feat(规则匹配): 事件名支持通配符匹配

Motivation:
通知规则的事件名此前仅支持精确匹配,无法用一条规则覆盖多类事件(如 trade.* 下的全部交易事件),规则配置维护成本高。本次引入通配符匹配,让规则可按模式批量命中事件,同时保证精确规则优先。

Changes:

* 事件名支持 * 和 ? 通配符匹配
* 匹配优先级:精确匹配 > 更具体的通配 > 泛匹配,同分时取更小 ID
* 精确命中未命中时回退为列出源下启用规则并按优先级挑选
* 抽取缓存预热逻辑为独立方法
* 更新文档说明事件名通配规则
This commit is contained in:
2026-08-15 23:39:00 +08:00
parent dc313fda13
commit de7a52e81f
5 changed files with 160 additions and 20 deletions
+1 -1
View File
@@ -486,7 +486,7 @@ Query`page`、`page_size`。**200** `{ "data": Channel[], "total", "page"
| 字段 | 类型 | 必填 | 说明 |
|------|------|------|------|
| `source_name` | string | 是 | Source 名称 |
| `event` | string | 是 | 事件名;text 模式请用 `default` |
| `event` | string | 是 | 事件名;支持 `*` / `?` 通配(如 `trade.*`)。精确匹配优先于通配,更具体的通配优先于 `*`text 模式请用 `default` |
| `template_name` | string | 是 | Template 名称 |
| `channels` | string[] | 否 | Channel 名称列表 |
| `conditions` | object[] | 否 | 过滤条件,全部 AND;省略则不过滤 |
+55
View File
@@ -0,0 +1,55 @@
package engine
import (
"path"
"strings"
"aiaa-notification-service/internal/model"
)
// PickEventRule selects the best enabled rule for an event.
// Exact event wins; otherwise glob patterns (* and ?) via path.Match.
// Among globs, more literal characters win; ties go to the smaller ID.
func PickEventRule(event string, rules []model.Rule) *model.Rule {
var exact *model.Rule
var best *model.Rule
bestScore := -1
for i := range rules {
r := &rules[i]
if r.Enabled == 0 {
continue
}
if r.Event == event {
if exact == nil || r.ID < exact.ID {
exact = r
}
continue
}
if !strings.ContainsAny(r.Event, "*?") {
continue
}
ok, err := path.Match(r.Event, event)
if err != nil || !ok {
continue
}
score := globSpecificity(r.Event)
if score > bestScore || (score == bestScore && (best == nil || r.ID < best.ID)) {
bestScore = score
best = r
}
}
if exact != nil {
return exact
}
return best
}
func globSpecificity(pattern string) int {
n := 0
for _, r := range pattern {
if r != '*' && r != '?' {
n++
}
}
return n
}
+62
View File
@@ -0,0 +1,62 @@
package engine
import (
"testing"
"aiaa-notification-service/internal/model"
)
func TestPickEventRuleExact(t *testing.T) {
rules := []model.Rule{
{ID: 1, Event: "trade.*", Enabled: 1},
{ID: 2, Event: "trade.open", Enabled: 1},
}
got := PickEventRule("trade.open", rules)
if got == nil || got.ID != 2 {
t.Fatalf("want exact id=2, got %#v", got)
}
}
func TestPickEventRuleWildcard(t *testing.T) {
rules := []model.Rule{
{ID: 1, Event: "trade.*", Enabled: 1},
}
got := PickEventRule("trade.close", rules)
if got == nil || got.Event != "trade.*" {
t.Fatalf("want trade.*, got %#v", got)
}
if PickEventRule("order.open", rules) != nil {
t.Fatal("trade.* must not match order.open")
}
}
func TestPickEventRuleMoreSpecificWildcardWins(t *testing.T) {
rules := []model.Rule{
{ID: 1, Event: "*", Enabled: 1},
{ID: 2, Event: "trade.*", Enabled: 1},
}
got := PickEventRule("trade.open", rules)
if got == nil || got.ID != 2 {
t.Fatalf("want trade.* id=2, got %#v", got)
}
}
func TestPickEventRuleSkipsDisabled(t *testing.T) {
rules := []model.Rule{
{ID: 1, Event: "trade.*", Enabled: 0},
{ID: 2, Event: "*", Enabled: 1},
}
got := PickEventRule("trade.open", rules)
if got == nil || got.ID != 2 {
t.Fatalf("want * id=2, got %#v", got)
}
}
func TestPickEventRuleNoMatch(t *testing.T) {
rules := []model.Rule{
{ID: 1, Event: "trade.open", Enabled: 1},
}
if PickEventRule("trade.close", rules) != nil {
t.Fatal("expected no match")
}
}
+17 -7
View File
@@ -33,17 +33,30 @@ func (m *Matcher) Match(ctx context.Context, sourceID int, event string) (*model
}
}
// Fall back to DB
rule, err := m.store.GetRuleBySourceEvent(ctx, sourceID, event)
if err != nil {
rules, listErr := m.store.ListEnabledRulesBySource(ctx, sourceID)
if listErr != nil {
return nil, fmt.Errorf("match rule: %w", listErr)
}
picked := PickEventRule(event, rules)
if picked == nil {
return nil, fmt.Errorf("match rule: %w", err)
}
return picked, nil
}
// Warm cache
if m.cache != nil {
m.warmRuleCache(ctx, sourceID, event, rule)
return rule, nil
}
func (m *Matcher) warmRuleCache(ctx context.Context, sourceID int, event string, rule *model.Rule) {
if m.cache == nil {
return
}
tmpl, err := m.store.GetTemplate(ctx, rule.TemplateID)
if err != nil {
return rule, nil // rule found but template fetch failed — still return rule
return
}
cr := &cache.CachedRule{
RuleID: rule.ID,
@@ -54,7 +67,4 @@ func (m *Matcher) Match(ctx context.Context, sourceID int, event string) (*model
cr.Conditions = string(*rule.Conditions)
}
_ = m.cache.SetRule(ctx, sourceID, event, cr)
}
return rule, nil
}
+13
View File
@@ -66,6 +66,19 @@ func (s *Store) GetRuleBySourceEvent(ctx context.Context, sourceID int, event st
return &r, nil
}
func (s *Store) ListEnabledRulesBySource(ctx context.Context, sourceID int) ([]model.Rule, error) {
rows, err := s.DB.QueryContext(ctx, `SELECT id, source_id, event, template_id, conditions, enabled, created_at, updated_at FROM notification_rule WHERE source_id = ? AND enabled = 1`, sourceID)
if err != nil {
return nil, fmt.Errorf("list enabled rules by source: %w", err)
}
defer rows.Close()
rules, err := scanRules(rows)
if err != nil {
return nil, err
}
return rules, nil
}
func (s *Store) ListRules(ctx context.Context, page PageFilter) ([]model.Rule, int, error) {
var count int
if err := s.DB.GetContext(ctx, &count, `SELECT COUNT(*) FROM notification_rule`); err != nil {