[SELC - 5131] fix: fixed filters in verify onboarding (#517)

connector/dao/src/main/java/it/pagopa/selfcare/mscore/connector/dao/InstitutionConnectorImpl.java

@@ -308,9 +308,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());
 

connector/dao/src/test/java/it/pagopa/selfcare/mscore/connector/dao/InstitutionConnectorImplTest.java

@@ -789,6 +789,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() {