feat: move validRoles to new ProductUtils class

pagopa · Oct 1, 2024 · 92323ba · 92323ba
1 parent 75c0938
commit 92323ba
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 13 deletions.
diff --git a/...ding-ms/src/main/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceDefault.java b/...ding-ms/src/main/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceDefault.java
@@ -73,6 +73,7 @@
 import static it.pagopa.selfcare.onboarding.common.ProductId.PROD_PAGOPA;
 import static it.pagopa.selfcare.onboarding.constants.CustomError.*;
 import static it.pagopa.selfcare.onboarding.util.ErrorMessage.*;
+import static it.pagopa.selfcare.product.utils.ProductUtils.validRoles;
 
 @ApplicationScoped
 public class OnboardingServiceDefault implements OnboardingService {
@@ -304,8 +305,8 @@ private Uni<OnboardingUtils.ProxyResource> getRegistryResource(Onboarding onboar
     private Uni<Onboarding> persistOnboarding(Onboarding onboarding, List<UserRequest> userRequests, Product product, List<AggregateInstitutionRequest>aggregates) {
         /* I have to retrieve onboarding id for saving reference to pdv */
         return Panache.withTransaction(() -> Onboarding.persist(onboarding).replaceWith(onboarding)
-                .onItem().transformToUni(onboardingPersisted -> validationRole(userRequests, validRoles(product))
-                        .onItem().transformToUni(ignore -> validateUserAggregatesRoles(aggregates, validRoles(product)))
+                .onItem().transformToUni(onboardingPersisted -> validationRole(userRequests, validRoles(product, PHASE_ADDITION_ALLOWED.ONBOARDING))
+                        .onItem().transformToUni(ignore -> validateUserAggregatesRoles(aggregates, validRoles(product, PHASE_ADDITION_ALLOWED.ONBOARDING)))
                         .onItem().transformToUni(ignore -> retrieveAndSetUserAggregatesResources(onboardingPersisted, product, aggregates))
                         .onItem().transformToUni(ignore -> retrieveUserResources(userRequests, product))
                         .onItem().invoke(onboardingPersisted::setUsers).replaceWith(onboardingPersisted)));
@@ -549,14 +550,6 @@ private String retrieveProductRole(UserRequest userInfo, Map<PartyRole, ProductR
         }
     }
 
-    private List<PartyRole> validRoles(Product product) {
-        return product.getRoleMappings().entrySet().stream()
-                .filter(entry -> Objects.nonNull(entry.getValue().getPhasesAdditionAllowed()) &&
-                        entry.getValue().getPhasesAdditionAllowed().contains(PHASE_ADDITION_ALLOWED.ONBOARDING))
-                .map(Map.Entry::getKey)
-                .collect(Collectors.toList());
-    }
-
     private Uni<List<UserRequest>> validationRole(List<UserRequest> users, List<PartyRole> validRoles) {
 
         List<UserRequest> usersNotValidRole = users.stream()

diff --git a/...-ms/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceDefaultTest.java b/...-ms/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceDefaultTest.java
@@ -33,6 +33,7 @@
 import it.pagopa.selfcare.onboarding.service.profile.OnboardingTestProfile;
 import it.pagopa.selfcare.onboarding.service.strategy.OnboardingValidationStrategy;
 import it.pagopa.selfcare.onboarding.service.util.OnboardingUtils;
+import it.pagopa.selfcare.product.entity.PHASE_ADDITION_ALLOWED;
 import it.pagopa.selfcare.product.entity.Product;
 import it.pagopa.selfcare.product.entity.ProductRole;
 import it.pagopa.selfcare.product.entity.ProductRoleInfo;
@@ -969,6 +970,7 @@ Product createDummyProduct(String productId, boolean hasParent) {
         productRole.setCode("admin");
         ProductRoleInfo productRoleInfo = new ProductRoleInfo();
         productRoleInfo.setRoles(List.of(productRole));
+        productRoleInfo.setPhasesAdditionAllowed(List.of(PHASE_ADDITION_ALLOWED.ONBOARDING.value));
         roleMapping.put(manager.getRole(), productRoleInfo);
         productResource.setRoleMappings(roleMapping);
 

diff --git a/...boarding-sdk-product/src/main/java/it/pagopa/selfcare/product/entity/ProductRoleInfo.java b/...boarding-sdk-product/src/main/java/it/pagopa/selfcare/product/entity/ProductRoleInfo.java
@@ -9,7 +9,7 @@ public class ProductRoleInfo {
     /**
      * List of phases where addition of the role is allowed
      */
-    private List<PHASE_ADDITION_ALLOWED> phasesAdditionAllowed;
+    private List<String> phasesAdditionAllowed;
     private List<ProductRole> roles;
 
     public boolean isMultiroleAllowed() {
@@ -20,11 +20,11 @@ public void setMultiroleAllowed(boolean multiroleAllowed) {
         this.multiroleAllowed = multiroleAllowed;
     }
 
-    public List<PHASE_ADDITION_ALLOWED> getPhasesAdditionAllowed() {
+    public List<String> getPhasesAdditionAllowed() {
         return phasesAdditionAllowed;
     }
 
-    public void setPhasesAdditionAllowed(List<PHASE_ADDITION_ALLOWED> phasesAdditionAllowed) {
+    public void setPhasesAdditionAllowed(List<String> phasesAdditionAllowed) {
         this.phasesAdditionAllowed = phasesAdditionAllowed;
     }
 

diff --git a/libs/onboarding-sdk-product/src/main/java/it/pagopa/selfcare/product/utils/ProductUtils.java b/libs/onboarding-sdk-product/src/main/java/it/pagopa/selfcare/product/utils/ProductUtils.java
@@ -0,0 +1,34 @@
+package it.pagopa.selfcare.product.utils;
+
+import it.pagopa.selfcare.onboarding.common.PartyRole;
+import it.pagopa.selfcare.product.entity.PHASE_ADDITION_ALLOWED;
+import it.pagopa.selfcare.product.entity.Product;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+public class ProductUtils {
+
+    /**
+     * Returns list of product's PartyRole associates with that PHASE_ADDITION_ALLOWED
+     * @param product Product
+     * @param phase phase
+     * @return List<PartyRole>
+     */
+    public static List<PartyRole> validRoles(Product product, PHASE_ADDITION_ALLOWED phase) {
+        if (Objects.isNull(product)) {
+            throw new IllegalArgumentException("Product must not be null!");
+        }
+        return Optional.ofNullable(product.getRoleMappings())
+                .orElse(Map.of())
+                .entrySet().stream()
+                .filter(entry -> Objects.nonNull(entry.getValue().getPhasesAdditionAllowed()) &&
+                        entry.getValue().getPhasesAdditionAllowed().contains(phase.value))
+                .map(Map.Entry::getKey)
+                .collect(Collectors.toList());
+
+    }
+}