Mathis/lemma
1
0
Fork 0
mirror of https://github.com/lordmathis/lemma.git synced 2025-11-06 07:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Combine settings and workspaces tables

Browse Source
This commit is contained in:
Matúš Námešný
2024-10-27 16:00:06 +01:00
parent ab7b018f88
commit 4544af8f0f
11 changed files with 281 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/internal/db/migrations.go
View File

@@ -26,21 +26,23 @@ var migrations = []Migration{
last_opened_file_path TEXT
);
-- Create workspaces table
-- Create workspaces table with integrated settings
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,
-- Settings fields
theme TEXT NOT NULL DEFAULT 'light' CHECK(theme IN ('light', 'dark')),
auto_save BOOLEAN NOT NULL DEFAULT 0,
git_enabled BOOLEAN NOT NULL DEFAULT 0,
git_url TEXT,
git_user TEXT,
git_token TEXT,
git_auto_commit BOOLEAN NOT NULL DEFAULT 0,
git_commit_msg_template TEXT DEFAULT '${action} ${filename}',
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)
);
`,
},
}

43
backend/internal/db/settings.go
View File

@@ -1,43 +0,0 @@
package db
import (
"database/sql"
"encoding/json"
"novamd/internal/models"
)
func (db *DB) GetWorkspaceSettings(workspaceID int) (*models.WorkspaceSettings, error) {
var settings models.WorkspaceSettings
var settingsJSON []byte
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.WorkspaceID = workspaceID
settings.Settings = models.UserSettings{} // This will be filled with defaults later
return &settings, nil
}
return nil, err
}
err = json.Unmarshal(settingsJSON, &settings.Settings)
if err != nil {
return nil, err
}
return &settings, nil
}
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 workspace_settings (workspace_id, settings) VALUES (?, ?)",
settings.WorkspaceID, settingsJSON)
return err
}

62
backend/internal/db/user.go → backend/internal/db/users.go
View File

@@ -26,11 +26,14 @@ func (db *DB) CreateUser(user *models.User) error {
}
user.ID = int(userID)
// Create default workspace
// Create default workspace with default settings
defaultWorkspace := &models.Workspace{
UserID: user.ID,
Name: "Main",
}
defaultWorkspace.GetDefaultSettings() // Initialize default settings
// Create workspace with settings
err = db.createWorkspaceTx(tx, defaultWorkspace)
if err != nil {
return err
@@ -52,8 +55,18 @@ func (db *DB) CreateUser(user *models.User) error {
}
func (db *DB) createWorkspaceTx(tx *sql.Tx, workspace *models.Workspace) error {
result, err := tx.Exec("INSERT INTO workspaces (user_id, name) VALUES (?, ?)",
workspace.UserID, workspace.Name)
result, err := tx.Exec(`
INSERT INTO workspaces (
user_id, name,
theme, auto_save,
git_enabled, git_url, git_user, git_token,
git_auto_commit, git_commit_msg_template
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
workspace.UserID, workspace.Name,
workspace.Theme, workspace.AutoSave,
workspace.GitEnabled, workspace.GitURL, workspace.GitUser, workspace.GitToken,
workspace.GitAutoCommit, workspace.GitCommitMsgTemplate,
)
if err != nil {
return err
}
@@ -68,10 +81,15 @@ func (db *DB) createWorkspaceTx(tx *sql.Tx, workspace *models.Workspace) error {
func (db *DB) GetUserByID(id int) (*models.User, error) {
user := &models.User{}
err := db.QueryRow(`
SELECT id, email, display_name, role, created_at, last_workspace_id, last_opened_file_path
FROM users WHERE id = ?`, id).
SELECT
u.id, u.email, u.display_name, u.role, u.created_at,
u.last_workspace_id, u.last_opened_file_path,
COALESCE(w.id, 0) as workspace_id
FROM users u
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.LastOpenedFilePath, &user.LastWorkspaceID)
if err != nil {
return nil, err
}
@@ -82,10 +100,15 @@ func (db *DB) GetUserByEmail(email string) (*models.User, error) {
user := &models.User{}
var lastOpenedFilePath sql.NullString
err := db.QueryRow(`
SELECT id, email, display_name, password_hash, role, created_at, last_workspace_id, last_opened_file_path
FROM users WHERE email = ?`, email).
SELECT
u.id, u.email, u.display_name, u.password_hash, u.role, u.created_at,
u.last_workspace_id, u.last_opened_file_path,
COALESCE(w.id, 0) as workspace_id
FROM users u
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, &lastOpenedFilePath, &user.LastWorkspaceID)
if err != nil {
return nil, err
}
@@ -117,8 +140,25 @@ func (db *DB) UpdateLastOpenedFile(userID int, filePath string) error {
}
func (db *DB) DeleteUser(id int) error {
_, err := db.Exec("DELETE FROM users WHERE id = ?", id)
return err
tx, err := db.Begin()
if err != nil {
return err
}
defer tx.Rollback()
// Delete all user's workspaces first
_, err = tx.Exec("DELETE FROM workspaces WHERE user_id = ?", id)
if err != nil {
return err
}
// Delete the user
_, err = tx.Exec("DELETE FROM users WHERE id = ?", id)
if err != nil {
return err
}
return tx.Commit()
}
func (db *DB) GetLastWorkspaceID(userID int) (int, error) {

59
backend/internal/db/workspace.go
View File

@@ -1,59 +0,0 @@
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, 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, 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
}
func (db *DB) UpdateWorkspace(workspace *models.Workspace) error {
_, err := db.Exec("UPDATE workspaces SET name = ? WHERE id = ? AND user_id = ?",
workspace.Name, workspace.ID, workspace.UserID)
return err
}
func (db *DB) DeleteWorkspace(id int) error {
_, err := db.Exec("DELETE FROM workspaces WHERE id = ?", id)
return err
}

151
backend/internal/db/workspaces.go Normal file
View File

@@ -0,0 +1,151 @@
package db
import (
"novamd/internal/models"
)
func (db *DB) CreateWorkspace(workspace *models.Workspace) error {
// Set default settings if not provided
if workspace.Theme == "" {
workspace.GetDefaultSettings()
}
result, err := db.Exec(`
INSERT INTO workspaces (
user_id, name, theme, auto_save,
git_enabled, git_url, git_user, git_token,
git_auto_commit, git_commit_msg_template
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
workspace.UserID, workspace.Name, workspace.Theme, workspace.AutoSave,
workspace.GitEnabled, workspace.GitURL, workspace.GitUser, workspace.GitToken,
workspace.GitAutoCommit, workspace.GitCommitMsgTemplate,
)
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, created_at,
theme, auto_save,
git_enabled, git_url, git_user, git_token,
git_auto_commit, git_commit_msg_template
FROM workspaces
WHERE id = ?`,
id,
).Scan(
&workspace.ID, &workspace.UserID, &workspace.Name, &workspace.CreatedAt,
&workspace.Theme, &workspace.AutoSave,
&workspace.GitEnabled, &workspace.GitURL, &workspace.GitUser, &workspace.GitToken,
&workspace.GitAutoCommit, &workspace.GitCommitMsgTemplate,
)
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, created_at,
theme, auto_save,
git_enabled, git_url, git_user, git_token,
git_auto_commit, git_commit_msg_template
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,
&workspace.Theme, &workspace.AutoSave,
&workspace.GitEnabled, &workspace.GitURL, &workspace.GitUser, &workspace.GitToken,
&workspace.GitAutoCommit, &workspace.GitCommitMsgTemplate,
)
if err != nil {
return nil, err
}
workspaces = append(workspaces, workspace)
}
return workspaces, nil
}
func (db *DB) UpdateWorkspace(workspace *models.Workspace) error {
_, err := db.Exec(`
UPDATE workspaces
SET
name = ?,
theme = ?,
auto_save = ?,
git_enabled = ?,
git_url = ?,
git_user = ?,
git_token = ?,
git_auto_commit = ?,
git_commit_msg_template = ?
WHERE id = ? AND user_id = ?`,
workspace.Name,
workspace.Theme,
workspace.AutoSave,
workspace.GitEnabled,
workspace.GitURL,
workspace.GitUser,
workspace.GitToken,
workspace.GitAutoCommit,
workspace.GitCommitMsgTemplate,
workspace.ID,
workspace.UserID,
)
return err
}
// UpdateWorkspaceSettings updates only the settings portion of a workspace
// This is useful when you don't want to modify the name or other core workspace properties
func (db *DB) UpdateWorkspaceSettings(workspace *models.Workspace) error {
_, err := db.Exec(`
UPDATE workspaces
SET
theme = ?,
auto_save = ?,
git_enabled = ?,
git_url = ?,
git_user = ?,
git_token = ?,
git_auto_commit = ?,
git_commit_msg_template = ?
WHERE id = ?`,
workspace.Theme,
workspace.AutoSave,
workspace.GitEnabled,
workspace.GitURL,
workspace.GitUser,
workspace.GitToken,
workspace.GitAutoCommit,
workspace.GitCommitMsgTemplate,
workspace.ID,
)
return err
}
func (db *DB) DeleteWorkspace(id int) error {
_, err := db.Exec("DELETE FROM workspaces WHERE id = ?", id)
return err
}