Update filtering

Author: ahmedxgouda

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

@@ -19,7 +19,7 @@ def unhealthy_projects(
         *,
         is_contributors_requirement_compliant: bool | None = None,
         is_funding_requirements_compliant: bool | None = None,
-        has_recent_commits: bool | None = None,
+        has_no_recent_commits: bool | None = None,
         has_recent_releases: bool | None = None,
         is_leader_requirements_compliant: bool | None = None,
         limit: int = 20,
@@ -47,8 +47,8 @@ def unhealthy_projects(
             suffix = "__gte" if is_contributors_requirement_compliant else "__lt"
             filters[f"contributors_count{suffix}"] = CONTRIBUTORS_COUNT_REQUIREMENT
 
-        if has_recent_commits is not None:
-            filters["has_recent_commits"] = has_recent_commits
+        if has_no_recent_commits is not None:
+            filters["has_no_recent_commits"] = has_no_recent_commits
 
         if has_long_open_issues is not None:
             filters["has_long_open_issues"] = has_long_open_issues

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

@@ -14,7 +14,7 @@ def handle(self, *args, **options):
             "contributors_count": "contributors_count",
             "created_at": "created_at",
             "forks_count": "forks_count",
-            "has_recent_commits": "has_recent_commits",
+            "has_no_recent_commits": "has_no_recent_commits",
             "is_funding_requirements_compliant": "is_funding_requirements_compliant",
             "is_leader_requirements_compliant": "is_leader_requirements_compliant",
             "last_committed_at": "pushed_at",

backend/apps/owasp/migrations/0043_remove_projecthealthmetrics_has_recent_commits_and_more.py

@@ -0,0 +1,21 @@
+# Generated by Django 5.2.1 on 2025-06-13 07:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("owasp", "0042_remove_projecthealthmetrics_has_no_recent_commits_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="projecthealthmetrics",
+            name="has_recent_commits",
+        ),
+        migrations.AddField(
+            model_name="projecthealthmetrics",
+            name="has_no_recent_commits",
+            field=models.BooleanField(default=False, verbose_name="Has no recent commits"),
+        ),
+    ]

backend/apps/owasp/models/project.py

@@ -133,10 +133,10 @@ def __str__(self) -> str:
         return f"{self.name or self.key}"
 
     @property
-    def has_recent_commits(self) -> bool:
-        """Indicate whether project has recent commits."""
+    def has_no_recent_commits(self) -> bool:
+        """Indicate whether project has no recent commits."""
         recent_period = timezone.now() - datetime.timedelta(days=60)
-        return self.pushed_at is not None and self.pushed_at >= recent_period
+        return self.pushed_at is None or self.pushed_at < recent_period or self.commits_count == 0
 
     @property
     def is_code_type(self) -> bool:

backend/apps/owasp/models/project_health_metrics.py

@@ -25,7 +25,9 @@ class Meta:
     forks_count = models.PositiveIntegerField(verbose_name="Forks", default=0)
 
     # The next boolean fields are used for filtering
-    has_recent_commits = models.BooleanField(verbose_name="Has recent commits", default=False)
+    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

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

@@ -34,7 +34,7 @@ def test_unhealthy_projects_field_configuration(self):
         expected_arg_names = [
             "is_contributors_requirement_compliant",
             "is_funding_requirements_compliant",
-            "has_recent_commits",
+            "has_no_recent_commits",
             "has_recent_releases",
             "is_leader_requirements_compliant",
             "limit",
@@ -92,7 +92,7 @@ def test_resolve_unhealthy_projects_with_filters(self):
         mock_metrics.contributors_count = 3
         mock_metrics.is_funding_requirements_compliant = False
         mock_metrics.is_leader_requirements_compliant = True
-        mock_metrics.has_recent_commits = True
+        mock_metrics.has_no_recent_commits = True
         mock_metrics.has_long_open_issues = True
         mock_metrics.has_long_unanswered_issues = True
         mock_metrics.has_long_unassigned_issues = True
@@ -129,7 +129,7 @@ def test_resolve_unhealthy_projects_with_filters(self):
         result = query_instance.unhealthy_projects(
             is_contributors_requirement_compliant=True,
             is_funding_requirements_compliant=False,
-            has_recent_commits=True,
+            has_no_recent_commits=True,
             has_recent_releases=True,
             is_leader_requirements_compliant=True,
             limit=10,
@@ -144,7 +144,7 @@ def test_resolve_unhealthy_projects_with_filters(self):
         mock_queryset.order_by.assert_called_with("project__key", "-nest_created_at")
         mock_queryset.filter.assert_called_with(
             contributors_count__gte=2,
-            has_recent_commits=True,
+            has_no_recent_commits=True,
             has_long_open_issues=True,
             has_long_unanswered_issues=True,
             has_long_unassigned_issues=True,

backend/tests/apps/owasp/models/project_health_metrics_test.py

@@ -70,6 +70,10 @@ 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),