SORMAS-Foundation#3169 - Added default filter to UserService to exclude inactive users

Author: MateStrysewske

sormas-api/src/main/java/de/symeda/sormas/api/user/UserFacade.java

@@ -59,7 +59,7 @@ public interface UserFacade {
 	 */
 	List<UserReferenceDto> getUserRefsByDistrict(DistrictReferenceDto district, boolean includeSupervisors, UserRole... userRoles);
 
-	List<UserReferenceDto> getAllUserRefs();
+	List<UserReferenceDto> getAllUserRefs(boolean includeInactive);
 
 	List<UserDto> getUsersByAssociatedOfficer(UserReferenceDto associatedOfficer, UserRole... userRoles);
 

sormas-backend/src/main/java/de/symeda/sormas/backend/user/UserFacadeEjb.java

@@ -139,8 +139,8 @@ public List<UserReferenceDto> getUserRefsByDistrict(DistrictReferenceDto distric
 	}
 
 	@Override
-	public List<UserReferenceDto> getAllUserRefs() {
-		return userService.getAllInJurisdiction().stream().map(c -> toReferenceDto(c)).collect(Collectors.toList());
+	public List<UserReferenceDto> getAllUserRefs(boolean includeInactive) {
+		return userService.getAllInJurisdiction(includeInactive).stream().map(c -> toReferenceDto(c)).collect(Collectors.toList());
 	}
 
 	@Override

sormas-backend/src/main/java/de/symeda/sormas/backend/user/UserService.java

@@ -119,7 +119,7 @@ private List<User> getAllByRegionAndUserRoles(
 		CriteriaQuery<User> cq = cb.createQuery(getElementClass());
 		Root<User> from = cq.from(getElementClass());
 
-		Predicate filter = null;
+		Predicate filter = createDefaultFilter(cb, from);
 		if (region != null) {
 			filter = cb.equal(from.get(User.REGION), region);
 		}
@@ -155,6 +155,7 @@ public List<User> getInformantsOfFacility(Facility facility) {
 		Join<User, UserRole> joinRoles = from.join(User.USER_ROLES, JoinType.LEFT);
 
 		Predicate filter = cb.and(
+			createDefaultFilter(cb, from),
 			cb.equal(from.get(User.HEALTH_FACILITY), facility),
 			joinRoles.in(
 				Arrays.asList(
@@ -177,6 +178,7 @@ public List<User> getLabUsersOfLab(Facility facility) {
 		Join<User, UserRole> joinRoles = from.join(User.USER_ROLES, JoinType.LEFT);
 
 		Predicate filter = cb.and(
+			createDefaultFilter(cb, from),
 			cb.equal(from.get(User.LABORATORY), facility),
 			joinRoles.in(
 				Arrays.asList(
@@ -213,7 +215,7 @@ private List<User> getAllByDistrict(
 		CriteriaQuery<User> cq = cb.createQuery(getElementClass());
 		Root<User> from = cq.from(getElementClass());
 
-		Predicate filter = buildDistrictFilter(cb, cq, from, district, includeSupervisors, userRoles);
+		Predicate filter = cb.and(createDefaultFilter(cb, from), buildDistrictFilter(cb, cq, from, district, includeSupervisors, userRoles));
 
 		if (createExtraFilters != null) {
 			filter = and(cb, filter, createExtraFilters.apply(cb, from));
@@ -239,7 +241,7 @@ public List<User> getAllByAssociatedOfficer(User associatedOfficer, UserRole...
 		CriteriaQuery<User> cq = cb.createQuery(getElementClass());
 		Root<User> from = cq.from(getElementClass());
 
-		Predicate filter = cb.and(cb.equal(from.get(User.ASSOCIATED_OFFICER), associatedOfficer));
+		Predicate filter = cb.and(createDefaultFilter(cb, from), cb.equal(from.get(User.ASSOCIATED_OFFICER), associatedOfficer));
 		filter = and(cb, filter, buildUserRolesFilter(from, Arrays.asList(userRoles)));
 		cq.where(filter);
 
@@ -248,13 +250,17 @@ public List<User> getAllByAssociatedOfficer(User associatedOfficer, UserRole...
 		return em.createQuery(cq).getResultList();
 	}
 
-	public List<User> getAllInJurisdiction() {
+	public List<User> getAllInJurisdiction(boolean includeInactive) {
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<User> cq = cb.createQuery(getElementClass());
 		Root<User> from = cq.from(getElementClass());
 
 		Predicate jurisdictionFilter = createJurisdictionFilter(cb, from);
 
+		if (!includeInactive) {
+			jurisdictionFilter = and(cb, jurisdictionFilter, createDefaultFilter(cb, from));
+		}
+
 		if (jurisdictionFilter != null) {
 			cq.where(jurisdictionFilter);
 		}
@@ -270,7 +276,6 @@ public boolean isLoginUnique(String uuid, String userName) {
 		CriteriaQuery<User> cq = cb.createQuery(getElementClass());
 		Root<User> from = cq.from(getElementClass());
 
-
 		Expression<String> userNameExpression = from.get(User.USER_NAME);
 		String userNameParamValue = userName;
 		if (!AuthProvider.getProvider().isUsernameCaseSensitive()) {
@@ -401,8 +406,8 @@ private Predicate buildDistrictFilter(
 
 		if (includeSupervisors) {
 			Join<User, UserRole> joinRoles = from.join(User.USER_ROLES, JoinType.LEFT);
-			Predicate supervisorFilter =
-				joinRoles.in(Arrays.asList(UserRole.CASE_SUPERVISOR, UserRole.CONTACT_SUPERVISOR, UserRole.SURVEILLANCE_SUPERVISOR, UserRole.ADMIN_SUPERVISOR));
+			Predicate supervisorFilter = joinRoles.in(
+				Arrays.asList(UserRole.CASE_SUPERVISOR, UserRole.CONTACT_SUPERVISOR, UserRole.SURVEILLANCE_SUPERVISOR, UserRole.ADMIN_SUPERVISOR));
 			if (filter != null) {
 				filter = cb.or(filter, supervisorFilter);
 			} else {
@@ -450,4 +455,8 @@ public boolean hasRight(UserRight right) {
 		User currentUser = getCurrentUser();
 		return userRoleConfigFacade.getEffectiveUserRights(currentUser.getUserRoles().toArray(new UserRole[0])).contains(right);
 	}
+
+	public Predicate createDefaultFilter(CriteriaBuilder cb, From<?, User> root) {
+		return cb.isTrue(root.get(User.ACTIVE));
+	}
 }

sormas-ui/src/main/java/de/symeda/sormas/ui/task/TaskEditForm.java

@@ -199,7 +199,7 @@ protected void addFields() {
 				users = FacadeProvider.getUserFacade().getUsersByRegionAndRoles(region);
 			} else {
 				// fallback - just show all users
-				users = FacadeProvider.getUserFacade().getAllUserRefs();
+				users = FacadeProvider.getUserFacade().getAllUserRefs(false);
 			}
 
 			// Validation