fix: questionnaire with new collecttionInstrumentId were not listed

Author: loichenninger

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

@@ -24,6 +24,10 @@ public class SurveyUnitModel {
 	// New name of questionnaireId
 	private String collectionInstrumentId;
 	// To be removed
+	/**
+	 * @deprecated We will not receive this identifier anymore
+	 */
+	@Deprecated(forRemoval = true)
 	private String campaignId;
 	private String interrogationId;
 	// New name of idUE

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

@@ -12,8 +12,8 @@
 
 public interface RawResponseApiPort {
 
-    List<RawResponse> getRawResponses(String questionnaireModelId, Mode mode, List<String> interrogationIdList);
-    DataProcessResult processRawResponses(String questionnaireId, List<String> interrogationIdList, List<GenesisError> errors) throws GenesisException;
+    List<RawResponse> getRawResponses(String collectionInstrumentId, Mode mode, List<String> interrogationIdList);
+    DataProcessResult processRawResponses(String collectionInstrumentId, List<String> interrogationIdList, List<GenesisError> errors) throws GenesisException;
     List<SurveyUnitModel> convertRawResponse(List<RawResponse> rawResponses, VariablesMap variablesMap);
     void updateProcessDates(List<SurveyUnitModel> surveyUnitModels);
 }

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

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mongodb.client.MongoCollection;
 import fr.insee.genesis.Constants;
 import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
 import fr.insee.genesis.domain.ports.spi.SurveyUnitPersistencePort;
@@ -11,6 +12,7 @@
 import fr.insee.genesis.infrastructure.repository.SurveyUnitMongoDBRepository;
 import jakarta.validation.constraints.NotNull;
 import lombok.extern.slf4j.Slf4j;
+import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -207,11 +209,11 @@ public long countByCampaignId(String campaignId){
 	@Override
 	public Set<String> findDistinctQuestionnaireIds() {
 		Set<String> questionnaireIds = new HashSet<>();
-		for(String questionnaireId : mongoTemplate.getCollection(Constants.MONGODB_RESPONSE_COLLECTION_NAME).distinct(
-                QUESTIONNAIRE_ID,
-				String.class)){
-			questionnaireIds.add(questionnaireId);
-		}
+		// Id selection is executed by mongoDB
+		MongoCollection<Document> collection = mongoTemplate.getCollection(Constants.MONGODB_RESPONSE_COLLECTION_NAME);
+		collection.distinct("questionnaireId", String.class).into(questionnaireIds);
+		collection.distinct("collectionInstrumentId", String.class).into(questionnaireIds);
+		questionnaireIds.remove(null);
 		return questionnaireIds;
 	}