apply sourcery comments

Author: Hans-christian

ckanext/gdi_userportal/helpers.py

@@ -21,15 +21,15 @@ def _ensure_data_dict(data: dict[str, Any] | None, package_id: str | None) -> di
     if data is not None:
         return data
 
-    if not package_id:
-        return {}
+    if package_id:
+        try:
+            return tk.get_action("package_show")(
+                {"ignore_auth": True}, {"id": package_id}
+            )
+        except (tk.ObjectNotFound, tk.NotAuthorized):
+            pass
 
-    try:
-        return tk.get_action("package_show")(
-            {"ignore_auth": True}, {"id": package_id}
-        )
-    except (tk.ObjectNotFound, tk.NotAuthorized):
-        return {}
+    return {}
 
 
 def _value_from_extras(data_dict: dict[str, Any], field_name: str) -> Any:
@@ -64,14 +64,10 @@ def _is_missing_value(value: Any) -> bool:
         return value.strip() == ""
 
     if isinstance(value, dict):
-        if not value:
-            return True
-        return all(_is_missing_value(v) for v in value.values())
+        return not value or all(_is_missing_value(v) for v in value.values())
 
     if isinstance(value, (list, tuple, set)):
-        if not value:
-            return True
-        return all(_is_missing_value(v) for v in value)
+        return not value or all(_is_missing_value(v) for v in value)
 
     return False
 

ckanext/gdi_userportal/logic/action/translation_utils.py

@@ -182,24 +182,7 @@ def replace_search_facets(data, translation_dict, lang):
 
 
 def _apply_translated_properties(data: Any, preferred_lang: str, fallback_lang: str = DEFAULT_FALLBACK_LANG):
-    if isinstance(data, dict):
-        for key, value in list(data.items()):
-            if isinstance(value, dict):
-                _apply_translated_properties(value, preferred_lang, fallback_lang)
-            elif isinstance(value, list):
-                data[key] = [
-                    _apply_translated_properties(item, preferred_lang, fallback_lang)
-                    if isinstance(item, (dict, list))
-                    else item
-                    for item in value
-                ]
-
-        for key, value in list(data.items()):
-            if key.endswith(TRANSLATED_SUFFIX) and isinstance(value, dict):
-                base_key = key[:-len(TRANSLATED_SUFFIX)]
-                data[base_key] = _select_translated_value(value, preferred_lang, fallback_lang)
-            elif key in LANGUAGE_VALUE_FIELDS and isinstance(value, dict):
-                data[key] = _select_translated_value(value, preferred_lang, fallback_lang)
+    if not isinstance(data, (dict, list)):
         return data
 
     if isinstance(data, list):
@@ -210,6 +193,24 @@ def _apply_translated_properties(data: Any, preferred_lang: str, fallback_lang:
             for item in data
         ]
 
+    for key, value in list(data.items()):
+        if isinstance(value, dict):
+            _apply_translated_properties(value, preferred_lang, fallback_lang)
+        elif isinstance(value, list):
+            data[key] = [
+                _apply_translated_properties(item, preferred_lang, fallback_lang)
+                if isinstance(item, (dict, list))
+                else item
+                for item in value
+            ]
+
+    for key, value in list(data.items()):
+        if key.endswith(TRANSLATED_SUFFIX) and isinstance(value, dict):
+            base_key = key[:-len(TRANSLATED_SUFFIX)]
+            data[base_key] = _select_translated_value(value, preferred_lang, fallback_lang)
+        elif key in LANGUAGE_VALUE_FIELDS and isinstance(value, dict):
+            data[key] = _select_translated_value(value, preferred_lang, fallback_lang)
+
     return data