feat(规则): 支持同一事件多规则按条件区分并全部发送

Motivation:
止盈、止损等不同策略信号会映射到同一事件(如 trade.close),但原有唯一约束要求每个事件只能有一条规则,无法按策略区分处理。放开该约束后,同一事件可配置多条规则,通过规则条件与精确/通配优先级区分,命中条件的规则全部发送;同时将去重键从消息原文改为信号维度,避免同一信号因时间戳等无关字段差异被误判为重复。

Changes:

* 移除规则 source_id+event 的唯一约束,改为普通索引
* 事件匹配改为返回命中优先级内所有启用规则,并按 ID 逐条派发
* 通知服务遍历多条规则,按条件过滤后聚合发送渠道
* 去重键由消息 body 哈希改为策略/币种/周期/方向/价格信号维度哈希
This commit is contained in:
2026-08-17 01:20:49 +08:00
parent f5f64f7653
commit d2e8476398
13 changed files with 349 additions and 115 deletions
+76 -5
View File
@@ -12,12 +12,22 @@ import (
)
type fakeMatcher struct {
rule *model.Rule
err error
rule *model.Rule
rules []model.Rule
err error
}
func (f *fakeMatcher) Match(context.Context, int, string) (*model.Rule, error) {
return f.rule, f.err
func (f *fakeMatcher) Match(context.Context, int, string) ([]model.Rule, error) {
if f.err != nil {
return nil, f.err
}
if len(f.rules) > 0 {
return f.rules, nil
}
if f.rule != nil {
return []model.Rule{*f.rule}, nil
}
return nil, nil
}
type fakeTemplates struct {
@@ -33,11 +43,15 @@ type fakeRouter struct {
channels []string
title string
content string
ruleIDs []int
}
func (f *fakeRouter) Route(_ context.Context, _ *model.Rule, title, content string) []string {
func (f *fakeRouter) Route(_ context.Context, rule *model.Rule, title, content string) []string {
f.title = title
f.content = content
if rule != nil {
f.ruleIDs = append(f.ruleIDs, rule.ID)
}
return f.channels
}
@@ -165,3 +179,60 @@ func TestProcessTemplateMissing(t *testing.T) {
t.Fatalf("want retryable error, got %v", err)
}
}
func TestProcessMultipleRulesSameEvent(t *testing.T) {
rt := &fakeRouter{channels: []string{"safew:1"}}
svc := newSvc(
&fakeMatcher{rules: []model.Rule{
{ID: 17, TemplateID: 1, Event: "trade.close"},
{ID: 18, TemplateID: 1, Event: "trade.close"},
}},
&fakeTemplates{tmpl: &model.Template{ID: 1, Content: "ok"}},
rt,
)
res, err := svc.Process(context.Background(), Request{
Source: &model.Source{ID: 11, Name: "crypto-strategy"},
Event: "trade.close",
Data: map[string]interface{}{"symbol": "CRV"},
})
if err != nil {
t.Fatal(err)
}
if !res.Matched || res.Filtered {
t.Fatalf("%+v", res)
}
if len(rt.ruleIDs) != 2 || rt.ruleIDs[0] != 17 || rt.ruleIDs[1] != 18 {
t.Fatalf("routed=%v", rt.ruleIDs)
}
if len(res.Channels) != 2 {
t.Fatalf("channels=%v", res.Channels)
}
}
func TestProcessSkipsFilteredSiblingRule(t *testing.T) {
hlss := json.RawMessage(`[{"field":"strategyCode","op":"eq","value":"HLSS"}]`)
ai := json.RawMessage(`[{"field":"strategyCode","op":"eq","value":"ai-crypto-signals"}]`)
rt := &fakeRouter{channels: []string{"safew:1"}}
svc := newSvc(
&fakeMatcher{rules: []model.Rule{
{ID: 1, TemplateID: 1, Event: "trade.close", Conditions: &hlss},
{ID: 2, TemplateID: 1, Event: "trade.close", Conditions: &ai},
}},
&fakeTemplates{tmpl: &model.Template{ID: 1, Content: "ok"}},
rt,
)
res, err := svc.Process(context.Background(), Request{
Source: &model.Source{ID: 11, Name: "crypto-strategy"},
Event: "trade.close",
Data: map[string]interface{}{"strategyCode": "ai-crypto-signals"},
})
if err != nil {
t.Fatal(err)
}
if !res.Matched || res.Filtered {
t.Fatalf("%+v", res)
}
if len(rt.ruleIDs) != 1 || rt.ruleIDs[0] != 2 {
t.Fatalf("routed=%v want only rule 2", rt.ruleIDs)
}
}