From 28d2990b2f7f162513cce5142112f76d091880d5 Mon Sep 17 00:00:00 2001
From: Kelvin Muchiri <kelvinmuchiri63@gmail.com>
Date: Fri, 21 Jul 2023 10:21:05 +0300
Subject: [PATCH] Fix AttributeError: 'NoneType' object has no attribute
 'strip' when exporting form data (#2453)

* fix bug when exporting SAV

fix bug AttributeError: 'NoneType' object has no attribute 'strip'.

* enhance test

* refactor code

* update docstring
---
 .../childrens_survey_sw_missing_en_label.xlsx | Bin 0 -> 9127 bytes
 .../libs/tests/utils/test_export_builder.py   |  50 ++++++++
 onadata/libs/utils/export_builder.py          | 113 +++++++++++-------
 3 files changed, 121 insertions(+), 42 deletions(-)
 create mode 100644 onadata/apps/logger/tests/fixtures/childrens_survey_sw_missing_en_label.xlsx

diff --git a/onadata/apps/logger/tests/fixtures/childrens_survey_sw_missing_en_label.xlsx b/onadata/apps/logger/tests/fixtures/childrens_survey_sw_missing_en_label.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..9b5461ef07b3e5aa43badcff9450e7fc126606a4
GIT binary patch
literal 9127
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

literal 0
HcmV?d00001

diff --git a/onadata/libs/tests/utils/test_export_builder.py b/onadata/libs/tests/utils/test_export_builder.py
index 0363ba2386..2119672e76 100644
--- a/onadata/libs/tests/utils/test_export_builder.py
+++ b/onadata/libs/tests/utils/test_export_builder.py
@@ -2050,6 +2050,56 @@ def _test_sav_file(section):
             section_name = section["name"].replace("/", "_")
             _test_sav_file(section_name)
 
+    def test_export_zipped_zap_missing_en_label(self):
+        """Blank language label defaults to label for default language"""
+        survey = create_survey_from_xls(
+            _logger_fixture_path("childrens_survey_sw_missing_en_label.xlsx"),
+            default_name="childrens_survey_sw",
+        )
+        # default_language is set to swahili
+        self.assertEqual(survey.to_json_dict().get("default_language"), "swahili")
+        export_builder = ExportBuilder()
+        export_builder.TRUNCATE_GROUP_TITLE = True
+        export_builder.INCLUDE_LABELS = True
+        # export to be in english
+        export_builder.language = "english"
+        export_builder.set_survey(survey)
+
+        with NamedTemporaryFile(suffix=".zip") as temp_zip_file:
+            filename = temp_zip_file.name
+            export_builder.to_zipped_sav(filename, self.data)
+            temp_zip_file.seek(0)
+            temp_dir = tempfile.mkdtemp()
+            with zipfile.ZipFile(temp_zip_file.name, "r") as zip_file:
+                zip_file.extractall(temp_dir)
+
+        # check that each file exists
+        self.assertTrue(os.path.exists(os.path.join(temp_dir, f"{survey.name}.sav")))
+        checks = 0
+
+        for section in export_builder.sections:
+            section_name = section["name"]
+
+            if section_name == "childrens_survey_sw":
+                # Default swahili label is used incase english label is missing for question
+                result = filter(
+                    lambda question: question["label"] == "1. Jina lako ni?",
+                    section["elements"],
+                )
+                self.assertEqual(len(list(result)), 1)
+                checks += 1
+
+            if section_name == "children":
+                # Default swahili label is used incase english label is missing for choice
+                result = filter(
+                    lambda choice: choice["label"] == "fav_colors/Nyekundu",
+                    section["elements"],
+                )
+                self.assertEqual(len(list(result)), 1)
+                checks += 1
+
+        self.assertEqual(checks, 2)
+
     # pylint: disable=invalid-name
     def test_generate_field_title_truncated_titles(self):
         self._create_childrens_survey()
diff --git a/onadata/libs/utils/export_builder.py b/onadata/libs/utils/export_builder.py
index d69ef03f9e..705a079c81 100644
--- a/onadata/libs/utils/export_builder.py
+++ b/onadata/libs/utils/export_builder.py
@@ -22,26 +22,46 @@
 from six import iteritems
 
 from onadata.apps.logger.models.osmdata import OsmData
-from onadata.apps.logger.models.xform import (QUESTION_TYPES_TO_EXCLUDE,
-                                              _encode_for_mongo)
+from onadata.apps.logger.models.xform import (
+    QUESTION_TYPES_TO_EXCLUDE,
+    _encode_for_mongo,
+)
 from onadata.apps.viewer.models.data_dictionary import DataDictionary
-from onadata.libs.utils.common_tags import (ATTACHMENTS, BAMBOO_DATASET_ID,
-                                            DELETEDAT, DURATION, GEOLOCATION,
-                                            ID, INDEX, MULTIPLE_SELECT_TYPE,
-                                            NOTES, PARENT_INDEX,
-                                            PARENT_TABLE_NAME,
-                                            REPEAT_INDEX_TAGS, REVIEW_COMMENT,
-                                            REVIEW_DATE, REVIEW_STATUS,
-                                            SAV_255_BYTES_TYPE,
-                                            SAV_NUMERIC_TYPE, SELECT_BIND_TYPE,
-                                            SELECT_ONE, STATUS,
-                                            SUBMISSION_TIME, SUBMITTED_BY,
-                                            TAGS, UUID, VERSION,
-                                            XFORM_ID_STRING)
-from onadata.libs.utils.common_tools import (get_choice_label,
-                                             get_choice_label_value,
-                                             get_value_or_attachment_uri,
-                                             str_to_bool, track_task_progress)
+from onadata.libs.utils.common_tags import (
+    ATTACHMENTS,
+    BAMBOO_DATASET_ID,
+    DELETEDAT,
+    DURATION,
+    GEOLOCATION,
+    ID,
+    INDEX,
+    MULTIPLE_SELECT_TYPE,
+    NOTES,
+    PARENT_INDEX,
+    PARENT_TABLE_NAME,
+    REPEAT_INDEX_TAGS,
+    REVIEW_COMMENT,
+    REVIEW_DATE,
+    REVIEW_STATUS,
+    SAV_255_BYTES_TYPE,
+    SAV_NUMERIC_TYPE,
+    SELECT_BIND_TYPE,
+    SELECT_ONE,
+    STATUS,
+    SUBMISSION_TIME,
+    SUBMITTED_BY,
+    TAGS,
+    UUID,
+    VERSION,
+    XFORM_ID_STRING,
+)
+from onadata.libs.utils.common_tools import (
+    get_choice_label,
+    get_choice_label_value,
+    get_value_or_attachment_uri,
+    str_to_bool,
+    track_task_progress,
+)
 from onadata.libs.utils.mongo import _decode_from_mongo, _is_invalid_for_mongo
 
 # the bind type of select multiples that we use to compare
@@ -100,7 +120,7 @@ def dict_to_joined_export(data, index, indices, name, survey, row, media_xpaths=
     media_xpaths = [] if media_xpaths is None else media_xpaths
     # pylint: disable=too-many-nested-blocks
     if isinstance(data, dict):
-        for (key, val) in iteritems(data):
+        for key, val in iteritems(data):
             if isinstance(val, list) and key not in [NOTES, ATTACHMENTS, TAGS]:
                 output[key] = []
                 for child in val:
@@ -118,7 +138,7 @@ def dict_to_joined_export(data, index, indices, name, survey, row, media_xpaths=
                     }
                     # iterate over keys within new_output and append to
                     # main output
-                    for (out_key, out_val) in iteritems(new_output):
+                    for out_key, out_val in iteritems(new_output):
                         if isinstance(out_val, list):
                             if out_key not in output:
                                 output[out_key] = []
@@ -202,7 +222,7 @@ def decode_mongo_encoded_section_names(data):
     :param data: A dictionary to decode.
     """
     results = {}
-    for (k, v) in iteritems(data):
+    for k, v in iteritems(data):
         new_v = v
         if isinstance(v, dict):
             new_v = decode_mongo_encoded_section_names(v)
@@ -351,10 +371,19 @@ def format_field_title(
         return title
 
     def get_choice_label_from_dict(self, label):
-        """Returns the choice label for the default language."""
+        """Returns the choice label for the default language
+
+        If a label for the target language is blank then the default
+        language is used
+        """
         if isinstance(label, dict):
-            language = self.get_default_language(list(label))
-            label = label.get(self.language or language)
+            default_language = self.get_default_language(list(label))
+            default_label = label.get(default_language)
+
+            if self.language:
+                return label.get(self.language, default_label)
+
+            return default_label
 
         return label
 
@@ -475,7 +504,7 @@ def build_sections(
                         )
                 elif isinstance(child, Question) and (
                     child.bind.get("type") not in QUESTION_TYPES_TO_EXCLUDE
-                    and child.type not in QUESTION_TYPES_TO_EXCLUDE
+                    and child.type not in QUESTION_TYPES_TO_EXCLUDE  # noqa W503
                 ):
                     # add to survey_sections
                     if isinstance(child, Question):
@@ -490,7 +519,7 @@ def build_sections(
                             data_dicionary.get_label(
                                 child_xpath, elem=child, language=language
                             )
-                            or _title
+                            or _title  # noqa W503
                         )
                         current_section["elements"].append(
                             {
@@ -511,7 +540,7 @@ def build_sections(
                     # if its a select multiple, make columns out of its choices
                     if (
                         child.bind.get("type") == SELECT_BIND_TYPE
-                        and child.type == MULTIPLE_SELECT_TYPE
+                        and child.type == MULTIPLE_SELECT_TYPE  # noqa W503
                     ):
                         choices = []
                         if self.SPLIT_SELECT_MULTIPLES:
@@ -590,7 +619,7 @@ def build_sections(
                         )
                     if (
                         child.bind.get("type") == SELECT_BIND_TYPE
-                        and child.type == SELECT_ONE
+                        and child.type == SELECT_ONE  # noqa W503
                     ):
                         _append_xpaths_to_section(
                             current_section_name,
@@ -679,7 +708,7 @@ def split_select_multiples(
         :return: the row dict with select multiples choice as fields in the row
         """
         # for each select_multiple, get the associated data and split it
-        for (xpath, choices) in iteritems(select_multiples):
+        for xpath, choices in iteritems(select_multiples):
             # get the data matching this xpath
             data = row.get(xpath) and str(row.get(xpath))
             selections = []
@@ -738,7 +767,7 @@ def split_select_multiples(
     def split_gps_components(cls, row, gps_fields):
         """Splits GPS components into their own fields."""
         # for each gps_field, get associated data and split it
-        for (xpath, gps_components) in iteritems(gps_fields):
+        for xpath, gps_components in iteritems(gps_fields):
             data = row.get(xpath)
             if data:
                 gps_parts = data.split()
@@ -749,7 +778,7 @@ def split_gps_components(cls, row, gps_fields):
     @classmethod
     def decode_mongo_encoded_fields(cls, row, encoded_fields):
         """Update encoded fields with their corresponding xpath"""
-        for (xpath, encoded_xpath) in iteritems(encoded_fields):
+        for xpath, encoded_xpath in iteritems(encoded_fields):
             if row.get(encoded_xpath):
                 val = row.pop(encoded_xpath)
                 row.update({xpath: val})
@@ -819,8 +848,8 @@ def pre_process_row(self, row, section):
             value = row.get(elm["xpath"])
             if (
                 elm["type"] in ExportBuilder.TYPES_TO_CONVERT
-                and value is not None
-                and value != ""
+                and value is not None  # noqa W503
+                and value != ""  # noqa W503
             ):
                 row[elm["xpath"]] = ExportBuilder.convert_type(value, elm["type"])
 
@@ -932,7 +961,7 @@ def write_row(row, csv_writer, fields):
 
         # write zipfile
         with ZipFile(path, "w", ZIP_DEFLATED, allowZip64=True) as zip_file:
-            for (section_name, csv_def) in iteritems(csv_defs):
+            for section_name, csv_def in iteritems(csv_defs):
                 csv_file = csv_def["csv_file"]
                 csv_file.seek(0)
                 zip_file.write(
@@ -940,7 +969,7 @@ def write_row(row, csv_writer, fields):
                 )
 
         # close files when we are done
-        for (section_name, csv_def) in iteritems(csv_defs):
+        for section_name, csv_def in iteritems(csv_defs):
             csv_def["csv_file"].close()
 
     @classmethod
@@ -1150,7 +1179,7 @@ def _get_sav_value_labels(self, xpath_var_names=None):
         for question in choice_questions:
             if (
                 xpath_var_names
-                and question.get_abbreviated_xpath() not in xpath_var_names
+                and question.get_abbreviated_xpath() not in xpath_var_names  # noqa W503
             ):
                 continue
             var_name = (
@@ -1293,7 +1322,7 @@ def _get_element_type(element_xpath):
                 )
                 for element in elements
             ]
-            + [
+            + [  # noqa W503
                 (
                     _var_types[item],
                     SAV_NUMERIC_TYPE
@@ -1302,7 +1331,7 @@ def _get_element_type(element_xpath):
                 )
                 for item in self.extra_columns
             ]
-            + [
+            + [  # noqa W503
                 (
                     x[1],
                     SAV_NUMERIC_TYPE
@@ -1400,12 +1429,12 @@ def write_row(row, sav_writer, fields):
             index += 1
             track_task_progress(i, total_records)
 
-        for (section_name, sav_def) in iteritems(sav_defs):
+        for section_name, sav_def in iteritems(sav_defs):
             sav_def["sav_writer"].closeSavFile(sav_def["sav_writer"].fh, mode="wb")
 
         # write zipfile
         with ZipFile(path, "w", ZIP_DEFLATED, allowZip64=True) as zip_file:
-            for (section_name, sav_def) in iteritems(sav_defs):
+            for section_name, sav_def in iteritems(sav_defs):
                 sav_file = sav_def["sav_file"]
                 sav_file.seek(0)
                 zip_file.write(
@@ -1413,7 +1442,7 @@ def write_row(row, sav_writer, fields):
                 )
 
         # close files when we are done
-        for (section_name, sav_def) in iteritems(sav_defs):
+        for section_name, sav_def in iteritems(sav_defs):
             sav_def["sav_file"].close()
 
     def get_fields(self, dataview, section, key):