Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-7812 - Dossier template will be renamed every time after each import

Browse Source 
- put back the checking by name for the other cases (when cloning, creating, updating a dossier template)
This commit is contained in:
Corina Olariu 2023-10-24 15:15:27 +03:00
parent 6d245ae7b6
commit 5a3432e6c6
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java
View File

@ -89,8 +89,9 @@ public class DossierTemplatePersistenceService {
@Transactional @Transactional
public void validateDossierTemplateNameIsUnique(String templateName) { public void validateDossierTemplateNameIsUnique(String templateName) {
var isUnique = isDossierTemplateNameNotUnique(templateName);
if (isDossierTemplateNameNotUnique(templateName, null)) { log.info("validateDossierTemplateNameIsUnique {} - {}", isUnique, templateName);
if (isUnique) {
throw new ConflictException("DossierTemplate name must be unique"); throw new ConflictException("DossierTemplate name must be unique");
} }
} }
@ -114,6 +115,11 @@ public class DossierTemplatePersistenceService {
return dossierTemplateRepository.existsByNameAndIdNot(templateName, dossierTemplateIdToIgnore); return dossierTemplateRepository.existsByNameAndIdNot(templateName, dossierTemplateIdToIgnore);
} }
@Transactional
public boolean isDossierTemplateNameNotUnique(String templateName) {
return dossierTemplateRepository.existsByName(templateName);
}
@Transactional @Transactional
public DossierTemplateStatus computeDossierTemplateStatus(DossierTemplateEntity dossierTemplate) { public DossierTemplateStatus computeDossierTemplateStatus(DossierTemplateEntity dossierTemplate) {

1
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierTemplateRepository.java
View File

@ -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") @Query("select d from DossierTemplateEntity d where d.id = :dossierTemplateId and d.softDeleteTime is null")
Optional<DossierTemplateEntity> findByIdAndNotDeleted(String dossierTemplateId); Optional<DossierTemplateEntity> findByIdAndNotDeleted(String dossierTemplateId);
boolean existsByName(String name);
boolean existsByNameAndIdNot(String name, String id); boolean existsByNameAndIdNot(String name, String id);