From 06d075304b74afe4c97906d16173c0e24acf5c7b Mon Sep 17 00:00:00 2001
From: andronache98 <andrei.andronache@itsyscom.com>
Date: Fri, 21 Jan 2022 14:28:40 +0200
Subject: [PATCH] Renamed GetSetCGRID to GetSetOptsOriginID

---
 sessions/libsessions.go |  4 ++--
 sessions/sessions.go    | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sessions/libsessions.go b/sessions/libsessions.go
index ba1f71c40..569859ce9 100644
--- a/sessions/libsessions.go
+++ b/sessions/libsessions.go
@@ -51,8 +51,8 @@ type BiRPClient interface {
 	V1WarnDisconnect(ctx *context.Context, args map[string]interface{}, reply *string) (err error)
 }
 
-// GetSetCGRID will populate the CGRID key if not present and return it
-func GetSetCGRID(ev engine.MapEvent, opt map[string]interface{}) (cgrID string) {
+// GetSetOptsOriginID will populate the CGRID key if not present and return it
+func GetSetOptsOriginID(ev engine.MapEvent, opt map[string]interface{}) (cgrID string) {
 	fldIface, has := opt[utils.MetaOriginID]
 	if has {
 		cgrID = utils.IfaceAsString(fldIface)
diff --git a/sessions/sessions.go b/sessions/sessions.go
index 6aabbda45..f1ff7b374 100644
--- a/sessions/sessions.go
+++ b/sessions/sessions.go
@@ -906,7 +906,7 @@ func (sS *SessionS) newSession(ctx *context.Context, cgrEv *utils.CGREvent, resI
 		err = errors.New("ChargerS is disabled")
 		return
 	}
-	cgrID := GetSetCGRID(cgrEv.Event, cgrEv.APIOpts)
+	cgrID := GetSetOptsOriginID(cgrEv.Event, cgrEv.APIOpts)
 	evStart := engine.MapEvent(cgrEv.Event)
 	if !evStart.HasField(utils.Usage) && evStart.HasField(utils.LastUsed) {
 		evStart[utils.Usage] = evStart[utils.LastUsed]
@@ -2001,7 +2001,7 @@ func (sS *SessionS) BiRPCv1UpdateSession(ctx *context.Context,
 			config.SessionsDebitIntervalDftOpt, utils.OptsSesDebitInterval); err != nil {
 			return err
 		}
-		cgrID := GetSetCGRID(ev, args.APIOpts)
+		cgrID := GetSetOptsOriginID(ev, args.APIOpts)
 		s := sS.getRelocateSession(ctx, cgrID,
 			ev.GetStringIgnoreErrors(utils.InitialOriginID),
 			ev.GetStringIgnoreErrors(utils.OriginID),
@@ -2085,7 +2085,7 @@ func (sS *SessionS) BiRPCv1TerminateSession(ctx *context.Context,
 
 	ev := engine.MapEvent(args.Event)
 	opts := engine.MapEvent(args.APIOpts)
-	cgrID := GetSetCGRID(ev, opts)
+	cgrID := GetSetOptsOriginID(ev, opts)
 	originID := ev.GetStringIgnoreErrors(utils.OriginID)
 	if termS {
 		if originID == "" {
@@ -2742,7 +2742,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(ctx *context.Context,
 	// 					return err //utils.NewErrRALs(err)
 	// 				}
 	// 			}
-	// 			s := sS.getRelocateSession(GetSetCGRID(ev),
+	// 			s := sS.getRelocateSession(GetSetOptsOriginID(ev),
 	// 				ev.GetStringIgnoreErrors(utils.InitialOriginID),
 	// 				ev.GetStringIgnoreErrors(utils.OriginID),
 	// 				ev.GetStringIgnoreErrors(utils.OriginHost))
@@ -2764,7 +2764,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(ctx *context.Context,
 	// 					return err //utils.NewErrRALs(err)
 	// 				}
 	// 			}
-	// 			s := sS.getRelocateSession(GetSetCGRID(ev),
+	// 			s := sS.getRelocateSession(GetSetOptsOriginID(ev),
 	// 				ev.GetStringIgnoreErrors(utils.InitialOriginID),
 	// 				ev.GetStringIgnoreErrors(utils.OriginID),
 	// 				ev.GetStringIgnoreErrors(utils.OriginHost))
@@ -2928,7 +2928,7 @@ func (sS *SessionS) BiRPCv1DeactivateSessions(ctx *context.Context,
 
 func (sS *SessionS) processCDR(ctx *context.Context, cgrEv *utils.CGREvent, rply *string) (err error) {
 	ev := engine.MapEvent(cgrEv.Event)
-	cgrID := GetSetCGRID(ev, cgrEv.APIOpts)
+	cgrID := GetSetOptsOriginID(ev, cgrEv.APIOpts)
 	s := sS.getRelocateSession(ctx, cgrID,
 		ev.GetStringIgnoreErrors(utils.InitialOriginID),
 		ev.GetStringIgnoreErrors(utils.OriginID),