From 3fbab340de0b1ca6428c17404e4e02dc4b406216 Mon Sep 17 00:00:00 2001
From: DanB <danb@cgrates.org>
Date: Fri, 5 Oct 2018 14:11:03 +0200
Subject: [PATCH] Corrections for NewAgentRequest constructor

---
 agents/diamagent.go | 9 +++++----
 agents/httpagent.go | 1 -
 agents/libdiam.go   | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/agents/diamagent.go b/agents/diamagent.go
index 39e310a91..ef4b16e89 100644
--- a/agents/diamagent.go
+++ b/agents/diamagent.go
@@ -124,8 +124,9 @@ func (da *DiameterAgent) handleMessage(c diam.Conn, m *diam.Message) {
 		lclProcessed, err = da.processRequest(reqProcessor,
 			newAgentRequest(
 				newDADataProvider(m), reqVars, rply,
-				reqProcessor.Tenant,
-				da.cgrCfg.DefaultTenant, da.filterS))
+				reqProcessor.Tenant, da.cgrCfg.DefaultTenant,
+				utils.FirstNonEmpty(reqProcessor.Timezone, config.CgrConfig().DefaultTimezone),
+				da.filterS))
 		if lclProcessed {
 			processed = lclProcessed
 		}
@@ -196,14 +197,14 @@ func (da *DiameterAgent) handleMessage(c diam.Conn, m *diam.Message) {
 
 func (da *DiameterAgent) processRequest(reqProcessor *config.DARequestProcessor,
 	agReq *AgentRequest) (processed bool, err error) {
-	if pass, err := da.filterS.Pass(agReq.Tenant,
+	if pass, err := da.filterS.Pass(agReq.tenant,
 		reqProcessor.Filters, agReq); err != nil || !pass {
 		return pass, err
 	}
 	if agReq.CGRRequest, err = agReq.AsNavigableMap(reqProcessor.RequestFields); err != nil {
 		return
 	}
-	cgrEv := agReq.CGRRequest.AsCGREvent(agReq.Tenant, utils.NestingSep)
+	cgrEv := agReq.CGRRequest.AsCGREvent(agReq.tenant, utils.NestingSep)
 	var reqType string
 	for _, typ := range []string{
 		utils.MetaDryRun, utils.MetaAuth,
diff --git a/agents/httpagent.go b/agents/httpagent.go
index 5127afe11..ef273e5c5 100644
--- a/agents/httpagent.go
+++ b/agents/httpagent.go
@@ -58,7 +58,6 @@ func (ha *HTTPAgent) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 				utils.HTTPAgent, err.Error()))
 		return
 	}
-	var processed bool
 	for _, reqProcessor := range ha.reqProcessors {
 		agReq := newAgentRequest(dcdr, nil, nil,
 			reqProcessor.Tenant, ha.dfltTenant,
diff --git a/agents/libdiam.go b/agents/libdiam.go
index 5f5cc403f..d2e9e5879 100644
--- a/agents/libdiam.go
+++ b/agents/libdiam.go
@@ -296,8 +296,7 @@ func (dP *diameterDP) FieldAsString(fldPath []string) (data string, err error) {
 	if err != nil {
 		return
 	}
-	data, _ = utils.CastFieldIfToString(valIface)
-	return
+	return utils.IfaceAsString(valIface)
 }
 
 // FieldAsInterface is part of engine.DataProvider interface