Hot fix WAI-939: survey submissions with empty answers blocking sync (b…

…eyondessential#3189)
beyondessential · Sep 9, 2021 · eb0ede5 · eb0ede5
1 parent 8b8ce14
commit eb0ede5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/packages/meditrak-app/app/assessment/actions/submitSurvey.js b/packages/meditrak-app/app/assessment/actions/submitSurvey.js
@@ -98,7 +98,7 @@ const processQuestions = async (dispatch, getState, database, userId, questions)
   const answers = getAnswers(getState());
   for (const question of questions) {
     const answer = answers[question.id];
-    if (answer === undefined) {
+    if (answer === undefined || answer === null || answer === '') {
       continue;
     }
 

diff --git a/packages/meditrak-app/ios/TupaiaMediTrak/Info.plist b/packages/meditrak-app/ios/TupaiaMediTrak/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.11.113</string>
+	<string>1.11.114</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>113</string>
+	<string>114</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/packages/meditrak-app/package.json b/packages/meditrak-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tupaia/meditrak-app",
-  "version": "1.11.113",
+  "version": "1.11.114",
   "private": true,
   "description": "Android and iOS app for surveying medical facilities",
   "repository": {

diff --git a/packages/meditrak-server/src/apiV2/postChanges.js b/packages/meditrak-server/src/apiV2/postChanges.js
@@ -182,8 +182,10 @@ const requiresSurveyResponseTranslation = (
   const answerTranslatorFields = Object.keys(answerTranslators);
   const { answers } = surveyResponseObject;
   if (Array.isArray(answers)) {
-    return answers.some(answer =>
-      Object.keys(answer).some(field => answerTranslatorFields.includes(field)),
+    return answers.some(
+      answer =>
+        answer.body === '' ||
+        Object.keys(answer).some(field => answerTranslatorFields.includes(field)),
     );
   }
 
@@ -200,6 +202,7 @@ const constructSurveyResponseTranslators = models => ({
   user_email: userEmail => translateUserEmailToIdAndAssessorName(models.user, userEmail),
   entity_code: entityCode => translateEntityCodeToId(models.entity, entityCode),
   survey_code: surveyCode => translateSurveyCodeToId(models.survey, surveyCode),
+  answers: answers => ({ answers: answers.filter(a => a.body !== '') }), // remove any empty answers
 });
 
 const constructAnswerTranslators = models => ({

diff --git a/packages/meditrak-server/src/apiV2/utilities/translateObjectFields.js b/packages/meditrak-server/src/apiV2/utilities/translateObjectFields.js
@@ -8,8 +8,8 @@ export const translateObjectFields = async (object, objectTranslators) => {
     Object.entries(object).map(async ([field, value]) => {
       if (objectTranslators[field]) {
         const newFields = await objectTranslators[field](value);
-        Object.entries(newFields).forEach(([newField, newValue]) => (object[newField] = newValue));
         delete object[field];
+        Object.entries(newFields).forEach(([newField, newValue]) => (object[newField] = newValue));
       }
     }),
   );