Fixed bug, where user could not be updated.

Author: open-schnick

src/main/java/de/filefighter/rest/domain/user/business/UserBusinessService.java

@@ -163,7 +163,7 @@ public void updateUser(long userId, UserRegisterForm userToUpdate, User authenti
 
         Update newUpdate = new Update();
 
-        boolean changesWereMade = updateUserName(newUpdate, userToUpdate.getUsername());
+        boolean changesWereMade = updateUserName(newUpdate, userEntityToUpdate, userToUpdate.getUsername());
         boolean passwordWasUpdated = updatePassword(newUpdate, userToUpdate.getPassword(), userToUpdate.getConfirmationPassword());
         changesWereMade = passwordWasUpdated || changesWereMade;
         boolean userGroupsWereUpdated = updateGroups(newUpdate, userToUpdate.getGroupIds(), authenticatedUserIsAdmin);
@@ -221,13 +221,19 @@ private boolean updatePassword(Update newUpdate, String password, String confirm
         return false;
     }
 
-    private boolean updateUserName(Update update, String username) {
+    private boolean updateUserName(Update update, UserEntity userEntityToUpdate, String username) {
         if (null != username) {
             if (!stringIsValid(username))
                 throw new UserNotUpdatedException("Wanted to change username, but username was not valid.");
 
-            if (null != getUserWithUsername(username))
-                throw new UserNotUpdatedException("Username already taken.");
+            UserEntity userWithNewUsername = getUserWithUsername(username);
+            if (null != userWithNewUsername) {
+                if (userWithNewUsername.getUserId() == userEntityToUpdate.getUserId()) {
+                    return false;
+                } else {
+                    throw new UserNotUpdatedException("Username already taken.");
+                }
+            }
 
             update.set("username", username);
             update.set("lowercaseUsername", username.toLowerCase());

src/test/java/de/filefighter/rest/domain/user/business/UserBusinessServiceUnitTest.java

@@ -329,6 +329,14 @@ void updateUserNameWorks() {
         when(userRepositoryMock.findByUserId(userId)).thenReturn(userEntityMock);
 
         assertDoesNotThrow(() -> userBusinessService.updateUser(userId, userRegisterForm, authenticatedUser));
+
+        // updating the user with the same username works.
+        UserRegisterForm anotherOne = UserRegisterForm.builder().username(userEntityMock.getUsername()).build();
+        when(userRepositoryMock.findByLowercaseUsername(userEntityMock.getLowercaseUsername())).thenReturn(userEntityMock);
+
+        UserNotUpdatedException exception = assertThrows(UserNotUpdatedException.class,
+                () -> userBusinessService.updateUser(userId, anotherOne, authenticatedUser));
+        assertEquals(UserNotUpdatedException.getErrorMessagePrefix() + " No changes were made.", exception.getMessage());
     }
 
     @Test