modify POST users/{userId}/onboarding

Author: giulia-tremolada

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

@@ -1559,7 +1559,7 @@
         },
         "responses" : {
           "200" : {
-            "description" : "The user is already a manager for the specified product.",
+            "description" : "The user is already onboarded for the specified product.",
             "content" : {
               "application/json" : { }
             }

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

@@ -1111,7 +1111,7 @@ paths:
               $ref: "#/components/schemas/AddUserRoleDto"
       responses:
         "200":
-          description: The user is already a manager for the specified product.
+          description: The user is already onboarded for the specified product.
           content:
             application/json: {}
         "201":

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

@@ -314,7 +314,7 @@ public Uni<Response> createOrUpdateByUserId(@PathParam("userId") String userId,
                                                 @Valid AddUserRoleDto userDto,
                                                 @Context SecurityContext ctx) {
         return readUserIdFromToken(ctx)
-                .onItem().transformToUni(loggedUser -> userService.createOrUpdateUserByUserId(userDto, userId, loggedUser))
+                .onItem().transformToUni(loggedUser -> userService.createOrUpdateUserByUserId(userDto, userId, loggedUser, OnboardedProductState.ACTIVE))
                 .onItem().ifNotNull().transform(ignore -> Response.status(HttpStatus.SC_CREATED).build())
                 .onItem().ifNull().continueWith(Response.status(HttpStatus.SC_OK).build());
 
@@ -327,7 +327,7 @@ public Uni<Response> createOrUpdateByUserId(@PathParam("userId") String userId,
      */
     @Operation(description = "Checks if the user is already a manager for the specified product and, if not, creates or updates the user with a new role.", summary = "Check if the user is manager or Update/create a user by userId with a new role")
     @APIResponses({
-            @APIResponse(responseCode = "200", description = "The user is already a manager for the specified product."),
+            @APIResponse(responseCode = "200", description = "The user is already onboarded for the specified product."),
             @APIResponse(responseCode = "201", description = "The user has been created or updated with a new role."),
     })
     @POST

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

@@ -4,6 +4,7 @@
 import it.pagopa.selfcare.user.controller.request.CreateUserDto;
 import it.pagopa.selfcare.user.controller.response.OnboardedProductResponse;
 import it.pagopa.selfcare.user.model.OnboardedProduct;
+import it.pagopa.selfcare.user.model.constants.OnboardedProductState;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
@@ -23,10 +24,11 @@ public interface OnboardedProductMapper {
     @Mapping(target = "productRole", source = "productRole")
     OnboardedProduct toNewOnboardedProduct(CreateUserDto.Product product, String productRole);
 
-    @Mapping(target = "status",  expression = "java(it.pagopa.selfcare.user.model.constants.OnboardedProductState.ACTIVE)")
+    @Mapping(target = "status",  source = "status")
     @Mapping(target = "env",  expression = "java(it.pagopa.selfcare.onboarding.common.Env.ROOT)")
     @Mapping(target = "createdAt", expression = "java(java.time.OffsetDateTime.now())")
     @Mapping(target = "updatedAt", expression = "java(java.time.OffsetDateTime.now())")
     @Mapping(target = "productRole", source = "productRole")
-    OnboardedProduct toNewOnboardedProduct(AddUserRoleDto.Product product, String productRole);
+    OnboardedProduct toNewOnboardedProduct(AddUserRoleDto.Product product, String productRole, OnboardedProductState status);
+
 }

apps/user-ms/src/main/java/it/pagopa/selfcare/user/service/UserService.java

@@ -50,7 +50,7 @@ public interface UserService {
 
     Uni<CreateOrUpdateUserByFiscalCodeResponse> createOrUpdateUserByFiscalCode(CreateUserDto userDto, LoggedUser loggedUser);
 
-    Uni<String> createOrUpdateUserByUserId(AddUserRoleDto userDto, String userId, LoggedUser loggedUser);
+    Uni<String> createOrUpdateUserByUserId(AddUserRoleDto userDto, String userId, LoggedUser loggedUser, OnboardedProductState status);
 
     Uni<String> createUserByUserId(AddUserRoleDto userDto, String userId, LoggedUser loggedUser);
 

apps/user-ms/src/main/java/it/pagopa/selfcare/user/service/UserServiceImpl.java

@@ -452,28 +452,29 @@ private Uni<CreateOrUpdateUserByFiscalCodeResponse> createUserOnUserRegistryAndU
      * Finally, if any operation fails, it logs an error message and returns a Uni that emits a failure.
      */
     @Override
-    public Uni<String> createOrUpdateUserByUserId(AddUserRoleDto userDto, String userId, LoggedUser loggedUser) {
+    public Uni<String> createOrUpdateUserByUserId(AddUserRoleDto userDto, String userId, LoggedUser loggedUser, OnboardedProductState status) {
         return userRegistryService.findByIdUsingGET(USERS_FIELD_LIST_WITHOUT_FISCAL_CODE, userId)
                 .onFailure(UserUtils::isUserNotFoundExceptionOnUserRegistry).retry().atMost(2)
                 .onFailure(UserUtils::isUserNotFoundExceptionOnUserRegistry).recoverWithUni(throwable -> Uni.createFrom().failure(new ResourceNotFoundException(throwable.getMessage())))
-                .onItem().transformToUni(userResource -> updateUserInstitutionByUserId(userResource, userDto, loggedUser))
+                .onItem().transformToUni(userResource -> updateUserInstitutionByUserId(userResource, userDto, loggedUser, status))
                 .onFailure().invoke(exception -> log.error("Error during retrieve user from userRegistry: {} ", exception.getMessage(), exception));
     }
 
     public Uni<String> createUserByUserId(AddUserRoleDto userDto, String userId, LoggedUser loggedUser) {
         var userInstitutionFilters = UserInstitutionFilter.builder().userId(userId).institutionId(userDto.getInstitutionId()).build().constructMap();
-        var productFilters = OnboardedProductFilter.builder().productId(userDto.getProduct().getProductId()).status(List.of(ACTIVE)).build().constructMap();
+        var productFilters = OnboardedProductFilter.builder().productId(userDto.getProduct().getProductId()).status(List.of(ACTIVE, SUSPENDED)).build().constructMap();
         Map<String, Object> queryParameter = userUtils.retrieveMapForFilter(userInstitutionFilters, productFilters);
         return userInstitutionService.retrieveFirstFilteredUserInstitution(queryParameter)
                 .onItem().transformToUni(userInstitution -> {
                     if (Optional.ofNullable(userInstitution).isPresent()) {
                         log.info("User with userId: {} has already onboarded for product {}. Proceeding with check role", userId, userDto.getProduct().getProductId());
                         PartyRole roleOnProduct = retrieveUserRoleOnProduct(userInstitution, userDto.getProduct().getProductId());
+                        OnboardedProductState currentStatus = retrieveUserStatusOnProduct(userInstitution, userDto.getProduct().getProductId());
                         return checkAndUpdateUserMail(userInstitution, userDto.getUserMailUuid())
-                                .onItem().transformToUni(ignore -> evaluateRoleAndCreateOrUpdateUserByUserId(userDto, userId, loggedUser, roleOnProduct));
+                                .onItem().transformToUni(ignore -> evaluateRoleAndCreateOrUpdateUserByUserId(userDto, userId, loggedUser, roleOnProduct, currentStatus));
                     } else {
                         log.info("User with userId: {} has not onboarded for product {}. Proceeding with create", userId, userDto.getProduct().getProductId());
-                        return createOrUpdateUserByUserId(userDto, userId, loggedUser);
+                        return createOrUpdateUserByUserId(userDto, userId, loggedUser, ACTIVE);
                     }
                 })
                 .onFailure().invoke(exception -> log.error("Error during createOrUpdateManagerByUserId for userId: {}, institutionId: {}: {}", userId, userDto.getInstitutionId(), exception.getMessage(), exception));
@@ -502,23 +503,33 @@ private Uni<UserInstitution> checkAndUpdateUserMail(UserInstitution userInstitut
      * we have to delete the old role, and subsequently we create new role for the user on selected product.
      * If the new role is equals or higher than the existing role, throw a UserRoleAlreadyPresentException to indicate that we need to keep the old role.
      */
-    private Uni<String> evaluateRoleAndCreateOrUpdateUserByUserId(AddUserRoleDto userDto, String userId, LoggedUser loggedUser, PartyRole roleOnProduct) {
+    private Uni<String> evaluateRoleAndCreateOrUpdateUserByUserId(AddUserRoleDto userDto, String userId, LoggedUser loggedUser, PartyRole roleOnProduct, OnboardedProductState currentStatus) {
         PartyRole newRole;
         try {
             newRole = PartyRole.valueOf(userDto.getProduct().getRole());
         } catch (IllegalArgumentException e) {
             throw new InvalidRequestException("Invalid role: " + userDto.getProduct().getRole() + ". Allowed value are: " + Arrays.toString(PartyRole.values()));
         }
         if (Objects.isNull(roleOnProduct)) {
-            return createOrUpdateUserByUserId(userDto, userId, loggedUser);
-        } else if (newRole.compareTo(roleOnProduct) < 0) {
-            log.info("User {}, for product {}, has role {}, which is lower than {}. The old role will be deleted, and the new role will be created.", userId, userDto.getProduct().getProductId(), roleOnProduct, userDto.getProduct().getRole());
-            return userInstitutionService.updateUserStatusWithOptionalFilterByInstitutionAndProduct(userId, userDto.getInstitutionId(), userDto.getProduct().getProductId(), null, null, DELETED)
-                    .onItem().transformToUni(longValue -> createOrUpdateUserByUserId(userDto, userId, loggedUser));
+            return createOrUpdateUserByUserId(userDto, userId, loggedUser, ACTIVE);
+        }
+
+        if (newRole == PartyRole.MANAGER) {
+            if (PartyRole.MANAGER.equals(roleOnProduct)) {
+                log.info("User {} already has MANAGER role with status {}. No changes needed.", userId, currentStatus);
+                return Uni.createFrom().failure(new UserRoleAlreadyPresentException(
+                        String.format("User already has MANAGER role with status %s for product [%s].", currentStatus, userDto.getProduct().getProductId())));
+            } else {
+                log.info("User {} has role {} with status {}. Replacing with MANAGER role keeping same status.", userId, roleOnProduct, currentStatus);
+                return userInstitutionService.updateUserStatusWithOptionalFilterByInstitutionAndProduct(
+                                userId, userDto.getInstitutionId(), userDto.getProduct().getProductId(), null, null, DELETED)
+                        .onItem().transformToUni(ignore -> createOrUpdateUserByUserId(userDto, userId, loggedUser, currentStatus));
+            }
         } else {
-            log.info("User {}, for product {}, has role {}, which is equals or biggest than {}. The old role is kept.", userId, userDto.getProduct().getProductId(), roleOnProduct, userDto.getProduct().getRole());
-            return Uni.createFrom().failure(new UserRoleAlreadyPresentException(String.format("User already has a role equals or bigger than %s for the product [%s] we cannot create %s role",
-                    roleOnProduct, userDto.getProduct().getProductId(), userDto.getProduct().getRole())));
+            log.info("User {} already has status {} for product {}. Cannot assign {} role.", userId, currentStatus, userDto.getProduct().getProductId(), newRole);
+            return Uni.createFrom().failure(new UserRoleAlreadyPresentException(
+                    String.format("User already has status %s for product [%s]. Cannot assign %s role.",
+                            currentStatus, userDto.getProduct().getProductId(), newRole)));
         }
     }
 
@@ -529,14 +540,27 @@ private PartyRole retrieveUserRoleOnProduct(UserInstitution userInstitution, Str
         if (Objects.nonNull(userInstitution.getProducts()) && !userInstitution.getProducts().isEmpty()) {
             return userInstitution.getProducts().stream()
                     .filter(onboardedProduct -> productId.equalsIgnoreCase(onboardedProduct.getProductId()))
-                    .filter(onboardedProduct -> ACTIVE.equals(onboardedProduct.getStatus()))
+                    .filter(onboardedProduct -> List.of(ACTIVE, SUSPENDED).contains(onboardedProduct.getStatus()))
                     .findFirst()
                     .map(OnboardedProduct::getRole)
                     .orElse(null);
         }
         return null;
     }
 
+    private OnboardedProductState retrieveUserStatusOnProduct(UserInstitution userInstitution, String productId) {
+        if (Objects.nonNull(userInstitution.getProducts()) && !userInstitution.getProducts().isEmpty()) {
+            return userInstitution.getProducts().stream()
+                    .filter(onboardedProduct -> productId.equalsIgnoreCase(onboardedProduct.getProductId()))
+                    .filter(onboardedProduct -> List.of(ACTIVE, SUSPENDED).contains(onboardedProduct.getStatus()))
+                    .findFirst()
+                    .map(OnboardedProduct::getStatus)
+                    .orElse(null);
+        }
+        return null;
+    }
+
+
     /**
      * Updates or creates a UserInstitution by userId and institutionId, persists the changes,
      * and sends notifications if needed. If the productRole already exists return nullItem.
@@ -546,9 +570,9 @@ private PartyRole retrieveUserRoleOnProduct(UserInstitution userInstitution, Str
      * @param loggedUser The currently logged-in user.
      * @return A Uni containing the userId as a string.
      */
-    private Uni<String> updateUserInstitutionByUserId(UserResource userResource, AddUserRoleDto userDto, LoggedUser loggedUser) {
+    private Uni<String> updateUserInstitutionByUserId(UserResource userResource, AddUserRoleDto userDto, LoggedUser loggedUser, OnboardedProductState status) {
         return userInstitutionService.findByUserIdAndInstitutionId(userResource.getId().toString(), userDto.getInstitutionId())
-                .onItem().transformToUni(userInstitution -> updateOrCreateUserInstitution(userDto, userInstitution, userResource.getId().toString()))
+                .onItem().transformToUni(userInstitution -> updateOrCreateUserInstitution(userDto, userInstitution, userResource.getId().toString(), status))
                 .onItem().ifNotNull().transformToUni(userInstitutionService::persistOrUpdate)
                 .onItem().ifNotNull().invoke(userInstitution -> log.info("UserInstitution with userId: {}, institutionId: {} persisted", userInstitution.getUserId(), userInstitution.getInstitutionId()))
                 .onFailure().invoke(exception -> log.error("Error during persist user on UserInstitution: {} ", exception.getMessage(), exception))
@@ -557,7 +581,7 @@ private Uni<String> updateUserInstitutionByUserId(UserResource userResource, Add
 
     }
 
-    private Uni<UserInstitution> updateOrCreateUserInstitution(AddUserRoleDto userDto, UserInstitution userInstitution, String userId) {
+    private Uni<UserInstitution> updateOrCreateUserInstitution(AddUserRoleDto userDto, UserInstitution userInstitution, String userId, OnboardedProductState status) {
         if (userInstitution == null) {
             log.info(USER_INSTITUTION_NOT_FOUND, userId, userDto.getInstitutionId());
             return Uni.createFrom().item(userInstitutionMapper.toNewEntity(userDto, userId));
@@ -572,7 +596,7 @@ private Uni<UserInstitution> updateOrCreateUserInstitution(AddUserRoleDto userDt
         List<String> productRoleToAdd = checkAlreadyOnboardedProductRole(userDto.getProduct().getProductId(), userDto.getProduct().getProductRoles(), userInstitution);
         userDto.getProduct().setProductRoles(productRoleToAdd);
 
-        productRoleToAdd.forEach(productRole -> userInstitution.getProducts().add(onboardedProductMapper.toNewOnboardedProduct(userDto.getProduct(), productRole)));
+        productRoleToAdd.forEach(productRole -> userInstitution.getProducts().add(onboardedProductMapper.toNewOnboardedProduct(userDto.getProduct(), productRole, status)));
         return Uni.createFrom().item(userInstitution);
     }
 

apps/user-ms/src/test/java/it/pagopa/selfcare/user/controller/UserControllerTest.java

@@ -28,12 +28,7 @@
 import org.apache.http.HttpStatus;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
-import org.openapi.quarkus.user_registry_json.model.EmailCertifiableSchema;
-import org.openapi.quarkus.user_registry_json.model.FamilyNameCertifiableSchema;
-import org.openapi.quarkus.user_registry_json.model.MobilePhoneCertifiableSchema;
-import org.openapi.quarkus.user_registry_json.model.NameCertifiableSchema;
-import org.openapi.quarkus.user_registry_json.model.UserResource;
-import org.openapi.quarkus.user_registry_json.model.WorkContactResource;
+import org.openapi.quarkus.user_registry_json.model.*;
 
 import java.util.*;
 
@@ -655,7 +650,7 @@ void testCreateOrUpdateUserByUserId() {
 
 
         // Mock the userService.createOrUpdateUser method
-        when(userService.createOrUpdateUserByUserId(any(AddUserRoleDto.class), anyString(), any()))
+        when(userService.createOrUpdateUserByUserId(any(AddUserRoleDto.class), anyString(), any(), any()))
                 .thenReturn(Uni.createFrom().item("example"));
 
         // Perform the API call
@@ -676,7 +671,7 @@ void testCreateOrUpdateUserWithInvalidBodyByUserId() {
         // Set userDto properties
 
         // Mock the userService.createOrUpdateUser method
-        when(userService.createOrUpdateUserByUserId(any(AddUserRoleDto.class), anyString(), any(LoggedUser.class)))
+        when(userService.createOrUpdateUserByUserId(any(AddUserRoleDto.class), anyString(), any(LoggedUser.class), any()))
                 .thenReturn(Uni.createFrom().nullItem());
 
         // Perform the API call