test: selection by date in SurveyUnitService

Author: loichenninger

…omain/service/SurveyUnitServiceTest.java …ce/surveyunit/SurveyUnitServiceTest.javasrc/test/java/fr/insee/genesis/domain/service/SurveyUnitServiceTest.java renamed to src/test/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitServiceTest.java src/test/java/fr/insee/genesis/domain/service/SurveyUnitServiceTest.java renamed to src/test/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitServiceTest.java

@@ -1,4 +1,4 @@
-package fr.insee.genesis.domain.service;
+package fr.insee.genesis.domain.service.surveyunit;
 
 import fr.insee.genesis.controller.dto.SurveyUnitDto;
 import fr.insee.genesis.controller.dto.VariableDto;
@@ -7,7 +7,6 @@
 import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
 import fr.insee.genesis.domain.model.surveyunit.VariableModel;
 import fr.insee.genesis.domain.service.metadata.QuestionnaireMetadataService;
-import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
 import fr.insee.genesis.infrastructure.utils.FileUtils;
 import fr.insee.genesis.stubs.ConfigStub;
 import fr.insee.genesis.stubs.QuestionnaireMetadataPersistancePortStub;
@@ -243,6 +242,24 @@ void findDistinctInterrogationIdsByQuestionnaireIdTest(){
         ).isNotEmpty().hasSize(1);
     }
 
+    @Test
+    void findDistinctInterrogationIdsByQuestionnaireIdAndDateAfterTest_no_doc_in_period(){
+        addAdditionnalSurveyUnitModelToMongoStub();
+
+        Assertions.assertThat(surveyUnitServiceStatic.findDistinctInterrogationIdsByQuestionnaireIdAndDateAfter(DEFAULT_QUESTIONNAIRE_ID,LocalDateTime.of(2025,9,1,0,0,0))).filteredOn(
+                interrogationId -> interrogationId.getInterrogationId().equals(DEFAULT_INTERROGATION_ID)
+        ).isEmpty();
+    }
+
+    @Test
+    void findDistinctInterrogationIdsByQuestionnaireIdAndDateAfterTest_doc_in_period(){
+        addAdditionnalSurveyUnitModelToMongoStub();
+
+        Assertions.assertThat(surveyUnitServiceStatic.findDistinctInterrogationIdsByQuestionnaireIdAndDateAfter(DEFAULT_QUESTIONNAIRE_ID,LocalDateTime.of(2022,1,1,0,0,0))).filteredOn(
+                interrogationId -> interrogationId.getInterrogationId().equals(DEFAULT_INTERROGATION_ID)
+        ).isNotEmpty().hasSize(1);
+    }
+
     @Test
     void findInterrogationIdsByQuestionnaireIdTest(){
         Assertions.assertThat(surveyUnitServiceStatic.findModesByQuestionnaireId(DEFAULT_QUESTIONNAIRE_ID)).filteredOn(

src/test/java/fr/insee/genesis/stubs/LastJsonExtractionPersistencePortStub.java

@@ -5,6 +5,7 @@
 import fr.insee.genesis.domain.ports.spi.LastJsonExtractionPersistencePort;
 import fr.insee.genesis.exceptions.GenesisException;
 import fr.insee.genesis.infrastructure.document.extraction.json.LastJsonExtractionDocument;
+import fr.insee.genesis.infrastructure.mappers.LastJsonExtractionDocumentMapper;
 import lombok.Getter;
 
 import java.util.ArrayList;
@@ -13,14 +14,18 @@
 @Getter
 public class LastJsonExtractionPersistencePortStub implements LastJsonExtractionPersistencePort {
 
-    List<LastJsonExtractionDocument> documents = new ArrayList<>();
+    List<LastJsonExtractionDocument> mongoStub = new ArrayList<>();
     @Override
     public void save(LastJsonExtractionModel extraction) {
-
+        mongoStub.add(LastJsonExtractionDocumentMapper.INSTANCE.modelToDocument(extraction));
     }
 
     @Override
     public LastJsonExtractionModel getLastExecutionDate(String questionnaireModelId, Mode mode) throws GenesisException {
-        return null;
+        LastJsonExtractionDocument extraction = mongoStub.stream()
+                .filter(doc -> doc.getId().equals(String.format("%s_%s",questionnaireModelId,mode)))
+                .findFirst()
+                .orElseThrow();
+        return LastJsonExtractionDocumentMapper.INSTANCE.documentToModel(extraction);
     }
 }

src/test/java/fr/insee/genesis/stubs/SurveyUnitPersistencePortStub.java

@@ -91,7 +91,15 @@ public List<SurveyUnitModel> findInterrogationIdsByQuestionnaireId(String questi
 
     @Override
     public List<SurveyUnitModel> findInterrogationIdsByQuestionnaireIdAndDateAfter(String questionnaireId, LocalDateTime since) {
-        return List.of();
+        List<SurveyUnitModel> surveyUnitModelList = new ArrayList<>();
+        for(SurveyUnitModel surveyUnitModel : mongoStub){
+            if(surveyUnitModel.getQuestionnaireId().equals(questionnaireId) && surveyUnitModel.getRecordDate().isAfter(since))
+                surveyUnitModelList.add(
+                        new SurveyUnitModel(surveyUnitModel.getInterrogationId(), surveyUnitModel.getMode())
+                );
+        }
+
+        return surveyUnitModelList;
     }