update: Update Menu operations

informatici · Oct 30, 2024 · 1d8090f · 1d8090f
1 parent e0e9af0
commit 1d8090f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/org/isf/menu/manager/UserBrowsingManager.java b/src/main/java/org/isf/menu/manager/UserBrowsingManager.java
@@ -280,7 +280,7 @@ public void deleteGroup(UserGroup aGroup) throws OHServiceException {
 			throw new OHDataValidationException(new OHExceptionMessage(MessageBundle.getMessage("angal.groupsbrowser.theadmingroupcannotbedeleted.msg")));
 		}
 		List<User> users = getUser(aGroup.getCode());
-		if (users != null && !users.isEmpty()) {
+		if (users != null && users.stream().anyMatch(user -> !user.isDeleted())) {
 			throw new OHDataIntegrityViolationException(
 				new OHExceptionMessage(MessageBundle.getMessage("angal.groupsbrowser.thisgrouphasusersandcannotbedeleted.msg")));
 		}

diff --git a/src/main/java/org/isf/menu/service/MenuIoOperations.java b/src/main/java/org/isf/menu/service/MenuIoOperations.java
@@ -73,7 +73,7 @@ public MenuIoOperations(
 	 * @throws OHServiceException When error occurs
 	 */
 	public List<User> getUser() throws OHServiceException {
-		return repository.findAllByDeletedOrderByUserNameAsc(false);
+		return repository.findAllByOrderByUserNameAsc();
 	}
 
 	/**
@@ -132,7 +132,7 @@ public String getUsrInfo(String userName) throws OHServiceException {
 	 * @throws OHServiceException When error occurs
 	 */
 	public List<UserGroup> getUserGroup() throws OHServiceException {
-		return groupRepository.findAllByDeletedOrderByCodeAsc(false);
+		return groupRepository.findAllByOrderByCodeAsc();
 	}
 
 	/**