From 01f92075bdc8022b7436f407b2d70d2e0aa0b593 Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Wed, 1 Nov 2023 11:22:32 +0200 Subject: [PATCH] RED-7677 - dossier-template endpoint should return a 400 if validFrom > validTo --- .../persistence/DossierTemplatePersistenceService.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java index 0187315f8..aa119ea4d 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java @@ -39,6 +39,7 @@ public class DossierTemplatePersistenceService { public DossierTemplateEntity createOrUpdateDossierTemplate(CreateOrUpdateDossierTemplateRequest createOrUpdateDossierRequest) { if (createOrUpdateDossierRequest.getDossierTemplateId() != null) { + validateDossierTemplateDates(createOrUpdateDossierRequest.getValidFrom(), createOrUpdateDossierRequest.getValidTo()); validateDossierTemplate(createOrUpdateDossierRequest.getName(), createOrUpdateDossierRequest.getDescription()); Optional dossierTemplate = dossierTemplateRepository.findById(createOrUpdateDossierRequest.getDossierTemplateId()); if (dossierTemplate.isPresent()) { @@ -77,6 +78,15 @@ public class DossierTemplatePersistenceService { } + + private void validateDossierTemplateDates(OffsetDateTime validFrom, OffsetDateTime validTo) { + + if (validFrom != null && validTo != null && validFrom.isAfter(validTo)) { + throw new BadRequestException("Invalid dates! validFrom can't be after validTo."); + } + } + + public void validateDossierTemplate(String name, String description) { if (!StringUtils.isEmpty(name) && name.length() > MAX_NAME_LENGTH) {