Add has_package_data to CodebaseResourceQuerySet #447

    * Remove dependency field from CodebaseResourceSerializer output
    * Update dependency donut chart labels
    * Revert Package URL hover to package_uid value in package_list view

Signed-off-by: Jono Yang <[email protected]>

Author: JonoYang

scanpipe/api/serializers.py

@@ -231,6 +231,7 @@ class Meta:
             "filename",
             "last_modified_date",
             "codebase_resources",
+            "dependencies",
         ]
 
 

scanpipe/models.py

@@ -1265,6 +1265,9 @@ def has_licenses(self):
     def has_no_licenses(self):
         return self.filter(licenses=[])
 
+    def has_package_data(self):
+        return self.filter(package_data__isnull=False)
+
     def licenses_categories(self, categories):
         return self.json_list_contains(
             field_name="licenses",

scanpipe/pipes/scancode.py

@@ -352,52 +352,32 @@ def assemble_packages(project):
     Create instances of DiscoveredPackage and DiscoveredDependency for `project`
     from the parsed package data present in the CodebaseResources of `project`.
     """
+    logger.info(f"Project: {project}:\n" "Function: assemble_packages\n")
     seen_resource_paths = set()
-    package_data_resources_qs = project.codebaseresources.filter(
-        package_data__isnull=False
-    )
-    for resource in package_data_resources_qs:
+    for resource in project.codebaseresources.has_package_data():
         if resource.path in seen_resource_paths:
             continue
 
-        logger.info(
-            f"project: {project}:\n"
-            "function: assemble_packages\n"
-            f"Processing: CodebaseResource {resource.path}\n"
-        )
+        logger.info(f"Processing: CodebaseResource {resource.path}\n")
 
-        for package_data in resource.package_data:
-            package_data = packagedcode_models.PackageData.from_dict(
-                mapping=package_data
-            )
+        for package_mapping in resource.package_data:
+            pd = packagedcode_models.PackageData.from_dict(mapping=package_mapping)
 
-            logger.info(
-                f"project: {project}:\n"
-                "function: assemble_packages\n"
-                f"Processing: PackageData {package_data.purl}\n"
-            )
+            logger.info(f"Processing: PackageData {pd.purl}\n")
 
-            handler = get_package_handler(package_data)
+            handler = get_package_handler(pd)
 
-            logger.info(
-                f"project: {project}:\n"
-                "function: assemble_packages\n"
-                f"Selected: Package handler {handler}\n"
-            )
+            logger.info(f"Selected: Package handler {handler}\n")
 
             items = handler.assemble(
-                package_data=package_data,
+                package_data=pd,
                 resource=resource,
                 codebase=project,
                 package_adder=add_to_package,
             )
 
             for item in items:
-                logger.info(
-                    f"project: {project}:\n"
-                    "function: assemble_packages\n"
-                    f"Processing: item {item}\n"
-                )
+                logger.info(f"Processing: item {item}\n")
                 if isinstance(item, packagedcode_models.Package):
                     package_data = item.to_dict()
                     pipes.update_or_create_package(project, package_data)
@@ -407,11 +387,7 @@ def assemble_packages(project):
                 elif isinstance(item, CodebaseResource):
                     seen_resource_paths.add(item.path)
                 else:
-                    logger.info(
-                        f"project: {project}:\n"
-                        "function: assemble_packages\n"
-                        f"Unknown Package assembly item type: {item!r}\n"
-                    )
+                    logger.info(f"Unknown Package assembly item type: {item!r}\n")
 
 
 def run_scancode(location, output_file, options, raise_on_error=False):

scanpipe/templates/scanpipe/package_list.html

@@ -27,7 +27,7 @@
         <tbody>
           {% for package in object_list %}
             <tr class="break-word">
-              <td style="min-width: 500px;" title="{{ package.package_url }}">
+              <td style="min-width: 500px;" title="{{ package.package_uid }}">
                 <a href="{{ package.get_absolute_url }}">{{ package.package_url }}</a>
               </td>
               <td style="min-width: 300px; max-width: 400px;">

scanpipe/templates/scanpipe/project_detail.html

@@ -272,9 +272,9 @@ <h3 class="title is-4 has-text-centered mb-3">
     makeChart("package_types", "#package_type_chart", "Package\nType");
     makeChart("package_licenses", "#package_license_chart", "Package\nLicense\nExpression");
     // Dependencies
-    makeChart("dependency_is_runtime", "#dependency_is_runtime_chart", "Dependency\nis_runtime");
-    makeChart("dependency_is_optional", "#dependency_is_optional_chart", "Dependency\nis_optional");
-    makeChart("dependency_is_resolved", "#dependency_is_resolved_chart", "Dependency\nis_resolved");
+    makeChart("dependency_is_runtime", "#dependency_is_runtime_chart", "Runtime\nDependencies");
+    makeChart("dependency_is_optional", "#dependency_is_optional_chart", "Optional\nDependencies");
+    makeChart("dependency_is_resolved", "#dependency_is_resolved_chart", "Resolved\nDependencies");
     // Resources
     makeChart("programming_languages", "#programming_language_chart", "Programming\nLanguage");
     makeChart("mime_types", "#mime_type_chart", "Mime\nType");