uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-21 23:28:44 +05:00
Code Issues Packages Projects Releases Wiki Activity

Implement and test passCronExp func in engine/filters.go

Browse Source
This commit is contained in:
ionutboangiu
2021-05-06 10:00:38 +03:00
committed by Dan Christian Bogos
parent acb604ebd8
commit ef60112e6b
5 changed files with 158 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
engine/filters.go
View File

@@ -25,6 +25,7 @@ import (
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
"github.com/cgrates/cron"
)
// NewFilterS initializtes the filter service
@@ -473,31 +474,37 @@ func (fltr *FilterRule) passStringSuffix(dDP utils.DataProvider) (bool, error) {
}
func (fltr *FilterRule) passCronExp(ctx *context.Context, dDP utils.DataProvider) (bool, error) {
// tm, err := fltr.rsrElement.ParseDataProvider(dDP)
// if err != nil {
// if err == utils.ErrNotFound {
// return false, nil
// }
// return false, err
// }
// tmTime, err := utils.IfaceAsTime(tm, config.CgrConfig().GeneralCfg().DefaultTimezone)
// if err != nil {
// return false, err
// }
tm, err := fltr.rsrElement.ParseDataProvider(dDP)
if err != nil {
if err == utils.ErrNotFound {
return false, nil
}
return false, err
}
tmTime, err := utils.IfaceAsTime(tm, config.CgrConfig().GeneralCfg().DefaultTimezone)
if err != nil {
return false, err
}
// for _, valCronIDVal := range fltr.rsrValues {
// valTmID, err := valCronIDVal.ParseDataProvider(dDP)
// if err != nil {
// return false, err
// }
// tmTime = tmTime.Truncate(time.Second)
tmTime = tmTime.Truncate(time.Minute)
tmBefore := tmTime.Add(-time.Second)
// if err = connMgr.Call(ctx, config.CgrConfig().FilterSCfg().AdminSConns, utils.APIerSv1GetTPTiming, ,); err != nil {
// continue
// }
for _, valCronIDVal := range fltr.rsrValues {
valTmID, err := valCronIDVal.ParseDataProvider(dDP)
if err != nil {
continue
}
exp, err := cron.ParseStandard(valTmID)
if err != nil {
continue
}
if exp.Next(tmBefore) == tmTime {
return true, nil
}
}
// }
// return false, nil
return false, utils.ErrNotImplemented
return false, nil
}
func (fltr *FilterRule) passDestinations(ctx *context.Context, dDP utils.DataProvider) (bool, error) {

141
engine/filters_test.go
View File

@@ -1097,20 +1097,131 @@ func TestFilterPassRSRFieldsWithMultplieValues(t *testing.T) {
}
}
// func TestFilterPassCronExp(t *testing.T) {
// ev := utils.MapStorage{
// utils.MetaReq: utils.MapStorage{
// utils.AnswerTime: "2018-01-07T17:00:10Z",
// },
// }
func TestFilterPassCronExpOK(t *testing.T) {
ev := utils.MapStorage{
utils.MetaReq: utils.MapStorage{
utils.AnswerTime: "2021-05-05T12:00:01Z",
},
}
// cfg := config.NewDefaultCGRConfig()
// dm := NewDataManager(NewInternalDB(nil, nil, true), cfg.CacheCfg(), nil)
// fltr := NewFilterS(cfg, nil, dm)
cfg := config.NewDefaultCGRConfig()
dm := NewDataManager(NewInternalDB(nil, nil, true), cfg.CacheCfg(), nil)
fltr := NewFilterS(cfg, nil, dm)
// if passes, err := fltr.Pass(context.Background(), "cgrates.org", []string{"*cronexp:~*req.AnswerTime:* 10-12 * * *"}, ev); err != nil {
// t.Error(err)
// } else if !passes {
// t.Error("Not passing")
// }
// }
if passes, err := fltr.Pass(context.Background(), "cgrates.org",
[]string{"*cronexp:~*req.AnswerTime:0 12 5 5 *"}, ev); err != nil {
t.Error(err)
} else if !passes {
t.Error("Not passing")
}
}
func TestFilterPassCronExpNotActive(t *testing.T) {
ev := utils.MapStorage{
utils.MetaReq: utils.MapStorage{
utils.AnswerTime: "2021-05-05T12:00:01Z",
},
}
cfg := config.NewDefaultCGRConfig()
dm := NewDataManager(NewInternalDB(nil, nil, true), cfg.CacheCfg(), nil)
fltr := NewFilterS(cfg, nil, dm)
if passes, err := fltr.Pass(context.Background(), "cgrates.org",
[]string{"*cronexp:~*req.AnswerTime:1 12 5 5 *"}, ev); err != nil {
t.Error(err)
} else if passes {
t.Error("should not be passing")
}
}
func TestFilterPassCronExpParseErrWrongPath(t *testing.T) {
ev := utils.MapStorage{
utils.MetaReq: 13,
}
cfg := config.NewDefaultCGRConfig()
dm := NewDataManager(NewInternalDB(nil, nil, true), cfg.CacheCfg(), nil)
fltr := NewFilterS(cfg, nil, dm)
experr := utils.ErrWrongPath
if passes, err := fltr.Pass(context.Background(), "cgrates.org",
[]string{"*cronexp:~*req.AnswerTime:1 12 5 5 *"}, ev); err != experr {
t.Errorf("\nexpected: <%+v>, \nreceived: <%+v>", experr, err)
} else if passes {
t.Errorf("should not be passing")
}
}
func TestFilterPassCronExpErrNotFound(t *testing.T) {
ev := utils.MapStorage{}
cfg := config.NewDefaultCGRConfig()
dm := NewDataManager(NewInternalDB(nil, nil, true), cfg.CacheCfg(), nil)
fltr := NewFilterS(cfg, nil, dm)
if passes, err := fltr.Pass(context.Background(), "cgrates.org",
[]string{"*cronexp:~*req.AnswerTime:1 12 5 5 *"}, ev); err != nil {
t.Errorf("Expected nil, got %+v", err)
} else if passes {
t.Error("should not be passing")
}
}
func TestFilterPassCronExpConvertTimeErr(t *testing.T) {
ev := utils.MapStorage{
utils.MetaReq: utils.MapStorage{
utils.AnswerTime: "invalid time format",
},
}
cfg := config.NewDefaultCGRConfig()
dm := NewDataManager(NewInternalDB(nil, nil, true), cfg.CacheCfg(), nil)
fltr := NewFilterS(cfg, nil, dm)
experr := "Unsupported time format"
if passes, err := fltr.Pass(context.Background(), "cgrates.org",
[]string{"*cronexp:~*req.AnswerTime:1 12 5 5 *"}, ev); err.Error() != experr {
t.Errorf("\nexpected: <%+v>, \nreceived: <%+v>", experr, err)
} else if passes {
t.Error("should not be passing")
}
}
func TestFilterPassCronExpParseExpErr(t *testing.T) {
fltr, err := NewFilterRule(utils.MetaCronExp, "~*req.AnswerTime", []string{"* * * * * *"})
if err != nil {
t.Fatal(err)
}
ev := utils.MapStorage{
utils.MetaReq: utils.MapStorage{
utils.AnswerTime: "2021-05-05T12:00:01Z",
},
}
if passes, err := fltr.passCronExp(context.Background(), ev); err != nil {
t.Errorf("Expected nil, got %+v", err)
} else if passes {
t.Error("should not be passing")
}
}
func TestFilterPassCronExpParseDPErr(t *testing.T) {
fltr, err := NewFilterRule(utils.MetaCronExp, "~*req.AnswerTime", []string{"~* * * * *"})
if err != nil {
t.Fatal(err)
}
ev := utils.MapStorage{
utils.MetaReq: utils.MapStorage{
utils.AnswerTime: "2021-05-05T12:00:01Z",
},
}
if passes, err := fltr.passCronExp(context.Background(), ev); err != nil {
t.Errorf("Expected nil, got %+v", err)
} else if passes {
t.Error("should not be passing")
}
}