Skip to content

Commit b850c95

Browse files
committed
add some modifications
1 parent 8b9e84c commit b850c95

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

src/main/java/fr/insee/genesis/infrastructure/adapter/LunaticJsonRawDataMongoAdapter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ public List<LunaticJsonRawDataModel> findRawData(String campaignName, Mode mode,
5656

5757
@Override
5858
public List<LunaticJsonRawDataModel> findRawDataByInterrogationID(String interrogationId) {
59-
return repository.findByInterrogationId(interrogationId);
59+
List<LunaticJsonRawDataDocument> rawDataDocs = repository.findByInterrogationId(interrogationId);
60+
return LunaticJsonRawDataDocumentMapper.INSTANCE.listDocumentToListModel(rawDataDocs);
6061
}
6162

6263
@Override

src/main/java/fr/insee/genesis/infrastructure/repository/LunaticJsonMongoDBRepository.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package fr.insee.genesis.infrastructure.repository;
22

33
import fr.insee.genesis.domain.model.surveyunit.Mode;
4-
import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
54
import fr.insee.genesis.infrastructure.document.rawdata.LunaticJsonRawDataDocument;
65
import fr.insee.genesis.infrastructure.document.surveyunit.GroupedInterrogationDocument;
76
import org.springframework.data.mongodb.repository.Aggregation;
@@ -28,7 +27,7 @@ public interface LunaticJsonMongoDBRepository extends MongoRepository<LunaticJso
2827
List<LunaticJsonRawDataDocument> findModesByCampaignIdAndByModeAndinterrogationIdIninterrogationIdList(String campaignName, Mode mode, List<String> interrogationIdList);
2928

3029
@Query(value = "{ 'interrogationId': ?0}")
31-
List<LunaticJsonRawDataModel> findByInterrogationId(String interrogationId);
30+
List<LunaticJsonRawDataDocument> findByInterrogationId(String interrogationId);
3231

3332
Page<LunaticJsonRawDataDocument> findByCampaignIdAndRecordDateBetween(String campagneId, Instant start, Instant end, Pageable pageable);
3433
long countByQuestionnaireId(String questionnaireId);

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package fr.insee.genesis.stubs;
22

33
import fr.insee.genesis.domain.model.surveyunit.Mode;
4-
import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
54
import fr.insee.genesis.infrastructure.document.rawdata.LunaticJsonRawDataDocument;
65
import fr.insee.genesis.infrastructure.document.surveyunit.GroupedInterrogationDocument;
7-
import fr.insee.genesis.infrastructure.mappers.LunaticJsonRawDataDocumentMapper;
86
import fr.insee.genesis.infrastructure.repository.LunaticJsonMongoDBRepository;
97
import lombok.Getter;
108
import org.springframework.data.domain.Example;
@@ -59,12 +57,11 @@ public List<LunaticJsonRawDataDocument> findModesByCampaignIdAndByModeAndinterro
5957
}
6058

6159
@Override
62-
public List<LunaticJsonRawDataModel> findByInterrogationId(String interrogationId) {
63-
return LunaticJsonRawDataDocumentMapper.INSTANCE.listDocumentToListModel(
64-
documents.stream()
60+
public List<LunaticJsonRawDataDocument> findByInterrogationId(String interrogationId) {
61+
return documents.stream()
6562
.filter(doc -> Objects.equals(doc.interrogationId(), interrogationId))
6663
.toList()
67-
);
64+
;
6865
}
6966

7067
@Override

0 commit comments

Comments
 (0)