[#90] Match identifiers correctly when their type has changed

e.g. schema says string, input is integer, output is string. Previously
merging would break in this case.

Author: Bjwebb

flattentool/input.py

@@ -167,7 +167,7 @@ def unflatten(self):
                 root_id_or_none = line[self.root_id] if self.root_id else None
                 unflattened = unflatten_main_with_parser(self.parser, line, self.timezone)
                 try:
-                    merge(main_sheet_by_ocid[root_id_or_none][line.get('id')], unflattened)
+                    merge(main_sheet_by_ocid[root_id_or_none][unflattened.get('id')], unflattened)
                 except KeyError:
                     pass
                     # FIXME add an appropriate warning here

flattentool/tests/test_input_SpreadsheetInput_unflatten_mulitplesheets.py

@@ -486,3 +486,58 @@ def test_basic_two_sub_sheets(self):
                 ]
             }
         ]
+
+
+from flattentool.schema import SchemaParser
+
+def test_with_schema():
+    spreadsheet_input = ListInput(
+        sheets={
+            'custom_main': [
+                {
+                    'ocid': 1,
+                    'id': 2,
+                    'testA': 3
+                }
+            ],
+            'sub': [
+                {
+                    'ocid': 1,
+                    'id': 2,
+                    'testR/testB': 4 # test that we can infer this an array from schema
+                }
+            ]
+        },
+        main_sheet_name='custom_main')
+    spreadsheet_input.read_sheets()
+
+    parser = SchemaParser(
+        root_schema_dict={
+            'properties': {
+                'id': {
+                    'type': 'string',
+                },
+                'testR': {
+                    'type': 'array',
+                    'items': {
+                        'type': 'object'
+                    }
+                },
+            }
+        },
+        main_sheet_name='custom_main',
+        root_id='ocid',
+        rollup=True
+    )
+    parser.parse()
+    spreadsheet_input.parser = parser
+    assert list(spreadsheet_input.unflatten()) == [{
+        'ocid': 1,
+        'id': '2', # check that we join correctly when this gets converted to a
+                   # string because of the schema type
+        'testA': 3,
+        'testR': [{
+            'testB': 4
+        }]
+    }]
+