Remove unique content ID from unqiue together

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Author: TG1999

vulnerabilities/migrations/0090_alter_advisory_unique_together.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.16 on 2025-02-14 15:42
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("vulnerabilities", "0089_alter_advisory_unique_content_id"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="advisory",
+            unique_together={("aliases", "date_published", "url")},
+        ),
+    ]

vulnerabilities/models.py

@@ -1356,7 +1356,7 @@ class Advisory(models.Model):
     objects = AdvisoryQuerySet.as_manager()
 
     class Meta:
-        unique_together = ["aliases", "unique_content_id", "date_published", "url"]
+        unique_together = ["aliases", "date_published", "url"]
         ordering = ["aliases", "date_published", "unique_content_id"]
 
     def save(self, *args, **kwargs):

vulnerabilities/pipelines/remove_duplicate_advisories.py

@@ -79,7 +79,7 @@ def recompute_content_ids(self):
         batch_size = 1000
 
         for advisory in progress.iter(Advisory.objects.all().paginated()):
-            advisory.unique_content_id = compute_content_id(advisory)
+            advisory.unique_content_id = compute_content_id(advisory.to_advisory_data())
             advisories.append(advisory)
             if len(advisories) % batch_size == 0:
                 Advisory.objects.bulk_update(

vulnerabilities/utils.py

@@ -574,6 +574,7 @@ def compute_content_id(advisory_data, include_metadata=False):
 
     if isinstance(advisory_data, Advisory):
         normalized_data = {
+            "aliases": normalize_list(advisory_data.aliases),
             "summary": normalize_text(advisory_data.summary),
             "affected_packages": [
                 pkg for pkg in normalize_list(advisory_data.affected_packages) if pkg
@@ -585,6 +586,7 @@ def compute_content_id(advisory_data, include_metadata=False):
 
     elif isinstance(advisory_data, AdvisoryData):
         normalized_data = {
+            "aliases": normalize_list(advisory_data.aliases),
             "summary": normalize_text(advisory_data.summary),
             "affected_packages": [
                 pkg.to_dict() for pkg in normalize_list(advisory_data.affected_packages) if pkg