Mark unread turn summaries in the switcher and Project rows
This commit is contained in:
+10
-2
@@ -438,6 +438,14 @@ CREATE TABLE lead_notes (
|
||||
updated_at TEXT NOT NULL
|
||||
);
|
||||
CREATE INDEX lead_notes_owner ON lead_notes(owner, created_at);
|
||||
`}, {"add-summary-reads", `
|
||||
CREATE INDEX events_summary ON events(task_id, seq) WHERE kind = 'turn.ended' AND json_extract(payload, '$.summary') = 1;
|
||||
CREATE TABLE summary_reads (
|
||||
login TEXT NOT NULL REFERENCES users(login),
|
||||
task_id TEXT NOT NULL REFERENCES tasks(id),
|
||||
seq INTEGER NOT NULL,
|
||||
PRIMARY KEY (login, task_id)
|
||||
);
|
||||
`}}
|
||||
|
||||
const (
|
||||
@@ -1526,7 +1534,7 @@ func (s *Store) write(ctx context.Context, fn func(tx *sql.Tx, emit emitFunc) er
|
||||
|
||||
const projectColumns = `id, name, repo_path, default_branch, remote, created_by, created_at`
|
||||
|
||||
const taskColumns = `id, project_id, title, merge_title, branch, worktree_path, base_ref, port_base, color, status, created_by, created_at, closed_at, merge_commit, todo_item, forked_from, forked_at, merge_queued_at, workflow_name, workflow_run, workflow_stage, parent_task_id, parent_merge_by, EXISTS (SELECT 1 FROM reviews WHERE reviews.task_id = tasks.id AND reviews.state = 'running'), merging_by != '', discard_state != '' AND status = 'active'`
|
||||
const taskColumns = `id, project_id, title, merge_title, branch, worktree_path, base_ref, port_base, color, status, created_by, created_at, closed_at, merge_commit, todo_item, forked_from, forked_at, merge_queued_at, workflow_name, workflow_run, workflow_stage, parent_task_id, parent_merge_by, EXISTS (SELECT 1 FROM reviews WHERE reviews.task_id = tasks.id AND reviews.state = 'running'), merging_by != '', discard_state != '' AND status = 'active', (SELECT coalesce(max(seq), 0) FROM events WHERE events.task_id = tasks.id AND kind = 'turn.ended' AND json_extract(payload, '$.summary') = 1)`
|
||||
|
||||
const sessionColumns = `id, coalesce(task_id, ''), owner, vendor, model, vendor_session_id, state, role, created_by, created_at, forked_from, forked_at`
|
||||
|
||||
@@ -1560,7 +1568,7 @@ func scanTask(row scanner) (api.Task, error) {
|
||||
workflowStage := ""
|
||||
parentTaskID := ""
|
||||
parentMergeBy := ""
|
||||
err := row.Scan(&t.Id, &t.ProjectId, &t.Title, &t.MergeTitle, &t.Branch, &t.WorktreePath, &t.BaseRef, &t.PortBase, &t.Color, &status, &t.CreatedBy, &createdAt, &closedAt, &mergeCommit, &todoItem, &forkedFrom, &forkedAt, &mergeQueuedAt, &workflowName, &workflowRun, &workflowStage, &parentTaskID, &parentMergeBy, &t.Reviewing, &t.Merging, &t.Discarding)
|
||||
err := row.Scan(&t.Id, &t.ProjectId, &t.Title, &t.MergeTitle, &t.Branch, &t.WorktreePath, &t.BaseRef, &t.PortBase, &t.Color, &status, &t.CreatedBy, &createdAt, &closedAt, &mergeCommit, &todoItem, &forkedFrom, &forkedAt, &mergeQueuedAt, &workflowName, &workflowRun, &workflowStage, &parentTaskID, &parentMergeBy, &t.Reviewing, &t.Merging, &t.Discarding, &t.SummarySeq)
|
||||
if err != nil {
|
||||
return t, err
|
||||
}
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
|
||||
"g.fc.run/misc/byre/internal/api"
|
||||
)
|
||||
|
||||
func (s *Store) SummaryReads(ctx context.Context, login string) (map[string]int64, error) {
|
||||
rows, err := s.db.QueryContext(ctx, `
|
||||
SELECT summary_reads.task_id, summary_reads.seq FROM summary_reads
|
||||
JOIN tasks ON tasks.id = summary_reads.task_id
|
||||
WHERE summary_reads.login = ? AND tasks.status = ?
|
||||
`, login, string(api.TaskStatusActive))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
reads := map[string]int64{}
|
||||
for rows.Next() {
|
||||
taskID := ""
|
||||
seq := int64(0)
|
||||
err = rows.Scan(&taskID, &seq)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
reads[taskID] = seq
|
||||
}
|
||||
return reads, rows.Err()
|
||||
}
|
||||
|
||||
func (s *Store) MarkSummaryRead(ctx context.Context, login, taskID string, seq int64) error {
|
||||
return s.write(ctx, func(tx *sql.Tx, emit emitFunc) error {
|
||||
err := tx.QueryRowContext(ctx, `SELECT id FROM tasks WHERE id = ?`, taskID).Scan(&taskID)
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return fmt.Errorf("task %s: %w", taskID, ErrNotFound)
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
res, err := tx.ExecContext(ctx, `
|
||||
INSERT INTO summary_reads (login, task_id, seq) VALUES (?, ?, ?)
|
||||
ON CONFLICT (login, task_id) DO UPDATE SET seq = excluded.seq WHERE excluded.seq > summary_reads.seq
|
||||
`, login, taskID, seq)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
n, err := res.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if n == 0 {
|
||||
return nil
|
||||
}
|
||||
return emit(api.Event{Kind: "summary.read", Owner: &login, Actor: login, Payload: map[string]any{"task_id": taskID, "seq": seq}})
|
||||
})
|
||||
}
|
||||
Reference in New Issue
Block a user