niuniu/ai-customer-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: platform event store and builder drift

Browse Source
This commit is contained in:
Your Name
2026-05-11 12:19:20 +08:00
parent 9319583ee3
commit 5beb002d2f
3 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/service/platformevents/builder.go
View File

@@ -34,7 +34,7 @@ func BuildInboundEvents(msg *message.UnifiedMessage, result *dialog.Result, meta
} }
eventIndex := 0 eventIndex := 0
baseEvent := func(eventType string, payload map[string]any) platformevent.Event { baseEvent := func(eventType string, payload map[string]any) platformevent.Event {
eventTime := now.Add(time.Duration(eventIndex) * time.Millisecond) eventTime := now.Add(time.Duration(eventIndex) * time.Nanosecond)
eventIndex++ eventIndex++
return platformevent.Event{ return platformevent.Event{
ID: uuid.New().String(), ID: uuid.New().String(),
@@ -47,7 +47,7 @@ func BuildInboundEvents(msg *message.UnifiedMessage, result *dialog.Result, meta
Payload: payload, Payload: payload,
Status: platformevent.StatusPending, Status: platformevent.StatusPending,
AttemptCount: 0, AttemptCount: 0,
NextAttemptAt: now, NextAttemptAt: eventTime,
OccurredAt: eventTime, OccurredAt: eventTime,
CreatedAt: eventTime, CreatedAt: eventTime,
UpdatedAt: eventTime, UpdatedAt: eventTime,

2
internal/store/postgres/platform_event_store.go
View File

@@ -81,7 +81,7 @@ func (s *PlatformEventStore) ListDue(ctx context.Context, platform string, dueBe
delivered_at, COALESCE(last_error, '') delivered_at, COALESCE(last_error, '')
FROM cs_platform_event_outbox FROM cs_platform_event_outbox
WHERE platform = $1 AND status IN ('pending', 'retrying') AND next_attempt_at <= $2 WHERE platform = $1 AND status IN ('pending', 'retrying') AND next_attempt_at <= $2
ORDER BY next_attempt_at ASC, created_at ASC ORDER BY next_attempt_at ASC, occurred_at ASC, created_at ASC, id ASC
LIMIT $3 LIMIT $3
`, platform, dueBefore, limit) `, platform, dueBefore, limit)
if err != nil { if err != nil {

47
internal/store/postgres/platform_event_store_test.go
View File

@@ -59,33 +59,31 @@ func TestPlatformEventStore_ShouldListPendingEventsInOrder(t *testing.T) {
store := NewPlatformEventStore(db) store := NewPlatformEventStore(db)
now := time.Now().UTC().Truncate(time.Second) now := time.Now().UTC().Truncate(time.Second)
firstID := uniqueID("evt") platformName := "s2a-" + uniqueID("plt")[:8]
secondID := uniqueID("evt")
platformName := "s2a-" + firstID[:8]
first := &platformevent.Event{ first := &platformevent.Event{
ID: firstID, ID: uniqueID("evt"),
Platform: platformName, Platform: platformName,
EventType: platformevent.TypeMessageProcessing, EventType: platformevent.TypeMessageReceived,
CallbackTarget: "default", CallbackTarget: "default",
Payload: map[string]any{"step": 1}, Payload: map[string]any{"step": 1},
Status: platformevent.StatusPending, Status: platformevent.StatusPending,
NextAttemptAt: now.Add(-2 * time.Minute), NextAttemptAt: now,
OccurredAt: now.Add(-2 * time.Minute), OccurredAt: now.Add(-5 * time.Nanosecond),
CreatedAt: now.Add(-2 * time.Minute), CreatedAt: now.Add(-5 * time.Nanosecond),
UpdatedAt: now.Add(-2 * time.Minute), UpdatedAt: now.Add(-5 * time.Nanosecond),
} }
second := &platformevent.Event{ second := &platformevent.Event{
ID: secondID, ID: uniqueID("evt"),
Platform: platformName, Platform: platformName,
EventType: platformevent.TypeReplyGenerated, EventType: platformevent.TypeMessageProcessing,
CallbackTarget: "default", CallbackTarget: "default",
Payload: map[string]any{"step": 2}, Payload: map[string]any{"step": 2},
Status: platformevent.StatusPending, Status: platformevent.StatusPending,
NextAttemptAt: now.Add(-1 * time.Minute), NextAttemptAt: now,
OccurredAt: now.Add(-1 * time.Minute), OccurredAt: now.Add(-4 * time.Nanosecond),
CreatedAt: now.Add(-1 * time.Minute), CreatedAt: now.Add(-4 * time.Nanosecond),
UpdatedAt: now.Add(-1 * time.Minute), UpdatedAt: now.Add(-4 * time.Nanosecond),
} }
if err := store.InsertPending(context.Background(), second); err != nil { if err := store.InsertPending(context.Background(), second); err != nil {
@@ -103,21 +101,14 @@ func TestPlatformEventStore_ShouldListPendingEventsInOrder(t *testing.T) {
t.Fatalf("due events count = %d, want at least 2", len(events)) t.Fatalf("due events count = %d, want at least 2", len(events))
} }
firstPos := -1 if events[0].EventType != platformevent.TypeMessageReceived {
secondPos := -1 t.Fatalf("first due event type = %s, want %s", events[0].EventType, platformevent.TypeMessageReceived)
for i, event := range events {
if event.ID == firstID {
firstPos = i
}
if event.ID == secondID {
secondPos = i
}
} }
if firstPos == -1 || secondPos == -1 { if events[1].EventType != platformevent.TypeMessageProcessing {
t.Fatalf("did not find inserted events in due list: first=%d second=%d", firstPos, secondPos) t.Fatalf("second due event type = %s, want %s", events[1].EventType, platformevent.TypeMessageProcessing)
} }
if firstPos >= secondPos { if events[0].OccurredAt.After(events[1].OccurredAt) {
t.Fatalf("event order invalid: firstPos=%d secondPos=%d", firstPos, secondPos) t.Fatalf("due events out of order: first occurred_at=%s second occurred_at=%s", events[0].OccurredAt, events[1].OccurredAt)
} }
} }