Use purl data in update_or_create_packages #438

    * Add package_uid to test package data
    * Update expected test result

Signed-off-by: Jono Yang <jyang@nexb.com>

Author: JonoYang

scanpipe/pipes/__init__.py

@@ -75,12 +75,17 @@ def update_or_create_package(project, package_data, codebase_resource=None):
     Uses the `project` and `package_data` mapping to lookup and creates the
     DiscoveredPackage using its Package URL and package_uid as a unique key.
     """
+    purl_data = DiscoveredPackage.extract_purl_data(package_data)
     package_uid = package_data.get("package_uid")
+    purl_data_and_package_uid = {
+        **purl_data,
+        "package_uid": package_uid,
+    }
 
     try:
         package = DiscoveredPackage.objects.get(
             project=project,
-            package_uid=package_uid,
+            **purl_data_and_package_uid
         )
     except DiscoveredPackage.DoesNotExist:
         package = None

scanpipe/tests/__init__.py

@@ -86,6 +86,7 @@
     "repository_homepage_url": None,
     "repository_download_url": None,
     "api_data_url": None,
+    "package_uid": "pkg:deb/debian/adduser@3.118?uuid=610bed29-ce39-40e7-92d6-fd8b8dd8b908",
 }
 
 license_policies = [

scanpipe/tests/test_api.py

@@ -627,7 +627,7 @@ def test_scanpipe_api_serializer_get_model_serializer(self):
             get_model_serializer(None)
 
     def test_scanpipe_api_serializer_get_serializer_fields(self):
-        self.assertEqual(30, len(get_serializer_fields(DiscoveredPackage)))
+        self.assertEqual(31, len(get_serializer_fields(DiscoveredPackage)))
         self.assertEqual(26, len(get_serializer_fields(CodebaseResource)))
 
         with self.assertRaises(LookupError):