fix: ending survey didn't save into local database

InseeFrLab · Aug 22, 2024 · 9911e00 · 9911e00
1 parent 27ee274
commit 9911e00
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 16 deletions.
diff --git a/src/pages/end-survey/EndSurvey.tsx b/src/pages/end-survey/EndSurvey.tsx
@@ -29,7 +29,13 @@ import {
 import { getCurrentSurveyRootPage } from "service/orchestrator-service";
 import { isPwa } from "service/responsive";
 import { surveyReadOnly } from "service/survey-activity-service";
-import { getCurrentPage, initializeSurveysDatasCache, saveData, setValue } from "service/survey-service";
+import {
+    getCurrentPage,
+    initializeSurveysDatasCache,
+    saveData,
+    setLocalDatabase,
+    setValue,
+} from "service/survey-service";
 import { isReviewer } from "service/user-service";
 import { getSurveyIdFromUrl } from "utils/utils";
 
@@ -112,10 +118,18 @@ const EndSurveyPage = () => {
         if (!isDemoMode && navigator.onLine) {
             if (isReviewer()) {
                 return remotePutSurveyDataReviewer(idSurvey, stateData, surveyData.data)
+                    .then(() => {
+                        return setLocalDatabase(stateData, surveyData, idSurvey);
+                    })
                     .then(navToHome)
                     .catch(handleError);
             } else {
-                return remotePutSurveyData(idSurvey, surveyData).then(navToHome).catch(handleError);
+                return remotePutSurveyData(idSurvey, surveyData)
+                    .then(() => {
+                        return setLocalDatabase(stateData, surveyData, idSurvey);
+                    })
+                    .then(navToHome)
+                    .catch(handleError);
             }
         } else {
             return saveDataAndInit(surveyData, true);

diff --git a/src/service/api-service/putRemoteData.ts b/src/service/api-service/putRemoteData.ts
@@ -14,17 +14,22 @@ const requestPutSurveyData = (
     data: SurveyData,
     token?: string,
 ): Promise<SurveyData> => {
-    const collectedData = transformCollectedArray(data?.data?.COLLECTED);
-    if (data.data) {
-        data.data.COLLECTED = collectedData;
-        delete data.data.COLLECTED?.WEEKLYPLANNER;
-        delete data.data.stateData;
+    try {
+        const collectedData = transformCollectedArray(data?.data?.COLLECTED);
+        if (data?.data) {
+            data.data.COLLECTED = collectedData;
+        }
+    } catch (error) {
+        console.error("Error transforming collected data:", error);
     }
-    console.log("requestPutSurveyData", data);
+    const tempData = { ...data };
+    delete tempData.data.COLLECTED?.WEEKLYPLANNER;
+    delete tempData.data.stateData;
+    console.log("requestPutSurveyData", tempData);
     const stateData = data.stateData;
     const putLunaticData = axios.put(
         `${stromaeBackOfficeApiBaseUrl}api/survey-unit/${idSurvey}/data`,
-        data.data,
+        tempData.data,
         getHeader(stromaeBackOfficeApiBaseUrl, token),
     );
 
@@ -95,9 +100,19 @@ const requestPutDataReviewer = (
     token?: string,
 ): Promise<LunaticData> => {
     console.log("requestPutDataReviewer", data);
-    data.COLLECTED = transformCollectedArray(data?.COLLECTED);
+    try {
+        const collectedData = transformCollectedArray(data?.COLLECTED);
+        if (data) {
+            data.COLLECTED = collectedData;
+        }
+    } catch (error) {
+        console.error("Error transforming collected data:", error);
+    }
     //TODO: Find another solution to avoid ui problem
-    delete data.COLLECTED?.WEEKLYPLANNER;
+    const tempData = { ...data };
+    delete tempData.COLLECTED?.WEEKLYPLANNER;
+    delete tempData.stateData;
+    console.log("requestPutSurveyData", tempData);
     return new Promise<LunaticData>(resolve => {
         axios
             .put(

diff --git a/src/service/survey-service.ts b/src/service/survey-service.ts
@@ -920,15 +920,14 @@ const saveData = (
             if (isReviewerMode) {
                 return remotePutSurveyDataReviewer(idSurvey, stateData, data).then(() => {
                     stateData.date = Math.max(stateData.date, data.lastLocalSaveDate ?? 0);
-                    data.stateData = stateData;
                     data.lastRemoteSaveDate = stateData.date;
+                    data.stateData = stateData;
                     return setLocalDatabase(stateData, data, idSurvey);
                 });
             } else {
-                //TODO: TEMP: need to figure out why there is still a state data here
                 return remotePutSurveyData(idSurvey, surveyData).then(() => {
-                    data.stateData = stateData;
-                    return setLocalDatabase(stateData, data, idSurvey);
+                    //data.stateData = stateData;
+                    return setLocalDatabase(stateData, surveyData, idSurvey);
                 });
             }
         } else {
@@ -971,14 +970,14 @@ const saveDataLocally = (
         data = saveQualityScore(idSurvey, data);
     }
     data.stateData = stateData;
-    console.log("saveDataLocally");
     return setLocalDatabase(stateData, data, idSurvey);
 };
 
 const setLocalDatabase = (stateData: StateData, data: LunaticData, idSurvey: string) => {
     let oldDataSurvey = datas.get(idSurvey) ?? {};
     oldDatas.set(idSurvey, oldDataSurvey);
     setDataCache(idSurvey, data);
+    console.log("Set LocalDatabase stateData", data);
     return lunaticDatabase.save(idSurvey, data).then(() => {
         datas.set(idSurvey, data);
         addItemToSession(idSurvey, data);
@@ -1750,6 +1749,7 @@ export {
     saveData,
     saveDataLocally,
     saveDatas,
+    setLocalDatabase,
     saveReferentiels,
     setData,
     setValue,