Fix API

Signed-off-by: Tushar Goel <[email protected]>

Author: TG1999

vulnerabilities/api.py

@@ -592,7 +592,11 @@ def get_fixed_packages_qs(self):
         Filter the packages that fixes a vulnerability
         on fields like name, namespace and type.
         """
-        return self.get_packages_qs().filter(fixingpackagerelatedvulnerability__isnull=False).with_is_vulnerable()
+        return (
+            self.get_packages_qs()
+            .filter(fixingpackagerelatedvulnerability__isnull=False)
+            .with_is_vulnerable()
+        )
 
     def get_packages_qs(self):
         """
@@ -620,11 +624,11 @@ def get_queryset(self):
                 #     queryset=self.get_packages_qs(),
                 # ),
                 "weaknesses",
-                # Prefetch(
-                #     "fixed_by_packages",
-                #     queryset=self.get_fixed_packages_qs(),
-                #     to_attr="filtered_fixed_packages",
-                # ),
+                Prefetch(
+                    "fixed_by_packages",
+                    queryset=self.get_fixed_packages_qs(),
+                    to_attr="filtered_fixed_packages",
+                ),
             )
         )
 

vulnerabilities/models.py

@@ -151,12 +151,8 @@ def search(self, query: str = None):
 
     def with_package_counts(self):
         return self.annotate(
-            vulnerable_package_count=Count(
-                "affecting_packages", distinct=True
-            ),
-            patched_package_count=Count(
-                "fixed_by_packages", distinct=True
-            ),
+            vulnerable_package_count=Count("affecting_packages", distinct=True),
+            patched_package_count=Count("fixed_by_packages", distinct=True),
         )
 
 
@@ -237,7 +233,7 @@ def affected_packages(self):
         """
         Return a queryset of packages that are affected by this vulnerability.
         """
-        return self.affecting_packages
+        return self.affecting_packages.with_is_vulnerable()
 
     @property
     def packages_fixing(self):
@@ -984,6 +980,7 @@ def add_package_vulnerability_changelog(self, advisory):
             related_vulnerability=str(self.vulnerability),
         )
 
+
 class PackageRelatedVulnerabilityBase(models.Model):
     """
     Abstract base class for package-vulnerability relations.
@@ -1077,10 +1074,12 @@ def add_package_vulnerability_changelog(self, advisory):
             related_vulnerability=str(self.vulnerability),
         )
 
+
 class FixingPackageRelatedVulnerability(PackageRelatedVulnerabilityBase):
     class Meta(PackageRelatedVulnerabilityBase.Meta):
         verbose_name_plural = "Fixing Package Related Vulnerabilities"
 
+
 class AffectedByPackageRelatedVulnerability(PackageRelatedVulnerabilityBase):
     class Meta(PackageRelatedVulnerabilityBase.Meta):
         verbose_name_plural = "Affected By Package Related Vulnerabilities"

vulnerabilities/pipes/advisory.py

@@ -18,13 +18,13 @@
 from vulnerabilities.importer import AdvisoryData
 from vulnerabilities.improver import MAX_CONFIDENCE
 from vulnerabilities.models import Advisory
+from vulnerabilities.models import AffectedByPackageRelatedVulnerability
+from vulnerabilities.models import FixingPackageRelatedVulnerability
 from vulnerabilities.models import Package
 from vulnerabilities.models import VulnerabilityReference
 from vulnerabilities.models import VulnerabilityRelatedReference
 from vulnerabilities.models import VulnerabilitySeverity
 from vulnerabilities.models import Weakness
-from vulnerabilities.models import AffectedByPackageRelatedVulnerability
-from vulnerabilities.models import FixingPackageRelatedVulnerability
 
 
 def insert_advisory(advisory: AdvisoryData, pipeline_id: str, logger: Callable = None):