feat: combine default and default_from

DataShades · Oct 20, 2024 · 7fabb18 · 7fabb18
1 parent ea07550
commit 7fabb18
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/ckanext/transmute/logic/action/get.py b/ckanext/transmute/logic/action/get.py
@@ -90,15 +90,16 @@ def mutate_fields(data: dict[str, Any], definition: SchemaParser, root: str):
 
         value = data.get(field_name)
 
-        if field.default is not SENTINEL and not value:
-            data[field.name] = value = field.default
-
         if field.default_from and not value:
             data[field.name] = value = _default_from(data, field)
 
         if field.replace_from:
             data[field.name] = value = _replace_from(data, field)
 
+        # set static default **after** attempt to get default from the other field
+        if field.default is not SENTINEL and not value:
+            data[field.name] = value = field.default
+
         if field.value is not SENTINEL:
             if field.update:
                 if not isinstance(data[field.name], type(field.value)):