Skip to content

add endpoint to get interrogations with record date between #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hajarel-moukh wants to merge 2 commits into
base: main
Choose a base branch
from
Open

add endpoint to get interrogations with record date between #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad02ea2
add endpoint to get interrogations with record date between
Hajarel-moukh Feb 11, 2026
b2d7c5d
add test
Hajarel-moukh Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/main/java/fr/insee/genesis/controller/rest/responses/InterrogationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,19 @@ public ResponseEntity<List<InterrogationId>> getAllInterrogationIdsByQuestionnai
return ResponseEntity.ok(responses);
}

@Operation(summary = "Retrieve interrogations recorded between two dates for a given collection instrument")
@GetMapping(path = "/by-collection-instrument-and-between-datetime")
public ResponseEntity<List<InterrogationId>> getAllInterrogationIdsByCollectionInstrumentIdAndDate(
@RequestParam("collectionInstrumentId") String collectionInstrumentId,
@RequestParam("start")
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime start,
Copy link
Contributor

@alicela alicela Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like to have an example in complex params as date.

@parameter(
description = "Date de début",
schema = @Schema(type = "string", format = "date-time", example = "2025-01-01T00:00:00")
)

@RequestParam("end")
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime end) {
List<InterrogationId> responses = surveyUnitService.findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(collectionInstrumentId, start,end);
return ResponseEntity.ok(responses);
}



//========= OPTIMISATIONS PERFS (START) ==========
/**
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/fr/insee/genesis/domain/ports/api/SurveyUnitApiPort.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public interface SurveyUnitApiPort {

List<InterrogationId> findDistinctInterrogationIdsByQuestionnaireIdAndDateAfter(String questionnaireId, LocalDateTime since);

List<InterrogationId> findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(String collectionInstrumentId, LocalDateTime start, LocalDateTime end);

//========= OPTIMISATIONS PERFS (START) ==========
long countResponsesByCollectionInstrumentId(String questionnaireId);

Expand Down
6 changes: 6 additions & 0 deletions src/main/java/fr/insee/genesis/domain/ports/spi/SurveyUnitPersistencePort.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ public interface SurveyUnitPersistencePort {

List<SurveyUnitModel> findInterrogationIdsByQuestionnaireIdAndDateAfter(String questionnaireId, LocalDateTime since);

List<SurveyUnitModel> findInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(
String collectionInstrumentId,
LocalDateTime start,
LocalDateTime end
);

//======== OPTIMISATIONS PERFS (START) ========
long countByCollectionInstrumentId(String collectionInstrumentId);

Expand Down
10 changes: 10 additions & 0 deletions src/main/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,16 @@ public List<InterrogationId> findDistinctInterrogationIdsByQuestionnaireIdAndDat
.toList();
}

@Override
public List<InterrogationId> findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(String collectionInstrumentId, LocalDateTime start, LocalDateTime end) {
return surveyUnitPersistencePort
.findInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(collectionInstrumentId,start,end)
.stream()
.map(su -> new InterrogationId(su.getInterrogationId()))
.distinct()
.toList();
}

//============ OPTIMISATIONS PERFS (START) ============

/**
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/fr/insee/genesis/infrastructure/adapter/SurveyUnitMongoAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,14 @@ public List<SurveyUnitModel> findInterrogationIdsByQuestionnaireIdAndDateAfter(S
return results.isEmpty() ? Collections.emptyList() : SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(results);
}

//========== OPTIMISATIONS PERFS (START) ===========
@Override
public List<SurveyUnitModel> findInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(String collectionInstrumentId, LocalDateTime start, LocalDateTime end) {
List<SurveyUnitDocument> results = new ArrayList<>();
results.addAll(mongoRepository.findInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(collectionInstrumentId,start,end));
return results.isEmpty() ? Collections.emptyList() : SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(results);
}

//========== OPTIMISATIONS PERFS (START) ===========
@Override
public long countByCollectionInstrumentId(String collectionInstrumentId) {
return mongoRepository.countByCollectionInstrumentId(collectionInstrumentId);
Expand Down
12 changes: 11 additions & 1 deletion src/main/java/fr/insee/genesis/infrastructure/repository/SurveyUnitMongoDBRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,17 @@ public interface SurveyUnitMongoDBRepository extends MongoRepository<SurveyUnitD
@Query(value = "{ 'collectionInstrumentId' : ?0, 'recordDate': { $gte: ?1 } }", fields = "{ 'interrogationId' : 1, 'mode' : 1 }")
List<SurveyUnitDocument> findInterrogationIdsByCollectionInstrumentIdAndDateAfter(String collectionInstrumentId, LocalDateTime since);

/**
@Query(
value = "{ 'collectionInstrumentId' : ?0, 'recordDate': { $gte: ?1, $lt: ?2 } }",
fields = "{ 'interrogationId' : 1, 'mode' : 1 }"
)
List<SurveyUnitDocument> findInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(
String collectionInstrumentId,
LocalDateTime start,
LocalDateTime end
);

/**
* @author Adrien Marchal
*/
@Query(value = "{ 'questionnaireId' : ?0 }", count = true)
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/fr/insee/genesis/controller/rest/responses/InterrogationControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,6 @@ void countAllInterrogationIdsByQuestionnaireOrCollectionInstrumentTest() {
Assertions.assertThat(response.getBody()).isEqualTo(1L);
}



}
31 changes: 31 additions & 0 deletions src/test/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,37 @@ void findDistinctInterrogationIdsByQuestionnaireIdAndDateAfterTest_doc_in_period
).isNotEmpty().hasSize(1);
}

@Test
void findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetweenTest_no_doc_in_period() {
addAdditionnalSurveyUnitModelToMongoStub();

LocalDateTime start = LocalDateTime.of(2025, 9, 1, 0, 0, 0);
LocalDateTime end = LocalDateTime.of(2025, 9, 2, 0, 0, 0);

Assertions.assertThat(
surveyUnitServiceStatic.findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(
DEFAULT_COLLECTION_INSTRUMENT_ID, start, end
)
).filteredOn(interrogationId -> interrogationId.getInterrogationId().equals(DEFAULT_INTERROGATION_ID))
.isEmpty();
}

@Test
void findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetweenTest_doc_in_period() {
addAdditionnalSurveyUnitModelToMongoStub();

LocalDateTime start = LocalDateTime.of(2022, 1, 1, 0, 0, 0);
LocalDateTime end = LocalDateTime.of(2026, 1, 1, 0, 0, 0);

Assertions.assertThat(
surveyUnitServiceStatic.findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(
DEFAULT_COLLECTION_INSTRUMENT_ID, start, end
)
).filteredOn(interrogationId -> interrogationId.getInterrogationId().equals(DEFAULT_INTERROGATION_ID))
.isNotEmpty()
.hasSize(1);
}

@Test
void findInterrogationIdsByQuestionnaireIdTest(){
Assertions.assertThat(surveyUnitServiceStatic.findModesByCollectionInstrumentId(DEFAULT_COLLECTION_INSTRUMENT_ID)).filteredOn(
Expand Down
1 change: 0 additions & 1 deletion src/test/java/fr/insee/genesis/infrastructure/adapter/SurveyUnitModelMongoAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import fr.insee.genesis.infrastructure.document.surveyunit.SurveyUnitDocument;
import fr.insee.genesis.infrastructure.document.surveyunit.VariableDocument;
import fr.insee.genesis.infrastructure.repository.SurveyUnitMongoDBRepository;
import fr.insee.modelefiliere.RawResponseDto;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/fr/insee/genesis/stubs/SurveyUnitPersistencePortStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,20 @@ public List<SurveyUnitModel> findInterrogationIdsByQuestionnaireIdAndDateAfter(S
return surveyUnitModelList;
}

@Override
public List<SurveyUnitModel> findInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(String collectionInstrumentId, LocalDateTime start, LocalDateTime end) {
List<SurveyUnitModel> surveyUnitModelList = new ArrayList<>();
for(SurveyUnitModel surveyUnitModel : mongoStub){
if(surveyUnitModel.getCollectionInstrumentId().equals(collectionInstrumentId)
&& !surveyUnitModel.getRecordDate().isBefore(start)
&& surveyUnitModel.getRecordDate().isBefore(end))
surveyUnitModelList.add(
new SurveyUnitModel(surveyUnitModel.getInterrogationId(), surveyUnitModel.getMode())
);
}

return surveyUnitModelList; }


//======== OPTIMISATIONS PERFS (START) ========
/**
Expand Down
Loading