From d8c746b48da9811005417baba922f8f521087adc Mon Sep 17 00:00:00 2001
From: Andrei Isvoran <andrei.isvoran.ext@knecon.com>
Date: Thu, 16 Nov 2023 09:04:14 +0100
Subject: [PATCH] RED-7784 - Include unprocessed redactions in reports by
 default

---
 .../v1/external/api/impl/controller/DownloadController.java   | 4 ++++
 .../service/download/DownloadPreparationService.java          | 2 +-
 .../v1/server/integration/tests/DownloadPreparationTest.java  | 1 +
 persistence-service-v1/pom.xml                                | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java
index f9a873a25..7db4dd501 100644
--- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java
+++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java
@@ -86,6 +86,10 @@ public class DownloadController implements DownloadResource {
     @PreAuthorize("hasAuthority('" + PROCESS_DOWNLOAD + "')")
     public DownloadResponse prepareDownload(@RequestBody PrepareDownloadRequest request) {
 
+        if (request.getIncludeUnprocessed() == null) {
+            request.setIncludeUnprocessed(true);
+        }
+
         // check the user is non-member or reviewer
         accessControlService.verifyUserIsDossierOwnerOrApprover(request.getDossierId());
         var response = downloadService.prepareDownload(convert(request));
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/download/DownloadPreparationService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/download/DownloadPreparationService.java
index 85beda749..cc08cba8c 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/download/DownloadPreparationService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/download/DownloadPreparationService.java
@@ -71,7 +71,7 @@ public class DownloadPreparationService {
 
 
         downloadStatus.getFiles().forEach(fileEntity -> {
-            RedactionMessage message = messageBuilder.fileId(fileEntity.getId()).unapprovedFile(fileEntity.getWorkflowStatus() != WorkflowStatus.APPROVED).includeUnprocessed(reportResultMessage.isIncludeUnprocessed()).build();
+            RedactionMessage message = messageBuilder.fileId(fileEntity.getId()).unapprovedFile(fileEntity.getWorkflowStatus() != WorkflowStatus.APPROVED).includeUnprocessed(reportResultMessage.getIncludeUnprocessed()).build();
             log.info("Sending redaction request for downloadId:{} fileId:{} to pdftron-redaction-queue", downloadId, fileEntity.getId());
             rabbitTemplate.convertAndSend(MessagingConfiguration.PDFTRON_QUEUE, message);
         });
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java
index c5d5e3f20..366d4f3a8 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java
@@ -140,6 +140,7 @@ public class DownloadPreparationTest extends AbstractPersistenceServerServiceTes
         ReportResultMessage reportResultMessage = new ReportResultMessage();
         reportResultMessage.setUserId(USER_ID);
         reportResultMessage.setDownloadId(downloadId);
+        reportResultMessage.setIncludeUnprocessed(true);
         downloadReportMessageReceiver.receive(reportResultMessage);
 
         redactionResultMessageReceiver.receive(RedactionResultMessage.builder()
diff --git a/persistence-service-v1/pom.xml b/persistence-service-v1/pom.xml
index 7f35315ca..427c4323e 100755
--- a/persistence-service-v1/pom.xml
+++ b/persistence-service-v1/pom.xml
@@ -34,7 +34,7 @@
         <redaction-service.version>4.165.0</redaction-service.version>
         <search-service.version>2.71.0</search-service.version>
         <pdftron-redaction-service.version>4.38.0</pdftron-redaction-service.version>
-        <redaction-report-service.version>4.31.0</redaction-report-service.version>
+        <redaction-report-service.version>4.33.0</redaction-report-service.version>
         <ocr-service.version>3.10.0</ocr-service.version>
         <storage.commons.version>2.45.0</storage.commons.version>
     </properties>