From 183c410c69754a6309a15473bb9c3b364e6a1e14 Mon Sep 17 00:00:00 2001 From: aoezyetimoglu Date: Thu, 16 Dec 2021 09:56:21 +0100 Subject: [PATCH] RED-2534: Date and date-format are not saved correctly in the Justification Appendix A1 & A2 Folder --- redaction-report-service-v1/pom.xml | 2 +- .../server/service/WordReportGenerationService.java | 12 +++++++++++- .../v1/server/RedactionReportIntegrationTest.java | 6 +++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/redaction-report-service-v1/pom.xml b/redaction-report-service-v1/pom.xml index 1cd9ab6..f50ffa0 100644 --- a/redaction-report-service-v1/pom.xml +++ b/redaction-report-service-v1/pom.xml @@ -7,7 +7,7 @@ com.iqser.red platform-dependency - 1.1.7 + 1.3.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/service/WordReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java index 35b533a..9773357 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java @@ -23,7 +23,11 @@ import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.time.Instant; +import java.time.LocalDate; import java.time.OffsetDateTime; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; import java.util.Base64; @@ -107,7 +111,13 @@ public class WordReportGenerationService { if (dossierAttribute.getValue() == null) { dossierAttributesPlaceholder.put(attributeConfig.getPlaceholder(), ""); } else { - dossierAttributesPlaceholder.put(attributeConfig.getPlaceholder(), dossierAttribute.getValue()); + if(attributeConfig.getType().equals(DossierAttributeType.DATE)) { + OffsetDateTime dt = OffsetDateTime.parse(dossierAttribute.getValue()); + String date = FORMAT_DATE_ISO.format(dt); + dossierAttributesPlaceholder.put(attributeConfig.getPlaceholder(), date); + } else { + dossierAttributesPlaceholder.put(attributeConfig.getPlaceholder(), dossierAttribute.getValue()); + } } } } diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java index 20c4e01..058e957 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java @@ -283,7 +283,7 @@ public class RedactionReportIntegrationTest { DossierAttribute dossierAttribute2 = new DossierAttribute(dossierId, "id2", "Reporter Status"); DossierAttribute dossierAttribute3 = new DossierAttribute(dossierId, "id3", "Dossier Name"); DossierAttribute dossierAttribute4 = new DossierAttribute(dossierId, "id4", "Firma"); - DossierAttribute dossierAttribute5 = new DossierAttribute(dossierId, "id5", OffsetDateTime.now().format(FORMAT_DATE_ENG)); + DossierAttribute dossierAttribute5 = new DossierAttribute(dossierId, "id5", "2021-11-09T23:00:00.000Z"); DossierAttribute dossierAttribute6 = new DossierAttribute(dossierId, "id6", "data:image/png;base64," + Base64.getEncoder().encodeToString(IOUtils.toByteArray(imageResource.getInputStream()))); when(dossierAttributesClient.getDossierAttributes("dossierId")).thenReturn(List.of(dossierAttribute, dossierAttribute2, dossierAttribute3, dossierAttribute4, dossierAttribute5, dossierAttribute6)); @@ -303,7 +303,7 @@ public class RedactionReportIntegrationTest { .storageId(storageId) .build()); - ClassPathResource wordTemplateResource = new ClassPathResource("templates/Justification Appendix A2.docx"); + ClassPathResource wordTemplateResource = new ClassPathResource("templates/Justification Appendix A1.docx"); when(reportStorageService.getReportTemplate(storageId)).thenReturn(IOUtils.toByteArray(wordTemplateResource.getInputStream())); ReportTemplate reportTemplate = ReportTemplate.builder() .dossierTemplateId("dossierTemplateId") @@ -381,7 +381,7 @@ public class RedactionReportIntegrationTest { DossierAttribute dossierAttribute2 = new DossierAttribute(dossierId, "id2", "Reporter Status"); DossierAttribute dossierAttribute3 = new DossierAttribute(dossierId, "id3", "Dossier Name"); DossierAttribute dossierAttribute4 = new DossierAttribute(dossierId, "id4", "Firma"); - DossierAttribute dossierAttribute5 = new DossierAttribute(dossierId, "id5", OffsetDateTime.now().format(FORMAT_DATE_ENG)); + DossierAttribute dossierAttribute5 = new DossierAttribute(dossierId, "id5", "2021-11-09T23:00:00.000Z"); DossierAttribute dossierAttribute6 = new DossierAttribute(dossierId, "id6", "data:image/png;base64," + Base64.getEncoder().encodeToString(IOUtils.toByteArray(imageResource.getInputStream()))); when(dossierAttributesClient.getDossierAttributes("dossierId")).thenReturn(List.of(dossierAttribute, dossierAttribute2, dossierAttribute3, dossierAttribute4, dossierAttribute5, dossierAttribute6));