feat: add new ENO transformation PoguesJSONToLunaticJSON (#314)

* feat: add new transformation PoguesJSONToLunaticJSON * bump: version to 4.8.2-SNAPSHOT
InseeFr · Oct 30, 2024 · a9b9d66 · a9b9d66
1 parent f7f91a1
commit a9b9d66
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
 	<groupId>fr.insee</groupId>
 	<artifactId>Pogues-BO</artifactId>
 	<packaging>jar</packaging>
-	<version>4.8.1</version>
+	<version>4.8.2-SNAPSHOT</version>
 	<name>Pogues-Back-Office</name>
 
 	<properties>

diff --git a/src/main/java/fr/insee/pogues/api/remote/eno/transforms/EnoClient.java b/src/main/java/fr/insee/pogues/api/remote/eno/transforms/EnoClient.java
@@ -28,6 +28,8 @@ public interface EnoClient {
 	String getDDITOLunaticJSON(String inputAsString, Map<String, Object> params) throws URISyntaxException, IOException, EnoException;
 
 	String getDDITOXForms(String inputAsString) throws URISyntaxException, IOException, EnoException;
+
+	String getJSONPoguesToLunaticJson(String inputAsString, Map<String, Object> params) throws URISyntaxException, IOException, EnoException;
 
 	void getParameters () throws Exception;
 

diff --git a/src/main/java/fr/insee/pogues/api/remote/eno/transforms/EnoClientImpl.java b/src/main/java/fr/insee/pogues/api/remote/eno/transforms/EnoClientImpl.java
@@ -15,7 +15,9 @@
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import org.springframework.web.util.UriComponentsBuilder;
 
+import java.io.IOException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
@@ -29,7 +31,11 @@ public class EnoClientImpl implements EnoClient{
     @Autowired
     private WebClient webClient;
 
-    private static final String BASE_PATH = "/questionnaire/DEFAULT";
+    private static String DEFAULT_CONTEXT = "DEFAULT";
+
+    private static final String DSFR_QUERY_PARAM = "dsfr";
+
+    private static final String BASE_PATH = "/questionnaire/" + DEFAULT_CONTEXT;
     private static final String MODE = "CAWI";
 
     public EnoClientImpl(WebClient webClient) {
@@ -63,7 +69,7 @@ public String getDDITOLunaticJSON(String inputAsString, Map<String, Object> para
         MultiValueMap<String,String> queryParams = new LinkedMultiValueMap<>();
         String modePathParam = params.get("mode") != null ? params.get("mode").toString() : MODE;
         String WSPath = BASE_PATH + "/lunatic-json/" + modePathParam;
-        queryParams.add("dsfr", Boolean.TRUE.equals(params.get("dsfr")) ? "true" : "false");
+        queryParams.add(DSFR_QUERY_PARAM, Boolean.TRUE.equals(params.get("dsfr")) ? "true" : "false");
         return callEnoApiWithParams(inputAsString, WSPath, queryParams);
     }
 
@@ -72,6 +78,19 @@ public String getDDITOXForms(String inputAsString) throws EnoException, PoguesEx
         return callEnoApi(inputAsString, BASE_PATH+"/xforms");
     }
 
+    @Override
+    public String getJSONPoguesToLunaticJson(String inputAsString, Map<String, Object> params) throws URISyntaxException, IOException, EnoException {
+        log.info("getJSONPoguesToLunaticJson - started");
+        MultiValueMap<String,String> queryParams = new LinkedMultiValueMap<>();
+        String modePathParam = params.get("mode") != null ? params.get("mode").toString() : MODE;
+        String WSPath = String.format("/questionnaire/pogues-2-lunatic/%s/%s",
+                DEFAULT_CONTEXT,
+                modePathParam);
+        log.info("WSPath : {} ",WSPath);
+        queryParams.add(DSFR_QUERY_PARAM, Boolean.TRUE.equals(params.get("dsfr")) ? "true" : "false");
+        return callEnoApiWithParams(inputAsString, WSPath, queryParams);
+    }
+
     @Override
     public String getDDIToODT (String inputAsString) throws EnoException, PoguesException {
         return callEnoApi(inputAsString, BASE_PATH+"/fodt");

diff --git a/src/main/java/fr/insee/pogues/transforms/visualize/eno/PoguesJSONToLunaticJSON.java b/src/main/java/fr/insee/pogues/transforms/visualize/eno/PoguesJSONToLunaticJSON.java
@@ -0,0 +1,6 @@
+package fr.insee.pogues.transforms.visualize.eno;
+
+import fr.insee.pogues.transforms.visualize.ModelTransformer;
+
+public interface PoguesJSONToLunaticJSON extends ModelTransformer {
+}
diff --git a/src/main/java/fr/insee/pogues/transforms/visualize/eno/PoguesJSONToLunaticJSONImpl.java b/src/main/java/fr/insee/pogues/transforms/visualize/eno/PoguesJSONToLunaticJSONImpl.java
@@ -0,0 +1,30 @@
+package fr.insee.pogues.transforms.visualize.eno;
+
+import fr.insee.pogues.api.remote.eno.transforms.EnoClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.util.Map;
+
+import static fr.insee.pogues.utils.IOStreamsUtils.inputStream2String;
+import static fr.insee.pogues.utils.IOStreamsUtils.string2BOAS;
+
+@Service
+public class PoguesJSONToLunaticJSONImpl implements PoguesJSONToLunaticJSON {
+
+    @Autowired
+    private EnoClient enoClient;
+
+    @Override
+    public ByteArrayOutputStream transform(InputStream inputStream, Map<String, Object> params, String surveyName) throws Exception {
+        String inputAsString = inputStream2String(inputStream);
+        String outputAsString = transform(inputAsString, params);
+        return string2BOAS(outputAsString);
+    }
+
+    private String transform(String inputAsString, Map<String, Object> params) throws Exception {
+        return enoClient.getJSONPoguesToLunaticJson(inputAsString, params);
+    }
+}
diff --git a/src/main/java/fr/insee/pogues/webservice/rest/VisualizeWithURI.java b/src/main/java/fr/insee/pogues/webservice/rest/VisualizeWithURI.java
@@ -5,6 +5,7 @@
 import fr.insee.pogues.transforms.visualize.PoguesJSONToPoguesXML;
 import fr.insee.pogues.transforms.visualize.eno.DDIToLunaticJSON;
 import fr.insee.pogues.transforms.visualize.eno.DDIToXForms;
+import fr.insee.pogues.transforms.visualize.eno.PoguesJSONToLunaticJSON;
 import fr.insee.pogues.transforms.visualize.eno.PoguesXMLToDDI;
 import fr.insee.pogues.transforms.visualize.uri.LunaticJSONToUriQueen;
 import fr.insee.pogues.transforms.visualize.uri.LunaticJSONToUriStromaeV2;
@@ -52,7 +53,7 @@ public class VisualizeWithURI {
     XFormsToURIStromaeV1 xformToUri;
 
     @Autowired
-    DDIToLunaticJSON ddiToLunaticJSON;
+    PoguesJSONToLunaticJSON poguesJSONToLunaticJSON;
 
     @Autowired
     LunaticJSONToUriQueen lunaticJSONToUriQueen;
@@ -69,8 +70,6 @@ public class VisualizeWithURI {
     @Autowired
     SuggesterVisuService suggesterVisuService;
 
-    private static final String CONTENT_DISPOSITION = HttpHeaders.CONTENT_DISPOSITION;
-
     @PostMapping(path = "visualize/{dataCollection}/{questionnaire}", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "Get visualization URI from JSON serialized Pogues entity", description = "dataCollection MUST refer to the name attribute owned by the nested DataCollectionObject")
     @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "JSON representation of the Pogues Model")
@@ -108,9 +107,7 @@ public ResponseEntity<String> visualizeCatiQueenFromBody(@RequestBody String req
         URI uri;
         ByteArrayOutputStream outputStream = pipeline.from(string2InputStream(request))
                 .map(jsonToJsonDeref::transform, params, questionnaireName.toLowerCase())
-                .map(jsonToXML::transform, params, questionnaireName.toLowerCase())
-                .map(poguesXMLToDDI::transform, params, questionnaireName.toLowerCase())
-                .map(ddiToLunaticJSON::transform, params, questionnaireName.toLowerCase())
+                .map(poguesJSONToLunaticJSON::transform, params, questionnaireName.toLowerCase())
                 .transform();
         uri = lunaticJSONToUriQueen.transform(output2Input(outputStream), params, questionnaireName.toLowerCase());
         return ResponseEntity.status(HttpStatus.OK).contentType(MediaType.TEXT_PLAIN).body(uri.toString());
@@ -129,9 +126,7 @@ public ResponseEntity<String> visualizeQueenFromBody(@RequestBody String request
         URI uri;
         ByteArrayOutputStream outputStream = pipeline.from(new ByteArrayInputStream(request.getBytes(StandardCharsets.UTF_8)))
                 .map(jsonToJsonDeref::transform, params, questionnaireName.toLowerCase())
-                .map(jsonToXML::transform, params, questionnaireName.toLowerCase())
-                .map(poguesXMLToDDI::transform, params, questionnaireName.toLowerCase())
-                .map(ddiToLunaticJSON::transform, params, questionnaireName.toLowerCase())
+                .map(poguesJSONToLunaticJSON::transform, params, questionnaireName.toLowerCase())
                 .transform();
         uri = lunaticJSONToUriQueen.transform(output2Input(outputStream), params, questionnaireName.toLowerCase());
         return ResponseEntity.status(HttpStatus.OK).contentType(MediaType.TEXT_PLAIN).body(uri.toString());
@@ -152,9 +147,7 @@ public ResponseEntity<String> visualizeStromaeV2FromBody(@RequestBody String req
         URI uri;
         ByteArrayOutputStream outputStream = pipeline.from(string2InputStream(request))
                 .map(jsonToJsonDeref::transform, params, questionnaireName.toLowerCase())
-                .map(jsonToXML::transform, params, questionnaireName.toLowerCase())
-                .map(poguesXMLToDDI::transform, params, questionnaireName.toLowerCase())
-                .map(ddiToLunaticJSON::transform, params, questionnaireName.toLowerCase())
+                .map(poguesJSONToLunaticJSON::transform, params, questionnaireName.toLowerCase())
                 .transform();
 
         uri = lunaticJSONToUriStromaeV2.transform(output2Input(outputStream), params, questionnaireName.toLowerCase());
@@ -176,9 +169,7 @@ public ResponseEntity<String> visualizeStromaeV3FromBody(@RequestBody String req
         URI uri;
         ByteArrayOutputStream outputStream = pipeline.from(string2InputStream(request))
                 .map(jsonToJsonDeref::transform, params, questionnaireName.toLowerCase())
-                .map(jsonToXML::transform, params, questionnaireName.toLowerCase())
-                .map(poguesXMLToDDI::transform, params, questionnaireName.toLowerCase())
-                .map(ddiToLunaticJSON::transform, params, questionnaireName.toLowerCase())
+                .map(poguesJSONToLunaticJSON::transform, params, questionnaireName.toLowerCase())
                 .transform();
         uri = lunaticJSONToUriStromaeV3.transform(output2Input(outputStream), params, questionnaireName.toLowerCase());
         return ResponseEntity.status(HttpStatus.OK).contentType(MediaType.TEXT_PLAIN).body(uri.toString());