diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DictionaryManagementService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DictionaryManagementService.java index cfa0613f1..51ac4103f 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DictionaryManagementService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DictionaryManagementService.java @@ -275,6 +275,9 @@ public class DictionaryManagementService { public void checkForDossierTypeExistenceAndCreate(String typeId) { + checkForDossierTypeExistenceAndCreate(typeId,false); + } + public void checkForDossierTypeExistenceAndCreate(String typeId, boolean includeDeleted) { // check for the existence of dossier type and create in case it does not exist if (isDossierTypeId(typeId)) { try { @@ -286,7 +289,7 @@ public class DictionaryManagementService { log.info("--> " + dossierId + " - " + dossierTemplateId); checkDossierMatchesDossierTemplate(dossierId, dossierTemplateId); // type not found, it should be created based on the info from the dossier template type - var dossierTemplateType = dictionaryPersistenceService.getType(getDosssierTemplateTypeIdFromTypeId(typeId)); + var dossierTemplateType = dictionaryPersistenceService.getType(getDosssierTemplateTypeIdFromTypeId(typeId),includeDeleted); Type dossierDictionaryType = MagicConverter.convert(dossierTemplateType, Type.class); dossierDictionaryType.setVersion(0); dossierDictionaryType.setDossierId(dossierId); diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DictionaryService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DictionaryService.java index 3efa30149..35a2a3bfe 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DictionaryService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DictionaryService.java @@ -227,7 +227,7 @@ public class DictionaryService { accessControlService.verifyUserHasViewPermissions(dossierId); dictionaryManagementService.checkDossierMatchesDossierTemplate(dossierId, dossierTemplateId); // for every dossier template type check if a dossier type exists - types.forEach(t -> dictionaryManagementService.checkForDossierTypeExistenceAndCreate(toTypeId(t.getType(), t.getDossierTemplateId(), dossierId))); + types.forEach(t -> dictionaryManagementService.checkForDossierTypeExistenceAndCreate(toTypeId(t.getType(), t.getDossierTemplateId(), dossierId),includeDeleted)); types.addAll(MagicConverter.convert(dictionaryPersistenceService.getAllTypesForDossier(dossierId, includeDeleted), Type.class)); } catch (AccessDeniedException e) { log.debug(" Don't include the types for the dossier id");