From a45440abb8f547c5380b7b47a867b7812a4c62d0 Mon Sep 17 00:00:00 2001 From: maverickstuder Date: Thu, 5 Dec 2024 13:59:27 +0100 Subject: [PATCH] RED-9056: Change flag name and decline requests except dossierDictionaryOnly is true --- .../external/api/impl/controller/DictionaryController.java | 4 ++-- .../v1/api/external/resource/DictionaryResource.java | 2 +- .../management/v1/processor/service/DictionaryService.java | 4 ++-- .../service/persistence/DictionaryPersistenceService.java | 7 +++++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DictionaryController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DictionaryController.java index d3978fbe9..31be0470f 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DictionaryController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DictionaryController.java @@ -357,9 +357,9 @@ public class DictionaryController implements DictionaryResource { public void changeFlags(@PathVariable(TYPE_PARAMETER_NAME) String type, @PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId, @PathVariable(value = DOSSIER_ID_PARAMETER_NAME) String dossierId, - @RequestParam(value = "addToDictionary") boolean addToDictionary) { + @RequestParam(value = "addToDictionaryAction") boolean addToDictionaryAction) { - dictionaryService.changeAddToDictionary(type, dossierTemplateId, dossierId, addToDictionary); + dictionaryService.changeAddToDictionary(type, dossierTemplateId, dossierId, addToDictionaryAction); } diff --git a/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/DictionaryResource.java b/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/DictionaryResource.java index a3fb5c1cb..651b8b35b 100644 --- a/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/DictionaryResource.java +++ b/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/DictionaryResource.java @@ -223,7 +223,7 @@ public interface DictionaryResource { void changeFlags(@PathVariable(TYPE_PARAMETER_NAME) String type, @PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId, @PathVariable(DOSSIER_ID_PARAMETER_NAME) String dossierId, - @RequestParam(value = "addToDictionary") boolean addToDictionary); + @RequestParam(value = "addToDictionaryAction") boolean addToDictionaryAction); @PostMapping(value = DICTIONARY_REST_PATH + DIFFERENCE + DOSSIER_TEMPLATE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE) 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 6739d394d..7ca589b49 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 @@ -494,9 +494,9 @@ public class DictionaryService { } @PreAuthorize("hasAuthority('" + ADD_UPDATE_DICTIONARY_TYPE + "')") - public void changeAddToDictionary(String type, String dossierTemplateId, String dossierId, boolean addToDictionary) { + public void changeAddToDictionary(String type, String dossierTemplateId, String dossierId, boolean addToDictionaryAction) { - dictionaryPersistenceService.updateAddToDictionary(toTypeId(type, dossierTemplateId, dossierId), addToDictionary); + dictionaryPersistenceService.updateAddToDictionary(toTypeId(type, dossierTemplateId, dossierId), addToDictionaryAction); } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DictionaryPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DictionaryPersistenceService.java index 05a1c4d45..19cf7d85d 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DictionaryPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DictionaryPersistenceService.java @@ -12,6 +12,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.TypeEntity; +import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException; import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException; import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierRepository; @@ -357,12 +358,14 @@ public class DictionaryPersistenceService { @Transactional - public void updateAddToDictionary(String typeId, boolean addToDictionary) { + public void updateAddToDictionary(String typeId, boolean addToDictionaryAction) { var typeEntity = getType(typeId); if (typeEntity.isDossierDictionaryOnly()) { - typeEntity.setAddToDictionaryAction(addToDictionary); + typeEntity.setAddToDictionaryAction(addToDictionaryAction); typeRepository.saveAndFlush(typeEntity); + } else { + throw new BadRequestException("The addToDictionaryAction flag can only be adjusted for dossierDictionaryOnly-types."); } }