Tpp Model Update

pagopa · Oct 29, 2024 · d80b832 · d80b832
1 parent a958fa7
commit d80b832
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/src/main/java/it/gov/pagopa/tpp/dto/TppDTO.java b/src/main/java/it/gov/pagopa/tpp/dto/TppDTO.java
@@ -6,6 +6,8 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import java.time.LocalDateTime;
+
 @Data
 @SuperBuilder
 @NoArgsConstructor
@@ -18,4 +20,6 @@ public class TppDTO {
     private AuthenticationType authenticationType;
     private Contact contact;
     private Boolean state;
+    private LocalDateTime creationDate;
+    private LocalDateTime lastUpdateDate;
 }
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
@@ -18,6 +18,8 @@ public TppDTO map(Tpp tpp){
                 .businessName(tpp.getBusinessName())
                 .contact(tpp.getContact())
                 .entityId(tpp.getEntityId())
+                .creationDate(tpp.getCreationDate())
+                .lastUpdateDate(tpp.getLastUpdateDate())
                 .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
@@ -7,6 +7,8 @@
 import lombok.experimental.SuperBuilder;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import java.time.LocalDateTime;
+
 @Document(collection = "tpp")
 @Data
 @SuperBuilder
@@ -20,6 +22,8 @@ public class Tpp {
     private String messageUrl;
     private String authenticationUrl;
     private AuthenticationType authenticationType;
-    private Contact contact;
     private Boolean state;
+    private Contact contact;
+    private LocalDateTime creationDate;
+    private LocalDateTime lastUpdateDate;
 }
diff --git a/src/main/java/it/gov/pagopa/tpp/service/TppServiceImpl.java b/src/main/java/it/gov/pagopa/tpp/service/TppServiceImpl.java
@@ -12,6 +12,7 @@
 import reactor.core.publisher.Mono;
 
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.UUID;
 
@@ -48,7 +49,6 @@ public Mono<List<TppDTO>> getEnabledList(List<String> tppIdList) {
         }
 
 
-    //TODO Definire i campi non aggiornabili
     @Override
     public Mono<TppDTO> upsert(TppDTO tppDTO) {
         log.info("[EMD-TPP][UPSERT] Received tppDTO:  {}", inputSanify(tppDTO.toString()));
@@ -57,13 +57,16 @@ public Mono<TppDTO> upsert(TppDTO tppDTO) {
                 .flatMap(tppDB -> {
                     log.info("[EMD-TPP][UPSERT] TPP with tppId:[{}] already exists",(tppDTO.getTppId()));
                     tppReceived.setId(tppDB.getId());
+                    tppReceived.setLastUpdateDate(LocalDateTime.now());
                     return tppRepository.save(tppReceived)
                             .map(mapperToDTO::map)
                             .doOnSuccess(savedTpp -> log.info("[EMD-TPP][UPSERT] Updated existing TPP"));
                 })
                 .switchIfEmpty(
                         Mono.defer(() -> {
                             tppReceived.setTppId("%s_%d".formatted(UUID.randomUUID().toString(), System.currentTimeMillis()));
+                            tppReceived.setCreationDate(LocalDateTime.now());
+                            tppReceived.setLastUpdateDate(LocalDateTime.now());
                             return tppRepository.save(tppReceived)
                                     .map(mapperToDTO::map)
                                     .doOnSuccess(savedTpp -> log.info("[EMD-TPP][UPSERT] Created TPP"));

diff --git a/src/test/java/it/gov/pagopa/tpp/controller/TppControllerTest.java b/src/test/java/it/gov/pagopa/tpp/controller/TppControllerTest.java
@@ -67,6 +67,7 @@ void stateUpdate_Ok()  {
                 .consumeWith(response -> {
                     TppDTO resultResponse = response.getResponseBody();
                     Assertions.assertNotNull(resultResponse);
+                    Assertions.assertEquals(resultResponse,mockTppDTO);
                 });
     }
 
@@ -85,6 +86,7 @@ void get_Ok()  {
                 .consumeWith(response -> {
                     TppDTO resultResponse = response.getResponseBody();
                     Assertions.assertNotNull(resultResponse);
+                    Assertions.assertEquals(resultResponse,mockTppDTO);
                 });
     }