SORMAS-Foundation#4130 - Fix sorting by facility in the users management view

Author: alexcaruntu-vita

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

@@ -62,6 +62,7 @@
 import de.symeda.sormas.backend.contact.Contact;
 import de.symeda.sormas.backend.contact.ContactService;
 import de.symeda.sormas.backend.event.EventService;
+import de.symeda.sormas.backend.facility.Facility;
 import de.symeda.sormas.backend.facility.FacilityFacadeEjb;
 import de.symeda.sormas.backend.facility.FacilityService;
 import de.symeda.sormas.backend.infrastructure.PointOfEntryFacadeEjb;
@@ -219,6 +220,7 @@ public List<UserDto> getIndexList(UserCriteria userCriteria, int first, int max,
 		Root<User> user = cq.from(User.class);
 		Join<User, District> district = user.join(User.DISTRICT, JoinType.LEFT);
 		Join<User, Location> address = user.join(User.ADDRESS, JoinType.LEFT);
+		Join<User, Facility> facility = user.join(User.HEALTH_FACILITY, JoinType.LEFT);
 
 		// TODO: We'll need a user filter for users at some point, to make sure that users can edit their own details,
 		// but not those of others
@@ -255,6 +257,9 @@ public List<UserDto> getIndexList(UserCriteria userCriteria, int first, int max,
 				case UserDto.ADDRESS:
 					expression = address.get(Location.REGION);
 					break;
+				case UserDto.HEALTH_FACILITY:
+					expression = facility.get(Facility.NAME);
+					break;
 				default:
 					throw new IllegalArgumentException(sortProperty.propertyName);
 				}