Integration of the modelefiliere library

.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

@@ -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:

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar

.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

pom.xml

@@ -36,7 +36,7 @@
         <pitest.version>1.22.0</pitest.version>
         <pitest.junit.version>1.2.3</pitest.junit.version>
         <jackson.version>2.19.0</jackson.version>
-        <bpm.version>1.0.22</bpm.version>
+        <bpm.version>1.0.23</bpm.version>
     </properties>
     <dependencies>
         <dependency>
@@ -98,7 +98,11 @@
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
             <version>${springdoc.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>fr.insee</groupId>
+            <artifactId>modelefiliere</artifactId>
+            <version>2.1.0</version>
+        </dependency>
         <!-- XML libraries -->
         <!-- XML-XSLT with Saxon -->
         <dependency>

src/main/java/fr/insee/genesis/Constants.java

@@ -23,8 +23,7 @@ public class Constants {
     public static final String MONGODB_CONTEXTUAL_EXTERNAL_COLLECTION_NAME = "editedExternal";
     public static final String LOOP_NAME_PREFIX = "BOUCLE";
     public static final String MONGODB_RESPONSE_COLLECTION_NAME = "responses";
-    public static final String MONGODB_RESPONSE_RAW_COLLECTION_NAME = "lunaticjsondata";
-    public static final String MONGODB_VARIABLETYPE_COLLECTION_NAME = "variabletypes";
+    public static final String MONGODB_RAW_RESPONSES_COLLECTION_NAME = "rawResponses";
     public static final String VOLUMETRY_FOLDER_NAME = "genesis_volumetries";
     public static final String VOLUMETRY_FILE_SUFFIX = "_VOLUMETRY";
     public static final String VOLUMETRY_RAW_FILE_SUFFIX = "_RAW_VOLUMETRY";

src/main/java/fr/insee/genesis/controller/adapter/LunaticJsonAdapter.java

@@ -13,7 +13,7 @@ public class LunaticJsonAdapter {
 
     public SurveyUnitModel convert(LunaticJsonSurveyUnit su){
         return SurveyUnitModel.builder()
-                .questionnaireId(su.getQuestionnaireId())
+                .collectionInstrumentId(su.getQuestionnaireId())
                 .campaignId("")
                 .interrogationId(su.getInterrogationId())
                 .state(DataState.COLLECTED)

src/main/java/fr/insee/genesis/controller/adapter/LunaticXmlAdapter.java

@@ -69,7 +69,7 @@ public static List<SurveyUnitModel> convert(LunaticXmlSurveyUnit su, VariablesMa
      */
     private static SurveyUnitModel getStateDataFromSurveyUnit(LunaticXmlSurveyUnit su, VariablesMap variablesMap, String campaignId, DataState dataState, Mode mode) {
         SurveyUnitModel surveyUnitModel = SurveyUnitModel.builder()
-                .questionnaireId(su.getQuestionnaireModelId().toUpperCase())
+                .collectionInstrumentId(su.getQuestionnaireModelId().toUpperCase())
                 .campaignId(campaignId)
                 .interrogationId(su.getId())
                 .state(dataState)

src/main/java/fr/insee/genesis/controller/dto/ScheduleDto.java

@@ -8,6 +8,7 @@
 
 @Builder
 public record ScheduleDto (String surveyName,
+						   String collectionInstrumentId,
 						   LocalDateTime lastExecution,
 						   List<KraftwerkExecutionSchedule> kraftwerkExecutionScheduleList
 ){}

src/main/java/fr/insee/genesis/controller/dto/SurveyUnitSimplified.java

@@ -2,20 +2,28 @@
 
 import fr.insee.genesis.domain.model.surveyunit.VariableModel;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
+import fr.insee.modelefiliere.RawResponseDto;
 import lombok.Builder;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Builder
 @Data
 public class SurveyUnitSimplified {
 
-	private String questionnaireId;
+	private String collectionInstrumentId;
+	/**
+	 * @deprecated We will not receive this piece of information anymore
+	 */
+	@Deprecated(forRemoval = true, since =  "2026-01-01")
 	private String campaignId;
 	private String interrogationId;
-	private String surveyUnitId;
+	private String usualSurveyUnitId;
 	private Mode mode;
+	private LocalDateTime validationDate;
+	private RawResponseDto.QuestionnaireStateEnum questionnaireState;
 	private List<VariableModel> variablesUpdate;
 	private List<VariableModel> externalVariables;
 }

src/main/java/fr/insee/genesis/controller/dto/rawdata/CombinedRawDataDto.java

@@ -0,0 +1,13 @@
+package fr.insee.genesis.controller.dto.rawdata;
+
+import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
+
+import java.util.List;
+
+public record CombinedRawDataDto(
+        List<RawResponseModel> rawResponseModels,
+        List<LunaticJsonRawDataModel> lunaticRawDataModels
+) {
+}
+

src/main/java/fr/insee/genesis/controller/mappers/DataProcessingContextMapperDto.java

@@ -23,4 +23,13 @@ public List<ScheduleDto> dataProcessingContextListToScheduleDtoList(List<DataPro
         }
         return dtos;
     }
+
+    public DataProcessingContextModel scheduleDtoToDataProcessingContext (ScheduleDto schedule){
+        return DataProcessingContextModel.builder()
+                .partitionId(schedule.surveyName())
+                .collectionInstrumentId(schedule.collectionInstrumentId())
+                .lastExecution(schedule.lastExecution())
+                .kraftwerkExecutionScheduleList(schedule.kraftwerkExecutionScheduleList())
+                .build();
+    }
 }

src/main/java/fr/insee/genesis/controller/rest/CombinedRawDataController.java

@@ -0,0 +1,40 @@
+package fr.insee.genesis.controller.rest;
+
+import fr.insee.genesis.controller.dto.rawdata.CombinedRawDataDto;
+import fr.insee.genesis.domain.service.rawdata.CombinedRawDataService;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@Slf4j
+@Controller
+@RequestMapping(path = "/combined-raw-data" )
+@RequiredArgsConstructor
+public class CombinedRawDataController {
+
+    private static final String INTERROGATION_ID = "interrogationId";
+    private final CombinedRawDataService combinedRawDataService;
+
+
+    @Operation(summary = "Retrieve combined raw responses and Lunatic raw data for a given interrogationId")
+    @GetMapping
+    @PreAuthorize("hasAnyRole('ADMIN', 'USER_PLATINE')")
+    public ResponseEntity<CombinedRawDataDto> getCombinetRawData(
+            @RequestParam(INTERROGATION_ID) String interrogationId
+    ){
+        CombinedRawDataDto data = combinedRawDataService.getCombinedRawDataByInterrogationId(interrogationId);
+
+        if (data.rawResponseModels().isEmpty()) {
+            return ResponseEntity.notFound().build();
+        }
+
+        return ResponseEntity.ok(data);
+    }
+
+    }