Revert search code

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

Author: TG1999

vulnerabilities/models.py

@@ -2930,15 +2930,18 @@ def latest_for_avid(self, avid: str):
 
     def latest_per_avid(self):
         return self.filter(is_latest=True)
-    
+
+    def latest_for_avids(self, avids):
+        return self.filter(avid__in=avids).latest_per_avid()
+
     def latest_for_avid_completely_imported_advisories(self, avid):
         return self.get(avid=avid, is_latest=True, _all_impacts_unfurled=True)
 
     def latest_completely_imported_advisories_per_avid(self):
         return self.filter(is_latest=True, _all_impacts_unfurled=True)
 
-    def latest_for_avids(self, avids):
-        return self.filter(avid__in=avids).latest_per_avid()
+    def latest_for_avids_completely_imported_advisories(self, avids):
+        return self.get(avid__in=avids, is_latest=True, _all_impacts_unfurled=True)
 
     def latest_affecting_advisories_for_purl(self, purl):
         adv_ids = ImpactedPackage.objects.filter(

vulnerabilities/views.py

@@ -213,29 +213,8 @@ def get_queryset(self, query=None):
         """
 
         query = query or self.request.GET.get("search") or ""
-        affecting_package_ids = ImpactedPackageAffecting.objects.filter(
-            impacted_package__advisory___all_impacts_unfurled=True,
-            impacted_package__advisory__is_latest=True,
-        ).values("package_id")
 
-        fixed_by_package_ids = ImpactedPackageFixedBy.objects.filter(
-            impacted_package__advisory___all_impacts_unfurled=True,
-            impacted_package__advisory__is_latest=True,
-        ).values("package_id")
-
-        return (
-            self.model.objects.search(query)
-            .filter(Q(id__in=affecting_package_ids) | Q(id__in=fixed_by_package_ids))
-            .annotate(
-                is_vulnerable=Exists(
-                    ImpactedPackageAffecting.objects.filter(
-                        package_id=OuterRef("pk"),
-                        impacted_package__advisory___all_impacts_unfurled=True,
-                        impacted_package__advisory__is_latest=True,
-                    )
-                )
-            )
-        )
+        return self.model.objects.search(query).prefetch_related().with_is_vulnerable()
 
 
 class AffectedByAdvisoriesListView(VulnerableCodeListView):