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

Merge branch 'RED-7784-booleanflag' into 'master'

Browse Source 
RED-7784 - change Boolean flag

Closes RED-7784

See merge request redactmanager/redaction-report-service!27
This commit is contained in:
Andrei Isvoran 2023-11-16 08:19:30 +01:00
commit 06db0c5393
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportRequestMessage.java
View File

@ -24,7 +24,7 @@ public class ReportRequestMessage {
private String dossierTemplateId;
private boolean includeUnprocessed;
private Boolean includeUnprocessed;
@Builder.Default
private List<String> fileIds = new ArrayList<>();

2
redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportResultMessage.java
View File

@ -14,6 +14,6 @@ public class ReportResultMessage {
private String userId;
private String downloadId;
private String reportFileInformationStorageId;
private boolean includeUnprocessed;
private Boolean includeUnprocessed;
}

2
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

@ -78,7 +78,7 @@ public class ReportGenerationService {
var fileStatus = fileStatusClient.getFileStatus(dossierId, fileId);
generatePlaceholderService.resolveFileAttributeValues(fileStatus, placeholderModel);
List<ReportRedactionEntry> reportEntries = entityLogConverterService.getReportEntries(dossierId, fileId, fileStatus.isExcluded(), reportMessage.isIncludeUnprocessed());
List<ReportRedactionEntry> reportEntries = entityLogConverterService.getReportEntries(dossierId, fileId, fileStatus.isExcluded(), reportMessage.getIncludeUnprocessed());
generateMultiFileExcelReports(reportTemplates.multiFileWorkbookReportTemplates, placeholderModel, fileStatus, isLastFile, dossierName, reportEntries);

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

@ -44,7 +44,8 @@ public class ReportMessageReceiver {
log.info("Start generating reports for downloadId {}", reportMessage.getDownloadId());
var reportFileInformationStorageId = reportGenerationService.generateReports(reportMessage);
addToReportResultQueue(reportMessage.getUserId(), reportMessage.getDownloadId(), reportFileInformationStorageId, 1, reportMessage.isIncludeUnprocessed());
addToReportResultQueue(reportMessage.getUserId(), reportMessage.getDownloadId(), reportFileInformationStorageId, 1,
reportMessage.getIncludeUnprocessed() == null || reportMessage.getIncludeUnprocessed());
long end = System.currentTimeMillis();
log.info("Successfully generated reports for downloadId {}, took {}", reportMessage.getDownloadId(), end - start);