From b28daeea30023b62abeb7739457cda9a335dae72 Mon Sep 17 00:00:00 2001
From: DanB <danb@cgrates.org>
Date: Mon, 25 Mar 2019 19:36:17 +0100
Subject: [PATCH] Adding tutorial2 Account related data

---
 data/tariffplans/tutorial2/AccountActions.csv   | 2 ++
 data/tariffplans/tutorial2/ActionPlans.csv      | 7 +++++++
 data/tariffplans/tutorial2/ActionTriggers.csv   | 3 +++
 data/tariffplans/tutorial2/Actions.csv          | 8 ++++++++
 data/tariffplans/tutorial2/DestinationRates.csv | 1 +
 data/tariffplans/tutorial2/Destinations.csv     | 1 +
 data/tariffplans/tutorial2/Rates.csv            | 1 +
 data/tariffplans/tutorial2/RatingPlans.csv      | 1 +
 data/tariffplans/tutorial2/RatingProfiles.csv   | 3 ++-
 data/tariffplans/tutorial2/Timings.csv          | 3 ++-
 engine/models.go                                | 2 +-
 11 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 data/tariffplans/tutorial2/AccountActions.csv
 create mode 100644 data/tariffplans/tutorial2/ActionPlans.csv
 create mode 100644 data/tariffplans/tutorial2/ActionTriggers.csv
 create mode 100644 data/tariffplans/tutorial2/Actions.csv

diff --git a/data/tariffplans/tutorial2/AccountActions.csv b/data/tariffplans/tutorial2/AccountActions.csv
new file mode 100644
index 000000000..54ebd6e14
--- /dev/null
+++ b/data/tariffplans/tutorial2/AccountActions.csv
@@ -0,0 +1,2 @@
+#Tenant,Account,ActionPlanID,ActionTriggersID,AllowNegative,Disabled
+cgrates.org,1001,STANDARD_PLAN,STANDARD_TRIGGERS,,
diff --git a/data/tariffplans/tutorial2/ActionPlans.csv b/data/tariffplans/tutorial2/ActionPlans.csv
new file mode 100644
index 000000000..ce9990901
--- /dev/null
+++ b/data/tariffplans/tutorial2/ActionPlans.csv
@@ -0,0 +1,7 @@
+#Id,ActionsId,TimingId,Weight
+STANDARD_PLAN,TOPUP_RST_MONETARY_10,*asap,10
+STANDARD_PLAN,TOPUP_RST_5M_VOICE,*asap,10
+STANDARD_PLAN,TOPUP_RST_10M_VOICE,*asap,10
+STANDARD_PLAN,TOPUP_RST_100_SMS,*asap,10
+STANDARD_PLAN,TOPUP_RST_1024_DATA,*asap,10
+STANDARD_PLAN,TOPUP_RST_1024_DATA,TM_NOON,10
\ No newline at end of file
diff --git a/data/tariffplans/tutorial2/ActionTriggers.csv b/data/tariffplans/tutorial2/ActionTriggers.csv
new file mode 100644
index 000000000..97824cc7a
--- /dev/null
+++ b/data/tariffplans/tutorial2/ActionTriggers.csv
@@ -0,0 +1,3 @@
+#ID[0],UniqueID[1],ThresholdType[2],ThresholdValue[3],Recurrent[4],MinSleep[5],ExpiryTime[6],ActivationTime[7],BalanceTag[8],BalanceType[9],BalanceCategories[10],BalanceDestinationIDs[11],BalanceRatingSubject[12],BalanceSharedGroup[13],BalanceExpiryTime[14],BalanceTimingIDs[15],BalanceWeight[16],BalanceBlocker[17],BalanceDisabled[18],ActionsID[19],Weight[20]
+STANDARD_TRIGGERS,,*min_balance,2,,,,,,*monetary,,,,,,,,,,LOG_WARNING,10
+STANDARD_TRIGGERS,,*max_balance,100,,,,,,*monetary,,,,,,,,,,DISABLE_ACCOUNT,10
\ No newline at end of file
diff --git a/data/tariffplans/tutorial2/Actions.csv b/data/tariffplans/tutorial2/Actions.csv
new file mode 100644
index 000000000..a36b87f1f
--- /dev/null
+++ b/data/tariffplans/tutorial2/Actions.csv
@@ -0,0 +1,8 @@
+#ActionsId[0],Action[1],ExtraParameters[2],Filter[3],BalanceId[4],BalanceType[5],Categories[6],DestinationIds[7],RatingSubject[8],SharedGroup[9],ExpiryTime[10],TimingIds[11],Units[12],BalanceWeight[13],BalanceBlocker[14],BalanceDisabled[15],Weight[16]
+TOPUP_RST_MONETARY_10,*topup_reset,,,*default,*monetary,,,,,,,10,10,,,10
+TOPUP_RST_5M_VOICE,*topup_reset,,,,*voice,,DST_10,RPF_SPECIAL_BLC,,,,5m,30,,,10
+TOPUP_RST_10M_VOICE,*topup_reset,,,,*voice,,DST_10,*zero1m,,,,10m,20,,,10
+TOPUP_RST_100_SMS,*topup_reset,,,,*sms,,DST_50,,,,,100,20,,,10
+TOPUP_RST_1024_DATA,*topup_reset,,,,*data,,,,,,,1024,20,,,10
+LOG_WARNING,*log,,,,,,,,,,,,,,,10
+DISABLE_ACCOUNT,*disable_account,,,,,,,,,,,,,,,10
\ No newline at end of file
diff --git a/data/tariffplans/tutorial2/DestinationRates.csv b/data/tariffplans/tutorial2/DestinationRates.csv
index 5ea2be959..61363bb15 100644
--- a/data/tariffplans/tutorial2/DestinationRates.csv
+++ b/data/tariffplans/tutorial2/DestinationRates.csv
@@ -5,6 +5,7 @@ DR_2030_120C,DST_2030,RT_120C,*up,4,,
 DR_20_60C,DST_20,RT_60C,*up,4,,
 DR_VOICEMAIL_FREE,DST_VOICEMAIL,RT_0,*up,4,,
 DR_1002_60C,DST_1002,RT_60C,*up,4,,
+DR_ANY_10C_CN,*any,RT_10C_CN,*up,4,,
 DR_ANY_1024_1,*any,RT_1024_1,*up,4,,
 DR_1002_10C1,DST_1002,RT_10C1,*up,4,,
 DR_10_20C1,DST_10,RT_20C1,*up,4,,
\ No newline at end of file
diff --git a/data/tariffplans/tutorial2/Destinations.csv b/data/tariffplans/tutorial2/Destinations.csv
index 26f6e6c44..fe08093df 100644
--- a/data/tariffplans/tutorial2/Destinations.csv
+++ b/data/tariffplans/tutorial2/Destinations.csv
@@ -5,3 +5,4 @@ DST_2030,20
 DST_2030,30
 DST_VOICEMAIL,voicemail
 DST_1002,1002
+DST_50,50
diff --git a/data/tariffplans/tutorial2/Rates.csv b/data/tariffplans/tutorial2/Rates.csv
index bc23aa4df..21ad729a4 100644
--- a/data/tariffplans/tutorial2/Rates.csv
+++ b/data/tariffplans/tutorial2/Rates.csv
@@ -3,6 +3,7 @@ RT_120C,0.2,1.2,1m,1m,0
 RT_120C,,1.2,1m,1s,1m
 RT_60C,0.1,0.01,1s,1s,0
 RT_0,0,0,1m,1m,0
+RT_10C_CN,0.1,0,0,1s,0
 RT_1024_1,0,1,1024,1024,0
 RT_10C1,0,0.1,1,1,0
 RT_20C1,0,0.2,1,1,0
\ No newline at end of file
diff --git a/data/tariffplans/tutorial2/RatingPlans.csv b/data/tariffplans/tutorial2/RatingPlans.csv
index d8500a18d..e327735d8 100644
--- a/data/tariffplans/tutorial2/RatingPlans.csv
+++ b/data/tariffplans/tutorial2/RatingPlans.csv
@@ -7,6 +7,7 @@ RP_STANDARD,DR_2030_120C,*any,10
 RP_STANDARD,DR_20_60C,NEW_YEAR,20
 RP_STANDARD,DR_VOICEMAIL_FREE,*any,10
 RP_1001,DR_1002_60C,*any,10
+RP_SPECIAL_BLC,DR_ANY_10C_CN,*any,10
 RP_DATA,DR_ANY_1024_1,*any,10
 RP_SMS,DR_1002_10C1,*any,10
 RP_SMS,DR_10_20C1,*any,10
\ No newline at end of file
diff --git a/data/tariffplans/tutorial2/RatingProfiles.csv b/data/tariffplans/tutorial2/RatingProfiles.csv
index 144307a66..61ad4c04a 100644
--- a/data/tariffplans/tutorial2/RatingProfiles.csv
+++ b/data/tariffplans/tutorial2/RatingProfiles.csv
@@ -1,5 +1,6 @@
 #Tenant,Category,Subject,ActivationTime,RatingPlanID,FallbackSubject
 cgrates.org,call,*any,2019-03-01T00:00:00Z,RP_STANDARD,
 cgrates.org,call,1001,2019-03-01T00:00:00Z,RP_1001,*any
+cgrates.org,call,RPF_SPECIAL_BLC,2019-03-01T00:00:00Z,RP_SPECIAL_BLC,
 cgrates.org,data,*any,2019-03-01T00:00:00Z,RP_DATA,
-cgrates.org,sms,*any,2019-03-01T00:00:00Z,RP_SMS,
\ No newline at end of file
+cgrates.org,sms,*any,2019-03-01T00:00:00Z,RP_SMS,
diff --git a/data/tariffplans/tutorial2/Timings.csv b/data/tariffplans/tutorial2/Timings.csv
index f5aec3adb..b0b113a1f 100644
--- a/data/tariffplans/tutorial2/Timings.csv
+++ b/data/tariffplans/tutorial2/Timings.csv
@@ -3,4 +3,5 @@ PEAK,*any,*any,*any,1;2;3;4;5,08:00:00
 OFFPEAK_MORNING,*any,*any,*any,1;2;3;4;5,00:00:00
 OFFPEAK_EVENING,*any,*any,*any,1;2;3;4;5,19:00:00
 OFFPEAK_WEEKEND,*any,*any,*any,6;7,00:00:00
-NEW_YEAR,*any,1,1,*any,00:00:00
\ No newline at end of file
+NEW_YEAR,*any,1,1,*any,00:00:00
+TM_NOON,*any,*any,*any,*any,12:00:00
\ No newline at end of file
diff --git a/engine/models.go b/engine/models.go
index ed7421b8d..a6e08000d 100644
--- a/engine/models.go
+++ b/engine/models.go
@@ -154,7 +154,7 @@ type TpActionTrigger struct {
 	UniqueId               string  `index:"1" re:"\w+"`
 	ThresholdType          string  `index:"2" re:"\*\w+"`
 	ThresholdValue         float64 `index:"3" re:"\d+\.?\d*"`
-	Recurrent              bool    `index:"4" re:"true|false"`
+	Recurrent              bool    `index:"4" re:"true|false|"`
 	MinSleep               string  `index:"5" re:"\d+[smh]?"`
 	ExpiryTime             string  `index:"6" re:""`
 	ActivationTime         string  `index:"7" re:""`