[SELC - 5148] feat: added new AggregateInstitution Object

apps/onboarding-cdc/src/main/openapi/onboarding_functions.json

@@ -204,7 +204,7 @@
           "aggregates": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/Institution"
+              "$ref": "#/components/schemas/AggregateInstitution"
             }
           },
           "billing": {
@@ -320,6 +320,42 @@
           }
         }
       },
+      "AggregateInstitution": {
+        "title": "AggregateInstitution",
+        "type": "object",
+        "properties": {
+          "taxCode": {
+            "type": "string"
+          },
+          "subunitCode": {
+            "type": "string"
+          },
+          "subunitType": {
+            "type": "string"
+          },
+          "origin": {
+            "$ref": "#/components/schemas/Origin"
+          },
+          "originId": {
+            "type": "string"
+          },
+          "geographicTaxonomies": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/GeographicTaxonomy"
+            }
+          },
+          "description": {
+            "type": "string"
+          },
+          "address": {
+            "type": "string"
+          },
+          "zipCode": {
+            "type": "string"
+          }
+        }
+      },
       "DataProtectionOfficer": {
         "type": "object",
         "properties": {

apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/entity/AggregateInstitution.java

@@ -0,0 +1,95 @@
+package it.pagopa.selfcare.onboarding.entity;
+
+
+import it.pagopa.selfcare.onboarding.common.Origin;
+
+
+import java.util.List;
+
+
+public class AggregateInstitution {
+
+    private String taxCode;
+    private String description;
+    private String subunitCode;
+    private String subunitType;
+    private List<GeographicTaxonomy> geographicTaxonomies;
+    private String address;
+    private String zipCode;
+    private String originId;
+    private Origin origin;
+
+    public String getTaxCode() {
+        return taxCode;
+    }
+
+    public void setTaxCode(String taxCode) {
+        this.taxCode = taxCode;
+    }
+
+    public String getSubunitCode() {
+        return subunitCode;
+    }
+
+    public void setSubunitCode(String subunitCode) {
+        this.subunitCode = subunitCode;
+    }
+
+    public String getSubunitType() {
+        return subunitType;
+    }
+
+    public void setSubunitType(String subunitType) {
+        this.subunitType = subunitType;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getZipCode() {
+        return zipCode;
+    }
+
+    public void setZipCode(String zipCode) {
+        this.zipCode = zipCode;
+    }
+
+    public List<GeographicTaxonomy> getGeographicTaxonomies() {
+        return geographicTaxonomies;
+    }
+
+    public void setGeographicTaxonomies(List<GeographicTaxonomy> geographicTaxonomies) {
+        this.geographicTaxonomies = geographicTaxonomies;
+    }
+
+    public Origin getOrigin() {
+        return origin;
+    }
+
+    public void setOrigin(Origin origin) {
+        this.origin = origin;
+    }
+
+    public String getOriginId() {
+        return originId;
+    }
+
+    public void setOriginId(String originId) {
+        this.originId = originId;
+    }
+
+
+}

apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/entity/Onboarding.java

@@ -20,7 +20,7 @@ public class Onboarding  {
     private WorkflowType workflowType;
     private Institution institution;
     private List<User> users;
-    private List<Institution> aggregates;
+    private List<AggregateInstitution> aggregates;
     private String pricingPlan;
     private Billing billing;
     private Boolean signContract;
@@ -175,9 +175,9 @@ public void setDeletedAt(LocalDateTime deletedAt) {
         this.deletedAt = deletedAt;
     }
 
-    public List<Institution> getAggregates() { return aggregates; }
+    public List<AggregateInstitution> getAggregates() { return aggregates; }
 
-    public void setAggregates(List<Institution> aggregates) { this.aggregates = aggregates; }
+    public void setAggregates(List<AggregateInstitution> aggregates) { this.aggregates = aggregates; }
 
     public Boolean getIsAggregator() { return isAggregator; }
 

apps/onboarding-ms/src/main/docs/openapi.json

@@ -1032,6 +1032,42 @@
           }
         }
       },
+      "AggregateInstitutionRequest" : {
+        "required" : [ "taxCode", "description" ],
+        "type" : "object",
+        "properties" : {
+          "taxCode" : {
+            "type" : "string"
+          },
+          "description" : {
+            "type" : "string"
+          },
+          "subunitCode" : {
+            "type" : "string"
+          },
+          "subunitType" : {
+            "type" : "string"
+          },
+          "geographicTaxonomies" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/GeographicTaxonomy"
+            }
+          },
+          "address" : {
+            "type" : "string"
+          },
+          "zipCode" : {
+            "type" : "string"
+          },
+          "originId" : {
+            "type" : "string"
+          },
+          "origin" : {
+            "$ref" : "#/components/schemas/Origin"
+          }
+        }
+      },
       "BillingPaRequest" : {
         "type" : "object",
         "properties" : {
@@ -1091,6 +1127,17 @@
           }
         }
       },
+      "GeographicTaxonomy" : {
+        "type" : "object",
+        "properties" : {
+          "code" : {
+            "type" : "string"
+          },
+          "desc" : {
+            "type" : "string"
+          }
+        }
+      },
       "GeographicTaxonomyDto" : {
         "type" : "object",
         "properties" : {
@@ -1420,7 +1467,7 @@
           "aggregates" : {
             "type" : "array",
             "items" : {
-              "$ref" : "#/components/schemas/InstitutionBaseRequest"
+              "$ref" : "#/components/schemas/AggregateInstitutionRequest"
             }
           },
           "isAggregator" : {
@@ -1606,7 +1653,7 @@
           "aggregates" : {
             "type" : "array",
             "items" : {
-              "$ref" : "#/components/schemas/InstitutionBaseRequest"
+              "$ref" : "#/components/schemas/AggregateInstitutionRequest"
             }
           },
           "isAggregator" : {
@@ -1676,7 +1723,7 @@
           "aggregates" : {
             "type" : "array",
             "items" : {
-              "$ref" : "#/components/schemas/InstitutionBaseRequest"
+              "$ref" : "#/components/schemas/AggregateInstitutionRequest"
             }
           },
           "isAggregator" : {

apps/onboarding-ms/src/main/docs/openapi.yaml

@@ -733,6 +733,32 @@ components:
           type: string
         otherNote:
           type: string
+    AggregateInstitutionRequest:
+      required:
+      - taxCode
+      - description
+      type: object
+      properties:
+        taxCode:
+          type: string
+        description:
+          type: string
+        subunitCode:
+          type: string
+        subunitType:
+          type: string
+        geographicTaxonomies:
+          type: array
+          items:
+            $ref: "#/components/schemas/GeographicTaxonomy"
+        address:
+          type: string
+        zipCode:
+          type: string
+        originId:
+          type: string
+        origin:
+          $ref: "#/components/schemas/Origin"
     BillingPaRequest:
       type: object
       properties:
@@ -771,6 +797,13 @@ components:
           type: string
         pec:
           type: string
+    GeographicTaxonomy:
+      type: object
+      properties:
+        code:
+          type: string
+        desc:
+          type: string
     GeographicTaxonomyDto:
       type: object
       properties:
@@ -1016,7 +1049,7 @@ components:
         aggregates:
           type: array
           items:
-            $ref: "#/components/schemas/InstitutionBaseRequest"
+            $ref: "#/components/schemas/AggregateInstitutionRequest"
         isAggregator:
           type: boolean
         pricingPlan:
@@ -1152,7 +1185,7 @@ components:
         aggregates:
           type: array
           items:
-            $ref: "#/components/schemas/InstitutionBaseRequest"
+            $ref: "#/components/schemas/AggregateInstitutionRequest"
         isAggregator:
           type: boolean
         pricingPlan:
@@ -1208,7 +1241,7 @@ components:
         aggregates:
           type: array
           items:
-            $ref: "#/components/schemas/InstitutionBaseRequest"
+            $ref: "#/components/schemas/AggregateInstitutionRequest"
         isAggregator:
           type: boolean
         pricingPlan:

apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/request/AggregateInstitutionRequest.java

@@ -0,0 +1,25 @@
+package it.pagopa.selfcare.onboarding.controller.request;
+
+import it.pagopa.selfcare.onboarding.common.Origin;
+import it.pagopa.selfcare.onboarding.entity.GeographicTaxonomy;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AggregateInstitutionRequest {
+    @NotNull(message = "taxCode is required")
+    private String taxCode;
+
+    @NotNull(message = "description is required")
+    private String description;
+
+    private String subunitCode;
+    private String subunitType;
+    private List<GeographicTaxonomy> geographicTaxonomies;
+    private String address;
+    private String zipCode;
+    private String originId;
+    private Origin origin;
+}

apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/request/OnboardingBaseRequest.java

@@ -14,7 +14,7 @@ public class OnboardingBaseRequest {
     @NotEmpty(message = "at least one user is required")
     private List<UserRequest> users;
 
-    private List<InstitutionBaseRequest> aggregates;
+    private List<AggregateInstitutionRequest> aggregates;
 
     private Boolean isAggregator;
 

apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/entity/AggregateInstitution.java

@@ -0,0 +1,22 @@
+package it.pagopa.selfcare.onboarding.entity;
+
+import it.pagopa.selfcare.onboarding.common.Origin;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AggregateInstitution {
+
+    private String taxCode;
+    private String description;
+    private String subunitCode;
+    private String subunitType;
+    private List<GeographicTaxonomy> geographicTaxonomies;
+    private String address;
+    private String zipCode;
+    private String originId;
+    private Origin origin;
+
+}

apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/entity/Onboarding.java

@@ -26,7 +26,7 @@ public class Onboarding extends ReactivePanacheMongoEntityBase {
     private WorkflowType workflowType;
     private Institution institution;
     private List<User> users;
-    private List<Institution> aggregates;
+    private List<AggregateInstitution> aggregates;
     private String pricingPlan;
     private Billing billing;
     private Boolean signContract;