From edea07e044433f216d8c79b4cf9768cdfdcc4226 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon@itsyscom.com>
Date: Wed, 18 Dec 2019 15:57:38 +0200
Subject: [PATCH] Updated AttributeS Context

---
 engine/cdrs.go       | 4 +++-
 engine/chargers.go   | 6 ++++--
 engine/suppliers.go  | 4 +++-
 sessions/sessions.go | 4 +++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/engine/cdrs.go b/engine/cdrs.go
index ebb6633fb..9251e0f66 100644
--- a/engine/cdrs.go
+++ b/engine/cdrs.go
@@ -316,7 +316,9 @@ func (cdrS *CDRServer) chrgrSProcessEvent(cgrEv *utils.CGREventWithArgDispatcher
 func (cdrS *CDRServer) attrSProcessEvent(cgrEv *utils.CGREventWithArgDispatcher) (err error) {
 	var rplyEv AttrSProcessEventReply
 	attrArgs := &AttrArgsProcessEvent{
-		Context:  utils.StringPointer(utils.MetaCDRs),
+		Context:  utils.StringPointer(utils.FirstNonEmpty(
+			utils.IfaceAsString(cgrEv.CGREvent.Event[utils.Context]),
+			utils.MetaCDRs)),
 		CGREvent: cgrEv.CGREvent}
 	if cgrEv.ArgDispatcher != nil {
 		attrArgs.ArgDispatcher = cgrEv.ArgDispatcher
diff --git a/engine/chargers.go b/engine/chargers.go
index 15496bde4..b97d6c513 100644
--- a/engine/chargers.go
+++ b/engine/chargers.go
@@ -122,8 +122,10 @@ func (cS *ChargerService) processEvent(cgrEv *utils.CGREventWithArgDispatcher) (
 		}
 
 		args := &AttrArgsProcessEvent{
-			AttributeIDs:  cP.AttributeIDs,
-			Context:       utils.StringPointer(utils.MetaChargers),
+			AttributeIDs: cP.AttributeIDs,
+			Context: utils.StringPointer(utils.FirstNonEmpty(
+				utils.IfaceAsString(clonedEv.CGREvent.Event[utils.Context]),
+				utils.MetaChargers)),
 			ProcessRuns:   nil,
 			CGREvent:      clonedEv.CGREvent,
 			ArgDispatcher: clonedEv.ArgDispatcher,
diff --git a/engine/suppliers.go b/engine/suppliers.go
index e72579a16..abd13dba9 100644
--- a/engine/suppliers.go
+++ b/engine/suppliers.go
@@ -579,7 +579,9 @@ func (spS *SupplierService) V1GetSuppliers(args *ArgsGetSuppliers, reply *Sorted
 	}
 	if len(spS.cgrcfg.SupplierSCfg().AttributeSConns) != 0 {
 		attrArgs := &AttrArgsProcessEvent{
-			Context:       utils.StringPointer(utils.MetaSuppliers),
+			Context: utils.StringPointer(utils.FirstNonEmpty(
+				utils.IfaceAsString(args.CGREvent.Event[utils.Context]),
+				utils.MetaSuppliers)),
 			CGREvent:      args.CGREvent,
 			ArgDispatcher: args.ArgDispatcher,
 		}
diff --git a/sessions/sessions.go b/sessions/sessions.go
index 8f63d0057..1dd092ca5 100644
--- a/sessions/sessions.go
+++ b/sessions/sessions.go
@@ -3386,7 +3386,9 @@ func (sS *SessionS) processAttributes(cgrEv *utils.CGREvent, argDisp *utils.ArgD
 		return rplyEv, utils.NewErrNotConnected(utils.AttributeS)
 	}
 	attrArgs := &engine.AttrArgsProcessEvent{
-		Context:       utils.StringPointer(utils.MetaSessionS),
+		Context: utils.StringPointer(utils.FirstNonEmpty(
+			utils.IfaceAsString(cgrEv.Event[utils.Context]),
+			utils.MetaSessionS)),
 		CGREvent:      cgrEv,
 		ArgDispatcher: argDisp,
 	}