From b1122ae4f3a40b74b301d4ff347fd1474cdfe6e6 Mon Sep 17 00:00:00 2001 From: Philipp Schramm Date: Wed, 20 Oct 2021 15:51:40 +0200 Subject: [PATCH] RED-2187 Use persistence-service-api-v1 version 0.74.0 --- .../redaction-report-service-server-v1/pom.xml | 2 +- .../v1/server/controller/StatusReportController.java | 2 +- .../report/v1/server/service/ReportGenerationService.java | 2 +- .../v1/server/service/StatusReportGenerationService.java | 2 +- .../server/service/StatusReportGenerationServiceTest.java | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) 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 b09f5a0..1143326 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 @@ -36,7 +36,7 @@ com.iqser.red.service persistence-service-api-v1 - 0.22.0 + 0.74.0 com.iqser.red.service 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 78e1553..5c58cde 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); + Dossier dossier = dossierClient.getDossierById(dossierId, 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 1ece589..d2ea5b7 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()); + Dossier project = dossierClient.getDossierById(reportMessage.getDossierId(), 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 0357dad..ecc6ecd 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 @@ -60,7 +60,7 @@ public class StatusReportGenerationService { String name = fileStatus.getFilename(); OffsetDateTime uploadDate = fileStatus.getLastUploaded(); String assignedTo = fileStatus.getCurrentReviewer(); - var status = fileStatus.getStatus(); + var status = fileStatus.getWorkflowStatus(); int pages = fileStatus.getNumberOfPages(); var fileAttributes = fileStatus.getFileAttributes(); 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 f46094d..83cb19c 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 @@ -18,7 +18,7 @@ import org.springframework.test.context.junit4.SpringRunner; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.Dossier; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileAttributeConfig; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileModel; -import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileStatus; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus; import com.iqser.red.service.redaction.report.v1.server.client.DossierClient; import com.iqser.red.service.redaction.report.v1.server.client.FileAttributesConfigClient; import com.iqser.red.service.redaction.report.v1.server.client.FileStatusClient; @@ -47,14 +47,14 @@ public class StatusReportGenerationServiceTest { String dossierId = "dossierId"; Dossier dossier = Dossier.builder().dossierName("dossierName").id(dossierId).build(); - when(dossierClient.getDossierById(dossierId)).thenReturn(dossier); + when(dossierClient.getDossierById(dossierId, false)).thenReturn(dossier); FileModel fileStatus1 = FileModel.builder() .dossierId(dossierId) .filename("file1desJahrhunderts") .lastUploaded(OffsetDateTime.now().minusHours(2)) .currentReviewer("me") - .status(FileStatus.APPROVED) + .workflowStatus(WorkflowStatus.APPROVED) .numberOfPages(3) .fileAttributes(Map.of("a", "A","config2","B2" )) .build(); @@ -65,7 +65,7 @@ public class StatusReportGenerationServiceTest { .filename("file2desJahrtausendsGibtsJaNicht") .lastUploaded(OffsetDateTime.now()) .currentReviewer("you") - .status(FileStatus.APPROVED) + .workflowStatus(WorkflowStatus.APPROVED) .numberOfPages(21) .fileAttributes(Map.of("config1","X1","y", "Y")) .build();