From 8f208957bb74b410ea385d69d8f7f21de79351cd Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@iqser.com>
Date: Thu, 27 Jan 2022 16:55:17 +0200
Subject: [PATCH] adjusted for new redaction service

---
 .../peristence/v1/server/migration/MigrationService.java  | 8 --------
 .../server/service/AnalysisFlagsCalculationService.java   | 5 ++---
 persistence-service-v1/pom.xml                            | 2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java
index 9f1dc2a6d..352a6ce0b 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java
@@ -226,16 +226,10 @@ public class MigrationService {
                 .redacted(oldRedactionLogEntry.isRedacted())
                 .isHint(oldRedactionLogEntry.isHint())
                 .isRecommendation(oldRedactionLogEntry.isRecommendation())
-                .hasBeenResized(false) // Will be added during merge of manual
-                .hasBeenRecategorized(false) // Will be added during merge of manual
                 .section(oldRedactionLogEntry.getSection())
                 .color(oldRedactionLogEntry.getColor())
                 .positions(oldRedactionLogEntry.getPositions())
                 .sectionNumber(oldRedactionLogEntry.getSectionNumber())
-                .manual(oldRedactionLogEntry.isManual())
-                .status(oldRedactionLogEntry.getStatus())
-                .manualRedactionType(oldRedactionLogEntry.getManualRedactionType())
-                .manualRedactionUserId(null) // Will be added during merge of manual
                 .isDictionaryEntry(oldRedactionLogEntry.isDictionaryEntry())
                 .textBefore(oldRedactionLogEntry.getTextBefore())
                 .textAfter(oldRedactionLogEntry.getTextAfter())
@@ -249,8 +243,6 @@ public class MigrationService {
                 .imageHasTransparency(oldRedactionLogEntry.isImageHasTransparency())
                 .isDossierDictionaryEntry(oldRedactionLogEntry.isDictionaryEntry())
                 .excluded(oldRedactionLogEntry.isExcluded())
-                .recategorizationType(oldRedactionLogEntry.getRecategorizationType())
-                .legalBasisChangeValue(oldRedactionLogEntry.getLegalBasisChangeValue())
                 .changes(List.of(new Change(analysisNumber, ChangeType.ADDED, lastProcessed)))
                 .engines(getEngine(oldRedactionLogEntry))
                 .reference(null)
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java
index c9e3322ab..bcdb3aa9e 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java
@@ -53,8 +53,7 @@ public class AnalysisFlagsCalculationService {
 
             String type = getType(entry.getType());
 
-            if (!hasRedactions && (entry.isRedacted() && !entry.isManual() || entry.isManual() && entry.getStatus()
-                    .equals(AnnotationStatus.APPROVED))) {
+            if (!hasRedactions && entry.isRedacted()) {
                 hasRedactions = true;
             }
 
@@ -66,7 +65,7 @@ public class AnalysisFlagsCalculationService {
                 hasImages = true;
             }
 
-            if (!hasSuggestions && entry.isManual() && entry.getStatus().equals(AnnotationStatus.REQUESTED)) {
+            if (!hasSuggestions && entry.getManualChanges().stream().anyMatch(e -> e.getAnnotationStatus() == AnnotationStatus.REQUESTED)) {
                 hasSuggestions = true;
             }
 
diff --git a/persistence-service-v1/pom.xml b/persistence-service-v1/pom.xml
index 798af4cdf..0d571b596 100755
--- a/persistence-service-v1/pom.xml
+++ b/persistence-service-v1/pom.xml
@@ -25,7 +25,7 @@
     </modules>
 
     <properties>
-        <redaction-service.version>3.56.0</redaction-service.version>
+        <redaction-service.version>3.67.0</redaction-service.version>
         <search-service.version>2.18.0</search-service.version>
         <pdftron-redaction-service.version>3.28.0</pdftron-redaction-service.version>
         <redaction-report-service.version>3.19.0</redaction-report-service.version>