Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/composition cati #276

Merged
merged 1 commit into from
May 17, 2024
Merged

Fix/composition cati #276

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/main/java/fr/insee/pogues/webservice/rest/VisualizeWithURI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package fr.insee.pogues.webservice.rest;

import com.fasterxml.jackson.core.JsonProcessingException;
import fr.insee.pogues.transforms.PipeLine;
import fr.insee.pogues.transforms.visualize.PoguesJSONToPoguesJSONDeref;
import fr.insee.pogues.transforms.visualize.PoguesJSONToPoguesXML;
Expand All @@ -23,6 +24,7 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import javax.xml.bind.JAXBException;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.net.URI;
Expand Down Expand Up @@ -105,21 +107,22 @@ public ResponseEntity<String> visualizeFromBody(@RequestBody String request,
@PostMapping(path = "visualize-queen-telephone/{questionnaire}", consumes = MediaType.APPLICATION_JSON_VALUE)
@Operation(summary = "Get visualization URI CATI Queen from JSON serialized Pogues entity", description = "Get visualization URI CATI Queen from JSON serialized Pogues entity")
public ResponseEntity<String> visualizeCatiQueenFromBody(@RequestBody String request,
@PathVariable(value = "questionnaire") String questionnaireName) throws Exception {
@PathVariable(value = "questionnaire") String questionnaireName,
@RequestParam(name = "references", defaultValue = "false") Boolean ref) throws Exception {
PipeLine pipeline = new PipeLine();
Map<String, Object> params = new HashMap<>();
params.put("mode", "CATI");
params.put("needDeref", ref);
params.put("nomenclatureIds", SuggesterVisuTreatment.getNomenclatureIdsFromQuestionnaire(request));

try {
URI uri;
try {
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())
.transform();

uri = lunaticJSONToUriQueen.transform(output2Input(outputStream), params, questionnaireName.toLowerCase());
} catch (Exception e) {
log.error(e.getCause().getMessage());
Expand Down Expand Up @@ -186,7 +189,6 @@ public ResponseEntity<String> visualizeStromaeV2FromBody(@RequestBody String req
.transform();

uri = lunaticJSONToUriStromaeV2.transform(output2Input(outputStream), params, questionnaireName.toLowerCase());
log.info("uri computed :"+uri);
} catch (Exception e) {
log.error(e.getCause().getMessage());
throw new PoguesException(500, e.getCause().getClass().getSimpleName(), e.getCause().getMessage());
Expand Down