Use unique_content_id for get_or_create Advisory

- Since unique_content_id is a proxy for other fields using it is
  enough and sufficient.

Signed-off-by: Keshav Priyadarshi <[email protected]>

Author: keshav-space

vulnerabilities/import_runner.py

@@ -108,16 +108,16 @@ def process_advisories(
                 aliases = get_or_create_aliases(aliases=data.aliases)
                 obj, created = Advisory.objects.get_or_create(
                     unique_content_id=content_id,
-                    summary=data.summary,
-                    affected_packages=[pkg.to_dict() for pkg in data.affected_packages],
-                    references=[ref.to_dict() for ref in data.references],
-                    date_published=data.date_published,
-                    weaknesses=data.weaknesses,
+                    url=data.url,
                     defaults={
+                        "summary": data.summary,
+                        "affected_packages": [pkg.to_dict() for pkg in data.affected_packages],
+                        "references": [ref.to_dict() for ref in data.references],
+                        "date_published": data.date_published,
+                        "weaknesses": data.weaknesses,
                         "created_by": importer_name,
                         "date_collected": datetime.datetime.now(tz=datetime.timezone.utc),
                     },
-                    url=data.url,
                 )
                 obj.aliases.add(*aliases)
                 if not obj.date_imported:

vulnerabilities/pipes/advisory.py

@@ -15,6 +15,7 @@
 from typing import List
 
 from django.db import transaction
+from django.db.models.query import QuerySet
 
 from vulnerabilities.importer import AdvisoryData
 from vulnerabilities.improver import MAX_CONFIDENCE
@@ -29,7 +30,7 @@
 from vulnerabilities.models import Weakness
 
 
-def get_or_create_aliases(aliases: List) -> List:
+def get_or_create_aliases(aliases: List) -> QuerySet:
     for alias in aliases:
         Alias.objects.get_or_create(alias=alias)
     return Alias.objects.filter(alias__in=aliases)
@@ -44,13 +45,13 @@ def insert_advisory(advisory: AdvisoryData, pipeline_id: str, logger: Callable =
     try:
         advisory_obj, _ = Advisory.objects.get_or_create(
             unique_content_id=content_id,
-            summary=advisory.summary,
-            affected_packages=[pkg.to_dict() for pkg in advisory.affected_packages],
-            references=[ref.to_dict() for ref in advisory.references],
-            date_published=advisory.date_published,
-            weaknesses=advisory.weaknesses,
             url=advisory.url,
             defaults={
+                "summary": advisory.summary,
+                "affected_packages": [pkg.to_dict() for pkg in advisory.affected_packages],
+                "references": [ref.to_dict() for ref in advisory.references],
+                "date_published": advisory.date_published,
+                "weaknesses": advisory.weaknesses,
                 "created_by": pipeline_id,
                 "date_collected": datetime.now(timezone.utc),
             },