[SELC-7326] fix: sonar duplication code in UserInstitutionMapper

Author: Pierluigi D'Uffizi

apps/user-ms/src/main/java/it/pagopa/selfcare/user/mapper/UserInstitutionMapper.java

@@ -55,17 +55,13 @@ default List<OnboardedProduct> toNewOnboardedProduct(CreateUserDto.Product produ
             return new ArrayList<>();
         }
         return product.getProductRoles().stream()
-                .map(role -> {
-                    OnboardedProduct onboardedProduct = buildOnboardedProduct();
-                    onboardedProduct.setProductId(product.getProductId());
-                    onboardedProduct.setTokenId(product.getTokenId());
-                    onboardedProduct.setProductRole(role);
-                    onboardedProduct.setToAddOnAggregates(product.getToAddOnAggregates());
-                    if(StringUtils.isNotBlank(product.getRole())) {
-                        onboardedProduct.setRole(PartyRole.valueOf(product.getRole()));
-                    }
-                    return onboardedProduct;
-                })
+                .map(role -> createOnboardedProduct(
+                        product.getProductId(),
+                        product.getTokenId(),
+                        product.getRole(),
+                        role,
+                        product.getToAddOnAggregates()
+                ))
                 .collect(Collectors.toList());
     }
 
@@ -75,17 +71,13 @@ default List<OnboardedProduct> toNewOnboardedProductFromAddUserRole(AddUserRoleD
         }
 
         return product.getProductRoles().stream()
-                .map(role -> {
-                    OnboardedProduct onboardedProduct = buildOnboardedProduct();
-                    onboardedProduct.setProductId(product.getProductId());
-                    onboardedProduct.setTokenId(product.getTokenId());
-                    onboardedProduct.setProductRole(role);
-                    onboardedProduct.setToAddOnAggregates(product.getToAddOnAggregates());
-                    if(StringUtils.isNotBlank(product.getRole())) {
-                        onboardedProduct.setRole(PartyRole.valueOf(product.getRole()));
-                    }
-                    return onboardedProduct;
-                })
+                .map(role -> createOnboardedProduct(
+                        product.getProductId(),
+                        product.getTokenId(),
+                        product.getRole(),
+                        role,
+                        product.getToAddOnAggregates()
+                ))
                 .collect(Collectors.toList());
     }
 
@@ -98,4 +90,18 @@ default OnboardedProduct buildOnboardedProduct(){
         onboardedProduct.setUpdatedAt(now);
         return onboardedProduct;
     }
+
+    default OnboardedProduct createOnboardedProduct(String productId, String tokenId,
+                                                    String role, String productRole,
+                                                    Boolean toAddOnAggregates) {
+        OnboardedProduct onboardedProduct = buildOnboardedProduct();
+        onboardedProduct.setProductId(productId);
+        onboardedProduct.setTokenId(tokenId);
+        onboardedProduct.setProductRole(productRole);
+        onboardedProduct.setToAddOnAggregates(toAddOnAggregates);
+        if (StringUtils.isNotBlank(role)) {
+            onboardedProduct.setRole(PartyRole.valueOf(role));
+        }
+        return onboardedProduct;
+    }
 }

apps/user-ms/src/test/java/it/pagopa/selfcare/user/mapper/UserInstitutionMapperTest.java

@@ -35,6 +35,7 @@ void toNewOnboardedProduct_returnsOnboardedProducts_whenProductRolesIsNotEmpty()
         product.setProductRoles(Arrays.asList("role1", "role2"));
         product.setProductId("productId");
         product.setTokenId("tokenId");
+        product.setToAddOnAggregates(true);
         product.setRole(PartyRole.MANAGER.name());
 
         List<OnboardedProduct> result = mapper.toNewOnboardedProduct(product);
@@ -43,6 +44,7 @@ void toNewOnboardedProduct_returnsOnboardedProducts_whenProductRolesIsNotEmpty()
         assertEquals("productId", result.get(0).getProductId());
         assertEquals("tokenId", result.get(0).getTokenId());
         assertEquals("role1", result.get(0).getProductRole());
+        assertEquals(true, result.get(0).getToAddOnAggregates());
         assertEquals(PartyRole.MANAGER, result.get(0).getRole());
         assertEquals(OnboardedProductState.ACTIVE, result.get(0).getStatus());
         assertEquals(Env.ROOT, result.get(0).getEnv());
@@ -55,6 +57,7 @@ void toNewOnboardedProductFromAddUserRole_returnsOnboardedProducts_whenProductRo
         product.setProductRoles(Arrays.asList("role1", "role2"));
         product.setProductId("productId");
         product.setTokenId("tokenId");
+        product.setToAddOnAggregates(true);
         product.setRole(PartyRole.MANAGER.name());
 
         List<OnboardedProduct> result = mapper.toNewOnboardedProductFromAddUserRole(product);
@@ -63,6 +66,7 @@ void toNewOnboardedProductFromAddUserRole_returnsOnboardedProducts_whenProductRo
         assertEquals("productId", result.get(0).getProductId());
         assertEquals("tokenId", result.get(0).getTokenId());
         assertEquals("role1", result.get(0).getProductRole());
+        assertEquals(true, result.get(0).getToAddOnAggregates());
         assertEquals(PartyRole.MANAGER, result.get(0).getRole());
         assertEquals(OnboardedProductState.ACTIVE, result.get(0).getStatus());
         assertEquals(Env.ROOT, result.get(0).getEnv());