diff --git a/backend/internal/domain/repository.go b/backend/internal/domain/repository.go index 6fa4c789..2e39cefd 100644 --- a/backend/internal/domain/repository.go +++ b/backend/internal/domain/repository.go @@ -51,6 +51,7 @@ type OutboxRepository interface { Enqueue(ctx context.Context, tx Tx, e *OutboxEntry) error ClaimBatch(ctx context.Context, limit int) ([]OutboxEntry, error) MarkPublished(ctx context.Context, ids []string) error + EnqueueDirect(ctx context.Context, e *OutboxEntry) error } type AttachmentJobRepository interface { diff --git a/backend/internal/storage/postgres/attachments.go b/backend/internal/storage/postgres/attachments.go index 1a3981cd..4b78dd8c 100644 --- a/backend/internal/storage/postgres/attachments.go +++ b/backend/internal/storage/postgres/attachments.go @@ -239,12 +239,12 @@ func (r *AttachmentRepo) ExistingKeys(ctx context.Context, keys []string) ([]str func (r *AttachmentRepo) ClaimForProcessing(ctx context.Context, id string, lease time.Duration) (*domain.Attachment, error) { const q = ` UPDATE attachments - SET status = 'processing', locked_until = now() + $2, updated_at = now() + SET status = 'processing', locked_until = now() + $2, updated_at = now(), attempts = attempts + 1 -- <--- ИНКРЕМЕНТ WHERE id = $1::uuid AND status = 'queued' - RETURNING id, chat_id, staging_key, pipeline_version, object_key, content_type + RETURNING id, chat_id, staging_key, pipeline_version, object_key, content_type, attempts ` var a domain.Attachment - err := r.pool.QueryRow(ctx, q, id, lease).Scan(&a.ID, &a.ChatID, &a.StagingKey, &a.PipelineVersion, &a.ObjectKey, &a.ContentType) + err := r.pool.QueryRow(ctx, q, id, lease).Scan(&a.ID, &a.ChatID, &a.StagingKey, &a.PipelineVersion, &a.ObjectKey, &a.ContentType, &a.Attempts) if err != nil { if err == pgx.ErrNoRows { return nil, nil diff --git a/backend/internal/storage/postgres/outbox.go b/backend/internal/storage/postgres/outbox.go index af78d77c..414ba0b0 100644 --- a/backend/internal/storage/postgres/outbox.go +++ b/backend/internal/storage/postgres/outbox.go @@ -57,7 +57,7 @@ func (r *OutboxRepo) ClaimBatch(ctx context.Context, limit int) ([]domain.Outbox const q = ` WITH claimed AS ( SELECT id FROM outbox - WHERE published_at IS NULL + WHERE published_at IS NULL AND created_at <= now() ORDER BY created_at LIMIT $1 FOR UPDATE SKIP LOCKED @@ -88,6 +88,22 @@ func (r *OutboxRepo) ClaimBatch(ctx context.Context, limit int) ([]domain.Outbox return entries, mapError(rows.Err()) } +func (r *OutboxRepo) EnqueueDirect(ctx context.Context, e *domain.OutboxEntry) error { + if e.ID == "" { + e.ID = uuid.NewString() + } + const q = ` + INSERT INTO outbox + (id, aggregate_type, aggregate_id, event_type, payload, attempts, created_at, published_at) + VALUES ($1::uuid, $2, $3::uuid, $4, $5::jsonb, $6, $7, $8) + ` + _, err := r.pool.Exec(ctx, q, + e.ID, e.AggregateType, e.AggregateID, e.EventType, + string(e.Payload), e.Attempts, e.CreatedAt, e.PublishedAt, + ) + return mapError(err) +} + func (r *OutboxRepo) MarkPublished(ctx context.Context, ids []string) error { if len(ids) == 0 { return nil