Update code

Author: arkid15r

backend/apps/owasp/admin.py

@@ -166,9 +166,13 @@ def custom_field_name(self, obj) -> str:
 
 class ProjectHealthMetricsAdmin(admin.ModelAdmin):
     autocomplete_fields = ("project",)
-    list_filter = ("project__level",)
+    list_filter = (
+        "project__level",
+        "nest_created_at",
+    )
     list_display = (
         "project",
+        "nest_created_at",
         "score",
         "contributors_count",
         "stars_count",

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

@@ -47,19 +47,14 @@ def handle(self, *args, **options):
             )
 
             requirements = project_health_requirements[metric.project.level]
+
             score = 0.0
             for field, weight in forward_fields.items():
-                metric_value = getattr(metric, field)
-                if field in [
-                    "is_funding_requirements_compliant",
-                    "is_leader_requirements_compliant",
-                ]:
-                    if metric_value:
-                        score += weight
-                elif metric_value >= getattr(requirements, field):
+                if int(getattr(metric, field)) >= int(getattr(requirements, field)):
                     score += weight
+
             for field, weight in backward_fields.items():
-                if getattr(metric, field) <= getattr(requirements, field):
+                if int(getattr(metric, field)) <= int(getattr(requirements, field)):
                     score += weight
 
             metric.score = score

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

@@ -14,6 +14,8 @@ class Command(BaseCommand):
             "age_days": 15,
             "contributors_count": 1,
             "forks_count": 2,
+            "is_funding_requirements_compliant": True,
+            "is_leader_requirements_compliant": False,
             "last_commit_days": 365,
             "last_pull_request_days": 60,
             "last_release_days": 365,
@@ -32,6 +34,8 @@ class Command(BaseCommand):
             "age_days": 20,
             "contributors_count": 3,
             "forks_count": 5,
+            "is_funding_requirements_compliant": True,
+            "is_leader_requirements_compliant": True,
             "last_commit_days": 270,
             "last_pull_request_days": 45,
             "last_release_days": 365,
@@ -50,6 +54,8 @@ class Command(BaseCommand):
             "age_days": 30,
             "contributors_count": 4,
             "forks_count": 7,
+            "is_funding_requirements_compliant": True,
+            "is_leader_requirements_compliant": True,
             "last_commit_days": 90,
             "last_pull_request_days": 30,
             "last_release_days": 180,
@@ -68,6 +74,8 @@ class Command(BaseCommand):
             "age_days": 30,
             "contributors_count": 5,
             "forks_count": 10,
+            "is_funding_requirements_compliant": True,
+            "is_leader_requirements_compliant": True,
             "last_commit_days": 180,
             "last_pull_request_days": 30,
             "last_release_days": 365,
@@ -84,59 +92,41 @@ class Command(BaseCommand):
         },
     }
 
-    def add_arguments(self, parser) -> None:
-        parser.add_argument(
-            "--level",
-            type=str,
-            choices=[level[0] for level in Project.ProjectLevel.choices],
-            help="Project level to set requirements for",
-        )
-
     def get_level_requirements(self, level):
         """Get default requirements based on project level."""
-        defaults = {
-            "age_days": 0,
-            "contributors_count": 0,
-            "forks_count": 0,
-            "last_commit_days": 0,
-            "last_pull_request_days": 0,
-            "last_release_days": 0,
-            "open_issues_count": 0,
-            "open_pull_requests_count": 0,
-            "owasp_page_last_update_days": 0,
-            "recent_releases_count": 0,
-            "recent_releases_time_window_days": 0,
-            "stars_count": 0,
-            "total_pull_requests_count": 0,
-            "total_releases_count": 0,
-            "unanswered_issues_count": 0,
-            "unassigned_issues_count": 0,
-        }
-
-        return self.LEVEL_REQUIREMENTS.get(level, defaults)
+        return self.LEVEL_REQUIREMENTS.get(
+            level,
+            {
+                "age_days": 0,
+                "contributors_count": 0,
+                "forks_count": 0,
+                "is_funding_requirements_compliant": True,
+                "is_leader_requirements_compliant": True,
+                "last_commit_days": 0,
+                "last_pull_request_days": 0,
+                "last_release_days": 0,
+                "open_issues_count": 0,
+                "open_pull_requests_count": 0,
+                "owasp_page_last_update_days": 0,
+                "recent_releases_count": 0,
+                "recent_releases_time_window_days": 0,
+                "stars_count": 0,
+                "total_pull_requests_count": 0,
+                "total_releases_count": 0,
+                "unanswered_issues_count": 0,
+                "unassigned_issues_count": 0,
+            },
+        )
 
     def handle(self, *args, **options) -> None:
         """Handle the command execution."""
-        level = options.get("level")
-
-        if level:
-            defaults = self.get_level_requirements(level)
-            requirements, created = ProjectHealthRequirements.objects.get_or_create(
-                level=level, defaults=defaults
+        for level_code, level_name in sorted(Project.ProjectLevel.choices):
+            _, created = ProjectHealthRequirements.objects.update_or_create(
+                level=level_code,
+                defaults=self.get_level_requirements(level_code),
             )
 
-            action = "Created" if created else "Updated"
-            print(f"{action} health requirements for {requirements.get_level_display()} projects")
-        else:
-            for level_choice in Project.ProjectLevel.choices:
-                level_code = level_choice[0]
-                defaults = self.get_level_requirements(level_code)
-
-                requirements, created = ProjectHealthRequirements.objects.get_or_create(
-                    level=level_code, defaults=defaults
-                )
-
-                if created:
-                    print(f"Created default health requirements for {level_choice[1]} projects")
-                else:
-                    print(f"Health requirements already exist for {level_choice[1]} projects")
+            print(
+                f"{'Created' if created else 'Updated'} health requirements for "
+                f"{level_name} projects"
+            )

backend/apps/owasp/migrations/0041_projecthealthrequirements_is_funding_requirements_compliant_and_more.py

@@ -0,0 +1,26 @@
+# Generated by Django 5.2.2 on 2025-06-14 17:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("owasp", "0040_alter_projecthealthmetrics_is_leader_requirements_compliant"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="projecthealthrequirements",
+            name="is_funding_requirements_compliant",
+            field=models.BooleanField(
+                default=True, verbose_name="Is funding requirements compliant"
+            ),
+        ),
+        migrations.AddField(
+            model_name="projecthealthrequirements",
+            name="is_leader_requirements_compliant",
+            field=models.BooleanField(
+                default=True, verbose_name="Is leader requirements compliant"
+            ),
+        ),
+    ]

backend/apps/owasp/migrations/0042_alter_projecthealthmetrics_score.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.2.2 on 2025-06-14 18:08
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("owasp", "0041_projecthealthrequirements_is_funding_requirements_compliant_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="projecthealthmetrics",
+            name="score",
+            field=models.FloatField(
+                blank=True,
+                help_text="0-100",
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(0.0),
+                    django.core.validators.MaxValueValidator(100.0),
+                ],
+                verbose_name="Project health score",
+            ),
+        ),
+    ]

backend/apps/owasp/models/project.py

@@ -205,9 +205,7 @@ def open_pull_requests_count(self) -> int:
     @property
     def owasp_page_last_updated_at(self) -> datetime.datetime | None:
         """Return the last updated date of the OWASP page."""
-        if owasp_repository := self.owasp_repository:
-            return owasp_repository.updated_at
-        return None
+        return self.owasp_repository.updated_at if self.owasp_repository else None
 
     @property
     def pull_requests(self):

backend/apps/owasp/models/project_health_metrics.py

@@ -44,11 +44,12 @@ class Meta:
         verbose_name="Pull request last created at", blank=True, null=True
     )
     recent_releases_count = models.PositiveIntegerField(verbose_name="Recent releases", default=0)
-    # score of projects health between 0 and 100(float value)
     score = models.FloatField(
+        blank=True,
         null=True,
+        verbose_name="Project health score",
         validators=[MinValueValidator(0.0), MaxValueValidator(100.0)],
-        help_text="Project health score (0-100)",
+        help_text="0-100",
     )
     stars_count = models.PositiveIntegerField(verbose_name="Stars", default=0)
     total_issues_count = models.PositiveIntegerField(verbose_name="Total issues", default=0)
@@ -63,6 +64,10 @@ class Meta:
         verbose_name="Unassigned issues", default=0
     )
 
+    def __str__(self) -> str:
+        """Project health metrics human readable representation."""
+        return f"Health Metrics for {self.project.name}"
+
     @property
     def age_days(self) -> int:
         """Calculate project age in days."""
@@ -106,7 +111,3 @@ def bulk_save(metrics: list, fields: list | None = None) -> None:  # type: ignor
 
         """
         BulkSaveModel.bulk_save(ProjectHealthMetrics, metrics, fields=fields)
-
-    def __str__(self) -> str:
-        """Project health metrics human readable representation."""
-        return f"Health Metrics for {self.project.name}"

backend/apps/owasp/models/project_health_requirements.py

@@ -24,6 +24,12 @@ class Meta:
     age_days = models.PositiveIntegerField(verbose_name="Project age (days)", default=0)
     contributors_count = models.PositiveIntegerField(verbose_name="Contributors", default=0)
     forks_count = models.PositiveIntegerField(verbose_name="Forks", default=0)
+    is_funding_requirements_compliant = models.BooleanField(
+        verbose_name="Is funding requirements compliant", default=True
+    )
+    is_leader_requirements_compliant = models.BooleanField(
+        verbose_name="Is leader requirements compliant", default=True
+    )
     last_release_days = models.PositiveIntegerField(
         verbose_name="Days since last release", default=0
     )

backend/tests/apps/owasp/management/commands/owasp_update_project_health_requirements_test.py

@@ -35,27 +35,23 @@ def _setup(self):
                 "Created health requirements for Incubator projects",
                 "Incubator",
             ),
-            (None, "Created default health requirements for Flagship projects", "Flagship"),
         ],
     )
     def test_handle_successful_creation(self, level, expected_output, display_name):
         """Test successful requirements creation."""
         mock_requirements = MagicMock(spec=ProjectHealthRequirements)
         mock_requirements.get_level_display.return_value = display_name
-        self.mock_requirements.get_or_create.return_value = (mock_requirements, True)
+        self.mock_requirements.update_or_create.return_value = (mock_requirements, True)
 
         with patch("sys.stdout", new=StringIO()) as fake_out:
-            if level:
-                call_command("owasp_update_project_health_requirements", level=level)
-            else:
-                call_command("owasp_update_project_health_requirements")
+            call_command("owasp_update_project_health_requirements")
 
-            assert expected_output in fake_out.getvalue()
+        assert expected_output in fake_out.getvalue()
 
     def test_handle_exception(self):
         """Test handling of exceptions during update."""
         error_message = "Database error"
-        self.mock_requirements.get_or_create.side_effect = CommandError(error_message)
+        self.mock_requirements.update_or_create.side_effect = CommandError(error_message)
 
         with pytest.raises(CommandError, match=error_message) as exc_info:
             call_command("owasp_update_project_health_requirements")

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

@@ -44,7 +44,6 @@ def test_str_representation(self, mock_project, project_name, expected):
             (MIN_SCORE, True),
             (MAX_SCORE + 0.1, False),
             (MIN_SCORE - 10.0, False),
-            (None, False),
         ],
     )
     def test_score_validation(self, score, is_valid):