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

AccountS - concrete balances with support for chained debitUnit

Browse Source
This commit is contained in:
DanB
2021-01-02 20:32:54 +01:00
parent 325d0f0131
commit 9df5ec3092
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
accounts/absolutebalance.go
View File

@@ -40,9 +40,9 @@ type abstractBalance struct {
ralsConns []string
}
// debit implements the balanceOperator interface
func (ab *abstractBalance) debit(cgrEv *utils.CGREventWithOpts,
startTime time.Time, usage *decimal.Big) (ec *utils.EventCharges, err error) {
// debitUsage implements the balanceOperator interface
func (ab *abstractBalance) debitUsage(usage *decimal.Big, startTime time.Time,
cgrEv *utils.CGREventWithOpts) (ec *utils.EventCharges, err error) {
//var uF *utils.UsageFactor
if _, _, err = usageWithFactor(ab.blnCfg, ab.fltrS, cgrEv, usage); err != nil {
return

15
accounts/concretebalance.go
View File

@@ -28,21 +28,22 @@ import (
)
// newConcreteBalance constructs a concreteBalanceOperator
func newConcreteBalanceOperator(blnCfg *utils.Balance,
func newConcreteBalanceOperator(blnCfg *utils.Balance, cncrtBlncs []*concreteBalance,
fltrS *engine.FilterS, ralsConns []string) balanceOperator {
return &concreteBalance{blnCfg, fltrS, ralsConns}
return &concreteBalance{blnCfg, cncrtBlncs, fltrS, ralsConns}
}
// concreteBalance is the operator for *concrete balance type
type concreteBalance struct {
blnCfg *utils.Balance
fltrS *engine.FilterS
ralsConns []string
blnCfg *utils.Balance
cncrtBlncs []*concreteBalance // paying balances
fltrS *engine.FilterS
ralsConns []string
}
// debit implements the balanceOperator interface
func (cb *concreteBalance) debit(cgrEv *utils.CGREventWithOpts,
startTime time.Time, usage *decimal.Big) (ec *utils.EventCharges, err error) {
func (cb *concreteBalance) debitUsage(usage *decimal.Big, startTime time.Time,
cgrEv *utils.CGREventWithOpts) (ec *utils.EventCharges, err error) {
//var uF *utils.UsageFactor
if _, _, err = usageWithFactor(cb.blnCfg, cb.fltrS, cgrEv, usage); err != nil {
return

8
accounts/libaccounts.go
View File

@@ -40,7 +40,7 @@ func newAccountBalances(acnt *utils.AccountProfile,
// populate cncrtBlncs
acntBlncs.cncrtBlncs = make([]*concreteBalance, len(acntBlncs.typIdx[utils.MetaConcrete]))
for i, blncIdx := range acntBlncs.typIdx[utils.MetaConcrete] {
acntBlncs.cncrtBlncs[i] = newConcreteBalanceOperator(acntBlncs.blnCfgs[blncIdx], fltrS, ralsConns).(*concreteBalance)
acntBlncs.cncrtBlncs[i] = newConcreteBalanceOperator(acntBlncs.blnCfgs[blncIdx], acntBlncs.cncrtBlncs, fltrS, ralsConns).(*concreteBalance)
acntBlncs.opers[acntBlncs.blnCfgs[blncIdx].ID] = acntBlncs.cncrtBlncs[i]
}
// populate opers
@@ -75,7 +75,7 @@ func newBalanceOperator(blncCfg *utils.Balance, cncrtBlncs []*concreteBalance,
default:
return nil, fmt.Errorf("unsupported balance type: <%s>", blncCfg.Type)
case utils.MetaConcrete:
return newConcreteBalanceOperator(blncCfg, fltrS, ralsConns), nil
return newConcreteBalanceOperator(blncCfg, cncrtBlncs, fltrS, ralsConns), nil
case utils.MetaAbstract:
return newAbstractBalanceOperator(blncCfg, cncrtBlncs, fltrS, ralsConns), nil
}
@@ -83,8 +83,8 @@ func newBalanceOperator(blncCfg *utils.Balance, cncrtBlncs []*concreteBalance,
// balanceOperator is the implementation of a balance type
type balanceOperator interface {
debit(cgrEv *utils.CGREventWithOpts,
startTime time.Time, usage *decimal.Big) (ec *utils.EventCharges, err error)
debitUsage(usage *decimal.Big, startTime time.Time,
cgrEv *utils.CGREventWithOpts) (ec *utils.EventCharges, err error)
}
// usagewithFactor returns the usage considering also factor for the debit

1
accounts/libaccounts_test.go
View File

@@ -74,7 +74,6 @@ func TestCBDebitUnits(t *testing.T) {
} else if dbted.Cmp(decimal.New(12, 1)) != 0 { // only 1.2 is possible due to increment
//} else if dbted.Cmp(new(decimal.Big).SetFloat64(1.2)) != 0 {
t.Errorf("debited: %s, cmp: %v", dbted, dbted.Cmp(new(decimal.Big).SetFloat64(1.2)))
} else if cb.blnCfg.Value != 0.05 {
t.Errorf("balance remaining: %f", cb.blnCfg.Value)
}