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

Updated CDR defaults values

Browse Source
This commit is contained in:
Trial97
2019-12-12 13:51:15 +02:00
parent 58eddbc9d1
commit 33209ec7b0
11 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
engine/action.go
View File

@@ -1063,7 +1063,6 @@ func resetAccount(ub *Account, action *Action, acts Actions, _ interface{}) erro
}
account := ub.GetID()
filter := &utils.CDRsFilter{
NotRunIDs: []string{utils.MetaRaw},
Accounts: []string{account},
NotCosts: []float64{-1},
OrderBy: fmt.Sprintf("%s%sdesc", utils.OrderID, utils.INFIELD_SEP),

2
engine/cdr.go
View File

@@ -112,7 +112,7 @@ func (cdr *CDR) AddDefaults(cfg *config.CGRConfig) {
cdr.ComputeCGRID()
}
if cdr.RunID == utils.EmptyString {
cdr.RunID = utils.MetaRaw
cdr.RunID = utils.MetaDefault
}
if cdr.ToR == utils.EmptyString {
cdr.ToR = utils.VOICE

2
engine/cdr_test.go
View File

@@ -1093,7 +1093,7 @@ func TestCDRAddDefaults(t *testing.T) {
eCDR := &CDR{
CGRID: "bf736fb56ce586357ab2f286b777187a1612c6e6",
ToR: utils.VOICE,
RunID: utils.MetaRaw,
RunID: utils.MetaDefault,
Subject: "1001",
RequestType: utils.META_RATED,
Tenant: "cgrates.org",

2
engine/mapevent.go
View File

@@ -180,7 +180,7 @@ func (me MapEvent) AsMapString(ignoredFlds *utils.StringSet) (mp map[string]stri
return
}
// AsCDR exports the SafEvent as CDR
// AsCDR exports the MapEvent as CDR
func (me MapEvent) AsCDR(cfg *config.CGRConfig, tnt, tmz string) (cdr *CDR, err error) {
cdr = &CDR{Tenant: tnt, Cost: -1.0, ExtraFields: make(map[string]string)}
for k, v := range me {

6
engine/mapevent_test.go
View File

@@ -289,7 +289,7 @@ func TestMapEventAsCDR(t *testing.T) {
expected = &CDR{
CGRID: "da39a3ee5e6b4b0d3255bfef95601890afd80709",
Cost: -1.0,
RunID: utils.MetaRaw,
RunID: utils.MetaDefault,
ToR: utils.VOICE,
RequestType: cfg.GeneralCfg().DefaultReqType,
Tenant: cfg.GeneralCfg().DefaultTenant,
@@ -362,7 +362,7 @@ func TestMapEventAsCDR(t *testing.T) {
"ExtraField1": "5",
"ExtraField2": "extra",
},
RunID: utils.MetaRaw,
RunID: utils.MetaDefault,
ToR: utils.VOICE,
RequestType: cfg.GeneralCfg().DefaultReqType,
Tenant: cfg.GeneralCfg().DefaultTenant,
@@ -618,7 +618,7 @@ func TestMapEventAsCDR(t *testing.T) {
"ExtraField1": "5",
"ExtraField2": "extra",
},
RunID: utils.MetaRaw,
RunID: utils.MetaDefault,
ToR: utils.VOICE,
RequestType: cfg.GeneralCfg().DefaultReqType,
Category: cfg.GeneralCfg().DefaultCategory,

6
engine/safevent_test.go
View File

@@ -647,7 +647,7 @@ func TestSafEventAsCDR(t *testing.T) {
expected = &CDR{
CGRID: "da39a3ee5e6b4b0d3255bfef95601890afd80709",
Cost: -1.0,
RunID: utils.MetaRaw,
RunID: utils.MetaDefault,
ToR: utils.VOICE,
RequestType: cfg.GeneralCfg().DefaultReqType,
Tenant: cfg.GeneralCfg().DefaultTenant,
@@ -710,7 +710,7 @@ func TestSafEventAsCDR(t *testing.T) {
"ExtraField1": "5",
"ExtraField2": "extra",
},
RunID: utils.MetaRaw,
RunID: utils.MetaDefault,
ToR: utils.VOICE,
RequestType: cfg.GeneralCfg().DefaultReqType,
Tenant: cfg.GeneralCfg().DefaultTenant,
@@ -744,7 +744,7 @@ func TestSafEventAsCDR(t *testing.T) {
"ExtraField1": "5",
"ExtraField2": "extra",
},
RunID: utils.MetaRaw,
RunID: utils.MetaDefault,
ToR: utils.VOICE,
RequestType: cfg.GeneralCfg().DefaultReqType,
Category: cfg.GeneralCfg().DefaultCategory,