From b35af23bcdf20b04146e4b9104b28d6c7a97acda Mon Sep 17 00:00:00 2001 From: TeoV Date: Thu, 2 May 2019 17:00:13 +0300 Subject: [PATCH] Use const name from utils and beautify the code --- console/debit.go | 7 +++++-- console/maxduration.go | 3 ++- engine/cdrs.go | 10 ++++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/console/debit.go b/console/debit.go index c98fd0b8f..e73b7735b 100644 --- a/console/debit.go +++ b/console/debit.go @@ -18,12 +18,15 @@ along with this program. If not, see package console -import "github.com/cgrates/cgrates/engine" +import ( + "github.com/cgrates/cgrates/engine" + "github.com/cgrates/cgrates/utils" +) func init() { c := &CmdDebit{ name: "debit", - rpcMethod: "Responder.Debit", + rpcMethod: utils.ResponderDebit, clientArgs: []string{"Direction", "Category", "TOR", "Tenant", "Subject", "Account", "Destination", "TimeStart", "TimeEnd", "CallDuration", "FallbackSubject", "DryRun"}, } commands[c.Name()] = c diff --git a/console/maxduration.go b/console/maxduration.go index 9efb2f1a3..a2f5e48a8 100644 --- a/console/maxduration.go +++ b/console/maxduration.go @@ -22,12 +22,13 @@ import ( "time" "github.com/cgrates/cgrates/engine" + "github.com/cgrates/cgrates/utils" ) func init() { c := &CmdGetMaxDuration{ name: "maxduration", - rpcMethod: "Responder.GetMaxSessionTime", + rpcMethod: utils.ResponderGetMaxSessionTime, clientArgs: []string{"Direction", "Category", "TOR", "Tenant", "Subject", "Account", "Destination", "TimeStart", "TimeEnd", "CallDuration", "FallbackSubject"}, } commands[c.Name()] = c diff --git a/engine/cdrs.go b/engine/cdrs.go index 44a850ee8..652574f1e 100644 --- a/engine/cdrs.go +++ b/engine/cdrs.go @@ -222,11 +222,13 @@ func (cdrS *CDRServer) getCostFromRater(cdr *CDRWithArgDispatcher) (*CallCost, e } if utils.IsSliceMember([]string{utils.META_PSEUDOPREPAID, utils.META_POSTPAID, utils.META_PREPAID, utils.PSEUDOPREPAID, utils.POSTPAID, utils.PREPAID}, cdr.RequestType) { // Prepaid - Cost can be recalculated in case of missing records from SM - err = cdrS.rals.Call(utils.ResponderDebit, &CallDescriptorWithArgDispatcher{CallDescriptor: cd, - ArgDispatcher: cdr.ArgDispatcher}, cc) + err = cdrS.rals.Call(utils.ResponderDebit, + &CallDescriptorWithArgDispatcher{CallDescriptor: cd, + ArgDispatcher: cdr.ArgDispatcher}, cc) } else { - err = cdrS.rals.Call(utils.ResponderGetCost, &CallDescriptorWithArgDispatcher{CallDescriptor: cd, - ArgDispatcher: cdr.ArgDispatcher}, cc) + err = cdrS.rals.Call(utils.ResponderGetCost, + &CallDescriptorWithArgDispatcher{CallDescriptor: cd, + ArgDispatcher: cdr.ArgDispatcher}, cc) } if err != nil { return cc, err