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

RED-2187 Use persistence-service-api-v1 version 0.74.0

Browse Source
This commit is contained in:
Philipp Schramm 2021-10-20 15:51:40 +02:00
parent 7f0be3676b
commit b1122ae4f3
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
View File

@ -36,7 +36,7 @@
<dependency>
<groupId>com.iqser.red.service</groupId>
<artifactId>persistence-service-api-v1</artifactId>
<version>0.22.0</version>
<version>0.74.0</version>
<exclusions>
<exclusion>
<groupId>com.iqser.red.service</groupId>

2
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/StatusReportController.java
View File

@ -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");
}

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

@ -43,7 +43,7 @@ public class ReportGenerationService {
List<StoredFileInformation> storedFileInformation = new ArrayList<>();
Dossier project = dossierClient.getDossierById(reportMessage.getDossierId());
Dossier project = dossierClient.getDossierById(reportMessage.getDossierId(), false);
List<ReportTemplate> singleFilesTemplates = new ArrayList<>();
List<MultiFileWorkbook> multiFileWorkbooks = new ArrayList<>();

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

@ -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();

8
redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java
View File

@ -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();