0ct0pu5/crowdsec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #1158 : group by value and scope and get only longest validity

Browse source
This commit is contained in:
bui 2022-01-12 15:46:02 +01:00
parent cc72800f50
commit 034aef81f5
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/database/decisions.go
View file

@ -137,6 +137,7 @@ func BuildDecisionRequestWithFilter(query *ent.DecisionQuery, filter map[string]
} else if ip_sz != 0 {
return nil, errors.Wrapf(InvalidFilter, "Unknown ip size %d", ip_sz)
}
return query, nil
}
@ -162,6 +163,11 @@ func (c *Client) QueryDecisionWithFilter(filter map[string][]string) ([]*ent.Dec
decision.FieldValue,
decision.FieldScope,
decision.FieldOrigin,
).GroupBy( /*group by value + scope, we don't want duplicate*/
decision.FieldValue,
decision.FieldScope,
).Aggregate( /*and we want the decision with longest validity*/
ent.Max(decision.FieldUntil),
).Scan(c.CTX, &data)
if err != nil {
c.Log.Warningf("QueryDecisionWithFilter : %s", err)