Marmelator/redaction-report-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 129 Wiki Activity

RED-6098: Changed namings of boolean values and simplified the usage of reportEntries

Browse Source
This commit is contained in:
Ali Oezyetimoglu 2023-04-06 12:34:36 +02:00
parent 5f9a12e25b
commit 4c6d04cf8a
4 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/model/ExcelModel.java
View File

@ -25,10 +25,10 @@ public class ExcelModel {
private List<Integer> 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;
}

23
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelReportGenerationService.java
View File

@ -100,7 +100,7 @@ public class ExcelReportGenerationService {
@Timed("redactmanager_generateExcelReport")
public void generateExcelReport(List<ReportRedactionEntry> allReportEntries,
public void generateExcelReport(List<ReportRedactionEntry> reportEntries,
PlaceholderModel placeholderModel,
String reportTemplateName,
SXSSFWorkbook workbook,
@ -111,12 +111,9 @@ public class ExcelReportGenerationService {
long start = System.currentTimeMillis();
List<ReportRedactionEntry> 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<Integer> 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<CellIdentifier, Cell> 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);
}
}

7
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
View File

@ -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<ReportRedactionEntry> 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);
}

5
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java
View File

@ -82,7 +82,7 @@ public class WordReportGenerationService {
@Timed("redactmanager_generateWordReport")
public int generateWordReport(List<ReportRedactionEntry> allReportEntries,
public int generateWordReport(List<ReportRedactionEntry> reportEntries,
PlaceholderModel placeholderModel,
String reportTemplateName,
XWPFDocument doc,
@ -92,7 +92,8 @@ public class WordReportGenerationService {
long start = System.currentTimeMillis();
List<ReportRedactionEntry> 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;