Refactor the package lookups into a function #295

Signed-off-by: tdruez <[email protected]>

Author: tdruez

product_portfolio/importers.py

@@ -692,29 +692,8 @@ def import_package(self, package_data):
         # Vulnerabilities are fetched post import.
         package_data.pop("affected_by_vulnerabilities", None)
 
-        unique_together_lookups = {
-            field: package_data.get(field, "") for field in self.unique_together_fields
-        }
-
-        # Check if the Package already exists in the local Dataspace
-        try:
-            package = Package.objects.scope(self.user.dataspace).get(**unique_together_lookups)
-            self.existing["package"].append(str(package))
-        except ObjectDoesNotExist:
-            package = None
-
-        # Check if the Package already exists in the reference Dataspace
-        reference_dataspace = Dataspace.objects.get_reference()
-        user_dataspace = self.user.dataspace
-        if not package and user_dataspace != reference_dataspace:
-            qs = Package.objects.scope(reference_dataspace).filter(**unique_together_lookups)
-            if qs.exists():
-                reference_object = qs.first()
-                try:
-                    package = copy_object(reference_object, user_dataspace, self.user, update=False)
-                    self.created["package"].append(str(package))
-                except IntegrityError as error:
-                    self.errors["package"].append(str(error))
+        # Check if the package already exists to prevent duplication.
+        package = self.look_for_existing_package(package_data)
 
         if license_expression := package_data.get("declared_license_expression"):
             license_expression = str(self.licensing.dedup(license_expression))
@@ -786,3 +765,31 @@ def import_dependency(self, dependency_data):
             return
 
         self.created["dependency"].append(str(dependency.dependency_uid))
+
+    def look_for_existing_package(self, package_data):
+        package = None
+        unique_together_lookups = {
+            field: package_data.get(field, "") for field in self.unique_together_fields
+        }
+
+        # Check if the Package already exists in the local Dataspace
+        try:
+            package = Package.objects.scope(self.user.dataspace).get(**unique_together_lookups)
+            self.existing["package"].append(str(package))
+        except ObjectDoesNotExist:
+            package = None
+
+        # Check if the Package already exists in the reference Dataspace
+        reference_dataspace = Dataspace.objects.get_reference()
+        user_dataspace = self.user.dataspace
+        if not package and user_dataspace != reference_dataspace:
+            qs = Package.objects.scope(reference_dataspace).filter(**unique_together_lookups)
+            if qs.exists():
+                reference_object = qs.first()
+                try:
+                    package = copy_object(reference_object, user_dataspace, self.user, update=False)
+                    self.created["package"].append(str(package))
+                except IntegrityError as error:
+                    self.errors["package"].append(str(error))
+
+        return package