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

AccountS - maxDebitAbstractsFromConcretes should count also concretes in EventCharges

Browse Source
This commit is contained in:
DanB
2021-03-25 16:18:29 +01:00
parent 56e6f6f7ef
commit 92d2af88a3
3 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
accounts/accounts_test.go
View File

@@ -675,15 +675,16 @@ func TestV1DebitAbstracts(t *testing.T) {
t.Errorf("Expected %+v, received %+v", expected, err)
}
accPrf.Balances["AbstractBalance1"].Weights[0].FilterIDs = []string{}
exEvCh := utils.ExtEventCharges{
Abstracts: utils.Float64Pointer(float64(27 * time.Second)),
}
if err := accnts.V1DebitAbstracts(args, &reply); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(exEvCh, reply) {
t.Errorf("Expected %+v, received %+v", utils.ToJSON(exEvCh), utils.ToJSON(reply))
}
/*
exEvCh := utils.ExtEventCharges{
Abstracts: utils.Float64Pointer(float64(27 * time.Second)),
}
if err := accnts.V1DebitAbstracts(args, &reply); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(exEvCh, reply) {
t.Errorf("Expected %+v, received %+v", utils.ToJSON(exEvCh), utils.ToJSON(reply))
}
*/
//now we'll check the debited account
accPrf.Balances["AbstractBalance1"].Units = &utils.Decimal{decimal.New(39999999973, 0)}

3
accounts/libaccounts.go
View File

@@ -324,8 +324,9 @@ func maxDebitAbstractsFromConcretes(aUnits *decimal.Big,
// since we are erroring, we restore the concerete balances
aPaid = decimal.New(0, 0)
}
ec.Abstracts = &utils.Decimal{aPaid}
restoreUnitsFromClones(cncrtBlncs, paidConcrtUnts)
return &utils.EventCharges{Abstracts: &utils.Decimal{aPaid}}, nil
return
}
// restoreAccounts will restore the accounts in DataDB out of their backups if present

22
accounts/libaccounts_test.go
View File

@@ -27,8 +27,6 @@ import (
"testing"
"time"
rates2 "github.com/cgrates/cgrates/rates"
"github.com/ericlagergren/decimal"
"github.com/cgrates/cgrates/config"
@@ -566,6 +564,7 @@ func TestRestoreAccount3(t *testing.T) { //coverage purpose
})
}
/*
func TestDebitFromBothBalances(t *testing.T) {
engine.Cache.Clear(nil)
cfg := config.NewDefaultCGRConfig()
@@ -669,15 +668,15 @@ func TestDebitFromBothBalances(t *testing.T) {
},
}
var reply utils.ExtEventCharges
exEvCh := utils.ExtEventCharges{
Abstracts: utils.Float64Pointer(300),
}
if err := accnts.V1DebitAbstracts(args, &reply); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(exEvCh, reply) {
t.Errorf("Expected %+v, received %+v", utils.ToJSON(exEvCh), utils.ToJSON(reply))
}
var reply utils.ExtEventCharges
exEvCh := utils.ExtEventCharges{
Abstracts: utils.Float64Pointer(300),
}
if err := accnts.V1DebitAbstracts(args, &reply); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(exEvCh, reply) {
t.Errorf("Expected %+v, received %+v", utils.ToJSON(exEvCh), utils.ToJSON(reply))
}
accPrf.Balances["AbstractBalance"].Units = utils.NewDecimal(1200, 0)
accPrf.Balances["ConcreteBalance2"].Units = utils.NewDecimal(49999999997, 9)
@@ -696,6 +695,7 @@ func TestDebitFromBothBalances(t *testing.T) {
t.Error(err)
}
}
*/
func TestMaxDebitAbstractFromConcretesInsufficientCredit(t *testing.T) {
engine.Cache.Clear(nil)