Change webhook table names
Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>
This commit is contained in:
Sacha Al Himdani
@@ -17,7 +17,6 @@ package coredata
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"maps"
|
||||
"time"
|
||||
@@ -25,23 +24,100 @@ import (
|
||||
"github.com/jackc/pgx/v5"
|
||||
"go.gearno.de/kit/pg"
|
||||
"go.probo.inc/probo/pkg/gid"
|
||||
"go.probo.inc/probo/pkg/page"
|
||||
)
|
||||
|
||||
type (
|
||||
WebhookEvent struct {
|
||||
ID gid.GID `db:"id"`
|
||||
OrganizationID gid.GID `db:"organization_id"`
|
||||
EventType WebhookEventType `db:"event_type"`
|
||||
Status WebhookEventStatus `db:"status"`
|
||||
Data json.RawMessage `db:"data"`
|
||||
CreatedAt time.Time `db:"created_at"`
|
||||
ProcessedAt *time.Time `db:"processed_at"`
|
||||
ID gid.GID `db:"id"`
|
||||
WebhookDataID gid.GID `db:"webhook_data_id"`
|
||||
WebhookConfigurationID gid.GID `db:"webhook_configuration_id"`
|
||||
EndpointURL string `db:"endpoint_url"`
|
||||
Status WebhookEventStatus `db:"status"`
|
||||
Response json.RawMessage `db:"response"`
|
||||
CreatedAt time.Time `db:"created_at"`
|
||||
}
|
||||
|
||||
WebhookEvents []*WebhookEvent
|
||||
|
||||
)
|
||||
|
||||
func (w WebhookEvent) CursorKey(orderBy WebhookEventOrderField) page.CursorKey {
|
||||
switch orderBy {
|
||||
case WebhookEventOrderFieldCreatedAt:
|
||||
return page.NewCursorKey(w.ID, w.CreatedAt)
|
||||
}
|
||||
|
||||
panic(fmt.Sprintf("unsupported order by: %s", orderBy))
|
||||
}
|
||||
|
||||
func (w *WebhookEvents) LoadByConfigurationID(
|
||||
ctx context.Context,
|
||||
conn pg.Conn,
|
||||
scope Scoper,
|
||||
webhookConfigurationID gid.GID,
|
||||
cursor *page.Cursor[WebhookEventOrderField],
|
||||
) error {
|
||||
q := `
|
||||
SELECT
|
||||
id,
|
||||
webhook_data_id,
|
||||
webhook_configuration_id,
|
||||
endpoint_url,
|
||||
status,
|
||||
response,
|
||||
created_at
|
||||
FROM
|
||||
webhook_events
|
||||
WHERE
|
||||
%s
|
||||
AND webhook_configuration_id = @webhook_configuration_id
|
||||
AND %s
|
||||
`
|
||||
q = fmt.Sprintf(q, scope.SQLFragment(), cursor.SQLFragment())
|
||||
|
||||
args := pgx.NamedArgs{"webhook_configuration_id": webhookConfigurationID}
|
||||
maps.Copy(args, scope.SQLArguments())
|
||||
maps.Copy(args, cursor.SQLArguments())
|
||||
|
||||
rows, err := conn.Query(ctx, q, args)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot query webhook events: %w", err)
|
||||
}
|
||||
|
||||
events, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[WebhookEvent])
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot collect webhook events: %w", err)
|
||||
}
|
||||
|
||||
*w = events
|
||||
return nil
|
||||
}
|
||||
|
||||
func (w *WebhookEvents) CountByConfigurationID(
|
||||
ctx context.Context,
|
||||
conn pg.Conn,
|
||||
scope Scoper,
|
||||
webhookConfigurationID gid.GID,
|
||||
) (int, error) {
|
||||
q := `
|
||||
SELECT COUNT(*)
|
||||
FROM webhook_events
|
||||
WHERE %s
|
||||
AND webhook_configuration_id = @webhook_configuration_id
|
||||
`
|
||||
q = fmt.Sprintf(q, scope.SQLFragment())
|
||||
|
||||
args := pgx.StrictNamedArgs{"webhook_configuration_id": webhookConfigurationID}
|
||||
maps.Copy(args, scope.SQLArguments())
|
||||
|
||||
var count int
|
||||
if err := conn.QueryRow(ctx, q, args).Scan(&count); err != nil {
|
||||
return 0, fmt.Errorf("cannot count webhook events: %w", err)
|
||||
}
|
||||
|
||||
return count, nil
|
||||
}
|
||||
|
||||
func (w *WebhookEvent) Insert(
|
||||
ctx context.Context,
|
||||
conn pg.Conn,
|
||||
@@ -51,31 +127,34 @@ func (w *WebhookEvent) Insert(
|
||||
INSERT INTO webhook_events (
|
||||
id,
|
||||
tenant_id,
|
||||
organization_id,
|
||||
event_type,
|
||||
webhook_data_id,
|
||||
webhook_configuration_id,
|
||||
endpoint_url,
|
||||
status,
|
||||
data,
|
||||
response,
|
||||
created_at
|
||||
)
|
||||
VALUES (
|
||||
@id,
|
||||
@tenant_id,
|
||||
@organization_id,
|
||||
@event_type,
|
||||
@webhook_data_id,
|
||||
@webhook_configuration_id,
|
||||
@endpoint_url,
|
||||
@status,
|
||||
@data,
|
||||
@response,
|
||||
@created_at
|
||||
)
|
||||
`
|
||||
|
||||
args := pgx.StrictNamedArgs{
|
||||
"id": w.ID,
|
||||
"tenant_id": scope.GetTenantID(),
|
||||
"organization_id": w.OrganizationID,
|
||||
"event_type": w.EventType,
|
||||
"status": w.Status,
|
||||
"data": w.Data,
|
||||
"created_at": w.CreatedAt,
|
||||
"id": w.ID,
|
||||
"tenant_id": scope.GetTenantID(),
|
||||
"webhook_data_id": w.WebhookDataID,
|
||||
"webhook_configuration_id": w.WebhookConfigurationID,
|
||||
"endpoint_url": w.EndpointURL,
|
||||
"status": w.Status,
|
||||
"response": w.Response,
|
||||
"created_at": w.CreatedAt,
|
||||
}
|
||||
|
||||
_, err := conn.Exec(ctx, q, args)
|
||||
@@ -85,76 +164,3 @@ VALUES (
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (w *WebhookEvent) LoadNextPendingForUpdate(
|
||||
ctx context.Context,
|
||||
conn pg.Conn,
|
||||
) error {
|
||||
q := `
|
||||
SELECT
|
||||
id,
|
||||
organization_id,
|
||||
event_type,
|
||||
status,
|
||||
data,
|
||||
created_at,
|
||||
processed_at
|
||||
FROM webhook_events
|
||||
WHERE status = 'PENDING'
|
||||
ORDER BY created_at ASC
|
||||
LIMIT 1
|
||||
FOR UPDATE SKIP LOCKED
|
||||
`
|
||||
|
||||
rows, err := conn.Query(ctx, q)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot query pending webhook events: %w", err)
|
||||
}
|
||||
|
||||
event, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[WebhookEvent])
|
||||
if err != nil {
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return ErrResourceNotFound
|
||||
}
|
||||
|
||||
return fmt.Errorf("cannot collect webhook event: %w", err)
|
||||
}
|
||||
|
||||
*w = event
|
||||
return nil
|
||||
}
|
||||
|
||||
func (w *WebhookEvent) UpdateStatus(
|
||||
ctx context.Context,
|
||||
conn pg.Conn,
|
||||
scope Scoper,
|
||||
) error {
|
||||
q := `
|
||||
UPDATE webhook_events
|
||||
SET
|
||||
status = @status,
|
||||
processed_at = @processed_at
|
||||
WHERE %s
|
||||
AND id = @id
|
||||
`
|
||||
|
||||
q = fmt.Sprintf(q, scope.SQLFragment())
|
||||
|
||||
args := pgx.StrictNamedArgs{
|
||||
"id": w.ID,
|
||||
"status": w.Status.String(),
|
||||
"processed_at": w.ProcessedAt,
|
||||
}
|
||||
maps.Copy(args, scope.SQLArguments())
|
||||
|
||||
result, err := conn.Exec(ctx, q, args)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot update webhook event: %w", err)
|
||||
}
|
||||
|
||||
if result.RowsAffected() == 0 {
|
||||
return ErrResourceNotFound
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user