From 99805242ce2abe74e95cf13a88631974de857eac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?=
 <deiflaender@dominiques-mbp.speedport.ip>
Date: Mon, 2 Aug 2021 10:12:11 +0200
Subject: [PATCH] RED-1911: Download should include excluded files, but without
 redactions

---
 .../service/ReportGenerationService.java      | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
index 7110f4b..d810b96 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
@@ -14,6 +14,7 @@ import com.iqser.red.service.redaction.report.v1.server.model.MultiFileWorkbook;
 import com.iqser.red.service.redaction.report.v1.server.model.ReportRedactionEntry;
 import com.iqser.red.service.redaction.report.v1.server.storage.ReportStorageService;
 import com.iqser.red.service.redaction.v1.model.RedactionLog;
+import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -83,12 +84,8 @@ public class ReportGenerationService {
                     .get(j));
 
             long start = System.currentTimeMillis();
-            RedactionLog redactionLog = reportStorageService.getRedactionLog(reportMessage.getDossierId(), reportMessage
-                    .getFileIds()
-                    .get(j));
-            List<LegalBasisMapping> legalBasisMappings = redactionLog.getLegalBasis();
 
-            List<ReportRedactionEntry> reportEntries = redactionLogConverterService.convertAndSort(redactionLog, legalBasisMappings);
+            List<ReportRedactionEntry> reportEntries = getReportEntries(reportMessage.getDossierId(), reportMessage.getFileIds().get(j));
 
             if (reportMessage.getReportTypes().contains(ReportType.EXCEL_MULTI_FILE)) {
                 excelReportService.addEntries(excelMultiFileSheet, reportEntries, fileStatus.getFilename(), excelRowIndex);
@@ -168,4 +165,16 @@ public class ReportGenerationService {
         return storedFileInformation;
     }
 
+    private List<ReportRedactionEntry> getReportEntries(String dossierId, String fileId){
+        RedactionLog redactionLog = null;
+        try {
+            redactionLog = reportStorageService.getRedactionLog(dossierId, fileId);
+        } catch (StorageObjectDoesNotExist e){
+            return new ArrayList<>();
+        }
+        List<LegalBasisMapping> legalBasisMappings = redactionLog.getLegalBasis();
+
+        return redactionLogConverterService.convertAndSort(redactionLog, legalBasisMappings);
+    }
+
 }