Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -287,11 +287,29 @@ func compareTimePart(actual any, expected any, op Operator) (bool, error) {
if !ok {
return false, newError(errType, actual)
}
value, err := toFloat(expected)
if err != nil {
return false, err

var target int
switch v := expected.(type) {
case string:
resolved, err := resolveExpectedTime(v, time.Now())
if err != nil {
return false, err
}
switch op {
case YearEq:
target = resolved.Year()
case MonthEq:
target = int(resolved.Month())
default:
return false, nil
}
default:
value, err := toFloat(expected)
if err != nil {
return false, err
}
target = int(value)
}
target := int(value)

switch op {
case YearEq:
Expand Down
14 changes: 14 additions & 0 deletions rulesengine_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,20 @@ var (
inputData: map[string]any{"startDate": relativeTime},
expResult: RuleResult{Result: true},
},
{
ruleNodes: Rule{
Operator: YearEq, Field: "startDate", Value: "thisYear-1",
},
inputData: map[string]any{"startDate": relativeTime.AddDate(-1, 0, 0)},
expResult: RuleResult{Result: true},
},
{
ruleNodes: Rule{
Operator: MonthEq, Field: "startDate", Value: "thisMonth",
},
inputData: map[string]any{"startDate": time.Date(relativeNow.Year(), relativeNow.Month(), 1, 12, 0, 0, 0, relativeNow.Location())},
expResult: RuleResult{Result: true},
},
{
ruleNodes: Rule{
Operator: WithinLast, Field: "startDate", Value: last10Sec,
Expand Down