From 7d20f721b40f9b600c6a8382f6ef384bd1cc4fdf Mon Sep 17 00:00:00 2001 From: Giuseppe-La-Manna Date: Thu, 25 Jul 2024 17:53:30 +0200 Subject: [PATCH 1/5] P4PU-294 added dependencies for mapstruct --- build.gradle.kts | 13 +++++++++++-- gradle.lockfile | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index db0e4b05..40aaba4b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,6 +29,7 @@ val springdocOpenApiVersion = "2.5.0" val janinoVersion = "3.1.12" val openApiToolsVersion = "0.2.6" val wiremockVersion = "3.5.4" +val mapstructVersion = "1.5.5.Final" dependencies { implementation("org.springframework.boot:spring-boot-starter") @@ -42,10 +43,18 @@ dependencies { // Spring Security // https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-oauth2-client implementation("org.springframework.boot:spring-boot-starter-oauth2-client") - //lombok - compileOnly("org.projectlombok:lombok") annotationProcessor("org.projectlombok:lombok") + compileOnly("org.projectlombok:lombok") + + /** + * Mapstruct + * https://mapstruct.org/ + * mapstruct dependencies must always be placed after the lombok dependency + * or the generated mappers will return an empty object + **/ + implementation("org.mapstruct:mapstruct:$mapstructVersion") + annotationProcessor("org.mapstruct:mapstruct-processor:$mapstructVersion") // Testing testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/gradle.lockfile b/gradle.lockfile index 48dd0ac3..45e8c530 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -45,6 +45,8 @@ org.aspectj:aspectjweaver:1.9.22=compileClasspath org.bouncycastle:bcprov-jdk18on:1.77=compileClasspath org.codehaus.janino:commons-compiler:3.1.12=compileClasspath org.codehaus.janino:janino:3.1.12=compileClasspath +org.mapstruct:mapstruct-processor:1.5.5.Final=compileClasspath +org.mapstruct:mapstruct:1.5.5.Final=compileClasspath org.openapitools:jackson-databind-nullable:0.2.6=compileClasspath org.ow2.asm:asm:9.6=compileClasspath org.projectlombok:lombok:1.18.32=compileClasspath From 55cbd30a20a75706e190b0cc07674470f48b78bc Mon Sep 17 00:00:00 2001 From: Giuseppe-La-Manna Date: Thu, 25 Jul 2024 17:55:16 +0200 Subject: [PATCH 2/5] P4PU-294 added mapper --- .../PaymentNoticesListDTOMapper.java | 17 +++++++++++++++++ ...ullPaymentInstallmentDTO2InstallmentDTO.java | 10 ++++++++++ .../PullPaymentNoticeDTO2PaymentNoticeDTO.java | 14 ++++++++++++++ ...PaymentNoticeStatus2PaymentNoticeStatus.java | 11 +++++++++++ .../PullPaymentOptionDTO2PaymentOptionDTO.java | 10 ++++++++++ ...PaymentOptionStatus2PaymentOptionStatus.java | 15 +++++++++++++++ 6 files changed, 77 insertions(+) create mode 100644 src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PaymentNoticesListDTOMapper.java create mode 100644 src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentInstallmentDTO2InstallmentDTO.java create mode 100644 src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentNoticeDTO2PaymentNoticeDTO.java create mode 100644 src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentNoticeStatus2PaymentNoticeStatus.java create mode 100644 src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentOptionDTO2PaymentOptionDTO.java create mode 100644 src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentOptionStatus2PaymentOptionStatus.java diff --git a/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PaymentNoticesListDTOMapper.java b/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PaymentNoticesListDTOMapper.java new file mode 100644 index 00000000..3fb346a5 --- /dev/null +++ b/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PaymentNoticesListDTOMapper.java @@ -0,0 +1,17 @@ +package it.gov.pagopa.arc.dto.mapper.pullpayment; + +import it.gov.pagopa.arc.model.generated.PaymentNoticeDTO; +import it.gov.pagopa.arc.model.generated.PaymentNoticesListDTO; +import org.mapstruct.Mapper; + +import java.util.List; + +@Mapper(componentModel = "spring", uses= PullPaymentNoticeDTO2PaymentNoticeDTO.class) +public interface PaymentNoticesListDTOMapper { + + default PaymentNoticesListDTO toPaymentNoticesListDTO(List paymentNotices) { + PaymentNoticesListDTO dto = new PaymentNoticesListDTO(); + dto.setPaymentNotices(paymentNotices); + return dto; + } +} diff --git a/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentInstallmentDTO2InstallmentDTO.java b/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentInstallmentDTO2InstallmentDTO.java new file mode 100644 index 00000000..97175bfb --- /dev/null +++ b/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentInstallmentDTO2InstallmentDTO.java @@ -0,0 +1,10 @@ +package it.gov.pagopa.arc.dto.mapper.pullpayment; + +import it.gov.pagopa.arc.connector.pullpayment.dto.PullPaymentInstallmentDTO; +import it.gov.pagopa.arc.model.generated.InstallmentDTO; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring", uses = PullPaymentOptionStatus2PaymentOptionStatus.class) +public interface PullPaymentInstallmentDTO2InstallmentDTO { + InstallmentDTO toInstallmentDTO(PullPaymentInstallmentDTO pullPaymentInstallmentDTOSource); +} diff --git a/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentNoticeDTO2PaymentNoticeDTO.java b/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentNoticeDTO2PaymentNoticeDTO.java new file mode 100644 index 00000000..07f98950 --- /dev/null +++ b/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentNoticeDTO2PaymentNoticeDTO.java @@ -0,0 +1,14 @@ +package it.gov.pagopa.arc.dto.mapper.pullpayment; + +import it.gov.pagopa.arc.connector.pullpayment.dto.PullPaymentNoticeDTO; +import it.gov.pagopa.arc.model.generated.PaymentNoticeDTO; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring", uses = {PullPaymentNoticeStatus2PaymentNoticeStatus.class, PullPaymentOptionDTO2PaymentOptionDTO.class}) +public interface PullPaymentNoticeDTO2PaymentNoticeDTO { + + PaymentNoticeDTO toPaymentNoticeDTO(PullPaymentNoticeDTO source); + +} + + diff --git a/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentNoticeStatus2PaymentNoticeStatus.java b/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentNoticeStatus2PaymentNoticeStatus.java new file mode 100644 index 00000000..4ab5c9fe --- /dev/null +++ b/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentNoticeStatus2PaymentNoticeStatus.java @@ -0,0 +1,11 @@ +package it.gov.pagopa.arc.dto.mapper.pullpayment; + +import it.gov.pagopa.arc.connector.pullpayment.enums.PullPaymentNoticeStatus; +import it.gov.pagopa.arc.model.generated.PaymentNoticeStatus; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring") +public interface PullPaymentNoticeStatus2PaymentNoticeStatus { + + PaymentNoticeStatus toPaymentNoticeStatus(PullPaymentNoticeStatus paymentNoticeStatusSource); +} \ No newline at end of file diff --git a/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentOptionDTO2PaymentOptionDTO.java b/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentOptionDTO2PaymentOptionDTO.java new file mode 100644 index 00000000..ecec7fd9 --- /dev/null +++ b/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentOptionDTO2PaymentOptionDTO.java @@ -0,0 +1,10 @@ +package it.gov.pagopa.arc.dto.mapper.pullpayment; + +import it.gov.pagopa.arc.connector.pullpayment.dto.PullPaymentOptionDTO; +import it.gov.pagopa.arc.model.generated.PaymentOptionDTO; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring", uses = PullPaymentInstallmentDTO2InstallmentDTO.class) +public interface PullPaymentOptionDTO2PaymentOptionDTO { + PaymentOptionDTO toPaymentOptionDTO(PullPaymentOptionDTO pullPaymentOptionDTOSource); +} diff --git a/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentOptionStatus2PaymentOptionStatus.java b/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentOptionStatus2PaymentOptionStatus.java new file mode 100644 index 00000000..eada3a43 --- /dev/null +++ b/src/main/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentOptionStatus2PaymentOptionStatus.java @@ -0,0 +1,15 @@ +package it.gov.pagopa.arc.dto.mapper.pullpayment; + +import it.gov.pagopa.arc.connector.pullpayment.enums.PullPaymentOptionStatus; +import it.gov.pagopa.arc.model.generated.PaymentOptionStatus; +import org.mapstruct.Mapper; +import org.mapstruct.ValueMapping; + +@Mapper(componentModel = "spring") +public interface PullPaymentOptionStatus2PaymentOptionStatus { + @ValueMapping(target = "UNPAID", source = "PO_UNPAID") + @ValueMapping(target = "PAID", source = "PO_PAID") + @ValueMapping(target = "PARTIALLY_REPORTED", source = "PO_PARTIALLY_REPORTED") + @ValueMapping(target = "REPORTED", source = "PO_REPORTED") + PaymentOptionStatus toPaymentOptionStatus(PullPaymentOptionStatus paymentOptionStatusSource); +} From 602a94f95b911068c41f31b4c8992d2ef115c915 Mon Sep 17 00:00:00 2001 From: Giuseppe-La-Manna Date: Fri, 26 Jul 2024 12:24:16 +0200 Subject: [PATCH 3/5] P4PU-294 added fakers --- .../PullPaymentInstallmentDTOFaker.java | 29 +++++++++ .../PullPaymentNoticeDTOFaker.java | 45 +++++++++++++ .../PullPaymentOptionDTOFaker.java | 31 +++++++++ .../paymentNotices/InstallmentDTOFaker.java | 28 ++++++++ .../paymentNotices/PaymentNoticeDTOFaker.java | 44 +++++++++++++ .../paymentNotices/PaymentOptionDTOFaker.java | 31 +++++++++ .../PullPaymentNoticeDTOFaker.java | 65 ------------------- 7 files changed, 208 insertions(+), 65 deletions(-) create mode 100644 src/test/java/it/gov/pagopa/arc/fakers/connector/pullPayment/PullPaymentInstallmentDTOFaker.java create mode 100644 src/test/java/it/gov/pagopa/arc/fakers/connector/pullPayment/PullPaymentNoticeDTOFaker.java create mode 100644 src/test/java/it/gov/pagopa/arc/fakers/connector/pullPayment/PullPaymentOptionDTOFaker.java create mode 100644 src/test/java/it/gov/pagopa/arc/fakers/paymentNotices/InstallmentDTOFaker.java create mode 100644 src/test/java/it/gov/pagopa/arc/fakers/paymentNotices/PaymentNoticeDTOFaker.java create mode 100644 src/test/java/it/gov/pagopa/arc/fakers/paymentNotices/PaymentOptionDTOFaker.java delete mode 100644 src/test/java/it/gov/pagopa/arc/fakers/pullPayment/PullPaymentNoticeDTOFaker.java diff --git a/src/test/java/it/gov/pagopa/arc/fakers/connector/pullPayment/PullPaymentInstallmentDTOFaker.java b/src/test/java/it/gov/pagopa/arc/fakers/connector/pullPayment/PullPaymentInstallmentDTOFaker.java new file mode 100644 index 00000000..139f6c54 --- /dev/null +++ b/src/test/java/it/gov/pagopa/arc/fakers/connector/pullPayment/PullPaymentInstallmentDTOFaker.java @@ -0,0 +1,29 @@ +package it.gov.pagopa.arc.fakers.connector.pullPayment; + +import it.gov.pagopa.arc.connector.pullpayment.dto.PullPaymentInstallmentDTO; +import it.gov.pagopa.arc.connector.pullpayment.enums.PullPaymentOptionStatus; + +import java.time.LocalDateTime; + +public class PullPaymentInstallmentDTOFaker { + + public static PullPaymentInstallmentDTO mockInstance(){ + return mockInstanceBuilder().build(); + } + + public static PullPaymentInstallmentDTO.PullPaymentInstallmentDTOBuilder mockInstanceBuilder(){ + return PullPaymentInstallmentDTO.builder() + .nav("347000000880099993") + .iuv("47000000880099993") + .paTaxCode("99999000013") + .paFullName("EC Demo Pagamenti Pull Test") + .amount(120L) + .description("Test Pull - unica opzione") + .dueDate(LocalDateTime.parse("2024-10-30T23:59:59")) + .retentionDate(LocalDateTime.parse("2024-11-30T23:59:59")) + .insertedDate(LocalDateTime.parse("2024-04-11T06:56:14.845126")) + .notificationFee(0L) + .status(PullPaymentOptionStatus.PO_UNPAID) + .lastUpdatedDate(LocalDateTime.parse("2024-04-11T06:56:14.845126")); + } +} diff --git a/src/test/java/it/gov/pagopa/arc/fakers/connector/pullPayment/PullPaymentNoticeDTOFaker.java b/src/test/java/it/gov/pagopa/arc/fakers/connector/pullPayment/PullPaymentNoticeDTOFaker.java new file mode 100644 index 00000000..86d20f27 --- /dev/null +++ b/src/test/java/it/gov/pagopa/arc/fakers/connector/pullPayment/PullPaymentNoticeDTOFaker.java @@ -0,0 +1,45 @@ +package it.gov.pagopa.arc.fakers.connector.pullPayment; + +import it.gov.pagopa.arc.connector.pullpayment.dto.PullPaymentInstallmentDTO; +import it.gov.pagopa.arc.connector.pullpayment.dto.PullPaymentNoticeDTO; +import it.gov.pagopa.arc.connector.pullpayment.dto.PullPaymentOptionDTO; +import it.gov.pagopa.arc.connector.pullpayment.enums.PullPaymentNoticeStatus; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +public class PullPaymentNoticeDTOFaker { + public static PullPaymentNoticeDTO mockInstance(Boolean singlePaymentOption){ + return mockInstanceBuilder(singlePaymentOption).build(); + } + + public static PullPaymentNoticeDTO.PullPaymentNoticeDTOBuilder mockInstanceBuilder(Boolean singlePaymentOption){ + PullPaymentInstallmentDTO installment = PullPaymentInstallmentDTOFaker.mockInstance(); + + PullPaymentNoticeDTO.PullPaymentNoticeDTOBuilder pullPaymentNoticeDTO = PullPaymentNoticeDTO.builder() + .iupd("99999000013-64c8e41bfec846e99c92fc0fe5899993") + .debtorTaxCode("STCCST83A15L1131") + .debtorFullName("EC Demo Pagamenti Pull Test") + .debtorType("F") + .paTaxCode("99999000013") + .paFullName("EC Demo Pagamenti Pull Test") + .insertedDate(LocalDateTime.parse("2024-04-11T06:56:14.845126")) + .publishDate(LocalDateTime.parse("2024-04-11T06:56:14.845142")) + .validityDate(LocalDateTime.parse("2024-04-11T06:56:14.845142")) + .status(PullPaymentNoticeStatus.VALID) + .lastUpdateDate(LocalDate.parse("2024-04-11")); + + if(!singlePaymentOption){ + PullPaymentOptionDTO option = PullPaymentOptionDTOFaker.mockInstance(installment, false); + PullPaymentOptionDTO optionInstallments = PullPaymentOptionDTOFaker.mockInstance(installment, true); + pullPaymentNoticeDTO.paymentOptions(List.of(option,optionInstallments)); + }else { + PullPaymentOptionDTO option = PullPaymentOptionDTOFaker.mockInstance(installment, false); + pullPaymentNoticeDTO.paymentOptions(List.of(option)); + } + + return pullPaymentNoticeDTO; + } + +} diff --git a/src/test/java/it/gov/pagopa/arc/fakers/connector/pullPayment/PullPaymentOptionDTOFaker.java b/src/test/java/it/gov/pagopa/arc/fakers/connector/pullPayment/PullPaymentOptionDTOFaker.java new file mode 100644 index 00000000..a1ee2705 --- /dev/null +++ b/src/test/java/it/gov/pagopa/arc/fakers/connector/pullPayment/PullPaymentOptionDTOFaker.java @@ -0,0 +1,31 @@ +package it.gov.pagopa.arc.fakers.connector.pullPayment; + +import it.gov.pagopa.arc.connector.pullpayment.dto.PullPaymentInstallmentDTO; +import it.gov.pagopa.arc.connector.pullpayment.dto.PullPaymentOptionDTO; + +import java.time.LocalDateTime; +import java.util.List; + +public class PullPaymentOptionDTOFaker { + public static PullPaymentOptionDTO mockInstance(PullPaymentInstallmentDTO installmentDTO, Boolean paymentInstallments){ + return mockInstanceBuilder(installmentDTO, paymentInstallments).build(); + } + public static PullPaymentOptionDTO.PullPaymentOptionDTOBuilder mockInstanceBuilder(PullPaymentInstallmentDTO installment, Boolean paymentInstallments){ + PullPaymentOptionDTO.PullPaymentOptionDTOBuilder pullPaymentOptionDTO = PullPaymentOptionDTO.builder() + .description("Test Pull - unica opzione") + .numberOfInstallments(1) + .amount(120L) + .dueDate(LocalDateTime.parse("2024-10-30T23:59:59")) + .isPartialPayment(false) + .switchToExpired(false) + .installments(List.of(installment)); + + if(paymentInstallments){ + pullPaymentOptionDTO.description("Test Pull - piano rateale"); + installment.setDescription("Test Pull - piano rateale"); + pullPaymentOptionDTO.numberOfInstallments(2).installments(List.of(installment,installment)); + } + + return pullPaymentOptionDTO; + } +} diff --git a/src/test/java/it/gov/pagopa/arc/fakers/paymentNotices/InstallmentDTOFaker.java b/src/test/java/it/gov/pagopa/arc/fakers/paymentNotices/InstallmentDTOFaker.java new file mode 100644 index 00000000..bd499ede --- /dev/null +++ b/src/test/java/it/gov/pagopa/arc/fakers/paymentNotices/InstallmentDTOFaker.java @@ -0,0 +1,28 @@ +package it.gov.pagopa.arc.fakers.paymentNotices; + +import it.gov.pagopa.arc.model.generated.InstallmentDTO; +import it.gov.pagopa.arc.model.generated.PaymentOptionStatus; + +import java.time.LocalDateTime; + +public class InstallmentDTOFaker { + public static InstallmentDTO mockInstance(){ + return mockInstanceBuilder().build(); + } + + public static InstallmentDTO.InstallmentDTOBuilder mockInstanceBuilder(){ + return InstallmentDTO.builder() + .nav("347000000880099993") + .iuv("47000000880099993") + .paTaxCode("99999000013") + .paFullName("EC Demo Pagamenti Pull Test") + .amount(120L) + .description("Test Pull - unica opzione") + .dueDate(LocalDateTime.parse("2024-10-30T23:59:59")) + .retentionDate(LocalDateTime.parse("2024-11-30T23:59:59")) + .insertedDate(LocalDateTime.parse("2024-04-11T06:56:14.845126")) + .notificationFee(0L) + .status(PaymentOptionStatus.UNPAID) + .lastUpdatedDate(LocalDateTime.parse("2024-04-11T06:56:14.845126")); + } +} diff --git a/src/test/java/it/gov/pagopa/arc/fakers/paymentNotices/PaymentNoticeDTOFaker.java b/src/test/java/it/gov/pagopa/arc/fakers/paymentNotices/PaymentNoticeDTOFaker.java new file mode 100644 index 00000000..e857a629 --- /dev/null +++ b/src/test/java/it/gov/pagopa/arc/fakers/paymentNotices/PaymentNoticeDTOFaker.java @@ -0,0 +1,44 @@ +package it.gov.pagopa.arc.fakers.paymentNotices; + +import it.gov.pagopa.arc.model.generated.InstallmentDTO; +import it.gov.pagopa.arc.model.generated.PaymentNoticeDTO; +import it.gov.pagopa.arc.model.generated.PaymentNoticeStatus; +import it.gov.pagopa.arc.model.generated.PaymentOptionDTO; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +public class PaymentNoticeDTOFaker { + public static PaymentNoticeDTO mockInstance(Boolean singlePaymentOption){ + return mockInstanceBuilder(singlePaymentOption).build(); + } + + public static PaymentNoticeDTO.PaymentNoticeDTOBuilder mockInstanceBuilder(Boolean singlePaymentOption){ + InstallmentDTO installment = InstallmentDTOFaker.mockInstance(); + + PaymentNoticeDTO.PaymentNoticeDTOBuilder paymentNoticeDTO = PaymentNoticeDTO.builder() + .iupd("99999000013-64c8e41bfec846e99c92fc0fe5899993") + .debtorTaxCode("STCCST83A15L1131") + .debtorFullName("EC Demo Pagamenti Pull Test") + .debtorType("F") + .paTaxCode("99999000013") + .paFullName("EC Demo Pagamenti Pull Test") + .insertedDate(LocalDateTime.parse("2024-04-11T06:56:14.845126")) + .publishDate(LocalDateTime.parse("2024-04-11T06:56:14.845142")) + .validityDate(LocalDateTime.parse("2024-04-11T06:56:14.845142")) + .status(PaymentNoticeStatus.VALID) + .lastUpdateDate(LocalDate.parse("2024-04-11")); + + if(!singlePaymentOption){ + PaymentOptionDTO option = PaymentOptionDTOFaker.mockInstance(installment, false); + PaymentOptionDTO optionInstallments = PaymentOptionDTOFaker.mockInstance(installment, true); + paymentNoticeDTO.paymentOptions(List.of(option,optionInstallments)); + }else { + PaymentOptionDTO option = PaymentOptionDTOFaker.mockInstance(installment, false); + paymentNoticeDTO.paymentOptions(List.of(option)); + } + + return paymentNoticeDTO; + } +} diff --git a/src/test/java/it/gov/pagopa/arc/fakers/paymentNotices/PaymentOptionDTOFaker.java b/src/test/java/it/gov/pagopa/arc/fakers/paymentNotices/PaymentOptionDTOFaker.java new file mode 100644 index 00000000..7c1de686 --- /dev/null +++ b/src/test/java/it/gov/pagopa/arc/fakers/paymentNotices/PaymentOptionDTOFaker.java @@ -0,0 +1,31 @@ +package it.gov.pagopa.arc.fakers.paymentNotices; + +import it.gov.pagopa.arc.model.generated.InstallmentDTO; +import it.gov.pagopa.arc.model.generated.PaymentOptionDTO; + +import java.time.LocalDateTime; +import java.util.List; + +public class PaymentOptionDTOFaker { + public static PaymentOptionDTO mockInstance(InstallmentDTO installmentDTO, Boolean paymentInstallments){ + return mockInstanceBuilder(installmentDTO, paymentInstallments).build(); + } + public static PaymentOptionDTO.PaymentOptionDTOBuilder mockInstanceBuilder(InstallmentDTO installment, Boolean paymentInstallments){ + PaymentOptionDTO.PaymentOptionDTOBuilder paymentOptionDTO = PaymentOptionDTO.builder() + .description("Test Pull - unica opzione") + .numberOfInstallments(1) + .amount(120L) + .dueDate(LocalDateTime.parse("2024-10-30T23:59:59")) + .isPartialPayment(false) + .switchToExpired(false) + .installments(List.of(installment)); + + if(paymentInstallments){ + paymentOptionDTO.description("Test Pull - piano rateale"); + installment.setDescription("Test Pull - piano rateale"); + paymentOptionDTO.numberOfInstallments(2).installments(List.of(installment,installment)); + } + + return paymentOptionDTO; + } +} diff --git a/src/test/java/it/gov/pagopa/arc/fakers/pullPayment/PullPaymentNoticeDTOFaker.java b/src/test/java/it/gov/pagopa/arc/fakers/pullPayment/PullPaymentNoticeDTOFaker.java deleted file mode 100644 index 5390d8c1..00000000 --- a/src/test/java/it/gov/pagopa/arc/fakers/pullPayment/PullPaymentNoticeDTOFaker.java +++ /dev/null @@ -1,65 +0,0 @@ -package it.gov.pagopa.arc.fakers.pullPayment; - -import it.gov.pagopa.arc.connector.pullpayment.dto.PullPaymentInstallmentDTO; -import it.gov.pagopa.arc.connector.pullpayment.dto.PullPaymentNoticeDTO; -import it.gov.pagopa.arc.connector.pullpayment.dto.PullPaymentOptionDTO; -import it.gov.pagopa.arc.connector.pullpayment.enums.PullPaymentNoticeStatus; -import it.gov.pagopa.arc.connector.pullpayment.enums.PullPaymentOptionStatus; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; - -public class PullPaymentNoticeDTOFaker { - public static PullPaymentNoticeDTO mockInstance(){ - return mockInstanceBuilder().build(); - } - - public static PullPaymentInstallmentDTO mockInstanceBuilderInstllmentDTO(){ - return PullPaymentInstallmentDTO.builder() - .nav("347000000880099993") - .iuv("47000000880099993") - .paTaxCode("99999000013") - .paFullName("EC Demo Pagamenti Pull Test") - .amount(120L) - .description("Test Pull - unica opzione") - .dueDate(LocalDateTime.parse("2024-10-30T23:59:59")) - .retentionDate(LocalDateTime.parse("2024-11-30T23:59:59")) - .insertedDate(LocalDateTime.parse("2024-04-11T06:56:14.845126")) - .notificationFee(0L) - .status(PullPaymentOptionStatus.PO_UNPAID) - .lastUpdatedDate(LocalDateTime.parse("2024-04-11T06:56:14.845126")) - .build(); - } - - public static PullPaymentOptionDTO mockInstanceBuilderOptionDTO(PullPaymentInstallmentDTO installment){ - return PullPaymentOptionDTO.builder() - .description("Test Pull - unica opzione") - .numberOfInstallments(1) - .amount(120L) - .dueDate(LocalDateTime.parse("2024-10-30T23:59:59")) - .isPartialPayment(false) - .switchToExpired(false) - .installments(List.of(installment)) - .build(); - } - public static PullPaymentNoticeDTO.PullPaymentNoticeDTOBuilder mockInstanceBuilder(){ - PullPaymentInstallmentDTO installment = mockInstanceBuilderInstllmentDTO(); - PullPaymentOptionDTO option = mockInstanceBuilderOptionDTO(installment); - - return PullPaymentNoticeDTO.builder() - .iupd("99999000013-64c8e41bfec846e99c92fc0fe5899993") - .debtorTaxCode("STCCST83A15L1131") - .debtorFullName("EC Demo Pagamenti Pull Test") - .debtorType("F") - .paTaxCode("99999000013") - .paFullName("EC Demo Pagamenti Pull Test") - .insertedDate(LocalDateTime.parse("2024-04-11T06:56:14.845126")) - .publishDate(LocalDateTime.parse("2024-04-11T06:56:14.845142")) - .validityDate(LocalDateTime.parse("2024-04-11T06:56:14.845142")) - .status(PullPaymentNoticeStatus.VALID) - .lastUpdateDate(LocalDate.parse("2024-04-11")) - .paymentOptions(List.of(option)); - } - -} From 5ca301a28ef93f7a544c1027c9d66b67720db895 Mon Sep 17 00:00:00 2001 From: Giuseppe-La-Manna Date: Fri, 26 Jul 2024 12:51:35 +0200 Subject: [PATCH 4/5] P4PU-294 added mapper tests --- .../PaymentNoticesListDTOMapperTest.java | 45 ++++++++++++++ ...mentInstallmentDTO2InstallmentDTOTest.java | 62 +++++++++++++++++++ ...PaymentNoticeDTO2PaymentNoticeDTOTest.java | 46 ++++++++++++++ ...tNoticeStatus2PaymentNoticeStatusTest.java | 22 +++++++ ...PaymentOptionDTO2PaymentOptionDTOTest.java | 55 ++++++++++++++++ ...tOptionStatus2PaymentOptionStatusTest.java | 21 +++++++ 6 files changed, 251 insertions(+) create mode 100644 src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PaymentNoticesListDTOMapperTest.java create mode 100644 src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentInstallmentDTO2InstallmentDTOTest.java create mode 100644 src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentNoticeDTO2PaymentNoticeDTOTest.java create mode 100644 src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentNoticeStatus2PaymentNoticeStatusTest.java create mode 100644 src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentOptionDTO2PaymentOptionDTOTest.java create mode 100644 src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentOptionStatus2PaymentOptionStatusTest.java diff --git a/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PaymentNoticesListDTOMapperTest.java b/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PaymentNoticesListDTOMapperTest.java new file mode 100644 index 00000000..01af04f3 --- /dev/null +++ b/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PaymentNoticesListDTOMapperTest.java @@ -0,0 +1,45 @@ +package it.gov.pagopa.arc.dto.mapper.pullpayment; + +import it.gov.pagopa.arc.fakers.paymentNotices.PaymentNoticeDTOFaker; +import it.gov.pagopa.arc.model.generated.PaymentNoticeDTO; +import it.gov.pagopa.arc.model.generated.PaymentNoticesListDTO; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mapstruct.factory.Mappers; + +import java.util.ArrayList; +import java.util.List; + +class PaymentNoticesListDTOMapperTest { + private final PaymentNoticesListDTOMapper mapper = Mappers.getMapper(PaymentNoticesListDTOMapper.class); + + @Test + void givenListOfPullPaymentNoticesListDTOWhenCallMapperThenReturnPaymentNoticesListDTO() { + //given + PaymentNoticeDTO paymentNoticeDTO1 = PaymentNoticeDTOFaker.mockInstance(true); + PaymentNoticeDTO paymentNoticeDTO2 = PaymentNoticeDTOFaker.mockInstance(true); + + List listOfPaymentNoticeDto = List.of(paymentNoticeDTO1, paymentNoticeDTO2); + //when + + PaymentNoticesListDTO result = mapper.toPaymentNoticesListDTO(listOfPaymentNoticeDto); + //then + Assertions.assertNotNull(result); + Assertions.assertEquals(2, result.getPaymentNotices().size()); + Assertions.assertEquals(paymentNoticeDTO1, result.getPaymentNotices().get(0)); + Assertions.assertEquals(paymentNoticeDTO2, result.getPaymentNotices().get(1)); + } + + @Test + void givenEmptyListWhenCallMapperThenReturnPaymentNoticesListDTOWithEmptyList() { + //given + List listOfPaymentNoticeDto = new ArrayList<>(); + + //when + PaymentNoticesListDTO result = mapper.toPaymentNoticesListDTO(listOfPaymentNoticeDto); + //then + Assertions.assertNotNull(result); + Assertions.assertTrue(result.getPaymentNotices().isEmpty()); + + } +} \ No newline at end of file diff --git a/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentInstallmentDTO2InstallmentDTOTest.java b/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentInstallmentDTO2InstallmentDTOTest.java new file mode 100644 index 00000000..08416070 --- /dev/null +++ b/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentInstallmentDTO2InstallmentDTOTest.java @@ -0,0 +1,62 @@ +package it.gov.pagopa.arc.dto.mapper.pullpayment; + +import it.gov.pagopa.arc.connector.pullpayment.dto.PullPaymentInstallmentDTO; +import it.gov.pagopa.arc.connector.pullpayment.enums.PullPaymentOptionStatus; +import it.gov.pagopa.arc.fakers.connector.pullPayment.PullPaymentInstallmentDTOFaker; +import it.gov.pagopa.arc.model.generated.InstallmentDTO; +import it.gov.pagopa.arc.model.generated.PaymentOptionStatus; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mapstruct.factory.Mappers; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.time.LocalDateTime; + +import static org.mockito.ArgumentMatchers.any; + +@ExtendWith(MockitoExtension.class) +class PullPaymentInstallmentDTO2InstallmentDTOTest { + + @Mock + private PullPaymentOptionStatus2PaymentOptionStatus pullPaymentOptionStatus2PaymentOptionStatusMock; + + @InjectMocks + private final PullPaymentInstallmentDTO2InstallmentDTO mapper = Mappers.getMapper(PullPaymentInstallmentDTO2InstallmentDTO.class); + + @Test + void givenPullPaymentInstallmentDTOWhenCallMapperThenReturnInstallmentDTO() { + //given + PullPaymentOptionStatus poUnpaid = PullPaymentOptionStatus.PO_UNPAID; + PaymentOptionStatus unpaid = PaymentOptionStatus.UNPAID; + + Mockito.when(pullPaymentOptionStatus2PaymentOptionStatusMock.toPaymentOptionStatus(poUnpaid)).thenReturn(unpaid); + + PullPaymentInstallmentDTO pullPaymentInstallmentDTO = PullPaymentInstallmentDTOFaker.mockInstance(); + + //when + InstallmentDTO result = mapper.toInstallmentDTO(pullPaymentInstallmentDTO); + + //then + Assertions.assertAll(() -> { + Assertions.assertNotNull(result); + Assertions.assertEquals("347000000880099993", result.getNav()); + Assertions.assertEquals("47000000880099993", result.getIuv()); + Assertions.assertEquals("99999000013", result.getPaTaxCode()); + Assertions.assertEquals("EC Demo Pagamenti Pull Test", result.getPaFullName()); + Assertions.assertEquals(120L, result.getAmount()); + Assertions.assertEquals("Test Pull - unica opzione", result.getDescription()); + Assertions.assertEquals(LocalDateTime.parse("2024-10-30T23:59:59"), result.getDueDate()); + Assertions.assertEquals(LocalDateTime.parse("2024-11-30T23:59:59"), result.getRetentionDate()); + Assertions.assertEquals(LocalDateTime.parse("2024-04-11T06:56:14.845126"), result.getInsertedDate()); + Assertions.assertEquals(0L, result.getNotificationFee()); + Assertions.assertEquals(unpaid, result.getStatus()); + Assertions.assertEquals(LocalDateTime.parse("2024-04-11T06:56:14.845126"), result.getLastUpdatedDate()); + + Mockito.verify(pullPaymentOptionStatus2PaymentOptionStatusMock).toPaymentOptionStatus(any()); + }); + } +} \ No newline at end of file diff --git a/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentNoticeDTO2PaymentNoticeDTOTest.java b/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentNoticeDTO2PaymentNoticeDTOTest.java new file mode 100644 index 00000000..3489a3f2 --- /dev/null +++ b/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentNoticeDTO2PaymentNoticeDTOTest.java @@ -0,0 +1,46 @@ +package it.gov.pagopa.arc.dto.mapper.pullpayment; + +import it.gov.pagopa.arc.connector.pullpayment.dto.PullPaymentNoticeDTO; +import it.gov.pagopa.arc.fakers.paymentNotices.PaymentNoticeDTOFaker; +import it.gov.pagopa.arc.fakers.connector.pullPayment.PullPaymentNoticeDTOFaker; +import it.gov.pagopa.arc.model.generated.PaymentNoticeDTO; +import it.gov.pagopa.arc.model.generated.PaymentNoticeStatus; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mapstruct.factory.Mappers; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; + +import static org.mockito.ArgumentMatchers.any; + +@ExtendWith(MockitoExtension.class) +class PullPaymentNoticeDTO2PaymentNoticeDTOTest { + + @Mock + PullPaymentNoticeStatus2PaymentNoticeStatus pullPaymentNoticeStatus2PaymentNoticeStatusMock; + @Mock + PullPaymentOptionDTO2PaymentOptionDTO pullPaymentOptionDTO2PaymentOptionDTOMock; + + @InjectMocks + PullPaymentNoticeDTO2PaymentNoticeDTO mapper = Mappers.getMapper(PullPaymentNoticeDTO2PaymentNoticeDTO.class); + + @Test + void givenPullPaymentNoticeDTOWhenCallMapperThenReturnPaymentNoticeDTO() { + //given + PullPaymentNoticeDTO pullPaymentNoticeDTO = PullPaymentNoticeDTOFaker.mockInstance(true); + PaymentNoticeDTO paymentNoticeDTO = PaymentNoticeDTOFaker.mockInstance(true); + + Mockito.when(pullPaymentNoticeStatus2PaymentNoticeStatusMock.toPaymentNoticeStatus(pullPaymentNoticeDTO.getStatus())).thenReturn(PaymentNoticeStatus.VALID); + Mockito.when(pullPaymentOptionDTO2PaymentOptionDTOMock.toPaymentOptionDTO(pullPaymentNoticeDTO.getPaymentOptions().get(0))).thenReturn(paymentNoticeDTO.getPaymentOptions().get(0)); + //when + PaymentNoticeDTO result = mapper.toPaymentNoticeDTO(pullPaymentNoticeDTO); + //then + Assertions.assertNotNull(result); + Assertions.assertEquals(paymentNoticeDTO, result); + Mockito.verify(pullPaymentNoticeStatus2PaymentNoticeStatusMock).toPaymentNoticeStatus(any()); + Mockito.verify(pullPaymentOptionDTO2PaymentOptionDTOMock).toPaymentOptionDTO(any()); + } +} \ No newline at end of file diff --git a/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentNoticeStatus2PaymentNoticeStatusTest.java b/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentNoticeStatus2PaymentNoticeStatusTest.java new file mode 100644 index 00000000..8bc7b05c --- /dev/null +++ b/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentNoticeStatus2PaymentNoticeStatusTest.java @@ -0,0 +1,22 @@ +package it.gov.pagopa.arc.dto.mapper.pullpayment; + +import it.gov.pagopa.arc.connector.pullpayment.enums.PullPaymentNoticeStatus; +import it.gov.pagopa.arc.model.generated.PaymentNoticeStatus; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mapstruct.factory.Mappers; + +class PullPaymentNoticeStatus2PaymentNoticeStatusTest { + private final PullPaymentNoticeStatus2PaymentNoticeStatus mapper = Mappers.getMapper(PullPaymentNoticeStatus2PaymentNoticeStatus.class); + + @Test + void givenPullPaymentNoticeStatusWhenCallMapperThenReturnPaymentNoticeStatus() { + //given + PullPaymentNoticeStatus valid = PullPaymentNoticeStatus.VALID; + //when + PaymentNoticeStatus result = mapper.toPaymentNoticeStatus(valid); + //then + Assertions.assertNotNull(result); + Assertions.assertEquals(PaymentNoticeStatus.VALID, result); + } +} \ No newline at end of file diff --git a/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentOptionDTO2PaymentOptionDTOTest.java b/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentOptionDTO2PaymentOptionDTOTest.java new file mode 100644 index 00000000..b32f56e0 --- /dev/null +++ b/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentOptionDTO2PaymentOptionDTOTest.java @@ -0,0 +1,55 @@ +package it.gov.pagopa.arc.dto.mapper.pullpayment; + +import it.gov.pagopa.arc.connector.pullpayment.dto.PullPaymentInstallmentDTO; +import it.gov.pagopa.arc.connector.pullpayment.dto.PullPaymentOptionDTO; +import it.gov.pagopa.arc.fakers.connector.pullPayment.PullPaymentInstallmentDTOFaker; +import it.gov.pagopa.arc.fakers.connector.pullPayment.PullPaymentOptionDTOFaker; +import it.gov.pagopa.arc.fakers.paymentNotices.InstallmentDTOFaker; +import it.gov.pagopa.arc.model.generated.InstallmentDTO; +import it.gov.pagopa.arc.model.generated.PaymentOptionDTO; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.time.LocalDateTime; +import java.util.List; + +import static org.mockito.ArgumentMatchers.any; + +@ExtendWith(MockitoExtension.class) +class PullPaymentOptionDTO2PaymentOptionDTOTest { + @Mock + private PullPaymentInstallmentDTO2InstallmentDTO pullPaymentInstallmentDTO2InstallmentDTOMock; + + @InjectMocks + private PullPaymentOptionDTO2PaymentOptionDTOImpl mapper; + @Test + void givenPullPaymentOptionDTOWhenCallMapperThenReturnPaymentOptionDTO() { + //given + PullPaymentInstallmentDTO pullPaymentInstallmentDTO = PullPaymentInstallmentDTOFaker.mockInstance(); + PullPaymentOptionDTO pullPaymentOptionDTO = PullPaymentOptionDTOFaker.mockInstance(pullPaymentInstallmentDTO, false); + InstallmentDTO installmentDTO = InstallmentDTOFaker.mockInstance(); + + Mockito.when(pullPaymentInstallmentDTO2InstallmentDTOMock.toInstallmentDTO(pullPaymentInstallmentDTO)).thenReturn(installmentDTO); + //when + PaymentOptionDTO result = mapper.toPaymentOptionDTO(pullPaymentOptionDTO); + //then + Assertions.assertAll(() -> { + Assertions.assertNotNull(result); + Assertions.assertEquals("Test Pull - unica opzione", result.getDescription()); + Assertions.assertEquals(1, result.getNumberOfInstallments()); + Assertions.assertEquals(120L, result.getAmount()); + Assertions.assertEquals(LocalDateTime.parse("2024-10-30T23:59:59"), result.getDueDate()); + Assertions.assertFalse(result.getIsPartialPayment()); + Assertions.assertFalse(result.getSwitchToExpired()); + Assertions.assertEquals(List.of(installmentDTO), result.getInstallments()); + + Mockito.verify(pullPaymentInstallmentDTO2InstallmentDTOMock).toInstallmentDTO(any()); + }); + + } +} \ No newline at end of file diff --git a/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentOptionStatus2PaymentOptionStatusTest.java b/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentOptionStatus2PaymentOptionStatusTest.java new file mode 100644 index 00000000..fe1f785a --- /dev/null +++ b/src/test/java/it/gov/pagopa/arc/dto/mapper/pullpayment/PullPaymentOptionStatus2PaymentOptionStatusTest.java @@ -0,0 +1,21 @@ +package it.gov.pagopa.arc.dto.mapper.pullpayment; + +import it.gov.pagopa.arc.connector.pullpayment.enums.PullPaymentOptionStatus; +import it.gov.pagopa.arc.model.generated.PaymentOptionStatus; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mapstruct.factory.Mappers; + +class PullPaymentOptionStatus2PaymentOptionStatusTest { + private final PullPaymentOptionStatus2PaymentOptionStatus paymentOptionStatusMapper = Mappers.getMapper(PullPaymentOptionStatus2PaymentOptionStatus.class); + @Test + void givenPullPaymentOptionStatusWhenCallMapperThenReturnPaymentOptionStatus() { + //given + PullPaymentOptionStatus pullPaymentOptionStatus = PullPaymentOptionStatus.PO_PAID; + //when + PaymentOptionStatus result = paymentOptionStatusMapper.toPaymentOptionStatus(pullPaymentOptionStatus); + //then + Assertions.assertNotNull(result); + Assertions.assertEquals(PaymentOptionStatus.PAID, result); + } +} \ No newline at end of file From a9911b842b070bdeb18bc9223bde1235fecf1576 Mon Sep 17 00:00:00 2001 From: Giuseppe-La-Manna Date: Fri, 26 Jul 2024 14:28:27 +0200 Subject: [PATCH 5/5] P4PU-294 updated import connector --- .../connector/pullpayment/PullPaymentConnectorImplTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/it/gov/pagopa/arc/connector/pullpayment/PullPaymentConnectorImplTest.java b/src/test/java/it/gov/pagopa/arc/connector/pullpayment/PullPaymentConnectorImplTest.java index 65864440..1eaabd70 100644 --- a/src/test/java/it/gov/pagopa/arc/connector/pullpayment/PullPaymentConnectorImplTest.java +++ b/src/test/java/it/gov/pagopa/arc/connector/pullpayment/PullPaymentConnectorImplTest.java @@ -5,7 +5,7 @@ import com.github.tomakehurst.wiremock.core.WireMockConfiguration; import it.gov.pagopa.arc.config.FeignConfig; import it.gov.pagopa.arc.connector.pullpayment.dto.PullPaymentNoticeDTO; -import it.gov.pagopa.arc.fakers.pullPayment.PullPaymentNoticeDTOFaker; +import it.gov.pagopa.arc.fakers.connector.pullPayment.PullPaymentNoticeDTOFaker; import it.gov.pagopa.arc.utils.MemoryAppender; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -59,7 +59,7 @@ void setUp() { @Test void givenHeaderAndParameterWhenCallPullPaymentConnectorThenReturnPaymentNoticesList() { //given - PullPaymentNoticeDTO pullPaymentNoticeDTO = PullPaymentNoticeDTOFaker.mockInstance(); + PullPaymentNoticeDTO pullPaymentNoticeDTO = PullPaymentNoticeDTOFaker.mockInstance(true); //when List result = pullPaymentConnector.getPaymentNotices("DUMMY_FISCAL_CODE", LocalDate.now(), 10, 0); //then