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

Fixed V1ProcessEventWithGet method

Browse Source
This commit is contained in:
porosnicuadrian
2021-10-13 12:11:17 +03:00
committed by Dan Christian Bogos
parent 277d8b388a
commit 04889e855f
2 changed files with 19 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apis/account_it_test.go
View File

@@ -451,16 +451,13 @@ func testAccMaxAbstracts(t *testing.T) {
Weights: ";20",
Type: utils.MetaConcrete,
Units: 213,
/*
CostIncrements: []*utils.APICostIncrement{
{
Increment: utils.Float64Pointer(float64(time.Second)),
FixedFee: utils.NewDecimal(int64(0, 0),
RecurrentFee: utils.NewDecimal(int64(0, 0),
},
CostIncrements: []*utils.APICostIncrement{
{
Increment: utils.Float64Pointer(float64(time.Second)),
FixedFee: utils.Float64Pointer(0),
RecurrentFee: utils.Float64Pointer(0),
},
*/
},
},
},
},
@@ -573,7 +570,14 @@ func testAccMaxAbstracts(t *testing.T) {
Weight: 20,
},
},
Type: "*concrete",
Type: "*concrete",
CostIncrements: []*utils.CostIncrement{
{
Increment: utils.NewDecimal(int64(time.Second), 0),
FixedFee: utils.NewDecimal(0, 0),
RecurrentFee: utils.NewDecimal(0, 0),
},
},
Units: utils.NewDecimal(213, 0),
},
},

78
engine/cdrs.go
View File

@@ -347,12 +347,14 @@ func (cdrS *CDRServer) V1ProcessEvent(ctx *context.Context, arg *utils.CGREvent,
return nil
}
/*
// V1ProcessEventWithGet has the same logic with V1ProcessEvent except it adds the proccessed events to the reply
func (cdrS *CDRServer) V1ProcessEventWithGet(ctx *context.Context, arg *utils.CGREvent, evs *[]*utils.EventWithFlags) (err error) {
if arg.ID == "" {
if arg.ID == utils.EmptyString {
arg.ID = utils.GenUUID()
}
if arg.Tenant == utils.EmptyString {
arg.Tenant = cdrS.cfg.GeneralCfg().DefaultTenant
}
// RPC caching
if config.CgrConfig().CacheCfg().Partitions[utils.CacheRPCResponses].Limit != 0 {
cacheKey := utils.ConcatenatedKey(utils.CDRsV1ProcessEvent, arg.ID)
@@ -373,80 +375,10 @@ func (cdrS *CDRServer) V1ProcessEventWithGet(ctx *context.Context, arg *utils.CG
}
// end of RPC caching
// processing options
argsDP := arg.AsDataProvider()
var acntS bool
if v, has := arg.APIOpts[utils.OptsAccountS]; !has {
if acntS, err = FilterBoolCfgOpts(ctx, arg.Tenant, argsDP, cdrS.filterS,
cdrS.cfg.CdrsCfg().Opts.Accounts); err != nil {
return
}
} else if acntS, err = utils.IfaceAsBool(v); err != nil {
return
}
var attrS bool
if v, has := arg.APIOpts[utils.OptsAttributeS]; !has {
if attrS, err = FilterBoolCfgOpts(ctx, arg.Tenant, argsDP, cdrS.filterS,
cdrS.cfg.CdrsCfg().Opts.Attributes); err != nil {
return
}
} else if attrS, err = utils.IfaceAsBool(v); err != nil {
return
}
var chrgS bool
if v, has := arg.APIOpts[utils.OptsChargerS]; !has {
if chrgS, err = FilterBoolCfgOpts(ctx, arg.Tenant, argsDP, cdrS.filterS,
cdrS.cfg.CdrsCfg().Opts.Chargers); err != nil {
return
}
} else if chrgS, err = utils.IfaceAsBool(v); err != nil {
return
}
var export bool
if v, has := arg.APIOpts[utils.OptsCDRsExport]; !has {
if export, err = FilterBoolCfgOpts(ctx, arg.Tenant, argsDP, cdrS.filterS,
cdrS.cfg.CdrsCfg().Opts.Export); err != nil {
return
}
} else if export, err = utils.IfaceAsBool(v); err != nil {
return
}
var rateS bool
if v, has := arg.APIOpts[utils.OptsRateS]; !has {
if rateS, err = FilterBoolCfgOpts(ctx, arg.Tenant, argsDP, cdrS.filterS,
cdrS.cfg.CdrsCfg().Opts.Rates); err != nil {
return
}
} else if rateS, err = utils.IfaceAsBool(v); err != nil {
return
}
var stS bool
if v, has := arg.APIOpts[utils.OptsStatS]; !has {
if stS, err = FilterBoolCfgOpts(ctx, arg.Tenant, argsDP, cdrS.filterS,
cdrS.cfg.CdrsCfg().Opts.Stats); err != nil {
return
}
} else if stS, err = utils.IfaceAsBool(v); err != nil {
return
}
var thdS bool
if v, has := arg.APIOpts[utils.OptsThresholdS]; !has {
if thdS, err = FilterBoolCfgOpts(ctx, arg.Tenant, argsDP, cdrS.filterS,
cdrS.cfg.CdrsCfg().Opts.Thresholds); err != nil {
return
}
} else if thdS, err = utils.IfaceAsBool(v); err != nil {
return
}
// end of processing options
var procEvs []*utils.EventWithFlags
if procEvs, err = cdrS.processEvent(ctx, arg,
chrgS, attrS, rateS, acntS, export, thdS, stS); err != nil {
if procEvs, err = cdrS.processEvent(ctx, arg); err != nil {
return
}
*evs = procEvs
return nil
}
*/