Merge branch 'main' into fixProcessRawData

Author: alexisszmundy

.github/workflows/create-release.yaml

@@ -41,7 +41,7 @@ jobs:
       - name: Print source version
         run: echo ${{ steps.version-step.outputs.newTag }}
 
-      - uses: mukunku/tag-exists-action@v1.6.0
+      - uses: mukunku/tag-exists-action@v1.7.0
         name: Check tag existence
         id: check-tag-exists
         with:
@@ -63,12 +63,16 @@ jobs:
     needs: check-version
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v6
       - name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
           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:
@@ -89,7 +93,7 @@ jobs:
           mvn package --no-transfer-progress
 
       - name: Upload app jar
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: app-jar
           path: target/*.jar
@@ -165,7 +169,7 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: Download uploaded jar
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: app-jar
           path: target/

.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:
@@ -42,7 +45,7 @@ jobs:
         run: mvn package --no-transfer-progress
 
       - name: Upload API jar
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: app-jar
           path: target/*.jar
@@ -55,7 +58,7 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: Download uploaded jar
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: app-jar
           path: target/

.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,10 @@ jobs:
           fi
           echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
 
+      - name: install model filiere
+        run: |
+          mvn install:install-file -Dfile="$(pwd)/genesis/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:
@@ -173,7 +177,7 @@ jobs:
 
       - name: Create Pull Request
         id: create_pr
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           path: genesis
           token: ${{ secrets.GITHUB_TOKEN }}

.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,12 @@
 # Changelog
+## 2.0.1 [TODO]
+### Fixed
+- Crash when get questionnaireIds by null processDate with too much raw datas in lunaticjsondata
+ 
+## 2.0.0 [2026-01-07]
+### Changed
+- Use filière model
+
 ## 1.13.0 [2025-12-04]
 ### Changed
 - New raw data process endpoint

libs/modelefiliere-2.1.0.jar

@@ -4,21 +4,21 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fr.insee.genesis</groupId>
     <artifactId>genesis-api</artifactId>
-    <version>1.13.0</version>
+    <version>2.0.0</version>
     <packaging>jar</packaging>
     <name>genesis-api</name>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.8</version>
+        <version>3.5.9</version>
     </parent>
 
     <properties>
         <java.version>21</java.version>
-        <springdoc.version>2.8.14</springdoc.version>
+        <springdoc.version>2.8.15</springdoc.version>
         <mapstruct.version>1.6.3</mapstruct.version>
-        <cucumber.version>7.32.0</cucumber.version>
+        <cucumber.version>7.33.0</cucumber.version>
         <junit-jupiter.version>5.13.4</junit-jupiter.version>
 
         <!-- Proprietes sonar -->
@@ -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.20</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>
@@ -111,7 +115,7 @@
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>json-schema-validator</artifactId>
-            <version>2.0.0</version>
+            <version>2.0.1</version>
         </dependency>
 
         <!-- generate implementation auto -->
@@ -173,7 +177,7 @@
                 <plugin>
                     <groupId>org.sonarsource.scanner.maven</groupId>
                     <artifactId>sonar-maven-plugin</artifactId>
-                    <version>5.4.0.6343</version>
+                    <version>5.5.0.6356</version>
                 </plugin>
                 <plugin>
                     <groupId>org.jacoco</groupId>

pom.xml

@@ -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";
@@ -60,6 +59,7 @@ public class Constants {
     // Data extraction parameters
     public static final int BATCH_SIZE = 100; //Adapt to avoid OutOfMemoryException
     public static final String DIFFERENTIAL_DATA_FOLDER_NAME = "differential/data";
+    public static final String CONTEXTUAL_FOLDER = "/contextual";
 
     // Kraftwerk service path parameters
     public static final String KRAFTWERK_MAIN_ENDPOINT = "";