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

Implement GetTimeOpts function in libfilters.go

Browse Source
This commit is contained in:
ionutboangiu
2021-10-06 11:28:57 +03:00
committed by Dan Christian Bogos
parent 6e20c1aeff
commit 1e7ff42468
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
engine/libfilters.go
View File

@@ -176,6 +176,38 @@ func GetStringOpts(ctx *context.Context, tnt string, ev *utils.CGREvent, fS *Fil
return // return the option or NOT_FOUND if there are no options or none of the filters pass
}
// GetTimeOpts checks the specified option names in order among the keys in APIOpts returning the first value it finds as time.Time, otherwise it
// returns the config option if at least one filter passes or NOT_FOUND if none of them do
func GetTimeOpts(ctx *context.Context, tnt string, ev *utils.CGREvent, fS *FilterS, dynOpts []*utils.DynamicStringOpt,
tmz string, optNames ...string) (_ time.Time, err error) {
for _, optName := range optNames {
if opt, has := ev.APIOpts[optName]; has {
return utils.IfaceAsTime(opt, tmz)
}
}
evDP := ev.AsDataProvider()
var cfgOptStr string
var hasDefault bool
for _, opt := range dynOpts { // iterate through the options
if len(opt.FilterIDs) == 1 && opt.FilterIDs[0] == utils.MetaDefault {
hasDefault = true
cfgOptStr = opt.Value
continue
}
var pass bool
if pass, err = fS.Pass(ctx, tnt, opt.FilterIDs, evDP); err != nil { // check if the filter is passing for the DataProvider and return the option if it does
return
} else if pass {
return utils.ParseTimeDetectLayout(opt.Value, tmz)
}
}
if !hasDefault {
err = utils.ErrNotFound
return
}
return utils.ParseTimeDetectLayout(cfgOptStr, tmz) // return the option or NOT_FOUND if there are no options or none of the filters pass
}
// FilterStringSliceCfgOpts returns the option as []string if the filters match
func FilterStringSliceCfgOpts(ctx *context.Context, tnt string, ev utils.DataProvider, fS *FilterS, dynOpts []*utils.DynamicStringSliceOpt) (dft []string, err error) {
var hasDefault bool

9
rates/rates.go
View File

@@ -167,14 +167,9 @@ func (rS *RateS) rateProfileCostForEvent(ctx *context.Context, rtPfl *utils.Rate
return
}
}
var sTimeStr string
if sTimeStr, err = engine.FilterStringCfgOpts(ctx, args.Tenant, args.AsDataProvider(), rS.filterS,
rS.cfg.RateSCfg().Opts.StartTime); err != nil {
return
}
var sTime time.Time
if sTime, err = args.StartTime(sTimeStr, rS.cfg.GeneralCfg().DefaultTimezone, utils.OptsRatesStartTime,
utils.MetaStartTime); err != nil {
if sTime, err = engine.GetTimeOpts(ctx, args.Tenant, args, rS.filterS, rS.cfg.RateSCfg().Opts.StartTime,
rS.cfg.GeneralCfg().DefaultTimezone, utils.OptsRatesStartTime, utils.MetaStartTime); err != nil {
return
}
var usage *decimal.Big