Move last opened file to workspaces table

backend/internal/api/file_handlers.go

@@ -120,19 +120,19 @@ func DeleteFile(fs *filesystem.FileSystem) http.HandlerFunc {
 
 func GetLastOpenedFile(db *db.DB) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		userID, _, err := getUserAndWorkspaceIDs(r)
+		_, workspaceID, err := getUserAndWorkspaceIDs(r)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 			return
 		}
 
-		user, err := db.GetUserByID(userID)
+		filePath, err := db.GetLastOpenedFile(workspaceID)
 		if err != nil {
-			http.Error(w, "Failed to get user", http.StatusInternalServerError)
+			http.Error(w, "Failed to get last opened file", http.StatusInternalServerError)
 			return
 		}
 
-		respondJSON(w, map[string]string{"lastOpenedFile": user.LastOpenedFilePath})
+		respondJSON(w, map[string]string{"lastOpenedFilePath": filePath})
 	}
 }
 
@@ -153,14 +153,15 @@ func UpdateLastOpenedFile(db *db.DB, fs *filesystem.FileSystem) http.HandlerFunc
 			return
 		}
 
-		// Validate that the file path is valid within the workspace
+		// Validate the file path exists in the workspace
-		_, err = fs.ValidatePath(userID, workspaceID, requestBody.FilePath)
+		if requestBody.FilePath != "" {
-		if err != nil {
+			if _, err := fs.ValidatePath(userID, workspaceID, requestBody.FilePath); err != nil {
 				http.Error(w, "Invalid file path", http.StatusBadRequest)
 				return
 			}
+		}
 
-		if err := db.UpdateLastOpenedFile(userID, requestBody.FilePath); err != nil {
+		if err := db.UpdateLastOpenedFile(workspaceID, requestBody.FilePath); err != nil {
 			http.Error(w, "Failed to update last opened file", http.StatusInternalServerError)
 			return
 		}

backend/internal/db/migrations.go

@@ -22,8 +22,7 @@ var migrations = []Migration{
 			password_hash TEXT NOT NULL,
 			role TEXT NOT NULL CHECK(role IN ('admin', 'editor', 'viewer')),
 			created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-			last_workspace_id INTEGER,
+			last_workspace_id INTEGER
-			last_opened_file_path TEXT
 		);
 
 		-- Create workspaces table with integrated settings
@@ -32,6 +31,7 @@ var migrations = []Migration{
 			user_id INTEGER NOT NULL,
 			name TEXT NOT NULL,
 			created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+			last_opened_file_path TEXT,
 			-- Settings fields
 			theme TEXT NOT NULL DEFAULT 'light' CHECK(theme IN ('light', 'dark')),
 			auto_save BOOLEAN NOT NULL DEFAULT 0,

backend/internal/db/users.go

@@ -82,14 +82,12 @@ func (db *DB) GetUserByID(id int) (*models.User, error) {
 	user := &models.User{}
 	err := db.QueryRow(`
         SELECT 
-			u.id, u.email, u.display_name, u.role, u.created_at, 
+            id, email, display_name, role, created_at, 
-			u.last_workspace_id, u.last_opened_file_path,
+            last_workspace_id
-			COALESCE(w.id, 0) as workspace_id
+        FROM users
-		FROM users u
+        WHERE id = ?`, id).
-		LEFT JOIN workspaces w ON w.id = u.last_workspace_id
-		WHERE u.id = ?`, id).
 		Scan(&user.ID, &user.Email, &user.DisplayName, &user.Role, &user.CreatedAt,
-			&user.LastWorkspaceID, &user.LastOpenedFilePath, &user.LastWorkspaceID)
+			&user.LastWorkspaceID)
 	if err != nil {
 		return nil, err
 	}
@@ -98,34 +96,27 @@ func (db *DB) GetUserByID(id int) (*models.User, error) {
 
 func (db *DB) GetUserByEmail(email string) (*models.User, error) {
 	user := &models.User{}
-	var lastOpenedFilePath sql.NullString
 	err := db.QueryRow(`
         SELECT 
-			u.id, u.email, u.display_name, u.password_hash, u.role, u.created_at, 
+            id, email, display_name, password_hash, role, created_at, 
-			u.last_workspace_id, u.last_opened_file_path,
+            last_workspace_id
-			COALESCE(w.id, 0) as workspace_id
+        FROM users
-		FROM users u
+        WHERE email = ?`, email).
-		LEFT JOIN workspaces w ON w.id = u.last_workspace_id
-		WHERE u.email = ?`, email).
 		Scan(&user.ID, &user.Email, &user.DisplayName, &user.PasswordHash, &user.Role, &user.CreatedAt,
-			&user.LastWorkspaceID, &lastOpenedFilePath, &user.LastWorkspaceID)
+			&user.LastWorkspaceID)
 	if err != nil {
 		return nil, err
 	}
-	if lastOpenedFilePath.Valid {
+
-		user.LastOpenedFilePath = lastOpenedFilePath.String
-	} else {
-		user.LastOpenedFilePath = ""
-	}
 	return user, nil
 }
 
 func (db *DB) UpdateUser(user *models.User) error {
 	_, err := db.Exec(`
 		UPDATE users
-		SET email = ?, display_name = ?, role = ?, last_workspace_id = ?, last_opened_file_path = ?
+		SET email = ?, display_name = ?, role = ?, last_workspace_id = ?
 		WHERE id = ?`,
-		user.Email, user.DisplayName, user.Role, user.LastWorkspaceID, user.LastOpenedFilePath, user.ID)
+		user.Email, user.DisplayName, user.Role, user.LastWorkspaceID, user.ID)
 	return err
 }
 
@@ -134,11 +125,6 @@ func (db *DB) UpdateLastWorkspace(userID, workspaceID int) error {
 	return err
 }
 
-func (db *DB) UpdateLastOpenedFile(userID int, filePath string) error {
-	_, err := db.Exec("UPDATE users SET last_opened_file_path = ? WHERE id = ?", filePath, userID)
-	return err
-}
-
 func (db *DB) DeleteUser(id int) error {
 	tx, err := db.Begin()
 	if err != nil {

backend/internal/db/workspaces.go

@@ -160,3 +160,20 @@ func (db *DB) UpdateLastWorkspaceTx(tx *sql.Tx, userID, workspaceID int) error {
 	_, err := tx.Exec("UPDATE users SET last_workspace_id = ? WHERE id = ?", workspaceID, userID)
 	return err
 }
+
+func (db *DB) UpdateLastOpenedFile(workspaceID int, filePath string) error {
+	_, err := db.Exec("UPDATE workspaces SET last_opened_file_path = ? WHERE id = ?", filePath, workspaceID)
+	return err
+}
+
+func (db *DB) GetLastOpenedFile(workspaceID int) (string, error) {
+	var filePath sql.NullString
+	err := db.QueryRow("SELECT last_opened_file_path FROM workspaces WHERE id = ?", workspaceID).Scan(&filePath)
+	if err != nil {
+		return "", err
+	}
+	if !filePath.Valid {
+		return "", nil
+	}
+	return filePath.String, nil
+}

backend/internal/models/user.go

@@ -24,7 +24,6 @@ type User struct {
 	Role            UserRole  `json:"role" validate:"required,oneof=admin editor viewer"`
 	CreatedAt       time.Time `json:"createdAt"`
 	LastWorkspaceID int       `json:"lastWorkspaceId"`
-	LastOpenedFilePath string    `json:"lastOpenedFilePath"`
 }
 
 func (u *User) Validate() error {

backend/internal/models/workspace.go

@@ -9,6 +9,7 @@ type Workspace struct {
 	UserID             int       `json:"userId" validate:"required,min=1"`
 	Name               string    `json:"name" validate:"required"`
 	CreatedAt          time.Time `json:"createdAt"`
+	LastOpenedFilePath string    `json:"lastOpenedFilePath"`
 
 	// Integrated settings
 	Theme                string `json:"theme" validate:"oneof=light dark"`