From 3c1a037538b75ccd251618174bdbe3b9eeaad954 Mon Sep 17 00:00:00 2001 From: BaldiVi-1 Date: Tue, 21 Jan 2025 15:06:27 +0100 Subject: [PATCH] fix: MMC-113 (#15) Co-authored-by: BaldiVi --- src/main/java/it/gov/pagopa/tpp/dto/TppDTO.java | 7 +++++++ .../it/gov/pagopa/tpp/dto/mapper/TppObjectToDTOMapper.java | 2 ++ src/main/java/it/gov/pagopa/tpp/model/Tpp.java | 3 +++ .../gov/pagopa/tpp/model/mapper/TppDTOToObjectMapper.java | 3 +++ .../java/it/gov/pagopa/tpp/utils/faker/TppDTOFaker.java | 6 ++++++ src/test/java/it/gov/pagopa/tpp/utils/faker/TppFaker.java | 6 ++++++ 6 files changed, 27 insertions(+) diff --git a/src/main/java/it/gov/pagopa/tpp/dto/TppDTO.java b/src/main/java/it/gov/pagopa/tpp/dto/TppDTO.java index cda4a84..18313de 100644 --- a/src/main/java/it/gov/pagopa/tpp/dto/TppDTO.java +++ b/src/main/java/it/gov/pagopa/tpp/dto/TppDTO.java @@ -11,6 +11,7 @@ import lombok.experimental.SuperBuilder; import java.time.LocalDateTime; +import java.util.HashMap; @Data @SuperBuilder @@ -48,4 +49,10 @@ public class TppDTO { private LocalDateTime lastUpdateDate; private TokenSection tokenSection; + @NotNull(message = "Payment Button must not be null") + private String paymentButton; + + @NotNull(message = "Agent Deep Link must not be null") + private HashMap agentDeepLinks; + } diff --git a/src/main/java/it/gov/pagopa/tpp/dto/mapper/TppObjectToDTOMapper.java b/src/main/java/it/gov/pagopa/tpp/dto/mapper/TppObjectToDTOMapper.java index bd29352..829a911 100644 --- a/src/main/java/it/gov/pagopa/tpp/dto/mapper/TppObjectToDTOMapper.java +++ b/src/main/java/it/gov/pagopa/tpp/dto/mapper/TppObjectToDTOMapper.java @@ -23,6 +23,8 @@ public TppDTO map(Tpp tpp){ .creationDate(tpp.getCreationDate()) .lastUpdateDate(tpp.getLastUpdateDate()) .tokenSection(tpp.getTokenSection()) + .paymentButton(tpp.getPaymentButton()) + .agentDeepLinks(tpp.getAgentDeepLinks()) .build(); } } diff --git a/src/main/java/it/gov/pagopa/tpp/model/Tpp.java b/src/main/java/it/gov/pagopa/tpp/model/Tpp.java index fac1936..49f5928 100644 --- a/src/main/java/it/gov/pagopa/tpp/model/Tpp.java +++ b/src/main/java/it/gov/pagopa/tpp/model/Tpp.java @@ -8,6 +8,7 @@ import org.springframework.data.mongodb.core.mapping.Document; import java.time.LocalDateTime; +import java.util.HashMap; @Document(collection = "tpp") @Data @@ -29,4 +30,6 @@ public class Tpp { private TokenSection tokenSection; private LocalDateTime creationDate; private LocalDateTime lastUpdateDate; + private String paymentButton; + private HashMap agentDeepLinks; } \ No newline at end of file diff --git a/src/main/java/it/gov/pagopa/tpp/model/mapper/TppDTOToObjectMapper.java b/src/main/java/it/gov/pagopa/tpp/model/mapper/TppDTOToObjectMapper.java index 7f45886..dab34ab 100644 --- a/src/main/java/it/gov/pagopa/tpp/model/mapper/TppDTOToObjectMapper.java +++ b/src/main/java/it/gov/pagopa/tpp/model/mapper/TppDTOToObjectMapper.java @@ -20,6 +20,9 @@ public Tpp map(TppDTO tppDTO){ .contact(tppDTO.getContact()) .entityId(tppDTO.getEntityId()) .tokenSection(tppDTO.getTokenSection()) + .paymentButton(tppDTO.getPaymentButton()) + .agentDeepLinks(tppDTO.getAgentDeepLinks()) .build(); } + } diff --git a/src/test/java/it/gov/pagopa/tpp/utils/faker/TppDTOFaker.java b/src/test/java/it/gov/pagopa/tpp/utils/faker/TppDTOFaker.java index a4b37f7..f3a9e84 100644 --- a/src/test/java/it/gov/pagopa/tpp/utils/faker/TppDTOFaker.java +++ b/src/test/java/it/gov/pagopa/tpp/utils/faker/TppDTOFaker.java @@ -4,6 +4,8 @@ import it.gov.pagopa.tpp.enums.AuthenticationType; import it.gov.pagopa.tpp.model.Contact; +import java.util.HashMap; + public class TppDTOFaker { private TppDTOFaker(){} @@ -26,6 +28,10 @@ public static TppDTO mockInstance(Boolean bias) { .lastUpdateDate(null) .creationDate(null) .tokenSection(TokenSectionFaker.mockInstance()) + .paymentButton("#button") + .agentDeepLinks(new HashMap<>() {{ + put("agent", "link"); + }}) .build(); } diff --git a/src/test/java/it/gov/pagopa/tpp/utils/faker/TppFaker.java b/src/test/java/it/gov/pagopa/tpp/utils/faker/TppFaker.java index 63eea6f..3410e09 100644 --- a/src/test/java/it/gov/pagopa/tpp/utils/faker/TppFaker.java +++ b/src/test/java/it/gov/pagopa/tpp/utils/faker/TppFaker.java @@ -4,6 +4,8 @@ import it.gov.pagopa.tpp.model.Contact; import it.gov.pagopa.tpp.model.Tpp; +import java.util.HashMap; + public class TppFaker { private TppFaker(){} @@ -26,6 +28,10 @@ public static Tpp mockInstance(Boolean bias){ .lastUpdateDate(null) .creationDate(null) .tokenSection(TokenSectionFaker.mockInstance()) + .paymentButton("#button") + .agentDeepLinks(new HashMap<>() {{ + put("agent", "link"); + }}) .build(); } }