From 1f11c1f85c1f419c0cfd7bc5a7a87b6e8c58042b Mon Sep 17 00:00:00 2001
From: deiflaender <dominique.eiflaender@iqser.com>
Date: Mon, 21 Mar 2022 13:52:55 +0100
Subject: [PATCH] RED-2836: Upgraded to new redaction-service api

---
 .../redaction-report-service-api-v1/pom.xml                   | 2 +-
 .../redaction-report-service-server-v1/pom.xml                | 4 ++--
 .../v1/server/service/RedactionLogConverterService.java       | 4 ++++
 .../report/v1/server/service/ReportGenerationService.java     | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml b/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml
index a354a30..f754d49 100644
--- a/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml
+++ b/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml
@@ -14,7 +14,7 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <persistence-service.version>1.27.0</persistence-service.version>
+        <persistence-service.version>1.98.0</persistence-service.version>
     </properties>
 
     <dependencies>
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml b/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
index ff2c7ed..e8e1088 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
@@ -14,8 +14,8 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <persistence-service.version>1.25.0</persistence-service.version>
-        <redaction-service.version>3.68.0</redaction-service.version>
+        <persistence-service.version>1.98.0</persistence-service.version>
+        <redaction-service.version>3.86.0</redaction-service.version>
     </properties>
 
     <dependencies>
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java
index 16597f4..1825442 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java
@@ -42,6 +42,10 @@ public class RedactionLogConverterService {
                     return;
                 }
 
+                if(entry.isFalsePositive()){
+                    return;
+                }
+
                 Set<Integer> pages = new HashSet<>();
                 for (Rectangle position : entry.getPositions()) {
 
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
index 806e457..ae0fb1d 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
@@ -132,7 +132,7 @@ public class ReportGenerationService {
 
         RedactionLog redactionLog;
         try {
-            redactionLog = redactionLogClient.getRedactionLog(dossierId, fileId, true);
+            redactionLog = redactionLogClient.getRedactionLog(dossierId, fileId, new ArrayList<>(), true, false);
 
             //filter DECLINED redactions out, they should not be in reports
             Iterator<RedactionLogEntry> iter = redactionLog.getRedactionLogEntry().iterator();