Refactor the SchemingDCATHarvester to use the configuration defaults …

…as fallback
mjanez · Oct 17, 2024 · 1918b6a · 1918b6a
1 parent 045f164
commit 1918b6a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/ckanext/schemingdcat/harvesters/base.py b/ckanext/schemingdcat/harvesters/base.py
@@ -1455,9 +1455,6 @@ def _set_package_dict_default_values(self, package_dict, harvest_object, context
         local_org = source_package_dict.get("owner_org")
         package_dict["owner_org"] = local_org
 
-        # Using dataset config defaults
-        package_dict = self._apply_package_defaults_from_config(package_dict, DATASET_DEFAULT_FIELDS)
-
         # Add default_extras from config
         default_extras = self.config.get('default_extras',{})
         if default_extras:
@@ -1530,6 +1527,10 @@ def _set_package_dict_default_values(self, package_dict, harvest_object, context
                 elif isinstance(value, dict):
                     package_dict[key] = {k: v for k, v in value.items()}
 
+
+        # Fallback: Using schemingdcat config defaults if no default values are set
+        package_dict = self._apply_package_defaults_from_config(package_dict, DATASET_DEFAULT_FIELDS)
+
         # log.debug('package_dict default values: %s', package_dict)
         return package_dict