fix: Modified fields with cents according to idpay (#39)

pagopa · May 22, 2024 · 568ac17 · 568ac17
1 parent aaf862e
commit 568ac17
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 9 deletions.
diff --git a/src/main/java/it/pagopa/swclient/mil/idpay/bean/AuthTransactionResponse.java b/src/main/java/it/pagopa/swclient/mil/idpay/bean/AuthTransactionResponse.java
@@ -5,6 +5,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import java.util.Date;
 
 @Data
 @Builder
@@ -15,7 +16,12 @@ public class AuthTransactionResponse {
 
     private String id;
     private String trxCode;
+    private Date trxDate;
     private String initiativeId;
+    private String initiativeName;
+    private String businessName;
     private TransactionStatus status;
+    private Long rewardCents;
     private Long amountCents;
+    private Long residualBudgetCents;
 }
diff --git a/src/main/java/it/pagopa/swclient/mil/idpay/client/IdpayRestClient.java b/src/main/java/it/pagopa/swclient/mil/idpay/client/IdpayRestClient.java
@@ -21,30 +21,44 @@ public interface IdpayRestClient {
     @GET
     @Path("/idpay/mil/merchant/initiatives")
     @ClientHeaderParam(name = "Ocp-Apim-Subscription-Key", value = "${idpay-rest-client.apim-subscription-key}", required = false)
-    Uni<List<InitiativeDTO>> getMerchantInitiativeList(@HeaderParam("x-merchant-fiscalcode") @NotNull String idpayMerchantId, @HeaderParam("x-acquirer-id") @NotNull String xAcquirerId);
+    Uni<List<InitiativeDTO>> getMerchantInitiativeList(
+            @HeaderParam("x-merchant-fiscalcode") @NotNull String idpayMerchantId,
+            @HeaderParam("x-acquirer-id") @NotNull String xAcquirerId);
 
     /*
      * TRANSACTIONS
      */
     @POST
     @Path("/idpay/mil/payment")
     @ClientHeaderParam(name = "Ocp-Apim-Subscription-Key", value = "${idpay-rest-client.apim-subscription-key}", required = false)
-    Uni<TransactionResponse> createTransaction(@HeaderParam("x-merchant-fiscalcode") @NotNull String idpayMerchantId, @HeaderParam("x-acquirer-id") @NotNull String xAcquirerId, TransactionCreationRequest transactionCreationRequest);
+    Uni<TransactionResponse> createTransaction(
+            @HeaderParam("x-merchant-fiscalcode") @NotNull String idpayMerchantId,
+            @HeaderParam("x-acquirer-id") @NotNull String xAcquirerId,
+            TransactionCreationRequest transactionCreationRequest);
 
     @GET
     @Path("/idpay/mil/payment/{transactionId}/status")
     @ClientHeaderParam(name = "Ocp-Apim-Subscription-Key", value = "${idpay-rest-client.apim-subscription-key}", required = false)
-    Uni<SyncTrxStatus> getStatusTransaction(@HeaderParam("x-merchant-fiscalcode") @NotNull String idpayMerchantId, @HeaderParam("x-acquirer-id") @NotNull String xAcquirerId, @PathParam("transactionId") String transactionId);
+    Uni<SyncTrxStatus> getStatusTransaction(
+            @HeaderParam("x-merchant-fiscalcode") @NotNull String idpayMerchantId,
+            @HeaderParam("x-acquirer-id") @NotNull String xAcquirerId,
+            @PathParam("transactionId") String transactionId);
 
     @PUT
     @Path("/idpay/mil/payment/idpay-code/{transactionId}/preview")
     @ClientHeaderParam(name = "Ocp-Apim-Subscription-Key", value = "${idpay-rest-client.apim-subscription-key}", required = false)
-    Uni<PreAuthPaymentResponseDTO> putPreviewPreAuthPayment(@HeaderParam("x-merchant-fiscalcode") @NotNull String idpayMerchantId, @HeaderParam("x-acquirer-id") @NotNull String xAcquirerId, @PathParam("transactionId") String transactionId);
+    Uni<PreAuthPaymentResponseDTO> putPreviewPreAuthPayment(
+            @HeaderParam("x-merchant-fiscalcode") @NotNull String idpayMerchantId,
+            @HeaderParam("x-acquirer-id") @NotNull String xAcquirerId,
+            @PathParam("transactionId") String transactionId);
 
     @DELETE
     @Path("/idpay/mil/payment/{transactionId}")
     @ClientHeaderParam(name = "Ocp-Apim-Subscription-Key", value = "${idpay-rest-client.apim-subscription-key}", required = false)
-    Uni<Void> deleteTransaction(@HeaderParam("x-merchant-fiscalcode") @NotNull String idpayMerchantId, @HeaderParam("x-acquirer-id") @NotNull String xAcquirerId, @PathParam("transactionId") String transactionId);
+    Uni<Void> deleteTransaction(
+            @HeaderParam("x-merchant-fiscalcode") @NotNull String idpayMerchantId,
+            @HeaderParam("x-acquirer-id") @NotNull String xAcquirerId,
+            @PathParam("transactionId") String transactionId);
 
     /*
      * AUTHORIZE TRANSACTIONS

diff --git a/src/main/java/it/pagopa/swclient/mil/idpay/client/bean/PreAuthPaymentResponseDTO.java b/src/main/java/it/pagopa/swclient/mil/idpay/client/bean/PreAuthPaymentResponseDTO.java
@@ -20,8 +20,8 @@ public class PreAuthPaymentResponseDTO {
     private String initiativeName;
     private String businessName;
     private TransactionStatus status;
-    private Long reward;
+    private Long rewardCents;
     private Long amountCents;
-    private BigDecimal residualBudget;
+    private BigDecimal residualBudgetCents;
     private String secondFactor;
 }
diff --git a/src/main/java/it/pagopa/swclient/mil/idpay/service/TransactionsService.java b/src/main/java/it/pagopa/swclient/mil/idpay/service/TransactionsService.java
@@ -343,15 +343,14 @@ protected IdpayTransactionEntity updateIdpayTransactionEntity(CommonHeader heade
         idpayTransaction.setStatus(res.getStatus());
         idpayTransaction.setCoveredAmount(res.getRewardCents());
         if (preview != null) {
-            idpayTransaction.setCoveredAmount(preview.getReward());
+            idpayTransaction.setCoveredAmount(preview.getRewardCents());
         }
         idpayTransaction.setLastUpdate(lastUpdateFormat.format(new Date()));
         idpayTransaction.setByCie(entity.idpayTransaction.getByCie());
 
         IdpayTransactionEntity trEntity = new IdpayTransactionEntity();
 
         trEntity.transactionId = entity.transactionId;
-
         trEntity.idpayTransaction = idpayTransaction;
 
         return trEntity;