refactoring

This commit is contained in:
dahoud
2026-01-03 18:01:52 +00:00
parent 3bc6661a89
commit 76ca827157
3 changed files with 26 additions and 5 deletions

View File

@@ -87,15 +87,16 @@ public class FactureRepository implements PanacheRepositoryBase<Facture, UUID> {
} }
public List<Facture> findProchesEcheance(int joursAvant) { public List<Facture> findProchesEcheance(int joursAvant) {
java.time.LocalDate dateLimite = java.time.LocalDate.now().plusDays(joursAvant);
return list( return list(
"dateEcheance BETWEEN CURRENT_DATE AND CURRENT_DATE + ?1 AND actif = true ORDER BY" "dateEcheance BETWEEN CURRENT_DATE AND ?1 AND actif = true ORDER BY dateEcheance ASC",
+ " dateEcheance ASC", dateLimite);
joursAvant);
} }
public long countProchesEcheance(int joursAvant) { public long countProchesEcheance(int joursAvant) {
java.time.LocalDate dateLimite = java.time.LocalDate.now().plusDays(joursAvant);
return count( return count(
"dateEcheance BETWEEN CURRENT_DATE AND CURRENT_DATE + ?1 AND actif = true", joursAvant); "dateEcheance BETWEEN CURRENT_DATE AND ?1 AND actif = true", dateLimite);
} }
// ============================================ // ============================================

View File

@@ -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;
import dev.lions.btpxpress.domain.core.entity.Budget.StatutBudget; import dev.lions.btpxpress.domain.core.entity.Budget.StatutBudget;
import dev.lions.btpxpress.domain.core.entity.Budget.TendanceBudget; 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 jakarta.ws.rs.core.Response;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -34,10 +36,13 @@ import org.mockito.junit.jupiter.MockitoExtension;
public class BudgetResourceIntegrationTest { public class BudgetResourceIntegrationTest {
@Mock private BudgetService budgetService; @Mock private BudgetService budgetService;
@Mock private BudgetMapper budgetMapper;
@InjectMocks private BudgetResource budgetResource; @InjectMocks private BudgetResource budgetResource;
private Budget testBudget; private Budget testBudget;
private BudgetResponseDTO testBudgetResponseDTO;
private UUID testChantierId; private UUID testChantierId;
@BeforeEach @BeforeEach
@@ -53,6 +58,21 @@ public class BudgetResourceIntegrationTest {
testBudget.setActif(true); testBudget.setActif(true);
testBudget.setDateCreation(LocalDateTime.now()); testBudget.setDateCreation(LocalDateTime.now());
testBudget.setDateModification(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 @Test

View File

@@ -322,7 +322,7 @@ public class ClientControllerIntegrationTest {
.when() .when()
.delete(BASE_PATH + "/{id}") .delete(BASE_PATH + "/{id}")
.then() .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 // DELETE avec ID invalide
given() given()