Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-9472

Browse Source 
working on bug with redaction service response
This commit is contained in:
yhampe 2024-12-18 10:09:55 +01:00
parent 3c2326e3f5
commit e1d592516f
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts
View File

@ -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" }

2
persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RulesController.java vendored
View File

@ -77,6 +77,7 @@ public class RulesController implements RulesResource {
try {
ResponseEntity<RulesUploadResponse> 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());

22
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java
View File

@ -24,7 +24,12 @@ public final class ApplicationRoles {
public static final Set<String> 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,