From 724b773be566abcfe70d1168771795f59a7d69ff Mon Sep 17 00:00:00 2001
From: akastijn <akastijn@alttd.com>
Date: Sat, 8 Nov 2025 18:21:21 +0100
Subject: [PATCH] Refactor `createPrivilegedUser` to accept `PrivilegedUser`
 object and adjust `LoginController` for consistency.

---
 .../controllers/login/LoginController.java            | 11 ++++++-----
 .../database/web_db/PrivilegedUserMapper.java         |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/com/alttd/altitudeweb/controllers/login/LoginController.java b/backend/src/main/java/com/alttd/altitudeweb/controllers/login/LoginController.java
index 1238f58..1ad478f 100644
--- a/backend/src/main/java/com/alttd/altitudeweb/controllers/login/LoginController.java
+++ b/backend/src/main/java/com/alttd/altitudeweb/controllers/login/LoginController.java
@@ -210,15 +210,16 @@ public class LoginController implements LoginApi {
                       try {
                           log.debug("Loading user by uuid {}", uuid.toString());
                           PrivilegedUserMapper mapper = sqlSession.getMapper(PrivilegedUserMapper.class);
-                          Optional<PrivilegedUser> privilegedUser = mapper
+                          Optional<PrivilegedUser> optionalPrivilegedUser = mapper
                                   .getUserByUuid(uuid);
 
-                          if (privilegedUser.isEmpty()) {
-                              int privilegedUserId = mapper.createPrivilegedUser(uuid);
+                          if (optionalPrivilegedUser.isEmpty()) {
+                              PrivilegedUser privilegedUser = new PrivilegedUser(null, uuid, List.of());
+                              mapper.createPrivilegedUser(privilegedUser);
                               privilegedUserCompletableFuture.complete(
-                                      Optional.of(new PrivilegedUser(privilegedUserId, uuid, List.of())));
+                                      Optional.of(privilegedUser));
                           } else {
-                              privilegedUserCompletableFuture.complete(privilegedUser);
+                              privilegedUserCompletableFuture.complete(optionalPrivilegedUser);
                           }
                       } catch (Exception e) {
                           log.error("Failed to load user by uuid", e);
diff --git a/database/src/main/java/com/alttd/altitudeweb/database/web_db/PrivilegedUserMapper.java b/database/src/main/java/com/alttd/altitudeweb/database/web_db/PrivilegedUserMapper.java
index 8fb4044..0e2c674 100644
--- a/database/src/main/java/com/alttd/altitudeweb/database/web_db/PrivilegedUserMapper.java
+++ b/database/src/main/java/com/alttd/altitudeweb/database/web_db/PrivilegedUserMapper.java
@@ -103,8 +103,8 @@ public interface PrivilegedUserMapper {
 
     @Insert("""
         INSERT INTO privileged_users (uuid)
-        VALUES (#{uuid})
+        VALUES (#{user.uuid})
         """)
-    @SelectKey(statement = "SELECT LAST_INSERT_ID()", keyProperty = "id", before = false, resultType = int.class)
-    int createPrivilegedUser(UUID uuid);
+    @SelectKey(statement = "SELECT LAST_INSERT_ID()", keyProperty = "user.id", before = false, resultType = int.class)
+    void createPrivilegedUser(@Param("user") PrivilegedUser user);
 }