[KNOWAGE-9272] Add support to retrieve users and roles across all tenants

Author: eng-dedalus

knowage-core/src/main/java/it/eng/spagobi/api/v2/UserResource.java

@@ -176,10 +176,14 @@ public Response insertUser(@Valid UserBO requestDTO) {
 			LOGGER.error("public is reserved prefix for user id");
 			throw new SpagoBIServiceException("SPAGOBI_SERVICE", "public_ is a reserved prefix for user name", null);
 		}
-		ISbiUserDAO usersDao = null;
+		ISbiUserDAO usersDao = DAOFactory.getSbiUserDAO();
 
-		usersDao = DAOFactory.getSbiUserDAO();
-		checkIfUserCanBeAdded(requestDTO, usersDao);
+		boolean isAdmin = userRequestDtoIsAdmin(requestDTO);
+
+		if (!userCanBeAdded(requestDTO, usersDao, isAdmin)) {
+			LOGGER.error("The limit for creating {} users has been reached.", isAdmin ? "admin " : "end ");
+			throw new SpagoBIServiceException("Create user", "The limit for creating " + (isAdmin ? "admin " : "end ") + "users has been reached.");
+		}
 
 		usersDao.setUserProfile(getUserProfile());
 		SbiUser existingUser = usersDao.loadSbiUserByUserId(userId);
@@ -252,44 +256,39 @@ public Response insertUser(@Valid UserBO requestDTO) {
 		}
 	}
 
-	private void checkIfUserCanBeAdded(UserBO requestDTO, ISbiUserDAO usersDao) {
-		List<UserBO> dbUsers = usersDao.loadUsers();
+	private boolean userCanBeAdded(UserBO requestDTO, ISbiUserDAO usersDao, boolean isAdmin) {
+		List<SbiUser> dbUsers = usersDao.loadAllTenantsUsers();
 
-		boolean isAdmin = userRequestDtoIsAdmin(requestDTO);
+		List<SbiUser> usersToCheck = filterUsersToCheck(dbUsers, isAdmin);
+        return ProductProfiler.canAddAUser(usersToCheck.size(), isAdmin);
+	}
 
-		List<UserBO> usersToCheck = filterUsersToCheck(dbUsers, isAdmin);
-		if (!ProductProfiler.canAddAUser(usersToCheck.size(), isAdmin)) {
-			LOGGER.error("Maximum number of {} users reached", isAdmin ? "admin" : "end");
-			throw new SpagoBIRestServiceException("Maximum number of " + (isAdmin ? "admin" : "end") + " users reached", buildLocaleFromSession(),
-					new Throwable());
-		}
+	private List<SbiUser> filterUsersToCheck(List<SbiUser> sbiUsers, boolean isAdmin) {
+		ISbiUserDAO usersDao = DAOFactory.getSbiUserDAO();
+		usersDao.setUserProfile(getUserProfile());
+
+		return filterUsersWithRoles(sbiUsers, isAdmin, usersDao);
+	}
+
+	private List<SbiUser> filterUsersWithRoles(List<SbiUser> sbiUsers, boolean isAdmin, ISbiUserDAO usersDao) {
+		return sbiUsers.stream()
+				.filter(user -> hasApplicableRoles(user, isAdmin, usersDao))
+				.toList();
 	}
 
-	private List<UserBO> filterUsersToCheck(List<UserBO> sbiUsers, boolean isAdmin) {
-        return sbiUsers.stream()
-                .filter(user -> {
-                    try {
-                        IRoleDAO rolesDao = DAOFactory.getRoleDAO();
-                        rolesDao.setUserProfile(getUserProfile());
-                        return user.getSbiExtUserRoleses().stream()
-                                .anyMatch(roleId -> {
-                                    try {
-                                        SbiExtRoles role = rolesDao.loadSbiExtRoleById((Integer) roleId);
-                                        return role != null &&
-                                                isRoleApplicable(role, isAdmin);
-                                    } catch (Exception e) {
-										LOGGER.error("Error loading role with id: {}", roleId, e);
-                                        return false;
-                                    }
-                                });
-                    } catch (Exception e) {
-                        LOGGER.error("Error accessing roles DAO", e);
-                        return false;
-                    }
-                })
-                .toList();
+	private boolean hasApplicableRoles(SbiUser user, boolean isAdmin, ISbiUserDAO usersDao) {
+		try {
+			ArrayList<SbiExtRoles> userRoles = usersDao.loadSbiUserRolesByIdAllTenants(user.getId());
+
+			return userRoles.stream()
+					.anyMatch(role -> role != null && isRoleApplicable(role, isAdmin));
+		} catch (Exception e) {
+			LOGGER.error("Error loading roles for user with id: {}", user.getId(), e);
+			return false;
+		}
 	}
 
+
 	private boolean userRequestDtoIsAdmin(@Valid UserBO requestDTO) {
 		List<Integer> sbiExtUserRoleses = requestDTO.getSbiExtUserRoleses();
 		IRoleDAO rolesDao = DAOFactory.getRoleDAO();
@@ -339,8 +338,12 @@ public Response updateUser(@PathParam("id") Integer id, @Valid UserBO requestDTO
 		}
 
 		usersDao = DAOFactory.getSbiUserDAO();
+		boolean isAdmin = userRequestDtoIsAdmin(requestDTO);
 
-		checkIfUserCanBeAdded(requestDTO, usersDao);
+		if (!userCanBeAdded(requestDTO, usersDao, isAdmin)) {
+			LOGGER.error("The limit for creating {} users has been reached.", isAdmin ? "admin " : "end ");
+			throw new SpagoBIServiceException("Update user", "The limit for creating " + (isAdmin ? "admin " : "end ") + "users has been reached.");
+		}
 
 		SbiUser sbiUser = new SbiUser();
 		sbiUser.changeId(id);

knowagedao/src/main/java/it/eng/spagobi/profiling/dao/ISbiUserDAO.java

@@ -50,6 +50,8 @@ public interface ISbiUserDAO extends ISpagoBIDao, EmittingEventDAO<UserEventsEme
 
 	ArrayList<SbiUser> loadSbiUsers();
 
+	ArrayList<SbiUser> loadAllTenantsUsers();
+
 	ArrayList<UserBO> loadUsers();
 
 	List<UserBO> loadUsers(QueryFilters filters);
@@ -88,4 +90,5 @@ public interface ISbiUserDAO extends ISpagoBIDao, EmittingEventDAO<UserEventsEme
 
 	void resetOtpSecret(Integer userId);
 
+	ArrayList<SbiExtRoles> loadSbiUserRolesByIdAllTenants(int id);
 }

knowagedao/src/main/java/it/eng/spagobi/profiling/dao/SbiUserDAOHibImpl.java

@@ -229,6 +229,31 @@ public void resetOtpSecret(Integer userId) {
 		}
 	}
 
+	@Override
+	public ArrayList<SbiExtRoles> loadSbiUserRolesByIdAllTenants(int id) {
+		LOGGER.debug("IN");
+
+		Session aSession = null;
+		Transaction tx = null;
+		try {
+			aSession = getSession();
+			disableTenantFilter(aSession);
+			tx = aSession.beginTransaction();
+			String q = "select us.sbiExtUserRoleses from SbiUser us where us.id = :id";
+			Query query = aSession.createQuery(q);
+			query.setInteger("id", id);
+
+			ArrayList<SbiExtRoles> result = (ArrayList<SbiExtRoles>) query.list();
+			return result;
+		} catch (HibernateException he) {
+			rollbackIfActive(tx);
+			throw new SpagoBIDAOException("Error while loading user role with id " + id, he);
+		} finally {
+			LOGGER.debug("OUT");
+			closeSessionIfOpen(aSession);
+		}
+	}
+
 	/**
 	 * Insert SbiUser
 	 *
@@ -423,6 +448,30 @@ public ArrayList<SbiUser> loadSbiUsers() {
 		}
 	}
 
+	@Override
+	public ArrayList<SbiUser> loadAllTenantsUsers() {
+			LOGGER.debug("IN");
+
+			Session aSession = null;
+			Transaction tx = null;
+			try {
+				aSession = getSession();
+				this.disableTenantFilter(aSession);
+				tx = aSession.beginTransaction();
+				String q = "from SbiUser ";
+				Query query = aSession.createQuery(q);
+
+				ArrayList<SbiUser> result = (ArrayList<SbiUser>) query.list();
+				return result;
+			} catch (HibernateException he) {
+				rollbackIfActive(tx);
+				throw new SpagoBIDAOException("Error while loading users", he);
+			} finally {
+				LOGGER.debug("OUT");
+				closeSessionIfOpen(aSession);
+		}
+	}
+
 	@Override
 	public Integer fullSaveOrUpdateSbiUser(SbiUser user) {
 		LOGGER.debug("IN");