Add db support for workspaces

This commit is contained in:
2024-10-14 21:08:37 +02:00
parent b36c5b30c6
commit 2d2b596f2c
8 changed files with 212 additions and 38 deletions

View File

@@ -18,6 +18,53 @@ var migrations = []Migration{
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,
password_hash TEXT NOT NULL,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
);
-- Create workspaces table
CREATE TABLE IF NOT EXISTS workspaces (
id INTEGER PRIMARY KEY AUTOINCREMENT,
user_id INTEGER NOT NULL,
name TEXT NOT NULL,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
FOREIGN KEY (user_id) REFERENCES users (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;
`,
},
}
func (db *DB) Migrate() error {

View File

@@ -7,39 +7,37 @@ import (
"novamd/internal/models"
)
func (db *DB) GetSettings(userID int) (models.Settings, error) {
var settings models.Settings
func (db *DB) GetWorkspaceSettings(workspaceID int) (*models.WorkspaceSettings, error) {
var settings models.WorkspaceSettings
var settingsJSON []byte
err := db.QueryRow("SELECT user_id, settings FROM settings WHERE user_id = ?", userID).Scan(&settings.UserID, &settingsJSON)
err := db.QueryRow("SELECT workspace_id, settings FROM workspace_settings WHERE workspace_id = ?", workspaceID).
Scan(&settings.WorkspaceID, &settingsJSON)
if err != nil {
if err == sql.ErrNoRows {
// If no settings found, return default settings
settings.UserID = userID
settings.WorkspaceID = workspaceID
settings.Settings = models.UserSettings{} // This will be filled with defaults later
return settings, nil
return &settings, nil
}
return settings, err
return nil, err
}
err = json.Unmarshal(settingsJSON, &settings.Settings)
if err != nil {
return settings, err
return nil, err
}
return settings, nil
return &settings, nil
}
func (db *DB) SaveSettings(settings models.Settings) error {
if err := settings.Validate(); err != nil {
return err
}
func (db *DB) SaveWorkspaceSettings(settings *models.WorkspaceSettings) error {
settingsJSON, err := json.Marshal(settings.Settings)
if err != nil {
return err
}
_, err = db.Exec("INSERT OR REPLACE INTO settings (user_id, settings) VALUES (?, json(?))", settings.UserID, string(settingsJSON))
_, err = db.Exec("INSERT OR REPLACE INTO workspace_settings (workspace_id, settings) VALUES (?, ?)",
settings.WorkspaceID, settingsJSON)
return err
}
}

View File

@@ -0,0 +1,31 @@
package db
import (
"novamd/internal/models"
)
func (db *DB) CreateUser(user *models.User) error {
_, err := db.Exec("INSERT INTO users (username, email, password_hash) VALUES (?, ?, ?)",
user.Username, user.Email, 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).
Scan(&user.ID, &user.Username, &user.Email, &user.CreatedAt)
if err != nil {
return nil, err
}
return user, nil
}
func (db *DB) GetUserByUsername(username string) (*models.User, error) {
user := &models.User{}
err := db.QueryRow("SELECT id, username, email, password_hash, created_at FROM users WHERE username = ?", username).
Scan(&user.ID, &user.Username, &user.Email, &user.PasswordHash, &user.CreatedAt)
if err != nil {
return nil, err
}
return user, nil
}

View File

@@ -0,0 +1,48 @@
package db
import (
"novamd/internal/models"
)
func (db *DB) CreateWorkspace(workspace *models.Workspace) error {
result, err := db.Exec("INSERT INTO workspaces (user_id, name) VALUES (?, ?, ?)",
workspace.UserID, workspace.Name)
if err != nil {
return err
}
id, err := result.LastInsertId()
if err != nil {
return err
}
workspace.ID = int(id)
return nil
}
func (db *DB) GetWorkspaceByID(id int) (*models.Workspace, error) {
workspace := &models.Workspace{}
err := db.QueryRow("SELECT id, user_id, name, root_path, created_at FROM workspaces WHERE id = ?", id).
Scan(&workspace.ID, &workspace.UserID, &workspace.Name, &workspace.CreatedAt)
if err != nil {
return nil, err
}
return workspace, nil
}
func (db *DB) GetWorkspacesByUserID(userID int) ([]*models.Workspace, error) {
rows, err := db.Query("SELECT id, user_id, name, root_path, created_at FROM workspaces WHERE user_id = ?", userID)
if err != nil {
return nil, err
}
defer rows.Close()
var workspaces []*models.Workspace
for rows.Next() {
workspace := &models.Workspace{}
err := rows.Scan(&workspace.ID, &workspace.UserID, &workspace.Name, &workspace.CreatedAt)
if err != nil {
return nil, err
}
workspaces = append(workspaces, workspace)
}
return workspaces, nil
}