fix: get interrogationIds

Author: alexisszmundy

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

@@ -99,6 +99,12 @@ public List<GroupedInterrogation> findUnprocessedIds() {
 
     @Override
     public Set<String> findUnprocessedInterrogationIdsByQuestionnaire(String questionnaireId) {
-        return new HashSet<>(repository.getUnprocessedInterrogationIds(questionnaireId));
+        Set<String> interrogationIds = new HashSet<>();
+
+        repository.aggregateRawGroupedWithNullProcessDate(questionnaireId).forEach(
+                groupedInterrogationDocument -> interrogationIds.addAll(groupedInterrogationDocument.getInterrogationIds())
+        );
+
+        return interrogationIds;
     }
 }

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

@@ -64,6 +64,21 @@ public interface LunaticJsonMongoDBRepository extends MongoRepository<LunaticJso
     })
     List<GroupedInterrogationDocument> aggregateRawGroupedWithNullProcessDate();
 
-    @Query(value = "{ 'questionnaireId' : ?0, 'processDate': null}", fields = "{ 'interrogationId' :  1 }")
-    List<String> getUnprocessedInterrogationIds(String questionnaireId);
+    @Aggregation(pipeline = {
+            "{ '$match': {'questionnaireId': ?0 ,'processDate': null } }",
+            "{ '$group': { " +
+                    "'_id': { " +
+                    "'questionnaireId': '$questionnaireId', " +
+                    "'partitionOrCampaignId': { '$ifNull': ['$partitionId', '$campaignId'] } " +
+                    "}, " +
+                    "'interrogationIds': { '$addToSet': '$interrogationId' } " +
+                    "} }",
+            "{ '$project': { " +
+                    "'questionnaireId': '$_id.questionnaireId', " +
+                    "'partitionOrCampaignId': '$_id.partitionOrCampaignId', " +
+                    "'interrogationIds': 1, " +
+                    "'_id': 0 " +
+                    "} }"
+    })
+    List<GroupedInterrogationDocument> aggregateRawGroupedWithNullProcessDate(String questionnaireId);
 }