feat(v2): webhook v2 outbox + Notifier(event_type + HMAC 双向 + 重试兜底)

internal/store/webhook.go

@@ -0,0 +1,68 @@
+package store
+
+import (
+	"fmt"
+
+	"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
+}
+
+// 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 {
+	if len(errMsg) > 255 {
+		errMsg = 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
+}

internal/store/webhook_test.go

@@ -0,0 +1,44 @@
+package store_test
+
+import (
+	"testing"
+
+	"github.com/wangjia/pay/internal/model"
+	"github.com/wangjia/pay/internal/store"
+)
+
+func TestWebhookOutboxEnqueueIdempotent(t *testing.T) {
+	ws := store.NewWebhookStore(model.OpenTestDB(t))
+
+	if err := ws.EnqueueDelivery("PAY-1", "pangolin", "payment.succeeded", `{"a":1}`); err != nil {
+		t.Fatalf("enqueue#1: %v", err)
+	}
+	// 幂等:同 (out_trade_no,event_type) 再入队不新增行、不报错。
+	if err := ws.EnqueueDelivery("PAY-1", "pangolin", "payment.succeeded", `{"a":1}`); err != nil {
+		t.Fatalf("enqueue#2: %v", err)
+	}
+	list, _ := ws.ListUndelivered(10)
+	if len(list) != 1 {
+		t.Fatalf("应恰 1 行待投递, got %d", len(list))
+	}
+
+	if err := ws.MarkDelivered(list[0].ID); err != nil {
+		t.Fatalf("markDelivered: %v", err)
+	}
+	if again, _ := ws.ListUndelivered(10); len(again) != 0 {
+		t.Fatalf("投递后应 0 待投递, got %d", len(again))
+	}
+}
+
+func TestWebhookMarkFailed(t *testing.T) {
+	ws := store.NewWebhookStore(model.OpenTestDB(t))
+	_ = ws.EnqueueDelivery("PAY-2", "jiu", "payment.succeeded", `{}`)
+	list, _ := ws.ListUndelivered(10)
+	if err := ws.MarkFailed(list[0].ID, "boom"); err != nil {
+		t.Fatalf("markFailed: %v", err)
+	}
+	again, _ := ws.ListUndelivered(10)
+	if len(again) != 1 || again[0].Attempts != 1 || again[0].LastError != "boom" {
+		t.Fatalf("失败后应仍待投递且 attempts=1, got %+v", again)
+	}
+}