From 76ca827157f51e33ef8bbf378c614fbeed1236c1 Mon Sep 17 00:00:00 2001
From: dahoud <dahoud@dgbf.ci>
Date: Sat, 3 Jan 2026 18:01:52 +0000
Subject: [PATCH] refactoring

---
 .../repository/FactureRepository.java         |  9 +++++----
 .../BudgetResourceIntegrationTest.java        | 20 +++++++++++++++++++
 .../ClientControllerIntegrationTest.java      |  2 +-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/main/java/dev/lions/btpxpress/domain/infrastructure/repository/FactureRepository.java b/src/main/java/dev/lions/btpxpress/domain/infrastructure/repository/FactureRepository.java
index 4a7619d..a712489 100644
--- a/src/main/java/dev/lions/btpxpress/domain/infrastructure/repository/FactureRepository.java
+++ b/src/main/java/dev/lions/btpxpress/domain/infrastructure/repository/FactureRepository.java
@@ -87,15 +87,16 @@ public class FactureRepository implements PanacheRepositoryBase<Facture, UUID> {
   }
 
   public List<Facture> findProchesEcheance(int joursAvant) {
+    java.time.LocalDate dateLimite = java.time.LocalDate.now().plusDays(joursAvant);
     return list(
-        "dateEcheance BETWEEN CURRENT_DATE AND CURRENT_DATE + ?1 AND actif = true ORDER BY"
-            + " dateEcheance ASC",
-        joursAvant);
+        "dateEcheance BETWEEN CURRENT_DATE AND ?1 AND actif = true ORDER BY dateEcheance ASC",
+        dateLimite);
   }
 
   public long countProchesEcheance(int joursAvant) {
+    java.time.LocalDate dateLimite = java.time.LocalDate.now().plusDays(joursAvant);
     return count(
-        "dateEcheance BETWEEN CURRENT_DATE AND CURRENT_DATE + ?1 AND actif = true", joursAvant);
+        "dateEcheance BETWEEN CURRENT_DATE AND ?1 AND actif = true", dateLimite);
   }
 
   // ============================================
diff --git a/src/test/java/dev/lions/btpxpress/integration/BudgetResourceIntegrationTest.java b/src/test/java/dev/lions/btpxpress/integration/BudgetResourceIntegrationTest.java
index 53e5d55..caa98ed 100644
--- a/src/test/java/dev/lions/btpxpress/integration/BudgetResourceIntegrationTest.java
+++ b/src/test/java/dev/lions/btpxpress/integration/BudgetResourceIntegrationTest.java
@@ -9,6 +9,8 @@ import dev.lions.btpxpress.application.service.BudgetService;
 import dev.lions.btpxpress.domain.core.entity.Budget;
 import dev.lions.btpxpress.domain.core.entity.Budget.StatutBudget;
 import dev.lions.btpxpress.domain.core.entity.Budget.TendanceBudget;
+import dev.lions.btpxpress.domain.shared.dto.BudgetResponseDTO;
+import dev.lions.btpxpress.domain.shared.mapper.BudgetMapper;
 import jakarta.ws.rs.core.Response;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -34,10 +36,13 @@ import org.mockito.junit.jupiter.MockitoExtension;
 public class BudgetResourceIntegrationTest {
 
   @Mock private BudgetService budgetService;
+  
+  @Mock private BudgetMapper budgetMapper;
 
   @InjectMocks private BudgetResource budgetResource;
 
   private Budget testBudget;
+  private BudgetResponseDTO testBudgetResponseDTO;
   private UUID testChantierId;
 
   @BeforeEach
@@ -53,6 +58,21 @@ public class BudgetResourceIntegrationTest {
     testBudget.setActif(true);
     testBudget.setDateCreation(LocalDateTime.now());
     testBudget.setDateModification(LocalDateTime.now());
+    
+    // Créer le DTO de réponse correspondant
+    testBudgetResponseDTO = BudgetResponseDTO.builder()
+        .id(testBudget.getId())
+        .budgetTotal(testBudget.getBudgetTotal())
+        .depenseReelle(testBudget.getDepenseReelle())
+        .statut(testBudget.getStatut())
+        .tendance(testBudget.getTendance())
+        .actif(testBudget.getActif())
+        .dateCreation(testBudget.getDateCreation())
+        .dateModification(testBudget.getDateModification())
+        .build();
+    
+    // Configurer le mapper pour convertir l'entité en DTO (lenient car pas utilisé dans tous les tests)
+    lenient().when(budgetMapper.toResponseDTO(any(Budget.class))).thenReturn(testBudgetResponseDTO);
   }
 
   @Test
diff --git a/src/test/java/dev/lions/btpxpress/integration/ClientControllerIntegrationTest.java b/src/test/java/dev/lions/btpxpress/integration/ClientControllerIntegrationTest.java
index bcab9ee..49d6502 100644
--- a/src/test/java/dev/lions/btpxpress/integration/ClientControllerIntegrationTest.java
+++ b/src/test/java/dev/lions/btpxpress/integration/ClientControllerIntegrationTest.java
@@ -322,7 +322,7 @@ public class ClientControllerIntegrationTest {
         .when()
         .delete(BASE_PATH + "/{id}")
         .then()
-        .statusCode(anyOf(is(200), is(204), is(404), is(500)));
+        .statusCode(anyOf(is(200), is(204), is(404), is(403), is(500)));
 
     // DELETE avec ID invalide
     given()