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

Move last opened file to workspaces table

Browse Source
This commit is contained in:
Matúš Námešný
2024-10-30 21:37:07 +01:00
parent 1086c402ec
commit bef682e5cb
6 changed files with 57 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
backend/internal/db/users.go
View File

@@ -81,15 +81,13 @@ 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
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).
SELECT
id, email, display_name, role, created_at,
last_workspace_id
FROM users
WHERE 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,
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).
SELECT
id, email, display_name, password_hash, role, created_at,
last_workspace_id
FROM users
WHERE 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 {