Tests rework

.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/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/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

@@ -181,7 +181,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()));

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/CampaignController.java

@@ -27,7 +27,8 @@
 
     @Operation(summary = "List campaigns in database")
     @GetMapping(path = "/")
+    @Deprecated
     public ResponseEntity<Set<String>> getCampaigns() {
         Set<String> campaigns = surveyUnitService.findDistinctCampaignIds();
         return ResponseEntity.ok(campaigns);
     }

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

@@ -82,6 +82,7 @@ public ResponseEntity<List<InterrogationId>> getAllInterrogationIdsByCollectionI
     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);

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

@@ -43,25 +43,27 @@
 
     @Operation(summary = "List sources/modes used for a given campaign")
     @GetMapping(path = "/by-campaign")
+    @Deprecated
     public ResponseEntity<List<Mode>> getModesByCampaign(@RequestParam("campaignId") String campaignId) {
         List<Mode> modes = surveyUnitService.findModesByCampaignId(campaignId);
         return ResponseEntity.ok(modes);
     }
 
+    //TODO Integrate into normal usage
     //========= OPTIMISATIONS PERFS (START) ==========
-    @Operation(summary = "List sources/modes used for a given questionnaire")
-    @GetMapping(path = "/by-questionnaireV2")
-    public ResponseEntity<List<Mode>> getModesByQuestionnaireV2(@RequestParam("questionnaireId") String questionnaireId) {
-        List<Mode> modes = surveyUnitService.findModesByQuestionnaireIdV2(questionnaireId);
-        return ResponseEntity.ok(modes);
-    }
-
-    @Operation(summary = "List sources/modes used for a given campaign")
-    @GetMapping(path = "/by-campaignV2")
-    public ResponseEntity<List<Mode>> getModesByCampaignV2(@RequestParam("campaignId") String campaignId) {
-        List<Mode> modes = surveyUnitService.findModesByCampaignIdV2(campaignId);
-        return ResponseEntity.ok(modes);
-    }
+//    @Operation(summary = "List sources/modes used for a given questionnaire")
+//    @GetMapping(path = "/by-questionnaireV2")
+//    public ResponseEntity<List<Mode>> getModesByQuestionnaireV2(@RequestParam("questionnaireId") String questionnaireId) {
+//        List<Mode> modes = surveyUnitService.findModesByQuestionnaireIdV2(questionnaireId);
+//        return ResponseEntity.ok(modes);
+//    }
+//
+//    @Operation(summary = "List sources/modes used for a given campaign")
+//    @GetMapping(path = "/by-campaignV2")
+//    public ResponseEntity<List<Mode>> getModesByCampaignV2(@RequestParam("campaignId") String campaignId) {
+//        List<Mode> modes = surveyUnitService.findModesByCampaignIdV2(campaignId);
+//        return ResponseEntity.ok(modes);
+//    }
     //========= OPTIMISATIONS PERFS (END) ==========
 
 }

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

@@ -57,7 +57,8 @@
 
     @Operation(summary = "List questionnaires in database with their campaigns")
     @GetMapping(path = "/with-campaigns")
+    @Deprecated
     public ResponseEntity<List<QuestionnaireWithCampaign>> getQuestionnairesWithCampaigns() {
         List<QuestionnaireWithCampaign> questionnaireWithCampaignList =
                 surveyUnitService.findQuestionnairesWithCampaigns();
         return ResponseEntity.ok(questionnaireWithCampaignList);
@@ -65,7 +66,8 @@
 
     @Operation(summary = "List questionnaires used for a given campaign")
     @GetMapping(path = "/by-campaign")
+    @Deprecated
     public ResponseEntity<Set<String>> getQuestionnairesByCampaign(@RequestParam("campaignId") String campaignId) {
         Set<String> questionnaires = surveyUnitService.findQuestionnaireIdsByCampaignId(campaignId);
         return ResponseEntity.ok(questionnaires);
     }
@@ -76,7 +78,8 @@
      */
     @Operation(summary = "List questionnaires used for a given campaign (using a DISTINCT query)")
     @GetMapping(path = "/by-campaignV2")
+    @Deprecated(forRemoval = true) //TODO integrate logic to find by interrogationId
     public ResponseEntity<Set<String>> getQuestionnairesByCampaignV2(@RequestParam("campaignId") String campaignId) {
         Set<String> questionnaires = surveyUnitService.findQuestionnaireIdsByCampaignIdV2(campaignId);
         return ResponseEntity.ok(questionnaires);
     }
@@ -92,7 +95,6 @@
         } catch (GenesisException e) {
             return ResponseEntity.status(e.getStatus()).body(e.getMessage());
         }
-
     }
 
 

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

@@ -64,7 +64,6 @@
     @PutMapping(path = "/responses/raw/lunatic-json/save")
     @PreAuthorize("hasRole('COLLECT_PLATFORM')")
     public ResponseEntity<String> saveRawResponsesFromJsonBody(
-
             @RequestParam("campaignName") String campaignName,
             @RequestParam("questionnaireId") String questionnaireId,
             @RequestParam(INTERROGATION_ID) String interrogationId,
@@ -99,7 +98,7 @@
     public ResponseEntity<String> saveRawResponsesFromRawResponseDto(
             @Valid @RequestBody RawResponseDto dto
     ) {
-        rawRepository.saveAsRawJson(dto);
+        rawRepository.saveAsRawJson(dto); //TODO put in service, repository is infra layer
         return ResponseEntity.status(201).body(String.format(SUCCESS_MESSAGE, dto.getInterrogationId()));
     }
 

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

@@ -263,8 +263,14 @@ public ResponseEntity<Object> findResponsesByInterrogationAndQuestionnaireLatest
     public ResponseEntity<Object> findResponsesByInterrogationAndCollectionInstrumentLatestStates(
             @RequestParam("interrogationId") String interrogationId,
             @RequestParam("collectionInstrumentId") String collectionInstrumentId) throws GenesisException {
+        //TODO move logic to service
+        DataProcessingContextModel dataProcessingContextModel;
         //Check context
-        DataProcessingContextModel dataProcessingContextModel = contextService.getContext(interrogationId);
+        try {
+            dataProcessingContextModel = contextService.getContext(interrogationId);
+        }catch (GenesisException e){
+            return ResponseEntity.internalServerError().body(e.getMessage());
+        }
 
         if(dataProcessingContextModel == null || !dataProcessingContextModel.isWithReview()){
             return ResponseEntity.status(403).body(new ApiError("Review is disabled for that partition"));
@@ -301,6 +307,7 @@ public ResponseEntity<SurveyUnitSimplifiedDto> getLatestByInterrogationOneObject
         LocalDateTime validationDate = null;
         for (SurveyUnitModel response :
                 responses.stream().filter(rep -> rep.getMode().equals(mode)).toList()){
+            //Keep last not null questionnaireState/validationDate
             questionnaireState = response.getQuestionnaireState() != null ?
                     response.getQuestionnaireState()
                     : questionnaireState;
@@ -331,14 +338,19 @@ public ResponseEntity<SurveyUnitSimplifiedDto> getLatestByInterrogationOneObject
     public ResponseEntity<SurveyUnitSimplifiedDto> getResponseByCollectionInstrumentAndInterrogation(
             @PathVariable("collectionInstrumentId") String collectionInstrumentId,
             @PathVariable("interrogationId") String interrogationId,
-            @RequestParam("mode") Mode mode) {
+            @PathVariable("mode") Mode mode){
+        try {
             return ResponseEntity.ok(
                     surveyUnitService.findSimplifiedByCollectionInstrumentIdAndInterrogationId(
                             collectionInstrumentId,
                             interrogationId,
                             mode
                     )
             );
+        } catch (NoDataException e){
+            log.error(e.getMessage());
+            return ResponseEntity.notFound().build();
+        }
     }
 
     /**
@@ -427,7 +439,7 @@ public ResponseEntity<Object> saveEditedVariables(
     ) {
         try {
             log.debug("Received in save edited : {}", surveyUnitInputDto.toString());
-            //Code quality : we need to put all that logic out of this controller
+            //TODO Code quality : we need to put all that logic out of this controller
             //Parse metadata
             //Try to look for DDI first, if no DDI found looks for lunatic components
             List<GenesisError> errors = new ArrayList<>();

src/main/java/fr/insee/genesis/domain/model/surveyunit/DataType.java

@@ -1,5 +1,9 @@
 package fr.insee.genesis.domain.model.surveyunit;
 
+/**
+ * @deprecated unused
+ */
+@Deprecated(forRemoval = true)
 public enum DataType {
     COLLECTED,CALCULATED,EXTERNAL
 }

src/main/java/fr/insee/genesis/domain/model/surveyunit/rawdata/RawResponseModel.java

@@ -1,11 +1,13 @@
 package fr.insee.genesis.domain.model.surveyunit.rawdata;
 
 import fr.insee.genesis.domain.model.surveyunit.Mode;
+import lombok.Builder;
 import org.bson.types.ObjectId;
 
 import java.time.LocalDateTime;
 import java.util.Map;
 
+@Builder
 public record RawResponseModel(
         ObjectId id,
         String interrogationId,

src/main/java/fr/insee/genesis/domain/ports/api/DataProcessingContextApiPort.java

@@ -38,7 +38,7 @@ void saveKraftwerkExecutionScheduleByCollectionInstrumentId(String collectionIns
 
     void deleteExpiredSchedules(String logFolder) throws GenesisException;
 
-    long countSchedules();
+    long countContexts();
 
     DataProcessingContextModel getContext(String interrogationId) throws GenesisException;
 

src/main/java/fr/insee/genesis/domain/ports/api/LunaticJsonRawDataApiPort.java

@@ -20,16 +20,19 @@
 public interface LunaticJsonRawDataApiPort {
 
     void save(LunaticJsonRawDataModel rawData);
+    @Deprecated
     List<LunaticJsonRawDataModel> getRawData(String campaignName, Mode mode, List<String> interrogationIdList);
     List<LunaticJsonRawDataModel> getRawDataByQuestionnaireId(String questionnaireId, Mode mode, List<String> interrogationIdList);
     List<SurveyUnitModel> convertRawData(List<LunaticJsonRawDataModel> rawData, VariablesMap variablesMap);
     List<LunaticJsonRawDataUnprocessedDto> getUnprocessedDataIds();
     Set<String> getUnprocessedDataQuestionnaireIds();
     void updateProcessDates(List<SurveyUnitModel> surveyUnitModels);
     Set<String> findDistinctQuestionnaireIds();
+    @Deprecated
     long countRawResponsesByQuestionnaireId(String campaignId);
     long countDistinctInterrogationIdsByQuestionnaireId(String questionnaireId);
+    @Deprecated
     Page<LunaticJsonRawDataModel> findRawDataByCampaignIdAndDate(String campaignId, Instant  startDt, Instant endDt, Pageable pageable);
 
     List<LunaticJsonRawDataModel> getRawDataByInterrogationId(String interrogationId);