Revert unnecessary work and apply suggestions

Author: ahmedxgouda

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

@@ -37,9 +37,11 @@ class ProjectNode(GenericEntityNode):
     """Project node."""
 
     @strawberry.field
-    def health(self) -> list[ProjectHealthMetricsNode]:
+    def health_metrics(self, limit: int = 30) -> list[ProjectHealthMetricsNode]:
         """Resolve project health metrics."""
-        return ProjectHealthMetrics.objects.filter(project=self).order_by("-nest_created_at")
+        return ProjectHealthMetrics.objects.filter(project=self).order_by("-nest_created_at")[
+            :limit
+        ]
 
     @strawberry.field
     def issues_count(self) -> int:

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

@@ -5,7 +5,6 @@
 from .event import EventQuery
 from .post import PostQuery
 from .project import ProjectQuery
-from .project_health_metrics import ProjectHealthMetricsQuery
 from .snapshot import SnapshotQuery
 from .sponsor import SponsorQuery
 from .stats import StatsQuery
@@ -17,7 +16,6 @@ class OwaspQuery(
     EventQuery,
     PostQuery,
     ProjectQuery,
-    ProjectHealthMetricsQuery,
     SnapshotQuery,
     SponsorQuery,
     StatsQuery,

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

@@ -32,11 +32,6 @@ def handle(self, *args, **options):
             "unassigned_issues_count": 6.0,
         }
 
-        boolean_mapping = {
-            "open_issues_count": "has_long_open_issues",
-            "unanswered_issues_count": "has_long_unanswered_issues",
-            "unassigned_issues_count": "has_long_unassigned_issues",
-        }
         project_health_metrics = []
         project_health_requirements = {
             phr.level: phr for phr in ProjectHealthRequirements.objects.all()
@@ -61,8 +56,6 @@ def handle(self, *args, **options):
             for field, weight in backward_fields.items():
                 if int(getattr(metric, field)) <= int(getattr(requirements, field)):
                     score += weight
-                elif field in boolean_mapping:
-                    setattr(metric, boolean_mapping[field], True)
 
             metric.score = score
             project_health_metrics.append(metric)
@@ -71,9 +64,6 @@ def handle(self, *args, **options):
             project_health_metrics,
             fields=[
                 "score",
-                "has_long_open_issues",
-                "has_long_unanswered_issues",
-                "has_long_unassigned_issues",
             ],
         )
         self.stdout.write(

backend/apps/owasp/management/commands/owasp_update_project_health_metrics_scores.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.2.1 on 2025-06-17 05:51
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("owasp", "0044_merge_20250615_0346"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="projecthealthmetrics",
+            name="has_long_open_issues",
+        ),
+        migrations.RemoveField(
+            model_name="projecthealthmetrics",
+            name="has_long_unanswered_issues",
+        ),
+        migrations.RemoveField(
+            model_name="projecthealthmetrics",
+            name="has_long_unassigned_issues",
+        ),
+        migrations.RemoveField(
+            model_name="projecthealthmetrics",
+            name="has_no_recent_commits",
+        ),
+    ]

backend/apps/owasp/migrations/0045_remove_projecthealthmetrics_has_long_open_issues_and_more.py

@@ -24,17 +24,6 @@ class Meta:
     created_at = models.DateTimeField(verbose_name="Created at", blank=True, null=True)
     forks_count = models.PositiveIntegerField(verbose_name="Forks", default=0)
 
-    # The next boolean fields are used for filtering
-    has_no_recent_commits = models.BooleanField(
-        verbose_name="Has no recent commits", default=False
-    )
-    has_long_open_issues = models.BooleanField(verbose_name="Has long open issues", default=False)
-    has_long_unanswered_issues = models.BooleanField(
-        verbose_name="Has long unanswered issues", default=False
-    )
-    has_long_unassigned_issues = models.BooleanField(
-        verbose_name="Has long unassigned issues", default=False
-    )
     is_funding_requirements_compliant = models.BooleanField(
         verbose_name="Is funding requirements compliant", default=False
     )

backend/apps/owasp/models/project_health_metrics.py

@@ -44,8 +44,8 @@ def _get_field_by_name(self, name):
             (f for f in ProjectNode.__strawberry_definition__.fields if f.name == name), None
         )
 
-    def test_resolve_health(self):
-        field = self._get_field_by_name("health")
+    def test_resolve_health_metrics(self):
+        field = self._get_field_by_name("health_metrics")
         assert field is not None
         assert field.type.of_type is ProjectHealthMetricsNode
 

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

@@ -77,14 +77,8 @@ def test_handle_successful_update(self):
             [mock_metric],
             fields=[
                 "score",
-                "has_long_open_issues",
-                "has_long_unanswered_issues",
-                "has_long_unassigned_issues",
             ],
         )
         assert mock_metric.score == EXPECTED_SCORE
-        assert mock_metric.has_long_open_issues is True
-        assert mock_metric.has_long_unanswered_issues is True
-        assert mock_metric.has_long_unassigned_issues is True
         assert "Updated projects health metrics score successfully." in self.stdout.getvalue()
         assert "Updating score for project: Test Project" in self.stdout.getvalue()

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

@@ -69,10 +69,6 @@ def test_default_score(self):
             ("age_days", 0),
             ("contributors_count", 0),
             ("forks_count", 0),
-            ("has_no_recent_commits", False),
-            ("has_long_open_issues", False),
-            ("has_long_unanswered_issues", False),
-            ("has_long_unassigned_issues", False),
             ("is_funding_requirements_compliant", False),
             ("is_leader_requirements_compliant", False),
             ("last_committed_at", None),