From c3e33565743b3a0ba869e32f755ecf39e1c059b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leon=20B=C3=B6sche?= <leonboesche1999@gmail.com>
Date: Sat, 24 Jan 2026 02:30:34 +0100
Subject: [PATCH] Refactor user struct and user info handling for improved
 readability

---
 go_cloud/internal/database/db.go | 12 ++++++------
 go_cloud/internal/http/routes.go | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/go_cloud/internal/database/db.go b/go_cloud/internal/database/db.go
index 6c18a8e..ec578e9 100644
--- a/go_cloud/internal/database/db.go
+++ b/go_cloud/internal/database/db.go
@@ -63,12 +63,12 @@ func (sa StringArray) Value() (driver.Value, error) {
 }
 
 type User struct {
-	ID           uuid.UUID `json:"id"`
-	Email        string    `json:"email"`
-	Username     string    `json:"username"`
-	DisplayName  string    `json:"displayName"`
-	PasswordHash *string   `json:"-"`
-	CreatedAt    time.Time `json:"createdAt"`
+	ID           uuid.UUID  `json:"id"`
+	Email        string     `json:"email"`
+	Username     string     `json:"username"`
+	DisplayName  string     `json:"displayName"`
+	PasswordHash *string    `json:"-"`
+	CreatedAt    time.Time  `json:"createdAt"`
 	LastLoginAt  *time.Time `json:"lastLoginAt"`
 }
 
diff --git a/go_cloud/internal/http/routes.go b/go_cloud/internal/http/routes.go
index af40a7a..0978841 100644
--- a/go_cloud/internal/http/routes.go
+++ b/go_cloud/internal/http/routes.go
@@ -922,15 +922,15 @@ func listMembersHandler(w http.ResponseWriter, r *http.Request, db *database.DB)
 			Role:      m.Membership.Role,
 			CreatedAt: m.Membership.CreatedAt,
 			User: userInfo{
-				ID:          m.User.ID.String(),
-				Username:    m.User.Username,
+				ID:       m.User.ID.String(),
+				Username: m.User.Username,
 				DisplayName: func() *string {
 					if m.User.DisplayName == "" {
 						return nil
 					}
 					return &m.User.DisplayName
 				}(),
-				Email:       m.User.Email,
+				Email: m.User.Email,
 			},
 		})
 	}
@@ -1194,15 +1194,15 @@ func listJoinRequestsHandler(w http.ResponseWriter, r *http.Request, db *databas
 			RequestedAt: req.JoinRequest.RequestedAt,
 			Status:      req.JoinRequest.Status,
 			User: userInfo{
-				ID:          req.User.ID.String(),
-				Username:    req.User.Username,
+				ID:       req.User.ID.String(),
+				Username: req.User.Username,
 				DisplayName: func() *string {
 					if req.User.DisplayName == "" {
 						return nil
 					}
 					return &req.User.DisplayName
 				}(),
-				Email:       req.User.Email,
+				Email: req.User.Email,
 			},
 		})
 	}