fix: Fix tests

informatici · Nov 5, 2024 · dc324ad · dc324ad
1 parent 12ca092
commit dc324ad
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/org/isf/menu/manager/UserBrowsingManager.java b/src/main/java/org/isf/menu/manager/UserBrowsingManager.java
@@ -280,8 +280,8 @@ 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.stream().anyMatch(user -> !user.isDeleted())) {
-			throw new OHDataValidationException(
+		if (users != null && !users.isEmpty()) {
+			throw new OHDataIntegrityViolationException(
 				new OHExceptionMessage(MessageBundle.getMessage("angal.groupsbrowser.thisgrouphasusersandcannotbedeleted.msg")));
 		}
 		ioOperations.deleteGroup(aGroup);
@@ -324,6 +324,13 @@ public UserGroup newUserGroup(UserGroup userGroup, List<Permission> permissions)
 	 * @return {@code true} if the group has been updated, {@code false} otherwise.
 	 */
 	public boolean updateUserGroup(UserGroup userGroup) throws OHServiceException {
+		if (userGroup.isDeleted()) {
+			List<User> users = getUser(userGroup.getCode());
+			if (users != null && users.stream().anyMatch(User::isDeleted)) {
+				throw new OHDataValidationException(
+					new OHExceptionMessage(MessageBundle.getMessage("angal.groupsbrowser.thisgrouphasusersandcannotbedeleted.msg")));
+			}
+		}
 		return ioOperations.updateUserGroup(userGroup);
 	}
 

diff --git a/src/main/java/org/isf/menu/service/MenuIoOperations.java b/src/main/java/org/isf/menu/service/MenuIoOperations.java
@@ -353,6 +353,7 @@ public UserGroup newUserGroup(UserGroup userGroup, List<Permission> permissions)
 	 */
 	public boolean updateUserGroup(UserGroup aGroup) throws OHServiceException {
 		ensureUserGroupNotDeleted(aGroup.getCode());
+
 		return groupRepository.update(aGroup.getDesc(), aGroup.isDeleted(), aGroup.getCode()) > 0;
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     	 */
     	public boolean updateUserGroup(UserGroup aGroup) throws OHServiceException {
     		ensureUserGroupNotDeleted(aGroup.getCode());
     		return groupRepository.update(aGroup.getDesc(), aGroup.isDeleted(), aGroup.getCode()) > 0;
     	}
@@ Expand Down @@