uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-21 07:08:45 +05:00
Code Issues Packages Projects Releases Wiki Activity

RunID is not longer added to event but to APIOpts

Browse Source
This commit is contained in:
andronache
2021-10-19 15:39:51 +03:00
committed by Dan Christian Bogos
parent 37dfdf6e58
commit 1e080a7123
20 changed files with 152 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
engine/chargers.go
View File

@@ -106,16 +106,17 @@ func (cS *ChargerService) processEvent(ctx *context.Context, tnt string, cgrEv *
if cPs, err = cS.matchingChargerProfilesForEvent(ctx, tnt, cgrEv); err != nil {
return nil, err
}
rply = make([]*ChrgSProcessEventReply, len(cPs))
for i, cP := range cPs {
clonedEv := cgrEv.Clone()
clonedEv.Tenant = tnt
clonedEv.Event[utils.RunID] = cP.RunID
clonedEv.APIOpts[utils.MetaRunID] = cP.RunID
clonedEv.APIOpts[utils.Subsys] = utils.MetaChargers
rply[i] = &ChrgSProcessEventReply{
ChargerSProfile: cP.ID,
CGREvent: clonedEv,
AlteredFields: []string{utils.MetaReqRunID},
AlteredFields: []string{utils.MetaOptsRunID},
}
if len(cP.AttributeIDs) == 1 && cP.AttributeIDs[0] == utils.MetaNone {
continue // AttributeS disabled

4
engine/chargers_test.go
View File

@@ -453,11 +453,11 @@ func TestChargerProcessEvent(t *testing.T) {
rpl := []*ChrgSProcessEventReply{
{
ChargerSProfile: "CPP_1",
AlteredFields: []string{utils.MetaReqRunID},
AlteredFields: []string{utils.MetaOptsRunID},
CGREvent: chargerEvents[0],
},
}
rpl[0].CGREvent.Event[utils.RunID] = cPPs[0].RunID
rpl[0].CGREvent.APIOpts[utils.MetaRunID] = cPPs[0].RunID
rcv, err := chargerSrv.processEvent(context.Background(), rpl[0].CGREvent.Tenant, chargerEvents[0])
if err != nil {
t.Fatalf("Error: %+v", err)

8
engine/z_chargers_test.go
View File

@@ -145,7 +145,7 @@ func TestChargersprocessEventCallNilErr(t *testing.T) {
exp := []*ChrgSProcessEventReply{
{
ChargerSProfile: "1001",
AlteredFields: []string{utils.MetaReqRunID, utils.AccountField},
AlteredFields: []string{utils.MetaOptsRunID, utils.AccountField},
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "cgrEvID",
@@ -221,15 +221,15 @@ func TestChargersprocessEventCallErr(t *testing.T) {
exp := []*ChrgSProcessEventReply{
{
ChargerSProfile: "1001",
AlteredFields: []string{utils.MetaReqRunID},
AlteredFields: []string{utils.MetaOptsRunID},
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "cgrEvID",
Event: map[string]interface{}{
utils.AccountField: "1001",
"RunID": utils.MetaDefault,
},
APIOpts: map[string]interface{}{
utils.MetaRunID: utils.MetaDefault,
utils.OptsAttributesProfileIDs: []string(nil),
utils.Subsys: utils.MetaChargers,
utils.OptsContext: utils.MetaChargers,
@@ -460,7 +460,7 @@ func TestChargersV1ProcessEvent(t *testing.T) {
exp := &[]*ChrgSProcessEventReply{
{
ChargerSProfile: "1001",
AlteredFields: []string{utils.MetaReqRunID, utils.AccountField},
AlteredFields: []string{utils.MetaOptsRunID, utils.AccountField},
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "cgrEvID",