feat: add new ENO transformation PoguesJSONToLunaticJSON #314

laurentC35 · 2024-08-20T14:29:09Z

fix: #182

github-actions · 2024-08-20T14:31:39Z

👋 Version 4.8.1-SNAPSHOT deployed on docker hub

github-actions · 2024-08-21T15:50:17Z

👋 Version 4.8.2-SNAPSHOT deployed on docker hub

nsenave

pas mal de refacto

nsenave · 2024-10-31T09:43:22Z

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>


should be 4.9.0 since its a feature

nsenave · 2024-10-31T09:53:27Z

src/main/java/fr/insee/pogues/api/remote/eno/transforms/EnoClientImpl.java

@@ -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");


"dsfr" est encore en dur dans params.get("dsfr")

peut-être une façon plus simple de cast le booléen en string qu'avec un ternaire

+ vérifier qu'on a bien ce qu'on veut si c'est null

à encadrer dans une méthode pour contrôler le truc

nsenave · 2024-10-31T09:57:57Z

src/main/java/fr/insee/pogues/api/remote/eno/transforms/EnoClientImpl.java

@@ -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");


peut-être que le log.info devrait être à un niveau plus élevé, log.debug ici ?

nsenave · 2024-10-31T09:59:47Z

src/main/java/fr/insee/pogues/api/remote/eno/transforms/EnoClientImpl.java

+        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",


nom de variable locale qui commence par une majuscule -> wsPath

nsenave · 2024-10-31T10:01:15Z

src/main/java/fr/insee/pogues/api/remote/eno/transforms/EnoClientImpl.java

+
+    private static final String DSFR_QUERY_PARAM = "dsfr";
+
+    private static final String BASE_PATH = "/questionnaire/" + DEFAULT_CONTEXT;
    private static final String MODE = "CAWI";


à renommer en CAWI_MODE ou qqch de plus explicite ?

nsenave · 2024-10-31T10:03:00Z

src/main/java/fr/insee/pogues/api/remote/eno/transforms/EnoClientImpl.java

+        String WSPath = String.format("/questionnaire/pogues-2-lunatic/%s/%s",
+                DEFAULT_CONTEXT,
+                modePathParam);
+        log.info("WSPath : {} ",WSPath);


log.debug ?

nsenave · 2024-10-31T10:09:13Z

src/main/java/fr/insee/pogues/transforms/visualize/eno/PoguesJSONToLunaticJSONImpl.java

+@Service
+public class PoguesJSONToLunaticJSONImpl implements PoguesJSONToLunaticJSON {
+
+    @Autowired


Remplacer les autorwired par un constructeur

NB : peut être fait avec un record

nsenave · 2024-10-31T10:13:30Z

src/main/java/fr/insee/pogues/transforms/visualize/eno/PoguesJSONToLunaticJSONImpl.java

+    private EnoClient enoClient;
+
+    @Override
+    public ByteArrayOutputStream transform(InputStream inputStream, Map<String, Object> params, String surveyName) throws Exception {


nsenave · 2024-10-31T10:14:14Z

src/main/java/fr/insee/pogues/webservice/rest/VisualizeWithURI.java

@@ -69,8 +70,6 @@ public class VisualizeWithURI {
    @Autowired
    SuggesterVisuService suggesterVisuService;

-    private static final String CONTENT_DISPOSITION = HttpHeaders.CONTENT_DISPOSITION;


nsenave · 2024-10-31T10:17:20Z

src/main/java/fr/insee/pogues/webservice/rest/VisualizeWithURI.java

-                .map(jsonToXML::transform, params, questionnaireName.toLowerCase())
-                .map(poguesXMLToDDI::transform, params, questionnaireName.toLowerCase())
-                .map(ddiToLunaticJSON::transform, params, questionnaireName.toLowerCase())
+                .map(poguesJSONToLunaticJSON::transform, params, questionnaireName.toLowerCase())


on pourrait passer null plutôt que le questionnaireName s'il ne sert pas dans la sous méthode

ou créer une nouvelle méthode map(Runable trunable, Map<String, Object> params) et utiliser celle là pour se préparer à virer celle avec le String questionnaireName

* feat: add new transformation PoguesJSONToLunaticJSON * bump: version to 4.8.2-SNAPSHOT

feat: add new transformation PoguesJSONToLunaticJSON

1798576

laurentC35 changed the title ~~feat: add new transformation PoguesJSONToLunaticJSON~~ feat: add new ENO transformation PoguesJSONToLunaticJSON Aug 20, 2024

laurentC35 added the deploy-snapshot To be used in PR to trigger snapshot deploy pipeline label Aug 20, 2024

github-actions bot removed the deploy-snapshot To be used in PR to trigger snapshot deploy pipeline label Aug 20, 2024

laurentC35 added 2 commits August 21, 2024 17:47

Merge branch 'main' into feat/#182

c0b1bb0

bump: version to 4.8.2-SNAPSHOT

883d09a

laurentC35 added the deploy-snapshot To be used in PR to trigger snapshot deploy pipeline label Aug 21, 2024

github-actions bot removed the deploy-snapshot To be used in PR to trigger snapshot deploy pipeline label Aug 21, 2024

RemiVerriez changed the base branch from main to next October 30, 2024 09:45

RemiVerriez requested a review from nsenave October 30, 2024 09:45

RemiVerriez self-assigned this Oct 30, 2024

RemiVerriez merged commit a9b9d66 into next Oct 30, 2024
7 checks passed

RemiVerriez deleted the feat/#182 branch October 30, 2024 09:46

FBibonne restored the feat/#182 branch October 31, 2024 09:52

nsenave reviewed Oct 31, 2024

View reviewed changes

FBibonne deleted the feat/#182 branch October 31, 2024 15:34

nsenave pushed a commit that referenced this pull request Nov 13, 2024

feat: add new ENO transformation PoguesJSONToLunaticJSON (#314)

923e68e

* feat: add new transformation PoguesJSONToLunaticJSON * bump: version to 4.8.2-SNAPSHOT

nsenave mentioned this pull request Nov 15, 2024

Refactor in Pogues to Lunatic classes #325

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add new ENO transformation PoguesJSONToLunaticJSON #314

feat: add new ENO transformation PoguesJSONToLunaticJSON #314

laurentC35 commented Aug 20, 2024 •

edited

Loading

github-actions bot commented Aug 20, 2024

github-actions bot commented Aug 21, 2024

nsenave left a comment

nsenave Oct 31, 2024

nsenave Oct 31, 2024

nsenave Oct 31, 2024

nsenave Oct 31, 2024

nsenave Oct 31, 2024

nsenave Oct 31, 2024

nsenave Oct 31, 2024

nsenave Oct 31, 2024

nsenave Oct 31, 2024

nsenave Oct 31, 2024

nsenave Oct 31, 2024

nsenave Oct 31, 2024

nsenave Oct 31, 2024

feat: add new ENO transformation PoguesJSONToLunaticJSON #314

feat: add new ENO transformation PoguesJSONToLunaticJSON #314

Conversation

laurentC35 commented Aug 20, 2024 • edited Loading

github-actions bot commented Aug 20, 2024

github-actions bot commented Aug 21, 2024

nsenave left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

laurentC35 commented Aug 20, 2024 •

edited

Loading