[SELC-5812] feat: Fixed contract path for institution type

pagopa · Nov 14, 2024 · 1647456 · 1647456
1 parent 68c4f0f
commit 1647456
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 6 deletions.
diff --git a/...oarding-functions/src/main/java/it/pagopa/selfcare/onboarding/utils/InstitutionUtils.java b/...oarding-functions/src/main/java/it/pagopa/selfcare/onboarding/utils/InstitutionUtils.java
@@ -11,8 +11,8 @@ public InstitutionUtils() {}
   public static String getCurrentInstitutionType(Onboarding onboarding) {
     String institutionType = Product.CONTRACT_TYPE_DEFAULT;
 
-    if (Objects.isNull(onboarding.getInstitution())
-        || Objects.isNull(onboarding.getInstitution().getInstitutionType())) {
+    if (Objects.nonNull(onboarding.getInstitution())
+        && Objects.nonNull(onboarding.getInstitution().getInstitutionType())) {
       institutionType = onboarding.getInstitution().getInstitutionType().name();
     }
 

diff --git a/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/util/InstitutionUtils.java b/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/util/InstitutionUtils.java
@@ -3,16 +3,15 @@
 import it.pagopa.selfcare.onboarding.entity.Onboarding;
 import it.pagopa.selfcare.product.entity.Product;
 import java.util.Objects;
+import lombok.NoArgsConstructor;
 
+@NoArgsConstructor
 public class InstitutionUtils {
 
-  public InstitutionUtils() {}
-
   public static String getCurrentInstitutionType(Onboarding onboarding) {
     String institutionType = Product.CONTRACT_TYPE_DEFAULT;
 
-    if (Objects.isNull(onboarding.getInstitution())
-        || Objects.isNull(onboarding.getInstitution().getInstitutionType())) {
+    if (Objects.nonNull(onboarding.getInstitution().getInstitutionType())) {
       institutionType = onboarding.getInstitution().getInstitutionType().name();
     }
 

diff --git a/.../onboarding-ms/src/test/java/it/pagopa/selfcare/onboarding/util/InstitutionUtilsTest.java b/.../onboarding-ms/src/test/java/it/pagopa/selfcare/onboarding/util/InstitutionUtilsTest.java
@@ -0,0 +1,58 @@
+package it.pagopa.selfcare.onboarding.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import it.pagopa.selfcare.onboarding.common.InstitutionType;
+import it.pagopa.selfcare.onboarding.common.PartyRole;
+import it.pagopa.selfcare.onboarding.entity.Institution;
+import it.pagopa.selfcare.onboarding.entity.Onboarding;
+import it.pagopa.selfcare.onboarding.entity.User;
+import java.util.List;
+import java.util.UUID;
+import org.junit.jupiter.api.Test;
+
+public class InstitutionUtilsTest {
+
+  @Test
+  void getCurrentInstitutionTypeTest() {
+    // given
+    Onboarding onboarding = createDummyOnboarding();
+
+    // when
+    String result = InstitutionUtils.getCurrentInstitutionType(onboarding);
+
+    // then
+    assertEquals("PSP", result);
+  }
+
+  @Test
+  void getCurrentInstitutionTypeTest_shouldReturnDefault_whenInstitutionTypeIsNull() {
+    // given
+    Onboarding onboarding = createDummyOnboarding();
+    onboarding.getInstitution().setInstitutionType(null);
+
+    // when
+    String result = InstitutionUtils.getCurrentInstitutionType(onboarding);
+
+    // then
+    assertEquals("default", result);
+  }
+
+  private Onboarding createDummyOnboarding() {
+    Onboarding onboarding = new Onboarding();
+    onboarding.setId(UUID.randomUUID().toString());
+    onboarding.setProductId("prod-pagopa");
+
+    Institution institution = new Institution();
+    institution.setTaxCode("taxCode");
+    institution.setSubunitCode("subunitCode");
+    institution.setInstitutionType(InstitutionType.PSP);
+    onboarding.setInstitution(institution);
+
+    User user = new User();
+    user.setId("actual-user-id");
+    user.setRole(PartyRole.MANAGER);
+    onboarding.setUsers(List.of(user));
+    return onboarding;
+  }
+}