[PAGOPA-1967] feat: Update Stamp converter (#108)

decode from base64 and keep the marshalling time base64 encoding for SANP compliance
pagopa · Jul 25, 2024 · 40f4f94 · 40f4f94
1 parent 55191bb
commit 40f4f94
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -110,7 +110,7 @@ __pycache__
 local.settings.json
 **/*.iml
 /lib/
-**/.env
+**/*.env
 bin/
 **/application-azure.properties
 .cache_ggshield

diff --git a/...main/java/it/gov/pagopa/payments/mapper/ConvertMarcaDaBolloToCtRichiestaMarcaDaBollo.java b/...main/java/it/gov/pagopa/payments/mapper/ConvertMarcaDaBolloToCtRichiestaMarcaDaBollo.java
@@ -7,6 +7,8 @@
 import org.modelmapper.MappingException;
 import org.modelmapper.spi.MappingContext;
 
+import java.util.Base64;
+
 public class ConvertMarcaDaBolloToCtRichiestaMarcaDaBollo
     implements Converter<Stamp, CtRichiestaMarcaDaBollo> {
 
@@ -17,7 +19,10 @@ public CtRichiestaMarcaDaBollo convert(MappingContext<Stamp, CtRichiestaMarcaDaB
     CtRichiestaMarcaDaBollo ctRichiestaMarcaDaBollo = new CtRichiestaMarcaDaBollo();
     ctRichiestaMarcaDaBollo.setTipoBollo(source.getStampType());
     ctRichiestaMarcaDaBollo.setProvinciaResidenza(source.getProvincialResidence());
-    ctRichiestaMarcaDaBollo.setHashDocumento(source.getHashDocument().getBytes());
+    // the given source.getHashDocument() is already taken as base64 from GPD-Core,
+    // so in this point decode the base64 byte array and encode it next (at the time of response marshalling)
+    ctRichiestaMarcaDaBollo.setHashDocumento(Base64.getDecoder().decode(source.getHashDocument().getBytes()));
+
     return ctRichiestaMarcaDaBollo;
   }
 }
diff --git a/src/main/java/it/gov/pagopa/payments/service/PartnerService.java b/src/main/java/it/gov/pagopa/payments/service/PartnerService.java
@@ -479,14 +479,13 @@ private PaGetPaymentV2Response generatePaGetPaymentResponse(
     transferList
         .getTransfer()
         .addAll(
-            source
-                .getTransfer()
-                .stream()
-                .map(
-                    paymentsTransferModelResponse ->
-                        getTransferResponseV2(
-                            paymentsTransferModelResponse, request.getTransferType()))
-                .collect(Collectors.toList()));
+                source
+                        .getTransfer()
+                        .stream()
+                        .map(
+                                paymentsTransferModelResponse ->
+                                        getTransferResponseV2(
+                                                paymentsTransferModelResponse, request.getTransferType())).toList());
 
     responseData.setTransferList(transferList);
     responseData.setDebtor(debtor);
@@ -574,6 +573,7 @@ private CtTransferPAV2 getTransferResponseV2(
 
     CtTransferPAV2 transferPA = new CtTransferPAV2();
     transferPA.setFiscalCodePA(transfer.getOrganizationFiscalCode());
+    transferPA.setCompanyName(" "); // stText140(1, 140) todo: to be filled in with the correct company name for the PO Nth transfer
     transferPA.setRichiestaMarcaDaBollo(richiestaMarcaDaBollo);
     transferPA.setIdTransfer(Integer.parseInt(transfer.getIdTransfer()));
     transferPA.setRemittanceInformation(transfer.getRemittanceInformation());

diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
@@ -1,6 +1,6 @@
 properties.environment=local
 
-server.port=8080
+server.port=8081
 
 pt.id_intermediario=80007580279
 pt.id_stazione=80007580279_01