From da47f17ef73fb80dec19363646b442e06f02ad1a Mon Sep 17 00:00:00 2001 From: "pierpaolo.didato@emeal.nttdata.com" Date: Mon, 9 Dec 2024 09:58:14 +0100 Subject: [PATCH 1/2] Added attribute attachments into v2/tokens/{onboardingId} API --- app/src/main/resources/swagger/api-docs.json | 7 +++++++ .../connector/model/onboarding/OnboardingData.java | 1 + .../rest/docs/openapi/api-selfcare-onboarding-docs.json | 6 ++++++ .../onboarding/web/model/OnboardingRequestResource.java | 3 +++ web/src/main/resources/swagger/swagger_en.properties | 1 + 5 files changed, 18 insertions(+) diff --git a/app/src/main/resources/swagger/api-docs.json b/app/src/main/resources/swagger/api-docs.json index 360a41e3..7f6342df 100644 --- a/app/src/main/resources/swagger/api-docs.json +++ b/app/src/main/resources/swagger/api-docs.json @@ -4102,6 +4102,13 @@ "$ref" : "#/components/schemas/UserInfo" } }, + "attachments" : { + "type" : "array", + "description" : "Onboarding's attachments", + "items" : { + "type" : "string" + } + }, "expiringDate" : { "type" : "string", "description" : "Onboarding request expiring date", diff --git a/connector-api/src/main/java/it/pagopa/selfcare/onboarding/connector/model/onboarding/OnboardingData.java b/connector-api/src/main/java/it/pagopa/selfcare/onboarding/connector/model/onboarding/OnboardingData.java index 5d7f82f1..6a00c771 100644 --- a/connector-api/src/main/java/it/pagopa/selfcare/onboarding/connector/model/onboarding/OnboardingData.java +++ b/connector-api/src/main/java/it/pagopa/selfcare/onboarding/connector/model/onboarding/OnboardingData.java @@ -52,6 +52,7 @@ public class OnboardingData { private String reasonForReject; private Boolean isAggregator; private List aggregates; + private List attachments; public List getUsers() { return Optional.ofNullable(users).orElse(Collections.emptyList()); } diff --git a/connector/rest/docs/openapi/api-selfcare-onboarding-docs.json b/connector/rest/docs/openapi/api-selfcare-onboarding-docs.json index 961262f8..f3656f13 100644 --- a/connector/rest/docs/openapi/api-selfcare-onboarding-docs.json +++ b/connector/rest/docs/openapi/api-selfcare-onboarding-docs.json @@ -2294,6 +2294,12 @@ }, "reasonForReject" : { "type" : "string" + }, + "attachments" : { + "type" : "array", + "items" : { + "type" : "string" + } } } }, diff --git a/web/src/main/java/it/pagopa/selfcare/onboarding/web/model/OnboardingRequestResource.java b/web/src/main/java/it/pagopa/selfcare/onboarding/web/model/OnboardingRequestResource.java index ded4bb38..c18ef14e 100644 --- a/web/src/main/java/it/pagopa/selfcare/onboarding/web/model/OnboardingRequestResource.java +++ b/web/src/main/java/it/pagopa/selfcare/onboarding/web/model/OnboardingRequestResource.java @@ -41,6 +41,9 @@ public class OnboardingRequestResource { @ApiModelProperty(value = "${swagger.onboarding.model.reason}") private String reasonForReject; + @ApiModelProperty(value = "${swagger.onboarding.model.attachments}") + private List attachments; + @Data @EqualsAndHashCode(of = "id") public static class InstitutionInfo { diff --git a/web/src/main/resources/swagger/swagger_en.properties b/web/src/main/resources/swagger/swagger_en.properties index 5e7cb8a3..4c8c719c 100644 --- a/web/src/main/resources/swagger/swagger_en.properties +++ b/web/src/main/resources/swagger/swagger_en.properties @@ -87,6 +87,7 @@ swagger.onboarding.model.status=Onboarding request's status swagger.onboarding.model.institutionInfo=Institution specific data swagger.onboarding.model.manager=Manager specific data. It's required when institutionType is not PT swagger.onboarding.model.reason=Onboarding request rejection reason +swagger.onboarding.model.attachments=Onboarding's attachments swagger.onboarding.model.updateDate=Onboarding request update date swagger.onboarding.model.expiringDate=Onboarding request expiring date swagger.onboarding.model.admins=Administrators specific data From e9bfa3ae7c08b5a7d335b8b0ac8797f1685f321d Mon Sep 17 00:00:00 2001 From: "pierpaolo.didato@emeal.nttdata.com" Date: Mon, 9 Dec 2024 10:06:29 +0100 Subject: [PATCH 2/2] Merge from main --- .../rest/docs/openapi/api-selfcare-onboarding-docs.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/connector/rest/docs/openapi/api-selfcare-onboarding-docs.json b/connector/rest/docs/openapi/api-selfcare-onboarding-docs.json index 989792f2..507943c2 100644 --- a/connector/rest/docs/openapi/api-selfcare-onboarding-docs.json +++ b/connector/rest/docs/openapi/api-selfcare-onboarding-docs.json @@ -2612,6 +2612,12 @@ }, "reasonForReject": { "type": "string" + }, + "attachments" : { + "type" : "array", + "items" : { + "type" : "string" + } } } },