Merge pull request #420 from InseeFr/devVolum

fix: change query to have all questionnaireId

Author: alicela

Dockerfile

@@ -4,14 +4,14 @@ ENV PATH_TO_JAR=/opt/app/app.jar
 WORKDIR /opt/app/
 COPY ./target/*.jar $PATH_TO_JAR
 
-ENV JAVA_TOOL_OPTIONS_DEFAULT \
-    -XX:MaxRAMPercentage=75
+ENV JAVA_TOOL_OPTIONS_DEFAULT="-XX:MaxRAMPercentage=75"
 
 # Setup a non-root user context (security)
-RUN addgroup -g 1000 tomcatgroup \
-&& adduser -D -s / -u 1000 tomcatuser -G tomcatgroup \
-&& mkdir /opt/app/temp-files \
-&& chown -R 1000:1000 /opt/app
+RUN if ! getent passwd 1000 >/dev/null; then \
+      useradd -u 1000 -g 1000 -s /usr/sbin/nologin -M tomcatuser; \
+    fi \
+ && mkdir -p /opt/app/temp-files \
+ && chown -R 1000:1000 /opt/app
 
 USER 1000
 

pom.xml

@@ -36,7 +36,7 @@
         <!-- Pi Test-->
         <pitest.version>1.22.1</pitest.version>
         <pitest.junit.version>1.2.3</pitest.junit.version>
-        <bpm.version>1.0.26</bpm.version>
+        <bpm.version>1.1.0</bpm.version>
     </properties>
     <dependencies>
         <dependency>

src/main/java/fr/insee/genesis/domain/service/volumetry/VolumetryLogService.java

@@ -2,9 +2,9 @@
 
 import fr.insee.genesis.Constants;
 import fr.insee.genesis.configuration.Config;
+import fr.insee.genesis.domain.ports.api.LunaticJsonRawDataApiPort;
 import fr.insee.genesis.domain.ports.api.RawResponseApiPort;
 import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
-import fr.insee.genesis.domain.ports.api.LunaticJsonRawDataApiPort;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -98,7 +98,7 @@ public Map<String, Map<String, Long>> writeRawDataVolumetries(
 
         Files.writeString(
                 logFilePath,
-                "questionnaireId;%s;%s;%s;distinctInterrogationIds\n"
+                "questionnaireId;%s;%s;%s;distinctInterrogationIds%n"
                         .formatted(
                                 Constants.MONGODB_LUNATIC_RAWDATA_COLLECTION_NAME,
                                 Constants.MONGODB_RAW_RESPONSES_COLLECTION_NAME,

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

@@ -95,14 +95,14 @@ public void updateProcessDates(String campaignId, Set<String> interrogationIds)
 
     @Override
     public Set<String> findDistinctQuestionnaireIds() {
-        Set<String> questionnaireIds = new HashSet<>();
-        for (String questionnaireId : mongoTemplate.getCollection(Constants.MONGODB_RAW_RESPONSES_COLLECTION_NAME).distinct(
-                "questionnaireId",
-                String.class)) {
-            questionnaireIds.add(questionnaireId);
+        List<String> ids = mongoTemplate.query(LunaticJsonRawDataDocument.class)
+                    .distinct("questionnaireId")
+                    .as(String.class)
+                    .all();
+        return ids.stream()
+                    .filter(id -> id != null && !id.isBlank())
+                    .collect(java.util.stream.Collectors.toSet());
         }
-        return questionnaireIds;
-    }
 
     @Override
     public Page<LunaticJsonRawDataModel> findByCampaignIdAndDate(String campaignId, Instant startDt, Instant  endDt, Pageable pageable) {