Always convert the package_content value when available

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

Author: tdruez

component_catalog/models.py

@@ -2649,9 +2649,6 @@ def update_from_purldb(self, user):
             package_data = purldb_entries[0]
         elif source_package := pick_source_package(purldb_entries):
             package_data = source_package
-            package_data["package_content"] = Package.get_package_content_value_from_label(
-                package_data["package_content"]
-            )
         else:
             package_data = merge_common_non_empty_values(purldb_entries)
 
@@ -2660,6 +2657,10 @@ def update_from_purldb(self, user):
             package_data["release_date"] = release_date.split("T")[0]
         package_data["license_expression"] = package_data.get("declared_license_expression")
 
+        if package_content := package_data.get("package_content"):
+            package_content_value = Package.get_package_content_value_from_label(package_content)
+            package_data["package_content"] = package_content_value
+
         # Avoid raising an IntegrityError when the values in `package_data` for the
         # identifier fields already exist on another Package instance.
         #

component_catalog/tests/test_models.py

@@ -2646,6 +2646,7 @@ def test_package_model_update_from_purldb(self, mock_get_purldb_entries):
             "sha256": "0a1efde1b685a6c30999ba00902f23613cf5db864c5a1532d2edf3eda7896a37",
             "copyright": "(c) Copyright",
             "declared_license_expression": "(bsd-simplified AND bsd-new)",
+            "package_content": "source_archive",
         }
 
         mock_get_purldb_entries.return_value = [purldb_entry]
@@ -2667,12 +2668,13 @@ def test_package_model_update_from_purldb(self, mock_get_purldb_entries):
             "sha256",
             "copyright",
             "declared_license_expression",
+            "package_content",
             "license_expression",
         ]
         self.assertEqual(expected, updated_fields)
 
         package1.refresh_from_db()
-        # Handle release_date separatly
+        # Handle release_date and package_content separatly
         updated_fields.remove("release_date")
         self.assertEqual(purldb_entry["release_date"], str(package1.release_date))