Code cleaning : Remove campaignId (except LunaticJsonRawData)

.runtests/Unit tests GENESIS.run.xml → .runtests/Tests GENESIS.run.xml

@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Unit tests GENESIS" type="JUnit" factoryName="JUnit">
+  <configuration default="false" name="Tests GENESIS" type="JUnit" factoryName="JUnit">
     <module name="genesis-api" />
+    <extension name="coverage" runner="jacoco" />
     <option name="PACKAGE_NAME" value="fr.insee.genesis" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />

pom.xml

@@ -18,7 +18,6 @@
         <java.version>25</java.version>
         <springdoc.version>2.8.17</springdoc.version>
         <mapstruct.version>1.6.3</mapstruct.version>
-        <cucumber.version>7.34.3</cucumber.version>
         <junit-jupiter.version>5.13.4</junit-jupiter.version>
         <tomcat.version>11.0.21</tomcat.version>
         <jackson-bom.version>2.21.1</jackson-bom.version>
@@ -126,32 +125,6 @@
             <version>${mapstruct.version}</version>
         </dependency>
 
-        <!-- Cucumber -->
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-java</artifactId>
-            <version>${cucumber.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-junit</artifactId>
-            <version>${cucumber.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-junit-platform-engine</artifactId>
-            <version>${cucumber.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-spring</artifactId>
-            <version>${cucumber.version}</version>
-            <scope>test</scope>
-        </dependency>
-
 
         <dependency>
             <groupId>org.junit.vintage</groupId>
@@ -264,16 +237,49 @@
                 <groupId>org.sonarsource.scanner.maven</groupId>
                 <artifactId>sonar-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>properties</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <printSummary>true</printSummary>
                     <includes>
-                        <include>**/*FT.java</include>
                         <include>**/*Test.java</include>
                         <include>**/*Tests.java</include>
                     </includes>
+                    <excludes>
+                        <exclude>**/*IT.java</exclude>
+                    </excludes>
+                    <parallel>methods</parallel>
+                    <threadCount>4</threadCount>
+                    <argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <includes>
+                        <include>**/*IT.java</include>
+                    </includes>
                 </configuration>
             </plugin>
             <plugin>
@@ -282,10 +288,10 @@
                 <version>${pitest.version}</version>
                 <configuration>
                     <targetClasses>
-                        <param>fr.insee.kraftwerk.*</param>
+                        <param>fr.insee.genesis.*</param>
                     </targetClasses>
                     <targetTests>
-                        <param>fr.insee.kraftwerk.*</param>
+                        <param>fr.insee.genesis.*</param>
                     </targetTests>
                     <mutators>
                         <mutator>STRONGER</mutator>

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

@@ -37,6 +37,8 @@ public class Constants {
     public static final String SCHEDULE_ARCHIVE_FOLDER_NAME = "genesis_deleted_schedules";
     public static final String SAME_AXIS_VALUE = "0";
 
+    public static final String VARIABLE_STATE_DTO_DATE_FORMAT = "dd/MM/yyyy HH:mm:ss.SSS";
+
 
    // XML sequential reading parameters
     public static final int MAX_FILE_SIZE_UNTIL_SEQUENTIAL = 200; // In megabytes

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

@@ -14,7 +14,6 @@ public class LunaticJsonAdapter {
     public SurveyUnitModel convert(LunaticJsonSurveyUnit su){
         return SurveyUnitModel.builder()
                 .collectionInstrumentId(su.getQuestionnaireId())
-                .campaignId("")
                 .interrogationId(su.getInterrogationId())
                 .state(DataState.COLLECTED)
                 .mode(Mode.WEB)

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

@@ -23,34 +23,33 @@ public class LunaticXmlAdapter {
      * Convert a Lunatic XML survey unit into a genesis survey unit model
      * @param su Lunatic XML survey unit to convert
      * @param variablesMap variable definitions (used for loops)
-     * @param campaignId survey id
      * @return Genesis SurveyUnitModels for each data state
      */
-    public static List<SurveyUnitModel> convert(LunaticXmlSurveyUnit su, VariablesMap variablesMap, String campaignId, Mode mode){
+    public static List<SurveyUnitModel> convert(LunaticXmlSurveyUnit su, VariablesMap variablesMap, Mode mode){
         //Get COLLECTED Data and external variables
         List<SurveyUnitModel> surveyUnitModelList = new ArrayList<>();
-        SurveyUnitModel surveyUnitModel = getStateDataFromSurveyUnit(su, variablesMap, campaignId, DataState.COLLECTED, mode);
+        SurveyUnitModel surveyUnitModel = getStateDataFromSurveyUnit(su, variablesMap, DataState.COLLECTED, mode);
         getExternalDataFromSurveyUnit(su, surveyUnitModel, variablesMap);
 
         surveyUnitModelList.add(surveyUnitModel);
 
         //Get data from other states
-        SurveyUnitModel editedSurveyUnitModel = getStateDataFromSurveyUnit(su, variablesMap, campaignId, DataState.EDITED,mode);
+        SurveyUnitModel editedSurveyUnitModel = getStateDataFromSurveyUnit(su, variablesMap, DataState.EDITED,mode);
         if(editedSurveyUnitModel != null){
             surveyUnitModelList.add(editedSurveyUnitModel);
         }
 
-        SurveyUnitModel inputedSurveyUnitModel = getStateDataFromSurveyUnit(su, variablesMap, campaignId, DataState.INPUTED,mode);
+        SurveyUnitModel inputedSurveyUnitModel = getStateDataFromSurveyUnit(su, variablesMap, DataState.INPUTED,mode);
         if(inputedSurveyUnitModel != null){
             surveyUnitModelList.add(inputedSurveyUnitModel);
         }
 
-        SurveyUnitModel forcedSurveyUnitModel = getStateDataFromSurveyUnit(su, variablesMap, campaignId, DataState.FORCED,mode);
+        SurveyUnitModel forcedSurveyUnitModel = getStateDataFromSurveyUnit(su, variablesMap, DataState.FORCED,mode);
         if(forcedSurveyUnitModel != null){
             surveyUnitModelList.add(forcedSurveyUnitModel);
         }
 
-        SurveyUnitModel previousSurveyUnitModel = getStateDataFromSurveyUnit(su, variablesMap, campaignId, DataState.PREVIOUS,mode);
+        SurveyUnitModel previousSurveyUnitModel = getStateDataFromSurveyUnit(su, variablesMap, DataState.PREVIOUS,mode);
         if(previousSurveyUnitModel != null){
             surveyUnitModelList.add(previousSurveyUnitModel);
         }
@@ -63,14 +62,12 @@ public static List<SurveyUnitModel> convert(LunaticXmlSurveyUnit su, VariablesMa
      * Collects data from XML survey unit depending on the data state
      * @param su source XML Survey Unit
      * @param variablesMap variable definitions (used for loops)
-     * @param campaignId survey id
      * @param dataState state of the SurveyUnitModel to generate
      * @return SurveyUnitModel with a specific state
      */
-    private static SurveyUnitModel getStateDataFromSurveyUnit(LunaticXmlSurveyUnit su, VariablesMap variablesMap, String campaignId, DataState dataState, Mode mode) {
+    private static SurveyUnitModel getStateDataFromSurveyUnit(LunaticXmlSurveyUnit su, VariablesMap variablesMap, DataState dataState, Mode mode) {
         SurveyUnitModel surveyUnitModel = SurveyUnitModel.builder()
                 .collectionInstrumentId(su.getQuestionnaireModelId().toUpperCase())
-                .campaignId(campaignId)
                 .interrogationId(su.getId())
                 .state(dataState)
                 .mode(mode)

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

@@ -9,6 +9,7 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -19,6 +20,7 @@
 @AllArgsConstructor
 @Schema(description = "Request used to schedule a Kraftwerk export workflow")
 @ValidScheduleRequest
+@Builder
 public class ScheduleRequestDto {
 
     @NotBlank

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

@@ -9,9 +9,8 @@
 @Builder
 @Data
 public class SurveyUnitInputDto {
+    private String questionnaireId;
     private String interrogationId;
-    private String campaignId;
     private Mode mode;
-    private String questionnaireId;
     private List<VariableInputDto> collectedVariables;
 }

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

@@ -14,11 +14,6 @@
 public class SurveyUnitSimplifiedDto {
 
 	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 usualSurveyUnitId;
 	private Mode mode;

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

@@ -1,6 +1,7 @@
 package fr.insee.genesis.controller.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import fr.insee.genesis.Constants;
 import fr.insee.genesis.domain.model.surveyunit.DataState;
 import lombok.Builder;
 import lombok.Data;
@@ -14,6 +15,6 @@ public class VariableStateDto {
     private boolean active;
     private Object value;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd/MM/yyyy HH:mm:ss.SSS")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = Constants.VARIABLE_STATE_DTO_DATE_FORMAT)
     private LocalDateTime date;
 }

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

@@ -3,4 +3,4 @@
 import lombok.Builder;
 
 @Builder
-public record LunaticJsonRawDataUnprocessedDto(String campaignId, String questionnaireId, String interrogationId){}
+public record LunaticJsonRawDataUnprocessedDto(String questionnaireId, String interrogationId){}

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

@@ -25,7 +25,7 @@ public class CombinedRawDataController {
     @Operation(summary = "Retrieve combined raw responses and Lunatic raw data for a given interrogationId")
     @GetMapping
     @PreAuthorize("hasAnyRole('ADMIN', 'USER_PLATINE')")
-    public ResponseEntity<CombinedRawDataDto> getCombinetRawData(
+    public ResponseEntity<CombinedRawDataDto> getCombinedRawData(
             @RequestParam(INTERROGATION_ID) String interrogationId
     ){
         CombinedRawDataDto data = combinedRawDataService.getCombinedRawDataByInterrogationId(interrogationId);

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

@@ -160,7 +160,7 @@ public ResponseEntity<Object> getAllSchedulesV2() {
         log.info("Returning {} V2 schedule documents...", schedules.size());
         return ResponseEntity.ok(schedules);
     }
-
+    
     @Operation(summary = "Fetch V2 schedules by collection instrument id")
     @GetMapping(path = "/contexts/{collectionInstrumentId}/schedules/v2")
     @PreAuthorize("hasAnyRole('SCHEDULER','READER')")

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

@@ -45,11 +45,11 @@ public ResponseEntity<String> healthcheckMongo() {
                              MongoDB OK
                             \s
                              %s Responses
-                             %s Schedules
+                             %s Contexts
                        \s"""
                         .formatted(
                                 surveyUnitApiPort.countResponses(),
-                                dataProcessingContextApiPort.countSchedules()
+                                dataProcessingContextApiPort.countContexts()
                         ));
     }
 

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

@@ -83,6 +83,7 @@
     public ResponseEntity<Long> countAllInterrogationIdsByQuestionnaireOrCollectionInstrument(
             @Parameter(description = "questionnaireId/collectionInstrumentId", required = true) @PathVariable("questionnaireId") String questionnaireId
     ) {
+        //TODO move logic to service
         long response = surveyUnitService.countResponsesByQuestionnaireId(questionnaireId);
         response += surveyUnitService.countResponsesByCollectionInstrumentId(questionnaireId);
         return ResponseEntity.ok(response);