Merge remote-tracking branch 'origin/devFixUsualSurveyUnitId' into dev/combined-rawdata

Author: Hajarel-moukh

.github/workflows/create-release.yaml

@@ -69,6 +69,9 @@ jobs:
           distribution: 'temurin'
           java-version: '21'
 
+      - name: install model filiere
+        run: mvn install:install-file -Dfile="$(pwd)/libs/modelefiliere-2.1.0.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.1.0 -Dpackaging=jar -DgeneratePom=true
+
       - name: Clone BPM
         uses: actions/checkout@v6
         with:

.github/workflows/docker.yaml

@@ -26,6 +26,9 @@ jobs:
           distribution: "temurin"
           java-version: "21"
 
+      - name: install model filiere
+        run: mvn install:install-file -Dfile="$(pwd)/libs/modelefiliere-2.1.0.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.1.0 -Dpackaging=jar -DgeneratePom=true
+
       - name: Clone BPM
         uses: actions/checkout@master
         with:

.github/workflows/maven.yml

@@ -12,7 +12,7 @@ on:
   push:
     branches: [ "main" ]
   pull_request:
-    branches: [ "main" ]
+    types: [opened, reopened, synchronize]
 
 jobs:
   build:
@@ -29,6 +29,9 @@ jobs:
         distribution: 'temurin'
         cache: maven
 
+    - name: install model filiere
+      run: mvn install:install-file -Dfile="$(pwd)/libs/modelefiliere-2.1.0.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.1.0 -Dpackaging=jar -DgeneratePom=true
+
     - name: Clone BPM
       uses: actions/checkout@master
       with:

.github/workflows/scheduled-version-update.yaml

@@ -85,6 +85,9 @@ jobs:
           fi
           echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
 
+      - name: install model filiere
+        run: mvn install:install-file -Dfile="$(pwd)/libs/modelefiliere-2.1.0.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.1.0 -Dpackaging=jar -DgeneratePom=true
+
       - name: Clone BPM
         uses: actions/checkout@master
         with:

.runtests/Unit tests GENESIS.run.xml

@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Unit tests GENESIS" type="JUnit" factoryName="JUnit">
+    <module name="genesis-api" />
+    <option name="PACKAGE_NAME" value="fr.insee.genesis" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="directory" />
+    <dir value="$PROJECT_DIR$/src/test/java/fr/insee/genesis" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
+## 2.0.0 [TODO]
+### Changed
+- Use filière model
+
 ## 1.13.0 [2025-12-04]
 ### Changed
 - New raw data process endpoint

libs/modelefiliere-2.1.0.jar

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.8</version>
+        <version>3.5.9</version>
     </parent>
 
     <properties>
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>fr.insee</groupId>
             <artifactId>modelefiliere</artifactId>
-            <version>2.0.0</version>
+            <version>2.1.0</version>
         </dependency>
         <dependency>
             <groupId>com.networknt</groupId>

pom.xml

@@ -237,15 +237,15 @@ public ResponseEntity<String> processJsonRawData(
         }
     }
 
-    @Operation(summary = "Process raw data of a questionnaire")
-    @PostMapping(path = "/responses/raw/lunatic-json/{collectionInstrumentId}/process")
+    @Operation(summary = "Process raw data of a questionnaire (old raw model)")
+    @PostMapping(path = "/responses/raw/lunatic-json/{questionnaireId}/process")
     @PreAuthorize("hasRole('SCHEDULER')")
     public ResponseEntity<String> processJsonRawData(
-            @PathVariable String collectionInstrumentId
+            @PathVariable String questionnaireId
     ) {
-        log.info("Try to process raw JSON datas for questionnaire {}",collectionInstrumentId);
+        log.info("Try to process raw JSON datas for questionnaire {}",questionnaireId);
         try {
-            DataProcessResult result = lunaticJsonRawDataApiPort.processRawData(collectionInstrumentId);
+            DataProcessResult result = lunaticJsonRawDataApiPort.processRawData(questionnaireId);
             return result.formattedDataCount() == 0 ?
                     ResponseEntity.ok("%d document(s) processed".formatted(result.dataCount()))
                     : ResponseEntity.ok("%d document(s) processed, including %d FORMATTED after data verification"

src/main/java/fr/insee/genesis/controller/rest/responses/RawResponseController.java

@@ -53,7 +53,11 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.stream.XMLStreamException;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -296,6 +300,7 @@ public ResponseEntity<SurveyUnitSimplified> getLatestByInterrogationOneObject(@R
                     "For a given id, the endpoint returns a document by collection mode (if there is more than one).")
     @PostMapping(path = "/simplified/by-list-interrogation-and-collection-instrument/latest")
     @PreAuthorize("hasRole('USER_KRAFTWERK')")
+    //TODO move logic and unit test to surveyUnitService (also extract some methods instead of multiple lambdas)
     public ResponseEntity<List<SurveyUnitSimplified>> getLatestForInterrogationListAndCollectionInstrument(
             @RequestParam("collectionInstrumentId") String collectionInstrumentId,
             @RequestBody List<InterrogationId> interrogationIds)
@@ -307,16 +312,20 @@ public ResponseEntity<List<SurveyUnitSimplified>> getLatestForInterrogationListA
             modes.forEach(mode -> {
                 List<VariableModel> outputVariables = new ArrayList<>();
                 List<VariableModel> outputExternalVariables = new ArrayList<>();
+                List<String> usualSurveyUnitIds = new ArrayList<>();
                 responses.stream().filter(rep -> rep.getMode().equals(mode)).forEach(response -> {
                     outputVariables.addAll(response.getCollectedVariables());
                     outputExternalVariables.addAll(response.getExternalVariables());
+                    if(response.getUsualSurveyUnitId() != null){
+                        usualSurveyUnitIds.add(response.getUsualSurveyUnitId());
+                    }
                 });
                 if (!outputVariables.isEmpty() || !outputExternalVariables.isEmpty()) {
                     results.add(SurveyUnitSimplified.builder()
                             .collectionInstrumentId(responses.getFirst().getCollectionInstrumentId())
                             .campaignId(responses.getFirst().getCampaignId())
-                            .interrogationId(responses.getFirst().getInterrogationId())
-                            .usualSurveyUnitId(responses.getFirst().getUsualSurveyUnitId())
+                            .interrogationId(interrogationId.getInterrogationId())
+                            .usualSurveyUnitId(!usualSurveyUnitIds.isEmpty() ? usualSurveyUnitIds.getFirst() : null)
                             .mode(mode)
                             .variablesUpdate(outputVariables)
                             .externalVariables(outputExternalVariables)