P2 redesign · phase 2: store rewrite — sources, slim schedules, repo maintenance

Go-side data model rebuilt against migration 0008. The fat-Schedule shape (paths/excludes/tags/retention/manual/kind/options/hooks) is gone; that surface lives on source_groups now. * store/types.go - Schedule slimmed to {id, host_id, cron, enabled, source_group_ids, timestamps}. SourceGroupIDs populated by Get/List, accepted on Create/Update so callers pass desired junction state in one shape. - SourceGroup added: name (= snapshot tag), includes/excludes, retention_policy, retry_max + retry_backoff_seconds, cached conflict_dimension. - HostRepoMaintenance added: forget/prune/check cadences + enabled. - PendingRun added: offline-retry queue. - Host loses RepoInitialisedAt; gains BandwidthUpKBps + BandwidthDownKBps. - RetentionPolicy moves home from "schedule field" to "source group field" but the type itself + Summary() method unchanged. * store/sources.go (new) — CRUD + GetByName + ConflictDimension cache. Group writes bump host_schedule_version; conflict cache writes don't (server-internal projection, agent doesn't see it). * store/maintenance.go (new) — CreateDefault is idempotent (INSERT OR IGNORE). UpdateRepoMaintenance doesn't bump schedule version because these run on the server's own ticker, not the agent's local cron. * store/pending.go (new) — Enqueue / DueRunsForRetry / Bump / Delete. * store/schedules.go — rewritten for slim shape + junction CRUD. Update wipes the schedule_source_groups junction wholesale and re-inserts (simpler than diffing). Adds SchedulesUsingGroup for retention-conflict detection + UI labels. * store/hosts.go — drops repo_initialised_at scan, adds bandwidth scan. New SetHostBandwidth helper. * HTTP layer — temporarily stubbed during this rewrite (501 returns with redesign_in_progress error code). Phase 3 fills these in against the new shape: - schedules.go REST CRUD - schedule_push.go agent reconciliation - ui_schedules.go HTML form CRUD Run-now-per-host + Init-repo handlers in ui_handlers.go also stubbed — both go away in the new model (Run-now per source group; auto-init at host enrolment). * enrollment.go — replaces "seed manual schedule from typed paths" with "seed default source group + repo-maintenance row." The default group gets the typed paths as its includes; operator edits later via Sources tab. * ws/handler.go — drops the MarkHostRepoInitialised projection (column is gone; auto-init makes it derivable from latest init job's status). Tests: * store: existing schedule test rewritten for slim shape + junction; new sources_test.go covers source-group CRUD, name uniqueness, conflict cache, repo-maintenance defaults + idempotent seed, pending-runs queue lifecycle. * http: schedules_test.go and schedule_push_test.go deleted — both exercised the obsolete fat-schedule API. Phase 3 rewrites them against the new endpoints. go test ./... green. cmd/server + cmd/agent build. The UI is broken end-to-end (schedules / sources / repo tabs all hit 501 stubs); Phase 3 restores REST + on-the-wire reconciliation; Phase 4 rewires the UI templates against the new model. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-02 21:30:41 +01:00
parent e717b6998c
commit e7eea7afac
16 changed files with 1076 additions and 1928 deletions
@@ -0,0 +1,261 @@
+package store
+
+import (
+	"context"
+	"database/sql"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"time"
+)
+
+// CreateSourceGroup inserts a new group + bumps host_schedule_version
+// in one tx. Group name doubles as the snapshot tag on backups; the
+// (host_id, name) UNIQUE constraint enforces tag unambiguity.
+func (st *Store) CreateSourceGroup(ctx context.Context, g *SourceGroup) error {
+	if g.ID == "" || g.HostID == "" || g.Name == "" {
+		return errors.New("store: source group id, host_id, name required")
+	}
+	now := time.Now().UTC()
+	g.CreatedAt = now
+	g.UpdatedAt = now
+	if g.Includes == nil {
+		g.Includes = []string{}
+	}
+	if g.Excludes == nil {
+		g.Excludes = []string{}
+	}
+	if g.RetryMax == 0 {
+		g.RetryMax = 3
+	}
+	if g.RetryBackoffSeconds == 0 {
+		g.RetryBackoffSeconds = 60
+	}
+	includesJSON, _ := json.Marshal(g.Includes)
+	excludesJSON, _ := json.Marshal(g.Excludes)
+	retentionJSON, _ := json.Marshal(g.RetentionPolicy)
+
+	tx, err := st.db.BeginTx(ctx, nil)
+	if err != nil {
+		return fmt.Errorf("store: begin tx: %w", err)
+	}
+	defer func() { _ = tx.Rollback() }()
+
+	if _, err := tx.ExecContext(ctx,
+		`INSERT INTO source_groups (
+			id, host_id, name, includes, excludes, retention_policy,
+			retry_max, retry_backoff_seconds, conflict_dimension,
+			created_at, updated_at
+		) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+		g.ID, g.HostID, g.Name,
+		string(includesJSON), string(excludesJSON), string(retentionJSON),
+		g.RetryMax, g.RetryBackoffSeconds,
+		nullableString(g.ConflictDimension),
+		now.Format(time.RFC3339Nano), now.Format(time.RFC3339Nano),
+	); err != nil {
+		return fmt.Errorf("store: create source group: %w", err)
+	}
+	if err := bumpHostScheduleVersionTx(ctx, tx, g.HostID); err != nil {
+		return err
+	}
+	return tx.Commit()
+}
+
+// UpdateSourceGroup replaces every editable field on an existing row
+// and bumps host_schedule_version. Returns ErrNotFound if no row matched.
+func (st *Store) UpdateSourceGroup(ctx context.Context, g *SourceGroup) error {
+	if g.ID == "" || g.HostID == "" || g.Name == "" {
+		return errors.New("store: source group id, host_id, name required")
+	}
+	if g.Includes == nil {
+		g.Includes = []string{}
+	}
+	if g.Excludes == nil {
+		g.Excludes = []string{}
+	}
+	includesJSON, _ := json.Marshal(g.Includes)
+	excludesJSON, _ := json.Marshal(g.Excludes)
+	retentionJSON, _ := json.Marshal(g.RetentionPolicy)
+	now := time.Now().UTC()
+
+	tx, err := st.db.BeginTx(ctx, nil)
+	if err != nil {
+		return fmt.Errorf("store: begin tx: %w", err)
+	}
+	defer func() { _ = tx.Rollback() }()
+
+	res, err := tx.ExecContext(ctx,
+		`UPDATE source_groups SET
+			name = ?, includes = ?, excludes = ?, retention_policy = ?,
+			retry_max = ?, retry_backoff_seconds = ?, conflict_dimension = ?,
+			updated_at = ?
+		 WHERE id = ? AND host_id = ?`,
+		g.Name,
+		string(includesJSON), string(excludesJSON), string(retentionJSON),
+		g.RetryMax, g.RetryBackoffSeconds,
+		nullableString(g.ConflictDimension),
+		now.Format(time.RFC3339Nano),
+		g.ID, g.HostID,
+	)
+	if err != nil {
+		return fmt.Errorf("store: update source group: %w", err)
+	}
+	n, _ := res.RowsAffected()
+	if n == 0 {
+		return ErrNotFound
+	}
+	g.UpdatedAt = now
+	if err := bumpHostScheduleVersionTx(ctx, tx, g.HostID); err != nil {
+		return err
+	}
+	return tx.Commit()
+}
+
+// DeleteSourceGroup removes a group and bumps host_schedule_version.
+// Junction rows in schedule_source_groups go via ON DELETE CASCADE.
+// Caller is expected to have already enforced the "default group
+// can't be the only one" UI rule; this layer just deletes.
+func (st *Store) DeleteSourceGroup(ctx context.Context, hostID, groupID string) error {
+	tx, err := st.db.BeginTx(ctx, nil)
+	if err != nil {
+		return fmt.Errorf("store: begin tx: %w", err)
+	}
+	defer func() { _ = tx.Rollback() }()
+
+	res, err := tx.ExecContext(ctx,
+		`DELETE FROM source_groups WHERE id = ? AND host_id = ?`,
+		groupID, hostID)
+	if err != nil {
+		return fmt.Errorf("store: delete source group: %w", err)
+	}
+	n, _ := res.RowsAffected()
+	if n == 0 {
+		return ErrNotFound
+	}
+	if err := bumpHostScheduleVersionTx(ctx, tx, hostID); err != nil {
+		return err
+	}
+	return tx.Commit()
+}
+
+// GetSourceGroup returns one group by (host_id, id). ErrNotFound on miss.
+func (st *Store) GetSourceGroup(ctx context.Context, hostID, groupID string) (*SourceGroup, error) {
+	row := st.db.QueryRowContext(ctx,
+		`SELECT id, host_id, name, includes, excludes, retention_policy,
+			retry_max, retry_backoff_seconds, conflict_dimension,
+			created_at, updated_at
+		 FROM source_groups WHERE id = ? AND host_id = ?`,
+		groupID, hostID)
+	g, err := scanSourceGroup(row)
+	if errors.Is(err, sql.ErrNoRows) {
+		return nil, ErrNotFound
+	}
+	return g, err
+}
+
+// GetSourceGroupByName resolves a group by its (host-unique) name.
+// Used by retention-conflict detection and the auto-init flow.
+func (st *Store) GetSourceGroupByName(ctx context.Context, hostID, name string) (*SourceGroup, error) {
+	row := st.db.QueryRowContext(ctx,
+		`SELECT id, host_id, name, includes, excludes, retention_policy,
+			retry_max, retry_backoff_seconds, conflict_dimension,
+			created_at, updated_at
+		 FROM source_groups WHERE host_id = ? AND name = ?`,
+		hostID, name)
+	g, err := scanSourceGroup(row)
+	if errors.Is(err, sql.ErrNoRows) {
+		return nil, ErrNotFound
+	}
+	return g, err
+}
+
+// ListSourceGroupsByHost returns every group for a host, ordered
+// by name (so 'default' isn't always at the bottom alphabetically —
+// well, it usually IS the only 'd' name on a fresh host so this
+// works out fine). Empty slice on miss.
+func (st *Store) ListSourceGroupsByHost(ctx context.Context, hostID string) ([]SourceGroup, error) {
+	rows, err := st.db.QueryContext(ctx,
+		`SELECT id, host_id, name, includes, excludes, retention_policy,
+			retry_max, retry_backoff_seconds, conflict_dimension,
+			created_at, updated_at
+		 FROM source_groups WHERE host_id = ? ORDER BY name`,
+		hostID)
+	if err != nil {
+		return nil, fmt.Errorf("store: list source groups: %w", err)
+	}
+	defer rows.Close()
+	out := []SourceGroup{}
+	for rows.Next() {
+		g, err := scanSourceGroupRow(rows)
+		if err != nil {
+			return nil, err
+		}
+		out = append(out, *g)
+	}
+	return out, rows.Err()
+}
+
+// SetSourceGroupConflict updates only the cached conflict_dimension.
+// Doesn't bump schedule version (the cache is server-internal, agent
+// doesn't see it). Empty string clears the conflict.
+func (st *Store) SetSourceGroupConflict(ctx context.Context, groupID, dimension string) error {
+	_, err := st.db.ExecContext(ctx,
+		`UPDATE source_groups SET conflict_dimension = ? WHERE id = ?`,
+		nullableString(dimension), groupID)
+	if err != nil {
+		return fmt.Errorf("store: set source group conflict: %w", err)
+	}
+	return nil
+}
+
+// ----- scan helpers --------------------------------------------------
+
+func scanSourceGroup(row *sql.Row) (*SourceGroup, error) {
+	return scanSourceGroupRow(row)
+}
+
+type sourceGroupScanner interface {
+	Scan(dest ...any) error
+}
+
+func scanSourceGroupRow(s sourceGroupScanner) (*SourceGroup, error) {
+	var (
+		out                                          SourceGroup
+		includes, excludes, retention                string
+		conflict                                     sql.NullString
+		createdAt, updatedAt                         string
+	)
+	err := s.Scan(&out.ID, &out.HostID, &out.Name,
+		&includes, &excludes, &retention,
+		&out.RetryMax, &out.RetryBackoffSeconds, &conflict,
+		&createdAt, &updatedAt)
+	if err != nil {
+		return nil, err
+	}
+	if includes != "" {
+		_ = json.Unmarshal([]byte(includes), &out.Includes)
+	}
+	if excludes != "" {
+		_ = json.Unmarshal([]byte(excludes), &out.Excludes)
+	}
+	if retention != "" {
+		_ = json.Unmarshal([]byte(retention), &out.RetentionPolicy)
+	}
+	if conflict.Valid {
+		out.ConflictDimension = conflict.String
+	}
+	if t, err := time.Parse(time.RFC3339Nano, createdAt); err == nil {
+		out.CreatedAt = t
+	}
+	if t, err := time.Parse(time.RFC3339Nano, updatedAt); err == nil {
+		out.UpdatedAt = t
+	}
+	return &out, nil
+}
+
+func nullableString(s string) any {
+	if s == "" {
+		return nil
+	}
+	return s
+}