diff --git a/app/src/main/resources/swagger/api-docs.json b/app/src/main/resources/swagger/api-docs.json index 1d731a3b3..276f7ada3 100644 --- a/app/src/main/resources/swagger/api-docs.json +++ b/app/src/main/resources/swagger/api-docs.json @@ -3332,7 +3332,9 @@ "type" : "object", "properties" : { "agentOfPublicService" : { - "type" : "boolean" + "type" : "boolean", + "description" : "The institution is an agent of a public service", + "example" : false }, "agentOfPublicServiceNote" : { "type" : "string", @@ -3353,7 +3355,9 @@ "description" : "establishedByRegulatoryProvision Note" }, "ipa" : { - "type" : "boolean" + "type" : "boolean", + "description" : "The institution is registered on IPA", + "example" : false }, "ipaCode" : { "type" : "string", diff --git a/connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/institution/AdditionalInformations.java b/connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/institution/AdditionalInformations.java index 92c80fafb..284a0e62e 100644 --- a/connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/institution/AdditionalInformations.java +++ b/connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/institution/AdditionalInformations.java @@ -7,11 +7,11 @@ public class AdditionalInformations { private boolean belongRegulatedMarket; private String regulatedMarketNote; - private boolean isIpa; + private boolean ipa; private String ipaCode; private boolean establishedByRegulatoryProvision; private String establishedByRegulatoryProvisionNote; - private boolean isAgentOfPublicService; + private boolean agentOfPublicService; private String agentOfPublicServiceNote; private String otherNote; diff --git a/connector/rest/src/test/resources/stubs/ms-core/mappings/getUserInstitutionRelationships_fullyValued.json b/connector/rest/src/test/resources/stubs/ms-core/mappings/getUserInstitutionRelationships_fullyValued.json index 96a9e858b..bf5429f1a 100644 --- a/connector/rest/src/test/resources/stubs/ms-core/mappings/getUserInstitutionRelationships_fullyValued.json +++ b/connector/rest/src/test/resources/stubs/ms-core/mappings/getUserInstitutionRelationships_fullyValued.json @@ -28,11 +28,11 @@ "additionalInformations" : { "belongRegulatedMarket" : true, "regulatedMarketNote" : "string", - "isIpa" : true, + "ipa" : true, "ipaCode" : "string", "establishedByRegulatoryProvision" : true, "establishedByRegulatoryProvisionNote" : "string", - "isAgentOfPublicService" : true, + "agentOfPublicService" : true, "agentOfPublicServiceNote" : "string", "otherNote" : "string" }, diff --git a/connector/rest/src/test/resources/stubs/party-management/mappings/getRelationshipById_fullyValued.json b/connector/rest/src/test/resources/stubs/party-management/mappings/getRelationshipById_fullyValued.json index ea721c021..e91a0b633 100644 --- a/connector/rest/src/test/resources/stubs/party-management/mappings/getRelationshipById_fullyValued.json +++ b/connector/rest/src/test/resources/stubs/party-management/mappings/getRelationshipById_fullyValued.json @@ -31,11 +31,11 @@ "additionalInformations" : { "belongRegulatedMarket" : true, "regulatedMarketNote" : "string", - "isIpa" : true, + "ipa" : true, "ipaCode" : "string", "establishedByRegulatoryProvision" : true, "establishedByRegulatoryProvisionNote" : "string", - "isAgentOfPublicService" : true, + "agentOfPublicService" : true, "agentOfPublicServiceNote" : "string", "otherNote" : "string" }, diff --git a/connector/rest/src/test/resources/stubs/party-process/mappings/getUserInstitutionRelationships_fullyValued.json b/connector/rest/src/test/resources/stubs/party-process/mappings/getUserInstitutionRelationships_fullyValued.json index a86dcee0b..2bddc902c 100644 --- a/connector/rest/src/test/resources/stubs/party-process/mappings/getUserInstitutionRelationships_fullyValued.json +++ b/connector/rest/src/test/resources/stubs/party-process/mappings/getUserInstitutionRelationships_fullyValued.json @@ -28,11 +28,11 @@ "additionalInformations" : { "belongRegulatedMarket" : true, "regulatedMarketNote" : "string", - "isIpa" : true, + "ipa" : true, "ipaCode" : "string", "establishedByRegulatoryProvision" : true, "establishedByRegulatoryProvisionNote" : "string", - "isAgentOfPublicService" : true, + "agentOfPublicService" : true, "agentOfPublicServiceNote" : "string", "otherNote" : "string" }, diff --git a/web/src/main/java/it/pagopa/selfcare/dashboard/web/model/onboarding/OnboardingRequestResource.java b/web/src/main/java/it/pagopa/selfcare/dashboard/web/model/onboarding/OnboardingRequestResource.java index 2721260c0..bbe910ed2 100644 --- a/web/src/main/java/it/pagopa/selfcare/dashboard/web/model/onboarding/OnboardingRequestResource.java +++ b/web/src/main/java/it/pagopa/selfcare/dashboard/web/model/onboarding/OnboardingRequestResource.java @@ -100,8 +100,8 @@ public static class AdditionalInformations{ @ApiModelProperty(value = "${swagger.dashboard.institutions.model.additionalInformations.regulatedMarketNote}") private String regulatedMarketNote; - @ApiModelProperty(value = "${swagger.dashboard.institutions.model.additionalInformations.isIpa}") - private boolean isIpa; + @ApiModelProperty(value = "${swagger.dashboard.institutions.model.additionalInformations.ipa}") + private boolean ipa; @ApiModelProperty(value = "${swagger.dashboard.institutions.model.additionalInformations.ipaCode}") private String ipaCode; @@ -112,8 +112,8 @@ public static class AdditionalInformations{ @ApiModelProperty(value = "${swagger.dashboard.institutions.model.additionalInformations.establishedByRegulatoryProvisionNote}") private String establishedByRegulatoryProvisionNote; - @ApiModelProperty(value = "${swagger.dashboard.institutions.model.additionalInformations.isAgentOfPublicService}") - private boolean isAgentOfPublicService; + @ApiModelProperty(value = "${swagger.dashboard.institutions.model.additionalInformations.agentOfPublicService}") + private boolean agentOfPublicService; @ApiModelProperty(value = "${swagger.dashboard.institutions.model.additionalInformations.agentOfPublicServiceNote}") private String agentOfPublicServiceNote; diff --git a/web/src/main/resources/swagger/swagger_en.properties b/web/src/main/resources/swagger/swagger_en.properties index ccc90a707..b4c311b61 100644 --- a/web/src/main/resources/swagger/swagger_en.properties +++ b/web/src/main/resources/swagger/swagger_en.properties @@ -178,11 +178,11 @@ swagger.dashboard.institutions.partners=Retrieve institution's delegations swagger.dashboard.institutions.delegations=Retrieve list of delegation using to swagger.dashboard.institutions.model.additionalInformations.belongRegulatedMarket=The institution belongs to a regulated market swagger.dashboard.institutions.model.additionalInformations.regulatedMarketNote=regulatedMarket Note -swagger.dashboard.institutions.model.additionalInformations.isIpa=The institution is registered on IPA +swagger.dashboard.institutions.model.additionalInformations.ipa=The institution is registered on IPA swagger.dashboard.institutions.model.additionalInformations.ipaCode=IPA code swagger.dashboard.institutions.model.additionalInformations.establishedByRegulatoryProvision=The institution is a company established by a regulatory provision swagger.dashboard.institutions.model.additionalInformations.establishedByRegulatoryProvisionNote=establishedByRegulatoryProvision Note -swagger.dashboard.institutions.model.additionalInformations.isAgentOfPublicService=The institution is an agent of a public service +swagger.dashboard.institutions.model.additionalInformations.agentOfPublicService=The institution is an agent of a public service swagger.dashboard.institutions.model.additionalInformations.agentOfPublicServiceNote=agentOfPublicService Note swagger.dashboard.institutions.model.additionalInformations.otherNote=Other note swagger.dashboard.institutions.model.additionalInformations=Institution's additional informations \ No newline at end of file