From 4e3b4f491bd751069c86f8c7c66f1554dbd18cb7 Mon Sep 17 00:00:00 2001 From: MailineN Date: Fri, 5 Jul 2024 10:25:02 +0200 Subject: [PATCH] refactor: new survey-unit endpoints --- src/service/api-service.ts | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src/service/api-service.ts b/src/service/api-service.ts index ee28afc1..a1f18237 100644 --- a/src/service/api-service.ts +++ b/src/service/api-service.ts @@ -195,21 +195,26 @@ const requestPutSurveyData = ( 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`, + lunaticData, + 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 => { @@ -349,7 +354,7 @@ const remoteGetSurveyData = ( return new Promise(resolve => { axios .get( - stromaeBackOfficeApiBaseUrl + "api/survey-unit/" + idSurvey, + stromaeBackOfficeApiBaseUrl + "api/survey-unit/" + idSurvey + "/data", getHeader(stromaeBackOfficeApiBaseUrl), ) .then(response => {