Skip to content

Commit 119c39b

Browse files
Revert "[SELC-6199] ref: removed if"
This reverts commit d51afc2.
1 parent d51afc2 commit 119c39b

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -458,15 +458,17 @@ public Uni<String> createUserByUserId(AddUserRoleDto userDto, String userId, Log
458458
var productFilters = OnboardedProductFilter.builder().productId(userDto.getProduct().getProductId()).status(List.of(ACTIVE)).build().constructMap();
459459
Map<String, Object> queryParameter = userUtils.retrieveMapForFilter(userInstitutionFilters, productFilters);
460460
return userInstitutionService.retrieveFirstFilteredUserInstitution(queryParameter)
461-
.onItem().transformToUni(userInstitution -> Optional.ofNullable(userInstitution).map(ui -> {
462-
log.info("User with userId: {} has already onboarded for product {}. Proceeding with check role", userId, userDto.getProduct().getProductId());
463-
PartyRole roleOnProduct = retrieveUserRoleOnProduct(ui, userDto.getProduct().getProductId());
464-
return checkAndUpdateUserMail(ui, userDto.getUserMailUuid())
465-
.onItem().transformToUni(ignore -> evaluateRoleAndCreateOrUpdateUserByUserId(userDto, userId, loggedUser, roleOnProduct));
466-
}).orElseGet(() -> {
467-
log.info("User with userId: {} has not onboarded for product {}. Proceeding with create", userId, userDto.getProduct().getProductId());
468-
return createOrUpdateUserByUserId(userDto, userId, loggedUser);
469-
}))
461+
.onItem().transformToUni(userInstitution -> {
462+
if (Optional.ofNullable(userInstitution).isPresent()) {
463+
log.info("User with userId: {} has already onboarded for product {}. Proceeding with check role", userId, userDto.getProduct().getProductId());
464+
PartyRole roleOnProduct = retrieveUserRoleOnProduct(userInstitution, userDto.getProduct().getProductId());
465+
return checkAndUpdateUserMail(userInstitution, userDto.getUserMailUuid())
466+
.onItem().transformToUni(ignore -> evaluateRoleAndCreateOrUpdateUserByUserId(userDto, userId, loggedUser, roleOnProduct));
467+
} else {
468+
log.info("User with userId: {} has not onboarded for product {}. Proceeding with create", userId, userDto.getProduct().getProductId());
469+
return createOrUpdateUserByUserId(userDto, userId, loggedUser);
470+
}
471+
})
470472
.onFailure().invoke(exception -> log.error("Error during createOrUpdateManagerByUserId for userId: {}, institutionId: {}: {}", userId, userDto.getInstitutionId(), exception.getMessage(), exception));
471473
}
472474

0 commit comments

Comments
 (0)