From 845ca0695ae54d03a3b180dbc4d1a6b27535fbb8 Mon Sep 17 00:00:00 2001
From: aoezyetimoglu <ali.oezyetimoglu@iqser.com>
Date: Tue, 18 Jan 2022 13:53:13 +0100
Subject: [PATCH] RED-3230: Placeholders in report for excluded file

---
 .../ExcelTemplateReportGenerationService.java | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 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/ExcelTemplateReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelTemplateReportGenerationService.java
index bd86af1..0c63ea6 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelTemplateReportGenerationService.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelTemplateReportGenerationService.java
@@ -160,10 +160,6 @@ public class ExcelTemplateReportGenerationService {
     private void addEntryRows(Sheet sheet, List<ReportRedactionEntry> reportEntries, String filename,
                               boolean isLastFile) {
 
-        if (reportEntries.isEmpty()) {
-            return;
-        }
-
         if (sheet == null) {
             return;
         }
@@ -200,15 +196,22 @@ public class ExcelTemplateReportGenerationService {
                 sheet.shiftRows(rowIndex.get(), rowIndex.get() + reportEntries.size(), reportEntries.size(), true, true);
             }
 
-            reportEntries.forEach(entry -> {
+            if(reportEntries.isEmpty()) {
                 sheet.createRow(rowIndex.get());
                 for (Map.Entry<Integer, String> entry1 : placeholderCellPos.entrySet()) {
-                    sheet.getRow(rowIndex.get())
-                            .createCell(entry1.getKey())
-                            .setCellValue(replaceTextPlaceholderWithEntries(entry, filename, entry1.getValue()));
+                    sheet.getRow(rowIndex.get()).createCell(entry1.getKey()).setCellValue("");
                 }
-                rowIndex.getAndIncrement();
-            });
+
+            } else {
+
+                reportEntries.forEach(entry -> {
+                    sheet.createRow(rowIndex.get());
+                    for (Map.Entry<Integer, String> entry1 : placeholderCellPos.entrySet()) {
+                        sheet.getRow(rowIndex.get()).createCell(entry1.getKey()).setCellValue(replaceTextPlaceholderWithEntries(entry, filename, entry1.getValue()));
+                    }
+                    rowIndex.getAndIncrement();
+                });
+            }
         }
     }