From c869a624e677eb6e5725b289d2f134779a6ab3dd Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Wed, 27 Mar 2024 09:25:53 +0100 Subject: [PATCH] RED-8480: addded property "value" to places with recategorizations --- .../redaction-service-server-v1/build.gradle.kts | 2 +- .../v1/server/migration/LegacyRedactionLogMergeService.java | 3 ++- .../v1/server/model/document/entity/ManualChangeOverwrite.java | 1 + .../redaction/v1/server/service/ManualChangeFactory.java | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/build.gradle.kts b/redaction-service-v1/redaction-service-server-v1/build.gradle.kts index 0ecfdbd6..7e0ea1d3 100644 --- a/redaction-service-v1/redaction-service-server-v1/build.gradle.kts +++ b/redaction-service-v1/redaction-service-server-v1/build.gradle.kts @@ -16,7 +16,7 @@ val layoutParserVersion = "0.96.0" val jacksonVersion = "2.15.2" val droolsVersion = "9.44.0.Final" val pdfBoxVersion = "3.0.0" -val persistenceServiceVersion = "2.379.0" +val persistenceServiceVersion = "2.380.0" val springBootStarterVersion = "3.1.5" configurations { diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/migration/LegacyRedactionLogMergeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/migration/LegacyRedactionLogMergeService.java index ff3fd601..cea05a42 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/migration/LegacyRedactionLogMergeService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/migration/LegacyRedactionLogMergeService.java @@ -206,7 +206,8 @@ public class LegacyRedactionLogMergeService { .withManualRedactionType(ManualRedactionType.RECATEGORIZE) .withChange("type", imageRecategorization.getType()) .withChange("section", imageRecategorization.getSection()) - .withChange("legalBasis", imageRecategorization.getLegalBasis())); + .withChange("legalBasis", imageRecategorization.getLegalBasis()) + .withChange("value", imageRecategorization.getValue())); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java index 02e62654..dfc4138a 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java @@ -132,6 +132,7 @@ public class ManualChangeOverwrite { recategorized = true; type = recategorization.getType(); section = recategorization.getSection(); + value = recategorization.getValue(); if (recategorization.getLegalBasis() != null && !recategorization.getLegalBasis().isEmpty()) { legalBasis = recategorization.getLegalBasis(); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/ManualChangeFactory.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/ManualChangeFactory.java index 7521b75a..402e8422 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/ManualChangeFactory.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/ManualChangeFactory.java @@ -34,7 +34,8 @@ public class ManualChangeFactory { manualChange.withManualRedactionType(ManualRedactionType.RECATEGORIZE) .withChange("type", recategorization.getType()) .withChange("section", recategorization.getSection()) - .withChange("legalBasis", recategorization.getLegalBasis()); + .withChange("legalBasis", recategorization.getLegalBasis()) + .withChange("value", recategorization.getValue()); } else if (baseAnnotation instanceof IdRemoval manualRemoval) { manualChange.withManualRedactionType(manualRemoval.isRemoveFromDictionary() ? ManualRedactionType.REMOVE_FROM_DICTIONARY : ManualRedactionType.REMOVE); } else if (baseAnnotation instanceof ManualForceRedaction manualForceRedaction) {