diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportRequestMessage.java b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportRequestMessage.java index f8f1025..500c05f 100644 --- a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportRequestMessage.java +++ b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportRequestMessage.java @@ -23,9 +23,7 @@ public class ReportRequestMessage { private String dossierId; private String dossierTemplateId; - - private Boolean includeUnprocessed; - + @Builder.Default private List fileIds = new ArrayList<>(); diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportResultMessage.java b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportResultMessage.java index 42b9eef..3d9eca8 100644 --- a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportResultMessage.java +++ b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportResultMessage.java @@ -14,6 +14,5 @@ public class ReportResultMessage { private String userId; private String downloadId; private String reportFileInformationStorageId; - private Boolean includeUnprocessed; } diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java index 3460cc9..4f272c5 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java @@ -55,7 +55,7 @@ public class EntityLogConverterService { @Timed("redactmanager_getReportEntries") - public List getReportEntries(String dossierId, String fileId, boolean isExcluded, boolean includeUnprocessed) { + public List getReportEntries(String dossierId, String fileId, boolean isExcluded) { if (isExcluded) { return new ArrayList<>(); @@ -64,11 +64,7 @@ public class EntityLogConverterService { EntityLog entityLog; Map mapOfEntityDisplayName; try { - if (includeUnprocessed) { - entityLog = entityLogClient.getEntityLog(dossierId, fileId, null, includeUnprocessed); - } else { - entityLog = reportStorageService.getEntityLog(dossierId, fileId, new ArrayList<>()); - } + entityLog = entityLogClient.getEntityLog(dossierId, fileId, null, true); mapOfEntityDisplayName = fillMapOfTypeAndEntityDisplayName(dossierId); } catch (StorageObjectDoesNotExist e) { return new ArrayList<>(); @@ -133,7 +129,7 @@ public class EntityLogConverterService { settings.getMaxRedactionEntryValueLength()); } - if (settings.getMaxSectionLength() > 0 && entry.getSection() != null && entry.getSection().length() > settings.getMaxSectionLength()){ + if (settings.getMaxSectionLength() > 0 && entry.getSection() != null && entry.getSection().length() > settings.getMaxSectionLength()) { entry.setSection(entry.getSection().substring(0, settings.getMaxSectionLength()) + "..."); log.warn("Truncated section in dossier {}, file {} on pages {} to {} chars", dossierId, @@ -142,7 +138,6 @@ public class EntityLogConverterService { settings.getMaxSectionLength()); } - if (!entry.getManualChanges().isEmpty() && (entry.getEntryType() == EntryType.IMAGE || entry.getEntryType() == EntryType.IMAGE_HINT) && entry.getManualChanges() .get(entry.getManualChanges().size() - 1) .getProcessedDate() == null && entry.getManualChanges() 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 8bc95ec..420970e 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 @@ -78,7 +78,7 @@ public class ReportGenerationService { var fileStatus = fileStatusClient.getFileStatus(dossierId, fileId); generatePlaceholderService.resolveFileAttributeValues(fileStatus, placeholderModel); - List reportEntries = entityLogConverterService.getReportEntries(dossierId, fileId, fileStatus.isExcluded(), reportMessage.getIncludeUnprocessed()); + List reportEntries = entityLogConverterService.getReportEntries(dossierId, fileId, fileStatus.isExcluded()); generateMultiFileExcelReports(reportTemplates.multiFileWorkbookReportTemplates, placeholderModel, fileStatus, isLastFile, dossierName, reportEntries); diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportMessageReceiver.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportMessageReceiver.java index 512ec6b..74bf8e0 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportMessageReceiver.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportMessageReceiver.java @@ -44,20 +44,16 @@ 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.getIncludeUnprocessed() == null || reportMessage.getIncludeUnprocessed()); + addToReportResultQueue(reportMessage.getUserId(), reportMessage.getDownloadId(), reportFileInformationStorageId); long end = System.currentTimeMillis(); log.info("Successfully generated reports for downloadId {}, took {}", reportMessage.getDownloadId(), end - start); } - private void addToReportResultQueue(String userId, String downloadId, String reportFileInformationStorageId, int priority, boolean includeUnprocessed) { + private void addToReportResultQueue(String userId, String downloadId, String reportFileInformationStorageId) { - rabbitTemplate.convertAndSend(REPORT_RESULT_QUEUE, new ReportResultMessage(userId, downloadId, reportFileInformationStorageId, includeUnprocessed), message -> { - message.getMessageProperties().setPriority(priority); - return message; - }); + rabbitTemplate.convertAndSend(REPORT_RESULT_QUEUE, new ReportResultMessage(userId, downloadId, reportFileInformationStorageId)); } } diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportV2IntegrationTest.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportV2IntegrationTest.java index a628020..fd538eb 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportV2IntegrationTest.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportV2IntegrationTest.java @@ -234,6 +234,7 @@ public class RedactionReportV2IntegrationTest { var entityLog = objectMapper.readValue(new ClassPathResource("files/entityLog.json").getInputStream(), EntityLog.class); fileSystemBackedStorageService.storeJSONObject(TenantContext.getTenantId(), StorageIdUtils.getStorageId("dossierId", "fileId" + id, FileType.ENTITY_LOG), entityLog); + when(entityLogClient.getEntityLog("dossierId", "fileId" + id, null, true)).thenReturn(entityLog); } @@ -242,7 +243,6 @@ public class RedactionReportV2IntegrationTest { public void testBasicExcelReportFlow() { var reportRequestMessage = prepareFlow(2, "templates/Excel QC (incl. Skipped Redactions).xlsx"); - reportRequestMessage.setIncludeUnprocessed(false); processRequest(reportRequestMessage, ".xlsx"); MetricValidationUtils.validateMetric(prometheusMeterRegistry, "redactmanager_generateReports", 1, null); @@ -257,7 +257,6 @@ public class RedactionReportV2IntegrationTest { public void testMultifileWordReportFlow() { var reportRequestMessage = prepareFlow(2, "templates/Justification Appendix A1.docx"); - reportRequestMessage.setIncludeUnprocessed(false); processRequest(reportRequestMessage, ".docx"); MetricValidationUtils.validateMetric(prometheusMeterRegistry, "redactmanager_generateReports", 1, null); @@ -274,7 +273,6 @@ public class RedactionReportV2IntegrationTest { public void test2FilesConcurrently() { var reportRequestMessage = prepareFlow(1, "templates/report.xlsx", "templates/report-advanced.xlsx"); - reportRequestMessage.setIncludeUnprocessed(false); processRequest(reportRequestMessage, ".xlsx"); MetricValidationUtils.validateMetric(prometheusMeterRegistry, "redactmanager_generateReports", 1, null); @@ -289,7 +287,6 @@ public class RedactionReportV2IntegrationTest { public void testIncludeUnprocessed() { var reportRequestMessage = prepareFlow(2, "templates/Excel QC (incl. Skipped Redactions).xlsx"); - reportRequestMessage.setIncludeUnprocessed(true); when(entityLogClient.getEntityLog(anyString(), anyString(), any(), eq(true))).thenReturn(new EntityLog(1, 1, List.of(EntityLogEntry.builder()