From 10137666df1002207d262e02b7cf1cfde9489dab Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@nexb.com>
Date: Mon, 13 Jan 2025 15:25:54 +0100
Subject: [PATCH] Fix failing test #1519

Signed-off-by: tdruez <tdruez@nexb.com>
---
 scanpipe/models.py | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/scanpipe/models.py b/scanpipe/models.py
index dc3bd33b6..e419a79e2 100644
--- a/scanpipe/models.py
+++ b/scanpipe/models.py
@@ -3071,22 +3071,9 @@ def vulnerable(self):
         return self.filter(~Q(affected_by_vulnerabilities__in=EMPTY_VALUES))
 
 
-class OnlyPackageURLFieldsQuerySetMixin:
-    def only_package_url_fields(self, extra=None):
-        """
-        Only select and return the UUID and PURL fields.
-        Minimum requirements to render a Package link in the UI.
-        """
-        if not extra:
-            extra = []
-
-        return self.only("pk", *PACKAGE_URL_FIELDS, *extra)
-
-
 class DiscoveredPackageQuerySet(
     VulnerabilityQuerySetMixin,
     PackageURLQuerySetMixin,
-    OnlyPackageURLFieldsQuerySetMixin,
     ComplianceAlertQuerySetMixin,
     ProjectRelatedQuerySet,
 ):
@@ -3099,6 +3086,16 @@ def with_resources_count(self):
         )
         return self.annotate(resources_count=count_subquery)
 
+    def only_package_url_fields(self, extra=None):
+        """
+        Only select and return the UUID and PURL fields.
+        Minimum requirements to render a Package link in the UI.
+        """
+        if not extra:
+            extra = []
+
+        return self.only("uuid", *PACKAGE_URL_FIELDS, *extra)
+
     def filter(self, *args, **kwargs):
         """Add support for using ``package_url`` as a field lookup."""
         if purl_str := kwargs.pop("package_url", None):
@@ -3678,7 +3675,6 @@ def as_cyclonedx(self):
 
 class DiscoveredDependencyQuerySet(
     PackageURLQuerySetMixin,
-    OnlyPackageURLFieldsQuerySetMixin,
     VulnerabilityQuerySetMixin,
     ProjectRelatedQuerySet,
 ):
@@ -3701,6 +3697,16 @@ def prefetch_for_serializer(self):
             ),
         )
 
+    def only_package_url_fields(self, extra=None):
+        """
+        Only select and return the UUID and PURL fields.
+        Minimum requirements to render a Package link in the UI.
+        """
+        if not extra:
+            extra = []
+
+        return self.only("dependency_uid", *PACKAGE_URL_FIELDS, *extra)
+
 
 class DiscoveredDependency(
     ProjectRelatedModel,