[SELC-5513] feat: Added new fields for GPUData

pagopa · Nov 27, 2024 · 97da222 · 97da222
1 parent c36bdf4
commit 97da222
Show file tree

Hide file tree

Showing 15 changed files with 138 additions and 4 deletions.
diff --git a/app/src/main/resources/swagger/api-docs.json b/app/src/main/resources/swagger/api-docs.json
@@ -3609,6 +3609,36 @@
           }
         }
       },
+      "GPUData" : {
+        "title" : "GPUData",
+        "type" : "object",
+        "properties" : {
+          "businessRegisterNumber" : {
+            "type" : "string"
+          },
+          "institutionCourtMeasures" : {
+            "type" : "boolean"
+          },
+          "legalRegisterName" : {
+            "type" : "string"
+          },
+          "legalRegisterNumber" : {
+            "type" : "string"
+          },
+          "manager" : {
+            "type" : "boolean"
+          },
+          "managerAuthorized" : {
+            "type" : "boolean"
+          },
+          "managerEligible" : {
+            "type" : "boolean"
+          },
+          "managerProsecution" : {
+            "type" : "boolean"
+          }
+        }
+      },
       "GeographicTaxonomyDto" : {
         "title" : "GeographicTaxonomyDto",
         "required" : [ "code", "desc" ],
@@ -4001,6 +4031,10 @@
               "$ref" : "#/components/schemas/GeographicTaxonomyDto"
             }
           },
+          "gpuData" : {
+            "description" : "Institution's GPU data",
+            "$ref" : "#/components/schemas/GPUData"
+          },
           "institutionLocationData" : {
             "description" : "Institution's location data, city, county, country information",
             "$ref" : "#/components/schemas/InstitutionLocationDataDto"

diff --git a/...src/main/java/it/pagopa/selfcare/onboarding/connector/model/institutions/Institution.java b/...src/main/java/it/pagopa/selfcare/onboarding/connector/model/institutions/Institution.java
@@ -31,6 +31,7 @@ public class Institution {
     private List<Attribute> attributes;
     private PaymentServiceProvider paymentServiceProvider;
     private DataProtectionOfficer dataProtectionOfficer;
+    private GPUData gpuData;
     private List<GeographicTaxonomy> geographicTaxonomies;
     private CompanyInformations companyInformations;
     private AssistanceContacts assistanceContacts;

diff --git a/.../src/main/java/it/pagopa/selfcare/onboarding/connector/model/onboarding/BusinessData.java b/.../src/main/java/it/pagopa/selfcare/onboarding/connector/model/onboarding/BusinessData.java
@@ -0,0 +1,12 @@
+package it.pagopa.selfcare.onboarding.connector.model.onboarding;
+
+import lombok.Data;
+
+@Data
+public class BusinessData {
+
+    private String businessRegisterNumber;
+    private String legalRegisterNumber;
+    private String legalRegisterName;
+
+}
diff --git a/...r-api/src/main/java/it/pagopa/selfcare/onboarding/connector/model/onboarding/GPUData.java b/...r-api/src/main/java/it/pagopa/selfcare/onboarding/connector/model/onboarding/GPUData.java
@@ -0,0 +1,16 @@
+package it.pagopa.selfcare.onboarding.connector.model.onboarding;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class GPUData extends BusinessData {
+
+    private boolean manager;
+    private boolean managerAuthorized;
+    private boolean managerEligible;
+    private boolean managerProsecution;
+    private boolean institutionCourtMeasures;
+
+}
diff --git a/...main/java/it/pagopa/selfcare/onboarding/connector/model/onboarding/InstitutionUpdate.java b/...main/java/it/pagopa/selfcare/onboarding/connector/model/onboarding/InstitutionUpdate.java
@@ -21,6 +21,7 @@ public class InstitutionUpdate {
     private String originId;
     private PaymentServiceProvider paymentServiceProvider;
     private DataProtectionOfficer dataProtectionOfficer;
+    private GPUData gpuData;
     private List<GeographicTaxonomy> geographicTaxonomies;
     private String rea;
     private String shareCapital;

diff --git a/...java/it/pagopa/selfcare/onboarding/connector/model/onboarding/PaymentServiceProvider.java b/...java/it/pagopa/selfcare/onboarding/connector/model/onboarding/PaymentServiceProvider.java
@@ -1,14 +1,13 @@
 package it.pagopa.selfcare.onboarding.connector.model.onboarding;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
-public class PaymentServiceProvider {
+@EqualsAndHashCode(callSuper = true)
+public class PaymentServiceProvider extends BusinessData {
 
     private String abiCode;
-    private String businessRegisterNumber;
-    private String legalRegisterName;
-    private String legalRegisterNumber;
     private Boolean vatNumberGroup;
 
 }
diff --git a/connector/rest/docs/openapi/api-selfcare-onboarding-docs.json b/connector/rest/docs/openapi/api-selfcare-onboarding-docs.json
@@ -2238,6 +2238,9 @@
           },
           "additionalInformations" : {
             "$ref" : "#/components/schemas/AdditionalInformationsDto"
+          },
+          "gpuData": {
+            "$ref": "#/components/schemas/GPUData"
           }
         }
       },
@@ -2813,6 +2816,35 @@
             }
           }
         }
+      },
+      "GPUData" : {
+        "type" : "object",
+        "properties" : {
+          "businessRegisterNumber" : {
+            "type" : "string"
+          },
+          "legalRegisterNumber" : {
+            "type" : "string"
+          },
+          "legalRegisterName" : {
+            "type" : "string"
+          },
+          "manager" : {
+            "type" : "boolean"
+          },
+          "managerAuthorized" : {
+            "type" : "boolean"
+          },
+          "managerEligible" : {
+            "type" : "boolean"
+          },
+          "managerProsecution" : {
+            "type" : "boolean"
+          },
+          "institutionCourtMeasures" : {
+            "type" : "boolean"
+          }
+        }
       }
     },
     "securitySchemes" : {

diff --git a/...t/src/main/java/it/pagopa/selfcare/onboarding/connector/rest/mapper/OnboardingMapper.java b/...t/src/main/java/it/pagopa/selfcare/onboarding/connector/rest/mapper/OnboardingMapper.java
@@ -24,6 +24,7 @@ public interface OnboardingMapper {
     OnboardingPspRequest toOnboardingPspRequest(OnboardingData onboardingData);
     @Mapping(target = "institution", source = ".", qualifiedByName = "toInstitutionBase")
     @Mapping(target = "additionalInformations", source = "institutionUpdate.additionalInformations")
+    @Mapping(target = "gpuData", source = "institutionUpdate.gpuData")
     OnboardingDefaultRequest toOnboardingDefaultRequest(OnboardingData onboardingData);
 
     @Mapping(target = "businessName", source = "institutionUpdate.description")

diff --git a/...src/main/java/it/pagopa/selfcare/onboarding/connector/rest/model/InstitutionResponse.java b/...src/main/java/it/pagopa/selfcare/onboarding/connector/rest/model/InstitutionResponse.java
@@ -3,6 +3,7 @@
 import it.pagopa.selfcare.commons.base.utils.InstitutionType;
 import it.pagopa.selfcare.onboarding.connector.model.institutions.Attribute;
 import it.pagopa.selfcare.onboarding.connector.model.onboarding.DataProtectionOfficer;
+import it.pagopa.selfcare.onboarding.connector.model.onboarding.GPUData;
 import it.pagopa.selfcare.onboarding.connector.model.onboarding.GeographicTaxonomy;
 import it.pagopa.selfcare.onboarding.connector.model.onboarding.PaymentServiceProvider;
 import lombok.Data;
@@ -31,6 +32,7 @@ public class InstitutionResponse {
     private List<Attribute> attributes;
     private PaymentServiceProvider paymentServiceProvider;
     private DataProtectionOfficer dataProtectionOfficer;
+    private GPUData gpuData;
     private List<GeographicTaxonomy> geographicTaxonomies;
     private List<OnboardingResponse> onboarding;
     private String rea;

diff --git a/connector/rest/src/test/resources/stubs/party-process/mappings/createInstitution.json b/connector/rest/src/test/resources/stubs/party-process/mappings/createInstitution.json
@@ -46,6 +46,16 @@
         "email": "string",
         "pec": "string"
       },
+      "gpuData": {
+        "businessRegisterNumber": "string",
+        "legalRegisterName": "string",
+        "legalRegisterNumber": "string",
+        "manager": false,
+        "managerAuthorized": false,
+        "managerEligible": false,
+        "managerProsecution": false,
+        "institutionCourtMeasures": false
+      },
       "geographicTaxonomies": [
         {
           "code": "string",

diff --git a/...est/src/test/resources/stubs/party-process/mappings/createInstitutionUsingExternalId.json b/...est/src/test/resources/stubs/party-process/mappings/createInstitutionUsingExternalId.json
@@ -41,6 +41,16 @@
         "email": "string",
         "pec": "string"
       },
+      "gpuData": {
+        "businessRegisterNumber": "string",
+        "legalRegisterName": "string",
+        "legalRegisterNumber": "string",
+        "manager": false,
+        "managerAuthorized": false,
+        "managerEligible": false,
+        "managerProsecution": false,
+        "institutionCourtMeasures": false
+      },
       "geographicTaxonomies": [
         {
           "code": "string",

diff --git a/...t/resources/stubs/party-process/mappings/getUserInstitutionRelationships_fullyValued.json b/...t/resources/stubs/party-process/mappings/getUserInstitutionRelationships_fullyValued.json
@@ -47,6 +47,16 @@
             "agentOfPublicServiceNote" : "string",
             "otherNote" : "string"
           },
+          "gpuData": {
+            "businessRegisterNumber": "string",
+            "legalRegisterName": "string",
+            "legalRegisterNumber": "string",
+            "manager": false,
+            "managerAuthorized": false,
+            "managerEligible": false,
+            "managerProsecution": false,
+            "institutionCourtMeasures": false
+          },
           "dataProtectionOfficer": {
             "address": "string",
             "email": "string",

diff --git a/web/src/main/java/it/pagopa/selfcare/onboarding/web/model/OnboardingProductDto.java b/web/src/main/java/it/pagopa/selfcare/onboarding/web/model/OnboardingProductDto.java
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import it.pagopa.selfcare.onboarding.common.InstitutionType;
+import it.pagopa.selfcare.onboarding.connector.model.onboarding.GPUData;
 import lombok.Data;
 
 import javax.validation.Valid;
@@ -74,4 +75,7 @@ public class OnboardingProductDto {
 
     @ApiModelProperty(value = "${swagger.onboarding.institutions.model.aggregates}")
     private List<AggregateInstitution> aggregates;
+
+    @ApiModelProperty(value = "${swagger.onboarding.institutions.model.gpuData}")
+    private GPUData gpuData;
 }
diff --git a/...rc/main/java/it/pagopa/selfcare/onboarding/web/model/mapper/OnboardingResourceMapper.java b/...rc/main/java/it/pagopa/selfcare/onboarding/web/model/mapper/OnboardingResourceMapper.java
@@ -34,6 +34,7 @@ public interface OnboardingResourceMapper {
     @Mapping(source = "assistanceContacts.supportEmail", target = "institutionUpdate.supportEmail")
     @Mapping(source = "assistanceContacts.supportPhone", target = "institutionUpdate.supportPhone")
     @Mapping(source = "additionalInformations", target = "institutionUpdate.additionalInformations")
+    @Mapping(source = "gpuData", target = "institutionUpdate.gpuData")
     @Mapping(source = "originId", target = "originId")
     OnboardingData toEntity(OnboardingProductDto dto);
 

diff --git a/web/src/main/resources/swagger/swagger_en.properties b/web/src/main/resources/swagger/swagger_en.properties
@@ -46,6 +46,7 @@ swagger.onboarding.institutions.model.vatNumber=Institution's VAT number
 swagger.onboarding.institutions.model.publicServices=Institution's service type
 swagger.onboarding.institutions.model.pricingPlan=Product's pricing plan
 swagger.onboarding.institutions.model.origin=Institution data origin
+swagger.onboarding.institutions.model.gpuData=Institution's GPU data
 swagger.onboarding.institutions.model.institutionType=Institution's type
 swagger.onboarding.institutions.model.userRole=Logged user's role
 swagger.onboarding.institutions.model.pspData=Payment Service Provider (PSP) specific data