diff --git a/apps/onboarding-ms/pom.xml b/apps/onboarding-ms/pom.xml index 2583a590b..901b0730d 100644 --- a/apps/onboarding-ms/pom.xml +++ b/apps/onboarding-ms/pom.xml @@ -1,340 +1,346 @@ - 4.0.0 - - it.pagopa.selfcare - onboarding-apps - 0.0.1 - + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + + it.pagopa.selfcare + onboarding-apps + 0.0.1 + - onboarding-ms - 1.0.0-SNAPSHOT - - 3.11.0 - 1.18.36 - 1.5.5.Final - 17 - UTF-8 - UTF-8 - quarkus-bom - io.quarkus.platform - 3.11.2 - true - 3.1.2 - 2.4.1 - 0.6.2 - - + onboarding-ms + 1.0.0-SNAPSHOT + + 3.11.0 + 1.18.36 + 1.5.5.Final + 17 + UTF-8 + UTF-8 + quarkus-bom + io.quarkus.platform + 3.11.2 + true + 3.1.2 + 2.4.1 + 0.6.2 + + + + + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + - - ${quarkus.platform.group-id} - ${quarkus.platform.artifact-id} - ${quarkus.platform.version} - pom - import - - - - - - io.quarkus - quarkus-resteasy-reactive - - - io.quarkus - quarkus-arc - - - io.quarkiverse.openapi.generator - quarkus-openapi-generator - ${quarkus-openapi-generator.version} - - - io.quarkus - quarkus-junit5 - test - - - net.jodah - expiringmap - 0.5.10 - compile - - - io.quarkus - quarkus-junit5-mockito - test - - - io.rest-assured - rest-assured - test - - - io.quarkus - quarkus-test-mongodb - - - io.quarkus - quarkus-hibernate-validator - - - io.quarkus - quarkus-resteasy-reactive-jackson - - - io.quarkus - quarkus-rest-client-reactive-jackson - - - io.quarkus - quarkus-smallrye-health - - - org.mapstruct - mapstruct - ${mapstruct.version} - - - io.quarkus - quarkus-smallrye-jwt - - - io.quarkus - quarkus-test-security - test - - - io.quarkus - quarkus-smallrye-openapi - - - io.quarkus - quarkus-mongodb-panache - - - io.quarkus - quarkus-smallrye-context-propagation - + + io.quarkus + quarkus-resteasy-reactive + + + io.quarkus + quarkus-arc + + + io.quarkiverse.openapi.generator + quarkus-openapi-generator + ${quarkus-openapi-generator.version} + + + io.quarkus + quarkus-junit5 + test + + + net.jodah + expiringmap + 0.5.10 + compile + + + io.quarkus + quarkus-junit5-mockito + test + + + io.rest-assured + rest-assured + test + + + io.quarkus + quarkus-test-mongodb + + + io.quarkus + quarkus-hibernate-validator + + + io.quarkus + quarkus-resteasy-reactive-jackson + + + io.quarkus + quarkus-rest-client-reactive-jackson + + + io.quarkus + quarkus-smallrye-health + + + org.mapstruct + mapstruct + ${mapstruct.version} + + + io.quarkus + quarkus-smallrye-jwt + + + io.quarkus + quarkus-test-security + test + + + io.quarkus + quarkus-smallrye-openapi + + + io.quarkus + quarkus-mongodb-panache + + + io.quarkus + quarkus-smallrye-context-propagation + - - io.quarkus - quarkus-panache-mock - test - - - io.quarkus - quarkus-test-hibernate-reactive-panache - test - - - io.quarkus - quarkus-jacoco - test - - - io.quarkus - quarkus-test-security-jwt - test - + + io.quarkus + quarkus-panache-mock + test + + + io.quarkus + quarkus-test-hibernate-reactive-panache + test + + + io.quarkus + quarkus-jacoco + test + + + io.quarkus + quarkus-test-security-jwt + test + - - - eu.europa.ec.joinup.sd-dss - dss-test - 5.12.1 - test - - - - eu.europa.ec.joinup.sd-dss - dss-utils - 5.12.1 - - - eu.europa.ec.joinup.sd-dss - dss-model - 5.12.1 - compile - - - - eu.europa.ec.joinup.sd-dss - dss-service - 5.12.1 - - - - eu.europa.ec.joinup.sd-dss - dss-tsl-validation - 5.12.1 - - - - eu.europa.ec.joinup.sd-dss - dss-utils-google-guava - 5.12.1 - - - eu.europa.ec.joinup.sd-dss - dss-pades - 5.12.1 - - - eu.europa.ec.joinup.sd-dss - dss-pades-pdfbox - 5.12.1 - - - eu.europa.ec.joinup.sd-dss - dss-cades - 5.12.1 - - - eu.europa.ec.joinup.sd-dss - dss-utils-apache-commons - 5.12.1 - - - eu.europa.ec.joinup.sd-dss - dss-crl-parser-stream - 5.12.1 - + + + eu.europa.ec.joinup.sd-dss + dss-test + 5.12.1 + test + + + + eu.europa.ec.joinup.sd-dss + dss-utils + 5.12.1 + + + eu.europa.ec.joinup.sd-dss + dss-model + 5.12.1 + compile + + + + eu.europa.ec.joinup.sd-dss + dss-service + 5.12.1 + + + + eu.europa.ec.joinup.sd-dss + dss-tsl-validation + 5.12.1 + + + + eu.europa.ec.joinup.sd-dss + dss-utils-google-guava + 5.12.1 + + + eu.europa.ec.joinup.sd-dss + dss-pades + 5.12.1 + + + eu.europa.ec.joinup.sd-dss + dss-pades-pdfbox + 5.12.1 + + + eu.europa.ec.joinup.sd-dss + dss-cades + 5.12.1 + + + eu.europa.ec.joinup.sd-dss + dss-utils-apache-commons + 5.12.1 + + + eu.europa.ec.joinup.sd-dss + dss-crl-parser-stream + 5.12.1 + - - javax.xml.bind - jaxb-api - 2.3.1 - + + javax.xml.bind + jaxb-api + 2.3.1 + - - jakarta.activation - jakarta.activation-api - 2.1.0 - - - com.sun.xml.bind - jaxb-impl - 2.3.4 - + + jakarta.activation + jakarta.activation-api + 2.1.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.4 + - - - com.opencsv - opencsv - 5.7.1 - - - com.github.tomakehurst - wiremock-jre8-standalone - 2.35.1 - compile - + + + com.opencsv + opencsv + 5.7.1 + + + com.github.tomakehurst + wiremock-jre8-standalone + 2.35.1 + compile + - - it.pagopa.selfcare - onboarding-sdk-azure-storage - ${commons-sdk-version} - - - it.pagopa.selfcare - onboarding-sdk-product - ${commons-sdk-version} - - - org.projectlombok - lombok - ${lombok.version} - provided - + + it.pagopa.selfcare + onboarding-sdk-azure-storage + ${commons-sdk-version} + + + it.pagopa.selfcare + onboarding-sdk-product + ${commons-sdk-version} + + + org.projectlombok + lombok + ${lombok.version} + provided + + + org.assertj + assertj-core + 3.23.1 + test + - - - - - ${quarkus.platform.group-id} - quarkus-maven-plugin - ${quarkus.platform.version} - true - - - - build - generate-code - generate-code-tests - - - - - - maven-compiler-plugin - ${compiler-plugin.version} - - - -parameters - - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - org.projectlombok - lombok - ${lombok.version} - - - org.projectlombok - lombok-mapstruct-binding - 0.2.0 - - - io.quarkus - quarkus-panache-common - ${quarkus.platform.version} - - - - - - maven-failsafe-plugin - ${surefire-plugin.version} - - - - integration-test - verify - - - - ${project.build.directory}/${project.build.finalName}-runner - - org.jboss.logmanager.LogManager - ${maven.home} - - - - - - - - - - native - - - native - - - - false - native - - - + + + + + ${quarkus.platform.group-id} + quarkus-maven-plugin + ${quarkus.platform.version} + true + + + + build + generate-code + generate-code-tests + + + + + + maven-compiler-plugin + ${compiler-plugin.version} + + + -parameters + + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.projectlombok + lombok + ${lombok.version} + + + org.projectlombok + lombok-mapstruct-binding + 0.2.0 + + + io.quarkus + quarkus-panache-common + ${quarkus.platform.version} + + + + + + maven-failsafe-plugin + ${surefire-plugin.version} + + + + integration-test + verify + + + + ${project.build.directory}/${project.build.finalName}-runner + + org.jboss.logmanager.LogManager + ${maven.home} + + + + + + + + + + native + + + native + + + + false + native + + + diff --git a/apps/onboarding-ms/src/main/docs/openapi.json b/apps/onboarding-ms/src/main/docs/openapi.json index 1c9faef32..04f5c352a 100644 --- a/apps/onboarding-ms/src/main/docs/openapi.json +++ b/apps/onboarding-ms/src/main/docs/openapi.json @@ -2693,6 +2693,9 @@ }, "isAggregator" : { "type" : "boolean" + }, + "createdAt" : { + "$ref" : "#/components/schemas/LocalDateTime" } } }, diff --git a/apps/onboarding-ms/src/main/docs/openapi.yaml b/apps/onboarding-ms/src/main/docs/openapi.yaml index 26ccc231a..f43a0005b 100644 --- a/apps/onboarding-ms/src/main/docs/openapi.yaml +++ b/apps/onboarding-ms/src/main/docs/openapi.yaml @@ -1965,6 +1965,8 @@ components: type: string isAggregator: type: boolean + createdAt: + $ref: "#/components/schemas/LocalDateTime" OnboardingStatus: enum: - REQUEST diff --git a/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/response/OnboardingResponse.java b/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/response/OnboardingResponse.java index 2219f1013..eb9bd37fb 100644 --- a/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/response/OnboardingResponse.java +++ b/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/response/OnboardingResponse.java @@ -3,6 +3,7 @@ import it.pagopa.selfcare.onboarding.controller.request.AdditionalInformationsDto; import lombok.Data; +import java.time.LocalDateTime; import java.util.List; @Data @@ -19,5 +20,6 @@ public class OnboardingResponse { private AdditionalInformationsDto additionalInformations; private String userRequestUid; private Boolean isAggregator; + private LocalDateTime createdAt; } diff --git a/apps/onboarding-ms/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceDefaultTest.java b/apps/onboarding-ms/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceDefaultTest.java index fd308d83b..8e20f9dc3 100644 --- a/apps/onboarding-ms/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceDefaultTest.java +++ b/apps/onboarding-ms/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceDefaultTest.java @@ -75,6 +75,7 @@ import static it.pagopa.selfcare.onboarding.common.WorkflowType.INCREMENT_REGISTRATION_AGGREGATOR; import static it.pagopa.selfcare.onboarding.service.OnboardingServiceDefault.USERS_FIELD_LIST; import static it.pagopa.selfcare.onboarding.service.OnboardingServiceDefault.USERS_FIELD_TAXCODE; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; @@ -315,7 +316,13 @@ void onboardingIncrement_Ok(UniAsserter asserter) { Uni response = onboardingService.onboardingIncrement(onboardingRequest, users, List.of(aggregateInstitutionRequest)); - asserter.assertEquals(() -> response, onboardingResponse); + // Confronta con AssertJ ignorando `createdAt` + asserter.execute(() -> response.subscribe().with(actualResponse -> { + assertThat(actualResponse) + .usingRecursiveComparison() + .ignoringFields("createdAt") + .isEqualTo(onboardingResponse); + })); } private static OnboardingResponse getOnboardingResponse() {