`d4c023b`

webhook/sqlc: paginated delivery listing + count

Authored by mfwolffe <wolffemf@dukes.jmu.edu> yesterday

SHA: d4c023b1b9c388880217efc78fa21f561b46cc85
Parents: dd52f0b
Tree: 0e9a6ad

3 changed files

Status	File	+
M	`internal/webhook/queries/webhooks.sql`	14
M	`internal/webhook/sqlc/querier.go`	4
M	`internal/webhook/sqlc/webhooks.sql.go`	83

internal/webhook/queries/webhooks.sqlmodified

  ORDER BY started_at DESC
  LIMIT $2;
++-- name: ListDeliveriesForWebhookPaged :many
++-- Paginated mirror of ListDeliveriesForWebhook for the REST surface.
++-- Order matches the unpaginated form so callers can swap freely.
++SELECT id, webhook_id, event_kind, event_id, delivery_uuid, response_status,
++       response_truncated, started_at, completed_at, attempt, max_attempts,
++       next_retry_at, status, error_summary, redeliver_of
++FROM webhook_deliveries
++WHERE webhook_id = $1
++ORDER BY started_at DESC
++LIMIT $2 OFFSET $3;
++
++-- name: CountDeliveriesForWebhook :one
++SELECT count(*)::bigint FROM webhook_deliveries WHERE webhook_id = $1;
++
  -- name: ClaimDueDeliveries :many
  -- Hot-path for the deliver worker: picks up to $1 rows that are
  -- pending or in retry-ready state, FOR UPDATE SKIP LOCKED so concurrent

internal/webhook/sqlc/querier.gomodified

  	// with a far-future next_retry_at while it works on it (defense
  	// against re-claim during a long HTTP timeout).
  	ClaimDueDeliveries(ctx context.Context, db DBTX, limit int32) ([]int64, error)
++	CountDeliveriesForWebhook(ctx context.Context, db DBTX, webhookID int64) (int64, error)
  	CreateDelivery(ctx context.Context, db DBTX, arg CreateDeliveryParams) (WebhookDelivery, error)
  	// SPDX-License-Identifier: AGPL-3.0-or-later
  	//
  	// Used by fanout to find subscribers for an event.
  	ListActiveWebhooksForOwner(ctx context.Context, db DBTX, arg ListActiveWebhooksForOwnerParams) ([]Webhook, error)
  	ListDeliveriesForWebhook(ctx context.Context, db DBTX, arg ListDeliveriesForWebhookParams) ([]ListDeliveriesForWebhookRow, error)
++	// Paginated mirror of ListDeliveriesForWebhook for the REST surface.
++	// Order matches the unpaginated form so callers can swap freely.
++	ListDeliveriesForWebhookPaged(ctx context.Context, db DBTX, arg ListDeliveriesForWebhookPagedParams) ([]ListDeliveriesForWebhookPagedRow, error)
  	ListUnprocessedDomainEvents(ctx context.Context, db DBTX, arg ListUnprocessedDomainEventsParams) ([]DomainEvent, error)
  	ListWebhooksForOwner(ctx context.Context, db DBTX, arg ListWebhooksForOwnerParams) ([]Webhook, error)
  	MarkDeliveryPermanentFailure(ctx context.Context, db DBTX, arg MarkDeliveryPermanentFailureParams) error

internal/webhook/sqlc/webhooks.sql.gomodified

  	return items, nil
+ }
++const countDeliveriesForWebhook = `-- name: CountDeliveriesForWebhook :one
++SELECT count(*)::bigint FROM webhook_deliveries WHERE webhook_id = $1
++`
++
++func (q *Queries) CountDeliveriesForWebhook(ctx context.Context, db DBTX, webhookID int64) (int64, error) {
++	row := db.QueryRow(ctx, countDeliveriesForWebhook, webhookID)
++	var column_1 int64
++	err := row.Scan(&column_1)
++	return column_1, err
++}
++
  const createDelivery = `-- name: CreateDelivery :one
  INSERT INTO webhook_deliveries (
      webhook_id, event_kind, event_id, payload, request_headers,
  	return items, nil
+ }
++const listDeliveriesForWebhookPaged = `-- name: ListDeliveriesForWebhookPaged :many
++SELECT id, webhook_id, event_kind, event_id, delivery_uuid, response_status,
++       response_truncated, started_at, completed_at, attempt, max_attempts,
++       next_retry_at, status, error_summary, redeliver_of
++FROM webhook_deliveries
++WHERE webhook_id = $1
++ORDER BY started_at DESC
++LIMIT $2 OFFSET $3
++`
++
++type ListDeliveriesForWebhookPagedParams struct {
++	WebhookID int64
++	Limit     int32
++	Offset    int32
++}
++
++type ListDeliveriesForWebhookPagedRow struct {
++	ID                int64
++	WebhookID         int64
++	EventKind         string
++	EventID           pgtype.Int8
++	DeliveryUuid      pgtype.UUID
++	ResponseStatus    pgtype.Int4
++	ResponseTruncated bool
++	StartedAt         pgtype.Timestamptz
++	CompletedAt       pgtype.Timestamptz
++	Attempt           int32
++	MaxAttempts       int32
++	NextRetryAt       pgtype.Timestamptz
++	Status            WebhookDeliveryStatus
++	ErrorSummary      pgtype.Text
++	RedeliverOf       pgtype.Int8
++}
++
++// Paginated mirror of ListDeliveriesForWebhook for the REST surface.
++// Order matches the unpaginated form so callers can swap freely.
++func (q *Queries) ListDeliveriesForWebhookPaged(ctx context.Context, db DBTX, arg ListDeliveriesForWebhookPagedParams) ([]ListDeliveriesForWebhookPagedRow, error) {
++	rows, err := db.Query(ctx, listDeliveriesForWebhookPaged, arg.WebhookID, arg.Limit, arg.Offset)
++	if err != nil {
++		return nil, err
++	}
++	defer rows.Close()
++	items := []ListDeliveriesForWebhookPagedRow{}
++	for rows.Next() {
++		var i ListDeliveriesForWebhookPagedRow
++		if err := rows.Scan(
++			&i.ID,
++			&i.WebhookID,
++			&i.EventKind,
++			&i.EventID,
++			&i.DeliveryUuid,
++			&i.ResponseStatus,
++			&i.ResponseTruncated,
++			&i.StartedAt,
++			&i.CompletedAt,
++			&i.Attempt,
++			&i.MaxAttempts,
++			&i.NextRetryAt,
++			&i.Status,
++			&i.ErrorSummary,
++			&i.RedeliverOf,
++		); err != nil {
++			return nil, err
++		}
++		items = append(items, i)
++	}
++	if err := rows.Err(); err != nil {
++		return nil, err
++	}
++	return items, nil
++}
++
  const listWebhooksForOwner = `-- name: ListWebhooksForOwner :many
  SELECT id, owner_kind, owner_id, url, content_type, events, secret_ciphertext, secret_nonce, active, ssl_verification, consecutive_failures, auto_disable_threshold, disabled_at, disabled_reason, last_success_at, last_failure_at, created_by_user_id, created_at, updated_at FROM webhooks
  WHERE owner_kind = $1 AND owner_id = $2