From 2805190f45f5fcdf086f7850189f8b8739c338a0 Mon Sep 17 00:00:00 2001
From: Radu Ioan Fericean <radu@fericean.ro>
Date: Mon, 22 Jul 2013 13:54:30 +0300
Subject: [PATCH] small management api improvements

---
 apier/apier.go    | 24 +++++++++++++-----------
 docs/apicalls.rst |  1 -
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/apier/apier.go b/apier/apier.go
index 775dca8b6..78e0859aa 100644
--- a/apier/apier.go
+++ b/apier/apier.go
@@ -117,7 +117,6 @@ type AttrExecuteAction struct {
 	Direction string
 	Tenant    string
 	Account   string
-	BalanceId string
 	ActionsId string
 }
 
@@ -213,7 +212,7 @@ type AttrAccount struct {
 
 // Ads a new account into dataDb. If already defined, returns success.
 func (self *Apier) AddAccount(attr *AttrAccount, reply *float64) error {
-	if missing := utils.MissingStructFields(&attr, []string{"Tenant", "Direction","Account","Type","ActionTimingsId"}); len(missing) != 0 {
+	if missing := utils.MissingStructFields(&attr, []string{"Tenant", "Direction", "Account", "Type", "ActionTimingsId"}); len(missing) != 0 {
 		return fmt.Errorf("%s:%v", utils.ERR_MANDATORY_IE_MISSING, missing)
 	}
 	tag := fmt.Sprintf("%s:%s:%s", attr.Direction, attr.Tenant, attr.Account)
@@ -221,18 +220,21 @@ func (self *Apier) AddAccount(attr *AttrAccount, reply *float64) error {
 		Id:   tag,
 		Type: attr.Type,
 	}
-	if err := self.DataDb.SetUserBalance(ub); err != nil {
-		return fmt.Errorf("%s:%s", utils.ERR_SERVER_ERROR, err.Error())
-	}
+
 	if attr.ActionTimingsId != "" {
 		if ats, err := self.DataDb.GetActionTimings(attr.ActionTimingsId); err == nil {
 			for _, at := range ats {
 				at.UserBalanceIds = append(at.UserBalanceIds, tag)
 			}
-			self.DataDb.SetActionTimings(attr.ActionTimingsId, ats)
-			if self.Sched != nil {
-				self.Sched.LoadActionTimings(self.DataDb)
-				self.Sched.Restart()
+			err = self.DataDb.SetActionTimings(attr.ActionTimingsId, ats)
+			if err != nil {
+				if self.Sched != nil {
+					self.Sched.LoadActionTimings(self.DataDb)
+					self.Sched.Restart()
+				}
+			}
+			if err := self.DataDb.SetUserBalance(ub); err != nil {
+				return fmt.Errorf("%s:%s", utils.ERR_SERVER_ERROR, err.Error())
 			}
 		} else {
 			return fmt.Errorf("%s:%s", utils.ERR_SERVER_ERROR, err.Error())
@@ -242,7 +244,7 @@ func (self *Apier) AddAccount(attr *AttrAccount, reply *float64) error {
 }
 
 type AttrSetAccountActions struct {
-	TPid            string
+	TPid             string
 	AccountActionsId string
 }
 
@@ -253,7 +255,7 @@ func (self *Apier) SetAccountActions(attrs AttrSetAccountActions, reply *string)
 	}
 	dbReader := rater.NewDbReader(self.StorDb, self.DataDb, attrs.TPid)
 
-	if _,err := rater.AccLock.Guard(attrs.AccountActionsId, func() (float64, error) {
+	if _, err := rater.AccLock.Guard(attrs.AccountActionsId, func() (float64, error) {
 		if err := dbReader.LoadAccountActionsByTag(attrs.AccountActionsId); err != nil {
 			return 0, err
 		}
diff --git a/docs/apicalls.rst b/docs/apicalls.rst
index be7e775bd..4afedbeb5 100644
--- a/docs/apicalls.rst
+++ b/docs/apicalls.rst
@@ -301,7 +301,6 @@ Executes specified action on a user account.
 		Direction string
 		Tenant    string
 		Account   string
-		BalanceId string
 		ActionsId string
 	}