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

)
pagopa · Sep 11, 2024 · 161ed33 · 161ed33
1 parent 5d1e2b3
commit 161ed33
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 0 deletions.
diff --git a/app/src/main/resources/swagger/api-docs.json b/app/src/main/resources/swagger/api-docs.json
@@ -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",
@@ -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"

diff --git a/...rc/main/java/it/pagopa/selfcare/external_api/model/onboarding/AdditionalInformations.java b/...rc/main/java/it/pagopa/selfcare/external_api/model/onboarding/AdditionalInformations.java
@@ -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;
+}
diff --git a/...or-api/src/main/java/it/pagopa/selfcare/external_api/model/onboarding/OnboardingData.java b/...or-api/src/main/java/it/pagopa/selfcare/external_api/model/onboarding/OnboardingData.java
@@ -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());

diff --git a/connector/rest/docs/openapi/api-selfcare-onboarding-docs.json b/connector/rest/docs/openapi/api-selfcare-onboarding-docs.json
@@ -1996,6 +1996,9 @@
           },
           "billing" : {
             "$ref" : "#/components/schemas/BillingPaRequest"
+          },
+          "additionalInformations" : {
+            "$ref" : "#/components/schemas/AdditionalInformationsDto"
           }
         }
       },

diff --git a/.../java/it/pagopa/selfcare/external_api/web/model/onboarding/AdditionalInformationsDto.java b/.../java/it/pagopa/selfcare/external_api/web/model/onboarding/AdditionalInformationsDto.java
@@ -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;
+}
diff --git a/.../main/java/it/pagopa/selfcare/external_api/web/model/onboarding/OnboardingProductDto.java b/.../main/java/it/pagopa/selfcare/external_api/web/model/onboarding/OnboardingProductDto.java
@@ -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;
 }
diff --git a/web/src/main/resources/swagger/swagger_en.properties b/web/src/main/resources/swagger/swagger_en.properties
@@ -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