From 51987111a45293bc1b0a725e9d50a8d723c3047d Mon Sep 17 00:00:00 2001 From: svariant Date: Wed, 3 Jan 2024 15:38:11 +0100 Subject: [PATCH] [PRDP-293] Updated BizEvent's Transaction & UserType enum --- integration-test/src/step_definitions/common.js | 4 ++-- .../receipt/pdf/helpdesk/entity/event/Transaction.java | 3 ++- .../pdf/helpdesk/entity/event/enumeration/UserType.java | 6 +++++- .../helpdesk/service/impl/BuildTemplateServiceImplTest.java | 2 +- .../service/impl/GenerateReceiptPdfServiceImplTest.java | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/integration-test/src/step_definitions/common.js b/integration-test/src/step_definitions/common.js index f068f58..3e58679 100644 --- a/integration-test/src/step_definitions/common.js +++ b/integration-test/src/step_definitions/common.js @@ -110,8 +110,8 @@ function createEvent(id, status, orgCode, iuv) { "userStatusDescription": "REGISTERED_SPID" }, "transaction": { - "idTransaction": 123456, - "transactionId": 123456, + "idTransaction": "123456", + "transactionId": "123456", "grandTotal": 0, "amount": 0, "fee": 0 diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/helpdesk/entity/event/Transaction.java b/src/main/java/it/gov/pagopa/receipt/pdf/helpdesk/entity/event/Transaction.java index 6b45e8b..668b128 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/helpdesk/entity/event/Transaction.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/helpdesk/entity/event/Transaction.java @@ -10,7 +10,8 @@ @Builder @JsonIgnoreProperties(ignoreUnknown = true) public class Transaction { - private long idTransaction; + private String idTransaction; + private String transactionId; private long grandTotal; private long amount; private long fee; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/helpdesk/entity/event/enumeration/UserType.java b/src/main/java/it/gov/pagopa/receipt/pdf/helpdesk/entity/event/enumeration/UserType.java index 61e9962..b29eabe 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/helpdesk/entity/event/enumeration/UserType.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/helpdesk/entity/event/enumeration/UserType.java @@ -10,5 +10,9 @@ public enum UserType { @Value("F") F, @Value("G") - G + G, + @Value("GUEST") + GUEST, + @Value("REGISTERED") + REGISTERED } diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/service/impl/BuildTemplateServiceImplTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/service/impl/BuildTemplateServiceImplTest.java index 0e485b9..9e59a1f 100644 --- a/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/service/impl/BuildTemplateServiceImplTest.java +++ b/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/service/impl/BuildTemplateServiceImplTest.java @@ -43,7 +43,7 @@ class BuildTemplateServiceImplTest { public static final String REMITTANCE_INFORMATION = "TARI 2021"; public static final String IUR = "IUR"; public static final String BRAND = "MASTER"; - public static final long ID_TRANSACTION = 1L; + public static final String ID_TRANSACTION = "1"; public static final String RRN = "rrn"; public static final String AUTH_CODE = "authCode"; public static final String DATE_TIME_TIMESTAMP_MILLISECONDS_DST_WINTER = "2023-11-14T19:31:55.484065"; diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/service/impl/GenerateReceiptPdfServiceImplTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/service/impl/GenerateReceiptPdfServiceImplTest.java index 8a0b514..9bb2ecb 100644 --- a/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/service/impl/GenerateReceiptPdfServiceImplTest.java +++ b/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/service/impl/GenerateReceiptPdfServiceImplTest.java @@ -652,7 +652,7 @@ private BizEvent getBizEvent(Payer payer) { .transactionDetails(TransactionDetails.builder() .wallet(WalletItem.builder().info(Info.builder().brand("MASTER").build()).pagoPa(false).favourite(false).build()) .transaction(Transaction.builder() - .idTransaction(1L) + .idTransaction("1") .grandTotal(0L) .amount(7000L) .fee(200L)