From 733cdd4f76f672b6d0723e3cc2a72132cf78bb34 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@iqser.com>
Date: Mon, 6 Dec 2021 11:03:15 +0200
Subject: [PATCH] RED-2772

---
 .../v1/server/controller/UploadController.java     |  2 ++
 .../download/DownloadPreparationService.java       | 14 ++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/UploadController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/UploadController.java
index 485c2c4bb..d69a9c589 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/UploadController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/UploadController.java
@@ -138,6 +138,7 @@ public class UploadController implements UploadResource {
 
         var request = PdfTronRedactionRequest.builder()
                 .dossierTemplateId(dossier.getDossierTemplateId())
+                .applyWatermark(dossier.isWatermarkEnabled())
                 .document(fileManagementStorageService.getStoredObjectBytes(dossierId, fileId, FileType.ORIGIN))
                 .redactionLog(fileManagementStorageService.getRedactionLog(dossierId, fileId))
                 .build();
@@ -156,6 +157,7 @@ public class UploadController implements UploadResource {
 
         PdfTronRedactionResult pdfTronRedactionResult = pdfTronRedactionClient.redactionPreview(PdfTronRedactionRequest.builder()
                 .dossierTemplateId(dossier.getDossierTemplateId())
+                .applyWatermark(dossier.isWatermarkPreviewEnabled())
                 .document(fileManagementStorageService.getStoredObjectBytes(dossierId, fileId, FileType.ORIGIN))
                 .redactionLog(fileManagementStorageService.getRedactionLog(dossierId, fileId))
                 .build());
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 417ef19c1..7e4e53a61 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
@@ -51,7 +51,7 @@ public class DownloadPreparationService {
 
         try (FileSystemBackedArchiver fileSystemBackedArchiver = new FileSystemBackedArchiver()) {
 
-            generateAndAddFiles(downloadStatus, fileSystemBackedArchiver, dossier.isWatermarkEnabled());
+            generateAndAddFiles(downloadStatus, fileSystemBackedArchiver);
             addReports(reportResultMessage, fileSystemBackedArchiver);
             storeZipFile(downloadStatus, fileSystemBackedArchiver);
 
@@ -67,8 +67,7 @@ public class DownloadPreparationService {
     }
 
 
-    private void generateAndAddFiles(DownloadStatusEntity downloadStatus, FileSystemBackedArchiver fileSystemBackedArchiver,
-                                     boolean watermarkEnabled) {
+    private void generateAndAddFiles(DownloadStatusEntity downloadStatus, FileSystemBackedArchiver fileSystemBackedArchiver) {
 
         int i = 1;
         long fileGenerationStart = System.currentTimeMillis();
@@ -89,13 +88,16 @@ public class DownloadPreparationService {
                     fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Original", fileStatus.getFilename(), original));
                 }
                 if (downloadFileType.name().equals(DownloadFileType.ANNOTATED.name())) {
-                    fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Annotated", addSuffix(fileStatus.getFilename(), "annotated"), getAnnotated(dossier.getDossierTemplateId(), fileStatus.getDossierId(), fileId)));
+                    fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Annotated", addSuffix(fileStatus.getFilename(), "annotated"),
+                            getAnnotated(dossier.getDossierTemplateId(), fileStatus.getDossierId(), fileId)));
                 }
                 if (downloadFileType.name().equals(DownloadFileType.PREVIEW.name())) {
-                    fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Preview", addSuffix(fileStatus.getFilename(), "highlighted"), getPreview(original, redactionLog, dossier.getDossierTemplateId(), watermarkEnabled)));
+                    fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Preview", addSuffix(fileStatus.getFilename(), "highlighted"),
+                            getPreview(original, redactionLog, dossier.getDossierTemplateId(), dossier.isWatermarkPreviewEnabled())));
                 }
                 if (downloadFileType.name().equals(DownloadFileType.REDACTED.name())) {
-                    fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Redacted", addSuffix(fileStatus.getFilename(), "redacted"), getRedacted(original, redactionLog, dossier.getDossierTemplateId(), watermarkEnabled)));
+                    fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Redacted", addSuffix(fileStatus.getFilename(), "redacted"),
+                            getRedacted(original, redactionLog, dossier.getDossierTemplateId(), dossier.isWatermarkEnabled())));
                 }
             }
             log.info("Successfully added file {}/{} for downloadId {}, took {}", i, fileIds