Rework db schema

.vscode/settings.json

@@ -18,7 +18,8 @@
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
       "source.organizeImports": "explicit"
-    }
+    },
+    "editor.defaultFormatter": "golang.go"
   },
   "gopls": {
     "usePlaceholders": true,

backend/internal/db/migrations.go

@@ -13,21 +13,16 @@ type Migration struct {
 var migrations = []Migration{
 	{
 		Version: 1,
-		SQL: `CREATE TABLE IF NOT EXISTS settings (
-			user_id INTEGER PRIMARY KEY,
-			settings JSON NOT NULL
-		)`,
-	},
-	{
-		Version: 2,
 		SQL: `
 		-- Create users table
 		CREATE TABLE IF NOT EXISTS users (
 			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			username TEXT NOT NULL UNIQUE,
 			email TEXT NOT NULL UNIQUE,
+			display_name TEXT,
 			password_hash TEXT NOT NULL,
-			created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+			created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+			last_workspace_id INTEGER,
+			last_opened_file_path TEXT
 		);
 
 		-- Create workspaces table
@@ -39,30 +34,16 @@ var migrations = []Migration{
 			FOREIGN KEY (user_id) REFERENCES users (id)
 		);
 
+		-- Add foreign key constraint to users table
+		ALTER TABLE users ADD CONSTRAINT fk_last_workspace
+		FOREIGN KEY (last_workspace_id) REFERENCES workspaces (id);
+
 		-- Create workspace_settings table
 		CREATE TABLE IF NOT EXISTS workspace_settings (
 			workspace_id INTEGER PRIMARY KEY,
 			settings JSON NOT NULL,
 			FOREIGN KEY (workspace_id) REFERENCES workspaces (id)
 		);
-
-		-- Migrate existing settings to a default user and workspace
-		INSERT INTO users (username, email, password_hash) 
-		VALUES ('default_user', 'default@example.com', 'placeholder_hash');
-
-		INSERT INTO workspaces (user_id, name, root_path) 
-		SELECT 1, 'Default Workspace'
-		WHERE NOT EXISTS (SELECT 1 FROM workspaces);
-
-		INSERT INTO workspace_settings (workspace_id, settings)
-		SELECT w.id, s.settings
-		FROM workspaces w
-		CROSS JOIN settings s
-		WHERE w.name = 'Default Workspace'
-		  AND NOT EXISTS (SELECT 1 FROM workspace_settings);
-
-		-- Drop the old settings table
-		DROP TABLE IF EXISTS settings;
 		`,
 	},
 }

backend/internal/db/user.go

@@ -5,27 +5,65 @@ import (
 )
 
 func (db *DB) CreateUser(user *models.User) error {
-	_, err := db.Exec("INSERT INTO users (username, email, password_hash) VALUES (?, ?, ?)",
+	_, err := db.Exec(`
-		user.Username, user.Email, user.PasswordHash)
+		INSERT INTO users (email, display_name, password_hash)
+		VALUES (?, ?, ?)`,
+		user.Email, user.DisplayName, user.PasswordHash)
 	return err
 }
 
 func (db *DB) GetUserByID(id int) (*models.User, error) {
 	user := &models.User{}
-	err := db.QueryRow("SELECT id, username, email, created_at FROM users WHERE id = ?", id).
+	err := db.QueryRow(`
-		Scan(&user.ID, &user.Username, &user.Email, &user.CreatedAt)
+		SELECT id, email, display_name, created_at, last_workspace_id, last_opened_file_path
+		FROM users WHERE id = ?`, id).
+		Scan(&user.ID, &user.Email, &user.DisplayName, &user.CreatedAt,
+			&user.LastWorkspaceID, &user.LastOpenedFilePath)
 	if err != nil {
 		return nil, err
 	}
 	return user, nil
 }
 
-func (db *DB) GetUserByUsername(username string) (*models.User, error) {
+func (db *DB) GetUserByEmail(email string) (*models.User, error) {
 	user := &models.User{}
-	err := db.QueryRow("SELECT id, username, email, password_hash, created_at FROM users WHERE username = ?", username).
+	err := db.QueryRow(`
-		Scan(&user.ID, &user.Username, &user.Email, &user.PasswordHash, &user.CreatedAt)
+		SELECT id, email, display_name, password_hash, created_at, last_workspace_id, last_opened_file_path
+		FROM users WHERE email = ?`, email).
+		Scan(&user.ID, &user.Email, &user.DisplayName, &user.PasswordHash, &user.CreatedAt,
+			&user.LastWorkspaceID, &user.LastOpenedFilePath)
 	if err != nil {
 		return nil, err
 	}
 	return user, nil
-}
+}
+
+func (db *DB) UpdateUser(user *models.User) error {
+	_, err := db.Exec(`
+		UPDATE users
+		SET email = ?, display_name = ?, last_workspace_id = ?, last_opened_file_path = ?
+		WHERE id = ?`,
+		user.Email, user.DisplayName, user.LastWorkspaceID, user.LastOpenedFilePath, user.ID)
+	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) 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 {
+	_, err := db.Exec("DELETE FROM users WHERE id = ?", id)
+	return err
+}
+
+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
+}

backend/internal/models/user.go

@@ -5,13 +5,15 @@ import (
 )
 
 type User struct {
-	ID           int       `json:"id" validate:"required,min=1"`
+	ID                 int       `json:"id" validate:"required,min=1"`
-	Username     string    `json:"username" validate:"required"`
+	Email              string    `json:"email" validate:"required,email"`
-	Email        string    `json:"email" validate:"required,email"`
+	DisplayName        string    `json:"displayName"`
-	PasswordHash string    `json:"-"`
+	PasswordHash       string    `json:"-"`
-	CreatedAt    time.Time `json:"createdAt"`
+	CreatedAt          time.Time `json:"createdAt"`
+	LastWorkspaceID    int       `json:"lastWorkspaceId"`
+	LastOpenedFilePath string    `json:"lastOpenedFilePath"`
 }
 
 func (u *User) Validate() error {
 	return validate.Struct(u)
-}
+}