From abc92c08e7d0aa01de44e671af7f6f1706b2bed8 Mon Sep 17 00:00:00 2001
From: AdrianBalunan <adrianbalunan63@gmail.com>
Date: Tue, 7 Apr 2026 20:39:05 +0200
Subject: [PATCH] Fix: User-registry return method have the same methods as in
 User return method

---
 .../systemutvikling/team6/database/DatabaseManager.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 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
index 55ba947..3af2fd7 100644
--- 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();