From 3ba3ced16419a5fbfb3007a261d8b83815f5b230 Mon Sep 17 00:00:00 2001
From: Tripon Alexandru-Ionut <alexandru.tripon@itsyscom.com>
Date: Mon, 3 Jun 2019 10:36:15 +0300
Subject: [PATCH] Updated MapEvent.AsCDR

---
 engine/mapevent.go      | 10 ++++++++--
 engine/mapevent_test.go |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/engine/mapevent.go b/engine/mapevent.go
index 904a2c8bd..166231426 100644
--- a/engine/mapevent.go
+++ b/engine/mapevent.go
@@ -267,8 +267,14 @@ func (me MapEvent) AsCDR(cfg *config.CGRConfig, tnt, tmz string) (cdr *CDR, err
 			if cdr.CostDetails, err = IfaceAsEventCost(v); err != nil {
 				return nil, err
 			}
-		case utils.ExtraInfo, utils.OrderID:
-
+		case utils.ExtraInfo:
+			if cdr.ExtraInfo, err = utils.IfaceAsString(v); err != nil {
+				return nil, err
+			}
+		case utils.OrderID:
+			if cdr.OrderID, err = utils.IfaceAsInt64(v); err != nil {
+				return nil, err
+			}
 		}
 	}
 	if cfg != nil {
diff --git a/engine/mapevent_test.go b/engine/mapevent_test.go
index 56fe1a5c7..5b5dc27ee 100644
--- a/engine/mapevent_test.go
+++ b/engine/mapevent_test.go
@@ -379,6 +379,7 @@ func TestMapEventAsCDR(t *testing.T) {
 		"Source":      1001,
 		"CostSource":  "1002",
 		"ExtraField2": "extra",
+		"ExtraInfo":   "ACCOUNT_NOT_FOUND",
 	}
 	expected = &CDR{
 		CGRID:      "da39a3ee5e6b4b0d3255bfef95601890afd80709",
@@ -394,6 +395,7 @@ func TestMapEventAsCDR(t *testing.T) {
 		RequestType: cfg.GeneralCfg().DefaultReqType,
 		Tenant:      cfg.GeneralCfg().DefaultTenant,
 		Category:    cfg.GeneralCfg().DefaultCategory,
+		ExtraInfo:   "ACCOUNT_NOT_FOUND",
 	}
 	if rply, err := me.AsCDR(cfg, utils.EmptyString, utils.EmptyString); err != nil {
 		t.Error(err)