[SELC - 5131] cherry-pick of release 1.1.5 (#519)

pagopa · Jun 20, 2024 · e3c24ca · e3c24ca
1 parent 49e3293
commit e3c24ca
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/connector-api/pom.xml b/connector-api/pom.xml
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>it.pagopa.selfcare</groupId>
             <artifactId>onboarding-sdk-product</artifactId>
-            <version>0.1.8</version>
+            <version>0.1.14</version>
         </dependency>
     </dependencies>
 

diff --git a/...r/dao/src/main/java/it/pagopa/selfcare/mscore/connector/dao/InstitutionConnectorImpl.java b/...r/dao/src/main/java/it/pagopa/selfcare/mscore/connector/dao/InstitutionConnectorImpl.java
@@ -301,9 +301,10 @@ public Boolean existsOnboardingByFilters(VerifyOnboardingFilters filters) {
                 .isIfNotNull(InstitutionEntity.Fields.taxCode.name(), filters.getTaxCode())
                 .isIfNotNull(InstitutionEntity.Fields.origin.name(), filters.getOrigin())
                 .isIfNotNull(InstitutionEntity.Fields.originId.name(), filters.getOriginId())
-                .isIfNotNull(InstitutionEntity.Fields.subunitCode.name(), filters.getSubunitCode())
                 .build();
 
+        criteriaInstitution.and(InstitutionEntity.Fields.subunitCode.name()).is(filters.getSubunitCode());
+
         Criteria criteriaOnboarding = Criteria.where(Onboarding.Fields.status.name()).in(filters.getValidRelationshipStates())
                 .and(Onboarding.Fields.productId.name()).is(filters.getProductId());
 

diff --git a/...o/src/test/java/it/pagopa/selfcare/mscore/connector/dao/InstitutionConnectorImplTest.java b/...o/src/test/java/it/pagopa/selfcare/mscore/connector/dao/InstitutionConnectorImplTest.java
@@ -669,6 +669,36 @@ void shouldReturnTrueWhenOnboardingExistsByFilters() {
         assertTrue(exists);
     }
 
+    @Test
+    @DisplayName("Should return true when onboarding exists by filters when subunitCode is null")
+    void shouldReturnTrueWhenOnboardingExistsByFiltersAndSubunitCodeIsNull() {
+        // Given
+        VerifyOnboardingFilters filters = new VerifyOnboardingFilters("productId", "externalId", "taxCode", "origin", "originId", null);
+        filters.setValidRelationshipStates(List.of(RelationshipState.ACTIVE));
+        when(institutionRepository.exists(any(Query.class), any())).thenReturn(true);
+
+        // When
+        Boolean exists = institutionConnectorImpl.existsOnboardingByFilters(filters);
+
+        // Then
+        assertTrue(exists);
+    }
+
+    @Test
+    @DisplayName("Should return false when onboarding exists by filters when subunitCode is null")
+    void shouldReturnFalseWhenOnboardingExistsByFiltersAndSubunitCodeIsNull() {
+        // Given
+        VerifyOnboardingFilters filters = new VerifyOnboardingFilters("productId", "externalId", "taxCode", "origin", "originId", null);
+        filters.setValidRelationshipStates(List.of(RelationshipState.ACTIVE));
+        when(institutionRepository.exists(any(Query.class), any())).thenReturn(false);
+
+        // When
+        Boolean exists = institutionConnectorImpl.existsOnboardingByFilters(filters);
+
+        // Then
+        assertFalse(exists);
+    }
+
     @Test
     @DisplayName("Should return false when onboarding does not exist by filters")
     void shouldReturnFalseWhenOnboardingDoesNotExistByFilters() {