3 files changed, 111 insertions, 11 deletions

diff --git a/api/internal/controllers/auth.go b/api/internal/controllers/auth.go
index 58653d0..ab2fbbb 100644
--- a/api/internal/controllers/auth.go
+++ b/api/internal/controllers/auth.go
@@ -38,23 +38,27 @@ func AuthHandler (c *gin.Context) {
 
         var user models.User
         var preference models.Preference
-        var size models.Size
 
-        row := db.QueryRow("SELECT name, uuid, password, color, size, unit FROM Users u INNER JOIN Preferences p ON p.user_id = u.id INNER JOIN Sizes s ON p.size_id = s.id WHERE u.name = ?", username)
-        if err := row.Scan(&user.Name, &user.UUID, &user.Password, &preference.Color, &size.Size, &size.Unit); err != nil {
+        row := db.QueryRow("SELECT id as 'id', name, uuid, password FROM Users WHERE name = ?", username)
+        if err := row.Scan(&user.ID, &user.Name, &user.UUID, &user.Password); err != nil {
                 if errors.Is(err, sql.ErrNoRows) {
-                        c.AbortWithStatus(http.StatusUnauthorized)
+                        c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
                         return
                 }
         }
 
+        row = db.QueryRow("SELECT id, color, size_id, user_id FROM Preferences where user_id = ?", user.ID)
+        if err := row.Scan(&preference.ID, &preference.Color, &preference.SizeID, &preference.UserID); err != nil {
+                if errors.Is(err, sql.ErrNoRows) {
+                        c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
+                }
+        }
+
         if err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(password)); err != nil {
-                c.AbortWithStatus(http.StatusUnauthorized)
+                c.JSON(http.StatusUnauthorized, gin.H{"error": err.Error()})
                 return
         }
 
-        preference.Size = size
-
         // Generate a simple API token
         apiToken := generateToken()
         c.JSON(http.StatusOK, gin.H{"token": apiToken, "user": user, "preferences": preference})
diff --git a/api/internal/controllers/preferences.go b/api/internal/controllers/preferences.go
new file mode 100644
index 0000000..a1bcf4f
--- /dev/null
+++ b/api/internal/controllers/preferences.go
@@ -0,0 +1,45 @@
+package controllers
+
+import (
+        "github.com/gin-gonic/gin"
+        "net/http"
+        "database/sql"
+        "water/api/internal/database"
+        "water/api/internal/models"
+)
+
+func GetSizes(c *gin.Context) {
+                db := database.EstablishDBConnection()
+        defer func(db *sql.DB) {
+                err := db.Close()
+                if err != nil {
+                        c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+                }
+        }(db)
+        
+        rows, err := db.Query("SELECT id, size, unit  FROM Sizes")
+        if err != nil {
+                c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+                return
+        }
+        defer func(rows *sql.Rows) {
+                err := rows.Close()
+                if err != nil {
+                        c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+                        return
+                }
+        }(rows)
+
+        var data []models.Size
+
+        for rows.Next() {
+                var size models.Size
+                if err := rows.Scan(&size.ID, &size.Size, &size.Unit); err != nil {
+                        c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+                        return
+                }
+                data = append(data, size)
+        }
+
+        c.JSON(http.StatusOK, data)
+}
diff --git a/api/internal/controllers/user.go b/api/internal/controllers/user.go
index 76dedc8..dbb09cf 100644
--- a/api/internal/controllers/user.go
+++ b/api/internal/controllers/user.go
@@ -1,17 +1,68 @@
 package controllers
 
 import (
-        "github.com/gin-gonic/gin"
+        "database/sql"
+        "errors"
+        "log"
         "net/http"
+        "water/api/internal/database"
+        "water/api/internal/models"
+
+        "github.com/gin-gonic/gin"
 )
 
 func GetUser(c *gin.Context) {
         c.JSON(http.StatusOK, gin.H{"message": "User found"})
 }
 func GetUserPreferences(c *gin.Context) {
-        c.JSON(http.StatusOK, gin.H{"message": "Preferences fetched successfully"})
+        db := database.EstablishDBConnection()
+        defer func(db *sql.DB) {
+                err := db.Close()
+                if err != nil {
+                        c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+                        return
+                }
+        }(db)
+
+        var preference models.Preference
+
+        row := db.QueryRow("SELECT id, user_id, color, size_id FROM Preferences WHERE user_id = ?", c.Param("id"))
+        if err := row.Scan(&preference.ID, &preference.UserID, &preference.Color, &preference.SizeID); err != nil {
+                if errors.Is(err, sql.ErrNoRows) {
+                        c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
+                        return
+                } else {
+                        c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+                        return
+                }
+        }
+
+        c.JSON(http.StatusOK, preference)
 }
 
 func UpdateUserPreferences(c *gin.Context) {
-        c.JSON(http.StatusOK, gin.H{"message": "Preferences updated successfully"})
-}
\ No newline at end of file
+        db := database.EstablishDBConnection()
+        defer func(db *sql.DB) {
+                err := db.Close()
+                if err != nil {
+                        c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+                        return
+                }
+        }(db)
+
+        var newPreferences models.Preference
+        if err := c.BindJSON(&newPreferences); err != nil {
+                c.JSON(http.StatusUnprocessableEntity, gin.H{"error": err.Error()})
+                return
+        }
+
+        log.Printf("newPreferences: %v", newPreferences)
+
+        _, err := db.Exec("UPDATE Preferences SET color = ?, size_id = ? WHERE id = ?", newPreferences.Color, newPreferences.SizeID, newPreferences.ID)
+        if err != nil {
+                c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+                return
+        }
+
+        c.Status(http.StatusNoContent)
+}