From 7b74552c8f70951e7b64c7fc911a49ecc9a6d0e2 Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Tue, 25 Mar 2025 19:01:22 +0200 Subject: [PATCH] export DynamicDP type and constructor --- engine/attributes.go | 2 +- engine/attributes_test.go | 8 ++++---- engine/dynamicdp.go | 16 +++++++-------- engine/dynamicdp_test.go | 30 ++++++++++++++-------------- engine/filters.go | 4 ++-- engine/filters_test.go | 4 ++-- engine/libroutes.go | 2 +- engine/libstats.go | 4 ++-- engine/z_attributes_test.go | 40 ++++++++++++++++++------------------- 9 files changed, 55 insertions(+), 55 deletions(-) diff --git a/engine/attributes.go b/engine/attributes.go index 2de214530..434186478 100644 --- a/engine/attributes.go +++ b/engine/attributes.go @@ -313,7 +313,7 @@ func (alS *AttributeS) V1ProcessEvent(ctx *context.Context, args *utils.CGREvent var lastID string matchedIDs := []*FieldsAltered{} - dynDP := newDynamicDP(ctx, alS.cfg.AttributeSCfg().ResourceSConns, + dynDP := NewDynamicDP(ctx, alS.cfg.AttributeSCfg().ResourceSConns, alS.cfg.AttributeSCfg().StatSConns, alS.cfg.AttributeSCfg().AccountSConns, nil, nil, args.Tenant, eNV) for i := 0; i < processRuns; i++ { eNV[utils.MetaVars].(utils.MapStorage)[utils.MetaProcessRunsCfg] = i + 1 diff --git a/engine/attributes_test.go b/engine/attributes_test.go index 3eede1310..30e058b6d 100644 --- a/engine/attributes_test.go +++ b/engine/attributes_test.go @@ -560,7 +560,7 @@ func TestAttributeProcessEventBlockerFromDynamicsErr(t *testing.T) { } expErr := "NOT_IMPLEMENTED:*stirng" - _, err := attrS.processEvent(context.TODO(), attrEvs.Tenant, attrEvs, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + _, err := attrS.processEvent(context.TODO(), attrEvs.Tenant, attrEvs, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err == nil || err.Error() != expErr { t.Errorf("Expected error <%+v>, received error <%+v>", expErr, err) } @@ -625,7 +625,7 @@ func TestAttributeSProcessEventPassErr(t *testing.T) { } expErr := `invalid converter value in string: <*>, err: unsupported converter definition: <*>` - _, err := attrS.processEvent(context.TODO(), attrPrf.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + _, err := attrS.processEvent(context.TODO(), attrPrf.Tenant, ev, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err == nil || err.Error() != expErr { t.Errorf("Expected error %s received: %v", expErr, err) } @@ -687,7 +687,7 @@ func TestAttributeSProcessAttrBlockerFromDynamicsErr(t *testing.T) { } expErr := "NOT_IMPLEMENTED:*stirng" - _, err := attrS.processEvent(context.TODO(), attrPrf.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + _, err := attrS.processEvent(context.TODO(), attrPrf.Tenant, ev, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err == nil || err.Error() != expErr { t.Errorf("Expected error %s received: %v", expErr, err) } @@ -761,7 +761,7 @@ func TestAttributeSProcessSubstituteRmvBlockerTrue(t *testing.T) { CGREvent: ev, } - rcv, err := attrS.processEvent(context.TODO(), attrPrf.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + rcv, err := attrS.processEvent(context.TODO(), attrPrf.Tenant, ev, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err != nil { t.Error(err) } else if !reflect.DeepEqual(utils.ToJSON(exp), utils.ToJSON(rcv)) { diff --git a/engine/dynamicdp.go b/engine/dynamicdp.go index 009bcb5ef..d2635ef4a 100644 --- a/engine/dynamicdp.go +++ b/engine/dynamicdp.go @@ -27,9 +27,9 @@ import ( "github.com/cgrates/cgrates/utils" ) -func newDynamicDP(ctx *context.Context, resConns, stsConns, actsConns, trdConns, rnkCOnns []string, - tenant string, initialDP utils.DataProvider) *dynamicDP { - return &dynamicDP{ +func NewDynamicDP(ctx *context.Context, resConns, stsConns, actsConns, trdConns, rnkCOnns []string, + tenant string, initialDP utils.DataProvider) *DynamicDP { + return &DynamicDP{ resConns: resConns, stsConns: stsConns, actsConns: actsConns, @@ -42,7 +42,7 @@ func newDynamicDP(ctx *context.Context, resConns, stsConns, actsConns, trdConns, } } -type dynamicDP struct { +type DynamicDP struct { resConns []string stsConns []string actsConns []string @@ -55,9 +55,9 @@ type dynamicDP struct { ctx *context.Context } -func (dDP *dynamicDP) String() string { return dDP.initialDP.String() } +func (dDP *DynamicDP) String() string { return dDP.initialDP.String() } -func (dDP *dynamicDP) FieldAsString(fldPath []string) (string, error) { +func (dDP *DynamicDP) FieldAsString(fldPath []string) (string, error) { val, err := dDP.FieldAsInterface(fldPath) if err != nil { return "", err @@ -72,7 +72,7 @@ var initialDPPrefixes = utils.NewStringSet([]string{ utils.MetaHdr, utils.MetaTrl, utils.MetaCfg, utils.MetaTenant, utils.MetaTmp}) -func (dDP *dynamicDP) FieldAsInterface(fldPath []string) (val any, err error) { +func (dDP *DynamicDP) FieldAsInterface(fldPath []string) (val any, err error) { if len(fldPath) == 0 { return nil, utils.ErrNotFound } @@ -87,7 +87,7 @@ func (dDP *dynamicDP) FieldAsInterface(fldPath []string) (val any, err error) { return } -func (dDP *dynamicDP) fieldAsInterface(fldPath []string) (val any, err error) { +func (dDP *DynamicDP) fieldAsInterface(fldPath []string) (val any, err error) { if len(fldPath) < 2 { return nil, fmt.Errorf("invalid fieldname <%s>", fldPath) } diff --git a/engine/dynamicdp_test.go b/engine/dynamicdp_test.go index 8d7af26d0..dfd5725d7 100644 --- a/engine/dynamicdp_test.go +++ b/engine/dynamicdp_test.go @@ -33,7 +33,7 @@ import ( func TestDynamicDPnewDynamicDP(t *testing.T) { - expDDP := &dynamicDP{ + expDDP := &DynamicDP{ resConns: []string{"conn1"}, stsConns: []string{"conn2"}, actsConns: []string{"conn3"}, @@ -45,7 +45,7 @@ func TestDynamicDPnewDynamicDP(t *testing.T) { ctx: context.Background(), } - if rcv := newDynamicDP(context.Background(), []string{"conn1"}, []string{"conn2"}, + if rcv := NewDynamicDP(context.Background(), []string{"conn1"}, []string{"conn2"}, []string{"conn3"}, nil, nil, "cgrates.org", utils.StringSet{"test": struct{}{}}); !reflect.DeepEqual(rcv, expDDP) { t.Errorf("expected: <%+v>, \nreceived: <%+v>", @@ -55,7 +55,7 @@ func TestDynamicDPnewDynamicDP(t *testing.T) { func TestDynamicDPString(t *testing.T) { - rcv := &dynamicDP{ + rcv := &DynamicDP{ resConns: []string{"conn1"}, stsConns: []string{"conn2"}, actsConns: []string{"conn3"}, @@ -76,7 +76,7 @@ func TestDynamicDPString(t *testing.T) { func TestDynamicDPFieldAsInterfaceErrFilename(t *testing.T) { - rcv := &dynamicDP{ + rcv := &DynamicDP{ resConns: []string{"conn1"}, stsConns: []string{"conn2"}, actsConns: []string{"conn3"}, @@ -96,7 +96,7 @@ func TestDynamicDPFieldAsInterfaceErrFilename(t *testing.T) { func TestDynamicDPFieldAsInterfaceErrLenFldPath(t *testing.T) { - rcv := &dynamicDP{ + rcv := &DynamicDP{ resConns: []string{"conn1"}, stsConns: []string{"conn2"}, actsConns: []string{"conn3"}, @@ -116,7 +116,7 @@ func TestDynamicDPFieldAsInterfaceErrLenFldPath(t *testing.T) { func TestDynamicDPFieldAsInterface(t *testing.T) { - DDP := &dynamicDP{ + DDP := &DynamicDP{ resConns: []string{"conn1"}, stsConns: []string{"conn2"}, actsConns: []string{"conn3"}, @@ -405,7 +405,7 @@ func TestLibphonenumberDPfieldAsInterface(t *testing.T) { func TestDynamicDPfieldAsInterfaceMetaLibPhoneNumber(t *testing.T) { - dDP := &dynamicDP{ + dDP := &DynamicDP{ resConns: []string{"conn1"}, stsConns: []string{"conn2"}, actsConns: []string{"conn3"}, @@ -435,7 +435,7 @@ func TestDynamicDPfieldAsInterfaceMetaLibPhoneNumber(t *testing.T) { func TestDynamicDPfieldAsInterfaceErrMetaLibPhoneNumber(t *testing.T) { - dDP := &dynamicDP{ + dDP := &DynamicDP{ resConns: []string{"conn1"}, stsConns: []string{"conn2"}, actsConns: []string{"conn3"}, @@ -456,7 +456,7 @@ func TestDynamicDPfieldAsInterfaceNotFound(t *testing.T) { Cache.Clear(nil) ms := utils.MapStorage{} - dDp := newDynamicDP(context.Background(), []string{}, []string{}, []string{}, nil, nil, "cgrates.org", ms) + dDp := NewDynamicDP(context.Background(), []string{}, []string{}, []string{}, nil, nil, "cgrates.org", ms) if _, err := dDp.fieldAsInterface([]string{"inexistentfld1", "inexistentfld2"}); err == nil || err != utils.ErrNotFound { t.Error(err) @@ -465,7 +465,7 @@ func TestDynamicDPfieldAsInterfaceNotFound(t *testing.T) { func TestDynamicDPfieldAsInterfaceErrMetaStats(t *testing.T) { - dDP := &dynamicDP{ + dDP := &DynamicDP{ stsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaStats)}, @@ -497,7 +497,7 @@ func TestDynamicDPfieldAsInterfaceErrMetaStats(t *testing.T) { func TestDynamicDPfieldAsInterfaceErrMetaResources(t *testing.T) { - dDP := &dynamicDP{ + dDP := &DynamicDP{ resConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)}, tenant: "cgrates.org", @@ -528,7 +528,7 @@ func TestDynamicDPfieldAsInterfaceErrMetaResources(t *testing.T) { func TestDynamicDPfieldAsInterfaceErrMetaAccounts(t *testing.T) { - dDP := &dynamicDP{ + dDP := &DynamicDP{ actsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAccounts)}, tenant: "cgrates.org", @@ -560,7 +560,7 @@ func TestDynamicDPfieldAsInterfaceErrMetaAccounts(t *testing.T) { func TestDynamicDPfieldAsInterfaceMetaAccounts(t *testing.T) { Cache.Clear(nil) - dDP := &dynamicDP{ + dDP := &DynamicDP{ actsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAccounts)}, tenant: "cgrates.org", @@ -628,7 +628,7 @@ func TestDynamicDPfieldAsInterfaceMetaAccounts(t *testing.T) { func TestDynamicDPfieldAsInterfaceMetaResources(t *testing.T) { Cache.Clear(nil) - dDP := &dynamicDP{ + dDP := &DynamicDP{ resConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)}, tenant: "cgrates.org", @@ -697,7 +697,7 @@ func TestDynamicDPfieldAsInterfaceMetaResources(t *testing.T) { func TestDynamicDPfieldAsInterfaceMetaStats(t *testing.T) { Cache.Clear(nil) - dDP := &dynamicDP{ + dDP := &DynamicDP{ stsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaStats)}, tenant: "cgrates.org", diff --git a/engine/filters.go b/engine/filters.go index ebe146e88..653ab8441 100644 --- a/engine/filters.go +++ b/engine/filters.go @@ -60,7 +60,7 @@ func (fS *FilterS) Pass(ctx *context.Context, tenant string, filterIDs []string, if len(filterIDs) == 0 { return true, nil } - dDP := newDynamicDP(ctx, fS.cfg.FilterSCfg().ResourceSConns, fS.cfg.FilterSCfg().StatSConns, + dDP := NewDynamicDP(ctx, fS.cfg.FilterSCfg().ResourceSConns, fS.cfg.FilterSCfg().StatSConns, fS.cfg.FilterSCfg().AccountSConns, fS.cfg.FilterSCfg().TrendSConns, fS.cfg.FilterSCfg().RankingSConns, tenant, ev) for _, fltrID := range filterIDs { f, err := fS.dm.GetFilter(ctx, tenant, fltrID, @@ -121,7 +121,7 @@ func (fS *FilterS) LazyPass(ctx *context.Context, tenant string, filterIDs []str return true, nil, nil } pass = true - dDP := newDynamicDP(ctx, fS.cfg.FilterSCfg().ResourceSConns, fS.cfg.FilterSCfg().StatSConns, + dDP := NewDynamicDP(ctx, fS.cfg.FilterSCfg().ResourceSConns, fS.cfg.FilterSCfg().StatSConns, fS.cfg.FilterSCfg().AccountSConns, fS.cfg.FilterSCfg().TrendSConns, fS.cfg.FilterSCfg().RankingSConns, tenant, ev) for _, fltrID := range filterIDs { var f *Filter diff --git a/engine/filters_test.go b/engine/filters_test.go index 8b22d42ac..9361ad4e2 100644 --- a/engine/filters_test.go +++ b/engine/filters_test.go @@ -2600,7 +2600,7 @@ func TestFilterTrends(t *testing.T) { }, } initDP := utils.MapStorage{} - dp := newDynamicDP(context.Background(), nil, nil, nil, []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaTrends)}, nil, "cgrates.org", initDP) + dp := NewDynamicDP(context.Background(), nil, nil, nil, []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaTrends)}, nil, "cgrates.org", initDP) for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { fl, err := NewFilterFromInline("cgrates.org", tc.filter) @@ -2665,7 +2665,7 @@ func TestFilterRanking(t *testing.T) { } initDP := utils.MapStorage{} - dp := newDynamicDP(context.Background(), nil, nil, nil, nil, []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaRankings)}, "cgrates.org", initDP) + dp := NewDynamicDP(context.Background(), nil, nil, nil, nil, []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaRankings)}, "cgrates.org", initDP) for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { fl, err := NewFilterFromInline(dp.tenant, tc.filter) diff --git a/engine/libroutes.go b/engine/libroutes.go index 386c80e6f..bd9904d10 100644 --- a/engine/libroutes.go +++ b/engine/libroutes.go @@ -278,7 +278,7 @@ func routeLazyPass(ctx *context.Context, filters []*FilterRule, ev *utils.CGREve return true, nil } - dynDP := newDynamicDP(ctx, resConns, statConns, acntConns, //construct the DP and pass it to filterS + dynDP := NewDynamicDP(ctx, resConns, statConns, acntConns, //construct the DP and pass it to filterS trdConns, rnkConns, ev.Tenant, utils.MapStorage{ utils.MetaReq: ev.Event, utils.MetaOpts: ev.APIOpts, diff --git a/engine/libstats.go b/engine/libstats.go index d9651eb40..073aca15d 100644 --- a/engine/libstats.go +++ b/engine/libstats.go @@ -308,7 +308,7 @@ func (sq *StatQueue) addStatEvent(ctx *context.Context, tnt, evID string, filter sq.SQItems = append(sq.SQItems, SQItem{EventID: evID, ExpiryTime: expTime}) var pass bool // recreate the request without *opts - dDP := newDynamicDP(ctx, config.CgrConfig().FilterSCfg().ResourceSConns, config.CgrConfig().FilterSCfg().StatSConns, + dDP := NewDynamicDP(ctx, config.CgrConfig().FilterSCfg().ResourceSConns, config.CgrConfig().FilterSCfg().StatSConns, config.CgrConfig().FilterSCfg().AccountSConns, config.CgrConfig().FilterSCfg().TrendSConns, config.CgrConfig().FilterSCfg().RankingSConns, tnt, utils.MapStorage{utils.MetaReq: evNm[utils.MetaReq], utils.MetaOpts: evNm[utils.MetaOpts]}) for idx, metricCfg := range sq.sqPrfl.Metrics { if pass, err = filterS.Pass(ctx, tnt, metricCfg.FilterIDs, @@ -342,7 +342,7 @@ func (sq *StatQueue) isOneEvent() bool { func (sq *StatQueue) addStatOneEvent(ctx *context.Context, tnt string, filterS *FilterS, evNm utils.MapStorage) (err error) { var pass bool - dDP := newDynamicDP(ctx, config.CgrConfig().FilterSCfg().ResourceSConns, config.CgrConfig().FilterSCfg().StatSConns, + dDP := NewDynamicDP(ctx, config.CgrConfig().FilterSCfg().ResourceSConns, config.CgrConfig().FilterSCfg().StatSConns, config.CgrConfig().FilterSCfg().AccountSConns, config.CgrConfig().FilterSCfg().TrendSConns, config.CgrConfig().FilterSCfg().RankingSConns, tnt, utils.MapStorage{utils.MetaReq: evNm[utils.MetaReq], utils.MetaOpts: evNm[utils.MetaOpts]}) for idx, metricCfg := range sq.sqPrfl.Metrics { diff --git a/engine/z_attributes_test.go b/engine/z_attributes_test.go index 61f6dc05a..6a3b0e11e 100644 --- a/engine/z_attributes_test.go +++ b/engine/z_attributes_test.go @@ -483,7 +483,7 @@ func TestAttributeProcessEvent(t *testing.T) { utils.OptsAttributesProcessRuns: 0, }, } - atrp, err := attrS.processEvent(context.TODO(), attrEvs[0].Tenant, attrEvs[0], eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + atrp, err := attrS.processEvent(context.TODO(), attrEvs[0].Tenant, attrEvs[0], eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err != nil { t.Errorf("Error: %+v", err) } @@ -502,7 +502,7 @@ func TestAttributeProcessEventWithNotFound(t *testing.T) { }, } if _, err := attrS.processEvent(context.TODO(), attrEvs[0].Tenant, attrEvs[3], eNM, - newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0); err == nil || err != utils.ErrNotFound { + NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0); err == nil || err != utils.ErrNotFound { t.Errorf("expected: <%+v>, \nreceived: <%+v>", utils.ErrNotFound, err) } } @@ -524,7 +524,7 @@ func TestAttributeProcessEventWithIDs(t *testing.T) { utils.OptsAttributesProcessRuns: 0, }, } - if atrp, err := attrS.processEvent(context.TODO(), attrEvs[0].Tenant, attrEvs[3], eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0); err != nil { + if atrp, err := attrS.processEvent(context.TODO(), attrEvs[0].Tenant, attrEvs[3], eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0); err != nil { } else if !reflect.DeepEqual(eRply, atrp) { t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(eRply), utils.ToJSON(atrp)) } @@ -2226,7 +2226,7 @@ func TestProcessAttributeConstant(t *testing.T) { utils.OptsAttributesProcessRuns: 0, }, } - rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err != nil { t.Errorf("Error: %+v", err) } @@ -2291,7 +2291,7 @@ func TestProcessAttributeVariable(t *testing.T) { utils.OptsAttributesProcessRuns: 0, }, } - rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err != nil { t.Errorf("Error: %+v", err) } @@ -2363,7 +2363,7 @@ func TestProcessAttributeComposed(t *testing.T) { utils.OptsAttributesProcessRuns: 0, }, } - rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err != nil { t.Errorf("Error: %+v", err) } @@ -2430,7 +2430,7 @@ func TestProcessAttributeUsageDifference(t *testing.T) { utils.OptsAttributesProcessRuns: 0, }, } - rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err != nil { t.Errorf("Error: %+v", err) } @@ -2497,7 +2497,7 @@ func TestProcessAttributeSum(t *testing.T) { utils.OptsAttributesProcessRuns: 0, }, } - rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err != nil { t.Errorf("Error: %+v", err) } @@ -2564,7 +2564,7 @@ func TestProcessAttributeDiff(t *testing.T) { utils.OptsAttributesProcessRuns: 0, }, } - rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err != nil { t.Errorf("Error: %+v", err) } @@ -2631,7 +2631,7 @@ func TestProcessAttributeMultiply(t *testing.T) { utils.OptsAttributesProcessRuns: 0, }, } - rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err != nil { t.Errorf("Error: %+v", err) } @@ -2698,7 +2698,7 @@ func TestProcessAttributeDivide(t *testing.T) { utils.OptsAttributesProcessRuns: 0, }, } - rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err != nil { t.Errorf("Error: %+v", err) } @@ -2765,7 +2765,7 @@ func TestProcessAttributeValueExponent(t *testing.T) { utils.OptsAttributesProcessRuns: 0, }, } - rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err != nil { t.Errorf("Error: %+v", err) } @@ -2832,7 +2832,7 @@ func TestProcessAttributeUnixTimeStamp(t *testing.T) { utils.OptsAttributesProcessRuns: 0, }, } - rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err != nil { t.Errorf("Error: %+v", err) } @@ -2898,7 +2898,7 @@ func TestProcessAttributePrefix(t *testing.T) { utils.OptsAttributesProcessRuns: 0, }, } - rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err != nil { t.Errorf("Error: %+v", err) } @@ -2964,7 +2964,7 @@ func TestProcessAttributeSuffix(t *testing.T) { utils.OptsAttributesProcessRuns: 0, }, } - rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err != nil { t.Errorf("Error: %+v", err) } @@ -5066,7 +5066,7 @@ func TestAttributesProcessEventProfileIgnoreFilters(t *testing.T) { }, }, } - if rcv2, err := aA.processEvent(context.Background(), args2.Tenant, args2, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0); err != nil { + if rcv2, err := aA.processEvent(context.Background(), args2.Tenant, args2, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0); err != nil { t.Error(err) } else if !reflect.DeepEqual(rcv2, exp2) { t.Errorf("expected: <%+v>, \nreceived: <%+v>", utils.ToJSON(exp2), utils.ToJSON(rcv2)) @@ -5109,7 +5109,7 @@ func TestAttributesProcessEventProfileIgnoreFilters(t *testing.T) { }, }, } - if rcv, err := aA.processEvent(context.Background(), args.Tenant, args, eNM2, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM2), utils.EmptyString, make(map[string]int), 0); err != nil { + if rcv, err := aA.processEvent(context.Background(), args.Tenant, args, eNM2, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM2), utils.EmptyString, make(map[string]int), 0); err != nil { t.Error(err) } else if !reflect.DeepEqual(rcv, exp) { t.Errorf("expected: <%+v>, \nreceived: <%+v>", utils.ToJSON(exp), utils.ToJSON(rcv)) @@ -5136,7 +5136,7 @@ func TestAttributeServicesProcessEventGetStringSliceOptsError(t *testing.T) { utils.OptsAttributesProcessRuns: 0, }, } - _, err := aA.processEvent(context.Background(), args2.Tenant, args2, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + _, err := aA.processEvent(context.Background(), args2.Tenant, args2, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err == nil || err.Error() != "cannot convert field: 1s to []string" { t.Errorf("\nExpected <%+v>, \nReceived <%+v>", "cannot convert field: 1s to []string", err) } @@ -5162,7 +5162,7 @@ func TestAttributeServicesProcessEventGetBoolOptsError(t *testing.T) { utils.OptsAttributesProcessRuns: 0, }, } - _, err := aA.processEvent(context.Background(), args2.Tenant, args2, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) + _, err := aA.processEvent(context.Background(), args2.Tenant, args2, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0) if err == nil || err.Error() != "cannot convert field: 1s to bool" { t.Errorf("\nExpected <%+v>, \nReceived <%+v>", "cannot convert field: 1s to bool", err) } @@ -5252,7 +5252,7 @@ func TestAttributesProcessEventSetError(t *testing.T) { }, } - if _, err := aA.processEvent(context.Background(), args2.Tenant, args2, eNM, newDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0); err != nil { + if _, err := aA.processEvent(context.Background(), args2.Tenant, args2, eNM, NewDynamicDP(context.TODO(), nil, nil, nil, nil, nil, "cgrates.org", eNM), utils.EmptyString, make(map[string]int), 0); err != nil { t.Error(err) } }