From 97960d8ed72f643dfd3299eed45b242a9b30da7e Mon Sep 17 00:00:00 2001 From: Kresnadi Budisantoso Date: Tue, 28 Nov 2023 17:33:28 +0100 Subject: [PATCH] RED-7962 Fixes error 500 that occurred because of the rule file type parameter that was not removed by mistake Also adjusted the audit log message if 'dryRun' was set to `true`. --- .../api/impl/controller/DossierTemplateControllerV2.java | 5 ++--- .../v2/api/external/resource/DossierTemplateResource.java | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/DossierTemplateControllerV2.java b/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/DossierTemplateControllerV2.java index 145bb8012..7a3b3c735 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/DossierTemplateControllerV2.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/DossierTemplateControllerV2.java @@ -101,8 +101,7 @@ public class DossierTemplateControllerV2 implements DossierTemplateResource { @PreAuthorize("hasAuthority('" + READ_RULES + "')") - public ResponseEntity downloadComponentRules(@PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId, - @PathVariable(RULE_FILE_TYPE_PARAMETER_NAME) RuleFileType ruleFileType) { + public ResponseEntity downloadComponentRules(@PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId) { return downloadRules(dossierTemplateId, RuleFileType.COMPONENT); } @@ -166,7 +165,7 @@ public class DossierTemplateControllerV2 implements DossierTemplateResource { .userId(KeycloakSecurity.getUserId()) .objectId(rulesUploadRequest.getDossierTemplateId()) .category(AuditCategory.DOSSIER_TEMPLATE.name()) - .message(String.format("%s Rules have been updated", rulesUploadRequest.getRuleFileType())) + .message(String.format("%s rules have been %s", rulesUploadRequest.getRuleFileType(), dryRun ? "validated" : "updated")) .build()); // TODO Add warning and deprecations to response diff --git a/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/resource/DossierTemplateResource.java b/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/resource/DossierTemplateResource.java index 616e76bb1..baf1fbb98 100644 --- a/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/resource/DossierTemplateResource.java +++ b/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/resource/DossierTemplateResource.java @@ -67,7 +67,7 @@ public interface DossierTemplateResource { @ResponseBody @ResponseStatus(value = HttpStatus.OK) - @Operation(summary = "Returns file containing the currently used Drools rules.") + @Operation(summary = "Returns file containing the currently used entity rules.") @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")}) @GetMapping(value = PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE + ENTITY_RULES_PATH, produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) ResponseEntity downloadEntityRules(@PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId); @@ -84,10 +84,10 @@ public interface DossierTemplateResource { @ResponseBody @ResponseStatus(value = HttpStatus.OK) - @Operation(summary = "Returns file containing the currently used Drools rules.") + @Operation(summary = "Returns file containing the currently used component rules.") @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")}) @GetMapping(value = PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE + COMPONENT_RULES_PATH, produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) - ResponseEntity downloadComponentRules(@PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId, @PathVariable(RULE_FILE_TYPE_PARAMETER_NAME) RuleFileType ruleFileType); + ResponseEntity downloadComponentRules(@PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId); @Operation(summary = "Get the file attribute definitions of a DossierTemplate.", description = "None") @GetMapping(value = PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE + FILE_ATTRIBUTE_DEFINITIONS_PATH, produces = MediaType.APPLICATION_JSON_VALUE)