[SELC-7326] feat: add field toAddOnAggregates to createOrUpdateByFiscalCode and createOrUpdateByUserId api

Author: Pierluigi D'Uffizi

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

@@ -1901,6 +1901,9 @@
           },
           "delegationId" : {
             "type" : "string"
+          },
+          "toAddOnAggregates" : {
+            "type" : "boolean"
           }
         }
       },
@@ -1924,6 +1927,9 @@
             "items" : {
               "type" : "string"
             }
+          },
+          "toAddOnAggregates" : {
+            "type" : "boolean"
           }
         }
       },

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

@@ -1376,6 +1376,8 @@ components:
             type: string
         delegationId:
           type: string
+        toAddOnAggregates:
+          type: boolean
     Product1:
       required:
       - productId
@@ -1396,6 +1398,8 @@ components:
           type: array
           items:
             type: string
+        toAddOnAggregates:
+          type: boolean
     QueueEvent:
       enum:
       - ADD

apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/request/AddUserRoleDto.java

@@ -37,5 +37,7 @@ public static class Product {
         private List<String> productRoles;
 
         private String delegationId;
+
+        private Boolean toAddOnAggregates;
     }
 }

apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/request/CreateUserDto.java

@@ -51,5 +51,7 @@ public static class Product {
 
         @NotNull(message = "productRoles is required")
         private List<String> productRoles;
+
+        private Boolean toAddOnAggregates;
     }
 }

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

@@ -60,6 +60,7 @@ default List<OnboardedProduct> toNewOnboardedProduct(CreateUserDto.Product produ
                     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()));
                     }
@@ -79,6 +80,7 @@ default List<OnboardedProduct> toNewOnboardedProductFromAddUserRole(AddUserRoleD
                     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()));
                     }

apps/user-ms/src/test/java/it/pagopa/selfcare/user/integration_test/steps/UserSteps.java

@@ -13,6 +13,7 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.types.ObjectId;
+import org.junit.jupiter.api.Assertions;
 
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
@@ -222,4 +223,27 @@ public void createMockInstitutionWithUnusedUser(String id, String onboardedProdu
             e.printStackTrace();
         }
     }
+
+    @And("The userInstitution with field toAddOnAggregates {string} was saved")
+    public void theUserInstitutionWithFieldToAddOnAggregatesWasSaved(String arg0) {
+        boolean toAddOnAggregates = Boolean.parseBoolean(arg0);
+        UserInstitution.find("institutionId = ?1", mockInstitutionId2)
+                .firstResult()
+                .subscribe()
+                .with(
+                        success -> {
+                            UserInstitution userInstitution = (UserInstitution) success;
+                            if(!Objects.isNull(userInstitution)) {
+                                List<OnboardedProduct> products = userInstitution.getProducts();
+                                Assertions.assertNotNull(products, "Products list is null");
+                                Assertions.assertFalse(products.isEmpty(), "Products list is empty");
+                                OnboardedProduct product = products.get(0);
+                                Assertions.assertEquals(toAddOnAggregates, product.getToAddOnAggregates(), String.format("The field toAddOnAggregates differ. Expected: %s, Current %s", toAddOnAggregates, product.getToAddOnAggregates()));
+                            } else {
+                                log.info("No userInstitution with institutionId {}", mockInstitutionId2);
+                            }
+                        },
+                        failure -> log.info("Failed to find userInstitution with institutionId {}", mockInstitutionId2)
+                );
+    }
 }

apps/user-ms/src/test/resources/features/user.feature

@@ -3050,6 +3050,32 @@ Feature: User
       | userId                        | 97a511a7-2acc-47b9-afed-2f3c65753b4a          |
     When I send a POST request to "users/{userId}"
     Then The status code is 401
+
+  @RemoveUserInstitutionAfterCreateFromAPI
+  Scenario: Successfully updated or created userInstitution by userId with a new role can be added to aggregates
+    Given User login with username "j.doe" and password "test"
+    And The following request body:
+      """
+      {
+          "institutionId": "e3a4c8d2-5b79-4f3e-92d7-184a9b6fcd21",
+          "product": {
+              "productId": "prod-io",
+              "role": "DELEGATE",
+              "tokenId": "7a3df825-8317-4601-9fea-12283b7ed97f",
+              "productRoles": [
+                  "referente amministrativo"
+              ],
+              "toAddOnAggregates" : true
+          },
+          "institutionDescription": "Comune di Bergamo",
+          "userMailUuid": "ID_MAIL#81956dd1-00fd-4423-888b-f77a48d26ba1"
+      }
+      """
+    And The following path params:
+      | userId                        | 97a511a7-2acc-47b9-afed-2f3c65753b4a          |
+    When I send a POST request to "users/{userId}"
+    Then The status code is 201
+    And The userInstitution with field toAddOnAggregates "true" was saved
   ######################### END POST /{userId} #########################
 
   ######################### BEGIN POST /{userId}/onboarding #########################
@@ -3506,6 +3532,35 @@ Feature: User
       | prod-io                        | admin                                         | SUB_DELEGATE | ACTIVE | asda8312-3311-5642-gsds-gfr2252341     |
       | prod-pagopa                    | referente amministrativo                      | MANAGER      | ACTIVE | aa1112-5132-4432-gsds-d12322           |
 
+  @RemoveUserInstitutionWithMockUser3
+  Scenario: Successfully created a new user or updated an existing one can be added to aggregates
+    Given User login with username "j.doe" and password "test"
+    And The following request body:
+      """
+        {
+            "institutionId": "e3a4c8d2-5b79-4f3e-92d7-184a9b6fcd21",
+            "hasToSendEmail": false,
+            "user": {
+              "fiscalCode": "VRDMRA22T71F205A",
+              "institutionEmail": "prova@email.com"
+            },
+            "product": {
+                "productId": "prod-io",
+                "role": "DELEGATE",
+                "tokenId": "7a3df825-8317-4601-9fea-12283b7ed97f",
+                "productRoles": [
+                    "referente amministrativo"
+                ],
+                "toAddOnAggregates" : true
+            },
+            "institutionDescription": "Comune di Bergamo",
+            "userMailUuid": "ID_MAIL#81956dd1-00fd-4423-888b-f77a48d26ba1"
+        }
+      """
+    When I send a POST request to "users/"
+    Then The status code is 201
+    And The userInstitution with field toAddOnAggregates "true" was saved
+
   @RemoveUserInstitutionAndUserInfoAfterScenario
   Scenario: Unsuccessfully create a new user or update an existing one with ACTIVE status (existing userInstitution with existing product)
     Given User login with username "j.doe" and password "test"

libs/user-sdk-model/src/main/java/it.pagopa.selfcare.user.model/OnboardedProduct.java

@@ -25,4 +25,5 @@ public class OnboardedProduct {
     private OffsetDateTime createdAt;
     private OffsetDateTime updatedAt;
     private String delegationId;
+    private Boolean toAddOnAggregates;
 }