diff --git a/apier/v1/accounts_it_test.go b/apier/v1/accounts_it_test.go index 864b8ac1e..9ef9cc6f1 100644 --- a/apier/v1/accounts_it_test.go +++ b/apier/v1/accounts_it_test.go @@ -248,7 +248,7 @@ func testAccITSetBalanceWithExtraData(t *testing.T) { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { t.Error("Unexpected number of CDRs returned: ", len(cdrs)) - } else if len(cdrs[0].ExtraFields) != 2 { + } else if len(cdrs[0].ExtraFields) != 3 { // included EventType t.Error("Unexpected number of ExtraFields returned: ", len(cdrs[0].ExtraFields)) } } @@ -276,7 +276,7 @@ func testAccITSetBalanceWithExtraData2(t *testing.T) { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { t.Error("Unexpected number of CDRs returned: ", len(cdrs)) - } else if len(cdrs[0].ExtraFields) != 2 { + } else if len(cdrs[0].ExtraFields) != 3 { // included EventType t.Error("Unexpected number of ExtraFields returned: ", len(cdrs[0].ExtraFields)) } else if cdrs[0].ExtraFields["ActionVal"] != "1.5" { t.Error("Unexpected value of ExtraFields[ActionVal] returned: ", cdrs[0].ExtraFields["ActionVal"]) diff --git a/apier/v1/cdre_it_test.go b/apier/v1/cdre_it_test.go index ac34817ec..003a89645 100755 --- a/apier/v1/cdre_it_test.go +++ b/apier/v1/cdre_it_test.go @@ -182,7 +182,7 @@ func testCDReProcessExternalCdr(t *testing.T) { SetupTime: "2014-08-04T13:00:00Z", AnswerTime: "2014-08-04T13:00:07Z", Usage: "1s", - ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, + ExtraFields: map[string]string{"EventType": "cdr", "field_extr1": "val_extr1", "fieldextr2": "valextr2"}, } var reply string if err := cdreRPC.Call("CDRsV1.ProcessExternalCDR", cdr, &reply); err != nil { diff --git a/engine/cdrs.go b/engine/cdrs.go index 0128738ae..8ebf7927a 100644 --- a/engine/cdrs.go +++ b/engine/cdrs.go @@ -479,6 +479,8 @@ func (cdrS *CDRServer) V1ProcessCDR(cdr *CDRWithArgDispatcher, reply *string) (e }, ArgDispatcher: cdr.ArgDispatcher, } + //Add event type as cdr + cgrEv.CGREvent.Event[utils.EventType] = utils.CDRPoster if cdrS.attrS != nil { if err = cdrS.attrSProcessEvent(cgrEv); err != nil { err = utils.NewErrServerError(err) @@ -584,6 +586,8 @@ func (cdrS *CDRServer) V1ProcessEvent(arg *ArgV1ProcessEvent, reply *string) (er if arg.ArgDispatcher != nil { cgrEv.ArgDispatcher = arg.ArgDispatcher } + //Add event type as event + cgrEv.CGREvent.Event[utils.EventType] = utils.Event if !ralS { if err = cdrS.attrStoExpThdStat(cgrEv, @@ -771,6 +775,8 @@ func (cdrS *CDRServer) V1RateCDRs(arg *ArgRateCDRs, reply *string) (err error) { CGREvent: cdr.AsCGREvent(), ArgDispatcher: arg.ArgDispatcher, } + //Add event type as cdr + argCharger.CGREvent.Event[utils.EventType] = utils.CDRPoster if err = cdrS.chrgProcessEvent(argCharger, false, store, export, thdS, statS); err != nil { return utils.NewErrServerError(err)