Add package_content field in forms, admin, API

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

Author: tdruez

component_catalog/admin.py

@@ -884,6 +884,7 @@ class PackageAdmin(
                     "parties",
                     "datasource_id",
                     "file_references",
+                    "package_content",
                 )
             },
         ),

component_catalog/api.py

@@ -687,6 +687,7 @@ class Meta:
             "parties",
             "datasource_id",
             "file_references",
+            "package_content",
             "external_references",
             "created_date",
             "last_modified_date",

component_catalog/forms.py

@@ -339,6 +339,7 @@ class Meta:
             "version",
             "qualifiers",
             "subpath",
+            "package_content",
             "collect_data",
         ]
         widgets = {
@@ -407,7 +408,7 @@ def helper(self):
                 HTML("<hr>"),
                 Group("description", "keywords"),
                 Group("primary_language", "cpe"),
-                Group("size", "release_date"),
+                Group("package_content", "size", "release_date"),
                 Group("dependencies", "notes"),
                 HTML("<hr>"),
                 Group("homepage_url", "code_view_url"),
@@ -1183,6 +1184,7 @@ class Meta:
             "version",
             "qualifiers",
             "subpath",
+            "package_content",
         ]
 
 

component_catalog/tests/test_models.py

@@ -1366,6 +1366,7 @@ def test_component_catalog_models_get_exclude_candidates_fields(self):
                     "file_references",
                     "other_license_expression",
                     "parties",
+                    "package_content",
                 ],
             ),
         )

component_catalog/views.py

@@ -1930,6 +1930,12 @@ def get_initial(self):
         if purldb_entry := self.get_entry_from_purldb():
             # Duplicate the declared_license_expression as the "concluded" license_expression
             purldb_entry["license_expression"] = purldb_entry.get("declared_license_expression")
+
+            # Convert package_content string label to integer value
+            if content_label := purldb_entry.pop("package_content", None):
+                if content_value := Package.get_package_content_value_from_label(content_label):
+                    purldb_entry["package_content"] = content_value
+
             model_fields = [field.name for field in Package._meta.get_fields()]
             initial_from_purldb_entry = {
                 field_name: value

dejacode_toolkit/purldb.py

@@ -61,6 +61,8 @@ def get_package_by_purl(self, package_url):
 
     def find_packages(self, payload, timeout=None):
         """Get Packages details using provided `payload` filters on the PurlDB package list."""
+        payload.update({"sort": "package_content"})
+
         response = self.request_get(self.package_api_url, params=payload, timeout=timeout)
         if response and response.get("count") > 0:
             return response.get("results")