manage GPU InstitutionType

pagopa · Dec 18, 2024 · 1732884 · 1732884
1 parent 696be71
commit 1732884
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/connector-api/pom.xml b/connector-api/pom.xml
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>it.pagopa.selfcare</groupId>
             <artifactId>onboarding-sdk-product</artifactId>
-            <version>0.3.3</version>
+            <version>0.6.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>it.pagopa.selfcare</groupId>
             <artifactId>onboarding-sdk-common</artifactId>
-            <version>0.3.3</version>
+            <version>0.6.2</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/connector/rest/docs/openapi/api-selfcare-core-docs.json b/connector/rest/docs/openapi/api-selfcare-core-docs.json
@@ -788,6 +788,15 @@
           "schema" : {
             "type" : "string"
           }
+        }, {
+          "name" : "productId",
+          "in" : "query",
+          "description" : "productId",
+          "required" : false,
+          "style" : "form",
+          "schema" : {
+            "type" : "string"
+          }
         } ],
         "responses" : {
           "200" : {
@@ -2086,7 +2095,7 @@
           "style" : "simple",
           "schema" : {
             "type" : "string",
-            "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP" ]
+            "enum" : [ "AS", "CON", "GPU", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP" ]
           }
         } ],
         "responses" : {
@@ -2736,6 +2745,9 @@
           "institutionFromName" : {
             "type" : "string"
           },
+          "institutionFromRootName" : {
+            "type" : "string"
+          },
           "institutionToName" : {
             "type" : "string"
           },
@@ -2961,7 +2973,7 @@
           },
           "institutionType" : {
             "type" : "string",
-            "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP" ]
+            "enum" : [ "AS", "CON", "GPU", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP" ]
           },
           "subunitCode" : {
             "type" : "string"
@@ -3223,7 +3235,7 @@
           },
           "institutionType" : {
             "type" : "string",
-            "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP" ]
+            "enum" : [ "AS", "CON", "GPU", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP" ]
           },
           "onboarding" : {
             "type" : "array",
@@ -3437,7 +3449,7 @@
           },
           "institutionType" : {
             "type" : "string",
-            "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP" ]
+            "enum" : [ "AS", "CON", "GPU", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP" ]
           },
           "ivassCode" : {
             "type" : "string"

diff --git a/...tor/rest/src/main/java/it/pagopa/selfcare/dashboard/connector/rest/CoreConnectorImpl.java b/...tor/rest/src/main/java/it/pagopa/selfcare/dashboard/connector/rest/CoreConnectorImpl.java
@@ -32,7 +32,6 @@
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 
-import javax.validation.ValidationException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -89,7 +88,7 @@ public List<Institution> getInstitutionsFromTaxCode(String taxCode, String subun
         log.trace("getInstitution start");
         log.debug("getInstitution institutionId = {}", taxCode);
         Assert.hasText(taxCode, REQUIRED_TAX_CODE_MESSAGE);
-        InstitutionsResponse institutions = coreInstitutionApiRestClient._getInstitutionsUsingGET(taxCode, subunitCode, origin, originId).getBody();
+        InstitutionsResponse institutions = coreInstitutionApiRestClient._getInstitutionsUsingGET(taxCode, subunitCode, origin, originId, null).getBody();
         log.debug("getInstitution result = {}", institutions);
         log.trace("getInstitution end");
         Assert.notNull(institutions, NO_INSTITUTION_FOUND);

diff --git a/...rest/src/test/java/it/pagopa/selfcare/dashboard/connector/rest/CoreConnectorImplTest.java b/...rest/src/test/java/it/pagopa/selfcare/dashboard/connector/rest/CoreConnectorImplTest.java
@@ -146,15 +146,15 @@ void getInstitutionsFromTaxCode() throws IOException {
         InstitutionsResponse institutionsResponse = new InstitutionsResponse();
         institutionsResponse.setInstitutions(List.of(institutionMock));
 
-        when(coreInstitutionApiRestClient._getInstitutionsUsingGET(institutionMock.getTaxCode(), null, null, null))
+        when(coreInstitutionApiRestClient._getInstitutionsUsingGET(institutionMock.getTaxCode(), null, null, null, null))
                 .thenReturn(ResponseEntity.of(Optional.of(institutionsResponse)));
         // when
         List<Institution> institutions = msCoreConnector.getInstitutionsFromTaxCode(institutionMock.getTaxCode(), null, null, null);
         // then
 
         assertEquals(institutions.get(0), institutionMapperSpy.toInstitution(institutionMock));
         verify(coreInstitutionApiRestClient, times(1))
-                ._getInstitutionsUsingGET(institutionMock.getTaxCode(), null, null, null);
+                ._getInstitutionsUsingGET(institutionMock.getTaxCode(), null, null, null, null);
     }
 
     @Test

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
     <description>Self Care Dashboard Backend</description>
 
     <properties>
-        <selc-commons.version>2.5.4</selc-commons.version>
+        <selc-commons.version>2.5.5</selc-commons.version>
         <sonar.host.url>https://sonarcloud.io/</sonar.host.url>
     </properties>
 

diff --git a/web/pom.xml b/web/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>it.pagopa.selfcare</groupId>
             <artifactId>onboarding-sdk-product</artifactId>
-            <version>0.3.2</version>
+            <version>0.6.2</version>
             <scope>compile</scope>
         </dependency>