From e1d592516f53a797cef46f2b6312a1fa0b9d23fa Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 18 Dec 2024 10:09:55 +0100 Subject: [PATCH] RED-9472 working on bug with redaction service response --- ...er.red.service.java-conventions.gradle.kts | 2 +- .../api/impl/controller/RulesController.java | 2 +- .../v1/processor/roles/ApplicationRoles.java | 22 ++++++++++++------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts index 83d3714cc..14e2f4672 100644 --- a/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts @@ -6,7 +6,7 @@ plugins { jacoco } -val redactionServiceVersion by rootProject.extra { "4.434.0-RED9472.1" } +val redactionServiceVersion by rootProject.extra { "4.436.0-RED9472.9" } val pdftronRedactionServiceVersion by rootProject.extra { "4.90.0-RED10115.0" } val redactionReportServiceVersion by rootProject.extra { "4.81.0" } val searchServiceVersion by rootProject.extra { "2.90.0" } 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/RulesController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RulesController.java index 0c1548830..f405697cf 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RulesController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RulesController.java @@ -77,6 +77,7 @@ public class RulesController implements RulesResource { try { ResponseEntity mergedRules = ruleBuilderClient.mergeUserUpdateRules(rulesUpdateRequest); + log.info("response: " + mergedRules); if (mergedRules == null || mergedRules.getBody() == null) { throw new BadRequestException("Failed to merge rules - received null response from service"); } @@ -93,7 +94,6 @@ public class RulesController implements RulesResource { } catch (FeignException e) { if (e.status() == HttpStatus.BAD_REQUEST.value()) { - log.info("exception: " + e); throw new BadRequestException("The provided rule file is not a valid drools rule file!"); } throw new BadRequestException("Failed to merge rules: " + e.getMessage()); diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java index 39dbc7dfa..26e2cf229 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java @@ -24,7 +24,12 @@ public final class ApplicationRoles { public static final Set KNECON_SUPPORT_ACTION_ROLES = Sets.newHashSet(READ_LICENSE, UPDATE_LICENSE, GET_TENANTS, - CREATE_TENANT, READ_USER_STATS, READ_USERS, READ_ALL_USERS, READ_SYSTEM_RULES, WRITE_SYSTEM_RULES, + CREATE_TENANT, + READ_USER_STATS, + READ_USERS, + READ_ALL_USERS, + READ_SYSTEM_RULES, + WRITE_SYSTEM_RULES, WRITE_USERS, READ_SMTP_CONFIGURATION, WRITE_SMTP_CONFIGURATION, @@ -58,8 +63,7 @@ public final class ApplicationRoles { MANAGE_VIEWED_PAGES, PROCESS_DOWNLOAD, PROCESS_MANUAL_REDACTION_REQUEST, - READ_COLORS, - READ_DICTIONARY_TYPES, READ_DIGITAL_SIGNATURE, READ_DOSSIER, + READ_COLORS, READ_DICTIONARY_TYPES, READ_DIGITAL_SIGNATURE, READ_DOSSIER, READ_DOSSIER_ATTRIBUTES, READ_DOSSIER_ATTRIBUTES_CONFIG, READ_DOSSIER_TEMPLATES, @@ -69,11 +73,9 @@ public final class ApplicationRoles { READ_GENERAL_CONFIGURATION, READ_LEGAL_BASIS, READ_MANUAL_REDACTIONS, - READ_NOTIFICATIONS, - READ_REDACTION_LOG, READ_SYSTEM_RULES, + READ_NOTIFICATIONS, READ_REDACTION_LOG, READ_SYSTEM_RULES, READ_DATA_FORMATS, - READ_USERS, - READ_VERSIONS, READ_WATERMARK, READ_RULES, + READ_USERS, READ_VERSIONS, READ_WATERMARK, READ_RULES, REANALYZE_DOSSIER, REANALYZE_FILE, REQUEST_MANUAL_REDACTION, @@ -149,7 +151,11 @@ public final class ApplicationRoles { READ_ALL_USERS, READ_APP_CONFIG, READ_GENERAL_CONFIGURATION, - READ_GENERAL_CONFIGURATION, GET_SIMILAR_IMAGES, READ_NOTIFICATIONS, READ_USERS, READ_USER_STATS, + READ_GENERAL_CONFIGURATION, + GET_SIMILAR_IMAGES, + READ_NOTIFICATIONS, + READ_USERS, + READ_USER_STATS, UPDATE_MY_PROFILE, UPDATE_NOTIFICATIONS, WRITE_USERS,