Merge pull request #57 from pagopa/PAGOPA-1231-gpd-payments-due-date-…

…format [PAGOPA-1231] fix: Update PO date conversion
pagopa · Sep 22, 2023 · 39ad9db · 39ad9db
2 parents 903b3e4 + 27281d8
commit 39ad9db
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v1
 name: pagopa-gpd-payments
 description: Microservice that exposes API for payment receipts retrieving and other operations
 type: application
-version: 0.23.0
-appVersion: 0.9.1
+version: 0.22.0
+appVersion: 0.9.0-1-PAGOPA-1231-gpd-payments-due-date-format
 dependencies:
   - name: microservice-chart
     version: 1.21.0

diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-gpd-payments
-    tag: "0.9.1"
+    tag: "0.9.0-1-PAGOPA-1231-gpd-payments-due-date-format"
     pullPolicy: Always
   livenessProbe:
     httpGet:

diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -4,8 +4,7 @@
     "title": "PagoPA API Payments",
     "description": "Payments",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "0.9.1"
-  },
+    "version": "0.9.1"  },
   "servers": [
     {
       "url": "http://localhost",

diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>it.gov.pagopa</groupId>
     <artifactId>payments</artifactId>
-    <version>0.9.1</version>
+    <version>0.9.0-1-PAGOPA-1231-gpd-payments-due-date-format</version>
     <name>Payments</name>
     <description>Payments</description>
 

diff --git a/src/main/java/it/gov/pagopa/payments/service/PartnerService.java b/src/main/java/it/gov/pagopa/payments/service/PartnerService.java
@@ -449,7 +449,10 @@ private PaVerifyPaymentNoticeRes generatePaVerifyPaymentNoticeResponse(
     paymentOption.setAmount(BigDecimal.valueOf(source.getAmount()));
     paymentOption.setOptions(StAmountOption.EQ); // de-scoping
     paymentOption.setDueDate(
-        DatatypeFactory.newInstance().newXMLGregorianCalendar(source.getDueDate().toString()));
+            DatatypeFactory.newInstance().newXMLGregorianCalendar(
+                    CommonUtil.convertToGregorianCalendar(
+                            source.getDueDate()
+                    )));
     paymentOption.setDetailDescription(source.getDescription());
     var cpp =
         source.getTransfer().stream()

diff --git a/src/main/java/it/gov/pagopa/payments/utils/CommonUtil.java b/src/main/java/it/gov/pagopa/payments/utils/CommonUtil.java
@@ -3,6 +3,10 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.GregorianCalendar;
 import javax.xml.XMLConstants;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
@@ -42,4 +46,12 @@ public static void syntacticValidationXml(byte[] xml, File xsdUrl)
     StAXSource source = new StAXSource(xmlStreamReader);
     validator.validate(source);
   }
+
+  public static GregorianCalendar convertToGregorianCalendar(LocalDateTime dateToConvert) {
+    Date date = Date.from(dateToConvert.atZone(ZoneId.systemDefault()).toInstant());
+    GregorianCalendar gregorianCalendar = new GregorianCalendar();
+    gregorianCalendar.setTime(date);
+
+    return gregorianCalendar;
+  }
 }