fix: fixes for KW

Author: loichenninger

src/main/java/fr/insee/genesis/controller/dto/SurveyUnitSimplified.java

@@ -11,10 +11,14 @@
 @Data
 public class SurveyUnitSimplified {
 
-	private String questionnaireId;
+	private String collectionInstrumentId;
+	/**
+	 * @deprecated We will not reveive this piece of information anymore
+	 */
+	@Deprecated(forRemoval = true)
 	private String campaignId;
 	private String interrogationId;
-	private String surveyUnitId;
+	private String usualSurveyUnitId;
 	private Mode mode;
 	private List<VariableModel> variablesUpdate;
 	private List<VariableModel> externalVariables;

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

@@ -28,7 +28,7 @@ public ModeController(SurveyUnitApiPort surveyUnitService) {
 
     @Operation(summary = "List sources/modes used for a given collection instrument (ex questionnaire)")
     @GetMapping(path = "/by-questionnaire")
-    public ResponseEntity<List<Mode>> getModesByQuestionnaire(@RequestParam("collectionInstrumentId") String collectionInstrumentId) {
+    public ResponseEntity<List<Mode>> getModesByQuestionnaire(@RequestParam("questionnaireId") String collectionInstrumentId) {
         List<Mode> modes = surveyUnitService.findModesByCollectionInstrumentId(collectionInstrumentId);
         return ResponseEntity.ok(modes);
     }

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

@@ -283,10 +283,10 @@ public ResponseEntity<SurveyUnitSimplified> getLatestByInterrogationOneObject(@R
             outputExternalVariables.addAll(response.getExternalVariables());
         });
         return ResponseEntity.ok(SurveyUnitSimplified.builder()
-                .questionnaireId(responses.getFirst().getCollectionInstrumentId())
+                .collectionInstrumentId(responses.getFirst().getCollectionInstrumentId())
                 .campaignId(responses.getFirst().getCampaignId())
                 .interrogationId(responses.getFirst().getInterrogationId())
-                .surveyUnitId(responses.getFirst().getUsualSurveyUnitId())
+                .usualSurveyUnitId(responses.getFirst().getUsualSurveyUnitId())
                 .variablesUpdate(outputVariables)
                 .externalVariables(outputExternalVariables)
                 .build());
@@ -315,10 +315,10 @@ public ResponseEntity<List<SurveyUnitSimplified>> getLatestForInterrogationListA
                 });
                 if (!outputVariables.isEmpty() || !outputExternalVariables.isEmpty()) {
                     results.add(SurveyUnitSimplified.builder()
-                            .questionnaireId(responses.getFirst().getCollectionInstrumentId())
+                            .collectionInstrumentId(responses.getFirst().getCollectionInstrumentId())
                             .campaignId(responses.getFirst().getCampaignId())
                             .interrogationId(responses.getFirst().getInterrogationId())
-                            .surveyUnitId(responses.getFirst().getUsualSurveyUnitId())
+                            .usualSurveyUnitId(responses.getFirst().getUsualSurveyUnitId())
                             .mode(mode)
                             .variablesUpdate(outputVariables)
                             .externalVariables(outputExternalVariables)
@@ -395,7 +395,7 @@ private SurveyUnitSimplified fusionWithLastUpdated(List<SurveyUnitModel> respons
             Mode modeWrapped = Mode.getEnumFromModeName(mode);
 
             simplifiedResponse = SurveyUnitSimplified.builder()
-                    .questionnaireId(responsesForSingleInterrId.getFirst().getCollectionInstrumentId())
+                    .collectionInstrumentId(responsesForSingleInterrId.getFirst().getCollectionInstrumentId())
                     .campaignId(responsesForSingleInterrId.getFirst().getCampaignId())
                     .interrogationId(responsesForSingleInterrId.getFirst().getInterrogationId())
                     .mode(modeWrapped)

src/main/java/fr/insee/genesis/domain/ports/spi/SurveyUnitPersistencePort.java

@@ -26,8 +26,6 @@ public interface SurveyUnitPersistencePort {
 
     Stream<SurveyUnitModel> findByQuestionnaireId(String questionnaireId);
 
-    List<SurveyUnitModel> findInterrogationIdsByQuestionnaireId(String questionnaireId);
-
     List<SurveyUnitModel> findInterrogationIdsByCollectionInstrumentId(String collectionInstrumentId);
 
     List<SurveyUnitModel> findInterrogationIdsByQuestionnaireIdAndDateAfter(String questionnaireId, LocalDateTime since);

src/main/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitService.java

@@ -265,7 +265,7 @@ public SurveyUnitDto findLatestValuesByStateByIdAndByCollectionInstrumentId(
 
     @Override
     public List<InterrogationId> findDistinctInterrogationIdsByQuestionnaireId(String questionnaireId) {
-        List<SurveyUnitModel> surveyUnitModels = surveyUnitPersistencePort.findInterrogationIdsByQuestionnaireId(questionnaireId);
+        List<SurveyUnitModel> surveyUnitModels = surveyUnitPersistencePort.findInterrogationIdsByCollectionInstrumentId(questionnaireId);
         List<InterrogationId> suIds = new ArrayList<>();
         surveyUnitModels.forEach(surveyUnitModel -> suIds.add(new InterrogationId(surveyUnitModel.getInterrogationId())));
         return suIds.stream().distinct().toList();
@@ -325,7 +325,7 @@ public long countInterrogationIdsByQuestionnaireId(String questionnaireId) {
 
     @Override
     public List<SurveyUnitModel> findInterrogationIdsAndModesByQuestionnaireId(String questionnaireId) {
-        List<SurveyUnitModel> surveyUnitModels = surveyUnitPersistencePort.findInterrogationIdsByQuestionnaireId(questionnaireId);
+        List<SurveyUnitModel> surveyUnitModels = surveyUnitPersistencePort.findInterrogationIdsByCollectionInstrumentId(questionnaireId);
         return surveyUnitModels.stream().distinct().toList();
     }
 

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

@@ -151,16 +151,12 @@ public Set<String> findDistinctCampaignIds() {
 		return campaignIds;
 	}
 
-	@Override
-	public List<SurveyUnitModel> findInterrogationIdsByQuestionnaireId(String questionnaireId) {
-		List<SurveyUnitDocument> surveyUnits = mongoRepository.findInterrogationIdsByQuestionnaireId(questionnaireId);
-		return surveyUnits.isEmpty() ? Collections.emptyList() : SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(surveyUnits);
-	}
-
 	@Override
 	public List<SurveyUnitModel> findInterrogationIdsByCollectionInstrumentId(String collectionInstrumentId) {
-		List<SurveyUnitDocument> surveyUnits = mongoRepository.findInterrogationIdsByCollectionInstrumentId(collectionInstrumentId);
-		return surveyUnits.isEmpty() ? Collections.emptyList() : SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(surveyUnits);
+		List<SurveyUnitDocument> results =  new ArrayList<>();
+		results.addAll(mongoRepository.findInterrogationIdsByCollectionInstrumentId(collectionInstrumentId));
+		results.addAll(mongoRepository.findInterrogationIdsByQuestionnaireId(collectionInstrumentId));
+		return results.isEmpty() ? Collections.emptyList() : SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(results);
 	}
 
 	@Override

src/test/java/fr/insee/genesis/controller/rest/ControllerAccessTest.java

@@ -111,7 +111,7 @@ private static Stream<Arguments> endpointsReader() {
                 Arguments.of("/questionnaires/with-campaigns"),
                 Arguments.of("/questionnaires/by-campaign?campaignId=CAMPAIGNTEST"),
                 Arguments.of("/questionnaires/"),
-                Arguments.of("/modes/by-questionnaire?collectionInstrumentId=QUESTTEST"),
+                Arguments.of("/modes/by-questionnaire?questionnaireId=QUESTTEST"),
                 Arguments.of("/modes/by-campaign?campaignId=CAMPAIGNTEST"),
                 Arguments.of("/interrogations/by-questionnaire?questionnaireId=QUESTTEST"),
                 Arguments.of("/campaigns/with-questionnaires"),

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

@@ -76,19 +76,6 @@ public Stream<SurveyUnitModel> findByQuestionnaireId(String questionnaireId) {
         return surveyUnitModelList.stream();
     }
 
-    @Override
-    public List<SurveyUnitModel> findInterrogationIdsByQuestionnaireId(String questionnaireId) {
-        List<SurveyUnitModel> surveyUnitModelList = new ArrayList<>();
-        for(SurveyUnitModel SurveyUnitModel : mongoStub){
-            if(SurveyUnitModel.getCollectionInstrumentId().equals(questionnaireId))
-                surveyUnitModelList.add(
-                        new SurveyUnitModel(SurveyUnitModel.getInterrogationId(), SurveyUnitModel.getMode())
-                );
-        }
-
-        return surveyUnitModelList;
-    }
-
     @Override
     public List<SurveyUnitModel> findInterrogationIdsByCollectionInstrumentId(String collectionInstrumentId) {
         List<SurveyUnitModel> surveyUnitModelList = new ArrayList<>();
@@ -103,7 +90,7 @@ public List<SurveyUnitModel> findInterrogationIdsByCollectionInstrumentId(String
 
     @Override
     public List<SurveyUnitModel> findModesByQuestionnaireIdV2(String questionnaireId) {
-        return findInterrogationIdsByQuestionnaireId(questionnaireId);
+        return findInterrogationIdsByCollectionInstrumentId(questionnaireId);
     }
 
     @Override