refactor: new survey-unit endpoints

InseeFrLab · Jul 5, 2024 · 1404bb1 · 1404bb1
1 parent a70dbed
commit 1404bb1
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 20 deletions.
diff --git a/src/service/api-service.ts b/src/service/api-service.ts
@@ -191,25 +191,35 @@ const requestPutSurveyData = (
     data: SurveyData,
     token?: string,
 ): Promise<SurveyData> => {
-    const lunaticData = token ? transformCollectedArray(data.data?.COLLECTED) : data.data?.COLLECTED;
+    console.log("data", data);
+    const collectedData = token ? transformCollectedArray(data.data?.COLLECTED) : data.data?.COLLECTED;
+    if (data.data) {
+        data.data.COLLECTED = collectedData;
+    }
+
     if (token) {
         console.log("lunaticData has been converted");
     }
-    const surveyData: SurveyData = {
-        data: lunaticData,
-        stateData: data.stateData,
-    };
-    return new Promise(resolve => {
-        axios
-            .put(
-                stromaeBackOfficeApiBaseUrl + "api/survey-unit/" + idSurvey,
-                surveyData,
-                getHeader(stromaeBackOfficeApiBaseUrl, token),
-            )
-            .then(() => {
-                return resolve(data);
-            });
-    });
+    const stateData = data.stateData;
+    const putLunaticData = axios.put(
+        `${stromaeBackOfficeApiBaseUrl}api/survey-unit/${idSurvey}/data`,
+        data,
+        getHeader(stromaeBackOfficeApiBaseUrl, token),
+    );
+
+    const putStateData = axios.put(
+        `${stromaeBackOfficeApiBaseUrl}api/survey-unit/${idSurvey}/state-data`,
+        stateData,
+        getHeader(stromaeBackOfficeApiBaseUrl, token),
+    );
+
+    return Promise.all([putLunaticData, putStateData])
+        .then(() => {
+            return data;
+        })
+        .catch(error => {
+            throw error;
+        });
 };
 
 const remotePutSurveyData = (idSurvey: string, data: SurveyData): Promise<SurveyData> => {
@@ -349,7 +359,7 @@ const remoteGetSurveyData = (
     return new Promise(resolve => {
         axios
             .get(
-                stromaeBackOfficeApiBaseUrl + "api/survey-unit/" + idSurvey,
+                stromaeBackOfficeApiBaseUrl + "api/survey-unit/" + idSurvey + "/data",
                 getHeader(stromaeBackOfficeApiBaseUrl),
             )
             .then(response => {

diff --git a/src/service/survey-service.ts b/src/service/survey-service.ts
@@ -480,7 +480,7 @@ const initializeSurveysIdsDataModeReviewer = (
     });
 };
 
-const initializeData = (remoteSurveyData: SurveyData, surveyId: string) => {
+const initializeData = (remoteSurveyData: SurveyData, idSurvey: string) => {
     const regexp = new RegExp(process.env.REACT_APP_HOUSE_REFERENCE_REGULAR_EXPRESSION || "");
     let surveyData: LunaticData = {
         COLLECTED: {},
@@ -490,10 +490,10 @@ const initializeData = (remoteSurveyData: SurveyData, surveyId: string) => {
         id: "",
         lastLocalSaveDate: Date.now(),
     };
-    surveyData.houseReference = surveyId?.replace(regexp, "");
+    surveyData.houseReference = idSurvey?.replace(regexp, "");
     surveyData.CALCULATED = {};
     surveyData.EXTERNAL = {};
-    surveyData.COLLECTED = remoteSurveyData.data?.COLLECTED ?? getDataEmpty(surveyId);
+    surveyData.COLLECTED = remoteSurveyData.data?.COLLECTED ?? getDataEmpty(idSurvey);
     surveyData.lastLocalSaveDate =
         remoteSurveyData.data?.lastLocalSaveDate ?? remoteSurveyData.data.stateData?.date;
     surveyData.stateData = remoteSurveyData.stateData;