From b1c618505ece49287a7d18aefd41ac2dd5c578ce Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Wed, 20 Mar 2024 18:44:20 +0100 Subject: [PATCH] RED-8480: updated code according to changes from ManualRecategorization --- .../redaction-service-server-v1/build.gradle.kts | 2 +- .../server/migration/LegacyRedactionLogMergeService.java | 6 +++++- .../model/document/entity/ManualChangeOverwrite.java | 1 + .../redaction/v1/server/service/ManualChangeFactory.java | 7 +++++-- 4 files changed, 12 insertions(+), 4 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 978b4bf9..b49ef282 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.366.0" +val persistenceServiceVersion = "2.377.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 48a6f1d8..ff3fd601 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 @@ -202,7 +202,11 @@ public class LegacyRedactionLogMergeService { } redactionLogEntry.getManualChanges() - .add(ManualChange.from(imageRecategorization).withManualRedactionType(ManualRedactionType.RECATEGORIZE).withChange("type", imageRecategorization.getType())); + .add(ManualChange.from(imageRecategorization) + .withManualRedactionType(ManualRedactionType.RECATEGORIZE) + .withChange("type", imageRecategorization.getType()) + .withChange("section", imageRecategorization.getSection()) + .withChange("legalBasis", imageRecategorization.getLegalBasis())); } 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 2584ff40..02e62654 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 @@ -131,6 +131,7 @@ public class ManualChangeOverwrite { if (manualChange instanceof ManualRecategorization recategorization) { recategorized = true; type = recategorization.getType(); + section = recategorization.getSection(); 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 27989baf..7521b75a 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 @@ -30,8 +30,11 @@ public class ManualChangeFactory { public ManualChange toManualChange(BaseAnnotation baseAnnotation, boolean isHint) { ManualChange manualChange = ManualChange.from(baseAnnotation); - if (baseAnnotation instanceof ManualRecategorization imageRecategorization) { - manualChange.withManualRedactionType(ManualRedactionType.RECATEGORIZE).withChange("type", imageRecategorization.getType()); + if (baseAnnotation instanceof ManualRecategorization recategorization) { + manualChange.withManualRedactionType(ManualRedactionType.RECATEGORIZE) + .withChange("type", recategorization.getType()) + .withChange("section", recategorization.getSection()) + .withChange("legalBasis", recategorization.getLegalBasis()); } else if (baseAnnotation instanceof IdRemoval manualRemoval) { manualChange.withManualRedactionType(manualRemoval.isRemoveFromDictionary() ? ManualRedactionType.REMOVE_FROM_DICTIONARY : ManualRedactionType.REMOVE); } else if (baseAnnotation instanceof ManualForceRedaction manualForceRedaction) {