From 6b15a577b7923e6e2014acd934bd363c43d632ee Mon Sep 17 00:00:00 2001
From: TeoV <teofil.voivozeanu@itsyscom.com>
Date: Thu, 23 Jan 2020 16:20:10 +0200
Subject: [PATCH] Merge in one CacheSv1.ReloadCache call for APIer

---
 apier/v1/accounts.go | 10 +---------
 apier/v1/apier.go    | 11 ++---------
 apier/v2/accounts.go | 10 +---------
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/apier/v1/accounts.go b/apier/v1/accounts.go
index f4080d4de..eb8768d48 100644
--- a/apier/v1/accounts.go
+++ b/apier/v1/accounts.go
@@ -246,21 +246,13 @@ func (api *ApierV1) SetAccount(attr utils.AttrSetAccount, reply *string) (err er
 					apIDs[i] = actionPlanID
 					i++
 				}
-				if err := api.ConnMgr.Call(api.Config.ApierCfg().CachesConns, nil,
-					utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithArgDispatcher{
-						AttrReloadCache: utils.AttrReloadCache{
-							ArgsCache: utils.ArgsCache{ActionPlanIDs: &apIDs},
-						},
-					}, reply); err != nil {
-					return 0, err
-				}
 				if err := api.DataManager.SetAccountActionPlans(accID, acntAPids, true); err != nil {
 					return 0, err
 				}
 				if err := api.ConnMgr.Call(api.Config.ApierCfg().CachesConns, nil,
 					utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithArgDispatcher{
 						AttrReloadCache: utils.AttrReloadCache{
-							ArgsCache: utils.ArgsCache{AccountActionPlanIDs: &[]string{accID}},
+							ArgsCache: utils.ArgsCache{AccountActionPlanIDs: &[]string{accID}, ActionPlanIDs: &apIDs},
 						},
 					}, reply); err != nil {
 					return 0, err
diff --git a/apier/v1/apier.go b/apier/v1/apier.go
index c6645d366..640e86f3e 100644
--- a/apier/v1/apier.go
+++ b/apier/v1/apier.go
@@ -151,21 +151,14 @@ func (apiv1 *ApierV1) SetDestination(attrs utils.AttrSetDestination, reply *stri
 	if err := apiv1.DataManager.SetDestination(dest, utils.NonTransactional); err != nil {
 		return utils.NewErrServerError(err)
 	}
-	if err := apiv1.ConnMgr.Call(apiv1.Config.ApierCfg().CachesConns, nil,
-		utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithArgDispatcher{
-			AttrReloadCache: utils.AttrReloadCache{
-				ArgsCache: utils.ArgsCache{DestinationIDs: &[]string{attrs.Id}},
-			},
-		}, reply); err != nil {
-		return err
-	}
 	if err = apiv1.DataManager.UpdateReverseDestination(oldDest, dest, utils.NonTransactional); err != nil {
 		return
 	}
 	if err := apiv1.ConnMgr.Call(apiv1.Config.ApierCfg().CachesConns, nil,
 		utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithArgDispatcher{
 			AttrReloadCache: utils.AttrReloadCache{
-				ArgsCache: utils.ArgsCache{ReverseDestinationIDs: &dest.Prefixes},
+				ArgsCache: utils.ArgsCache{ReverseDestinationIDs: &dest.Prefixes,
+					DestinationIDs: &[]string{attrs.Id}},
 			},
 		}, reply); err != nil {
 		return err
diff --git a/apier/v2/accounts.go b/apier/v2/accounts.go
index dc3fc4628..9ee31891f 100644
--- a/apier/v2/accounts.go
+++ b/apier/v2/accounts.go
@@ -186,21 +186,13 @@ func (apiv2 *ApierV2) SetAccount(attr AttrSetAccount, reply *string) error {
 				apIDs[i] = actionPlanID
 				i++
 			}
-			if err := apiv2.ConnMgr.Call(apiv2.Config.ApierCfg().CachesConns, nil,
-				utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithArgDispatcher{
-					AttrReloadCache: utils.AttrReloadCache{
-						ArgsCache: utils.ArgsCache{ActionPlanIDs: &apIDs},
-					},
-				}, reply); err != nil {
-				return 0, err
-			}
 			if err := apiv2.DataManager.SetAccountActionPlans(accID, acntAPids, true); err != nil {
 				return 0, err
 			}
 			return 0, apiv2.ConnMgr.Call(apiv2.Config.ApierCfg().CachesConns, nil,
 				utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithArgDispatcher{
 					AttrReloadCache: utils.AttrReloadCache{
-						ArgsCache: utils.ArgsCache{AccountActionPlanIDs: &[]string{accID}},
+						ArgsCache: utils.ArgsCache{AccountActionPlanIDs: &[]string{accID}, ActionPlanIDs: &apIDs},
 					},
 				}, reply)
 		}, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACTION_PLAN_PREFIX)