queue-table: Outbound › Queue as the drawn table, Inbound › Queue built
Owner, 2026-10-18: "Фиаско, что очередь не была сделана. Как мы это допустили? Исправляем!" The mockups out-queue and in-queue (design629de5e, guards8525e8e). - postfix: postqueue -j gives each message's size and each recipient's delay_reason (src/postqueue/showq_json.c, format_json(): "delay_reason" only when LEN(why) > 0); QueueListing reads it with the page's 5 s, QueueMessages keeps the notifier's 30 s. - view: one Queue page type for both directions (queue.go), one polled box (queue_body.html): a row per recipient, oldest first, cut at 200 with a foot; the head "N messages · size", "Refreshes on its own" while empty; Last reply is the delay reason, or where the message is (active, hold, incoming) before there was one. Inbound has no Details: an inbound message has no page of its own. - handlers: one read of the queue, split by the recipient's domain against the inbound domains; an outbound recipient is linked to its send-log row (store.SendLogRefsByQueueID, through idx_send_log_queue_id, plan pinned in TestSendLogQueriesUseTheirIndexes), matched without regard to case, else the message's first row. Both pages are the global role's; the inbound one 404s with the relay off. Routes /inbound/queue (+ /fragment), menu, touch menu and sibling strip. - Overview: Queues · Both empty · outbound and inbound with the relay on. - Help: the queue topic rewritten, an Inbound queue topic (word for word with the mockup; domain administrators do not see it, as with the lists). - TestUnbuiltScreensAreOnTheRoadmap and its rule in development.md: an exempted screen must be named in roadmap.md; queue-table leaves the roadmap; guide, architecture, panel-redesign.md updated. Tests: go vet; go test ./internal/web/... ./internal/store ./internal/postfix ./internal/notify pass. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -61,6 +61,8 @@ func TestSendLogQueriesUseTheirIndexes(t *testing.T) {
|
||||
[]string{"SEARCH send_log USING INDEX idx_send_log_domain_id_created_at (domain_id=? AND created_at>?)"}, true},
|
||||
{"busiest hour of an application", peakPerHourQuery(appByLogin), []any{"app1", StatusRejected, since},
|
||||
[]string{"SEARCH send_log USING INDEX idx_send_log_app_login_created_at (app_login=? AND created_at>?)"}, true},
|
||||
{"the rows of queued messages", sendLogRefsQuery(2), []any{"4XcB7k2Jm9z1", "5F00AA12"},
|
||||
[]string{"SEARCH send_log USING INDEX idx_send_log_queue_id (queue_id=?)"}, true},
|
||||
{"open rows", listOpenQuery, []any{since},
|
||||
[]string{"SEARCH send_log USING INDEX idx_send_log_open (created_at<?)"}, true},
|
||||
{"open rows counted", countOpenQuery, []any{since},
|
||||
|
||||
@@ -621,3 +621,57 @@ func (s *Store) DeleteSendLogBefore(cutoff time.Time) (int64, error) {
|
||||
n, _ := res.RowsAffected()
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// SendLogRef is one send-log row as Outbound › Queue needs it: the row's id,
|
||||
// for the link to its page, and the recipient, to tell the rows of one
|
||||
// message apart.
|
||||
type SendLogRef struct {
|
||||
ID int64
|
||||
To string
|
||||
}
|
||||
|
||||
// sendLogRefsChunk keeps one query's parameters well under SQLite's limit
|
||||
// (SQLITE_MAX_VARIABLE_NUMBER, 32766 since 3.32.0, https://sqlite.org/limits.html).
|
||||
const sendLogRefsChunk = 500
|
||||
|
||||
// sendLogRefsQuery reads the rows of n queue ids, through idx_send_log_queue_id
|
||||
// (TestSendLogQueriesUseTheirIndexes).
|
||||
func sendLogRefsQuery(n int) string {
|
||||
marks := strings.TrimSuffix(strings.Repeat("?,", n), ",")
|
||||
return `SELECT id, queue_id, COALESCE(to_addr, '') FROM send_log WHERE queue_id IN (` + marks + `) ORDER BY id`
|
||||
}
|
||||
|
||||
// SendLogRefsByQueueID returns the send-log rows of each of the queue ids, in
|
||||
// row order: what Outbound › Queue links a waiting recipient to. An id with no
|
||||
// row - the panel's own mail, a bounce, a row past the retention - is absent.
|
||||
func (s *Store) SendLogRefsByQueueID(queueIDs []string) (map[string][]SendLogRef, error) {
|
||||
out := make(map[string][]SendLogRef)
|
||||
for start := 0; start < len(queueIDs); start += sendLogRefsChunk {
|
||||
chunk := queueIDs[start:min(start+sendLogRefsChunk, len(queueIDs))]
|
||||
args := make([]any, len(chunk))
|
||||
for i, id := range chunk {
|
||||
args[i] = id
|
||||
}
|
||||
rows, err := s.db.Query(sendLogRefsQuery(len(chunk)), args...)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("send-log rows by queue id: %w", err)
|
||||
}
|
||||
for rows.Next() {
|
||||
var (
|
||||
ref SendLogRef
|
||||
queueID string
|
||||
)
|
||||
if err := rows.Scan(&ref.ID, &queueID, &ref.To); err != nil {
|
||||
rows.Close()
|
||||
return nil, fmt.Errorf("send-log rows by queue id: %w", err)
|
||||
}
|
||||
out[queueID] = append(out[queueID], ref)
|
||||
}
|
||||
err = rows.Err()
|
||||
rows.Close()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("send-log rows by queue id: %w", err)
|
||||
}
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
@@ -560,3 +560,29 @@ func TestCloseUnmatchedTestMessages(t *testing.T) {
|
||||
t.Errorf("the row with a queue id = %+v", r)
|
||||
}
|
||||
}
|
||||
|
||||
// Outbound › Queue links a waiting recipient to its row: the rows of each queue
|
||||
// id asked for, in row order, and nothing for an id with none.
|
||||
func TestSendLogRefsByQueueID(t *testing.T) {
|
||||
s := openTestStore(t)
|
||||
for _, e := range []SendLogEntry{
|
||||
{QueueID: "Q1", Domain: "example.com", From: "a@example.com", To: "x@example.net"},
|
||||
{QueueID: "Q1", Domain: "example.com", From: "a@example.com", To: "y@example.net"},
|
||||
{QueueID: "Q2", Domain: "example.com", From: "a@example.com", To: "z@example.net"},
|
||||
} {
|
||||
if err := s.InsertQueued(e); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
refs, err := s.SendLogRefsByQueueID([]string{"Q1", "NONE"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(refs) != 1 || len(refs["Q1"]) != 2 || refs["Q1"][0].To != "x@example.net" || refs["Q1"][1].To != "y@example.net" ||
|
||||
refs["Q1"][0].ID >= refs["Q1"][1].ID {
|
||||
t.Errorf("refs = %+v", refs)
|
||||
}
|
||||
if refs, err := s.SendLogRefsByQueueID(nil); err != nil || len(refs) != 0 {
|
||||
t.Errorf("no ids: %v, %v", refs, err)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user