From c069028bd5929e5d1078c109b265d389ceb1baba Mon Sep 17 00:00:00 2001
From: Max <walzen665@web.de>
Date: Mon, 3 Jun 2024 22:00:55 +0200
Subject: [PATCH] Fixed updateUser

---
 .../de/w665/sharepulse/db/repo/UserRepository.java    | 11 +----------
 .../w665/sharepulse/rest/mappings/Administration.java |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/main/java/de/w665/sharepulse/db/repo/UserRepository.java b/src/main/java/de/w665/sharepulse/db/repo/UserRepository.java
index 70b01d4..bad97c4 100644
--- a/src/main/java/de/w665/sharepulse/db/repo/UserRepository.java
+++ b/src/main/java/de/w665/sharepulse/db/repo/UserRepository.java
@@ -42,16 +42,7 @@ public class UserRepository {
 
     public void updateUser(User user) {
         r.db(config.getDatabase()).table("users")
-                .filter(r.hashMap("username", user.getUsername()))
-                .update(user)
-                .run(connection);
-    }
-
-    // If username is changed, this method must be used. Else the user will not be found
-    public void updateUser(User user, String originalUsername) {
-        // TODO: Refactor this to use the userID instead of the username (remove this and use method above)
-        r.db(config.getDatabase()).table("users")
-                .filter(r.hashMap("username", originalUsername))
+                .filter(r.hashMap("id", user.getId()))
                 .update(user)
                 .run(connection);
     }
diff --git a/src/main/java/de/w665/sharepulse/rest/mappings/Administration.java b/src/main/java/de/w665/sharepulse/rest/mappings/Administration.java
index 6632c92..9e8fafa 100644
--- a/src/main/java/de/w665/sharepulse/rest/mappings/Administration.java
+++ b/src/main/java/de/w665/sharepulse/rest/mappings/Administration.java
@@ -69,7 +69,7 @@ public class Administration extends SecureApiRestController {
         User user = optionalUser.get();
         user.setPassword(authenticationService.encodePassword(userEditRequest.getNewPassword()));
         user.setUsername(userEditRequest.getUsername());
-        userRepository.updateUser(user, userEditRequest.getOriginalUsername());
+        userRepository.updateUser(user);
         // Clear password before returning
         user.setPassword(null);
         return ResponseEntity.ok(user);