add unit tests

Signed-off-by: tdruez <tdruez@aboutcode.org>

Author: tdruez

product_portfolio/importers.py

@@ -472,6 +472,13 @@ def validate_toolkit_options(scan_options):
             options_str = " ".join(missing_options)
             raise ValidationError(f"The Scan run is missing those required options: {options_str}")
 
+    def _handle_package_dependencies(self, package_data, package_uid, dependencies_by_package_uid):
+        if self.create_dependencies:
+            if not package_data.get("dependencies"):
+                package_data["dependencies"] = dependencies_by_package_uid.get(package_uid, [])
+        else:
+            package_data.pop("dependencies", None)
+
     def import_packages(self):
         product_packages_count = 0
         packages_count = 0
@@ -491,12 +498,7 @@ def import_packages(self):
 
         for package_data in packages:
             package_uid = package_data.get("package_uid")
-            if self.create_dependencies:
-                package_dependencies = package_data.get("dependencies", [])
-                if not package_dependencies:
-                    package_data["dependencies"] = dependencies_by_package_uid.get(package_uid, [])
-            else:
-                package_data.pop("dependencies", None)
+            self._handle_package_dependencies(package_data, package_uid, dependencies_by_package_uid)
 
             prepared = PackageImporter.prepare_package(package_data, path="/")
             if not prepared:

product_portfolio/tests/test_importers.py

@@ -6,6 +6,7 @@
 # See https://aboutcode.org for more information about AboutCode FOSS projects.
 #
 
+import json
 import tempfile
 import uuid
 from pathlib import Path
@@ -908,6 +909,36 @@ def test_product_portfolio_product_import_from_scan_input_data_validation_errors
         self.assertEqual(expected, warnings)
         self.assertEqual({"Packages": 1, "Product Packages": 1}, created_counts)
 
+    def test_product_portfolio_product_import_from_scan_create_dependencies(self):
+        scan_input_location = self.testfiles_path / "import_from_scan_with_dependencies.json"
+
+        upload_file = wrap_as_temp_uploaded_file(scan_input_location)
+        importer = ImportFromScan(
+            self.product1, self.super_user, upload_file, create_dependencies=False
+        )
+        importer.save()
+        package = self.product1.packages.get()
+        self.assertEqual([], package.dependencies)
+
+        package.productpackages.all().delete()
+        package.delete()
+
+        upload_file = wrap_as_temp_uploaded_file(scan_input_location)
+        importer = ImportFromScan(
+            self.product1, self.super_user, upload_file, create_dependencies=True
+        )
+        importer.save()
+        package = self.product1.packages.get()
+        expected_dependency = {
+            "purl": "pkg:npm/lodash@4.17.21",
+            "scope": "runtime",
+            "is_runtime": True,
+            "is_optional": False,
+            "is_pinned": True,
+            "for_package_uid": "pkg:npm/test-package@1?uuid=9779a0ea-ef30-4a05-b4db-0a0ba3b3507c",
+        }
+        self.assertEqual([expected_dependency], json.loads(package.dependencies))
+
     def test_product_portfolio_product_import_from_scan_view_base(self):
         self.client.login(username=self.super_user.username, password="secret")
         scan_input_location = self.testfiles_path / "import_from_scan.json"
@@ -1060,6 +1091,56 @@ def test_product_portfolio_import_packages_from_scancodeio_importer(
             importer.save()
             mock_fetch.assert_called()
 
+    @mock.patch("dejacode_toolkit.scancodeio.ScanCodeIO.fetch_project_dependencies")
+    @mock.patch("dejacode_toolkit.scancodeio.ScanCodeIO.fetch_project_packages")
+    def test_product_portfolio_import_packages_from_scancodeio_create_dependencies(
+        self, mock_fetch_packages, mock_fetch_dependencies
+    ):
+        purl = "pkg:maven/abc/abc@1.0"
+        mock_fetch_packages.return_value = [
+            {
+                "type": "maven",
+                "namespace": "abc",
+                "name": "abc",
+                "version": "1.0",
+                "purl": purl,
+            }
+        ]
+        dependency_uid = "pkg:pypi/requests@2.0?uuid=test-dep"
+        mock_fetch_dependencies.return_value = [
+            {
+                "purl": "pkg:pypi/requests@2.0",
+                "dependency_uid": dependency_uid,
+                "for_package_uid": None,
+                "resolved_to_package_uid": None,
+                "scope": "install",
+                "is_runtime": True,
+                "is_optional": False,
+                "is_pinned": False,
+                "is_direct": True,
+                "datasource_id": "pypi_setup_cfg",
+                "affected_by_vulnerabilities": [],
+            }
+        ]
+
+        importer = ImportPackageFromScanCodeIO(
+            user=self.super_user,
+            project_uuid=uuid.uuid4(),
+            product=self.product1,
+            create_dependencies=False,
+        )
+        importer.save()
+        self.assertEqual(0, self.product1.dependencies.count())
+
+        importer = ImportPackageFromScanCodeIO(
+            user=self.super_user,
+            project_uuid=uuid.uuid4(),
+            product=self.product1,
+            create_dependencies=True,
+        )
+        importer.save()
+        self.assertEqual(1, self.product1.dependencies.count())
+
     @mock.patch("dejacode_toolkit.scancodeio.ScanCodeIO.fetch_project_dependencies")
     @mock.patch("dejacode_toolkit.scancodeio.ScanCodeIO.fetch_project_packages")
     def test_product_portfolio_import_packages_from_scio_importer_multiple_package_objs(

product_portfolio/tests/testfiles/import_from_scan_with_dependencies.json

@@ -0,0 +1,37 @@
+{
+  "headers": [
+    {
+      "tool_name": "scancode-toolkit",
+      "tool_version": "32.0.0",
+      "options": {
+        "--copyright": true,
+        "--info": true,
+        "--license": true,
+        "--package": true
+      }
+    }
+  ],
+  "packages": [
+    {
+      "type": "npm",
+      "name": "test-package",
+      "version": "1",
+      "purl": "pkg:npm/test-package@1",
+      "package_uid": "pkg:npm/test-package@1?uuid=9779a0ea-ef30-4a05-b4db-0a0ba3b3507c",
+      "download_url": "https://registry.npmjs.org/test-package/-/test-package-1.tgz",
+      "copyright": "Copyright",
+      "declared_license_expression": "apache-2.0"
+    }
+  ],
+  "dependencies": [
+    {
+      "purl": "pkg:npm/lodash@4.17.21",
+      "scope": "runtime",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_pinned": true,
+      "for_package_uid": "pkg:npm/test-package@1?uuid=9779a0ea-ef30-4a05-b4db-0a0ba3b3507c"
+    }
+  ],
+  "files": []
+}