Make logging in work on frontend

backend/internal/api/routes.go

@@ -45,8 +45,8 @@ func SetupRoutes(r chi.Router, db *db.DB, fs *filesystem.FileSystem, authMiddlew
 		r.Route("/workspaces", func(r chi.Router) {
 			r.Get("/", handler.ListWorkspaces())
 			r.Post("/", handler.CreateWorkspace())
-			r.Get("/last", handler.GetLastWorkspace())
-			r.Put("/last", handler.UpdateLastWorkspace())
+			r.Get("/last", handler.GetLastWorkspaceName())
+			r.Put("/last", handler.UpdateLastWorkspaceName())
 
 			// Single workspace routes
 			r.Route("/{workspaceName}", func(r chi.Router) {

backend/internal/db/users.go

@@ -120,9 +120,26 @@ func (db *DB) UpdateUser(user *models.User) error {
 	return err
 }
 
-func (db *DB) UpdateLastWorkspace(userID, workspaceID int) error {
-	_, err := db.Exec("UPDATE users SET last_workspace_id = ? WHERE id = ?", workspaceID, userID)
-	return err
+func (db *DB) UpdateLastWorkspace(userID int, workspaceName string) error {
+	tx, err := db.Begin()
+	if err != nil {
+		return err
+	}
+	defer tx.Rollback()
+
+	var workspaceID int
+
+	err = tx.QueryRow("SELECT id FROM workspaces WHERE user_id = ? AND name = ?", userID, workspaceName).Scan(&workspaceID)
+	if err != nil {
+		return err
+	}
+
+	_, err = tx.Exec("UPDATE users SET last_workspace_id = ? WHERE id = ?", workspaceID, userID)
+	if err != nil {
+		return err
+	}
+
+	return tx.Commit()
 }
 
 func (db *DB) DeleteUser(id int) error {
@@ -147,8 +164,14 @@ func (db *DB) DeleteUser(id int) error {
 	return tx.Commit()
 }
 
-func (db *DB) GetLastWorkspaceID(userID int) (int, error) {
-	var workspaceID int
-	err := db.QueryRow("SELECT last_workspace_id FROM users WHERE id = ?", userID).Scan(&workspaceID)
-	return workspaceID, err
+func (db *DB) GetLastWorkspaceName(userID int) (string, error) {
+	var workspaceName string
+	err := db.QueryRow(`
+        SELECT 
+            w.name
+        FROM workspaces w
+        JOIN users u ON u.last_workspace_id = w.id
+        WHERE u.id = ?`, userID).
+		Scan(&workspaceName)
+	return workspaceName, err
 }

backend/internal/handlers/workspace_handlers.go

@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
 
 	"novamd/internal/httpcontext"
@@ -151,10 +152,12 @@ func (h *Handler) DeleteWorkspace() http.HandlerFunc {
 		}
 
 		// Find another workspace to set as last
+		var nextWorkspaceName string
 		var nextWorkspaceID int
 		for _, ws := range workspaces {
 			if ws.ID != ctx.Workspace.ID {
 				nextWorkspaceID = ws.ID
+				nextWorkspaceName = ws.Name
 				break
 			}
 		}
@@ -188,28 +191,28 @@ func (h *Handler) DeleteWorkspace() http.HandlerFunc {
 		}
 
 		// Return the next workspace ID in the response so frontend knows where to redirect
-		respondJSON(w, map[string]int{"nextWorkspaceId": nextWorkspaceID})
+		respondJSON(w, map[string]string{"nextWorkspaceName": nextWorkspaceName})
 	}
 }
 
-func (h *Handler) GetLastWorkspace() http.HandlerFunc {
+func (h *Handler) GetLastWorkspaceName() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		ctx, ok := httpcontext.GetRequestContext(w, r)
 		if !ok {
 			return
 		}
 
-		workspaceID, err := h.DB.GetLastWorkspaceID(ctx.UserID)
+		workspaceName, err := h.DB.GetLastWorkspaceName(ctx.UserID)
 		if err != nil {
 			http.Error(w, "Failed to get last workspace", http.StatusInternalServerError)
 			return
 		}
 
-		respondJSON(w, map[string]int{"lastWorkspaceId": workspaceID})
+		respondJSON(w, map[string]string{"lastWorkspaceName": workspaceName})
 	}
 }
 
-func (h *Handler) UpdateLastWorkspace() http.HandlerFunc {
+func (h *Handler) UpdateLastWorkspaceName() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		ctx, ok := httpcontext.GetRequestContext(w, r)
 		if !ok {
@@ -217,15 +220,17 @@ func (h *Handler) UpdateLastWorkspace() http.HandlerFunc {
 		}
 
 		var requestBody struct {
-			WorkspaceID int `json:"workspaceId"`
+			WorkspaceName string `json:"workspaceName"`
 		}
 
 		if err := json.NewDecoder(r.Body).Decode(&requestBody); err != nil {
+			fmt.Println(err)
 			http.Error(w, "Invalid request body", http.StatusBadRequest)
 			return
 		}
 
-		if err := h.DB.UpdateLastWorkspace(ctx.UserID, requestBody.WorkspaceID); err != nil {
+		if err := h.DB.UpdateLastWorkspace(ctx.UserID, requestBody.WorkspaceName); err != nil {
+			fmt.Println(err)
 			http.Error(w, "Failed to update last workspace", http.StatusInternalServerError)
 			return
 		}