From bd59b70694ef0a2d80485bc68a69c798c8e70bb8 Mon Sep 17 00:00:00 2001
From: porosnicuadrian <adrian.porosnicu@itsyscom.com>
Date: Tue, 27 Jul 2021 12:02:39 +0300
Subject: [PATCH] Debit account from *usage test

---
 accounts/accounts_test.go   | 8 ++++----
 accounts/concretebalance.go | 1 -
 utils/eventcharges.go       | 7 ++++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/accounts/accounts_test.go b/accounts/accounts_test.go
index 07332494b..aec576623 100644
--- a/accounts/accounts_test.go
+++ b/accounts/accounts_test.go
@@ -437,8 +437,10 @@ func TestAccountsDebitGetUsage(t *testing.T) {
 		t.Errorf("Expected %v, \n received %v", utils.ToJSON(evChExp), utils.ToJSON(rcv))
 	}
 
-/*
 	// get usage from *usage
+	//firstly reset the account
+	accntsPrf[0].Account.Balances["ConcreteBal1"].Units = &utils.Decimal{decimal.New(90, 0)}
+	accnts = NewAccountS(cfg, fltr, nil, dm)
 	cgrEvent = &utils.CGREvent{
 		ID:     "TEST_EVENT_get_usage",
 		Tenant: "cgrates.org",
@@ -452,11 +454,9 @@ func TestAccountsDebitGetUsage(t *testing.T) {
 	if rcv, err := accnts.accountsDebit(context.Background(), accntsPrf,
 		cgrEvent, false, false); err != nil {
 		t.Error(err)
-	} else if rcv.Equals(evChExp) {
+	} else if !rcv.Equals(evChExp) {
 		t.Errorf("Expected %v, \n received %v", utils.ToJSON(evChExp), utils.ToJSON(rcv))
 	}
-
- */
 }
 
 func TestAccountsDebit(t *testing.T) {
diff --git a/accounts/concretebalance.go b/accounts/concretebalance.go
index bc154ddef..7b7bf109e 100644
--- a/accounts/concretebalance.go
+++ b/accounts/concretebalance.go
@@ -78,7 +78,6 @@ func (cB *concreteBalance) debitAbstracts(ctx *context.Context, aUnits *decimal.
 	} else if !pass {
 		return nil, utils.ErrFilterNotPassingNoCaps
 	}
-
 	// costIncrement
 	var costIcrm *utils.CostIncrement
 	if costIcrm, err = costIncrement(ctx, cB.blnCfg.CostIncrements,
diff --git a/utils/eventcharges.go b/utils/eventcharges.go
index 1b9049443..d741fca37 100644
--- a/utils/eventcharges.go
+++ b/utils/eventcharges.go
@@ -285,7 +285,12 @@ func (eEc *ExtEventCharges) Equals(exCh *ExtEventCharges) (eq bool) {
 
 // Equals returns the equality between two EventCharges
 func (eC *EventCharges) Equals(evCh *EventCharges) (eq bool) {
-	if (eC.Abstracts == nil && evCh.Abstracts != nil ||
+    if eC == nil && evCh == nil {
+    	return true
+	}
+	if (eC == nil && evCh != nil ||
+		eC != nil && evCh == nil) ||
+		(eC.Abstracts == nil && evCh.Abstracts != nil ||
 		eC.Abstracts != nil && evCh.Abstracts == nil ||
 		(eC.Abstracts != nil && evCh.Abstracts != nil &&
 			eC.Abstracts.Compare(evCh.Abstracts) != 0)) ||