feat(规则): 支持同一事件多规则按条件区分并全部发送
Motivation: 止盈、止损等不同策略信号会映射到同一事件(如 trade.close),但原有唯一约束要求每个事件只能有一条规则,无法按策略区分处理。放开该约束后,同一事件可配置多条规则,通过规则条件与精确/通配优先级区分,命中条件的规则全部发送;同时将去重键从消息原文改为信号维度,避免同一信号因时间戳等无关字段差异被误判为重复。 Changes: * 移除规则 source_id+event 的唯一约束,改为普通索引 * 事件匹配改为返回命中优先级内所有启用规则,并按 ID 逐条派发 * 通知服务遍历多条规则,按条件过滤后聚合发送渠道 * 去重键由消息 body 哈希改为策略/币种/周期/方向/价格信号维度哈希
This commit is contained in:
@@ -3,11 +3,13 @@ package subscriber
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
|
||||
"aiaa-notification-service/internal/model"
|
||||
"aiaa-notification-service/internal/notify"
|
||||
"aiaa-notification-service/internal/subscriber/cryptostrategy"
|
||||
"aiaa-notification-service/internal/subscriber/tradesignal"
|
||||
)
|
||||
|
||||
@@ -23,6 +25,38 @@ func TestMessageHashStable(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestSignalHashIgnoresUnrelatedFields(t *testing.T) {
|
||||
a := SignalHash(map[string]interface{}{
|
||||
"strategyCode": "ai-crypto-signals",
|
||||
"symbol": "CRV",
|
||||
"period": "1h",
|
||||
"direction": "LONG",
|
||||
"price": 0.2528,
|
||||
"eventTime": int64(1),
|
||||
})
|
||||
b := SignalHash(map[string]interface{}{
|
||||
"strategyCode": "ai-crypto-signals",
|
||||
"currency": "CRV",
|
||||
"period": "1h",
|
||||
"side": "long",
|
||||
"price": 0.2528,
|
||||
"eventTime": int64(2),
|
||||
})
|
||||
if a == "" || a != b {
|
||||
t.Fatalf("same signal fields should hash equal, a=%q b=%q", a, b)
|
||||
}
|
||||
c := SignalHash(map[string]interface{}{
|
||||
"strategyCode": "ai-crypto-signals",
|
||||
"symbol": "CRV",
|
||||
"period": "1h",
|
||||
"direction": "LONG",
|
||||
"price": 0.26,
|
||||
})
|
||||
if a == c {
|
||||
t.Fatal("different price should hash differently")
|
||||
}
|
||||
}
|
||||
|
||||
func TestMemoryDeduperClaimOnce(t *testing.T) {
|
||||
d := NewMemoryDeduper()
|
||||
ok, err := d.Claim(context.Background(), "abc")
|
||||
@@ -42,6 +76,51 @@ func TestMemoryDeduperClaimOnce(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestHandleDedupByStrategySymbolPeriodDirectionPrice(t *testing.T) {
|
||||
dedup := NewMemoryDeduper()
|
||||
var n atomic.Int32
|
||||
process := func(context.Context, notify.Request) (notify.Result, error) {
|
||||
n.Add(1)
|
||||
return notify.Result{Matched: true}, nil
|
||||
}
|
||||
lookup := func(context.Context, string) (*model.Source, error) {
|
||||
return &model.Source{ID: 1, Name: "crypto-strategy", Status: 1}, nil
|
||||
}
|
||||
conv := cryptostrategy.NewConverter()
|
||||
in := func(eventTime int64) HandleInput {
|
||||
body := []byte(fmt.Sprintf(`{
|
||||
"eventType":"SIGNAL_RECEIVED","symbol":"CRV","direction":"LONG",
|
||||
"payload":"{\"strategyCode\":\"ai-crypto-signals\",\"period\":\"1h\",\"currency\":\"CRV\",\"isClose\":true,\"isGain\":true,\"price\":0.2528}",
|
||||
"eventTime":%d
|
||||
}`, eventTime))
|
||||
return HandleInput{Body: body, SourceName: "crypto-strategy", MaxRetry: 3, Deduper: dedup}
|
||||
}
|
||||
|
||||
if d := HandleMessage(context.Background(), in(1786899538978), conv, lookup, process); d != DispositionAck {
|
||||
t.Fatalf("first=%v", d)
|
||||
}
|
||||
if d := HandleMessage(context.Background(), in(1786899539730), conv, lookup, process); d != DispositionAck {
|
||||
t.Fatalf("dup=%v", d)
|
||||
}
|
||||
if n.Load() != 1 {
|
||||
t.Fatalf("same strategy/symbol/period/direction/price should process once, got %d", n.Load())
|
||||
}
|
||||
|
||||
bodyDiffPrice := []byte(`{
|
||||
"eventType":"SIGNAL_RECEIVED","symbol":"CRV","direction":"LONG",
|
||||
"payload":"{\"strategyCode\":\"ai-crypto-signals\",\"period\":\"1h\",\"currency\":\"CRV\",\"isClose\":true,\"isGain\":true,\"price\":0.26}",
|
||||
"eventTime":1786899539731
|
||||
}`)
|
||||
if d := HandleMessage(context.Background(), HandleInput{
|
||||
Body: bodyDiffPrice, SourceName: "crypto-strategy", MaxRetry: 3, Deduper: dedup,
|
||||
}, conv, lookup, process); d != DispositionAck {
|
||||
t.Fatalf("diff price=%v", d)
|
||||
}
|
||||
if n.Load() != 2 {
|
||||
t.Fatalf("different price should process again, got %d", n.Load())
|
||||
}
|
||||
}
|
||||
|
||||
func TestHandleDuplicateAckSkipsProcess(t *testing.T) {
|
||||
dedup := NewMemoryDeduper()
|
||||
var n atomic.Int32
|
||||
|
||||
Reference in New Issue
Block a user