test: improved coverage of github queries to more than 80 (#1871)

* test: improved coverage of github queries to more than 80

* Fix: Remove code duplication to pass checks after improving coverage

* Update tests

---------

Co-authored-by: Arkadii Yakovets <arkadii.yakovets@owasp.org>

Author: trucodd

backend/tests/apps/github/api/internal/queries/issue_test.py

@@ -75,3 +75,116 @@ def test_recent_issues_limit(self, mock_select_related, mock_issue):
         mock_select_related.assert_called_once()
         mock_queryset.order_by.assert_called_once_with("-created_at")
         assert result == [mock_issue]
+
+    @patch("apps.github.api.internal.queries.issue.Subquery")
+    @patch("apps.github.models.issue.Issue.objects.select_related")
+    def test_recent_issues_distinct(self, mock_select_related, mock_subquery, mock_issue):
+        """Test distinct filtering with Subquery for issues."""
+        mock_queryset = MagicMock()
+        mock_queryset.order_by.return_value = mock_queryset
+        mock_queryset.filter.return_value = mock_queryset
+        mock_queryset.__getitem__.return_value = [mock_issue]
+        mock_select_related.return_value = mock_queryset
+
+        mock_subquery_instance = MagicMock()
+        mock_subquery.return_value = mock_subquery_instance
+
+        result = IssueQuery().recent_issues(distinct=True)
+
+        assert result == [mock_issue]
+        mock_subquery.assert_called_once()
+        mock_queryset.filter.assert_called()
+
+    @patch("apps.github.models.issue.Issue.objects.select_related")
+    def test_recent_issues_combined_filters(self, mock_select_related, mock_issue):
+        mock_queryset = MagicMock()
+        mock_queryset.order_by.return_value.filter.return_value.filter.return_value = [mock_issue]
+        mock_select_related.return_value = mock_queryset
+
+        result = IssueQuery().recent_issues(login="alice", organization="owasp")
+
+        mock_select_related.assert_called_once()
+        mock_queryset.order_by.assert_called_once()
+        assert result == [mock_issue]
+
+    @patch("apps.github.api.internal.queries.issue.OuterRef")
+    @patch("apps.github.api.internal.queries.issue.Subquery")
+    @patch("apps.github.models.issue.Issue.objects.select_related")
+    def test_recent_issues_distinct_with_organization(
+        self, mock_select_related, mock_subquery, mock_outer_ref, mock_issue
+    ):
+        """Test distinct filtering with organization filter."""
+        mock_queryset = MagicMock()
+        mock_queryset.order_by.return_value = mock_queryset
+        mock_queryset.filter.return_value = mock_queryset
+        mock_queryset.__getitem__.return_value = [mock_issue]
+        mock_select_related.return_value = mock_queryset
+
+        mock_subquery_instance = Mock()
+        mock_subquery.return_value = mock_subquery_instance
+        mock_outer_ref_instance = Mock()
+        mock_outer_ref.return_value = mock_outer_ref_instance
+
+        result = IssueQuery().recent_issues(distinct=True, organization="owasp")
+
+        assert result == [mock_issue]
+        mock_subquery.assert_called_once()
+        mock_outer_ref.assert_called_once_with("author_id")
+
+    @patch("apps.github.api.internal.queries.issue.OuterRef")
+    @patch("apps.github.api.internal.queries.issue.Subquery")
+    @patch("apps.github.models.issue.Issue.objects.select_related")
+    def test_recent_issues_distinct_with_all_filters(
+        self, mock_select_related, mock_subquery, mock_outer_ref, mock_issue
+    ):
+        """Test distinct filtering with all filters."""
+        mock_queryset = MagicMock()
+        mock_queryset.order_by.return_value = mock_queryset
+        mock_queryset.filter.return_value = mock_queryset
+        mock_queryset.__getitem__.return_value = [mock_issue]
+        mock_select_related.return_value = mock_queryset
+
+        mock_subquery_instance = Mock()
+        mock_subquery.return_value = mock_subquery_instance
+        mock_outer_ref_instance = Mock()
+        mock_outer_ref.return_value = mock_outer_ref_instance
+
+        result = IssueQuery().recent_issues(
+            distinct=True, login="alice", organization="owasp", limit=3
+        )
+
+        assert result == [mock_issue]
+        mock_subquery.assert_called_once()
+        mock_outer_ref.assert_called_once_with("author_id")
+        # Verify both login and organization filters were applied
+        assert mock_queryset.filter.call_count >= 3  # login, organization, distinct
+
+    @patch("apps.github.models.issue.Issue.objects.select_related")
+    def test_recent_issues_organization_only(self, mock_select_related, mock_issue):
+        """Test filtering issues by organization only."""
+        mock_queryset = MagicMock()
+        mock_queryset.order_by.return_value = mock_queryset
+        mock_queryset.filter.return_value = mock_queryset
+        mock_queryset.__getitem__.return_value = [mock_issue]
+        mock_select_related.return_value = mock_queryset
+
+        result = IssueQuery().recent_issues(organization="owasp")
+
+        assert result == [mock_issue]
+        assert len(mock_queryset.filter.call_args_list) >= 1
+
+    @patch("apps.github.models.issue.Issue.objects.select_related")
+    def test_recent_issues_multiple_filters(self, mock_select_related, mock_issue):
+        """Test issues with multiple filters applied."""
+        mock_queryset = MagicMock()
+        mock_queryset.order_by.return_value = mock_queryset
+        mock_queryset.filter.return_value = mock_queryset
+        mock_queryset.__getitem__.return_value = [mock_issue]
+        mock_select_related.return_value = mock_queryset
+
+        result = IssueQuery().recent_issues(organization="owasp", limit=10)
+
+        assert result == [mock_issue]
+        # Verify organization filter was applied
+        assert len(mock_queryset.filter.call_args_list) >= 1
+        mock_queryset.__getitem__.assert_called_with(slice(None, 10))

backend/tests/apps/github/api/internal/queries/milestone_test.py

@@ -3,6 +3,7 @@
 from unittest.mock import MagicMock, Mock, patch
 
 import pytest
+from django.core.exceptions import ValidationError
 
 from apps.github.api.internal.queries.milestone import MilestoneQuery
 from apps.github.models.milestone import Milestone
@@ -94,3 +95,25 @@ def test_recent_milestones_distinct(self):
 
             assert isinstance(result, list)
             assert filtered_queryset.__getitem__.called
+
+    def test_recent_milestones_invalid_state(self):
+        """Test ValidationError for invalid state parameter."""
+        with pytest.raises(ValidationError) as exc_info:
+            MilestoneQuery().recent_milestones(state="invalid")
+
+        assert "Invalid state: invalid" in str(exc_info.value)
+        assert "Valid states are 'open', 'closed', or 'all'" in str(exc_info.value)
+
+    def test_recent_milestones_with_all_parameters(self, get_queryset):
+        """Test recent milestones with all parameters provided."""
+        with patch.object(Milestone, "closed_milestones", new_callable=Mock) as mock_manager:
+            mock_manager.all.return_value = get_queryset
+
+            result = MilestoneQuery().recent_milestones(
+                distinct=False, limit=10, login="testuser", organization="owasp", state="closed"
+            )
+
+        assert isinstance(result, list)
+        get_queryset.filter.assert_any_call(author__login="testuser")
+        get_queryset.filter.assert_any_call(repository__organization__login="owasp")
+        get_queryset.__getitem__.assert_called_with(slice(None, 10))

backend/tests/apps/github/api/internal/queries/organization_test.py

@@ -0,0 +1,50 @@
+"""Test cases for OrganizationQuery."""
+
+from unittest.mock import Mock, patch
+
+import pytest
+
+from apps.github.api.internal.queries.organization import OrganizationQuery
+from apps.github.models.organization import Organization
+
+
+class TestOrganizationQuery:
+    """Test cases for OrganizationQuery class."""
+
+    @pytest.fixture
+    def mock_organization(self):
+        """Mock Organization instance."""
+        org = Mock(spec=Organization)
+        org.id = 1
+        org.login = "owasp"
+        return org
+
+    @patch("apps.github.models.organization.Organization.objects.get")
+    def test_organization_found(self, mock_get, mock_organization):
+        """Test fetching organization when it exists."""
+        mock_get.return_value = mock_organization
+
+        result = OrganizationQuery().organization(login="owasp")
+
+        assert result == mock_organization
+        mock_get.assert_called_once_with(is_owasp_related_organization=True, login="owasp")
+
+    @patch("apps.github.models.organization.Organization.objects.get")
+    def test_organization_not_found(self, mock_get):
+        """Test fetching organization when it doesn't exist."""
+        mock_get.side_effect = Organization.DoesNotExist()
+
+        result = OrganizationQuery().organization(login="nonexistent")
+
+        assert result is None
+        mock_get.assert_called_once_with(is_owasp_related_organization=True, login="nonexistent")
+
+    @patch("apps.github.models.organization.Organization.objects.get")
+    def test_organization_with_different_login(self, mock_get, mock_organization):
+        """Test fetching organization with different login."""
+        mock_get.return_value = mock_organization
+
+        result = OrganizationQuery().organization(login="test-org")
+
+        assert result == mock_organization
+        mock_get.assert_called_once_with(is_owasp_related_organization=True, login="test-org")