From 5a3432e6c6d2a9744a094905ceef91eef53d90a5 Mon Sep 17 00:00:00 2001
From: Corina Olariu <corina.olariu.ext@knecon.com>
Date: Tue, 24 Oct 2023 15:15:27 +0300
Subject: [PATCH] RED-7812 - Dossier template will be renamed every time after
 each import

- put back the checking by name for the other cases (when cloning, creating, updating a dossier template)
---
 .../persistence/DossierTemplatePersistenceService.java | 10 ++++++++--
 .../repository/DossierTemplateRepository.java          |  1 +
 2 files changed, 9 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/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 79f743e0b..9eaf511b2 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
@@ -89,8 +89,9 @@ public class DossierTemplatePersistenceService {
 
     @Transactional
     public void validateDossierTemplateNameIsUnique(String templateName) {
-
-        if (isDossierTemplateNameNotUnique(templateName, null)) {
+        var isUnique = isDossierTemplateNameNotUnique(templateName);
+        log.info("validateDossierTemplateNameIsUnique {} - {}", isUnique, templateName);
+        if (isUnique) {
             throw new ConflictException("DossierTemplate name must be unique");
         }
     }
@@ -114,6 +115,11 @@ public class DossierTemplatePersistenceService {
         return dossierTemplateRepository.existsByNameAndIdNot(templateName, dossierTemplateIdToIgnore);
     }
 
+    @Transactional
+    public boolean isDossierTemplateNameNotUnique(String templateName) {
+        return dossierTemplateRepository.existsByName(templateName);
+    }
+
 
     @Transactional
     public DossierTemplateStatus computeDossierTemplateStatus(DossierTemplateEntity dossierTemplate) {
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierTemplateRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierTemplateRepository.java
index 057d20ca4..61fca2f2f 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierTemplateRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierTemplateRepository.java
@@ -17,6 +17,7 @@ public interface DossierTemplateRepository extends JpaRepository<DossierTemplate
     @Query("select d from DossierTemplateEntity d where d.id = :dossierTemplateId and d.softDeleteTime is null")
     Optional<DossierTemplateEntity> findByIdAndNotDeleted(String dossierTemplateId);
 
+    boolean existsByName(String name);
 
     boolean existsByNameAndIdNot(String name, String id);