Fix unit tests

pagopa · Aug 28, 2024 · 05a14a4 · 05a14a4
1 parent 95735d6
commit 05a14a4
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 16 deletions.
diff --git a/...boarding-ms/src/main/java/it/pagopa/selfcare/onboarding/service/util/OnboardingUtils.java b/...boarding-ms/src/main/java/it/pagopa/selfcare/onboarding/service/util/OnboardingUtils.java
@@ -1,7 +1,6 @@
 package it.pagopa.selfcare.onboarding.service.util;
 
 import io.smallrye.mutiny.Uni;
-import it.pagopa.selfcare.onboarding.common.InstitutionPaSubunitType;
 import it.pagopa.selfcare.onboarding.common.InstitutionType;
 import it.pagopa.selfcare.onboarding.common.ProductId;
 import it.pagopa.selfcare.onboarding.constants.CustomError;
@@ -20,6 +19,8 @@
 
 import java.util.Objects;
 
+import static it.pagopa.selfcare.onboarding.common.InstitutionPaSubunitType.EC;
+import static it.pagopa.selfcare.onboarding.common.InstitutionPaSubunitType.UO;
 import static it.pagopa.selfcare.onboarding.constants.CustomError.*;
 
 @ApplicationScoped
@@ -32,7 +33,7 @@ public class OnboardingUtils {
     @RestClient
     @Inject
     AooApi aooApi;
-
+    private static final String DEFAULT_VALUE = "EC";
     private static final String ADDITIONAL_INFORMATION_REQUIRED = "Additional Information is required when institutionType is GSP and productId is pagopa";
     private static final String OTHER_NOTE_REQUIRED = "Other Note is required when other boolean are false";
     private static final String BILLING_OR_RECIPIENT_CODE_REQUIRED = "Billing and/or recipient code are required";
@@ -66,7 +67,8 @@ private Uni<Void> checkRecipientCode(Onboarding onboarding) {
     }
 
     private Uni<CustomError> validationRecipientCode(Onboarding onboarding, UOResource uoResource) {
-        switch (onboarding.getInstitution().getSubunitType()) {
+
+        switch ((onboarding.getInstitution().getSubunitType() != null) ? onboarding.getInstitution().getSubunitType() : EC ) {
             case AOO -> {
                 return aooApi.findByUnicodeUsingGET(onboarding.getInstitution().getSubunitCode(), null)
                         .onItem().transformToUni(aooResource -> getValidationRecipientCodeError(aooResource.getCodiceIpa(), uoResource));
@@ -154,7 +156,7 @@ private Uni<Onboarding> additionalChecksForProduct(Onboarding onboarding, Produc
 
     private boolean isUO(Onboarding onboarding) {
         return Objects.nonNull(onboarding.getInstitution().getSubunitCode())
-                && onboarding.getInstitution().getSubunitType().equals(InstitutionPaSubunitType.UO)
+                && UO.equals(onboarding.getInstitution().getSubunitType())
                 && Objects.nonNull(onboarding.getBilling())
                 && Objects.nonNull(onboarding.getBilling().getTaxCodeInvoicing())
                 && Objects.nonNull(onboarding.getInstitution().getTaxCode());

diff --git a/...ding-ms/src/test/java/it/pagopa/selfcare/onboarding/service/util/OnboardingUtilsTest.java b/...ding-ms/src/test/java/it/pagopa/selfcare/onboarding/service/util/OnboardingUtilsTest.java
@@ -18,7 +18,10 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import org.openapi.quarkus.party_registry_proxy_json.api.AooApi;
 import org.openapi.quarkus.party_registry_proxy_json.api.UoApi;
+import org.openapi.quarkus.party_registry_proxy_json.model.AOOResource;
+import org.openapi.quarkus.party_registry_proxy_json.model.AOOsResource;
 import org.openapi.quarkus.party_registry_proxy_json.model.UOResource;
 import org.openapi.quarkus.party_registry_proxy_json.model.UOsResource;
 import org.wildfly.common.Assert;
@@ -34,6 +37,11 @@ public class OnboardingUtilsTest {
     @InjectMock
     @RestClient
     UoApi uoApi;
+
+    @InjectMock
+    @RestClient
+    AooApi aooApi;
+
     @Inject
     OnboardingUtils onboardingUtils;
 
@@ -219,21 +227,28 @@ void checkRecipientCodeNoBilling() {
         institution.setSubunitType(InstitutionPaSubunitType.AOO);
         institution.setInstitutionType(InstitutionType.PA);
         institution.setTaxCode("taxCode");
-        UOResource uoResource = new UOResource();
-        uoResource.setCodiceFiscaleEnte("taxCode");
-        uoResource.setCodiceIpa("ipaCode");
+        AOOResource resource = new AOOResource();
+        resource.setCodiceFiscaleEnte("taxCode");
+        resource.setCodiceIpa("ipaCode");
         onboarding.setInstitution(institution);
         onboarding.setProductId(ProductId.PROD_IO_SIGN.getValue());
         Billing billing = new Billing();
         billing.setTaxCodeInvoicing("taxCodeInvoicing");
         billing.setRecipientCode("recipientCode");
         onboarding.setBilling(billing);
 
+        UOResource uoResource = new UOResource();
+        uoResource.setCodiceIpa("ipaCode");
+        uoResource.setCodiceFiscaleEnte("taxCode1");
+
         when(uoApi.findByUnicodeUsingGET1(any(), any()))
                 .thenReturn(Uni.createFrom().item(uoResource));
 
-        UOsResource uOsResource = new UOsResource();
-        uOsResource.setItems(List.of(uoResource));
+        when(aooApi.findByUnicodeUsingGET(any(), any()))
+                .thenReturn(Uni.createFrom().item(resource));
+
+        AOOsResource uOsResource = new AOOsResource();
+        uOsResource.setItems(List.of(resource));
 
         UniAssertSubscriber<Onboarding> subscriber = onboardingUtils
                 .customValidationOnboardingData(onboarding, dummyProduct())
@@ -253,22 +268,29 @@ void checkRecipientCodeNoAssociation() {
         institution.setSubunitType(InstitutionPaSubunitType.AOO);
         institution.setInstitutionType(InstitutionType.PA);
         institution.setTaxCode("taxCode");
-        UOResource uoResource = new UOResource();
-        uoResource.setCodiceFiscaleEnte("taxCode");
-        uoResource.setCodiceIpa("ipaCode");
-        uoResource.setCodiceFiscaleSfe("taxCodeInvoicing");
+        AOOResource aooResource = new AOOResource();
+        aooResource.setCodiceFiscaleEnte("taxCode");
+        aooResource.setCodiceIpa("ipaCode");
         onboarding.setInstitution(institution);
         onboarding.setProductId(ProductId.PROD_IO_SIGN.getValue());
         Billing billing = new Billing();
         billing.setTaxCodeInvoicing("taxCodeInvoicing");
         billing.setRecipientCode("recipientCode");
         onboarding.setBilling(billing);
 
+        UOResource uoResource = new UOResource();
+        uoResource.setCodiceIpa("customIpaCode");
+        uoResource.setCodiceFiscaleEnte("taxCode1");
+        uoResource.setCodiceFiscaleSfe("taxCodeInvoicing1");
+
         when(uoApi.findByUnicodeUsingGET1(any(), any()))
                 .thenReturn(Uni.createFrom().item(uoResource));
 
-        UOsResource uOsResource = new UOsResource();
-        uOsResource.setItems(List.of(uoResource));
+        when(aooApi.findByUnicodeUsingGET(any(), any()))
+                .thenReturn(Uni.createFrom().item(aooResource));
+
+        AOOsResource uOsResource = new AOOsResource();
+        uOsResource.setItems(List.of(aooResource));
 
         UniAssertSubscriber<Onboarding> subscriber = onboardingUtils
                 .customValidationOnboardingData(onboarding, dummyProduct())
@@ -285,7 +307,6 @@ void checkRecipientCodeSuccess() {
         Institution institution = new Institution();
         institution.setOriginId("ipaCode");
         institution.setSubunitCode("subunitCode");
-        institution.setSubunitType(InstitutionPaSubunitType.AOO);
         institution.setInstitutionType(InstitutionType.PA);
         institution.setTaxCode("taxCode");
         UOResource uoResource = new UOResource();