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

Pull request #55: RED-2000: Fixed failing report generation with excluded files

Browse Source 
Merge in RED/redaction-report-service from RED-2000-master to master

* commit '550356e975dfc911e87b53f986ecd45793307671':
  RED-2000: Fixed failing report generation with excluded files
This commit is contained in:
Dominique Eiflaender 2021-08-17 15:23:07 +02:00
commit f37491f3e2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
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

@ -91,7 +91,7 @@ public class ReportGenerationService {
long start = System.currentTimeMillis();
List<ReportRedactionEntry> reportEntries = getReportEntries(reportMessage.getDossierId(), reportMessage.getFileIds().get(j));
List<ReportRedactionEntry> reportEntries = getReportEntries(reportMessage.getDossierId(), reportMessage.getFileIds().get(j), fileStatus.isExcluded());
if (reportMessage.getReportTypes().contains(ReportType.EXCEL_MULTI_FILE)) {
excelReportService.addEntries(excelMultiFileSheet, reportEntries, fileStatus.getFilename(), excelRowIndex);
@ -171,7 +171,12 @@ public class ReportGenerationService {
return storedFileInformation;
}
private List<ReportRedactionEntry> getReportEntries(String dossierId, String fileId){
private List<ReportRedactionEntry> getReportEntries(String dossierId, String fileId, boolean isExcluded){
if(isExcluded){
return new ArrayList<>();
}
RedactionLog redactionLog;
try {
redactionLog = redactionLogClient.getRedactionLog(dossierId, fileId, true);