From fc8ce6ea5c04397c0262bfb3dc078a693808e202 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 27 Jan 2022 17:17:47 +0200 Subject: [PATCH 1/3] correction --- .../redaction-report-service-api-v1/pom.xml | 7 +++++-- .../pom.xml | 19 ++++++------------- .../service/RedactionLogConverterService.java | 15 +-------------- 3 files changed, 12 insertions(+), 29 deletions(-) diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml b/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml index 0759411..17a116a 100644 --- a/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml +++ b/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml @@ -13,6 +13,10 @@ redaction-report-service-api-v1 1.0-SNAPSHOT + + 1.25.0 + + @@ -29,8 +33,7 @@ com.iqser.red.service persistence-service-api-v1 - 0.151.0 - compile + ${persistence-service.version} diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml b/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml index 2f53c04..ff2c7ed 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml +++ b/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml @@ -13,6 +13,11 @@ redaction-report-service-server-v1 1.0-SNAPSHOT + + 1.25.0 + 3.68.0 + + com.iqser.red.service @@ -24,7 +29,7 @@ com.iqser.red.service redaction-service-api-v1 - 3.21.0 + ${redaction-service.version} com.iqser.red.service @@ -33,18 +38,6 @@ - - com.iqser.red.service - persistence-service-api-v1 - 0.83.0 - - - com.iqser.red.service - redaction-service-api-v1 - - - - org.apache.poi poi diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java index 1e8b3b2..16597f4 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java @@ -30,10 +30,7 @@ public class RedactionLogConverterService { if (entry.isRedacted()) { - if (entry.getChanges() != null && entry.getChanges().size() > 1 && entry.getChanges() - .get(entry.getChanges().size() - 1) - .getType() - .equals(ChangeType.REMOVED)) { + if(entry.lastChangeIsRemoved()){ return; } @@ -45,16 +42,6 @@ public class RedactionLogConverterService { return; } - if (entry.isManual() && entry.getManualRedactionType() - .equals(ManualRedactionType.ADD) && !entry.getStatus().equals(AnnotationStatus.APPROVED)) { - return; - } - - if (entry.isManual() && entry.getManualRedactionType() - .equals(ManualRedactionType.REMOVE) && entry.getStatus().equals(AnnotationStatus.APPROVED)) { - return; - } - Set pages = new HashSet<>(); for (Rectangle position : entry.getPositions()) { From ddeecd32649bab237876643c307547ee20486a85 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 27 Jan 2022 17:21:17 +0200 Subject: [PATCH 2/3] RED-3242 - excluded from automatic analysis - reworked redactionLog architecture - adaptations for services --- .../report/v1/server/controller/StatusReportController.java | 2 +- .../report/v1/server/service/ReportGenerationService.java | 2 +- .../report/v1/server/service/StatusReportGenerationService.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/StatusReportController.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/StatusReportController.java index 5c58cde..ae80abf 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/StatusReportController.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/StatusReportController.java @@ -23,7 +23,7 @@ public class StatusReportController implements StatusReportResource { @Override public StatusReportResponse generateStatusReport(@PathVariable(DOSSIER_ID) String dossierId) { - Dossier dossier = dossierClient.getDossierById(dossierId, false); + Dossier dossier = dossierClient.getDossierById(dossierId, true,false); byte[] report = statusReportGenerationService.generateReport(dossier); return new StatusReportResponse(report, dossier.getDossierName() + ".xlsx"); } 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 d2ea5b7..39338ed 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 @@ -43,7 +43,7 @@ public class ReportGenerationService { List storedFileInformation = new ArrayList<>(); - Dossier project = dossierClient.getDossierById(reportMessage.getDossierId(), false); + Dossier project = dossierClient.getDossierById(reportMessage.getDossierId(), true,false); List singleFilesTemplates = new ArrayList<>(); List multiFileWorkbooks = new ArrayList<>(); diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java index ecc6ecd..8cb3587 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java @@ -59,7 +59,7 @@ public class StatusReportGenerationService { String name = fileStatus.getFilename(); OffsetDateTime uploadDate = fileStatus.getLastUploaded(); - String assignedTo = fileStatus.getCurrentReviewer(); + String assignedTo = fileStatus.getAssignee(); var status = fileStatus.getWorkflowStatus(); int pages = fileStatus.getNumberOfPages(); var fileAttributes = fileStatus.getFileAttributes(); From 972d4f891aebe76719dd7426578c783ae0c563e5 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 27 Jan 2022 17:22:09 +0200 Subject: [PATCH 3/3] test correction --- .../server/service/StatusReportGenerationServiceTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java index c9458d7..ff855d5 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java @@ -47,13 +47,13 @@ public class StatusReportGenerationServiceTest { String dossierId = "dossierId"; Dossier dossier = Dossier.builder().dossierName("dossierName").id(dossierId).build(); - when(dossierClient.getDossierById(dossierId, false)).thenReturn(dossier); + when(dossierClient.getDossierById(dossierId, true,false)).thenReturn(dossier); FileModel fileStatus1 = FileModel.builder() .dossierId(dossierId) .filename("file1desJahrhunderts") .lastUploaded(OffsetDateTime.now().minusHours(2)) - .currentReviewer("me") + .assignee("me") .workflowStatus(WorkflowStatus.APPROVED) .numberOfPages(3) .fileAttributes(Map.of("a", "A","config2","B2" )) @@ -64,7 +64,7 @@ public class StatusReportGenerationServiceTest { .dossierId(dossierId) .filename("file2desJahrtausendsGibtsJaNicht") .lastUploaded(OffsetDateTime.now()) - .currentReviewer("you") + .assignee("you") .workflowStatus(WorkflowStatus.APPROVED) .numberOfPages(21) .fileAttributes(Map.of("config1","X1","y", "Y")) @@ -85,4 +85,4 @@ public class StatusReportGenerationServiceTest { } -} \ No newline at end of file +}