Replace the fixed_packages_length annotation by a generated field #95

Signed-off-by: tdruez <[email protected]>

component_catalog/filters.py

@@ -286,6 +286,7 @@ class VulnerabilityFilterSet(DataspacedFilterSet):
         fields=[
             "vulnerability_id",
             "affected_packages_count",
+            "fixed_packages_length",
             "created_date",
             "last_modified_date",
         ],

component_catalog/migrations/0007_vulnerability_fixed_packages_length.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.6 on 2024-08-23 10:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('component_catalog', '0006_vulnerability_model_and_missing_indexes'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='vulnerability',
+            name='fixed_packages_length',
+            field=models.GeneratedField(db_persist=True, expression=models.Func(models.F('fixed_packages'), function='jsonb_array_length'), output_field=models.IntegerField()),
+        ),
+    ]

component_catalog/models.py

@@ -2603,6 +2603,14 @@ class Vulnerability(HistoryDateFieldsMixin, DataspacedModel):
         blank=True,
         help_text=_("A list of packages that are not affected by this vulnerability."),
     )
+    fixed_packages_length = models.GeneratedField(
+        expression=models.Func(
+            models.F('fixed_packages'),
+            function='jsonb_array_length'
+        ),
+        output_field=models.IntegerField(),
+        db_persist=True,
+    )
 
     class Meta:
         verbose_name_plural = "Vulnerabilities"

component_catalog/views.py

@@ -2498,26 +2498,20 @@ class VulnerabilityListView(
     )
 
     def get_queryset(self):
-        from django.db.models import Func
-        from django.db.models import IntegerField
-
         return (
             super()
             .get_queryset()
             .only(
                 "uuid",
                 "vulnerability_id",
                 "aliases",
+                "fixed_packages_length",
                 "created_date",
                 "last_modified_date",
                 "dataspace",
             )
             .annotate(
                 affected_packages_count=Count("affected_packages"),
-                # TODO: Consider computing this on save()
-                fixed_packages_length=Func(
-                    "fixed_packages", function="jsonb_array_length", output_field=IntegerField()
-                ),
             )
             .order_by(
                 "-last_modified_date",