fix: Apply fix from #3, closes #3

open-contracting · Feb 6, 2025 · d4efb45 · d4efb45
1 parent 2338fe9
commit d4efb45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 40 deletions.
diff --git a/docs/make.bat b/docs/make.bat
diff --git a/nightingale/mapper.py b/nightingale/mapper.py
@@ -128,9 +128,6 @@ def transform_row(
         :param result: Existing result dictionary to update.
         :return: Transformed row dictionary.
         """
-        if array_counters is None:
-            array_counters = {}
-
         # XXX: some duplication in code present maybe refactoring needed
         def set_nested_value(nested_dict, keys, value, schema, add_new=False, append_once=False):
             value = self.map_codelist_value(keys, schema, codelists, value)
@@ -192,14 +189,16 @@ def set_nested_value(nested_dict, keys, value, schema, add_new=False, append_onc
                         # case for /parties/roles
                         set_nested_value(result, keys, value, flattened_schema, add_new=True, append_once=True)
                         continue
+                    elif array_counters is None:
+                        array_counters = {}
                     elif array_path in array_counters:
                         if add_new := is_new_array(array_counters, child_path, last_key_name, array_value, array_path):
                             array_counters[array_path] = array_value
                             set_nested_value(result, keys[:-1], {}, flattened_schema, add_new=add_new)
                     else:
                         if last_key_name == "id":
                             array_counters[array_path] = array_value
-                        set_nested_value(result, keys[:-1], [{}], flattened_schema)
+                            set_nested_value(result, keys[:-1], {}, flattened_schema, True)
 
                     current = result
                     for i, key in enumerate(keys[:-1]):
@@ -223,7 +222,7 @@ def set_nested_value(nested_dict, keys, value, schema, add_new=False, append_onc
     def shift_current_array(self, current, array_path, array_counters):
         if not current:
             current.append({})
-        return find_array_element_by_id(current, array_counters.get(array_path))
+        return find_array_element_by_id(current, array_counters.get(array_path) if array_counters else None)
 
     def make_release_id(self, curr_row: dict) -> None:
         """