mirror of
https://github.com/lordmathis/lemma.git
synced 2025-11-06 07:54:22 +00:00
Create workspace on user create
This commit is contained in:
@@ -1,23 +1,76 @@
|
|||||||
package db
|
package db
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"database/sql"
|
||||||
"novamd/internal/models"
|
"novamd/internal/models"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (db *DB) CreateUser(user *models.User) error {
|
func (db *DB) CreateUser(user *models.User) error {
|
||||||
_, err := db.Exec(`
|
tx, err := db.Begin()
|
||||||
INSERT INTO users (email, display_name, password_hash)
|
if err != nil {
|
||||||
VALUES (?, ?, ?)`,
|
return err
|
||||||
user.Email, user.DisplayName, user.PasswordHash)
|
}
|
||||||
return err
|
defer tx.Rollback()
|
||||||
|
|
||||||
|
result, err := tx.Exec(`
|
||||||
|
INSERT INTO users (email, display_name, password_hash, role)
|
||||||
|
VALUES (?, ?, ?, ?)`,
|
||||||
|
user.Email, user.DisplayName, user.PasswordHash, user.Role)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
userID, err := result.LastInsertId()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
user.ID = int(userID)
|
||||||
|
|
||||||
|
// Create default workspace
|
||||||
|
defaultWorkspace := &models.Workspace{
|
||||||
|
UserID: user.ID,
|
||||||
|
Name: "Main",
|
||||||
|
}
|
||||||
|
err = db.createWorkspaceTx(tx, defaultWorkspace)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update user's last workspace ID
|
||||||
|
_, err = tx.Exec("UPDATE users SET last_workspace_id = ? WHERE id = ?", defaultWorkspace.ID, user.ID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
err = tx.Commit()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
user.LastWorkspaceID = defaultWorkspace.ID
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
id, err := result.LastInsertId()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
workspace.ID = int(id)
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (db *DB) GetUserByID(id int) (*models.User, error) {
|
func (db *DB) GetUserByID(id int) (*models.User, error) {
|
||||||
user := &models.User{}
|
user := &models.User{}
|
||||||
err := db.QueryRow(`
|
err := db.QueryRow(`
|
||||||
SELECT id, email, display_name, created_at, last_workspace_id, last_opened_file_path
|
SELECT id, email, display_name, role, created_at, last_workspace_id, last_opened_file_path
|
||||||
FROM users WHERE id = ?`, id).
|
FROM users WHERE id = ?`, id).
|
||||||
Scan(&user.ID, &user.Email, &user.DisplayName, &user.CreatedAt,
|
Scan(&user.ID, &user.Email, &user.DisplayName, &user.Role, &user.CreatedAt,
|
||||||
&user.LastWorkspaceID, &user.LastOpenedFilePath)
|
&user.LastWorkspaceID, &user.LastOpenedFilePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -28,9 +81,9 @@ func (db *DB) GetUserByID(id int) (*models.User, error) {
|
|||||||
func (db *DB) GetUserByEmail(email string) (*models.User, error) {
|
func (db *DB) GetUserByEmail(email string) (*models.User, error) {
|
||||||
user := &models.User{}
|
user := &models.User{}
|
||||||
err := db.QueryRow(`
|
err := db.QueryRow(`
|
||||||
SELECT id, email, display_name, password_hash, created_at, last_workspace_id, last_opened_file_path
|
SELECT id, email, display_name, password_hash, role, created_at, last_workspace_id, last_opened_file_path
|
||||||
FROM users WHERE email = ?`, email).
|
FROM users WHERE email = ?`, email).
|
||||||
Scan(&user.ID, &user.Email, &user.DisplayName, &user.PasswordHash, &user.CreatedAt,
|
Scan(&user.ID, &user.Email, &user.DisplayName, &user.PasswordHash, &user.Role, &user.CreatedAt,
|
||||||
&user.LastWorkspaceID, &user.LastOpenedFilePath)
|
&user.LastWorkspaceID, &user.LastOpenedFilePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -41,9 +94,9 @@ func (db *DB) GetUserByEmail(email string) (*models.User, error) {
|
|||||||
func (db *DB) UpdateUser(user *models.User) error {
|
func (db *DB) UpdateUser(user *models.User) error {
|
||||||
_, err := db.Exec(`
|
_, err := db.Exec(`
|
||||||
UPDATE users
|
UPDATE users
|
||||||
SET email = ?, display_name = ?, last_workspace_id = ?, last_opened_file_path = ?
|
SET email = ?, display_name = ?, role = ?, last_workspace_id = ?, last_opened_file_path = ?
|
||||||
WHERE id = ?`,
|
WHERE id = ?`,
|
||||||
user.Email, user.DisplayName, user.LastWorkspaceID, user.LastOpenedFilePath, user.ID)
|
user.Email, user.DisplayName, user.Role, user.LastWorkspaceID, user.LastOpenedFilePath, user.ID)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -32,6 +32,33 @@ func (fs *FileSystem) GetWorkspacePath(userID, workspaceID int) string {
|
|||||||
return filepath.Join(fs.RootDir, fmt.Sprintf("%d", userID), fmt.Sprintf("%d", workspaceID))
|
return filepath.Join(fs.RootDir, fmt.Sprintf("%d", userID), fmt.Sprintf("%d", workspaceID))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (fs *FileSystem) InitializeUserWorkspace(userID, workspaceID int) error {
|
||||||
|
workspacePath := fs.GetWorkspacePath(userID, workspaceID)
|
||||||
|
err := os.MkdirAll(workspacePath, 0755)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to create workspace directory: %w", err)
|
||||||
|
}
|
||||||
|
// Optionally, create a welcome file in the new workspace
|
||||||
|
// welcomeFilePath := filepath.Join(workspacePath, "Welcome.md")
|
||||||
|
// welcomeContent := []byte("# Welcome to Your Main Workspace\n\nThis is your default workspace in NovaMD. You can start creating and editing files right away!")
|
||||||
|
// err = os.WriteFile(welcomeFilePath, welcomeContent, 0644)
|
||||||
|
// if err != nil {
|
||||||
|
// return fmt.Errorf("failed to create welcome file: %w", err)
|
||||||
|
// }
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (fs *FileSystem) DeleteUserWorkspace(userID, workspaceID int) error {
|
||||||
|
workspacePath := fs.GetWorkspacePath(userID, workspaceID)
|
||||||
|
err := os.RemoveAll(workspacePath)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to delete workspace directory: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (fs *FileSystem) ValidatePath(userID, workspaceID int, path string) (string, error) {
|
func (fs *FileSystem) ValidatePath(userID, workspaceID int, path string) (string, error) {
|
||||||
workspacePath := fs.GetWorkspacePath(userID, workspaceID)
|
workspacePath := fs.GetWorkspacePath(userID, workspaceID)
|
||||||
fullPath := filepath.Join(workspacePath, path)
|
fullPath := filepath.Join(workspacePath, path)
|
||||||
|
|||||||
@@ -4,11 +4,20 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type UserRole string
|
||||||
|
|
||||||
|
const (
|
||||||
|
RoleAdmin UserRole = "admin"
|
||||||
|
RoleEditor UserRole = "editor"
|
||||||
|
RoleViewer UserRole = "viewer"
|
||||||
|
)
|
||||||
|
|
||||||
type User struct {
|
type User struct {
|
||||||
ID int `json:"id" validate:"required,min=1"`
|
ID int `json:"id" validate:"required,min=1"`
|
||||||
Email string `json:"email" validate:"required,email"`
|
Email string `json:"email" validate:"required,email"`
|
||||||
DisplayName string `json:"displayName"`
|
DisplayName string `json:"displayName"`
|
||||||
PasswordHash string `json:"-"`
|
PasswordHash string `json:"-"`
|
||||||
|
Role UserRole `json:"role" validate:"required,oneof=admin editor viewer"`
|
||||||
CreatedAt time.Time `json:"createdAt"`
|
CreatedAt time.Time `json:"createdAt"`
|
||||||
LastWorkspaceID int `json:"lastWorkspaceId"`
|
LastWorkspaceID int `json:"lastWorkspaceId"`
|
||||||
LastOpenedFilePath string `json:"lastOpenedFilePath"`
|
LastOpenedFilePath string `json:"lastOpenedFilePath"`
|
||||||
|
|||||||
Reference in New Issue
Block a user