From 245c4b4556168de25e58942856ff5f1fbbd621ff Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Thu, 11 Apr 2024 14:32:39 +0200 Subject: [PATCH] RED-8762: added endpoint to update flag addToDictionary for given type, dossierTemplateId and dossierId --- .../impl/controller/DictionaryController.java | 16 +++++++++++++--- .../external/resource/DictionaryResource.java | 14 +++++++++++++- .../v1/processor/service/DictionaryService.java | 11 +++++++++++ .../DictionaryPersistenceService.java | 6 ++++++ 4 files changed, 43 insertions(+), 4 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 bdb313aef..816fae011 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 @@ -23,12 +23,10 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.iqser.red.service.persistence.management.v1.processor.service.AccessControlService; -import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity; import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException; +import com.iqser.red.service.persistence.management.v1.processor.service.AccessControlService; import com.iqser.red.service.persistence.management.v1.processor.service.DictionaryService; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.AuditPersistenceService; -import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter; import com.iqser.red.service.persistence.management.v1.processor.utils.StringEncodingUtils; import com.iqser.red.service.persistence.management.v1.processor.utils.TypeValueMapper; import com.iqser.red.service.persistence.service.v1.api.external.resource.DictionaryResource; @@ -42,6 +40,8 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.Audit import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.Colors; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.DictionaryEntryType; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.Type; +import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter; +import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity; import feign.FeignException; import jakarta.validation.Valid; @@ -318,4 +318,14 @@ public class DictionaryController implements DictionaryResource { .build()); } + + @Override + public void changeFlags(@PathVariable(TYPE_PARAMETER_NAME) String type, + @PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId, + @RequestParam(value = DOSSIER_ID_PARAMETER_NAME) String dossierId, + @RequestParam(value = "addToDictionary") boolean addToDictionary) { + + dictionaryService.changeAddToDictionary(type, dossierTemplateId, dossierId, addToDictionary); + } + } 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 4ce5bc4dd..b77db241c 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 @@ -51,6 +51,8 @@ public interface DictionaryResource { String MERGED = "/merged"; String DELETE = "/delete"; + String UPDATE_FLAG = "/updateFlag"; + String COLOR_REST_PATH = ExternalApi.BASE_PATH + "/color"; String DOSSIER_ID_PARAMETER_NAME = "dossierId"; @@ -194,4 +196,14 @@ public interface DictionaryResource { @GetMapping(value = COLOR_REST_PATH + DOSSIER_TEMPLATE_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE) Colors getColors(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId); -} + + @ResponseStatus(HttpStatus.NO_CONTENT) + @PostMapping(value = DICTIONARY_REST_PATH + UPDATE_FLAG + TYPE_PATH_VARIABLE + DOSSIER_TEMPLATE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE) + @Operation(summary = "Updates flags regarding to selected type, dossier and dossier template.", description = "None") + @ApiResponses(value = {@ApiResponse(responseCode = "204", description = "Successfully updated the flags of the type."), @ApiResponse(responseCode = "400", description = "Request contains error."), @ApiResponse(responseCode = "404", description = "The entry type is not found.")}) + void changeFlags(@PathVariable(TYPE_PARAMETER_NAME) String type, + @PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId, + @RequestParam(value = DOSSIER_ID_PARAMETER_NAME) String dossierId, + @RequestParam(value = "addToDictionary") boolean addToDictionary); + +} \ No newline at end of file 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 84669d45e..33b1be038 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 @@ -429,4 +429,15 @@ public class DictionaryService { return MagicConverter.convert(colorsService.getColors(dossierTemplateId), Colors.class); } + + public void changeAddToDictionary(String type, String dossierTemplateId, String dossierId, boolean addToDictionary) { + + var typeEntity = dictionaryPersistenceService.getType(toTypeId(type, dossierTemplateId, dossierId)); + if (typeEntity.isDossierDictionaryOnly()) { + typeEntity.setAddToDictionaryAction(addToDictionary); + dictionaryPersistenceService.saveType(typeEntity); + } + + } + } 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 fc5d29440..f4fa5ff3b 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 @@ -274,6 +274,12 @@ public class DictionaryPersistenceService { } + public void saveType(TypeEntity type) { + + typeRepository.saveAndFlush(type); + } + + @Transactional public int undeleteType(String typeId) { -- 2.47.2