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 index 30e7e80..3be67d5 100644 --- 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 index 3390f78..5b901f6 100644 --- 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,7 +21,9 @@ 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> getMerchantInitiativeList(@HeaderParam("x-merchant-fiscalcode") @NotNull String idpayMerchantId, @HeaderParam("x-acquirer-id") @NotNull String xAcquirerId); + Uni> getMerchantInitiativeList( + @HeaderParam("x-merchant-fiscalcode") @NotNull String idpayMerchantId, + @HeaderParam("x-acquirer-id") @NotNull String xAcquirerId); /* * TRANSACTIONS @@ -29,22 +31,34 @@ public interface IdpayRestClient { @POST @Path("/idpay/mil/payment") @ClientHeaderParam(name = "Ocp-Apim-Subscription-Key", value = "${idpay-rest-client.apim-subscription-key}", required = false) - Uni createTransaction(@HeaderParam("x-merchant-fiscalcode") @NotNull String idpayMerchantId, @HeaderParam("x-acquirer-id") @NotNull String xAcquirerId, TransactionCreationRequest transactionCreationRequest); + Uni 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 getStatusTransaction(@HeaderParam("x-merchant-fiscalcode") @NotNull String idpayMerchantId, @HeaderParam("x-acquirer-id") @NotNull String xAcquirerId, @PathParam("transactionId") String transactionId); + Uni 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 putPreviewPreAuthPayment(@HeaderParam("x-merchant-fiscalcode") @NotNull String idpayMerchantId, @HeaderParam("x-acquirer-id") @NotNull String xAcquirerId, @PathParam("transactionId") String transactionId); + Uni 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 deleteTransaction(@HeaderParam("x-merchant-fiscalcode") @NotNull String idpayMerchantId, @HeaderParam("x-acquirer-id") @NotNull String xAcquirerId, @PathParam("transactionId") String transactionId); + Uni 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 index 09b1245..91fa7f2 100644 --- 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 index c0b37f2..0e88ff8 100644 --- 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,7 +343,7 @@ 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()); @@ -351,7 +351,6 @@ protected IdpayTransactionEntity updateIdpayTransactionEntity(CommonHeader heade IdpayTransactionEntity trEntity = new IdpayTransactionEntity(); trEntity.transactionId = entity.transactionId; - trEntity.idpayTransaction = idpayTransaction; return trEntity;