From b2e84bfdf02392f7b8cdce7ba46d3cbd818fd6ea Mon Sep 17 00:00:00 2001
From: porosnicuadrian <adrian.porosnicu@itsyscom.com>
Date: Mon, 10 Jan 2022 09:30:20 +0200
Subject: [PATCH] Fixed chargers tests

---
 apis/chargers_it_test.go  | 14 +++++++++-----
 engine/chargers.go        |  2 +-
 engine/chargers_test.go   |  3 ++-
 engine/z_chargers_test.go |  8 ++++----
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/apis/chargers_it_test.go b/apis/chargers_it_test.go
index 8b9757060..d45ef7353 100644
--- a/apis/chargers_it_test.go
+++ b/apis/chargers_it_test.go
@@ -486,7 +486,7 @@ func testChgrsProcessEvent(t *testing.T) {
 	expected := &[]*engine.ChrgSProcessEventReply{
 		{
 			ChargerSProfile: "TEST_CHARGERS_IT_TEST",
-			AlteredFields:   []string{"*opts.*runID"},
+			AlteredFields:   []string{utils.MetaOptsRunID, utils.MetaOpts + utils.NestingSep + utils.MetaChargeID},
 			CGREvent: &utils.CGREvent{
 				Tenant: "cgrates.org",
 				ID:     "eventCharger",
@@ -495,8 +495,9 @@ func testChgrsProcessEvent(t *testing.T) {
 					utils.Destination:  "1002",
 				},
 				APIOpts: map[string]interface{}{
-					"*subsys":       "*chargers",
-					utils.MetaRunID: utils.MetaDefault,
+					utils.MetaChargeID: utils.UUIDSha1Prefix(),
+					"*subsys":          "*chargers",
+					utils.MetaRunID:    utils.MetaDefault,
 				},
 			},
 		},
@@ -514,8 +515,11 @@ func testChgrsProcessEvent(t *testing.T) {
 	if err := chgrsSRPC.Call(context.Background(), utils.ChargerSv1ProcessEvent,
 		cgrEv, &reply); err != nil {
 		t.Error(err)
-	} else if !reflect.DeepEqual(reply, expected) {
-		t.Errorf("\nExpected %+v, \nreceived %+v", utils.ToJSON(expected), utils.ToJSON(reply))
+	} else {
+		(*reply)[0].CGREvent.APIOpts[utils.MetaChargeID] = (*expected)[0].CGREvent.APIOpts[utils.MetaChargeID]
+		if !reflect.DeepEqual(reply, expected) {
+			t.Errorf("\nExpected %+v, \nreceived %+v", utils.ToJSON(expected), utils.ToJSON(reply))
+		}
 	}
 }
 
diff --git a/engine/chargers.go b/engine/chargers.go
index 241702e95..0798d0926 100644
--- a/engine/chargers.go
+++ b/engine/chargers.go
@@ -117,7 +117,7 @@ func (cS *ChargerS) processEvent(ctx *context.Context, tnt string, cgrEv *utils.
 		rply[i] = &ChrgSProcessEventReply{
 			ChargerSProfile: cP.ID,
 			CGREvent:        clonedEv,
-			AlteredFields:   []string{utils.MetaOptsRunID, utils.MetaChargeID},
+			AlteredFields:   []string{utils.MetaOptsRunID, utils.MetaOpts + utils.NestingSep + utils.MetaChargeID},
 		}
 		if len(cP.AttributeIDs) == 1 && cP.AttributeIDs[0] == utils.MetaNone {
 			continue // AttributeS disabled
diff --git a/engine/chargers_test.go b/engine/chargers_test.go
index 33044652b..8b60fb758 100644
--- a/engine/chargers_test.go
+++ b/engine/chargers_test.go
@@ -452,7 +452,7 @@ func TestChargerProcessEvent(t *testing.T) {
 	rpl := []*ChrgSProcessEventReply{
 		{
 			ChargerSProfile: "CPP_1",
-			AlteredFields:   []string{utils.MetaOptsRunID},
+			AlteredFields:   []string{utils.MetaOptsRunID, utils.MetaOpts + utils.NestingSep + utils.MetaChargeID},
 			CGREvent:        chargerEvents[0],
 		},
 	}
@@ -461,6 +461,7 @@ func TestChargerProcessEvent(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Error: %+v", err)
 	}
+	rpl[0].CGREvent.APIOpts[utils.MetaChargeID] = rcv[0].CGREvent.APIOpts[utils.MetaChargeID]
 	if !reflect.DeepEqual(rpl[0], rcv[0]) {
 		t.Errorf("Expecting: %+v, received: %+v ", utils.ToJSON(rpl[0]), utils.ToJSON(rcv[0]))
 	}
diff --git a/engine/z_chargers_test.go b/engine/z_chargers_test.go
index 1f9b5aa48..4edc6b969 100644
--- a/engine/z_chargers_test.go
+++ b/engine/z_chargers_test.go
@@ -148,7 +148,7 @@ func TestChargersprocessEventCallNilErr(t *testing.T) {
 	exp := []*ChrgSProcessEventReply{
 		{
 			ChargerSProfile: "1001",
-			AlteredFields:   []string{utils.MetaOptsRunID, utils.AccountField},
+			AlteredFields:   []string{utils.MetaOptsRunID, utils.MetaOpts + utils.NestingSep + utils.MetaChargeID, utils.AccountField},
 			CGREvent: &utils.CGREvent{
 				Tenant: "cgrates.org",
 				ID:     "cgrEvID",
@@ -224,7 +224,7 @@ func TestChargersprocessEventCallErr(t *testing.T) {
 	exp := []*ChrgSProcessEventReply{
 		{
 			ChargerSProfile: "1001",
-			AlteredFields:   []string{utils.MetaOptsRunID},
+			AlteredFields:   []string{utils.MetaOptsRunID, utils.MetaOpts + utils.NestingSep + utils.MetaChargeID},
 			CGREvent: &utils.CGREvent{
 				Tenant: "cgrates.org",
 				ID:     "cgrEvID",
@@ -245,7 +245,7 @@ func TestChargersprocessEventCallErr(t *testing.T) {
 	if err != nil {
 		t.Errorf("\nexpected: <%+v>, \nreceived: <%+v>", nil, err)
 	}
-
+	exp[0].CGREvent.APIOpts[utils.MetaChargeID] = rcv[0].CGREvent.APIOpts[utils.MetaChargeID]
 	if !reflect.DeepEqual(exp, rcv) {
 		t.Errorf("\nexpected: <%+v>, \nreceived: <%+v>",
 			utils.ToJSON(exp), utils.ToJSON(rcv))
@@ -463,7 +463,7 @@ func TestChargersV1ProcessEvent(t *testing.T) {
 	exp := &[]*ChrgSProcessEventReply{
 		{
 			ChargerSProfile: "1001",
-			AlteredFields:   []string{utils.MetaOptsRunID, utils.AccountField},
+			AlteredFields:   []string{utils.MetaOptsRunID, utils.MetaOpts + utils.NestingSep + utils.MetaChargeID, utils.AccountField},
 			CGREvent: &utils.CGREvent{
 				Tenant: "cgrates.org",
 				ID:     "cgrEvID",