Merge branch 'main' into develop

dossierfacile-bo/src/main/java/fr/gouv/bo/controller/BOController.java

@@ -148,7 +148,7 @@ public String bo(@ModelAttribute("numberOfDocumentsToProcess") ResultDTO numberO
         model.addAttribute("numberOfTenantsToProcess", tenantService.countTenantsWithStatusInToProcess());
         long result = 0;
         if (numberOfDocumentsToProcess.getId() == null) {
-            result = tenantService.getTotalOfTenantsWithFailedGeneratedPdfDocument();
+            result = tenantService.getCountOfTenantsWithFailedGeneratedPdfDocument();
         }
         model.addAttribute("TenantsWithFailedGeneratedPdf", result);
         model.addAttribute("isUserAdmin", is_admin);

dossierfacile-bo/src/main/java/fr/gouv/bo/repository/DocumentRepository.java

@@ -21,11 +21,11 @@ public interface DocumentRepository extends JpaRepository<Document, Long> {
     @Query(value = """
             SELECT d.id
             FROM Document d
-            WHERE d.documentStatus = 'TO_PROCESS'
-              AND (d.lastModifiedDate IS NULL OR d.lastModifiedDate < :toDateTime)
-              AND d.watermarkFile IS NULL
-            """)
-    Page<Long> findToProcessWithoutPDFToDate(LocalDateTime toDateTime, Pageable pageable);
+            WHERE d.document_status = 'TO_PROCESS'
+              AND (d.last_modified_date IS NULL OR d.last_modified_date < :to)
+              AND d.watermark_file_id IS NULL
+            """, nativeQuery = true)
+    List<Long> findToProcessWithoutPDFToDate(@Param("to") LocalDateTime toDateTime);
 
     @Modifying
     @Query("UPDATE Document d SET d.documentDeniedReasons = :documentDeniedReasons where d.id = :documentId")

dossierfacile-bo/src/main/java/fr/gouv/bo/service/DocumentService.java

@@ -93,26 +93,19 @@ public void initializeFieldsToProcessPdfGeneration(Document document) {
     @Transactional
     public void regenerateFailedPdfDocumentsUsingButtonRequest() {
         synchronized (this) {
-            int numberOfUpdate = 1;
-            int lengthOfPage = 1000;
-            Pageable page = PageRequest.of(0, lengthOfPage, Sort.Direction.DESC, "id");
-            LocalDateTime thirtyMinutesAgo = LocalDateTime.now().minusMinutes(30);
-
-            Page<Long> documents;
-            do {
-                documents = documentRepository.findToProcessWithoutPDFToDate(thirtyMinutesAgo, page);
-                long totalElements = documents.getTotalElements();
-                log.info("Treat PDF Failed :" + lengthOfPage + " on " + totalElements + " elements");
-
-                documents.forEach(documentId -> producer.generatePdf(documentId));
-                log.info("Send number [" + numberOfUpdate++ + "] with " + documents.getNumberOfElements() + " documentId");
+            LocalDateTime oneHourAgo = LocalDateTime.now().minusHours(1);
+            List<Long> documents = documentRepository.findToProcessWithoutPDFToDate(oneHourAgo);
+            log.info("Regenerate [{}] Failed PDF in TO PROCESS status", documents.size());
+
+            documents.forEach(documentId -> {
                 try {
-                    this.wait(30000);
+                    producer.generatePdf(documentId);
+                    Thread.sleep(10);
                 } catch (InterruptedException e) {
-                    log.error("some exception message ", e);
                     Thread.currentThread().interrupt();
+                    log.error("Something wrong on sleep !!! ");
                 }
-            } while (!documents.isEmpty());
+            });
         }
     }
 

dossierfacile-bo/src/main/java/fr/gouv/bo/service/TenantService.java

@@ -763,12 +763,12 @@ private void updatePageOfDocumentsWithNullCreationDateTime(Page<Document> docume
         });
     }
 
-    public long getTotalOfTenantsWithFailedGeneratedPdfDocument() {
-        return tenantRepository.countAllTenantsWithFailedGeneratedPdfDocument();
+    public long getCountOfTenantsWithFailedGeneratedPdfDocument() {
+        return tenantRepository.countAllTenantsWithoutPdfDocument();
     }
 
     public Page<Tenant> getAllTenantsToProcessWithFailedGeneratedPdfDocument(Pageable pageable) {
-        return new PageImpl<>(tenantRepository.findAllTenantsToProcessWithFailedGeneratedPdfDocument(pageable).toList());
+        return new PageImpl<>(tenantRepository.findAllTenantsToProcessWithoutPdfDocument(pageable).toList());
     }
 
     public long countTenantsWithStatusInToProcess() {

dossierfacile-bo/src/main/resources/templates/bo/index.html

@@ -72,15 +72,15 @@
                 <div style="background: bisque; padding: 10px; font-size: 16px; margin-top: 15px;">
                     <a th:href="@{/bo/documentFailedList}" style="text-decoration: none;">
                         <span>
-                            <span style="color: red; font-weight: bold;">PDFs en erreur :</span>
+                            <span style="color: red; font-weight: bold;">Locataires avec erreur PDF :</span>
                             <span th:text="${TenantsWithFailedGeneratedPdf}"></span>
                         </span>
                     </a>
                 </div>
                 <div th:if="${TenantsWithFailedGeneratedPdf != 0}">
                     <form th:action="@{/bo/regeneratePdfDocument}" th:method="post">
                         <button style="border-radius: 5px; width: 100%" class="btn btn-danger bo-btn" name="action" type="submit">
-                            Relancer la génération
+                            Regénération PDF (TO_PROCESS)
                         </button>
                     </form>
                 </div>

dossierfacile-common-library/src/main/java/fr/dossierfacile/common/repository/TenantCommonRepository.java

@@ -107,10 +107,9 @@ SELECT COUNT(DISTINCT t.id)
             LEFT JOIN document d ON d.tenant_id = t.id OR d.guarantor_id = t.id
             WHERE d.watermark_file_id IS NULL
               AND d.document_status IS NOT NULL
-              AND d.last_modified_date IS NOT NULL
-              AND d.last_modified_date < NOW() - INTERVAL '12' HOUR
+              AND ( d.last_modified_date IS NULL OR d.last_modified_date < NOW() - INTERVAL '1' HOUR)
             """, nativeQuery = true)
-    long countAllTenantsWithFailedGeneratedPdfDocument();
+    long countAllTenantsWithoutPdfDocument();
 
     @Query(value = """
             SELECT *
@@ -122,20 +121,19 @@ WHERE t.id IN (
               JOIN document d ON d.tenant_id = t2.id
               WHERE d.watermark_file_id IS NULL
                 AND d.document_status IS NOT NULL
-                AND d.last_modified_date IS NOT NULL
-                AND d.last_modified_date < NOW() - INTERVAL '12' HOUR
+                AND ( d.last_modified_date IS NULL OR d.last_modified_date < NOW() - INTERVAL '1' HOUR)
               UNION DISTINCT
               SELECT t3.id
               FROM tenant t3
               JOIN guarantor g ON g.tenant_id = t3.id
               JOIN document d ON d.guarantor_id = g.id
               WHERE d.watermark_file_id IS NULL
                 AND d.document_status IS NOT NULL
-                AND d.lastModified < NOW() - INTERVAL '12' HOUR
+                AND ( d.last_modified_date IS NULL OR d.last_modified_date < NOW() - INTERVAL '1' HOUR)
             )
             ORDER BY t.last_update_date DESC
             """, nativeQuery = true)
-    Page<Tenant> findAllTenantsToProcessWithFailedGeneratedPdfDocument(Pageable pageable);
+    Page<Tenant> findAllTenantsToProcessWithoutPdfDocument(Pageable pageable);
 
     long countAllByStatus(TenantFileStatus tenantFileStatus);
     //endregion

dossierfacile-pdf-generator/src/main/java/fr/dossierfacile/api/pdfgenerator/service/DocumentServiceImpl.java

@@ -27,7 +27,7 @@ public boolean documentIsUpToDateAt(Long timestamp, Long documentId) {
         LocalDateTime dateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault());
         Document document = documentRepository.findById(documentId).orElse(null);
 
-        return document != null && dateTime.isAfter(document.getLastModifiedDate());
+        return document != null && ( document.getLastModifiedDate() == null || dateTime.isAfter(document.getLastModifiedDate()));
     }
 
     @Override

dossierfacile-process-file/src/main/java/fr/dossierfacile/process/file/service/DocumentServiceImpl.java

@@ -23,7 +23,7 @@ public boolean documentIsUpToDateAt(Long timestamp, Long documentId) {
         LocalDateTime dateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault());
         Document document = documentRepository.findById(documentId).orElse(null);
 
-        return document != null && dateTime.isAfter(document.getLastModifiedDate());
+        return document != null && ( document.getLastModifiedDate() == null || dateTime.isAfter(document.getLastModifiedDate()));
     }
 
     @Override

dossierfacile-process-file/src/main/java/fr/dossierfacile/process/file/service/documentrules/IncomeTaxRulesValidationService.java

@@ -55,7 +55,7 @@ private static String normalizeName(String name) {
             return null;
         String normalized = Normalizer.normalize(name, Normalizer.Form.NFD);
         return normalized.replace('-', ' ')
-                .replaceAll("[\\p{InCombiningDiacriticalMarks}]", "").toUpperCase();
+                .replaceAll("[\\p{InCombiningDiacriticalMarks}]", "").toUpperCase().trim();
     }
 
     @Override
@@ -161,7 +161,7 @@ public DocumentAnalysisReport process(Document document) {
         // Firstname LastName
         Person documentOwner = Optional.ofNullable((Person) document.getTenant()).orElseGet(() -> document.getGuarantor());
         String firstName = documentOwner.getFirstName();
-        String lastName = document.getName();
+        String lastName = documentOwner.getLastName();
         for (File dfFile : document.getFiles()) {
             BarCodeFileAnalysis analysis = dfFile.getFileAnalysis();
             if (analysis.getDocumentType() == BarCodeDocumentType.TAX_ASSESSMENT) {

dossierfacile-task-scheduler/src/main/java/fr/dossierfacile/scheduler/tasks/documenttoprocess/DocumentRepository.java

@@ -15,9 +15,12 @@ public interface DocumentRepository extends JpaRepository<Document, Long> {
             SELECT *
             FROM document
             WHERE document_status = 'TO_PROCESS'
-              AND (last_modified_date IS NULL OR last_modified_date < :to)
               AND watermark_file_id IS NULL
-              LIMIT 100;
+              AND (last_modified_date IS NULL OR last_modified_date < :to)
+            ORDER BY
+              CASE WHEN last_modified_date IS NULL THEN 1 ELSE 0 END,
+              last_modified_date DESC
+            LIMIT 200;
             """, nativeQuery = true)
     List<Document> findToProcessWithoutPDFToDate(@Param("to") LocalDateTime toDateTime);
 }