wangjia
63af44bfe1
- MarkFailed: truncateUTF8 避免截断中点 UTF-8 rune, last_error 安全 <=255B - notifier truncate: 同上, 投递失败消息截断 UTF-8 安全 - deliverOne: 拆分 orderPaid 错误分支 — DB 错误落日志 [webhook] 投递门禁查单失败,与"订单未付"(静默)区分 - test: MarkFailed with long Chinese string, 验证 stored last_error 为有效 UTF-8 且 <=255B Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013nMthbVEmQquxBRKb9Fj8u
80 lines
2.3 KiB
Go
80 lines
2.3 KiB
Go
package store
|
|
|
|
import (
|
|
"fmt"
|
|
"unicode/utf8"
|
|
|
|
"gorm.io/gorm"
|
|
"gorm.io/gorm/clause"
|
|
|
|
"github.com/wangjia/pay/internal/model"
|
|
)
|
|
|
|
// WebhookDeliveryRow is the row type returned by WebhookStore (alias to the model).
|
|
type WebhookDeliveryRow = model.WebhookDelivery
|
|
|
|
type WebhookStore struct{ db *gorm.DB }
|
|
|
|
func NewWebhookStore(db *gorm.DB) *WebhookStore { return &WebhookStore{db: db} }
|
|
|
|
// EnqueueDelivery inserts an outbox row; a duplicate (out_trade_no,event_type)
|
|
// is a no-op (idempotent enqueue) via ON CONFLICT DO NOTHING.
|
|
func (s *WebhookStore) EnqueueDelivery(outTradeNo, bizSystem, eventType, payload string) error {
|
|
row := model.WebhookDelivery{
|
|
OutTradeNo: outTradeNo, BizSystem: bizSystem, EventType: eventType, Payload: payload,
|
|
}
|
|
err := s.db.Clauses(clause.OnConflict{
|
|
Columns: []clause.Column{{Name: "out_trade_no"}, {Name: "event_type"}},
|
|
DoNothing: true,
|
|
}).Create(&row).Error
|
|
if err != nil {
|
|
return fmt.Errorf("store.EnqueueDelivery: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (s *WebhookStore) ListUndelivered(limit int) ([]WebhookDeliveryRow, error) {
|
|
if limit <= 0 || limit > 200 {
|
|
limit = 50
|
|
}
|
|
var out []WebhookDeliveryRow
|
|
if err := s.db.Where("delivered = ?", false).Order("id ASC").Limit(limit).Find(&out).Error; err != nil {
|
|
return nil, fmt.Errorf("store.ListUndelivered: %w", err)
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
func (s *WebhookStore) MarkDelivered(id uint64) error {
|
|
if err := s.db.Model(&model.WebhookDelivery{}).Where("id = ?", id).
|
|
Update("delivered", true).Error; err != nil {
|
|
return fmt.Errorf("store.MarkDelivered: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// truncateUTF8 safely truncates a string to n bytes without splitting UTF-8 runes.
|
|
func truncateUTF8(s string, n int) string {
|
|
if len(s) <= n {
|
|
return s
|
|
}
|
|
s = s[:n]
|
|
for len(s) > 0 && !utf8.ValidString(s) {
|
|
s = s[:len(s)-1]
|
|
}
|
|
return s
|
|
}
|
|
|
|
// MarkFailed increments attempts and records the last error, leaving the row
|
|
// undelivered for the next retry sweep.
|
|
func (s *WebhookStore) MarkFailed(id uint64, errMsg string) error {
|
|
errMsg = truncateUTF8(errMsg, 255)
|
|
if err := s.db.Model(&model.WebhookDelivery{}).Where("id = ?", id).
|
|
Updates(map[string]any{
|
|
"attempts": gorm.Expr("attempts + 1"),
|
|
"last_error": errMsg,
|
|
}).Error; err != nil {
|
|
return fmt.Errorf("store.MarkFailed: %w", err)
|
|
}
|
|
return nil
|
|
}
|