Update compute_content_id to ensure it works correctly and creates an advisory when it has severities, patches, references_v2, and an advisory_id

Signed-off-by: ziad hany <ziadhany2016@gmail.com>

Author: ziadhany

vulnerabilities/importer.py

@@ -271,9 +271,9 @@ def __lt__(self, other):
 
     def _cmp_key(self):
         return (
-            self.patch_url,
-            self.patch_text,
-            self.patch_checksum,
+            self.patch_url or "",
+            self.patch_text or "",
+            self.patch_checksum or "",
         )
 
     def to_dict(self) -> dict:

vulnerabilities/utils.py

@@ -633,8 +633,9 @@ def compute_content_id(advisory_data):
         normalized_data["url"] = advisory_data.url
 
     elif isinstance(advisory_data, AdvisoryData):
-        if advisory_data.references_v2:
+        if advisory_data.references_v2 or advisory_data.severities or advisory_data.patches:
             normalized_data = {
+                "advisory_id": normalize_text(advisory_data.advisory_id),
                 "aliases": normalize_list(advisory_data.aliases),
                 "summary": normalize_text(advisory_data.summary),
                 "affected_packages": [
@@ -646,6 +647,9 @@ def compute_content_id(advisory_data):
                 "severities": [
                     sev.to_dict() for sev in normalize_list(advisory_data.severities) if sev
                 ],
+                "patches": [
+                    patch.to_dict() for patch in normalize_list(advisory_data.patches) if patch
+                ],
                 "weaknesses": normalize_list(advisory_data.weaknesses),
             }
         elif advisory_data.references or advisory_data.references == []:
@@ -665,7 +669,6 @@ def compute_content_id(advisory_data):
 
     normalized_json = json.dumps(normalized_data, separators=(",", ":"), sort_keys=True)
     content_id = hashlib.sha256(normalized_json.encode("utf-8")).hexdigest()
-
     return content_id