fix: updated RegistryManagerPDNDInfocamere logic (#956)

Author: gianmarcoplutino

apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/entity/registry/RegistryManagerPDNDInfocamere.java

@@ -39,10 +39,10 @@ public RegistryManagerPDNDInfocamere(Onboarding onboarding, InfocamerePdndApi in
     @Override
     public Uni<Onboarding> customValidation(Product product) {
         if (isIdPayMerchantProduct(product)) {
-            return validateAtecoCodes();
-        }
-        if (isPrivatePersonInstitution()) {
-            return manageTaxCode();
+            return validateAtecoCodes()
+                    .chain(() -> isPrivatePersonInstitution()
+                            ? manageTaxCode()
+                            : Uni.createFrom().item(onboarding));
         }
         return Uni.createFrom().item(onboarding);
     }
@@ -108,7 +108,7 @@ private Onboarding updateOnboardingWithUserId(Onboarding onboarding, String user
      */
     private Uni<Onboarding> validateAtecoCodes() {
         List<String> institutionAtecoCodes = onboarding.getInstitution().getAtecoCodes();
-        
+
         if (Objects.isNull(institutionAtecoCodes) || institutionAtecoCodes.isEmpty()) {
             return Uni.createFrom().failure(new InvalidRequestException("Institution must have at least one ATECO code"));
         }

apps/onboarding-ms/src/test/java/it/pagopa/selfcare/onboarding/entity/registry/RegistryManagerPDNDInfocamereTest.java

@@ -191,13 +191,25 @@ void customValidation_withIdPayMerchantProduct_noAllowedAtecoCodes() {
     @Test
     void customValidation_withPrivatePersonInstitution_userSearchSuccessful() {
         // given
+        String taxCode = "RSSMRA80A01H501T";
+        String allowedAtecoCodes = "01.11.00";
         onboarding.getInstitution().setInstitutionType(InstitutionType.PRV_PF);
-        onboarding.getInstitution().setTaxCode("RSSMRA80A01H501T");
+        onboarding.getInstitution().setTaxCode(taxCode);
+        onboarding.getInstitution().setAtecoCodes(List.of("01.11.00"));
+
+        when(product.getId()).thenReturn("prod-idpay-merchant");
+
+        PDNDBusinessResource pdndResource = new PDNDBusinessResource();
+        pdndResource.setAtecoCodes(List.of("01.11.00"));
+
+        when(pdndVisuraInfoCamereControllerApi.institutionVisuraPdndByTaxCodeUsingGET(taxCode))
+                .thenReturn(Uni.createFrom().item(pdndResource));
+
         registryManager = new RegistryManagerPDNDInfocamere(
                 onboarding,
                 infocamerePdndApi,
                 userRegistryApi,
-                Optional.empty(),
+                Optional.of(allowedAtecoCodes),
                 pdndVisuraInfoCamereControllerApi
         );
 
@@ -222,13 +234,25 @@ void customValidation_withPrivatePersonInstitution_userSearchSuccessful() {
     @Test
     void customValidation_withPrivatePersonInstitution_userSearchThrowsException() {
         // given
+        String taxCode = "RSSMRA80A01H501T";
+        String allowedAtecoCodes = "01.11.00";
         onboarding.getInstitution().setInstitutionType(InstitutionType.PRV_PF);
-        onboarding.getInstitution().setTaxCode("RSSMRA80A01H501T");
+        onboarding.getInstitution().setTaxCode(taxCode);
+        onboarding.getInstitution().setAtecoCodes(List.of("01.11.00"));
+
+        when(product.getId()).thenReturn("prod-idpay-merchant");
+
+        PDNDBusinessResource pdndResource = new PDNDBusinessResource();
+        pdndResource.setAtecoCodes(List.of("01.11.00"));
+
+        when(pdndVisuraInfoCamereControllerApi.institutionVisuraPdndByTaxCodeUsingGET(taxCode))
+                .thenReturn(Uni.createFrom().item(pdndResource));
+
         registryManager = new RegistryManagerPDNDInfocamere(
                 onboarding,
                 infocamerePdndApi,
                 userRegistryApi,
-                Optional.empty(),
+                Optional.of(allowedAtecoCodes),
                 pdndVisuraInfoCamereControllerApi
         );