update: Hard delete user/usergroup when not used

informatici · Oct 31, 2024 · e4b4a7b · e4b4a7b
1 parent 1d8090f
commit e4b4a7b
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/main/java/org/isf/menu/service/MenuIoOperations.java b/src/main/java/org/isf/menu/service/MenuIoOperations.java
@@ -99,7 +99,7 @@ public long countAllActiveGroups() {
 	 * @throws OHServiceException When error occurs
 	 */
 	public List<User> getUser(String groupID) throws OHServiceException {
-		return repository.findByDeletedWhereUserGroupNameByOrderUserNameAsc(groupID, false);
+		return repository.findAllWhereUserGroupNameByOrderUserNameAsc(groupID);
 	}
 
 	/**
@@ -204,8 +204,12 @@ public boolean updatePassword(User user) throws OHServiceException {
 	 */
 	public void deleteUser(User user) throws OHServiceException {
 		ensureUserNotDeleted(user.getUserName());
-		user.setDeleted(true);
-		repository.save(user);
+		try {
+			repository.delete(user);
+		} catch (Exception ex) {
+			user.setDeleted(true);
+			repository.save(user);
+		}
 	}
 
 	public void updateFailedAttempts(String userName, int newFailAttempts) {
@@ -307,8 +311,12 @@ private GroupMenu insertGroupMenu(UserGroup aGroup, UserMenuItem item) throws OH
 	 */
 	public void deleteGroup(UserGroup aGroup) throws OHServiceException {
 		ensureUserGroupNotDeleted(aGroup.getCode());
-		aGroup.setDeleted(true);
-		groupRepository.save(aGroup);
+		if (getUser(aGroup.getCode()).isEmpty()) {
+			groupRepository.delete(aGroup);
+		} else {
+			aGroup.setDeleted(true);
+			groupRepository.save(aGroup);
+		}
 	}
 
 	/**