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

Adding AccountS support for cost calculation of routes

Browse Source
This commit is contained in:
DanB
2021-09-27 19:51:32 +02:00
parent 32c5d5e587
commit 1f4191d89d
2 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
engine/route_cost_sort.go
View File

@@ -51,22 +51,45 @@ func populateCostForRoutes(ctx *context.Context, cfg *config.CGRConfig,
},
RouteParameters: route.RouteParameters,
}
ev.APIOpts[utils.OptsRatesRateProfileIDs] = utils.CloneStringSlice(route.RateProfileIDs)
var rpCost utils.RateProfileCost
if err = connMgr.Call(ctx, cfg.RouteSCfg().RateSConns,
utils.RateSv1CostForEvent, ev, &rpCost); err != nil {
if extraOpts.ignoreErrors {
utils.Logger.Warning(
fmt.Sprintf("<%s> ignoring route with ID: %s, err: %s",
utils.RouteS, route.ID, err.Error()))
continue
var cost float64
if len(route.AccountIDs) != 0 { // query AccountS for cost
acntCost := new(utils.ExtEventCharges)
ev.APIOpts[utils.OptsAccountsAccountIDs] = utils.CloneStringSlice(route.AccountIDs)
if err = connMgr.Call(ctx, cfg.RouteSCfg().AccountSConns,
utils.AccountSv1MaxAbstracts, ev, &acntCost); err != nil {
return
}
return
cost = *acntCost.Concretes
acntIDs := make([]string, 0, len(acntCost.Accounts))
for acntID := range acntCost.Accounts {
acntIDs = append(acntIDs, acntID)
}
srtRoute.SortingData[utils.AccountIDs] = acntIDs
} else { // query RateS for cost
ev.APIOpts[utils.OptsRatesRateProfileIDs] = utils.CloneStringSlice(route.RateProfileIDs)
var rpCost utils.RateProfileCost
if err = connMgr.Call(ctx, cfg.RouteSCfg().RateSConns,
utils.RateSv1CostForEvent, ev, &rpCost); err != nil {
if extraOpts.ignoreErrors {
utils.Logger.Warning(
fmt.Sprintf("<%s> ignoring route with ID: %s, err: %s",
utils.RouteS, route.ID, err.Error()))
continue
}
return
}
cost, _ = rpCost.Cost.Float64()
srtRoute.SortingData[utils.RatingPlanID] = rpCost.ID
}
cost, _ := rpCost.Cost.Float64()
srtRoute.sortingDataF64[utils.Cost] = cost
srtRoute.SortingData[utils.Cost] = cost
srtRoute.SortingData[utils.RatingPlanID] = rpCost.ID
var pass bool
if pass, err = routeLazyPass(ctx, route.lazyCheckRules, ev, srtRoute.SortingData,
cfg.FilterSCfg().ResourceSConns,

2
sessions/sessions.go
View File

@@ -1438,7 +1438,7 @@ func (sS *SessionS) accounSMaxAbstracts(ctx *context.Context, cgrEvs map[string]
for runID, cgrEv := range cgrEvs {
acntCost := new(utils.ExtEventCharges)
if err = sS.connMgr.Call(ctx, sS.cgrCfg.SessionSCfg().AttributeSConns, // Fix Here with AccountS
utils.AccountSv1DebitAbstracts, cgrEv, &acntCost); err != nil {
utils.AccountSv1MaxAbstracts, cgrEv, &acntCost); err != nil {
return
}
maxAbstracts[runID] = utils.NewDecimalFromFloat64(*acntCost.Abstracts) // did not optimize here since we need to remove floats from acntCost