rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove status on webhook data

Browse Source 
Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>
This commit is contained in:
Sacha Al Himdani
2026-02-13 16:23:38 +01:00
parent 2d2546ee1b
commit 6de906d0a9
11 changed files with 138 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/coredata/webhook_data.go
View File

@@ -29,13 +29,12 @@ import (
type (
WebhookData struct {
ID gid.GID `db:"id"`
OrganizationID gid.GID `db:"organization_id"`
EventType WebhookEventType `db:"event_type"`
Status WebhookDataStatus `db:"status"`
Data json.RawMessage `db:"data"`
CreatedAt time.Time `db:"created_at"`
ProcessedAt *time.Time `db:"processed_at"`
ID gid.GID `db:"id"`
OrganizationID gid.GID `db:"organization_id"`
EventType WebhookEventType `db:"event_type"`
Data json.RawMessage `db:"data"`
CreatedAt time.Time `db:"created_at"`
ProcessedAt *time.Time `db:"processed_at"`
}
WebhookDataList []*WebhookData
@@ -52,7 +51,6 @@ INSERT INTO webhook_data (
tenant_id,
organization_id,
event_type,
status,
data,
created_at
)
@@ -61,7 +59,6 @@ VALUES (
@tenant_id,
@organization_id,
@event_type,
@status,
@data,
@created_at
)
@@ -72,7 +69,6 @@ VALUES (
"tenant_id": scope.GetTenantID(),
"organization_id": w.OrganizationID,
"event_type": w.EventType,
"status": w.Status,
"data": w.Data,
"created_at": w.CreatedAt,
}
@@ -85,7 +81,7 @@ VALUES (
return nil
}
func (w *WebhookData) LoadNextPendingForUpdate(
func (w *WebhookData) LoadNextUnprocessedForUpdate(
ctx context.Context,
conn pg.Conn,
) error {
@@ -94,12 +90,11 @@ SELECT
id,
organization_id,
event_type,
status,
data,
created_at,
processed_at
FROM webhook_data
WHERE status = 'PENDING'
WHERE processed_at IS NULL
ORDER BY created_at ASC
LIMIT 1
FOR UPDATE SKIP LOCKED
@@ -107,7 +102,7 @@ FOR UPDATE SKIP LOCKED
rows, err := conn.Query(ctx, q)
if err != nil {
return fmt.Errorf("cannot query pending webhook data: %w", err)
return fmt.Errorf("cannot query unprocessed webhook data: %w", err)
}
data, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[WebhookData])
@@ -123,16 +118,14 @@ FOR UPDATE SKIP LOCKED
return nil
}
func (w *WebhookData) UpdateStatus(
func (w *WebhookData) UpdateProcessedAt(
ctx context.Context,
conn pg.Conn,
scope Scoper,
) error {
q := `
UPDATE webhook_data
SET
status = @status,
processed_at = @processed_at
SET processed_at = @processed_at
WHERE %s
AND id = @id
`
@@ -141,7 +134,6 @@ WHERE %s
args := pgx.StrictNamedArgs{
"id": w.ID,
"status": w.Status.String(),
"processed_at": w.ProcessedAt,
}
maps.Copy(args, scope.SQLArguments())