diff --git a/agents/diamagent.go b/agents/diamagent.go index d7e4f7b1e..b3d3cafca 100644 --- a/agents/diamagent.go +++ b/agents/diamagent.go @@ -344,7 +344,7 @@ func (da *DiameterAgent) processRequest(reqProcessor *config.RequestProcessor, reqProcessor.Flags.HasKey(utils.MetaSuppliers), reqProcessor.Flags.HasKey(utils.MetaSuppliersIgnoreErrors), reqProcessor.Flags.HasKey(utils.MetaSuppliersEventCost), - *cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator) + cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator) var eventRply sessions.V1ProcessEventReply err = da.sS.Call(utils.SessionSv1ProcessEvent, evArgs, &eventRply) diff --git a/agents/dnsagent.go b/agents/dnsagent.go index e2261ca36..4487c08fe 100644 --- a/agents/dnsagent.go +++ b/agents/dnsagent.go @@ -244,7 +244,7 @@ func (da *DNSAgent) processRequest(reqProcessor *config.RequestProcessor, reqProcessor.Flags.HasKey(utils.MetaSuppliers), reqProcessor.Flags.HasKey(utils.MetaSuppliersIgnoreErrors), reqProcessor.Flags.HasKey(utils.MetaSuppliersEventCost), - *cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator) + cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator) var eventRply sessions.V1ProcessEventReply err = da.sS.Call(utils.SessionSv1ProcessEvent, evArgs, &eventRply) diff --git a/agents/httpagent.go b/agents/httpagent.go index 13632c7d0..51555ff9e 100644 --- a/agents/httpagent.go +++ b/agents/httpagent.go @@ -193,7 +193,7 @@ func (ha *HTTPAgent) processRequest(reqProcessor *config.RequestProcessor, reqProcessor.Flags.HasKey(utils.MetaSuppliers), reqProcessor.Flags.HasKey(utils.MetaSuppliersIgnoreErrors), reqProcessor.Flags.HasKey(utils.MetaSuppliersEventCost), - *cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator) + cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator) var eventRply sessions.V1ProcessEventReply err = ha.sessionS.Call(utils.SessionSv1ProcessEvent, evArgs, &eventRply) diff --git a/agents/radagent.go b/agents/radagent.go index 370f50f2e..e95e46418 100644 --- a/agents/radagent.go +++ b/agents/radagent.go @@ -237,7 +237,7 @@ func (ra *RadiusAgent) processRequest(reqProcessor *config.RequestProcessor, reqProcessor.Flags.HasKey(utils.MetaSuppliers), reqProcessor.Flags.HasKey(utils.MetaSuppliersIgnoreErrors), reqProcessor.Flags.HasKey(utils.MetaSuppliersEventCost), - *cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator) + cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator) var eventRply sessions.V1ProcessEventReply err = ra.sessionS.Call(utils.SessionSv1ProcessEvent, evArgs, &eventRply) diff --git a/apier/v1/sessionsv1_it_test.go b/apier/v1/sessionsv1_it_test.go index e5fc1744b..6a5af0a44 100644 --- a/apier/v1/sessionsv1_it_test.go +++ b/apier/v1/sessionsv1_it_test.go @@ -503,7 +503,7 @@ func TestSSv1ItProcessEvent(t *testing.T) { AllocateResources: true, Debit: true, GetAttributes: true, - CGREvent: utils.CGREvent{ + CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", ID: "TestSSv1ItProcessEvent", Event: map[string]interface{}{ diff --git a/dispatchers/sessions.go b/dispatchers/sessions.go index 4af525b3a..63aa769b6 100755 --- a/dispatchers/sessions.go +++ b/dispatchers/sessions.go @@ -221,7 +221,7 @@ func (dS *DispatcherService) SessionSv1ProcessEvent(args *sessions.V1ProcessEven if args.ArgDispatcher != nil { routeID = args.ArgDispatcher.RouteID } - return dS.Dispatch(&args.CGREvent, utils.MetaSessionS, routeID, + return dS.Dispatch(args.CGREvent, utils.MetaSessionS, routeID, utils.SessionSv1ProcessEvent, args, reply) } diff --git a/dispatchers/sessions_it_test.go b/dispatchers/sessions_it_test.go index 7632a5825..89ce1d56a 100755 --- a/dispatchers/sessions_it_test.go +++ b/dispatchers/sessions_it_test.go @@ -523,7 +523,7 @@ func testDspSessionProcessEvent(t *testing.T) { AllocateResources: true, Debit: true, GetAttributes: true, - CGREvent: utils.CGREvent{ + CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", ID: "TestSSv1ItProcessEvent", Event: map[string]interface{}{ @@ -589,7 +589,7 @@ func testDspSessionProcessEvent2(t *testing.T) { AllocateResources: true, Debit: true, GetAttributes: true, - CGREvent: utils.CGREvent{ + CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", ID: "TestSSv1ItProcessEvent", Event: map[string]interface{}{ diff --git a/general_tests/rpccaching_it_test.go b/general_tests/rpccaching_it_test.go index 5ab134f37..1305f7dfa 100644 --- a/general_tests/rpccaching_it_test.go +++ b/general_tests/rpccaching_it_test.go @@ -584,7 +584,7 @@ func testRPCMethodsProcessEvent(t *testing.T) { initUsage := 5 * time.Minute args := &sessions.V1ProcessEventArgs{ Debit: true, - CGREvent: utils.CGREvent{ + CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", ID: "testRPCMethodsProcessEvent", Event: map[string]interface{}{ diff --git a/sessions/sessions.go b/sessions/sessions.go index 634120303..5f1c6e82b 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -2556,7 +2556,7 @@ func (sS *SessionS) BiRPCv1ProcessCDR(clnt rpcclient.RpcClientConnection, // NewV1ProcessEventArgs is a constructor for EventArgs used by ProcessEvent func NewV1ProcessEventArgs(resrc, acnts, attrs, thds, stats, suppls, supplsIgnoreErrs, supplsEventCost bool, - cgrEv utils.CGREvent, argDisp *utils.ArgDispatcher, + cgrEv *utils.CGREvent, argDisp *utils.ArgDispatcher, supplierPaginator utils.Paginator) (args *V1ProcessEventArgs) { args = &V1ProcessEventArgs{ AllocateResources: resrc, @@ -2586,7 +2586,7 @@ type V1ProcessEventArgs struct { GetSuppliers bool SuppliersMaxCost string SuppliersIgnoreErrors bool - utils.CGREvent + *utils.CGREvent utils.Paginator *utils.ArgDispatcher } @@ -2665,13 +2665,13 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.RpcClientConnection, } attrArgs := &engine.AttrArgsProcessEvent{ Context: utils.StringPointer(utils.MetaSessionS), - CGREvent: &args.CGREvent, + CGREvent: args.CGREvent, ArgDispatcher: args.ArgDispatcher, } var rplyEv engine.AttrSProcessEventReply if err := sS.attrS.Call(utils.AttributeSv1ProcessEvent, attrArgs, &rplyEv); err == nil { - args.CGREvent = *rplyEv.CGREvent + args.CGREvent = rplyEv.CGREvent if tntIface, has := args.CGREvent.Event[utils.MetaTenant]; has { // special case when we want to overwrite the tenant args.CGREvent.Tenant = tntIface.(string) @@ -2690,7 +2690,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.RpcClientConnection, return utils.NewErrMandatoryIeMissing(utils.OriginID) } attrRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &args.CGREvent, + CGREvent: args.CGREvent, UsageID: originID, Units: 1, ArgDispatcher: args.ArgDispatcher, @@ -2740,7 +2740,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.RpcClientConnection, } var tIDs []string thEv := &engine.ArgsProcessEvent{ - CGREvent: &args.CGREvent, + CGREvent: args.CGREvent, ArgDispatcher: args.ArgDispatcher, } if err := sS.thdS.Call(utils.ThresholdSv1ProcessEvent, @@ -2757,7 +2757,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.RpcClientConnection, } var statReply []string statArgs := &engine.StatsArgsProcessEvent{ - CGREvent: &args.CGREvent, + CGREvent: args.CGREvent, ArgDispatcher: args.ArgDispatcher, } if err := sS.statS.Call(utils.StatSv1ProcessEvent, diff --git a/sessions/sessions_test.go b/sessions/sessions_test.go index 2c9fd6230..38045b605 100644 --- a/sessions/sessions_test.go +++ b/sessions/sessions_test.go @@ -888,7 +888,7 @@ func TestSessionSNewV1TerminateSessionArgs(t *testing.T) { } func TestSessionSNewV1ProcessEventArgs(t *testing.T) { - cgrEv := utils.CGREvent{ + cgrEv := &utils.CGREvent{ Tenant: "cgrates.org", ID: "Event", Event: map[string]interface{}{