From 4c6d04cf8a0be86bc596c85a11b7b7f7b195b884 Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Thu, 6 Apr 2023 12:34:36 +0200 Subject: [PATCH] RED-6098: Changed namings of boolean values and simplified the usage of reportEntries --- .../report/v1/server/model/ExcelModel.java | 6 ++--- .../service/ExcelReportGenerationService.java | 23 ++++++++----------- .../service/ReportGenerationService.java | 7 ++---- .../service/WordReportGenerationService.java | 5 ++-- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/model/ExcelModel.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/model/ExcelModel.java index 1c7321a..2f5e831 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/model/ExcelModel.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/model/ExcelModel.java @@ -25,10 +25,10 @@ public class ExcelModel { private List writtenRows = new ArrayList<>(); private boolean rowsBeforeRedactionEntryRowsAdded; - private boolean hasRssPlaceHolders; + private boolean rssPlaceholdersPresent; private boolean placeholderInFirstRow; private boolean firstRowWritten; - private boolean hasScmFunctionPlaceholder; - private boolean hasSkippedPlaceholder; + private boolean scmFunctionPlaceholderPresent; + private boolean skippedPlaceholderPresent; } diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelReportGenerationService.java index e90a423..7fc816d 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelReportGenerationService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelReportGenerationService.java @@ -100,7 +100,7 @@ public class ExcelReportGenerationService { @Timed("redactmanager_generateExcelReport") - public void generateExcelReport(List allReportEntries, + public void generateExcelReport(List reportEntries, PlaceholderModel placeholderModel, String reportTemplateName, SXSSFWorkbook workbook, @@ -111,12 +111,9 @@ public class ExcelReportGenerationService { long start = System.currentTimeMillis(); - List reportEntries; - if (!excelModel.isHasSkippedPlaceholder()) { - reportEntries = allReportEntries.stream().filter(entry -> !entry.isSkipped()).collect(Collectors.toList()); - } else { - reportEntries = allReportEntries; + if (!excelModel.isSkippedPlaceholderPresent()) { + reportEntries = reportEntries.stream().filter(entry -> !entry.isSkipped()).collect(Collectors.toList()); } try { @@ -132,22 +129,22 @@ public class ExcelReportGenerationService { addRows(workbook, sheet, excelModel.getCellsToCopyBeforeRedactionPlaceholderRow(), - excelModel.isHasRssPlaceHolders() ? excelModel.getWrittenRows().size() : 0, + excelModel.isRssPlaceholdersPresent() ? excelModel.getWrittenRows().size() : 0, placeholderModel, dossierName, fileModel.getFilename(), excelModel); - if (!excelModel.isHasRssPlaceHolders()) { + if (!excelModel.isRssPlaceholdersPresent()) { excelModel.setRowsBeforeRedactionEntryRowsAdded(true); } } - if (!excelModel.isHasRssPlaceHolders() && !excelModel.isHasScmFunctionPlaceholder()) { + if (!excelModel.isRssPlaceholdersPresent() && !excelModel.isScmFunctionPlaceholderPresent()) { addRedactionEntryRows(sheet, reportEntries, fileModel.getFilename(), excelModel, placeholderModel); } - if (excelModel.isHasScmFunctionPlaceholder()) { + if (excelModel.isScmFunctionPlaceholderPresent()) { addSCMEntryRows(sheet, fileModel, excelModel); } @@ -189,10 +186,10 @@ public class ExcelReportGenerationService { Set createdCopyRows = new HashSet<>(); - int skipRows = excelModel.isHasRssPlaceHolders() && excelModel.isFirstRowWritten() && !excelModel.isPlaceholderInFirstRow() ? 1 : 0; + int skipRows = excelModel.isRssPlaceholdersPresent() && excelModel.isFirstRowWritten() && !excelModel.isPlaceholderInFirstRow() ? 1 : 0; for (Map.Entry cellsToCopyEntry : copiedCells.entrySet()) { - if (excelModel.isHasRssPlaceHolders() && cellsToCopyEntry.getKey().getRowIndex() == 0 && excelModel.isFirstRowWritten() && !excelModel.isPlaceholderInFirstRow()) { + if (excelModel.isRssPlaceholdersPresent() && cellsToCopyEntry.getKey().getRowIndex() == 0 && excelModel.isFirstRowWritten() && !excelModel.isPlaceholderInFirstRow()) { continue; } @@ -201,7 +198,7 @@ public class ExcelReportGenerationService { if (!createdCopyRows.contains(indexToAddRow)) { sheet.createRow(indexToAddRow); createdCopyRows.add(indexToAddRow); - if (excelModel.isHasRssPlaceHolders()) { + if (excelModel.isRssPlaceholdersPresent()) { excelModel.getWrittenRows().add(indexToAddRow); } } 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 8937a1b..14c032c 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 @@ -4,11 +4,8 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedList; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.xssf.streaming.SXSSFWorkbook; @@ -175,7 +172,7 @@ public class ReportGenerationService { List reportEntries) { for (MultiFileWorkbook multiFileWorkbook : multiFileWorkbookReportTemplates) { - if (multiFileWorkbook.getExcelModel().isHasRssPlaceHolders()) { + if (multiFileWorkbook.getExcelModel().isRssPlaceholdersPresent()) { generatePlaceholderService.resolveRssValues(fileStatus, placeholderModel); } excelTemplateReportGenerationService.generateExcelReport(reportEntries, @@ -261,7 +258,7 @@ public class ReportGenerationService { writeWorkbook.createSheet(sheet.getSheetName()); } var excelModel = excelTemplateReportGenerationService.calculateExcelModel(readWorkbook.getSheetAt(0)); - if (excelModel.isHasRssPlaceHolders()) { + if (excelModel.isRssPlaceholdersPresent()) { generatePlaceholderService.resolveRssValues(fileStatus, placeholderModel); } diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java index 479ab12..132f3f7 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java @@ -82,7 +82,7 @@ public class WordReportGenerationService { @Timed("redactmanager_generateWordReport") - public int generateWordReport(List allReportEntries, + public int generateWordReport(List reportEntries, PlaceholderModel placeholderModel, String reportTemplateName, XWPFDocument doc, @@ -92,7 +92,8 @@ public class WordReportGenerationService { long start = System.currentTimeMillis(); - List reportEntries = allReportEntries.stream().filter(entry -> !entry.isSkipped()).collect(Collectors.toList()); + // currently word reports should not contain skipped redactions + reportEntries = reportEntries.stream().filter(entry -> !entry.isSkipped()).collect(Collectors.toList()); int sumOfChars = 0;