[SELC-5617] feat: Replace commons InstitutionType with onboarding-sdk…

… InstitutionType (#479)
pagopa · Sep 24, 2024 · 629a37a · 629a37a
1 parent c0788a8
commit 629a37a
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 262 deletions.
diff --git a/app/src/main/resources/swagger/api-docs.json b/app/src/main/resources/swagger/api-docs.json
@@ -764,47 +764,6 @@
  "summary" : "getInstitutions",
  "description" : "Service to get all the institutions related to logged user",
  "operationId" : "v2RetrieveUserInstitutions",
- "parameters" : [ {
- "name" : "authenticated",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "boolean"
- }
- }, {
- "name" : "authorities[0].authority",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "string"
- }
- }, {
- "name" : "credentials",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "object"
- }
- }, {
- "name" : "details",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "object"
- }
- }, {
- "name" : "principal",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "object"
- }
- } ],
  "responses" : {
  "200" : {
  "description" : "OK",
@@ -1318,38 +1277,6 @@
  "description" : "Service to get the users with the given user id related to a specific institution",
  "operationId" : "v2RetrieveInstitutionUser",
  "parameters" : [ {
- "name" : "authenticated",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "boolean"
- }
- }, {
- "name" : "authorities[0].authority",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "string"
- }
- }, {
- "name" : "credentials",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "object"
- }
- }, {
- "name" : "details",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "object"
- }
- }, {
  "name" : "institutionId",
  "in" : "path",
  "description" : "Institution's unique internal identifier",
@@ -1358,14 +1285,6 @@
  "schema" : {
  "type" : "string"
  }
- }, {
- "name" : "principal",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "object"
- }
  }, {
  "name" : "userId",
  "in" : "path",
@@ -1455,8 +1374,7 @@
  "required" : true,
  "style" : "simple",
  "schema" : {
- "type" : "string",
- "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PSP", "PT", "REC", "SA", "SCP" ]
+ "type" : "string"
  }
  } ],
  "responses" : {
@@ -1702,47 +1620,6 @@
  "summary" : "sendSupportRequest",
  "description" : "Service to retrieve Support contact's form",
  "operationId" : "sendSupportRequestUsingPOST",
- "parameters" : [ {
- "name" : "authenticated",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "boolean"
- }
- }, {
- "name" : "authorities[0].authority",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "string"
- }
- }, {
- "name" : "credentials",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "object"
- }
- }, {
- "name" : "details",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "object"
- }
- }, {
- "name" : "principal",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "object"
- }
- } ],
  "requestBody" : {
  "content" : {
  "application/json" : {
@@ -1897,38 +1774,6 @@
  "description" : "Service to create a 'Billing Token' based on a Self Care session token",
  "operationId" : "billingTokenUsingGET",
  "parameters" : [ {
- "name" : "authenticated",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "boolean"
- }
- }, {
- "name" : "authorities[0].authority",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "string"
- }
- }, {
- "name" : "credentials",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "string"
- }
- }, {
- "name" : "details",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "object"
- }
- }, {
  "name" : "institutionId",
  "in" : "query",
  "description" : "Institution's unique internal identifier",
@@ -1937,22 +1782,6 @@
  "schema" : {
  "type" : "string"
  }
- }, {
- "name" : "name",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "string"
- }
- }, {
- "name" : "principal",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "object"
- }
  }, {
  "name" : "environment",
  "in" : "query",
@@ -2675,38 +2504,6 @@
  "description" : "Service to get all the users related to a specific institution",
  "operationId" : "v2GetUsersUsingGET",
  "parameters" : [ {
- "name" : "authenticated",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "boolean"
- }
- }, {
- "name" : "authorities[0].authority",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "string"
- }
- }, {
- "name" : "credentials",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "object"
- }
- }, {
- "name" : "details",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "object"
- }
- }, {
  "name" : "institutionId",
  "in" : "path",
  "description" : "Institution's unique internal identifier",
@@ -2715,14 +2512,6 @@
  "schema" : {
  "type" : "string"
  }
- }, {
- "name" : "principal",
- "in" : "query",
- "required" : false,
- "style" : "form",
- "schema" : {
- "type" : "object"
- }
  }, {
  "name" : "productId",
  "in" : "query",
@@ -3565,8 +3354,7 @@
  "type" : "string"
  },
  "institutionType" : {
- "type" : "string",
- "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PSP", "PT", "REC", "SA", "SCP" ]
+ "type" : "string"
  },
  "productId" : {
  "type" : "string"
@@ -3724,8 +3512,7 @@
  "type" : "string"
  },
  "institutionType" : {
- "type" : "string",
- "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PSP", "PT", "REC", "SA", "SCP" ]
+ "type" : "string"
  },
  "onboarding" : {
  "type" : "array",
@@ -3842,8 +3629,7 @@
  },
  "institutionType" : {
  "type" : "string",
- "description" : "Institution's type",
- "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PSP", "PT", "REC", "SA", "SCP" ]
+ "description" : "Institution's type"
  },
  "mailAddress" : {
  "type" : "string",

diff --git a/connector-api/pom.xml b/connector-api/pom.xml
@@ -23,13 +23,9 @@
  <dependency>
  <groupId>it.pagopa.selfcare</groupId>
  <artifactId>onboarding-sdk-product</artifactId>
- <version>0.2.0</version>
+ <version>0.2.1</version>
  <scope>compile</scope>
  </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-commons</artifactId>
- </dependency>
  </dependencies>
 
  <repositories>

diff --git a/...main/java/it/pagopa/selfcare/dashboard/connector/model/delegation/DelegationWithInfo.java b/...main/java/it/pagopa/selfcare/dashboard/connector/model/delegation/DelegationWithInfo.java
@@ -1,6 +1,6 @@
 package it.pagopa.selfcare.dashboard.connector.model.delegation;
 
-import it.pagopa.selfcare.commons.base.utils.InstitutionType;
+import it.pagopa.selfcare.onboarding.common.InstitutionType;
 import lombok.Data;
 
 import java.time.OffsetDateTime;
@@ -19,7 +19,7 @@ public class DelegationWithInfo {
  private DelegationType type;
  private OffsetDateTime createdAt;
  private OffsetDateTime updatedAt;
- private InstitutionType institutionType;
+ private String institutionType;
  private String status;
  private String taxCode;
 }
diff --git a/...i/src/main/java/it/pagopa/selfcare/dashboard/connector/model/institution/Institution.java b/...i/src/main/java/it/pagopa/selfcare/dashboard/connector/model/institution/Institution.java
@@ -1,6 +1,6 @@
 package it.pagopa.selfcare.dashboard.connector.model.institution;
 
-import it.pagopa.selfcare.commons.base.utils.InstitutionType;
+import it.pagopa.selfcare.onboarding.common.InstitutionType;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -19,7 +19,7 @@ public class Institution {
  private String zipCode;
  private String taxCode;
  private String origin;
- private InstitutionType institutionType;
+ private String institutionType;
  private List<Attribute> attributes;
  private List<GeographicTaxonomy> geographicTaxonomies;
  private String category;

diff --git a/...c/main/java/it/pagopa/selfcare/dashboard/connector/model/institution/InstitutionInfo.java b/...c/main/java/it/pagopa/selfcare/dashboard/connector/model/institution/InstitutionInfo.java
@@ -1,6 +1,6 @@
 package it.pagopa.selfcare.dashboard.connector.model.institution;
 
-import it.pagopa.selfcare.commons.base.utils.InstitutionType;
+import it.pagopa.selfcare.onboarding.common.InstitutionType;
 import lombok.Data;
 
 import java.util.List;

diff --git a/...st/src/main/java/it/pagopa/selfcare/dashboard/connector/rest/model/InstitutionUpdate.java b/...st/src/main/java/it/pagopa/selfcare/dashboard/connector/rest/model/InstitutionUpdate.java
@@ -1,6 +1,6 @@
 package it.pagopa.selfcare.dashboard.connector.rest.model;
 
-import it.pagopa.selfcare.commons.base.utils.InstitutionType;
+import it.pagopa.selfcare.onboarding.common.InstitutionType;
 import it.pagopa.selfcare.dashboard.connector.model.institution.AdditionalInformations;
 import it.pagopa.selfcare.dashboard.connector.model.institution.DataProtectionOfficer;
 import it.pagopa.selfcare.dashboard.connector.model.institution.PaymentServiceProvider;

diff --git a/...main/java/it/pagopa/selfcare/dashboard/connector/rest/model/mapper/InstitutionMapper.java b/...main/java/it/pagopa/selfcare/dashboard/connector/rest/model/mapper/InstitutionMapper.java
@@ -1,6 +1,6 @@
 package it.pagopa.selfcare.dashboard.connector.rest.model.mapper;
 
-import it.pagopa.selfcare.commons.base.utils.InstitutionType;
+import it.pagopa.selfcare.onboarding.common.InstitutionType;
 import it.pagopa.selfcare.core.generated.openapi.v1.dto.*;
 import it.pagopa.selfcare.dashboard.connector.model.institution.Billing;
 import it.pagopa.selfcare.dashboard.connector.model.institution.*;

diff --git a/...ain/java/it/pagopa/selfcare/dashboard/connector/rest/model/onboarding/OnboardingData.java b/...ain/java/it/pagopa/selfcare/dashboard/connector/rest/model/onboarding/OnboardingData.java
@@ -1,7 +1,7 @@
 package it.pagopa.selfcare.dashboard.connector.rest.model.onboarding;
 
 import it.pagopa.selfcare.commons.base.security.PartyRole;
-import it.pagopa.selfcare.commons.base.utils.InstitutionType;
+import it.pagopa.selfcare.onboarding.common.InstitutionType;
 import it.pagopa.selfcare.dashboard.connector.model.institution.*;
 import it.pagopa.selfcare.dashboard.connector.rest.model.product.ProductInfo;
 import lombok.Data;

diff --git a/...java/it/pagopa/selfcare/dashboard/connector/rest/model/onboarding/OnboardingPnPGData.java b/...java/it/pagopa/selfcare/dashboard/connector/rest/model/onboarding/OnboardingPnPGData.java
@@ -1,7 +1,7 @@
 package it.pagopa.selfcare.dashboard.connector.rest.model.onboarding;
 
 import it.pagopa.selfcare.commons.base.security.PartyRole;
-import it.pagopa.selfcare.commons.base.utils.InstitutionType;
+import it.pagopa.selfcare.onboarding.common.InstitutionType;
 import it.pagopa.selfcare.dashboard.connector.model.institution.*;
 import it.pagopa.selfcare.dashboard.connector.rest.model.product.PnPGProductInfo;
 import it.pagopa.selfcare.dashboard.connector.rest.model.product.ProductInfo;