From ec47a511d632db0cdcb39663f4d9567a07ca392a Mon Sep 17 00:00:00 2001
From: Viktor Seifert <viktor.seifert@iqser.com>
Date: Fri, 2 Dec 2022 16:18:18 +0100
Subject: [PATCH] RED-5479: Use preview color from dossier-template.

Set the color field for a redaction-message from the color configured in the dossier-template.
---
 .../download/DownloadPreparationService.java       | 14 +++++++++++---
 persistence-service-v1/pom.xml                     |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java
index a5bc915e6..912517b62 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java
@@ -10,7 +10,6 @@ import java.util.stream.Collectors;
 
 import javax.transaction.Transactional;
 
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 
@@ -28,6 +27,7 @@ import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.ReportTemplateEntity;
 import com.iqser.red.service.persistence.management.v1.processor.entity.download.DownloadStatusEntity;
+import com.iqser.red.service.persistence.management.v1.processor.service.ColorsService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DownloadStatusPersistenceService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.FileStatusPersistenceService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.NotificationPersistenceService;
@@ -35,6 +35,7 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist
 import com.iqser.red.service.persistence.service.v1.api.model.audit.AddNotificationRequest;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus;
 import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadStatusValue;
 import com.iqser.red.service.redaction.report.v1.api.model.ReportResultMessage;
 import com.iqser.red.service.redaction.report.v1.api.model.StoredFileInformation;
@@ -60,8 +61,8 @@ public class DownloadPreparationService {
     RabbitTemplate rabbitTemplate;
     ObjectMapper objectMapper;
     StorageService storageService;
-
     DownloadReportCleanupService downloadReportCleanupService;
+    ColorsService colorsService;
 
 
     @Transactional
@@ -71,12 +72,19 @@ public class DownloadPreparationService {
 
         DossierEntity dossier = downloadStatus.getDossier();
 
+        var colors = colorsService.getColors(dossier.getDossierTemplateId());
+
         RedactionMessage message = RedactionMessage.builder()
                 .dossierId(dossier.getId())
                 .downloadId(reportResultMessage.getDownloadId())
                 .redactionTypes(toPdfTronRedactionTypes(downloadStatus.getDownloadFileTypes()))
                 .fileIds(downloadStatus.getFiles().stream().map(FileEntity::getId).collect(Collectors.toList()))
-                .unapprovedFileIds(downloadStatus.getFiles().stream().filter(f -> !WorkflowStatus.APPROVED.equals(f.getWorkflowStatus())).map(FileEntity::getId).collect(Collectors.toSet()))
+                .unapprovedFileIds(downloadStatus.getFiles()
+                        .stream()
+                        .filter(f -> !WorkflowStatus.APPROVED.equals(f.getWorkflowStatus()))
+                        .map(FileEntity::getId)
+                        .collect(Collectors.toSet()))
+                .redactionPreviewColor(colors.getPreviewColor())
                 .build();
 
         log.info("Sending redaction request for downloadId:{} to pdftron-redaction-queue", message.getDownloadId());
diff --git a/persistence-service-v1/pom.xml b/persistence-service-v1/pom.xml
index 0dc376757..5829c2c9e 100755
--- a/persistence-service-v1/pom.xml
+++ b/persistence-service-v1/pom.xml
@@ -27,7 +27,7 @@
     <properties>
         <redaction-service.version>3.206.0</redaction-service.version>
         <search-service.version>2.39.0</search-service.version>
-        <pdftron-redaction-service.version>3.143.0</pdftron-redaction-service.version>
+        <pdftron-redaction-service.version>RED-5479-1</pdftron-redaction-service.version>
         <redaction-report-service.version>3.63.0</redaction-report-service.version>
     </properties>