浏览代码

Pkg/database/fix count decisions since by value (#1606)

* fix CountDecisionsSinceByValue to have also expired decisions
he2ss 3 年之前
父节点
当前提交
7fafb483ad
共有 2 个文件被更改,包括 1 次插入2 次删除
  1. 0 1
      pkg/database/decisions.go
  2. 1 1
      pkg/exprhelpers/exprlib_test.go

+ 0 - 1
pkg/database/decisions.go

@@ -567,7 +567,6 @@ func (c *Client) CountDecisionsSinceByValue(decisionValue string, since time.Tim
 	contains := true
 	contains := true
 	decisions := c.Ent.Decision.Query().Where(
 	decisions := c.Ent.Decision.Query().Where(
 		decision.CreatedAtGT(since),
 		decision.CreatedAtGT(since),
-		decision.UntilGT(time.Now().UTC()),
 	)
 	)
 	decisions, err = applyStartIpEndIpFilter(decisions, contains, ip_sz, start_ip, start_sfx, end_ip, end_sfx)
 	decisions, err = applyStartIpEndIpFilter(decisions, contains, ip_sz, start_ip, start_sfx, end_ip, end_sfx)
 	if err != nil {
 	if err != nil {

+ 1 - 1
pkg/exprhelpers/exprlib_test.go

@@ -877,7 +877,7 @@ func TestGetDecisionsSinceCount(t *testing.T) {
 	}
 	}
 	decision2 := dbClient.Ent.Decision.Create().
 	decision2 := dbClient.Ent.Decision.Create().
 		SetCreatedAt(time.Now().AddDate(0, 0, -1)).
 		SetCreatedAt(time.Now().AddDate(0, 0, -1)).
-		SetUntil(time.Now().Add(time.Hour)).
+		SetUntil(time.Now().AddDate(0, 0, -1)).
 		SetScenario("crowdsec/test").
 		SetScenario("crowdsec/test").
 		SetStartIP(start_ip).
 		SetStartIP(start_ip).
 		SetStartSuffix(start_sfx).
 		SetStartSuffix(start_sfx).