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

process all balances on debit (own+shared)

Browse Source
This commit is contained in:
Radu Ioan Fericean
2014-03-21 18:01:28 +02:00
parent c6de153685
commit 5de1a83bf5
2 changed files with 31 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
engine/account.go
View File

@@ -164,11 +164,7 @@ func (ub *Account) getBalancesForPrefix(prefix string, balances BalanceChain, sh
if sharedGroup != "" && sharedGroup != "" && b.SharedGroup != sharedGroup {
continue
}
if b.SharedGroup != "" {
// we are asking for balances from a sharing user so
// attach ub info to the balance
b.account = ub
}
b.account = ub
if b.DestinationId != "" && b.DestinationId != utils.ANY {
for _, p := range utils.SplitPrefix(prefix, MIN_PREFIX_MATCH) {
if x, err := cache2go.GetCached(DESTINATION_PREFIX + p); err == nil {
@@ -195,14 +191,14 @@ func (ub *Account) getBalancesForPrefix(prefix string, balances BalanceChain, sh
}
func (ub *Account) debitCreditBalance(cc *CallCost, count bool) (err error) {
usefulMinuteBalances := ub.getBalancesForPrefix(cc.Destination, ub.BalanceMap[MINUTES+cc.Direction], "")
usefulMoneyBalances := ub.getBalancesForPrefix(cc.Destination, ub.BalanceMap[CREDIT+cc.Direction], "")
usefulMinuteBalances := ub.getAlldBalancesForPrefix(cc.Destination, MINUTES+cc.Direction)
usefulMoneyBalances := ub.getAlldBalancesForPrefix(cc.Destination, CREDIT+cc.Direction)
// debit minutes
for _, balance := range usefulMinuteBalances {
if balance.SharedGroup != "" {
ub.debitMinutesFromSharedBalances(balance, cc, usefulMoneyBalances, count)
} else {
balance.DebitMinutes(cc, count, ub, usefulMoneyBalances)
initialValue := balance.Value
balance.DebitMinutes(cc, count, balance.account, usefulMoneyBalances)
if balance.Value != initialValue && balance.account != ub {
accountingStorage.SetAccount(balance.account)
}
if cc.IsPaid() {
goto CONNECT_FEE
@@ -222,10 +218,10 @@ func (ub *Account) debitCreditBalance(cc *CallCost, count bool) (err error) {
}
// debit money
for _, balance := range usefulMoneyBalances {
if balance.SharedGroup != "" {
ub.debitMoneyFromSharedBalances(balance, cc, count)
} else {
balance.DebitMoney(cc, count, ub)
initialValue := balance.Value
balance.DebitMoney(cc, count, balance.account)
if balance.Value != initialValue && balance.account != ub {
accountingStorage.SetAccount(balance.account)
}
if cc.IsPaid() {
goto CONNECT_FEE
@@ -286,48 +282,6 @@ CONNECT_FEE:
return
}
func (ub *Account) debitMinutesFromSharedBalances(myBalance *Balance, cc *CallCost, moneyBalances BalanceChain, count bool) {
sharedGroupName := myBalance.SharedGroup
sharedGroup, err := accountingStorage.GetSharedGroup(sharedGroupName, false)
if err != nil {
Logger.Warning(fmt.Sprintf("Could not get shared group: %v", sharedGroupName))
return
}
allMinuteSharedBalances := sharedGroup.GetBalances(cc.Destination, MINUTES+cc.Direction, ub)
for _, sharedBalance := range sharedGroup.SortBalancesByStrategy(myBalance, allMinuteSharedBalances) {
initialValue := sharedBalance.Value
sharedBalance.DebitMinutes(cc, count, sharedBalance.account, moneyBalances)
if sharedBalance.Value != initialValue {
accountingStorage.SetAccount(sharedBalance.account)
}
if cc.IsPaid() {
return
}
}
return
}
func (ub *Account) debitMoneyFromSharedBalances(myBalance *Balance, cc *CallCost, count bool) {
sharedGroupName := myBalance.SharedGroup
sharedGroup, err := accountingStorage.GetSharedGroup(sharedGroupName, false)
if err != nil {
Logger.Warning(fmt.Sprintf("Could not get shared group: %v", sharedGroup))
return
}
allMoneySharedBalances := sharedGroup.GetBalances(cc.Destination, CREDIT+cc.Direction, ub)
for _, sharedBalance := range sharedGroup.SortBalancesByStrategy(myBalance, allMoneySharedBalances) {
initialValue := sharedBalance.Value
sharedBalance.DebitMoney(cc, count, sharedBalance.account)
if sharedBalance.Value != initialValue {
accountingStorage.SetAccount(sharedBalance.account)
}
if cc.IsPaid() {
return
}
}
return
}
func (ub *Account) GetDefaultMoneyBalance(direction string) *Balance {
for _, balance := range ub.BalanceMap[CREDIT+direction] {
if balance.IsDefault() {
@@ -548,3 +502,23 @@ func (account *Account) GetUniqueSharedGroupMembers(destination, direction strin
}
return memberIds, nil
}
// like getBalancesForPrefix but expanding shared balances
func (account *Account) getAlldBalancesForPrefix(destination, balanceType string) (bc BalanceChain) {
balances := account.getBalancesForPrefix(destination, account.BalanceMap[balanceType], "")
for _, b := range balances {
if b.SharedGroup != "" {
sharedGroup, err := accountingStorage.GetSharedGroup(b.SharedGroup, false)
if err != nil {
Logger.Warning(fmt.Sprintf("Could not get shared group: %v", b.SharedGroup))
continue
}
sharedBalances := sharedGroup.GetBalances(destination, balanceType, account)
sharedBalances = sharedGroup.SortBalancesByStrategy(b, sharedBalances)
bc = append(bc, sharedBalances...)
} else {
bc = append(bc, b)
}
}
return
}

1
engine/calldesc_test.go
View File

@@ -405,7 +405,6 @@ func TestMaxDebitWithAccountShared(t *testing.T) {
t.Errorf("Wrong callcost in shared debit: %+v, %v", cc, err)
}
acc, _ := cd.getAccount()
log.Print(cd.GetAccountKey())
balanceMap := acc.BalanceMap[CREDIT+OUTBOUND]
if len(balanceMap) != 1 || balanceMap[0].Value != 0 {
t.Errorf("Wrong shared balance debited: %+v", balanceMap)