Improve admin dashboard

backend/internal/db/users.go

@@ -6,10 +6,10 @@ import (
 )
 
 // CreateUser inserts a new user record into the database
-func (db *DB) CreateUser(user *models.User) error {
+func (db *DB) CreateUser(user *models.User) (*models.User, error) {
 	tx, err := db.Begin()
 	if err != nil {
-		return err
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -18,15 +18,21 @@ func (db *DB) CreateUser(user *models.User) error {
 		VALUES (?, ?, ?, ?)`,
 		user.Email, user.DisplayName, user.PasswordHash, user.Role)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	userID, err := result.LastInsertId()
 	if err != nil {
-		return err
+		return nil, err
 	}
 	user.ID = int(userID)
 
+	// Retrieve the created_at timestamp
+	err = tx.QueryRow("SELECT created_at FROM users WHERE id = ?", user.ID).Scan(&user.CreatedAt)
+	if err != nil {
+		return nil, err
+	}
+
 	// Create default workspace with default settings
 	defaultWorkspace := &models.Workspace{
 		UserID: user.ID,
@@ -37,22 +43,22 @@ func (db *DB) CreateUser(user *models.User) error {
 	// Create workspace with settings
 	err = db.createWorkspaceTx(tx, defaultWorkspace)
 	if err != nil {
-		return err
+		return nil, 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
+		return nil, err
 	}
 
 	err = tx.Commit()
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	user.LastWorkspaceID = defaultWorkspace.ID
-	return nil
+	return user, nil
 }
 
 // Helper function to create a workspace in a transaction

backend/internal/handlers/admin_handlers.go

@@ -75,18 +75,19 @@ func (h *Handler) AdminCreateUser() http.HandlerFunc {
 			Role:         req.Role,
 		}
 
-		if err := h.DB.CreateUser(user); err != nil {
+		insertedUser, err := h.DB.CreateUser(user)
+		if err != nil {
 			http.Error(w, "Failed to create user", http.StatusInternalServerError)
 			return
 		}
 
 		// Initialize user workspace
-		if err := h.FS.InitializeUserWorkspace(user.ID, user.LastWorkspaceID); err != nil {
+		if err := h.FS.InitializeUserWorkspace(insertedUser.ID, insertedUser.LastWorkspaceID); err != nil {
 			http.Error(w, "Failed to initialize user workspace", http.StatusInternalServerError)
 			return
 		}
 
-		respondJSON(w, user)
+		respondJSON(w, insertedUser)
 	}
 }
 
@@ -197,7 +198,7 @@ func (h *Handler) AdminDeleteUser() http.HandlerFunc {
 			return
 		}
 
-		w.WriteHeader(http.StatusOK)
+		w.WriteHeader(http.StatusNoContent)
 	}
 }
 

backend/internal/user/user.go

@@ -47,69 +47,18 @@ func (s *UserService) SetupAdminUser(adminEmail, adminPassword string) (*models.
 		Role:         models.RoleAdmin,
 	}
 
-	err = s.DB.CreateUser(adminUser)
+	createdUser, err := s.DB.CreateUser(adminUser)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create admin user: %w", err)
 	}
 
 	// Initialize workspace directory
-	err = s.FS.InitializeUserWorkspace(adminUser.ID, adminUser.LastWorkspaceID)
+	err = s.FS.InitializeUserWorkspace(createdUser.ID, createdUser.LastWorkspaceID)
 	if err != nil {
 		return nil, fmt.Errorf("failed to initialize admin workspace: %w", err)
 	}
 
-	log.Printf("Created admin user with ID: %d and default workspace with ID: %d", adminUser.ID, adminUser.LastWorkspaceID)
+	log.Printf("Created admin user with ID: %d and default workspace with ID: %d", createdUser.ID, createdUser.LastWorkspaceID)
 
 	return adminUser, nil
 }
-
-func (s *UserService) CreateUser(user *models.User) error {
-	err := s.DB.CreateUser(user)
-	if err != nil {
-		return fmt.Errorf("failed to create user: %w", err)
-	}
-
-	err = s.FS.InitializeUserWorkspace(user.ID, user.LastWorkspaceID)
-	if err != nil {
-		return fmt.Errorf("failed to initialize user workspace: %w", err)
-	}
-
-	return nil
-}
-
-func (s *UserService) GetUserByID(id int) (*models.User, error) {
-	return s.DB.GetUserByID(id)
-}
-
-func (s *UserService) GetUserByEmail(email string) (*models.User, error) {
-	return s.DB.GetUserByEmail(email)
-}
-
-func (s *UserService) UpdateUser(user *models.User) error {
-	return s.DB.UpdateUser(user)
-}
-
-func (s *UserService) DeleteUser(id int) error {
-	// First, get the user to check if they exist
-	user, err := s.DB.GetUserByID(id)
-	if err != nil {
-		return fmt.Errorf("failed to get user: %w", err)
-	}
-
-	// Get user's workspaces
-	workspaces, err := s.DB.GetWorkspacesByUserID(id)
-	if err != nil {
-		return fmt.Errorf("failed to get user's workspaces: %w", err)
-	}
-
-	// Delete workspace directories
-	for _, workspace := range workspaces {
-		err = s.FS.DeleteUserWorkspace(user.ID, workspace.ID)
-		if err != nil {
-			return fmt.Errorf("failed to delete workspace files: %w", err)
-		}
-	}
-
-	// Delete user from database (this will cascade delete workspaces)
-	return s.DB.DeleteUser(id)
-}