diff --git a/web/src/main/java/it/pagopa/selfcare/mscore/web/controller/InstitutionController.java b/web/src/main/java/it/pagopa/selfcare/mscore/web/controller/InstitutionController.java index cc523d7e..003c47cb 100644 --- a/web/src/main/java/it/pagopa/selfcare/mscore/web/controller/InstitutionController.java +++ b/web/src/main/java/it/pagopa/selfcare/mscore/web/controller/InstitutionController.java @@ -1,10 +1,6 @@ package it.pagopa.selfcare.mscore.web.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tags; import it.pagopa.selfcare.commons.base.security.SelfCareUser; @@ -15,7 +11,10 @@ import it.pagopa.selfcare.mscore.core.OnboardingService; import it.pagopa.selfcare.mscore.model.institution.*; import it.pagopa.selfcare.mscore.web.model.institution.*; -import it.pagopa.selfcare.mscore.web.model.mapper.*; +import it.pagopa.selfcare.mscore.web.model.mapper.BrokerMapper; +import it.pagopa.selfcare.mscore.web.model.mapper.InstitutionMapperCustom; +import it.pagopa.selfcare.mscore.web.model.mapper.InstitutionResourceMapper; +import it.pagopa.selfcare.mscore.web.model.mapper.OnboardingResourceMapper; import it.pagopa.selfcare.mscore.web.model.onboarding.OnboardedProducts; import it.pagopa.selfcare.mscore.web.util.CustomExceptionMessage; import lombok.extern.slf4j.Slf4j; diff --git a/web/src/main/java/it/pagopa/selfcare/mscore/web/model/institution/InstitutionOnboardingRequest.java b/web/src/main/java/it/pagopa/selfcare/mscore/web/model/institution/InstitutionOnboardingRequest.java index 61d5ae5e..12497748 100644 --- a/web/src/main/java/it/pagopa/selfcare/mscore/web/model/institution/InstitutionOnboardingRequest.java +++ b/web/src/main/java/it/pagopa/selfcare/mscore/web/model/institution/InstitutionOnboardingRequest.java @@ -3,7 +3,7 @@ import lombok.Data; import javax.validation.constraints.NotEmpty; -import java.time.LocalDateTime; +import java.time.OffsetDateTime; @Data public class InstitutionOnboardingRequest { @@ -15,7 +15,7 @@ public class InstitutionOnboardingRequest { private String contractPath; private String pricingPlan; private BillingRequest billing; - private LocalDateTime activatedAt; + private OffsetDateTime activatedAt; private Boolean isAggregator; } diff --git a/web/src/main/java/it/pagopa/selfcare/mscore/web/model/mapper/OnboardingResourceMapper.java b/web/src/main/java/it/pagopa/selfcare/mscore/web/model/mapper/OnboardingResourceMapper.java index 65af7a0b..c6eb299d 100644 --- a/web/src/main/java/it/pagopa/selfcare/mscore/web/model/mapper/OnboardingResourceMapper.java +++ b/web/src/main/java/it/pagopa/selfcare/mscore/web/model/mapper/OnboardingResourceMapper.java @@ -37,7 +37,7 @@ default Boolean mapSignContract(Boolean signContract) { } @Mapping(target = "contract", source = "contractPath") - @Mapping(target = "createdAt", source = "activatedAt", qualifiedByName = "toOffsetDateTime") + @Mapping(target = "createdAt", source = "activatedAt") Onboarding toOnboarding(InstitutionOnboardingRequest onboardingRequest); @Named("toOffsetDateTime")