From 403cb640932d55a78a5e5a800e05dd5e1476d48b Mon Sep 17 00:00:00 2001
From: porosnicuadrian <adrian.porosnicu@itsyscom.com>
Date: Mon, 4 Oct 2021 14:42:47 +0300
Subject: [PATCH] Fixed ld_process_match_ac_it_test and panic in accounts

---
 accounts/abstractbalance.go                              | 2 +-
 accounts/accounts.go                                     | 2 --
 data/conf/samples/ld_process_match_rt_mysql/cgrates.json | 2 ++
 data/tariffplans/loadRateTest/Accounts.csv               | 4 ++--
 general_tests/ld_process_match_ac_it_test.go             | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/accounts/abstractbalance.go b/accounts/abstractbalance.go
index bedf84027..c1dcc23fd 100644
--- a/accounts/abstractbalance.go
+++ b/accounts/abstractbalance.go
@@ -115,7 +115,7 @@ func (aB *abstractBalance) debitAbstracts(ctx *context.Context, usage *decimal.B
 			costIcrm, dbted); err != nil {
 			return
 		} else if ecCost.Abstracts.Compare(utils.NewDecimal(0, 0)) == 0 { // no debit performed
-			return
+			return ecCost, nil
 		}
 	}
 	var dbtUnits *decimal.Big
diff --git a/accounts/accounts.go b/accounts/accounts.go
index dbdcac035..6e473dc16 100644
--- a/accounts/accounts.go
+++ b/accounts/accounts.go
@@ -131,7 +131,6 @@ func (aS *AccountS) matchingAccountsForEvent(ctx *context.Context, tnt string, c
 // accountsDebit will debit an usage out of multiple accounts
 func (aS *AccountS) accountsDebit(ctx *context.Context, acnts []*utils.AccountWithWeight,
 	cgrEv *utils.CGREvent, concretes, store bool) (ec *utils.EventCharges, err error) {
-
 	var usage *decimal.Big
 	if usage, err = engine.FilterDecimalBigCfgOpts(ctx, cgrEv.Tenant, cgrEv.AsDataProvider(), aS.fltrS,
 		aS.cfg.AccountSCfg().Opts.Usage); err != nil {
@@ -316,7 +315,6 @@ func (aS *AccountS) V1DebitAbstracts(ctx *context.Context, args *utils.CGREvent,
 	if procEC, err = aS.accountsDebit(ctx, acnts, args, false, true); err != nil {
 		return
 	}
-
 	var rcvEec *utils.ExtEventCharges
 	if rcvEec, err = procEC.AsExtEventCharges(); err != nil {
 		return
diff --git a/data/conf/samples/ld_process_match_rt_mysql/cgrates.json b/data/conf/samples/ld_process_match_rt_mysql/cgrates.json
index a5bd8ef94..f0379016a 100644
--- a/data/conf/samples/ld_process_match_rt_mysql/cgrates.json
+++ b/data/conf/samples/ld_process_match_rt_mysql/cgrates.json
@@ -48,6 +48,7 @@
 		"ees_conns": ["conn1"]
 	},
 	
+	
 	"chargers": {
 		"enabled": true,
 		"attributes_conns": ["*internal"],
@@ -62,6 +63,7 @@
 
 	"accounts": {
 		"enabled": true,
+		"rates_conns": ["*internal"],
 	},
 
 	"rpc_conns": {
diff --git a/data/tariffplans/loadRateTest/Accounts.csv b/data/tariffplans/loadRateTest/Accounts.csv
index 67882eafa..42165a1f7 100644
--- a/data/tariffplans/loadRateTest/Accounts.csv
+++ b/data/tariffplans/loadRateTest/Accounts.csv
@@ -1,3 +1,3 @@
 #Tenant,ID,FilterIDs,Weights,Opts,BalanceID,BalanceFilterIDs,BalanceWeights,BalanceType,BalanceUnits,BalanceUnitFactors,BalanceOpts,BalanceCostIncrements,BalanceAttributeIDs,BalanceRateProfileIDs,ThresholdIDs
-cgrates.org,ACC_PRF_1,,;20,,MonetaryBalance,,;10,*concrete,14,fltr1&fltr2;100;fltr3;200,,fltr1&fltr2;1.3;2.3;3.3,attr1;attr2,,*none
-cgrates.org,1001,,,,VoiceBalance,,;10,*voice,3600000000000,,,,,,
\ No newline at end of file
+#cgrates.org,ACC_PRF_1,,;20,,MonetaryBalance,,;10,*concrete,14,fltr1&fltr2;100;fltr3;200,,fltr1&fltr2;1.3;2.3;3.3,attr1;attr2,,*none
+cgrates.org,1001,,,,VoiceBalance,,;10,*abstract,3600000000000,,,,,,
\ No newline at end of file
diff --git a/general_tests/ld_process_match_ac_it_test.go b/general_tests/ld_process_match_ac_it_test.go
index 4b8abc477..be436e35f 100644
--- a/general_tests/ld_process_match_ac_it_test.go
+++ b/general_tests/ld_process_match_ac_it_test.go
@@ -41,11 +41,11 @@ var (
 		testLdPrMatchAcLoadConfig,
 		testLdPrMatchAcResetDataDB,
 		testLdPrMatchAcResetStorDb,
-		testLdPrMatchAcStartEngine,
+		// testLdPrMatchAcStartEngine,
 		testLdPrMatchAcRPCConn,
 		testLdPrMatchAcLoadTP,
 		testLdPrMatchAcCDRSProcessEvent,
-		testLdPrMatchAcStopCgrEngine,
+		// testLdPrMatchAcStopCgrEngine,
 	}
 )