From caa1aa03d123dd8fc022f3367bfc4e2ccbd12483 Mon Sep 17 00:00:00 2001
From: Andrei Isvoran <andrei.isvoran.ext@knecon.com>
Date: Tue, 7 Nov 2023 16:50:26 +0200
Subject: [PATCH] RED-7784 - Include unprocessed redactions and update
 persistence version

---
 .../redaction/report/v1/api/model/ReportResultMessage.java  | 1 +
 .../redaction-report-service-server-v1/build.gradle.kts     | 2 +-
 .../report/v1/server/service/ReportMessageReceiver.java     | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportResultMessage.java b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportResultMessage.java
index 3d9eca8..86cf3bc 100644
--- a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportResultMessage.java
+++ b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportResultMessage.java
@@ -14,5 +14,6 @@ public class ReportResultMessage {
     private String userId;
     private String downloadId;
     private String reportFileInformationStorageId;
+    private boolean includeUnprocessed;
 
 }
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/build.gradle.kts b/redaction-report-service-v1/redaction-report-service-server-v1/build.gradle.kts
index 3526dc6..b4d83f3 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/build.gradle.kts
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/build.gradle.kts
@@ -16,7 +16,7 @@ val springCommonsVersion = "2.1.0"
 val storageCommonsVersion = "2.27.0"
 val poiVersion = "5.2.3"
 val metricCommonsVersion = "2.1.0"
-val persistenceServiceVersion = "2.236.0"
+val persistenceServiceVersion = "2.239.0"
 
 configurations {
     all {
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportMessageReceiver.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportMessageReceiver.java
index 6db47c0..849b941 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportMessageReceiver.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportMessageReceiver.java
@@ -44,16 +44,16 @@ public class ReportMessageReceiver {
         log.info("Start generating reports for downloadId {}", reportMessage.getDownloadId());
 
         var reportFileInformationStorageId = reportGenerationService.generateReports(reportMessage);
-        addToReportResultQueue(reportMessage.getUserId(), reportMessage.getDownloadId(), reportFileInformationStorageId, 1);
+        addToReportResultQueue(reportMessage.getUserId(), reportMessage.getDownloadId(), reportFileInformationStorageId, 1, reportMessage.isIncludeUnprocessed());
 
         long end = System.currentTimeMillis();
         log.info("Successfully generated reports for downloadId {}, took {}", reportMessage.getDownloadId(), end - start);
     }
 
 
-    private void addToReportResultQueue(String userId, String downloadId, String reportFileInformationStorageId, int priority) {
+    private void addToReportResultQueue(String userId, String downloadId, String reportFileInformationStorageId, int priority, boolean includeUnprocessed) {
 
-        rabbitTemplate.convertAndSend(REPORT_RESULT_QUEUE, new ReportResultMessage(userId, downloadId, reportFileInformationStorageId), message -> {
+        rabbitTemplate.convertAndSend(REPORT_RESULT_QUEUE, new ReportResultMessage(userId, downloadId, reportFileInformationStorageId, includeUnprocessed), message -> {
             message.getMessageProperties().setPriority(priority);
             return message;
         });