Fix errors

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

Author: TG1999

vulnerabilities/models.py

@@ -2872,65 +2872,52 @@ def latest_for_avids(self, avids):
         return self.filter(avid__in=avids).latest_per_avid()
 
     def latest_affecting_advisories_for_purl(self, purl):
-        affecting_exists = ImpactedPackageAffecting.objects.filter(
-            impacted_package__advisory_id=OuterRef("pk"),
-            package__package_url=purl,
-        )
-
-        return (
-            self.annotate(has_affecting=Exists(affecting_exists))
-            .filter(has_affecting=True)
-            .latest_per_avid()
+        adv_ids = ImpactedPackageAffecting.objects.filter(package__package_url=purl).values_list(
+            "impacted_package__advisory_id",
+            flat=True,
         )
+        return self.filter(id__in=Subquery(adv_ids)).latest_per_avid()
 
     def latest_affecting_advisories_for_purls(self, purls):
-        affecting_exists = ImpactedPackageAffecting.objects.filter(
-            impacted_package__advisory_id=OuterRef("pk"),
-            package__package_url__in=purls,
-        )
-
-        return (
-            self.annotate(has_affecting=Exists(affecting_exists))
-            .filter(has_affecting=True)
-            .latest_per_avid()
+        adv_ids = ImpactedPackageAffecting.objects.filter(
+            package__package_url__in=purls
+        ).values_list(
+            "impacted_package__advisory_id",
+            flat=True,
         )
+        return self.filter(id__in=Subquery(adv_ids)).latest_per_avid()
 
     def latest_fixed_by_advisories_for_purl(self, purl):
-        fixed_exists = ImpactedPackageFixedBy.objects.filter(
-            impacted_package__advisory_id=OuterRef("pk"),
-            package__package_url=purl,
-        )
-
-        return (
-            self.annotate(has_fixed=Exists(fixed_exists)).filter(has_fixed=True).latest_per_avid()
+        adv_ids = ImpactedPackageFixedBy.objects.filter(package__package_url=purl).values_list(
+            "impacted_package__advisory_id",
+            flat=True,
         )
+        return self.filter(id__in=Subquery(adv_ids)).latest_per_avid()
 
     def latest_fixed_by_advisories_for_purls(self, purls):
-        fixed_exists = ImpactedPackageFixedBy.objects.filter(
-            impacted_package__advisory_id=OuterRef("pk"),
-            package__package_url__in=purls,
+        adv_ids = ImpactedPackageFixedBy.objects.filter(package__package_url__in=purls).values_list(
+            "impacted_package__advisory_id",
+            flat=True,
         )
 
-        return (
-            self.annotate(has_fixed=Exists(fixed_exists)).filter(has_fixed=True).latest_per_avid()
-        )
+        return self.filter(id__in=Subquery(adv_ids)).latest_per_avid()
 
     def latest_advisories_for_purls(self, purls):
-        adv_ids = ImpactedPackageAffecting.objects.filter(
-            package__package_url__in=purls
-        ).values_list(
-            "impacted_package__advisory_id",
-            flat=True,
-        ).union(
-            ImpactedPackageFixedBy.objects.filter(
-                package__package_url__in=purls
-            ).values_list(
+        adv_ids = (
+            ImpactedPackageAffecting.objects.filter(package__package_url__in=purls)
+            .values_list(
                 "impacted_package__advisory_id",
                 flat=True,
             )
+            .union(
+                ImpactedPackageFixedBy.objects.filter(package__package_url__in=purls).values_list(
+                    "impacted_package__advisory_id",
+                    flat=True,
+                )
+            )
         )
 
-        qs = AdvisoryV2.objects.filter(id__in=Subquery(adv_ids))
+        qs = self.filter(id__in=Subquery(adv_ids))
         return qs.latest_per_avid()
 
 

vulnerabilities/pipelines/v2_improvers/compute_advisory_content_hash.py

@@ -41,8 +41,11 @@ def compute_advisory_content_hash(self):
         batch_size = 5000
 
         for advisory in progress.iter(advisories.iterator(chunk_size=batch_size)):
-            advisory.advisory_content_hash = compute_advisory_content(advisory)
-            to_update.append(advisory)
+            try:
+                advisory.advisory_content_hash = compute_advisory_content(advisory)
+                to_update.append(advisory)
+            except Exception as e:
+                self.log(f"Error computing advisory_content_hash for {advisory.avid}: {e}")
 
             if len(to_update) >= batch_size:
                 AdvisoryV2.objects.bulk_update(