From e1b0b657308638d178ff8967e2dd4ea68419a9d1 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon@itsyscom.com>
Date: Mon, 30 Sep 2019 13:50:59 +0300
Subject: [PATCH] Renamed Scheduler from apierV1 structure

---
 apier/v1/accounts.go  |  4 ++--
 apier/v1/apier.go     | 28 ++++++++++++++--------------
 apier/v1/scheduler.go |  2 +-
 apier/v2/accounts.go  |  2 +-
 apier/v2/apier.go     |  2 +-
 services/apierv1.go   | 12 ++++++------
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/apier/v1/accounts.go b/apier/v1/accounts.go
index b571dad59..c90971565 100644
--- a/apier/v1/accounts.go
+++ b/apier/v1/accounts.go
@@ -155,7 +155,7 @@ func (self *ApierV1) RemoveActionTiming(attrs AttrRemoveActionTiming, reply *str
 		return utils.NewErrServerError(err)
 	}
 	if attrs.ReloadScheduler {
-		sched := self.Scheduler.GetScheduler()
+		sched := self.SchedulerService.GetScheduler()
 		if sched == nil {
 			return errors.New(utils.SchedulerNotRunningCaps)
 		}
@@ -277,7 +277,7 @@ func (self *ApierV1) SetAccount(attr utils.AttrSetAccount, reply *string) (err e
 		return utils.NewErrServerError(err)
 	}
 	if attr.ReloadScheduler && len(dirtyActionPlans) != 0 {
-		sched := self.Scheduler.GetScheduler()
+		sched := self.SchedulerService.GetScheduler()
 		if sched == nil {
 			return errors.New(utils.SchedulerNotRunningCaps)
 		}
diff --git a/apier/v1/apier.go b/apier/v1/apier.go
index d11f710b5..4835f878e 100644
--- a/apier/v1/apier.go
+++ b/apier/v1/apier.go
@@ -42,18 +42,18 @@ type SchedulerGeter interface {
 }
 
 type ApierV1 struct {
-	StorDb      engine.LoadStorage
-	DataManager *engine.DataManager
-	CdrDb       engine.CdrStorage
-	Config      *config.CGRConfig
-	Responder   *engine.Responder
-	CDRs        rpcclient.RpcClientConnection // FixMe: populate it from cgr-engine
-	Scheduler   SchedulerGeter                // Need to have them capitalize so we can export in V2
-	HTTPPoster  *engine.HTTPPoster
-	FilterS     *engine.FilterS //Used for CDR Exporter
-	CacheS      rpcclient.RpcClientConnection
-	SchedulerS  rpcclient.RpcClientConnection
-	AttributeS  rpcclient.RpcClientConnection
+	StorDb           engine.LoadStorage
+	DataManager      *engine.DataManager
+	CdrDb            engine.CdrStorage
+	Config           *config.CGRConfig
+	Responder        *engine.Responder
+	CDRs             rpcclient.RpcClientConnection // FixMe: populate it from cgr-engine
+	SchedulerService SchedulerGeter                // Need to have them capitalize so we can export in V2
+	HTTPPoster       *engine.HTTPPoster
+	FilterS          *engine.FilterS //Used for CDR Exporter
+	CacheS           rpcclient.RpcClientConnection
+	SchedulerS       rpcclient.RpcClientConnection
+	AttributeS       rpcclient.RpcClientConnection
 }
 
 // Call implements rpcclient.RpcClientConnection interface for internal RPC
@@ -664,7 +664,7 @@ func (self *ApierV1) SetActionPlan(attrs AttrSetActionPlan, reply *string) (err
 		return err
 	}
 	if attrs.ReloadScheduler {
-		sched := self.Scheduler.GetScheduler()
+		sched := self.SchedulerService.GetScheduler()
 		if sched == nil {
 			return errors.New(utils.SchedulerNotRunningCaps)
 		}
@@ -776,7 +776,7 @@ func (self *ApierV1) LoadAccountActions(attrs utils.TPAccountActions, reply *str
 	}
 	// ToDo: Get the action keys loaded by dbReader so we reload only these in cache
 	// Need to do it before scheduler otherwise actions to run will be unknown
-	sched := self.Scheduler.GetScheduler()
+	sched := self.SchedulerService.GetScheduler()
 	if sched != nil {
 		sched.Reload()
 	}
diff --git a/apier/v1/scheduler.go b/apier/v1/scheduler.go
index e1cb49f43..3a1cf3ec2 100644
--- a/apier/v1/scheduler.go
+++ b/apier/v1/scheduler.go
@@ -101,7 +101,7 @@ import (
 */
 
 func (self *ApierV1) GetScheduledActions(args scheduler.ArgsGetScheduledActions, reply *[]*scheduler.ScheduledAction) error {
-	sched := self.Scheduler.GetScheduler()
+	sched := self.SchedulerService.GetScheduler()
 	if sched == nil {
 		return errors.New(utils.SchedulerNotRunningCaps)
 	}
diff --git a/apier/v2/accounts.go b/apier/v2/accounts.go
index 67e91fb0c..c9e8d297b 100644
--- a/apier/v2/accounts.go
+++ b/apier/v2/accounts.go
@@ -237,7 +237,7 @@ func (self *ApierV2) SetAccount(attr AttrSetAccount, reply *string) error {
 		return utils.NewErrServerError(err)
 	}
 	if attr.ReloadScheduler && schedNeedsReload {
-		sched := self.Scheduler.GetScheduler()
+		sched := self.SchedulerService.GetScheduler()
 		if sched == nil {
 			return errors.New(utils.SchedulerNotRunningCaps)
 		}
diff --git a/apier/v2/apier.go b/apier/v2/apier.go
index b1755d538..a1dd96fef 100644
--- a/apier/v2/apier.go
+++ b/apier/v2/apier.go
@@ -85,7 +85,7 @@ func (self *ApierV2) LoadAccountActions(attrs AttrLoadAccountActions, reply *str
 	}, config.CgrConfig().GeneralCfg().LockingTimeout, attrs.AccountActionsId); err != nil {
 		return utils.NewErrServerError(err)
 	}
-	sched := self.Scheduler.GetScheduler()
+	sched := self.SchedulerService.GetScheduler()
 	if sched != nil {
 		sched.Reload()
 	}
diff --git a/services/apierv1.go b/services/apierv1.go
index 8489ba83b..32bb8cf28 100644
--- a/services/apierv1.go
+++ b/services/apierv1.go
@@ -108,12 +108,12 @@ func (api *ApierV1Service) Start(sp servmanager.ServiceProvider, waitCache bool)
 	}
 
 	api.api = &v1.ApierV1{
-		StorDb:      sp.GetLoadStorage(),
-		DataManager: sp.GetDM(),
-		CdrDb:       sp.GetCDRStorage(),
-		Config:      sp.GetConfig(),
-		Responder:   responder,
-		Scheduler:   schS,
+		StorDb:           sp.GetLoadStorage(),
+		DataManager:      sp.GetDM(),
+		CdrDb:            sp.GetCDRStorage(),
+		Config:           sp.GetConfig(),
+		Responder:        responder,
+		SchedulerService: schS,
 		HTTPPoster: engine.NewHTTPPoster(sp.GetConfig().GeneralCfg().HttpSkipTlsVerify,
 			sp.GetConfig().GeneralCfg().ReplyTimeout),
 		FilterS:    sp.GetFilterS(),