Просмотр исходного кода

Merge branch 'feat/116540-117514-save-questionnaire-answer-when-failed-to-send' into feat/116540-117515-resend-questionnaire-answers-that-failed-to-send

Futa Arai 3 лет назад
Родитель
Сommit
dd86a30e92
1 измененных файлов с 22 добавлено и 12 удалено
  1. 22 12
      packages/app/src/server/routes/apiv3/questionnaire.ts

+ 22 - 12
packages/app/src/server/routes/apiv3/questionnaire.ts

@@ -94,12 +94,17 @@ module.exports = (crowi: Crowi): Router => {
         answeredAt: new Date(),
         answeredAt: new Date(),
       };
       };
 
 
-      await axios.post(`${growiQuestionnaireServerOrigin}/questionnaire-answer/proactive`, proactiveQuestionnaireAnswer)
-        .catch(async(err) => {
-          if (err.request != null) {
-            await ProactiveQuestionnaireAnswer.create(proactiveQuestionnaireAnswer);
-          }
-        });
+      try {
+        await axios.post(`${growiQuestionnaireServerOrigin}/questionnaire-answer/proactive`, proactiveQuestionnaireAnswer);
+      }
+      catch (err) {
+        if (err.request != null) {
+          await ProactiveQuestionnaireAnswer.create(proactiveQuestionnaireAnswer);
+        }
+        else {
+          throw err;
+        }
+      }
     };
     };
 
 
     const errors = validationResult(req);
     const errors = validationResult(req);
@@ -130,12 +135,17 @@ module.exports = (crowi: Crowi): Router => {
         answeredAt: new Date(),
         answeredAt: new Date(),
       };
       };
 
 
-      await axios.post(`${growiQuestionnaireServerOrigin}/questionnaire-answer`, questionnaireAnswer)
-        .catch(async(err) => {
-          if (err.request != null) {
-            await QuestionnaireAnswer.create(questionnaireAnswer);
-          }
-        });
+      try {
+        await axios.post(`${growiQuestionnaireServerOrigin}/questionnaire-answer`, questionnaireAnswer);
+      }
+      catch (err) {
+        if (err.request != null) {
+          await QuestionnaireAnswer.create(questionnaireAnswer);
+        }
+        else {
+          throw err;
+        }
+      }
     };
     };
 
 
     const errors = validationResult(req);
     const errors = validationResult(req);