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

Updated account update threshold trigger

Browse Source
This commit is contained in:
Trial97
2021-07-16 17:10:37 +03:00
committed by Dan Christian Bogos
parent 36aab43e90
commit 7e7657b30d
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
engine/account.go
View File

@@ -376,6 +376,9 @@ func (acc *Account) getAlldBalancesForPrefix(destination, category,
func (acc *Account) debitCreditBalance(cd *CallDescriptor, count bool, dryRun bool, goNegative bool) (cc *CallCost, err error) {
usefulUnitBalances := acc.getAlldBalancesForPrefix(cd.Destination, cd.Category, cd.ToR, cd.TimeStart)
usefulMoneyBalances := acc.getAlldBalancesForPrefix(cd.Destination, cd.Category, utils.MetaMonetary, cd.TimeStart)
// intiValues map[UUID]float64 and pass them to publish updating initial value
initUnitBal, initMoneyBal := balancesValues(usefulUnitBalances), balancesValues(usefulMoneyBalances)
var leftCC *CallCost
cc = cd.CreateCallCost()
var hadBalanceSubj bool
@@ -578,8 +581,8 @@ func (acc *Account) debitCreditBalance(cd *CallDescriptor, count bool, dryRun bo
COMMIT:
if !dryRun {
// save darty shared balances
usefulMoneyBalances.SaveDirtyBalances(acc)
usefulUnitBalances.SaveDirtyBalances(acc)
usefulMoneyBalances.SaveDirtyBalances(acc, initMoneyBal)
usefulUnitBalances.SaveDirtyBalances(acc, initUnitBal)
}
//log.Printf("Final CC: %+v", cc)
return
@@ -1091,8 +1094,11 @@ func (acc *Account) AsAccountSummary() *AccountSummary {
}
// Publish sends the account to stats and threshold
func (acc *Account) Publish() {
func (acc *Account) Publish(initBal map[string]float64) {
acntSummary := acc.AsAccountSummary()
for _, currentBal := range acntSummary.BalanceSummaries {
currentBal.Initial = initBal[currentBal.UUID]
}
cgrEv := &utils.CGREvent{
Tenant: acntSummary.Tenant,
ID: utils.GenUUID(),
@@ -1120,7 +1126,14 @@ func (acc *Account) Publish() {
fmt.Sprintf("<AccountS> error: %s processing account event %+v with StatS.", err.Error(), cgrEv))
}
}
}
func balancesValues(bals Balances) (init map[string]float64) {
init = make(map[string]float64)
for _, bal := range bals {
init[bal.Uuid] = bal.Value
}
return
}
// NewAccountSummaryFromJSON creates a new AcccountSummary from a json string

8
engine/action.go
View File

@@ -754,7 +754,13 @@ func publishAccount(ub *Account, a *Action, acs Actions, extraData interface{})
if ub == nil {
return errors.New("nil account")
}
ub.Publish()
initBal := make(map[string]float64)
for _, bals := range ub.BalanceMap {
for _, bal := range bals {
initBal[bal.Uuid] = bal.Value
}
}
ub.Publish(initBal)
return nil
}

4
engine/balances.go
View File

@@ -757,7 +757,7 @@ func (bc Balances) HasBalance(balance *Balance) bool {
return false
}
func (bc Balances) SaveDirtyBalances(acc *Account) {
func (bc Balances) SaveDirtyBalances(acc *Account, initBal map[string]float64) {
savedAccounts := utils.StringSet{}
for _, b := range bc {
if b.account == nil || !b.dirty || savedAccounts.Has(b.account.ID) {
@@ -767,7 +767,7 @@ func (bc Balances) SaveDirtyBalances(acc *Account) {
if b.account != acc {
dm.SetAccount(b.account)
}
b.account.Publish()
b.account.Publish(initBal)
}
}