From 58c16a5f47cc1c269903d8b45c763763bb5dc124 Mon Sep 17 00:00:00 2001
From: DanB <danb@cgrates.org>
Date: Sun, 4 Aug 2013 16:45:43 +0200
Subject: [PATCH] Errors fixup in sql queries

---
 .../mysql/create_costdetails_tables.sql       |  1 -
 engine/responder.go                           |  4 +--
 engine/storage_sql.go                         | 29 +++++++++++--------
 utils/consts.go                               |  2 ++
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/data/storage/mysql/create_costdetails_tables.sql b/data/storage/mysql/create_costdetails_tables.sql
index e03d641bb..a3ab38d6b 100644
--- a/data/storage/mysql/create_costdetails_tables.sql
+++ b/data/storage/mysql/create_costdetails_tables.sql
@@ -12,7 +12,6 @@ CREATE TABLE `cost_details` (
   `account` varchar(64) NOT NULL,
   `subject` varchar(64) NOT NULL,
   `destination` varchar(64) NOT NULL,
-  `time_start` datetime NOT NULL,
   `cost` DECIMAL(5,4) NOT NULL,
   `connect_fee` DECIMAL(5,4) NOT NULL,
   `timespans` text,
diff --git a/engine/responder.go b/engine/responder.go
index 70903b0dc..8338807b9 100644
--- a/engine/responder.go
+++ b/engine/responder.go
@@ -230,7 +230,7 @@ func (rs *Responder) getCallCost(key *CallDescriptor, method string) (reply *Cal
 	for err != nil {
 		client := rs.Bal.Balance()
 		if client == nil {
-			Logger.Info("Waiting for raters to register...")
+			Logger.Info("<Balancer> Waiting for raters to register...")
 			time.Sleep(1 * time.Second) // wait one second and retry
 		} else {
 			reply = &CallCost{}
@@ -239,7 +239,7 @@ func (rs *Responder) getCallCost(key *CallDescriptor, method string) (reply *Cal
 				return reply, err
 			})
 			if err != nil {
-				Logger.Err(fmt.Sprintf("Got en error from rater: %v", err))
+				Logger.Err(fmt.Sprintf("<Balancer> Got en error from rater: %v", err))
 			}
 		}
 	}
diff --git a/engine/storage_sql.go b/engine/storage_sql.go
index d5d879930..84216ee7a 100644
--- a/engine/storage_sql.go
+++ b/engine/storage_sql.go
@@ -819,6 +819,7 @@ func (self *SQLStorage) GetAllActionTimings() (ats map[string]ActionTimings, err
 }
 
 func (self *SQLStorage) LogCallCost(uuid, source string, cc *CallCost) (err error) {
+	//ToDo: Add cgrid to logCallCost
 	if self.Db == nil {
 		//timespans.Logger.Warning("Cannot write log to database.")
 		return
@@ -827,18 +828,20 @@ func (self *SQLStorage) LogCallCost(uuid, source string, cc *CallCost) (err erro
 	if err != nil {
 		Logger.Err(fmt.Sprintf("Error marshalling timespans to json: %v", err))
 	}
-	_, err = self.Db.Exec(fmt.Sprintf("INSERT INTO callcosts VALUES ('NULL','%s', '%s','%s', '%s', '%s', '%s', '%s', '%s', %v, %v, '%s')",
+	_, err = self.Db.Exec(fmt.Sprintf("INSERT INTO %s (cgrid, accid, direction, tenant, tor, account, subject, destination, cost, connect_fee, timespans, source )VALUES ('%s', '%s','%s', '%s', '%s', '%s', '%s', '%s', %f, %f, '%s','%s')", 
+		utils.TBL_COST_DETAILS,
+		utils.FSCgrId(uuid),
 		uuid,
-		source,
 		cc.Direction,
 		cc.Tenant,
 		cc.TOR,
-		cc.Subject,
 		cc.Account,
+		cc.Subject,
 		cc.Destination,
 		cc.Cost,
 		cc.ConnectFee,
-		tss))
+		tss,
+		source))
 	if err != nil {
 		Logger.Err(fmt.Sprintf("failed to execute insert statement: %v", err))
 	}
@@ -846,10 +849,11 @@ func (self *SQLStorage) LogCallCost(uuid, source string, cc *CallCost) (err erro
 }
 
 func (self *SQLStorage) GetCallCostLog(uuid, source string) (cc *CallCost, err error) {
-	row := self.Db.QueryRow(fmt.Sprintf("SELECT * FROM callcosts WHERE uuid='%s' AND source='%s'", uuid, source))
-	var uuid_found string
+	//ToDo: cgrid instead of uuid
+	row := self.Db.QueryRow(fmt.Sprintf("SELECT cgrid, accid, direction, tenant, tor, account, subject, destination, cost, connect_fee, timespans, source  FROM %s WHERE cgrid='%s' AND source='%s'", utils.TBL_COST_DETAILS, utils.FSCgrId(uuid), source))
+	var cgrid, accid, src string
 	var timespansJson string
-	err = row.Scan(&uuid_found, &cc.Direction, &cc.Tenant, &cc.TOR, &cc.Subject, &cc.Destination, &cc.Cost, &cc.ConnectFee, &timespansJson)
+	err = row.Scan(&cgrid, &accid, &cc.Direction, &cc.Tenant, &cc.TOR, &cc.Subject, &cc.Destination, &cc.Cost, &cc.ConnectFee, &timespansJson, &src)
 	err = json.Unmarshal([]byte(timespansJson), cc.Timespans)
 	return
 }
@@ -900,12 +904,13 @@ func (self *SQLStorage) SetCdr(cdr utils.CDR) (err error) {
 }
 
 func (self *SQLStorage) SetRatedCdr(cdr utils.CDR, cc *CallCost) (err error) {
-	_, err = self.Db.Exec(fmt.Sprintf("INSERT INTO rated_cdrs VALUES ('%s', '%s', '%s', '%s')",
+	// ToDo: Add here source and subject
+	_, err = self.Db.Exec(fmt.Sprintf("INSERT INTO %s (cgrid, subject, cost, source) VALUES ('%s', '%s', %f, '%s')",
+		utils.TBL_RATED_CDRS,
 		cdr.GetCgrId(),
-		cc.Cost,
-		"cgrcostid",
-		"cdrsrc",
-	))
+		"subject",
+		cc.Cost+cc.ConnectFee,
+		"cdrsrc"))
 	if err != nil {
 		Logger.Err(fmt.Sprintf("failed to execute cdr insert statement: %v", err))
 	}
diff --git a/utils/consts.go b/utils/consts.go
index 9ea654ec8..a6ab640c5 100644
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -29,6 +29,8 @@ const (
 	TBL_TP_ACTION_TIMINGS    = "tp_action_timings"
 	TBL_TP_ACTION_TRIGGERS   = "tp_action_triggers"
 	TBL_TP_ACCOUNT_ACTIONS   = "tp_account_actions"
+	TBL_COST_DETAILS	= "cost_details"
+	TBL_RATED_CDRS		= "rated_cdrs"
 	TIMINGS_CSV              = "Timings.csv"
 	DESTINATIONS_CSV         = "Destinations.csv"
 	RATES_CSV                = "Rates.csv"