Update tests and queries

Author: ahmedxgouda

backend/apps/owasp/graphql/nodes/project_health_metrics.py

@@ -12,7 +12,7 @@
         "contributors_count",
         "forks_count",
         "is_funding_requirements_compliant",
-        "is_project_leaders_requirements_compliant",
+        "is_leader_requirements_compliant",
         "open_issues_count",
         "recent_releases_count",
         "score",

backend/apps/owasp/graphql/queries/project_health_metrics.py

@@ -18,10 +18,10 @@ def unhealthy_projects(
         self,
         *,
         is_contributors_requirement_compliant: bool | None = None,
-        is_funding_requirement_compliant: bool | None = None,
+        is_funding_requirements_compliant: bool | None = None,
         has_recent_commits: bool | None = None,
         has_recent_releases: bool | None = None,
-        is_leaders_requirement_compliant: bool | None = None,
+        is_leader_requirements_compliant: bool | None = None,
         limit: int = 20,
         has_long_open_issues: bool | None = None,
         has_long_unanswered_issues: bool | None = None,
@@ -59,11 +59,11 @@ def unhealthy_projects(
         if has_long_unassigned_issues is not None:
             filters["has_long_unassigned_issues"] = has_long_unassigned_issues
 
-        if is_leaders_requirement_compliant is not None:
-            filters["is_project_leaders_requirements_compliant"] = is_leaders_requirement_compliant
+        if is_leader_requirements_compliant is not None:
+            filters["is_leader_requirements_compliant"] = is_leader_requirements_compliant
 
-        if is_funding_requirement_compliant is not None:
-            filters["is_funding_requirements_compliant"] = is_funding_requirement_compliant
+        if is_funding_requirements_compliant is not None:
+            filters["is_funding_requirements_compliant"] = is_funding_requirements_compliant
 
         if has_low_score:
             filters["score__lt"] = 50

backend/tests/apps/owasp/graphql/nodes/project_health_metrics_test.py

@@ -18,7 +18,7 @@ def test_meta_configuration(self):
             "contributors_count",
             "forks_count",
             "is_funding_requirements_compliant",
-            "is_project_leaders_requirements_compliant",
+            "is_leader_requirements_compliant",
             "last_commit_days",
             "last_pull_request_days",
             "last_release_days",
@@ -50,7 +50,7 @@ def _get_field_by_name(self, name):
             ("contributors_count", int),
             ("forks_count", int),
             ("is_funding_requirements_compliant", bool),
-            ("is_project_leaders_requirements_compliant", bool),
+            ("is_leader_requirements_compliant", bool),
             ("last_commit_days", int),
             ("last_pull_request_days", int),
             ("last_release_days", int),

backend/tests/apps/owasp/graphql/queries/project_health_metrics_test.py

@@ -30,16 +30,16 @@ def test_unhealthy_projects_field_configuration(self):
 
         arg_names = [arg.python_name for arg in unhealthy_projects_field.arguments]
         expected_arg_names = [
-            "contributors_count_requirement_compliant",
-            "funding_requirement_compliant",
-            "no_recent_commits",
-            "no_recent_releases",
-            "leaders_requirement_compliant",
+            "is_contributors_requirement_compliant",
+            "is_funding_requirements_compliant",
+            "has_recent_commits",
+            "has_recent_releases",
+            "is_leader_requirements_compliant",
             "limit",
-            "long_open_issues",
-            "long_unanswered_issues",
-            "long_unassigned_issues",
-            "low_score",
+            "has_long_open_issues",
+            "has_long_unanswered_issues",
+            "has_long_unassigned_issues",
+            "has_low_score",
         ]
         assert set(arg_names) == set(expected_arg_names)
 
@@ -55,7 +55,7 @@ def _setup(self):
             self.mocked_objects = mocked_objects
             yield
 
-    def test_resolve_unhealthy_projects(self):
+    def test_resolve_unhealthy_projects_without_filters(self):
         """Test the resolution of unhealthy projects."""
         # Mock the queryset
         mock_queryset = Mock()
@@ -77,3 +77,38 @@ def test_resolve_unhealthy_projects(self):
 
         assert isinstance(result, list)
         mock_filter.select_related.assert_called_with("project")
+
+    # def test_resolve_unhealthy_projects_with_filters(self):
+    #     """Test the resolution of unhealthy projects with filters."""
+    #     # Mock the queryset
+    #     mock_queryset = Mock()
+    #     self.mocked_objects.select_related.return_value = mock_queryset
+    #     mock_queryset.order_by.return_value.distinct.return_value = mock_queryset
+    #     # Filters
+    #     mock_filter = Mock()
+    #     mock_queryset.filter.return_value = mock_filter
+    #     mock_filter.select_related.return_value = [mock_filter]
+
+    #     # Create an instance of the query class
+    #     query_instance = ProjectHealthMetricsQuery()
+
+    #     # Call the method with filters
+    #     result = query_instance.unhealthy_projects(
+    #         is_contributors_requirement_compliant=True,
+    #         is_funding_requirements_compliant=False,
+    #         has_recent_commits=True,
+    #         has_recent_releases=False,
+    #         is_leaders_requirement_compliant=True,
+    #         limit=10,
+    #         has_long_open_issues=False,
+    #         has_long_unanswered_issues=True,
+    #         has_long_unassigned_issues=False,
+    #         has_low_score=True,
+    #     )
+
+    #     # Assert that the mocked queryset was called correctly with filters
+    #     self.mocked_objects.select_related.assert_called_with("project")
+    #     mock_queryset.order_by.assert_called_with("project__key", "-nest_created_at")
+
+    #     assert isinstance(result, list)
+    #     mock_filter.select_related.assert_called_with("project")