fix: missing array detection

open-contracting · Jun 14, 2024 · fb37a17 · fb37a17
1 parent c6c8616
commit fb37a17
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/nightingale/mapper.py b/nightingale/mapper.py
@@ -133,6 +133,8 @@ def set_nested_value(nested_dict, keys, value, schema, add_new=False):
                         nested_dict[-1][last_key] = []
                     nested_dict[-1][last_key].append(value)
                 else:
+                    if not nested_dict:
+                        nested_dict.append({})
                     nested_dict[-1][last_key] = value
             else:
                 if last_key in nested_dict:

diff --git a/nightingale/mapping/v1/config.py b/nightingale/mapping/v1/config.py
@@ -122,6 +122,11 @@ def read_schema_sheet(self):
             _, path, title, description, type, range, values, links, _, _ = row
             if not path:
                 continue
+            path = "/" + path
+
+            if path in schema and type == "object":
+                # this is a nested object inside arrray we are interested in parrent array path
+                continue
             schema[path] = {
                 "title": title,
                 "description": description,

diff --git a/tests/test_mapping_loader.py b/tests/test_mapping_loader.py
@@ -153,15 +153,15 @@ def test_read_schema_sheet(mock_load_workbook, mock_workbook, mock_config):
     schema = mapping.read_schema_sheet()
 
     expected_schema = {
-        "array_path": {
+        "/array_path": {
             "title": "title1",
             "description": "description1",
             "type": "array",
             "range": "range1",
             "values": "values1",
             "links": "links1",
         },
-        "path1": {
+        "/path1": {
             "title": "title2",
             "description": "description2",
             "type": "string",
@@ -463,8 +463,8 @@ def test_is_array_path(mock_load_workbook, mock_workbook, mock_config):
     mapping = Mapping(mock_config)
     mapping.schema = mapping.read_schema_sheet()
 
-    assert mapping.is_array_path("array_path") is True
-    assert mapping.is_array_path("path2") is False
+    assert mapping.is_array_path("/array_path") is True
+    assert mapping.is_array_path("/path2") is False
 
 
 if __name__ == "__main__":