Merge pull request #319 from kobotoolbox/properly-flatten-select_mult…

…iple_from_file Properly flatten select_multiple_from_file
kobotoolbox · Feb 6, 2024 · 3b6c89a · 3b6c89a
2 parents 569d8bf + a806e0d
commit 3b6c89a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/formpack/utils/flatten_content.py b/src/formpack/utils/flatten_content.py
@@ -251,6 +251,9 @@ def _flatten_survey_row(row):
                 row['type'] = '{} {} or_other'.format(_type, _list_name)
             else:
                 row['type'] = '{} {}'.format(_type, _list_name)
-        elif row['type'] == 'select_one_from_file' and 'file' in row:
+        elif (
+            row['type'] in ('select_one_from_file', 'select_multiple_from_file')
+            and 'file' in row
+        ):
             _file = row.pop('file')
             row['type'] = '{} {}'.format(_type, _file)
diff --git a/tests/test_utils_flatten_content.py b/tests/test_utils_flatten_content.py
@@ -107,16 +107,18 @@ def test_flatten_select_or_other():
     assert 'select_from_list_name' not in row0
 
 
-def test_flatten_select_one_from_file():
-    s1 = {
-        'survey': [
-            {'type': 'select_one_from_file', 'file': 'fruits.csv'}
-        ]
-    }
-    flatten_content(s1, in_place=True)
-    row0 = s1['survey'][0]
-    assert row0['type'] == 'select_one_from_file fruits.csv'
-    assert 'file' not in row0
+def test_flatten_select_x_from_file():
+    # Search terms: select_one_from_file, select_multiple_from_file
+    for x in 'one', 'multiple':
+        s1 = {
+            'survey': [
+                {'type': f'select_{x}_from_file', 'file': 'fruits.csv'}
+            ]
+        }
+        flatten_content(s1, in_place=True)
+        row0 = s1['survey'][0]
+        assert row0['type'] == f'select_{x}_from_file fruits.csv'
+        assert 'file' not in row0
 
 
 def test_flatten_select():