Refactor compute content ID

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

Author: TG1999

vulnerabilities/utils.py

@@ -610,18 +610,27 @@ def compute_content_id(advisory_data):
         }
         normalized_data["url"] = advisory_data.url
 
-    elif isinstance(advisory_data, AdvisoryData) or isinstance(advisory_data, AdvisoryDataV2):
+    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
             ],
-            "references": [
-                ref.to_dict() for ref in normalize_list(advisory_data.references) if ref
-            ],
             "weaknesses": normalize_list(advisory_data.weaknesses),
         }
+        if advisory_data.references_v2:
+            advisory_data["references"]= [
+                ref.to_dict() for ref in normalize_list(advisory_data.references_v2) if ref
+            ]
+            advisory_data["severities"] = [
+                sev.to_dict() for sev in normalize_list(advisory_data.severities) if sev
+            ]
+        if advisory_data.references:
+            advisory_data["references"]= [
+                ref.to_dict() for ref in normalize_list(advisory_data.references) if ref
+            ]
+
         normalized_data["url"] = advisory_data.url
 
     normalized_json = json.dumps(normalized_data, separators=(",", ":"), sort_keys=True)