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.16</springdoc.version>
         <mapstruct.version>1.6.3</mapstruct.version>
-        <cucumber.version>7.34.2</cucumber.version>
         <junit-jupiter.version>5.13.4</junit-jupiter.version>
         <jackson-bom.version>2.21.1</jackson-bom.version>
 
@@ -125,32 +124,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>
@@ -263,16 +236,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>
@@ -281,10 +287,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

@@ -67,10 +67,9 @@
      * @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) {
         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/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

@@ -19,7 +19,6 @@
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -34,23 +33,6 @@ public class DataProcessingContextController {
     private DataProcessingContextApiPort dataProcessingContextApiPort;
     private final FileUtils fileUtils;
 
-    @Deprecated(forRemoval = true)
-    @Operation(summary = "Create or update a data processing context")
-    @PutMapping(path = "/context/review")
-    @PreAuthorize("hasAnyRole('USER_PLATINE', 'USER_BACK_OFFICE', 'SCHEDULER')")
-    public ResponseEntity<Object> saveContext(
-            @Parameter(description = "Identifier of the partition", required = true) @RequestParam("partitionId") String partitionId,
-            @Parameter(description = "Allow reviewing") @RequestParam(value = "withReview", defaultValue = "false") Boolean withReview
-    ){
-        try {
-            withReview = withReview != null && withReview; //False if null
-            dataProcessingContextApiPort.saveContext(partitionId, withReview);
-        }catch (GenesisException e){
-            return new ResponseEntity<>(e.getMessage(), HttpStatusCode.valueOf(e.getStatus()));
-        }
-        return ResponseEntity.ok().build();
-    }
-
     @Operation(summary = "Create or update a data processing context")
     @PutMapping(path = "/contexts/{collectionInstrumentId}/review")
     @PreAuthorize("hasAnyRole('USER_PLATINE', 'USER_BACK_OFFICE', 'SCHEDULER')")
@@ -82,67 +64,6 @@ public ResponseEntity<Object> getReviewIndicatorByCollectionInstrumentId(
         }
     }
 
-    @Deprecated(forRemoval = true)
-    @Operation(summary = "Returns partition review indicator")
-    @GetMapping(path = "/context/review")
-    @PreAuthorize("hasAnyRole('USER_BACK_OFFICE','SCHEDULER','USER_PLATINE')")
-    public ResponseEntity<Object> getReviewIndicator(
-            @Parameter(description = "Identifier of the partition", required = true) @RequestParam("partitionId") String partitionId
-    ){
-        try {
-            boolean withReview = dataProcessingContextApiPort.getReviewByPartitionId(partitionId);
-            return ResponseEntity.ok(withReview);
-        }catch (GenesisException e){
-            return new ResponseEntity<>(e.getMessage(), HttpStatusCode.valueOf(e.getStatus()));
-        }
-    }
-
-    @Deprecated(forRemoval = true)
-    @Operation(summary = "Schedule a Kraftwerk execution")
-    @PutMapping(path = "/context/schedules")
-    @PreAuthorize("hasRole('USER_KRAFTWERK')")
-    public ResponseEntity<Object> saveSchedule(
-            @Parameter(description = "Partition identifier to call Kraftwerk on") @RequestParam("partitionId") String partitionId,
-            @Parameter(description = "Kraftwerk endpoint") @RequestParam(value = "serviceTocall", defaultValue = Constants.KRAFTWERK_MAIN_ENDPOINT) ServiceToCall serviceToCall,
-            @Parameter(description = "Frequency in Spring cron format (6 inputs, go to https://crontab.cronhub.io/ for generator)  \n Example : 0 0 6 * * *") @RequestParam("frequency") String frequency,
-            @Parameter(description = "Schedule effective date and time", example = "2024-01-01T12:00:00") @RequestParam("scheduleBeginDate") LocalDateTime scheduleBeginDate,
-            @Parameter(description = "Schedule end date and time", example = "2024-01-01T12:00:00") @RequestParam("scheduleEndDate") LocalDateTime scheduleEndDate,
-            @Parameter(description = "Encrypt after process ? Ignore next parameters if false") @RequestParam(value =
-                    "useEncryption",
-                    defaultValue = "false") boolean useEncryption,
-            @Parameter(description = "(Encryption) vault path") @RequestParam(value = "encryptionVaultPath", defaultValue = "") String encryptionVaultPath,
-            @Parameter(description = "(Encryption) output folder") @RequestParam(value = "encryptionOutputFolder",
-                    defaultValue = "") String encryptionOutputFolder,
-            @Parameter(description = "(Encryption) Use signature system") @RequestParam(value = "useSignature", defaultValue = "false") boolean useSignature
-    ) {
-        try {
-            //Check frequency
-            if(!CronExpression.isValidExpression(frequency)) {
-                log.warn("Returned error for wrong frequency : {}", frequency);
-                throw new GenesisException(400, "Wrong frequency syntax");
-            }
-
-            TrustParameters trustParameters = null;
-            if(useEncryption) {
-                trustParameters = new TrustParameters(
-                        fileUtils.getKraftwerkOutFolder(partitionId),
-                        encryptionOutputFolder,
-                        encryptionVaultPath,
-                        useSignature
-                );
-            }
-            dataProcessingContextApiPort.saveKraftwerkExecutionSchedule(
-                    partitionId,
-                    serviceToCall == null ? ServiceToCall.MAIN : serviceToCall,
-                    frequency,
-                    scheduleBeginDate, scheduleEndDate, trustParameters
-            );
-        }catch (GenesisException e){
-            return new ResponseEntity<>(e.getMessage(), HttpStatusCode.valueOf(e.getStatus()));
-        }
-        return ResponseEntity.ok().build();
-    }
-
     // Should be refactored to make it restfull
     @Operation(summary = "Schedule a Kraftwerk execution using the collection instrument")
     @PutMapping(path = "/contexts/schedules")
@@ -181,7 +102,9 @@ public ResponseEntity<Object> saveScheduleWithCollectionInstrumentId(
                     collectionInstrumentId,
                     serviceToCall == null ? ServiceToCall.MAIN : serviceToCall,
                     frequency,
-                    scheduleBeginDate, scheduleEndDate, trustParameters
+                    scheduleBeginDate,
+                    scheduleEndDate,
+                    trustParameters
             );
         }catch (GenesisException e){
             return new ResponseEntity<>(e.getMessage(), HttpStatusCode.valueOf(e.getStatus()));
@@ -215,24 +138,6 @@ public ResponseEntity<Object> getAllSchedulesV2() {
         return ResponseEntity.ok(surveyScheduleDocumentModels);
     }
 
-
-    @Deprecated(forRemoval = true)
-    @Operation(summary = "Set last execution date of a partition with new date or nothing")
-    @PostMapping(path = "/context/schedules/lastExecutionDate")
-    @PreAuthorize("hasRole('SCHEDULER')")
-    public ResponseEntity<Object> setSurveyLastExecution(
-            @Parameter(description = "Survey name to call Kraftwerk on") @RequestBody String partitionId,
-            @Parameter(description = "Date to save as last execution date", example = "2024-01-01T12:00:00") @RequestParam("newDate") LocalDateTime newDate
-    ) {
-        try {
-            dataProcessingContextApiPort.updateLastExecutionDate(partitionId, newDate);
-            log.info("{} last execution updated at {} !", partitionId, newDate);
-        }catch (GenesisException e){
-            return new ResponseEntity<>(e.getMessage(), HttpStatusCode.valueOf(e.getStatus()));
-        }
-        return ResponseEntity.ok().build();
-    }
-
     @Operation(summary = "Update the date of the last extraction of data corresponding to a collection instrument")
     @PutMapping(path = "/contexts/{collectionInstrumentId}/lastExecutionDate")
     @PreAuthorize("hasRole('SCHEDULER')")
@@ -249,22 +154,6 @@ public ResponseEntity<Object> setSurveyLastExecutionByCollectionInstrumentId(
         return ResponseEntity.ok().build();
     }
 
-    @Deprecated(forRemoval = true)
-    @Operation(summary = "Delete the Kraftwerk execution schedules of a partition")
-    @DeleteMapping(path = "/context/schedules")
-    @PreAuthorize("hasRole('USER_KRAFTWERK')")
-    public ResponseEntity<Object> deleteSchedules(
-            @Parameter(description = "Survey name of the schedule(s) to delete") @RequestParam("partitionId") String partitionId
-    ){
-        try {
-            dataProcessingContextApiPort.deleteSchedules(partitionId);
-        }catch (GenesisException e){
-            return new ResponseEntity<>(e.getMessage(), HttpStatusCode.valueOf(e.getStatus()));
-        }
-        log.info("Schedule deleted for survey {}", partitionId);
-        return ResponseEntity.ok().build();
-    }
-
     @Operation(summary = "Delete the Kraftwerk execution schedules of a collection instrument id")
     @DeleteMapping(path = "/context/{collectionInstrumentId}/schedules")
     @PreAuthorize("hasRole('USER_KRAFTWERK')")