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

Fix all the compilation errors in non-test files

Browse Source
This commit is contained in:
ionutboangiu
2021-10-12 16:01:45 +03:00
committed by Dan Christian Bogos
parent 82c491ad46
commit 5490cf66bf
8 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
accounts/accounts.go
View File

@@ -136,7 +136,7 @@ func (aS *AccountS) accountsDebit(ctx *context.Context, acnts []*utils.AccountWi
cgrEv *utils.CGREvent, concretes, store bool) (ec *utils.EventCharges, err error) {
var usage *decimal.Big
if usage, err = engine.GetDecimalBigOpts(ctx, cgrEv.Tenant, cgrEv, aS.fltrS, aS.cfg.AccountSCfg().Opts.Usage,
utils.OptsAccountsUsage, utils.MetaUsage); err != nil {
config.AccountsUsageDftOpt, utils.OptsAccountsUsage, utils.MetaUsage); err != nil {
return
}
dbted := decimal.New(0, 0)
@@ -239,12 +239,12 @@ func (aS *AccountS) accountDebit(ctx *context.Context, acnt *utils.Account, usag
func (aS *AccountS) V1AccountsForEvent(ctx *context.Context, args *utils.CGREvent, aps *[]*utils.Account) (err error) {
var accIDs []string
if accIDs, err = engine.GetStringSliceOpts(ctx, args.Tenant, args, aS.fltrS, aS.cfg.AccountSCfg().Opts.AccountIDs,
utils.OptsAccountsAccountIDs); err != nil {
config.AccountsAccountIDsDftOpt, utils.OptsAccountsAccountIDs); err != nil {
return
}
var ignFilters bool
if ignFilters, err = engine.GetBoolOpts(ctx, args.Tenant, args, aS.fltrS, aS.cfg.AccountSCfg().Opts.ProfileIgnoreFilters,
utils.MetaProfileIgnoreFilters); err != nil {
config.AccountsProfileIgnoreFiltersDftOpt, utils.MetaProfileIgnoreFilters); err != nil {
return
}
var acnts utils.AccountsWithWeight
@@ -263,12 +263,12 @@ func (aS *AccountS) V1AccountsForEvent(ctx *context.Context, args *utils.CGREven
func (aS *AccountS) V1MaxAbstracts(ctx *context.Context, args *utils.CGREvent, eEc *utils.EventCharges) (err error) {
var accIDs []string
if accIDs, err = engine.GetStringSliceOpts(ctx, args.Tenant, args, aS.fltrS, aS.cfg.AccountSCfg().Opts.AccountIDs,
utils.OptsAccountsAccountIDs); err != nil {
config.AccountsAccountIDsDftOpt, utils.OptsAccountsAccountIDs); err != nil {
return
}
var ignFilters bool
if ignFilters, err = engine.GetBoolOpts(ctx, args.Tenant, args, aS.fltrS, aS.cfg.AccountSCfg().Opts.ProfileIgnoreFilters,
utils.MetaProfileIgnoreFilters); err != nil {
config.AccountsProfileIgnoreFiltersDftOpt, utils.MetaProfileIgnoreFilters); err != nil {
return
}
var acnts utils.AccountsWithWeight
@@ -293,12 +293,12 @@ func (aS *AccountS) V1MaxAbstracts(ctx *context.Context, args *utils.CGREvent, e
func (aS *AccountS) V1DebitAbstracts(ctx *context.Context, args *utils.CGREvent, eEc *utils.EventCharges) (err error) {
var accIDs []string
if accIDs, err = engine.GetStringSliceOpts(ctx, args.Tenant, args, aS.fltrS, aS.cfg.AccountSCfg().Opts.AccountIDs,
utils.OptsAccountsAccountIDs); err != nil {
config.AccountsAccountIDsDftOpt, utils.OptsAccountsAccountIDs); err != nil {
return
}
var ignFilters bool
if ignFilters, err = engine.GetBoolOpts(ctx, args.Tenant, args, aS.fltrS, aS.cfg.AccountSCfg().Opts.ProfileIgnoreFilters,
utils.MetaProfileIgnoreFilters); err != nil {
config.AccountsProfileIgnoreFiltersDftOpt, utils.MetaProfileIgnoreFilters); err != nil {
return
}
var acnts utils.AccountsWithWeight
@@ -323,12 +323,12 @@ func (aS *AccountS) V1DebitAbstracts(ctx *context.Context, args *utils.CGREvent,
func (aS *AccountS) V1MaxConcretes(ctx *context.Context, args *utils.CGREvent, eEc *utils.EventCharges) (err error) {
var accIDs []string
if accIDs, err = engine.GetStringSliceOpts(ctx, args.Tenant, args, aS.fltrS, aS.cfg.AccountSCfg().Opts.AccountIDs,
utils.OptsAccountsAccountIDs); err != nil {
config.AccountsAccountIDsDftOpt, utils.OptsAccountsAccountIDs); err != nil {
return
}
var ignFilters bool
if ignFilters, err = engine.GetBoolOpts(ctx, args.Tenant, args, aS.fltrS, aS.cfg.AccountSCfg().Opts.ProfileIgnoreFilters,
utils.MetaProfileIgnoreFilters); err != nil {
config.AccountsProfileIgnoreFiltersDftOpt, utils.MetaProfileIgnoreFilters); err != nil {
return
}
var acnts utils.AccountsWithWeight
@@ -353,12 +353,12 @@ func (aS *AccountS) V1MaxConcretes(ctx *context.Context, args *utils.CGREvent, e
func (aS *AccountS) V1DebitConcretes(ctx *context.Context, args *utils.CGREvent, eEc *utils.EventCharges) (err error) {
var accIDs []string
if accIDs, err = engine.GetStringSliceOpts(ctx, args.Tenant, args, aS.fltrS, aS.cfg.AccountSCfg().Opts.AccountIDs,
utils.OptsAccountsAccountIDs); err != nil {
config.AccountsAccountIDsDftOpt, utils.OptsAccountsAccountIDs); err != nil {
return
}
var ignFilters bool
if ignFilters, err = engine.GetBoolOpts(ctx, args.Tenant, args, aS.fltrS, aS.cfg.AccountSCfg().Opts.ProfileIgnoreFilters,
utils.MetaProfileIgnoreFilters); err != nil {
config.AccountsProfileIgnoreFiltersDftOpt, utils.MetaProfileIgnoreFilters); err != nil {
return
}
var acnts utils.AccountsWithWeight

8
actions/actions.go
View File

@@ -265,12 +265,12 @@ func (aS *ActionS) asapExecuteActions(ctx *context.Context, sActs *scheduledActs
func (aS *ActionS) V1ScheduleActions(ctx *context.Context, args *utils.CGREvent, rpl *string) (err error) {
var actPrfIDs []string
if actPrfIDs, err = engine.GetStringSliceOpts(ctx, args.Tenant, args, aS.fltrS, aS.cfg.ActionSCfg().Opts.ActionProfileIDs,
utils.OptsActionsActionProfileIDs); err != nil {
config.ActionsActionProfileIDs, utils.OptsActionsActionProfileIDs); err != nil {
return
}
var ignFilters bool
if ignFilters, err = engine.GetBoolOpts(ctx, args.Tenant, args, aS.fltrS, aS.cfg.ActionSCfg().Opts.ProfileIgnoreFilters,
utils.MetaProfileIgnoreFilters); err != nil {
config.ActionsProfileIgnoreFilters, utils.MetaProfileIgnoreFilters); err != nil {
return
}
if err = aS.scheduleActions(ctx, []*utils.CGREvent{args},
@@ -285,12 +285,12 @@ func (aS *ActionS) V1ScheduleActions(ctx *context.Context, args *utils.CGREvent,
func (aS *ActionS) V1ExecuteActions(ctx *context.Context, args *utils.CGREvent, rpl *string) (err error) {
var actPrfIDs []string
if actPrfIDs, err = engine.GetStringSliceOpts(ctx, args.Tenant, args, aS.fltrS, aS.cfg.ActionSCfg().Opts.ActionProfileIDs,
utils.OptsActionsActionProfileIDs); err != nil {
config.ActionsActionProfileIDs, utils.OptsActionsActionProfileIDs); err != nil {
return
}
var ignFilters bool
if ignFilters, err = engine.GetBoolOpts(ctx, args.Tenant, args, aS.fltrS, aS.cfg.ActionSCfg().Opts.ProfileIgnoreFilters,
utils.MetaProfileIgnoreFilters); err != nil {
config.ActionsProfileIgnoreFilters, utils.MetaProfileIgnoreFilters); err != nil {
return
}
var schedActSet []*scheduledActs

12
engine/attributes.go
View File

@@ -134,12 +134,12 @@ func (alS *AttributeService) processEvent(ctx *context.Context, tnt string, args
lastID string, processedPrfNo map[string]int, profileRuns int) (rply *AttrSProcessEventReply, err error) {
var attrIDs []string
if attrIDs, err = GetStringSliceOpts(ctx, args.Tenant, args, alS.filterS, alS.cgrcfg.AttributeSCfg().Opts.AttributeIDs,
utils.OptsAttributesAttributeIDs); err != nil {
config.AttributesAttributeIDsDftOpt, utils.OptsAttributesAttributeIDs); err != nil {
return
}
var ignFilters bool
if ignFilters, err = GetBoolOpts(ctx, tnt, args, alS.filterS, alS.cgrcfg.AttributeSCfg().Opts.ProfileIgnoreFilters,
utils.MetaProfileIgnoreFilters); err != nil {
config.AttributesProfileIgnoreFiltersDftOpt, utils.MetaProfileIgnoreFilters); err != nil {
return
}
var attrPrf *AttributeProfile
@@ -214,12 +214,12 @@ func (alS *AttributeService) V1GetAttributeForEvent(ctx *context.Context, args *
}
var attrIDs []string
if attrIDs, err = GetStringSliceOpts(ctx, args.Tenant, args, alS.filterS, alS.cgrcfg.AttributeSCfg().Opts.AttributeIDs,
utils.OptsAttributesAttributeIDs); err != nil {
config.AttributesAttributeIDsDftOpt, utils.OptsAttributesAttributeIDs); err != nil {
return
}
var ignFilters bool
if ignFilters, err = GetBoolOpts(ctx, tnt, args, alS.filterS, alS.cgrcfg.AttributeSCfg().Opts.ProfileIgnoreFilters,
utils.MetaProfileIgnoreFilters); err != nil {
config.AttributesProfileIgnoreFiltersDftOpt, utils.MetaProfileIgnoreFilters); err != nil {
return
}
attrPrf, err := alS.attributeProfileForEvent(ctx, tnt, attrIDs, utils.MapStorage{
@@ -249,13 +249,13 @@ func (alS *AttributeService) V1ProcessEvent(ctx *context.Context, args *utils.CG
var processRuns int
if processRuns, err = GetIntOpts(ctx, tnt, args, alS.filterS, alS.cgrcfg.AttributeSCfg().Opts.ProcessRuns,
utils.OptsAttributesProcessRuns); err != nil {
config.AttributesProcessRunsDftOpt, utils.OptsAttributesProcessRuns); err != nil {
return
}
var profileRuns int
if profileRuns, err = GetIntOpts(ctx, tnt, args, alS.filterS, alS.cgrcfg.AttributeSCfg().Opts.ProfileRuns,
utils.OptsAttributesProfileRuns); err != nil {
config.AttributesProfileRunsDftOpt, utils.OptsAttributesProfileRuns); err != nil {
return
}
args = args.Clone()

14
engine/cdrs.go
View File

@@ -189,7 +189,7 @@ func (cdrS *CDRServer) processEvent(ctx *context.Context, ev *utils.CGREvent) (e
// making the options
var attrS bool
if attrS, err = GetBoolOpts(ctx, ev.Tenant, ev, cdrS.filterS, cdrS.cfg.CdrsCfg().Opts.Attributes,
utils.OptsAttributeS); err != nil {
config.CDRsAttributesDftOpt, utils.OptsAttributeS); err != nil {
return
}
if attrS {
@@ -205,7 +205,7 @@ func (cdrS *CDRServer) processEvent(ctx *context.Context, ev *utils.CGREvent) (e
var cgrEvs []*utils.CGREvent
var chrgS bool
if chrgS, err = GetBoolOpts(ctx, ev.Tenant, ev, cdrS.filterS, cdrS.cfg.CdrsCfg().Opts.Chargers,
utils.OptsChargerS); err != nil {
config.CDRsChargersDftOpt, utils.OptsChargerS); err != nil {
return
}
if chrgS {
@@ -225,7 +225,7 @@ func (cdrS *CDRServer) processEvent(ctx *context.Context, ev *utils.CGREvent) (e
var rateS bool
for _, cgrEv := range cgrEvs {
if rateS, err = GetBoolOpts(ctx, cgrEv.Tenant, cgrEv, cdrS.filterS, cdrS.cfg.CdrsCfg().Opts.Rates,
utils.OptsRateS); err != nil {
config.CDRsRatesDftOpt, utils.OptsRateS); err != nil {
return
}
if rateS {
@@ -241,7 +241,7 @@ func (cdrS *CDRServer) processEvent(ctx *context.Context, ev *utils.CGREvent) (e
var acntS bool
for _, cgrEv := range cgrEvs {
if acntS, err = GetBoolOpts(ctx, cgrEv.Tenant, cgrEv, cdrS.filterS, cdrS.cfg.CdrsCfg().Opts.Accounts,
utils.OptsAccountS); err != nil {
config.CDRsAccountsDftOpt, utils.OptsAccountS); err != nil {
return
}
if acntS {
@@ -257,7 +257,7 @@ func (cdrS *CDRServer) processEvent(ctx *context.Context, ev *utils.CGREvent) (e
var export bool
for _, cgrEv := range cgrEvs {
if export, err = GetBoolOpts(ctx, cgrEv.Tenant, cgrEv, cdrS.filterS, cdrS.cfg.CdrsCfg().Opts.Export,
utils.OptsCDRsExport); err != nil {
config.CDRsExportDftOpt, utils.OptsCDRsExport); err != nil {
return
}
if export {
@@ -277,7 +277,7 @@ func (cdrS *CDRServer) processEvent(ctx *context.Context, ev *utils.CGREvent) (e
var thdS bool
for _, cgrEv := range cgrEvs {
if thdS, err = GetBoolOpts(ctx, cgrEv.Tenant, cgrEv, cdrS.filterS, cdrS.cfg.CdrsCfg().Opts.Thresholds,
utils.OptsThresholdS); err != nil {
config.CDRsThresholdsDftOpt, utils.OptsThresholdS); err != nil {
return
}
if thdS {
@@ -293,7 +293,7 @@ func (cdrS *CDRServer) processEvent(ctx *context.Context, ev *utils.CGREvent) (e
var stS bool
for _, cgrEv := range cgrEvs {
if stS, err = GetBoolOpts(ctx, cgrEv.Tenant, cgrEv, cdrS.filterS, cdrS.cfg.CdrsCfg().Opts.Stats,
utils.OptsStatS); err != nil {
config.CDRsStatsDftOpt, utils.OptsStatS); err != nil {
return
}
if stS {

12
engine/resources.go
View File

@@ -679,7 +679,7 @@ func (rS *ResourceService) V1ResourcesForEvent(ctx *context.Context, args *utils
var ttl time.Duration
if ttl, err = GetDurationOpts(ctx, args.Tenant, args, rS.filterS, rS.cgrcfg.ResourceSCfg().Opts.UsageTTL,
utils.OptsResourcesUsageTTL); err != nil {
config.ResourcesUsageTTLDftOpt, utils.OptsResourcesUsageTTL); err != nil {
return
}
usageTTL := utils.DurationPointer(ttl)
@@ -737,13 +737,13 @@ func (rS *ResourceService) V1AuthorizeResources(ctx *context.Context, args *util
var units float64
if units, err = GetFloat64Opts(ctx, args.Tenant, args, rS.filterS, rS.cgrcfg.ResourceSCfg().Opts.Units,
utils.OptsResourcesUnits); err != nil {
config.ResourcesUnitsDftOpt, utils.OptsResourcesUnits); err != nil {
return
}
var ttl time.Duration
if ttl, err = GetDurationOpts(ctx, args.Tenant, args, rS.filterS, rS.cgrcfg.ResourceSCfg().Opts.UsageTTL,
utils.OptsResourcesUsageTTL); err != nil {
config.ResourcesUsageTTLDftOpt, utils.OptsResourcesUsageTTL); err != nil {
return
}
usageTTL := utils.DurationPointer(ttl)
@@ -813,13 +813,13 @@ func (rS *ResourceService) V1AllocateResources(ctx *context.Context, args *utils
var units float64
if units, err = GetFloat64Opts(ctx, args.Tenant, args, rS.filterS, rS.cgrcfg.ResourceSCfg().Opts.Units,
utils.OptsResourcesUnits); err != nil {
config.ResourcesUnitsDftOpt, utils.OptsResourcesUnits); err != nil {
return
}
var ttl time.Duration
if ttl, err = GetDurationOpts(ctx, args.Tenant, args, rS.filterS, rS.cgrcfg.ResourceSCfg().Opts.UsageTTL,
utils.OptsResourcesUsageTTL); err != nil {
config.ResourcesUsageTTLDftOpt, utils.OptsResourcesUsageTTL); err != nil {
return
}
usageTTL := utils.DurationPointer(ttl)
@@ -893,7 +893,7 @@ func (rS *ResourceService) V1ReleaseResources(ctx *context.Context, args *utils.
var ttl time.Duration
if ttl, err = GetDurationOpts(ctx, args.Tenant, args, rS.filterS, rS.cgrcfg.ResourceSCfg().Opts.UsageTTL,
utils.OptsResourcesUsageTTL); err != nil {
config.ResourcesUsageTTLDftOpt, utils.OptsResourcesUsageTTL); err != nil {
return
}
usageTTL := utils.DurationPointer(ttl)

8
engine/stats.go
View File

@@ -312,12 +312,12 @@ func (sS *StatService) processEvent(ctx *context.Context, tnt string, args *util
evNm := args.AsDataProvider()
var sqIDs []string
if sqIDs, err = GetStringSliceOpts(ctx, tnt, args, sS.filterS, sS.cgrcfg.StatSCfg().Opts.StatIDs,
utils.OptsStatsStatIDs); err != nil {
config.StatsStatIDsDftOpt, utils.OptsStatsStatIDs); err != nil {
return
}
var ignFilters bool
if ignFilters, err = GetBoolOpts(ctx, tnt, args, sS.filterS, sS.cgrcfg.StatSCfg().Opts.ProfileIgnoreFilters,
utils.MetaProfileIgnoreFilters); err != nil {
config.StatsProfileIgnoreFilters, utils.MetaProfileIgnoreFilters); err != nil {
return
}
matchSQs, err := sS.matchingStatQueuesForEvent(ctx, tnt, sqIDs, evNm, ignFilters)
@@ -383,12 +383,12 @@ func (sS *StatService) V1GetStatQueuesForEvent(ctx *context.Context, args *utils
}
var sqIDs []string
if sqIDs, err = GetStringSliceOpts(ctx, tnt, args, sS.filterS, sS.cgrcfg.StatSCfg().Opts.StatIDs,
utils.OptsStatsStatIDs); err != nil {
config.StatsStatIDsDftOpt, utils.OptsStatsStatIDs); err != nil {
return
}
var ignFilters bool
if ignFilters, err = GetBoolOpts(ctx, tnt, args, sS.filterS, sS.cgrcfg.StatSCfg().Opts.ProfileIgnoreFilters,
utils.MetaProfileIgnoreFilters); err != nil {
config.StatsProfileIgnoreFilters, utils.MetaProfileIgnoreFilters); err != nil {
return
}
var sQs StatQueues

4
engine/thresholds.go
View File

@@ -331,12 +331,12 @@ func (tS *ThresholdService) matchingThresholdsForEvent(ctx *context.Context, tnt
}
var thIDs []string
if thIDs, err = GetStringSliceOpts(ctx, tnt, args, tS.filterS, tS.cgrcfg.ThresholdSCfg().Opts.ThresholdIDs,
utils.OptsThresholdsThresholdIDs); err != nil {
config.ThresholdsThresholdIDsDftOpt, utils.OptsThresholdsThresholdIDs); err != nil {
return
}
var ignFilters bool
if ignFilters, err = GetBoolOpts(ctx, tnt, args, tS.filterS, tS.cgrcfg.ThresholdSCfg().Opts.ProfileIgnoreFilters,
utils.MetaProfileIgnoreFilters); err != nil {
config.ThresholdsProfileIgnoreFiltersDftOpt, utils.MetaProfileIgnoreFilters); err != nil {
return
}

8
rates/rates.go
View File

@@ -177,7 +177,7 @@ func (rS *RateS) rateProfileCostForEvent(ctx *context.Context, rtPfl *utils.Rate
}
var usage *decimal.Big
if usage, err = engine.GetDecimalBigOpts(ctx, args.Tenant, args, rS.filterS, rS.cfg.RateSCfg().Opts.Usage,
utils.OptsRatesUsage, utils.MetaUsage); err != nil {
config.RatesUsageDftOpt, utils.OptsRatesUsage, utils.MetaUsage); err != nil {
return
}
var ordRts []*orderedRate
@@ -196,7 +196,7 @@ func (rS *RateS) rateProfileCostForEvent(ctx *context.Context, rtPfl *utils.Rate
}
var ivalStart *decimal.Big
if ivalStart, err = engine.GetDecimalBigOpts(ctx, args.Tenant, args, rS.filterS, rS.cfg.RateSCfg().Opts.IntervalStart,
utils.OptsRatesIntervalStart); err != nil {
config.RatesIntervalStartDftOpt, utils.OptsRatesIntervalStart); err != nil {
return
}
var costIntervals []*utils.RateSInterval
@@ -217,12 +217,12 @@ func (rS *RateS) rateProfileCostForEvent(ctx *context.Context, rtPfl *utils.Rate
func (rS *RateS) V1CostForEvent(ctx *context.Context, args *utils.CGREvent, rpCost *utils.RateProfileCost) (err error) {
var rPfIDs []string
if rPfIDs, err = engine.GetStringSliceOpts(ctx, args.Tenant, args, rS.filterS, rS.cfg.RateSCfg().Opts.RateProfileIDs,
utils.OptsRatesRateProfileIDs); err != nil {
config.RatesRateProfileIDsDftOpt, utils.OptsRatesRateProfileIDs); err != nil {
return
}
var ignFilters bool
if ignFilters, err = engine.GetBoolOpts(ctx, args.Tenant, args, rS.filterS, rS.cfg.RateSCfg().Opts.ProfileIgnoreFilters,
utils.MetaProfileIgnoreFilters); err != nil {
config.RatesProfileIgnoreFiltersDftOpt, utils.MetaProfileIgnoreFilters); err != nil {
return
}
var rtPrl *utils.RateProfile