From 523bfde23e1047525151bad5e2a3415958ebf245 Mon Sep 17 00:00:00 2001 From: adi Date: Fri, 23 Sep 2022 09:59:24 +0300 Subject: [PATCH] Removed DataProvider func and improved GetBoolOpts args --- engine/libengine.go | 13 ------ sessions/sessions.go | 108 +++++++++++++++++++++++-------------------- 2 files changed, 58 insertions(+), 63 deletions(-) diff --git a/engine/libengine.go b/engine/libengine.go index 81d759781..c675a6907 100644 --- a/engine/libengine.go +++ b/engine/libengine.go @@ -182,19 +182,6 @@ func NewServiceWithName(val interface{}, name string, useName bool) (_ IntServic return s, nil } -func GetAPIOptsFromDataProvider(dP utils.DataProvider) map[string]interface{} { - switch v := dP.(type) { - case utils.MapStorage: - if x, has := v[utils.MetaOpts]; has { - return x.(map[string]interface{}) - } - return make(map[string]interface{}) - case MapEvent: - return v - } - return nil -} - func NewDispatcherService(val interface{}) (_ IntService, err error) { var srv *birpc.Service if srv, err = birpc.NewService(val, utils.EmptyString, false); err != nil { diff --git a/sessions/sessions.go b/sessions/sessions.go index 143555640..d789cd216 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -916,7 +916,8 @@ func (sS *SessionS) newSession(ctx *context.Context, cgrEv *utils.CGREvent, resI DebitInterval: dbtItval, } s.OptsStart[utils.MetaOriginID] = originID - if s.Chargeable, err = engine.GetBoolOpts(ctx, cgrEv.Tenant, s.OptsStart, sS.fltrS, sS.cfg.SessionSCfg().Opts.Chargeable, + opts := engine.MapEvent{utils.MetaOpts: s.OptsStart} + if s.Chargeable, err = engine.GetBoolOpts(ctx, cgrEv.Tenant, opts, sS.fltrS, sS.cfg.SessionSCfg().Opts.Chargeable, config.SessionsChargeableDftOpt, utils.OptsSesChargeable); err != nil { return } @@ -1551,23 +1552,24 @@ func (sS *SessionS) BiRPCv1AuthorizeEvent(ctx *context.Context, nil, true, utils.NonTransactional) } // end of RPC caching + dP := args.AsDataProvider() var attrS bool - if attrS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Attributes, + if attrS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Attributes, config.SessionsAttributesDftOpt, utils.OptsAttributeS); err != nil { return } var routeS bool - if routeS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Routes, + if routeS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Routes, config.SessionsRoutesDftOpt, utils.OptsRouteS); err != nil { return } var maxUsage bool - if maxUsage, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.MaxUsage, + if maxUsage, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.MaxUsage, config.SessionsMaxUsageDftOpt, utils.OptsSesMaxUsage); err != nil { return } var resAuthorize bool - if resAuthorize, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.ResourcesAuthorize, + if resAuthorize, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.ResourcesAuthorize, config.SessionsResourcesAuthorizeDftOpt, utils.OptsSesResourceSAuthorize); err != nil { return } @@ -1592,7 +1594,7 @@ func (sS *SessionS) BiRPCv1AuthorizeEvent(ctx *context.Context, runEvents := make(map[string]*utils.CGREvent) var chrgS bool - if chrgS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Chargers, + if chrgS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Chargers, config.SessionsChargersDftOpt, utils.OptsChargerS); err != nil { return } @@ -1608,7 +1610,7 @@ func (sS *SessionS) BiRPCv1AuthorizeEvent(ctx *context.Context, runEvents[utils.MetaRaw] = args } var acntS bool - if acntS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Accounts, + if acntS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Accounts, config.SessionsAccountsDftOpt, utils.OptsAccountS); err != nil { return } @@ -1645,7 +1647,7 @@ func (sS *SessionS) BiRPCv1AuthorizeEvent(ctx *context.Context, } } var thdS bool - if thdS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Thresholds, + if thdS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Thresholds, config.SessionsThresholdsDftOpt, utils.OptsThresholdS); err != nil { return } @@ -1660,7 +1662,7 @@ func (sS *SessionS) BiRPCv1AuthorizeEvent(ctx *context.Context, authReply.ThresholdIDs = &tIDs } var stS bool - if stS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Stats, + if stS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Stats, config.SessionsStatsDftOpt, utils.OptsStatS); err != nil { return } @@ -1689,8 +1691,9 @@ func (sS *SessionS) BiRPCv1AuthorizeEventWithDigest(ctx *context.Context, if err = sS.BiRPCv1AuthorizeEvent(ctx, args, &initAuthRply); err != nil { return } + dP := args.AsDataProvider() var attrS bool - if attrS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Attributes, + if attrS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Attributes, config.SessionsAttributesDftOpt, utils.OptsAttributeS); err != nil { return } @@ -1698,7 +1701,7 @@ func (sS *SessionS) BiRPCv1AuthorizeEventWithDigest(ctx *context.Context, authReply.AttributesDigest = utils.StringPointer(initAuthRply.Attributes.Digest()) } var resourcesAuthorize bool - if resourcesAuthorize, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.ResourcesAuthorize, + if resourcesAuthorize, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.ResourcesAuthorize, config.SessionsResourcesAuthorizeDftOpt, utils.OptsSesResourceSAuthorize); err != nil { return } @@ -1706,7 +1709,7 @@ func (sS *SessionS) BiRPCv1AuthorizeEventWithDigest(ctx *context.Context, authReply.ResourceAllocation = initAuthRply.ResourceAllocation } var acntS bool - if acntS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Accounts, + if acntS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Accounts, config.SessionsAccountsDftOpt, utils.OptsAccountS); err != nil { return } @@ -1715,7 +1718,7 @@ func (sS *SessionS) BiRPCv1AuthorizeEventWithDigest(ctx *context.Context, authReply.MaxUsage = maxDur.Seconds() } var routeS bool - if routeS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Routes, + if routeS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Routes, config.SessionsRoutesDftOpt, utils.OptsRouteS); err != nil { return } @@ -1723,7 +1726,7 @@ func (sS *SessionS) BiRPCv1AuthorizeEventWithDigest(ctx *context.Context, authReply.RoutesDigest = utils.StringPointer(initAuthRply.RouteProfiles.Digest()) } var thdS bool - if thdS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Thresholds, + if thdS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Thresholds, config.SessionsThresholdsDftOpt, utils.OptsThresholdS); err != nil { return } @@ -1732,7 +1735,7 @@ func (sS *SessionS) BiRPCv1AuthorizeEventWithDigest(ctx *context.Context, strings.Join(*initAuthRply.ThresholdIDs, utils.FieldsSep)) } var stS bool - if stS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Stats, + if stS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Stats, config.SessionsStatsDftOpt, utils.OptsStatS); err != nil { return } @@ -1780,19 +1783,20 @@ func (sS *SessionS) BiRPCv1InitiateSession(ctx *context.Context, } // end of RPC caching rply.MaxUsage = utils.DurationPointer(time.Duration(utils.InvalidUsage)) // temp + dP := args.AsDataProvider() var attrS bool - if attrS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Attributes, + if attrS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Attributes, config.SessionsAttributesDftOpt, utils.OptsAttributeS); err != nil { return } var initS bool - if initS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Initiate, + if initS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Initiate, config.SessionsInitiateDftOpt, utils.OptsSesInitiate); err != nil { return } var resourcesAllocate bool - if resourcesAllocate, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.ResourcesAllocate, + if resourcesAllocate, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.ResourcesAllocate, config.SessionsResourcesAllocateDftOpt, utils.OptsSesResourceSAllocate); err != nil { return } @@ -1832,7 +1836,7 @@ func (sS *SessionS) BiRPCv1InitiateSession(ctx *context.Context, return } var forceDuration bool - if forceDuration, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.ForceDuration, + if forceDuration, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.ForceDuration, config.SessionsForceDurationDftOpt, utils.OptsSesForceDuration); err != nil { return } @@ -1865,7 +1869,7 @@ func (sS *SessionS) BiRPCv1InitiateSession(ctx *context.Context, } } var thdS bool - if thdS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Thresholds, + if thdS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Thresholds, config.SessionsThresholdsDftOpt, utils.OptsThresholdS); err != nil { return } @@ -1880,7 +1884,7 @@ func (sS *SessionS) BiRPCv1InitiateSession(ctx *context.Context, rply.ThresholdIDs = &tIDs } var stS bool - if stS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Stats, + if stS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Stats, config.SessionsStatsDftOpt, utils.OptsStatS); err != nil { return } @@ -1966,13 +1970,14 @@ func (sS *SessionS) BiRPCv1UpdateSession(ctx *context.Context, nil, true, utils.NonTransactional) } // end of RPC caching + dP := args.AsDataProvider() var attrS bool - if attrS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Attributes, + if attrS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Attributes, config.SessionsAttributesDftOpt, utils.OptsAttributeS); err != nil { return } var updS bool - if updS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Update, + if updS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Update, config.SessionsUpdateDftOpt, utils.OptsSesUpdate); err != nil { return } @@ -2003,7 +2008,7 @@ func (sS *SessionS) BiRPCv1UpdateSession(ctx *context.Context, ev.GetStringIgnoreErrors(utils.OriginHost)) if s == nil { var forceDuration bool - if forceDuration, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.ForceDuration, + if forceDuration, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.ForceDuration, config.SessionsForceDurationDftOpt, utils.OptsSesForceDuration); err != nil { return } @@ -2064,13 +2069,14 @@ func (sS *SessionS) BiRPCv1TerminateSession(ctx *context.Context, nil, true, utils.NonTransactional) } // end of RPC caching + dP := args.AsDataProvider() var resourcesRelease bool - if resourcesRelease, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.ResourcesRelease, + if resourcesRelease, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.ResourcesRelease, config.SessionsResourcesReleaseDftOpt, utils.OptsSesResourceSRelease); err != nil { return } var termS bool - if termS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Terminate, + if termS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Terminate, config.SessionsTerminateDftOpt, utils.OptsSesTerminate); err != nil { return } @@ -2095,7 +2101,7 @@ func (sS *SessionS) BiRPCv1TerminateSession(ctx *context.Context, fib := utils.FibDuration(time.Millisecond, 0) var isMsg bool // one time charging, do not perform indexing and sTerminator var forceDuration bool - if forceDuration, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.ForceDuration, + if forceDuration, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.ForceDuration, config.SessionsForceDurationDftOpt, utils.OptsSesForceDuration); err != nil { return } @@ -2124,7 +2130,7 @@ func (sS *SessionS) BiRPCv1TerminateSession(ctx *context.Context, s.UpdateSRuns(ev, sS.cfg.SessionSCfg().AlterableFields) } s.Lock() - if s.Chargeable, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Chargeable, + if s.Chargeable, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Chargeable, config.SessionsChargeableDftOpt, utils.OptsSesChargeable); err != nil { return } @@ -2153,7 +2159,7 @@ func (sS *SessionS) BiRPCv1TerminateSession(ctx *context.Context, } } var thdS bool - if thdS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Thresholds, + if thdS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Thresholds, config.SessionsThresholdsDftOpt, utils.OptsThresholdS); err != nil { return } @@ -2168,7 +2174,7 @@ func (sS *SessionS) BiRPCv1TerminateSession(ctx *context.Context, } } var stS bool - if stS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Stats, + if stS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Stats, config.SessionsStatsDftOpt, utils.OptsStatS); err != nil { return } @@ -2268,9 +2274,10 @@ func (sS *SessionS) BiRPCv1ProcessMessage(ctx *context.Context, me := engine.MapEvent(args.Event) originID := me.GetStringIgnoreErrors(utils.OriginID) + dP := args.AsDataProvider() var attrS bool - if attrS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Attributes, + if attrS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Attributes, config.SessionsAttributesDftOpt, utils.OptsAttributeS); err != nil { return } @@ -2284,7 +2291,7 @@ func (sS *SessionS) BiRPCv1ProcessMessage(ctx *context.Context, } } var resourcesAllocate bool - if resourcesAllocate, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.ResourcesAllocate, + if resourcesAllocate, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.ResourcesAllocate, config.SessionsResourcesAllocateDftOpt, utils.OptsSesResourceSAllocate); err != nil { return } @@ -2305,7 +2312,7 @@ func (sS *SessionS) BiRPCv1ProcessMessage(ctx *context.Context, rply.ResourceAllocation = &allocMessage } var routeS bool - if routeS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Routes, + if routeS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Routes, config.SessionsRoutesDftOpt, utils.OptsRouteS); err != nil { return } @@ -2319,13 +2326,13 @@ func (sS *SessionS) BiRPCv1ProcessMessage(ctx *context.Context, } } var message bool - if message, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Message, + if message, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Message, config.SessionsMessageDftOpt, utils.OptsSesMessage); err != nil { return } if message { var forceDuration bool - if forceDuration, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.ForceDuration, + if forceDuration, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.ForceDuration, config.SessionsForceDurationDftOpt, utils.OptsSesForceDuration); err != nil { return } @@ -2336,7 +2343,7 @@ func (sS *SessionS) BiRPCv1ProcessMessage(ctx *context.Context, rply.MaxUsage = &maxUsage } var thdS bool - if thdS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Thresholds, + if thdS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Thresholds, config.SessionsThresholdsDftOpt, utils.OptsThresholdS); err != nil { return } @@ -2351,7 +2358,7 @@ func (sS *SessionS) BiRPCv1ProcessMessage(ctx *context.Context, rply.ThresholdIDs = &tIDs } var stS bool - if stS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Stats, + if stS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Stats, config.SessionsStatsDftOpt, utils.OptsStatS); err != nil { return } @@ -2410,8 +2417,9 @@ func (sS *SessionS) BiRPCv1ProcessEvent(ctx *context.Context, } // end of RPC caching + dP := args.AsDataProvider() var blockError bool - if blockError, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.BlockerError, + if blockError, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.BlockerError, config.SessionsBlockerErrorDftOpt, utils.OptsSesBlockerError); err != nil { return } @@ -2419,7 +2427,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(ctx *context.Context, utils.MetaRaw: args, } var chrgS bool - if chrgS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Chargers, + if chrgS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Chargers, config.SessionsChargersDftOpt, utils.OptsChargerS); err != nil { return } @@ -2435,14 +2443,14 @@ func (sS *SessionS) BiRPCv1ProcessEvent(ctx *context.Context, // check for *attribute var attrS bool - if attrS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Attributes, + if attrS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Attributes, config.SessionsAttributesDftOpt, utils.OptsAttributeS); err != nil { return } if attrS { rply.Attributes = make(map[string]*engine.AttrSProcessEventReply) var attrsDerivedReply bool - if attrsDerivedReply, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.AttributesDerivedReply, + if attrsDerivedReply, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.AttributesDerivedReply, config.SessionsAttributesDerivedReplyDftOpt, utils.OptsSesAttributeSDerivedReply); err != nil { return } @@ -2462,13 +2470,13 @@ func (sS *SessionS) BiRPCv1ProcessEvent(ctx *context.Context, // get routes if required var routeS bool - if routeS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Routes, + if routeS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Routes, config.SessionsRoutesDftOpt, utils.OptsRouteS); err != nil { return } if routeS { var routesDerivedReply bool - if routesDerivedReply, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.RoutesDerivedReply, + if routesDerivedReply, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.RoutesDerivedReply, config.SessionsRoutesDerivedReplyDftOpt, utils.OptsSesRouteSDerivedReply); err != nil { return } @@ -2487,13 +2495,13 @@ func (sS *SessionS) BiRPCv1ProcessEvent(ctx *context.Context, // process thresholds if required var thdS bool - if thdS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Thresholds, + if thdS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Thresholds, config.SessionsThresholdsDftOpt, utils.OptsThresholdS); err != nil { return } if thdS { var thdsDerivedReply bool - if thdsDerivedReply, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.ThresholdsDerivedReply, + if thdsDerivedReply, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.ThresholdsDerivedReply, config.SessionsThresholdsDerivedReplyDftOpt, utils.OptsSesThresholdSDerivedReply); err != nil { return } @@ -2515,13 +2523,13 @@ func (sS *SessionS) BiRPCv1ProcessEvent(ctx *context.Context, // process stats if required var stS bool - if stS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.Stats, + if stS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.Stats, config.SessionsStatsDftOpt, utils.OptsStatS); err != nil { return } if stS { var stsDerivedReply bool - if stsDerivedReply, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.StatsDerivedReply, + if stsDerivedReply, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.StatsDerivedReply, config.SessionsStatsDerivedReplyDftOpt, utils.OptsSesStatSDerivedReply); err != nil { return } @@ -2616,7 +2624,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(ctx *context.Context, return fmt.Errorf("unsuported value for %s option: %q ", utils.OptsResourceS, optStr) } var resourcesDerivedReply bool - if resourcesDerivedReply, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.ResourcesDerivedReply, + if resourcesDerivedReply, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.ResourcesDerivedReply, config.SessionsResourcesDerivedReplyDftOpt, utils.OptsSesResourceSDerivedReply); err != nil { return } @@ -2785,7 +2793,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(ctx *context.Context, // } var cdrS bool - if cdrS, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.CDRs, + if cdrS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.CDRs, config.SessionsCDRsDftOpt, utils.OptsCDRs); err != nil { return } @@ -2794,7 +2802,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(ctx *context.Context, return utils.NewErrNotConnected(utils.CDRs) } var cdrsDerivedReply bool - if cdrsDerivedReply, err = engine.GetBoolOpts(ctx, args.Tenant, args.AsDataProvider(), sS.fltrS, sS.cfg.SessionSCfg().Opts.CDRsDerivedReply, + if cdrsDerivedReply, err = engine.GetBoolOpts(ctx, args.Tenant, dP, sS.fltrS, sS.cfg.SessionSCfg().Opts.CDRsDerivedReply, config.SessionsCDRsDerivedReplyDftOpt, utils.OptsSesCDRsDerivedReply); err != nil { return }