Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SELC-5539] feat: added additionalInformations to Onboarding model #356

Merged
merged 2 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions app/src/main/resources/swagger/api-docs.json
Original file line number Diff line number Diff line change
Expand Up @@ -1416,6 +1416,39 @@
},
"components" : {
"schemas" : {
"AdditionalInformationsDto" : {
"title" : "AdditionalInformationsDto",
"type" : "object",
"properties" : {
"agentOfPublicService" : {
"type" : "boolean"
},
"agentOfPublicServiceNote" : {
"type" : "string"
},
"belongRegulatedMarket" : {
"type" : "boolean"
},
"establishedByRegulatoryProvision" : {
"type" : "boolean"
},
"establishedByRegulatoryProvisionNote" : {
"type" : "string"
},
"ipa" : {
"type" : "boolean"
},
"ipaCode" : {
"type" : "string"
},
"otherNote" : {
"type" : "string"
},
"regulatedMarketNote" : {
"type" : "string"
}
}
},
"AssistanceContactsDto" : {
"title" : "AssistanceContactsDto",
"type" : "object",
Expand Down Expand Up @@ -2205,6 +2238,10 @@
"required" : [ "geographicTaxonomies", "institutionType", "productId", "users" ],
"type" : "object",
"properties" : {
"additionalInformations" : {
"description" : "GSP institution's additional informations",
"$ref" : "#/components/schemas/AdditionalInformationsDto"
},
"assistanceContacts" : {
"description" : "Institution's assistance contacts",
"$ref" : "#/components/schemas/AssistanceContactsDto"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package it.pagopa.selfcare.external_api.model.onboarding;

import lombok.Data;

@Data
public class AdditionalInformations {
private boolean belongRegulatedMarket;
private String regulatedMarketNote;
private boolean ipa;
private String ipaCode;
private boolean establishedByRegulatoryProvision;
private String establishedByRegulatoryProvisionNote;
private boolean agentOfPublicService;
private String agentOfPublicServiceNote;
private String otherNote;
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public class OnboardingData {
private Boolean sendCompleteOnboardingEmail;
private InstitutionLocation location;
private OnboardingImportContract contractImported;
private AdditionalInformations additionalInformations;

public List<User> getUsers() {
return Optional.ofNullable(users).orElse(Collections.emptyList());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1996,6 +1996,9 @@
},
"billing" : {
"$ref" : "#/components/schemas/BillingPaRequest"
},
"additionalInformations" : {
"$ref" : "#/components/schemas/AdditionalInformationsDto"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package it.pagopa.selfcare.external_api.web.model.onboarding;

import lombok.Data;

@Data
public class AdditionalInformationsDto {
private boolean belongRegulatedMarket;
private String regulatedMarketNote;
private boolean ipa;
private String ipaCode;
private boolean establishedByRegulatoryProvision;
private String establishedByRegulatoryProvisionNote;
private boolean agentOfPublicService;
private String agentOfPublicServiceNote;
private String otherNote;
}
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,7 @@ public class OnboardingProductDto {

@ApiModelProperty(value = "${swagger.external_api.institutions.model.subUnitType}")
private String subunitType;

@ApiModelProperty(value = "${swagger.external_api.institutions.model.additionalInformations}")
private AdditionalInformationsDto additionalInformations;
}
1 change: 1 addition & 0 deletions web/src/main/resources/swagger/swagger_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ swagger.external_api.institutions.model.userRole=Logged user's role
swagger.external_api.institutions.model.geographicTaxonomy=Institution's geographic taxonomy
swagger.external_api.institutions.model.geographicTaxonomies=List of geographic Taxonomies
swagger.external_api.institutions.model.productRoles=Logged user's roles on product
swagger.external_api.institutions.model.additionalInformations=GSP institution's additional informations
swagger.external_api.institutions.model.importContract=Institution's old contract information
swagger.external_api.institutions.model.rea=Institution's REA
swagger.external_api.institutions.model.shareCapital=Institution's share capital value
Expand Down
Loading