From a5bc937b24ab8da5654de68bcedb8fac480b0b6f Mon Sep 17 00:00:00 2001
From: edwardro22 <edwardro22@gmail.com>
Date: Tue, 29 Aug 2017 14:04:26 +0000
Subject: [PATCH] action trigger structure update

---
 migrator/accounts.go       |  3 ---
 migrator/action_trigger.go | 29 +++++++++++++----------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/migrator/accounts.go b/migrator/accounts.go
index 26661fd14..849d2564b 100755
--- a/migrator/accounts.go
+++ b/migrator/accounts.go
@@ -296,9 +296,6 @@ func (v1Acc v1Account) AsAccount() (ac *engine.Account) {
 		if oldAtr.BalanceWeight != 0 {
 			bf.Weight = utils.Float64Pointer(oldAtr.BalanceWeight)
 		}
-		if oldAtr.BalanceDisabled != false {
-			bf.Disabled = utils.BoolPointer(oldAtr.BalanceDisabled)
-		}
 		if !oldAtr.BalanceExpirationDate.IsZero() {
 			bf.ExpirationDate = utils.TimePointer(oldAtr.BalanceExpirationDate)
 		}
diff --git a/migrator/action_trigger.go b/migrator/action_trigger.go
index 100b20042..a2740e2ea 100644
--- a/migrator/action_trigger.go
+++ b/migrator/action_trigger.go
@@ -12,26 +12,26 @@ import (
 )
 
 type v1ActionTrigger struct {
-	Id                    string
-	ThresholdType         string
+	Id                    string // for visual identification
+	ThresholdType         string //*min_counter, *max_counter, *min_balance, *max_balance
 	ThresholdValue        float64
-	Recurrent             bool
-	MinSleep              time.Duration
+	Recurrent             bool          // reset eexcuted flag each run
+	MinSleep              time.Duration // Minimum duration between two executions in case of recurrent triggers
 	BalanceId             string
 	BalanceType           string
 	BalanceDirection      string
-	BalanceDestinationIds string
-	BalanceWeight         float64
-	BalanceExpirationDate time.Time
-	BalanceTimingTags     string
-	BalanceRatingSubject  string
-	BalanceCategory       string
-	BalanceSharedGroup    string
-	BalanceDisabled       bool
+	BalanceDestinationIds string    // filter for balance
+	BalanceWeight         float64   // filter for balance
+	BalanceExpirationDate time.Time // filter for balance
+	BalanceTimingTags     string    // filter for balance
+	BalanceRatingSubject  string    // filter for balance
+	BalanceCategory       string    // filter for balance
+	BalanceSharedGroup    string    // filter for balance
 	Weight                float64
 	ActionsId             string
-	MinQueuedItems        int
+	MinQueuedItems        int // Trigger actions only if this number is hit (stats only)
 	Executed              bool
+	lastExecutionTime     time.Time
 }
 
 type v1ActionTriggers []*v1ActionTrigger
@@ -169,9 +169,6 @@ func (v1Act v1ActionTrigger) AsActionTrigger() (at *engine.ActionTrigger) {
 	if v1Act.BalanceWeight != 0 {
 		bf.Weight = utils.Float64Pointer(v1Act.BalanceWeight)
 	}
-	if v1Act.BalanceDisabled != false {
-		bf.Disabled = utils.BoolPointer(v1Act.BalanceDisabled)
-	}
 	if !v1Act.BalanceExpirationDate.IsZero() {
 		bf.ExpirationDate = utils.TimePointer(v1Act.BalanceExpirationDate)
 		at.ExpirationDate = v1Act.BalanceExpirationDate