This commit is contained in:
TeoV
2018-09-17 10:29:29 -04:00
committed by Dan Christian Bogos
parent 19961ab9f7
commit 5003eecd71
6 changed files with 148 additions and 18 deletions

View File

@@ -209,23 +209,23 @@ func (cdr *CDR) ParseFieldValue(fieldId, fieldVal, timezone string) error {
case utils.OriginHost: // overwrite if originHost is given from template
cdr.OriginHost = fieldVal
case utils.ToR:
cdr.ToR += fieldVal
cdr.ToR = fieldVal
case utils.RunID:
cdr.RunID += fieldVal
cdr.RunID = fieldVal
case utils.OriginID:
cdr.OriginID += fieldVal
cdr.OriginID = fieldVal
case utils.RequestType:
cdr.RequestType += fieldVal
cdr.RequestType = fieldVal
case utils.Tenant:
cdr.Tenant += fieldVal
cdr.Tenant = fieldVal
case utils.Category:
cdr.Category += fieldVal
cdr.Category = fieldVal
case utils.Account:
cdr.Account += fieldVal
cdr.Account = fieldVal
case utils.Subject:
cdr.Subject += fieldVal
cdr.Subject = fieldVal
case utils.Destination:
cdr.Destination += fieldVal
cdr.Destination = fieldVal
case utils.PreRated:
cdr.PreRated, _ = strconv.ParseBool(fieldVal)
case utils.SetupTime:
@@ -247,7 +247,7 @@ func (cdr *CDR) ParseFieldValue(fieldId, fieldVal, timezone string) error {
case utils.Partial:
cdr.Partial, _ = strconv.ParseBool(fieldVal)
default: // Extra fields will not match predefined so they all show up here
cdr.ExtraFields[fieldId] += fieldVal
cdr.ExtraFields[fieldId] = fieldVal
}
return nil
}

View File

@@ -954,3 +954,22 @@ func TestCDRUpdateFromCGREvent(t *testing.T) {
t.Errorf("Expecting: %+v, received: %+v", cdr, eCDR)
}
}
func TestCDRParseFieldValue2(t *testing.T) {
cdr := new(CDR)
if err := cdr.ParseFieldValue(utils.RunID, "*default", ""); err != nil {
t.Error(err)
} else if cdr.RunID != "*default" {
t.Errorf("Received cdr: %+v", cdr)
}
if err := cdr.ParseFieldValue(utils.OriginID, "FirstID", ""); err != nil {
t.Error(err)
} else if cdr.OriginID != "FirstID" {
t.Errorf("Received cdr: %+v", cdr)
}
if err := cdr.ParseFieldValue(utils.OriginID, "SecondID", ""); err != nil {
t.Error(err)
} else if cdr.OriginID != "SecondID" {
t.Errorf("Received cdr: %+v", cdr)
}
}