[SELC-5629] feat: Associate Product Roles by InstitutionType

apps/onboarding-functions/pom.xml

@@ -193,17 +193,17 @@
     <dependency>
       <groupId>it.pagopa.selfcare</groupId>
       <artifactId>onboarding-sdk-crypto</artifactId>
-      <version>0.2.3</version>
+      <version>0.3.0</version>
     </dependency>
     <dependency>
       <groupId>it.pagopa.selfcare</groupId>
       <artifactId>onboarding-sdk-azure-storage</artifactId>
-      <version>0.2.3</version>
+      <version>0.3.0</version>
     </dependency>
     <dependency>
       <groupId>it.pagopa.selfcare</groupId>
       <artifactId>onboarding-sdk-product</artifactId>
-      <version>0.2.3</version>
+      <version>0.3.0</version>
     </dependency>
   </dependencies>
   <build>

apps/onboarding-ms/pom.xml

@@ -237,12 +237,12 @@
         <dependency>
             <groupId>it.pagopa.selfcare</groupId>
             <artifactId>onboarding-sdk-azure-storage</artifactId>
-            <version>0.2.3</version>
+            <version>0.3.0</version>
         </dependency>
         <dependency>
             <groupId>it.pagopa.selfcare</groupId>
             <artifactId>onboarding-sdk-product</artifactId>
-            <version>0.2.3</version>
+            <version>0.3.0</version>
         </dependency>
 
     </dependencies>

apps/onboarding-ms/src/main/docs/openapi.json

@@ -1494,6 +1494,9 @@
           "subunitType" : {
             "type" : "string"
           },
+          "vatNumber" : {
+            "type" : "string"
+          },
           "geographicTaxonomies" : {
             "type" : "array",
             "items" : {

apps/onboarding-ms/src/main/docs/openapi.yaml

@@ -1096,6 +1096,8 @@ components:
           type: string
         subunitType:
           type: string
+        vatNumber:
+          type: string
         geographicTaxonomies:
           type: array
           items:

apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceDefault.java

@@ -175,6 +175,7 @@ public Uni<OnboardingResponse> onboardingUsers(OnboardingUserRequest request, St
                 .onItem().transform(response -> institutionMapper.toEntity(response))
                 .onItem().transform(institution -> {
                     Onboarding onboarding = onboardingMapper.toEntity(request, userId);
+                    institution.setInstitutionType(request.getInstitutionType());
                     onboarding.setInstitution(institution);
                     onboarding.setExpiringDate(OffsetDateTime.now().plusDays(onboardingExpireDate).toLocalDateTime());
                     return onboarding;
@@ -303,12 +304,19 @@ private Uni<OnboardingUtils.ProxyResource> getRegistryResource(Onboarding onboar
     }
 
     private Uni<Onboarding> persistOnboarding(Onboarding onboarding, List<UserRequest> userRequests, Product product, List<AggregateInstitutionRequest>aggregates) {
+
+        Log.infof("persist onboarding for: product %s, product parent %s", product.getId(), product.getParentId());
+
+        Map<PartyRole, ProductRoleInfo> roleMappings = Objects.nonNull(product.getParent())
+                ? product.getParent().getRoleMappings(onboarding.getInstitution().getInstitutionType().name())
+                : product.getRoleMappings(onboarding.getInstitution().getInstitutionType().name());
+
         /* 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, PHASE_ADDITION_ALLOWED.ONBOARDING))
-                        .onItem().transformToUni(ignore -> validateUserAggregatesRoles(aggregates, validRoles(product, PHASE_ADDITION_ALLOWED.ONBOARDING)))
+                .onItem().transformToUni(onboardingPersisted -> validationRole(userRequests, validRoles(product, PHASE_ADDITION_ALLOWED.ONBOARDING, onboarding.getInstitution().getInstitutionType()))
+                        .onItem().transformToUni(ignore -> validateUserAggregatesRoles(aggregates, validRoles(product, PHASE_ADDITION_ALLOWED.ONBOARDING, onboarding.getInstitution().getInstitutionType())))
                         .onItem().transformToUni(ignore -> retrieveAndSetUserAggregatesResources(onboardingPersisted, product, aggregates))
-                        .onItem().transformToUni(ignore -> retrieveUserResources(userRequests, product))
+                        .onItem().transformToUni(ignore -> retrieveUserResources(userRequests, roleMappings))
                         .onItem().invoke(onboardingPersisted::setUsers).replaceWith(onboardingPersisted)));
     }
 
@@ -580,12 +588,18 @@ private Uni<Void> validateUserAggregatesRoles(List<AggregateInstitutionRequest>
     }
 
     private Uni<Void> retrieveAndSetUserAggregatesResources(Onboarding onboarding, Product product, List<AggregateInstitutionRequest> aggregates) {
-        LOG.debug("Retrieving user resources for aggregates");
+
+        Log.infof("Retrieving user resources for aggregates: product %s, product parent %s", product.getId(), product.getParentId());
+
+        Map<PartyRole, ProductRoleInfo> roleMappings = Objects.nonNull(product.getParent())
+                ? product.getParent().getRoleMappings(onboarding.getInstitution().getInstitutionType().name())
+                : product.getRoleMappings(onboarding.getInstitution().getInstitutionType().name());
+
         if (!CollectionUtils.isEmpty(aggregates)) {
             return Multi.createFrom().iterable(aggregates)
                     .filter(aggregate -> !CollectionUtils.isEmpty(aggregate.getUsers()))
                     .onItem().invoke(aggregate -> LOG.debugf("Retrieving user resources for aggregate: %s", aggregate.getTaxCode()))
-                    .onItem().transformToUni(aggregate -> retrieveUserResources(aggregate.getUsers(), product)
+                    .onItem().transformToUni(aggregate -> retrieveUserResources(aggregate.getUsers(), roleMappings)
                             .onFailure().invoke(throwable -> LOG.errorf("Error during retrieving user resources for aggregate: %s", aggregate.getTaxCode(), throwable))
                             .onItem().invoke(users -> setUsersInAggregateToPersist(onboarding, aggregate, users)))
                     .concatenate().onItem().ignoreAsUni();
@@ -601,13 +615,7 @@ private static void setUsersInAggregateToPersist(Onboarding onboarding, Aggregat
                 .ifPresent(aggregateInstitutionRequest -> aggregateInstitutionRequest.setUsers(users));
     }
 
-    private Uni<List<User>> retrieveUserResources(List<UserRequest> users, Product product) {
-
-        Log.infof("Retrieving user resources for: product %s, product parent %s", product.getId(), product.getParentId());
-
-        Map<PartyRole, ProductRoleInfo> roleMappings = Objects.nonNull(product.getParent())
-                ? product.getParent().getRoleMappings()
-                : product.getRoleMappings();
+    private Uni<List<User>> retrieveUserResources(List<UserRequest> users,  Map<PartyRole, ProductRoleInfo> roleMappings) {
 
         return Multi.createFrom().iterable(users)
                 .onItem().transformToUni(user -> userRegistryApi

apps/onboarding-ms/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceDefaultTest.java

@@ -150,6 +150,9 @@ class OnboardingServiceDefaultTest {
     static final UserResource managerResourceWk;
     static final UserResource managerResourceWkSpid;
 
+    static final String productRoleAdminCode = "admin";
+    static final String productRoleAdminPspCode = "admin-psp";
+
     static final File testFile = new File("src/test/resources/application.properties");
 
     static final FormItem TEST_FORM_ITEM = FormItem.builder()
@@ -411,7 +414,7 @@ void onboardingPa_throwExceptionIfProductParentRoleIsNotValid(UniAsserter assert
     @RunOnVertxContext
     void onboarding_shouldThrowExceptionIfRoleNotValid(UniAsserter asserter) {
         Onboarding onboardingDefaultRequest = new Onboarding();
-        onboardingDefaultRequest.setInstitution(new Institution());
+        onboardingDefaultRequest.setInstitution(dummyInstitution());
         onboardingDefaultRequest.setProductId(PROD_INTEROP.getValue());
 
         List<UserRequest> users = List.of(UserRequest.builder()
@@ -962,25 +965,29 @@ Product mockSimpleProductValidAssert(String productId, boolean hasParent, UniAss
         return productResource;
     }
 
-    Product createDummyProduct(String productId, boolean hasParent) {
-        Product productResource = new Product();
-        productResource.setId(productId);
-        Map<PartyRole, ProductRoleInfo> roleMapping = new HashMap<>();
+    ProductRoleInfo dummyProductRoleInfo(String productRolCode) {
         ProductRole productRole = new ProductRole();
-        productRole.setCode("admin");
+        productRole.setCode(productRolCode);
         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);
+        return productRoleInfo;
+    }
+
+    Product createDummyProduct(String productId, boolean hasParent) {
+
+        Map<PartyRole, ProductRoleInfo> roleMappingByInstitutionType = new HashMap<>();
+        roleMappingByInstitutionType.put(manager.getRole(), dummyProductRoleInfo(productRoleAdminPspCode));
+
+        Product productResource = new Product();
+        productResource.setId(productId);
+        productResource.setRoleMappings(Map.of(manager.getRole(), dummyProductRoleInfo(productRoleAdminCode)));
+        productResource.setRoleMappingsByInstitutionType(Map.of(InstitutionType.PSP.name(), roleMappingByInstitutionType));
 
         if (hasParent) {
             Product parent = new Product();
             parent.setId("productParentId");
-            Map<PartyRole, ProductRoleInfo> roleParentMapping = new HashMap<>();
-            roleParentMapping.put(manager.getRole(), productRoleInfo);
-            parent.setRoleMappings(roleParentMapping);
-
+            parent.setRoleMappings(Map.of(manager.getRole(), dummyProductRoleInfo(productRoleAdminCode)));
             productResource.setParentId(parent.getId());
             productResource.setParent(parent);
         }
@@ -1045,14 +1052,19 @@ void onboardingPsp_whenUserFoundedAndWillNotUpdateAndProductHasParent(UniAsserte
         });
     }
 
+    Institution dummyInstitution() {
+        Institution institution = new Institution();
+        institution.setInstitutionType(InstitutionType.SA);
+        return institution;
+    }
 
     @Test
     @RunOnVertxContext
     void onboarding_whenUserFoundedAndWillNotUpdate(UniAsserter asserter) {
         Onboarding onboardingDefaultRequest = new Onboarding();
         List<UserRequest> users = List.of(manager);
         onboardingDefaultRequest.setProductId("productId");
-        onboardingDefaultRequest.setInstitution(new Institution());
+        onboardingDefaultRequest.setInstitution(dummyInstitution());
 
         mockPersistOnboarding(asserter);
         mockSimpleSearchPOSTAndPersist(asserter);
@@ -1203,7 +1215,7 @@ void onboarding_whenUserNotFoundedAndWillSave(UniAsserter asserter) {
         Onboarding request = new Onboarding();
         List<UserRequest> users = List.of(manager);
         request.setProductId("productId");
-        request.setInstitution(new Institution());
+        request.setInstitution(dummyInstitution());
         final UUID createUserId = UUID.randomUUID();
 
         mockPersistOnboarding(asserter);
@@ -1242,7 +1254,7 @@ void onboarding_whenUserNotFoundedAndWillSave(UniAsserter asserter) {
     @RunOnVertxContext
     void onboarding_shouldThrowExceptionIfUserRegistryFails(UniAsserter asserter) {
         Onboarding onboardingDefaultRequest = new Onboarding();
-        onboardingDefaultRequest.setInstitution(new Institution());
+        onboardingDefaultRequest.setInstitution(dummyInstitution());
         onboardingDefaultRequest.setProductId(PROD_INTEROP.getValue());
         List<UserRequest> users = List.of(manager);
 
@@ -1820,6 +1832,7 @@ void onboarding_aggregationCompletion(UniAsserter asserter) {
         request.setProductId(PROD_IO.getValue());
         Institution institutionBaseRequest = new Institution();
         institutionBaseRequest.setTaxCode("taxCode");
+        institutionBaseRequest.setInstitutionType(InstitutionType.SA);
         request.setInstitution(institutionBaseRequest);
 
         mockPersistOnboarding(asserter);
@@ -1855,6 +1868,7 @@ void onboardingUsers(UniAsserter asserter) {
         List<UserRequest> users = List.of(manager);
         request.setProductId(PROD_INTEROP.getValue());
         request.setUsers(users);
+        request.setInstitutionType(InstitutionType.PA);
         mockPersistOnboarding(asserter);
         mockPersistToken(asserter);
 

apps/pom.xml

@@ -16,7 +16,7 @@
         <dependency>
             <groupId>it.pagopa.selfcare</groupId>
             <artifactId>onboarding-sdk-common</artifactId>
-            <version>0.2.3</version>
+            <version>0.3.0</version>
         </dependency>
     </dependencies>
 

libs/onboarding-sdk-azure-storage/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>it.pagopa.selfcare</groupId>
         <artifactId>onboarding-sdk-pom</artifactId>
-        <version>0.2.3</version>
+        <version>0.3.0</version>
         <relativePath>../onboarding-sdk-pom</relativePath>
     </parent>
 

libs/onboarding-sdk-common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>it.pagopa.selfcare</groupId>
         <artifactId>onboarding-sdk-pom</artifactId>
-        <version>0.2.3</version>
+        <version>0.3.0</version>
         <relativePath>../onboarding-sdk-pom</relativePath>
     </parent>
     <artifactId>onboarding-sdk-common</artifactId>

libs/onboarding-sdk-crypto/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>it.pagopa.selfcare</groupId>
         <artifactId>onboarding-sdk-pom</artifactId>
-        <version>0.2.3</version>
+        <version>0.3.0</version>
         <relativePath>../onboarding-sdk-pom</relativePath>
     </parent>
     <artifactId>onboarding-sdk-crypto</artifactId>

libs/onboarding-sdk-pom/pom.xml

@@ -6,7 +6,7 @@
     <artifactId>onboarding-sdk-pom</artifactId>
     <packaging>pom</packaging>
     <name>onboarding-sdk-pom</name>
-    <version>0.2.3</version>
+    <version>0.3.0</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

libs/onboarding-sdk-product/pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <groupId>it.pagopa.selfcare</groupId>
         <artifactId>onboarding-sdk-pom</artifactId>
-        <version>0.2.3</version>
+        <version>0.3.0</version>
         <relativePath>../onboarding-sdk-pom</relativePath>
     </parent>
     <artifactId>onboarding-sdk-product</artifactId>
     <name>onboarding-sdk-product</name>
-    <version>0.2.3</version>
+    <version>0.3.0</version>
 
     <properties>
         <jackson.version>2.15.2</jackson.version>

libs/onboarding-sdk-product/src/main/java/it/pagopa/selfcare/product/entity/Product.java

@@ -3,9 +3,7 @@
 import it.pagopa.selfcare.onboarding.common.PartyRole;
 
 import java.time.Instant;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 public class Product {
 
@@ -22,6 +20,7 @@ public class Product {
     private Instant modifiedAt;
     private String modifiedBy;
     private Map<PartyRole, ProductRoleInfo> roleMappings;
+    private Map<String, Map<PartyRole, ProductRoleInfo>> roleMappingsByInstitutionType;
     private String roleManagementURL;
     private Instant contractTemplateUpdatedAt;
     private String contractTemplatePath;
@@ -136,14 +135,40 @@ public void setModifiedBy(String modifiedBy) {
         this.modifiedBy = modifiedBy;
     }
 
-    public Map<PartyRole, ProductRoleInfo> getRoleMappings() {
+    /**
+     * This method returns roleMappings associate with a specific InstitutionType on roleMappingsByInstitutionType map.
+     * In case none InstitutionType exists on roleMappingsByInstitutionType, it returns roleMappings.
+     * @param institutionType InstitutionType
+     * @return Map<PartyRole, ProductRoleInfo>
+     */
+    public Map<PartyRole, ProductRoleInfo> getRoleMappings(String institutionType) {
+        if(Objects.nonNull(institutionType) && Objects.nonNull(roleMappingsByInstitutionType)
+                && roleMappingsByInstitutionType.containsKey(institutionType)){
+            return roleMappingsByInstitutionType.get(institutionType);
+        }
         return roleMappings;
     }
 
+    public Map<PartyRole, List<ProductRoleInfo>> getAllRoleMappings() {
+        Map<PartyRole, List<ProductRoleInfo>> roleInfoMap = new HashMap<>();
+        Optional.ofNullable(roleMappings)
+                .ifPresent(roleMappings -> roleMappings.forEach((key, value) -> roleInfoMap.put(key, List.of(value))));
+        Optional.ofNullable(roleMappingsByInstitutionType)
+                .map(Map::values)
+                .ifPresent(items -> items.stream()
+                        .map(Map::entrySet)
+                        .forEach(item -> item.forEach(entry -> roleInfoMap.put(entry.getKey(), List.of(entry.getValue())))));
+        return roleInfoMap;
+    }
+
     public void setRoleMappings(Map<PartyRole, ProductRoleInfo> roleMappings) {
         this.roleMappings = roleMappings;
     }
 
+    public void setRoleMappingsByInstitutionType(Map<String, Map<PartyRole, ProductRoleInfo>> roleMappingsByInstitutionType) {
+        this.roleMappingsByInstitutionType = roleMappingsByInstitutionType;
+    }
+
     public String getRoleManagementURL() {
         return roleManagementURL;
     }