From 8a8fa56797a84b00bf5e419bd4f6d6d7fdd3e581 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon@itsyscom.com>
Date: Tue, 12 Mar 2019 13:54:56 +0200
Subject: [PATCH] Updated fctemplate to populate Tag if empty

---
 config/config_test.go     | 6 +++---
 config/configcdrc_test.go | 6 +++---
 config/fctemplate.go      | 7 ++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/config/config_test.go b/config/config_test.go
index 7e98da885..157634119 100755
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -222,11 +222,11 @@ func TestCgrCfgCDRC(t *testing.T) {
 			PartialCacheExpiryAction: "*dump_to_file",
 			HeaderFields:             make([]*FCTemplate, 0),
 			ContentFields: []*FCTemplate{
-				{FieldId: "ToR", Type: utils.META_COMPOSED,
+				{Tag: "ToR", FieldId: "ToR", Type: utils.META_COMPOSED,
 					Value: NewRSRParsersMustCompile("~7:s/^(voice|data|sms|mms|generic)$/*$1/", true, utils.INFIELD_SEP)},
-				{FieldId: "AnswerTime", Type: utils.META_COMPOSED,
+				{Tag: "AnswerTime", FieldId: "AnswerTime", Type: utils.META_COMPOSED,
 					Value: NewRSRParsersMustCompile("~1", true, utils.INFIELD_SEP)},
-				{FieldId: "Usage", Type: utils.META_COMPOSED,
+				{Tag: "Usage", FieldId: "Usage", Type: utils.META_COMPOSED,
 					Value: NewRSRParsersMustCompile("~9:s/^(\\d+)$/${1}s/", true, utils.INFIELD_SEP)},
 			},
 			TrailerFields: make([]*FCTemplate, 0),
diff --git a/config/configcdrc_test.go b/config/configcdrc_test.go
index 3a97c89b9..e08a6661f 100644
--- a/config/configcdrc_test.go
+++ b/config/configcdrc_test.go
@@ -209,11 +209,11 @@ func TestLoadCdrcConfigMultipleFiles(t *testing.T) {
 			PartialCacheExpiryAction: utils.MetaDumpToFile,
 			HeaderFields:             make([]*FCTemplate, 0),
 			ContentFields: []*FCTemplate{
-				{FieldId: utils.ToR,
+				{Tag: utils.ToR, FieldId: utils.ToR,
 					Value: NewRSRParsersMustCompile("~7:s/^(voice|data|sms|mms|generic)$/*$1/", true, utils.INFIELD_SEP)},
-				{Tag: "", Type: "", FieldId: utils.AnswerTime,
+				{Tag: utils.AnswerTime, Type: "", FieldId: utils.AnswerTime,
 					Value: NewRSRParsersMustCompile("~1", true, utils.INFIELD_SEP)},
-				{FieldId: utils.Usage,
+				{Tag: utils.Usage, FieldId: utils.Usage,
 					Value: NewRSRParsersMustCompile("~9:s/^(\\d+)$/${1}s/", true, utils.INFIELD_SEP)},
 			},
 			TrailerFields: make([]*FCTemplate, 0),
diff --git a/config/fctemplate.go b/config/fctemplate.go
index f45f1c633..7b95bc824 100755
--- a/config/fctemplate.go
+++ b/config/fctemplate.go
@@ -27,15 +27,16 @@ import (
 func NewFCTemplateFromFCTemplateJsonCfg(jsnCfg *FcTemplateJsonCfg, separator string) (*FCTemplate, error) {
 	fcTmp := new(FCTemplate)
 	var err error
-	if jsnCfg.Tag != nil {
-		fcTmp.Tag = *jsnCfg.Tag
-	}
 	if jsnCfg.Type != nil {
 		fcTmp.Type = *jsnCfg.Type
 	}
 	if jsnCfg.Field_id != nil {
 		fcTmp.FieldId = *jsnCfg.Field_id
 	}
+	fcTmp.Tag = fcTmp.FieldId
+	if jsnCfg.Tag != nil {
+		fcTmp.Tag = *jsnCfg.Tag
+	}
 	if jsnCfg.Filters != nil {
 		fcTmp.Filters = make([]string, len(*jsnCfg.Filters))
 		for i, fltr := range *jsnCfg.Filters {