mirror of
https://github.com/PerpetualSoftware/pad.git
synced 2026-09-22 10:33:27 +00:00
be68292e03
`pad workspace list` was showing `workspaces.updated_at`, which only moves on workspace-row mutations (rename, settings, members). After this fix the effective UpdatedAt surfaces item activity inside the workspace — answering "where is work happening?" instead of "when was this row last UPDATEd?". Implementation: scalar `MAX(items.updated_at)` subquery in `ListWorkspaces` and `GetUserWorkspaces`, then `effectiveWorkspaceUpdatedAt` picks the later of the two timestamps (portable across SQLite + Postgres, no GREATEST). Read-time approach per the bug's design notes. Visibility-aware: codex review surfaced that a naive MAX leaks activity timing for items the caller can't see. The member subquery mirrors `VisibleCollectionIDs` (`collection_access='all'` short-circuits; for `'specific'` members, system collections + `member_collection_access` + `collection_grants` + `item_grants` gate visibility). The guest subquery limits MAX to items reachable via `collection_grants` / `item_grants`. All grant lookups are workspace-scoped for defense-in-depth. Four regression tests cover: admin `ListWorkspaces`, member all-access, member specific-access leak guard, and guest leak guard.
270 lines
8.4 KiB
Go
270 lines
8.4 KiB
Go
package store
|
|
|
|
import (
|
|
"database/sql"
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/PerpetualSoftware/pad/internal/models"
|
|
)
|
|
|
|
// ListWorkspaces returns every non-deleted workspace, unordered by user.
|
|
// This is intended for admin-panel cross-tenant views and the
|
|
// pre-auth/fresh-install bootstrap. End-user workspace switchers should
|
|
// call GetUserWorkspaces instead, which scopes to the user's memberships.
|
|
func (s *Store) ListWorkspaces() ([]models.Workspace, error) {
|
|
// BUG-1481: workspaces.updated_at only moves when the workspace row
|
|
// itself changes (rename, settings, members) — it does NOT reflect
|
|
// item activity inside the workspace. We surface the latter via
|
|
// MAX(items.updated_at) and expose the later of the two as the
|
|
// workspace's effective UpdatedAt, so `pad workspace list` answers
|
|
// "where is work happening?" rather than "when was this row last
|
|
// renamed?". Done in two steps (scalar subquery + Go-side max) to
|
|
// stay portable across SQLite (no GREATEST) and Postgres.
|
|
rows, err := s.db.Query(s.q(`
|
|
SELECT w.id, w.name, w.slug, w.owner_id, COALESCE(ou.username, ''), w.description, w.settings, w.created_at, w.updated_at,
|
|
(SELECT MAX(i.updated_at) FROM items i WHERE i.workspace_id = w.id AND i.deleted_at IS NULL)
|
|
FROM workspaces w
|
|
LEFT JOIN users ou ON ou.id = w.owner_id
|
|
WHERE w.deleted_at IS NULL
|
|
ORDER BY w.name ASC
|
|
`))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer rows.Close()
|
|
|
|
var workspaces []models.Workspace
|
|
for rows.Next() {
|
|
var w models.Workspace
|
|
var createdAt, updatedAt string
|
|
var lastItemActivity sql.NullString
|
|
if err := rows.Scan(&w.ID, &w.Name, &w.Slug, &w.OwnerID, &w.OwnerUsername, &w.Description, &w.Settings, &createdAt, &updatedAt, &lastItemActivity); err != nil {
|
|
return nil, err
|
|
}
|
|
w.CreatedAt = parseTime(createdAt)
|
|
w.UpdatedAt = effectiveWorkspaceUpdatedAt(updatedAt, lastItemActivity)
|
|
w.HydrateDerivedFields()
|
|
workspaces = append(workspaces, w)
|
|
}
|
|
return workspaces, rows.Err()
|
|
}
|
|
|
|
// effectiveWorkspaceUpdatedAt returns the later of the workspace's own
|
|
// updated_at and the most recent item activity inside it. See BUG-1481
|
|
// for why item activity is the meaningful freshness signal.
|
|
func effectiveWorkspaceUpdatedAt(workspaceUpdatedAt string, lastItemActivity sql.NullString) time.Time {
|
|
wsTS := parseTime(workspaceUpdatedAt)
|
|
if !lastItemActivity.Valid || lastItemActivity.String == "" {
|
|
return wsTS
|
|
}
|
|
itemTS := parseTime(lastItemActivity.String)
|
|
if itemTS.After(wsTS) {
|
|
return itemTS
|
|
}
|
|
return wsTS
|
|
}
|
|
|
|
func (s *Store) CreateWorkspace(input models.WorkspaceCreate) (*models.Workspace, error) {
|
|
id := newID()
|
|
ts := now()
|
|
|
|
slug := input.Slug
|
|
if slug == "" {
|
|
slug = slugify(input.Name)
|
|
}
|
|
|
|
// Workspace slugs are globally unique (not scoped to a workspace
|
|
// like collection/item slugs), so we use a workspace-specific
|
|
// uniqueness check rather than the generic uniqueSlug helper.
|
|
finalSlug, err := s.uniqueWorkspaceSlug(slug)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
settings := input.Settings
|
|
if settings == "" {
|
|
settings = "{}"
|
|
}
|
|
settings, err = models.NormalizeWorkspaceSettings(settings)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("normalize workspace settings: %w", err)
|
|
}
|
|
if input.Context != nil {
|
|
settings, err = models.ApplyWorkspaceContext(settings, input.Context)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("apply workspace context: %w", err)
|
|
}
|
|
}
|
|
|
|
_, err = s.db.Exec(s.q(`
|
|
INSERT INTO workspaces (id, name, slug, owner_id, description, settings, created_at, updated_at)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
|
`), id, input.Name, finalSlug, input.OwnerID, input.Description, settings, ts, ts)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("insert workspace: %w", err)
|
|
}
|
|
|
|
return s.GetWorkspaceBySlug(finalSlug)
|
|
}
|
|
|
|
func (s *Store) uniqueWorkspaceSlug(baseSlug string) (string, error) {
|
|
slug := baseSlug
|
|
for i := 2; ; i++ {
|
|
var count int
|
|
err := s.db.QueryRow(s.q("SELECT COUNT(*) FROM workspaces WHERE slug = ? AND deleted_at IS NULL"), slug).Scan(&count)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
if count == 0 {
|
|
return slug, nil
|
|
}
|
|
slug = fmt.Sprintf("%s-%d", baseSlug, i)
|
|
}
|
|
}
|
|
|
|
func (s *Store) GetWorkspaceBySlug(slug string) (*models.Workspace, error) {
|
|
var w models.Workspace
|
|
var createdAt, updatedAt string
|
|
var deletedAt *string
|
|
|
|
err := s.db.QueryRow(s.q(`
|
|
SELECT w.id, w.name, w.slug, w.owner_id, COALESCE(ou.username, ''), w.description, w.settings, w.created_at, w.updated_at, w.deleted_at
|
|
FROM workspaces w
|
|
LEFT JOIN users ou ON ou.id = w.owner_id
|
|
WHERE w.slug = ? AND w.deleted_at IS NULL
|
|
`), slug).Scan(&w.ID, &w.Name, &w.Slug, &w.OwnerID, &w.OwnerUsername, &w.Description, &w.Settings, &createdAt, &updatedAt, &deletedAt)
|
|
if err == sql.ErrNoRows {
|
|
return nil, nil
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
w.CreatedAt = parseTime(createdAt)
|
|
w.UpdatedAt = parseTime(updatedAt)
|
|
w.DeletedAt = parseTimePtr(deletedAt)
|
|
w.HydrateDerivedFields()
|
|
return &w, nil
|
|
}
|
|
|
|
func (s *Store) GetWorkspaceByID(id string) (*models.Workspace, error) {
|
|
var w models.Workspace
|
|
var createdAt, updatedAt string
|
|
var deletedAt *string
|
|
|
|
err := s.db.QueryRow(s.q(`
|
|
SELECT w.id, w.name, w.slug, w.owner_id, COALESCE(ou.username, ''), w.description, w.settings, w.created_at, w.updated_at, w.deleted_at
|
|
FROM workspaces w
|
|
LEFT JOIN users ou ON ou.id = w.owner_id
|
|
WHERE w.id = ? AND w.deleted_at IS NULL
|
|
`), id).Scan(&w.ID, &w.Name, &w.Slug, &w.OwnerID, &w.OwnerUsername, &w.Description, &w.Settings, &createdAt, &updatedAt, &deletedAt)
|
|
if err == sql.ErrNoRows {
|
|
return nil, nil
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
w.CreatedAt = parseTime(createdAt)
|
|
w.UpdatedAt = parseTime(updatedAt)
|
|
w.DeletedAt = parseTimePtr(deletedAt)
|
|
w.HydrateDerivedFields()
|
|
return &w, nil
|
|
}
|
|
|
|
// GetWorkspacesBySlugForUser finds workspaces matching a slug that are accessible
|
|
// to the given user (owned, member, or guest with grants).
|
|
func (s *Store) GetWorkspacesBySlugForUser(slug, userID string) ([]models.Workspace, error) {
|
|
rows, err := s.db.Query(s.q(`
|
|
SELECT DISTINCT w.id, w.name, w.slug, w.owner_id, COALESCE(ou.username, ''), w.description, w.settings, w.created_at, w.updated_at
|
|
FROM workspaces w
|
|
LEFT JOIN workspace_members wm ON wm.workspace_id = w.id AND wm.user_id = ?
|
|
LEFT JOIN collection_grants cg ON cg.workspace_id = w.id AND cg.user_id = ?
|
|
LEFT JOIN item_grants ig ON ig.workspace_id = w.id AND ig.user_id = ?
|
|
LEFT JOIN users ou ON ou.id = w.owner_id
|
|
WHERE w.slug = ? AND w.deleted_at IS NULL
|
|
AND (w.owner_id = ? OR wm.user_id IS NOT NULL OR cg.user_id IS NOT NULL OR ig.user_id IS NOT NULL)
|
|
`), userID, userID, userID, slug, userID)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("get workspaces by slug for user: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
var result []models.Workspace
|
|
for rows.Next() {
|
|
var w models.Workspace
|
|
var createdAt, updatedAt string
|
|
if err := rows.Scan(&w.ID, &w.Name, &w.Slug, &w.OwnerID, &w.OwnerUsername, &w.Description, &w.Settings, &createdAt, &updatedAt); err != nil {
|
|
return nil, err
|
|
}
|
|
w.CreatedAt = parseTime(createdAt)
|
|
w.UpdatedAt = parseTime(updatedAt)
|
|
w.HydrateDerivedFields()
|
|
result = append(result, w)
|
|
}
|
|
return result, rows.Err()
|
|
}
|
|
|
|
func (s *Store) UpdateWorkspace(slug string, input models.WorkspaceUpdate) (*models.Workspace, error) {
|
|
w, err := s.GetWorkspaceBySlug(slug)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if w == nil {
|
|
return nil, nil
|
|
}
|
|
|
|
ts := now()
|
|
|
|
if input.Name != nil {
|
|
w.Name = *input.Name
|
|
}
|
|
if input.Description != nil {
|
|
w.Description = *input.Description
|
|
}
|
|
if input.Settings != nil {
|
|
w.Settings = *input.Settings
|
|
}
|
|
if input.Context != nil {
|
|
settings, err := models.ApplyWorkspaceContext(w.Settings, input.Context)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("apply workspace context: %w", err)
|
|
}
|
|
w.Settings = settings
|
|
}
|
|
if w.Settings != "" {
|
|
settings, err := models.NormalizeWorkspaceSettings(w.Settings)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("normalize workspace settings: %w", err)
|
|
}
|
|
w.Settings = settings
|
|
}
|
|
|
|
_, err = s.db.Exec(s.q(`
|
|
UPDATE workspaces SET name = ?, description = ?, settings = ?, updated_at = ?
|
|
WHERE id = ?
|
|
`), w.Name, w.Description, w.Settings, ts, w.ID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return s.GetWorkspaceBySlug(slug)
|
|
}
|
|
|
|
func (s *Store) DeleteWorkspace(slug string) error {
|
|
ts := now()
|
|
result, err := s.db.Exec(s.q(`
|
|
UPDATE workspaces SET deleted_at = ?, updated_at = ?
|
|
WHERE slug = ? AND deleted_at IS NULL
|
|
`), ts, ts, slug)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
rows, _ := result.RowsAffected()
|
|
if rows == 0 {
|
|
return sql.ErrNoRows
|
|
}
|
|
return nil
|
|
}
|