From b16babef1a84dee6ad69be45a774b030decd6a15 Mon Sep 17 00:00:00 2001
From: deiflaender <dominique.eiflaender@iqser.com>
Date: Fri, 25 Mar 2022 09:33:35 +0100
Subject: [PATCH] RED-3699: Fixed cycle rest calls on getRedactionLog

---
 .../peristence/v1/server/service/RedactionLogService.java | 8 ++++++++
 persistence-service-v1/pom.xml                            | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java
index d2b5b1e97..b18cab878 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java
@@ -6,6 +6,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.peristence.v1.server.client.RedactionClient;
+import com.iqser.red.service.peristence.v1.server.controller.DictionaryController;
 import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierPersistenceService;
 import com.iqser.red.service.redaction.v1.model.RedactionLog;
@@ -24,6 +25,7 @@ public class RedactionLogService {
     private final RedactionClient redactionClient;
     private final DossierPersistenceService dossierPersistenceService;
     private final FileStatusService fileStatusService;
+    private final DictionaryController dictionaryController;
 
 
     public RedactionLog getRedactionLog(String dossierId, String fileId, boolean withManualRedactions, boolean includeFalsePositives) {
@@ -44,6 +46,10 @@ public class RedactionLogService {
         if (withManualRedactions) {
             var dossier = dossierPersistenceService.findByDossierId(dossierId);
             var manualRedactions = manualRedactionService.getManualRedactions(fileId);
+            var colors = dictionaryController.getColors(dossier.getDossierTemplateId());
+            var types = dictionaryController.getAllTypesForDossierTemplate(dossier.getDossierTemplateId());
+            var dossierTypes = dictionaryController.getAllTypesForDossier(dossierId);
+            types.addAll(dossierTypes);
 
             try {
                 redactionLog = redactionClient.getRedactionLog(RedactionRequest.builder()
@@ -53,6 +59,8 @@ public class RedactionLogService {
                         .dossierTemplateId(dossier.getDossierTemplateId())
                         .excludedPages(fileStatus.getExcludedPages())
                         .includeFalsePositives(includeFalsePositives)
+                        .colors(colors)
+                        .types(types)
                         .build());
             } catch (FeignException e) {
                 if (e.status() == HttpStatus.NOT_FOUND.value()) {
diff --git a/persistence-service-v1/pom.xml b/persistence-service-v1/pom.xml
index 2854b03bd..18045b65b 100755
--- a/persistence-service-v1/pom.xml
+++ b/persistence-service-v1/pom.xml
@@ -25,7 +25,7 @@
     </modules>
 
     <properties>
-        <redaction-service.version>3.86.0</redaction-service.version>
+        <redaction-service.version>3.90.0</redaction-service.version>
         <search-service.version>2.26.0</search-service.version>
         <pdftron-redaction-service.version>3.53.0</pdftron-redaction-service.version>
         <redaction-report-service.version>3.19.0</redaction-report-service.version>