From a8d4c917330e131ed1549ff86c0947b645a4a1f0 Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Tue, 13 Jun 2023 13:32:05 +0300 Subject: [PATCH] RED-6485 - Dossier-only entity setting in the dossier template, RED-6743 - Create dossier dictionaries on-the-fly - when getting DictionaryForType, create dossier level dictionary if it does not exists --- .../management/v1/processor/service/DictionaryService.java | 3 ++- .../peristence/v1/server/integration/tests/DictionaryTest.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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 81d761660..721fa8b08 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 @@ -246,7 +246,8 @@ public class DictionaryService { accessControlService.verifyUserHasViewPermissions(dossierId); } var typeId = toTypeId(type, dossierTemplateId, dossierId); - // should we create it? + // create dossier level type if it does not exist + dictionaryManagementService.checkForDossierTypeExistenceAndCreate(typeId); var entity = dictionaryPersistenceService.getType(typeId); var dictionaryForType = MagicConverter.convert(entity, Type.class); dictionaryForType.setEntries(MagicConverter.convert(entryPersistenceService.getEntries(typeId, DictionaryEntryType.ENTRY, null), DictionaryEntry.class)); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DictionaryTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DictionaryTest.java index 1ff9678ff..946549537 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DictionaryTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DictionaryTest.java @@ -269,6 +269,7 @@ public class DictionaryTest extends AbstractPersistenceServerServiceTest { assertThat(dictionaryClient.getAllTypes(dossier.getDossierTemplateId(), null, false).getTypes().size()).isEqualTo(1); assertThat(dictionaryClient.getAllTypes(dossier.getDossierTemplateId(), dossier.getId(), false).getTypes().size()).isEqualTo(3); + var dictionary = dictionaryClient.getDictionaryForType(returnedtype1.getType(), dossier.getDossierTemplateId(), dossier2.getId()); assertThat(dictionaryClient.getAllTypes(dossier.getDossierTemplateId(), dossier2.getId(), false).getTypes().size()).isEqualTo(3); }