From 13ed7a3a8a858bd46583812c1dab42447c844f15 Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Mon, 9 Oct 2023 12:36:15 +0300 Subject: [PATCH] RED-7185 - RM-46 - Error message when adjusting the Justification - validate the name and description of dossier template when cloning - check for null for dossier template's name --- .../v1/processor/service/DossierTemplateCloneService.java | 5 +++++ .../persistence/DossierTemplatePersistenceService.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateCloneService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateCloneService.java index 1a5afb981..59b016b12 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateCloneService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateCloneService.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -63,6 +64,10 @@ public class DossierTemplateCloneService { public DossierTemplateEntity cloneDossierTemplate(String dossierTemplateId, CloneDossierTemplateRequest cloneDossierTemplateRequest) { + if (StringUtils.isEmpty(cloneDossierTemplateRequest.getName())) { + throw new ConflictException("DossierTemplate name must be set"); + } + dossierTemplatePersistenceService.validateDossierTemplate(cloneDossierTemplateRequest.getName(), cloneDossierTemplateRequest.getDescription()); dossierTemplatePersistenceService.validateDossierTemplateNameIsUnique(cloneDossierTemplateRequest.getName()); DossierTemplateEntity clonedDossierTemplate = new DossierTemplateEntity(); 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 7b264650c..0187315f8 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 @@ -77,9 +77,9 @@ public class DossierTemplatePersistenceService { } - private void validateDossierTemplate(String name, String description) { + public void validateDossierTemplate(String name, String description) { - if (name.length() > MAX_NAME_LENGTH) { + if (!StringUtils.isEmpty(name) && name.length() > MAX_NAME_LENGTH) { throw new BadRequestException(String.format("The name is too long (%s), max length %s", name.length(), MAX_NAME_LENGTH)); } -- 2.47.2