Merge pull request #361 from OpenDataServices/306-fix-titles-keyerror

flatten: Fix use of titles for sheet names, to avoid KeyError

Author: Bjwebb

CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.14.0] - 2020-09-29
+
+### Fixed
+
+- Fix use of titles for sheet names, to avoid KeyError when a field is missing from the schema
+
+### Changed
+
 - Include sheet name with duplicate heading warnings.
 
 ## [0.13.0] - 2020-09-09

flattentool/json_input.py

@@ -475,7 +475,11 @@ def parse_json_dict(
                                         sheet_key(sheet, parent_name + key + "/0/" + k)
                                     ] = "WARNING: More than one value supplied, consult the relevant sub-sheet for the data."
 
-                    if self.use_titles and self.schema_parser:
+                    if (
+                        self.use_titles
+                        and self.schema_parser
+                        and (parent_name, key,) in self.schema_parser.sub_sheet_titles
+                    ):
                         sub_sheet_name = self.schema_parser.sub_sheet_titles[
                             (parent_name, key,)
                         ]

flattentool/tests/test_input_SpreadsheetInput_unflatten_mulitplesheets.py

@@ -326,9 +326,18 @@
                 {"ROOT_ID": 1, "Identifier": 2, "Arr title:C title": "3",},
                 {"ROOT_ID": 1, "Identifier": 2, "Arr title:C title": "4",},
             ],
+            "arr_not_in_schema": [
+                {"ROOT_ID": 1, "Identifier": 2, "arr_not_in_schema/0/testD": "5",},
+                {"ROOT_ID": 1, "Identifier": 2, "arr_not_in_schema/0/testD": "6",},
+            ],
         },
         [
-            {"ROOT_ID": 1, "id": 2, "testArr": [{"testC": "3"}, {"testC": "4"},]},
+            {
+                "ROOT_ID": 1,
+                "id": 2,
+                "testArr": [{"testC": "3"}, {"testC": "4"},],
+                "arr_not_in_schema": [{"testD": "5"}, {"testD": "6"}],
+            },
             {"ROOT_ID": 1, "id": 3},
         ],
         [],

setup.py

@@ -12,7 +12,7 @@
 
 setup(
     name="flattentool",
-    version="0.13.0",
+    version="0.14.0",
     author="Open Data Services",
     author_email="[email protected]",
     packages=["flattentool"],