Fix: User-registry return method have the same methods as in User ret…

…urn method
cathrkri · Apr 7, 2026 · abc92c0 · abc92c0
1 parent a9aad5b
commit abc92c0
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseManager.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseManager.java
@@ -447,7 +447,11 @@ public UserRegistry getUsersFromDB(){
                 rs.getString("user_password"),
                 rs.getString("role")
         );
-        registry.addUser(user);
+        Settings settings = getSettingsForUser(user.getId().toString());
+        user.setSettings(settings);
+
+        Inbox inbox = getInboxForUser(user.getId().toString());
+        user.setInbox(inbox);
       }
     } catch (SQLException e) {
       e.printStackTrace();
@@ -483,7 +487,7 @@ public User getUserFromDBUuid(UUID uuid){
         user.setSettings(settings);
 
         Inbox inbox = getInboxForUser(user.getId().toString());
-        user.setSettings(settings);
+        user.setInbox(inbox);
       }
     } catch (SQLException e) {
       e.printStackTrace();