Added alert type enum

Ahmad Noman Musleh · Ahmad Noman Musleh · commit 51f6b02f653b · 2020-08-16T10:57:20.000+03:00
diff --git a/src/Alert/Alert.csproj b/src/Alert/Alert.csproj
@@ -88,6 +88,7 @@
     <Compile Include="Behaviors\ScrollToItemBehavior.cs" />
     <Compile Include="Converters\EnumToDescription.cs" />
     <Compile Include="Converters\EnumToInt.cs" />
+    <Compile Include="Enums\AlertType.cs" />
     <Compile Include="Enums\DataGridColumnSettingsType.cs" />
     <Compile Include="Enums\TimeFormat.cs" />
     <Compile Include="Events\AlertAddedEvent.cs" />
diff --git a/src/Alert/Enums/AlertType.cs b/src/Alert/Enums/AlertType.cs
@@ -0,0 +1,9 @@
+﻿namespace cAlgo.API.Alert.Enums
+{
+    public enum AlertType
+    {
+        None,
+        Triggers,
+        Popup
+    }
+}
diff --git a/src/Alert/INotificationsExtensions.cs b/src/Alert/INotificationsExtensions.cs
@@ -1,6 +1,7 @@
 ﻿using cAlgo.API.Alert.Models;
 using cAlgo.API.Internals;
 using System;
+using cAlgo.API.Alert.Enums;
 
 namespace cAlgo.API.Alert
 {
@@ -23,47 +24,57 @@ public static void ShowPopup(this INotifications notifications, TimeFrame timeFr
             ShowPopup(notifications, timeFrame, symbol, type, string.Empty);
         }
 
-        public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, TradeType type, string triggeredBy)
+        public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, TradeType type,
+            string triggeredBy)
         {
             ShowPopup(notifications, timeFrame, symbol, type, triggeredBy, symbol.Bid);
         }
 
-        public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, string type, string triggeredBy)
+        public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, string type,
+            string triggeredBy)
         {
             ShowPopup(notifications, timeFrame, symbol, type, triggeredBy, symbol.Bid);
         }
 
-        public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, TradeType type, string triggeredBy, double price)
+        public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, TradeType type,
+            string triggeredBy, double price)
         {
             ShowPopup(notifications, timeFrame, symbol, type, triggeredBy, price, string.Empty);
         }
 
-        public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, string type, string triggeredBy, double price)
+        public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, string type,
+            string triggeredBy, double price)
         {
             ShowPopup(notifications, timeFrame, symbol, type, triggeredBy, price, string.Empty);
         }
 
-        public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, TradeType type, string triggeredBy, double price, string comment)
+        public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, TradeType type,
+            string triggeredBy, double price, string comment)
         {
             ShowPopup(notifications, timeFrame, symbol, type, triggeredBy, price, comment, DateTimeOffset.Now);
         }
 
-        public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, string type, string triggeredBy, double price, string comment)
+        public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, string type,
+            string triggeredBy, double price, string comment)
         {
             ShowPopup(notifications, timeFrame, symbol, type, triggeredBy, price, comment, DateTimeOffset.Now);
         }
 
-        public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, TradeType type, string triggeredBy, double price, string comment, DateTimeOffset time)
+        public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, TradeType type,
+            string triggeredBy, double price, string comment, DateTimeOffset time)
         {
-            ShowPopup(notifications, timeFrame.ToString(), symbol.Name.ToString(), type.ToString(), triggeredBy, price, comment, time);
+            ShowPopup(notifications, timeFrame.ToString(), symbol.Name.ToString(), type.ToString(), triggeredBy, price, comment,
+                time);
         }
 
-        public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, string type, string triggeredBy, double price, string comment, DateTimeOffset time)
+        public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, string type,
+            string triggeredBy, double price, string comment, DateTimeOffset time)
         {
             ShowPopup(notifications, timeFrame.ToString(), symbol.Name.ToString(), type, triggeredBy, price, comment, time);
         }
 
-        public static void ShowPopup(this INotifications notifications, string timeFrame, string symbol, string type, string triggeredBy, double price, string comment, DateTimeOffset time)
+        public static void ShowPopup(this INotifications notifications, string timeFrame, string symbol, string type,
+            string triggeredBy, double price, string comment, DateTimeOffset time)
         {
             AlertModel alert = new AlertModel
             {
@@ -81,12 +92,12 @@ public static void ShowPopup(this INotifications notifications, string timeFrame
 
         public static void ShowPopup(this INotifications notifications, AlertModel alert)
         {
-            Launcher.Launch(notifications, alert);
+            Launcher.Launch(notifications, alert, AlertType.Popup);
         }
 
         public static void TriggerAlert(this INotifications notifications, AlertModel alert)
         {
-            Launcher.Launch(notifications, alert, showPopup: false);
+            Launcher.Launch(notifications, alert, AlertType.Triggers);
         }
 
         #endregion Methods
diff --git a/src/Alert/Launcher.cs b/src/Alert/Launcher.cs
@@ -1,4 +1,5 @@
-﻿using cAlgo.API.Alert.Events;
+﻿using cAlgo.API.Alert.Enums;
+using cAlgo.API.Alert.Events;
 using cAlgo.API.Alert.Factories;
 using cAlgo.API.Alert.Models;
 using cAlgo.API.Alert.Utility;
@@ -41,22 +42,22 @@ static Launcher()
 
         #region Methods
 
-        public static void Launch(INotifications notifications, AlertModel alert, bool triggerAlerts = true, bool showPopup = true)
+        public static void Launch(INotifications notifications, AlertModel alert, AlertType alertType)
         {
             UpdateAlerts();
 
             DataManager.AddAlerts(alert);
 
             _alerts.Add(alert);
 
-            SettingsModel settings = SettingsFactory.GetSettings(Configuration.Current.SettingsFilePath);
+            var settings = SettingsFactory.GetSettings(Configuration.Current.SettingsFilePath);
 
-            if (triggerAlerts)
+            if (alertType == AlertType.Triggers || alertType == AlertType.Popup)
             {
                 TriggerAlerts(notifications, settings, alert);
             }
 
-            if (showPopup)
+            if (alertType == AlertType.Popup)
             {
                 ShowPopup(alert);
             }
@@ -85,15 +86,18 @@ private static void PlaySound(string path)
 
         private static string PutObjectInTemplate(object obj, string template)
         {
-            Dictionary<string, object> properties = obj.GetType().GetProperties().Where(iProperty => iProperty.GetValue(obj) != null)
+            Dictionary<string, object> properties = obj.GetType().GetProperties()
+                .Where(iProperty => iProperty.GetValue(obj) != null)
                 .ToDictionary(propertyInfo => propertyInfo.Name,
                 propertyInfo => propertyInfo.GetValue(obj));
 
             foreach (string keyword in _templateKeywords)
             {
                 string propertyName = RemoveKeywordBrackets(keyword);
 
-                template = template.Replace(keyword, properties.ContainsKey(propertyName) ? properties[propertyName].ToString() : string.Empty);
+                template = template.Replace(keyword, properties.ContainsKey(propertyName) 
+                    ? properties[propertyName].ToString() 
+                    : string.Empty);
             }
 
             return template;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using cAlgo.API.Alert.Models;`
`2`	`2`	`using cAlgo.API.Internals;`
`3`	`3`	`using System;`
	`4`	`+using cAlgo.API.Alert.Enums;`
`4`	`5`
`5`	`6`	`namespace cAlgo.API.Alert`
`6`	`7`	`{`
`@@ -23,47 +24,57 @@ public static void ShowPopup(this INotifications notifications, TimeFrame timeFr`
`23`	`24`	`ShowPopup(notifications, timeFrame, symbol, type, string.Empty);`
`24`	`25`	`}`
`25`	`26`
`26`		`- public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, TradeType type, string triggeredBy)`
	`27`	`+ public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, TradeType type,`
	`28`	`+ string triggeredBy)`
`27`	`29`	`{`
`28`	`30`	`ShowPopup(notifications, timeFrame, symbol, type, triggeredBy, symbol.Bid);`
`29`	`31`	`}`
`30`	`32`
`31`		`- public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, string type, string triggeredBy)`
	`33`	`+ public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, string type,`
	`34`	`+ string triggeredBy)`
`32`	`35`	`{`
`33`	`36`	`ShowPopup(notifications, timeFrame, symbol, type, triggeredBy, symbol.Bid);`
`34`	`37`	`}`
`35`	`38`
`36`		`- public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, TradeType type, string triggeredBy, double price)`
	`39`	`+ public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, TradeType type,`
	`40`	`+ string triggeredBy, double price)`
`37`	`41`	`{`
`38`	`42`	`ShowPopup(notifications, timeFrame, symbol, type, triggeredBy, price, string.Empty);`
`39`	`43`	`}`
`40`	`44`
`41`		`- public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, string type, string triggeredBy, double price)`
	`45`	`+ public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, string type,`
	`46`	`+ string triggeredBy, double price)`
`42`	`47`	`{`
`43`	`48`	`ShowPopup(notifications, timeFrame, symbol, type, triggeredBy, price, string.Empty);`
`44`	`49`	`}`
`45`	`50`
`46`		`- public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, TradeType type, string triggeredBy, double price, string comment)`
	`51`	`+ public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, TradeType type,`
	`52`	`+ string triggeredBy, double price, string comment)`
`47`	`53`	`{`
`48`	`54`	`ShowPopup(notifications, timeFrame, symbol, type, triggeredBy, price, comment, DateTimeOffset.Now);`
`49`	`55`	`}`
`50`	`56`
`51`		`- public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, string type, string triggeredBy, double price, string comment)`
	`57`	`+ public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, string type,`
	`58`	`+ string triggeredBy, double price, string comment)`
`52`	`59`	`{`
`53`	`60`	`ShowPopup(notifications, timeFrame, symbol, type, triggeredBy, price, comment, DateTimeOffset.Now);`
`54`	`61`	`}`
`55`	`62`
`56`		`- public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, TradeType type, string triggeredBy, double price, string comment, DateTimeOffset time)`
	`63`	`+ public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, TradeType type,`
	`64`	`+ string triggeredBy, double price, string comment, DateTimeOffset time)`
`57`	`65`	`{`
`58`		`- ShowPopup(notifications, timeFrame.ToString(), symbol.Name.ToString(), type.ToString(), triggeredBy, price, comment, time);`
	`66`	`+ ShowPopup(notifications, timeFrame.ToString(), symbol.Name.ToString(), type.ToString(), triggeredBy, price, comment,`
	`67`	`+ time);`
`59`	`68`	`}`
`60`	`69`
`61`		`- public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, string type, string triggeredBy, double price, string comment, DateTimeOffset time)`
	`70`	`+ public static void ShowPopup(this INotifications notifications, TimeFrame timeFrame, Symbol symbol, string type,`
	`71`	`+ string triggeredBy, double price, string comment, DateTimeOffset time)`
`62`	`72`	`{`
`63`	`73`	`ShowPopup(notifications, timeFrame.ToString(), symbol.Name.ToString(), type, triggeredBy, price, comment, time);`
`64`	`74`	`}`
`65`	`75`
`66`		`- public static void ShowPopup(this INotifications notifications, string timeFrame, string symbol, string type, string triggeredBy, double price, string comment, DateTimeOffset time)`
	`76`	`+ public static void ShowPopup(this INotifications notifications, string timeFrame, string symbol, string type,`
	`77`	`+ string triggeredBy, double price, string comment, DateTimeOffset time)`
`67`	`78`	`{`
`68`	`79`	`AlertModel alert = new AlertModel`
`69`	`80`	`{`
`@@ -81,12 +92,12 @@ public static void ShowPopup(this INotifications notifications, string timeFrame`
`81`	`92`
`82`	`93`	`public static void ShowPopup(this INotifications notifications, AlertModel alert)`
`83`	`94`	`{`
`84`		`- Launcher.Launch(notifications, alert);`
	`95`	`+ Launcher.Launch(notifications, alert, AlertType.Popup);`
`85`	`96`	`}`
`86`	`97`
`87`	`98`	`public static void TriggerAlert(this INotifications notifications, AlertModel alert)`
`88`	`99`	`{`
`89`		`- Launcher.Launch(notifications, alert, showPopup: false);`
	`100`	`+ Launcher.Launch(notifications, alert, AlertType.Triggers);`
`90`	`101`	`}`
`91`	`102`
`92`	`103`	`#endregion Methods`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using cAlgo.API.Alert.Events;`
	`1`	`+using cAlgo.API.Alert.Enums;`
	`2`	`+using cAlgo.API.Alert.Events;`
`2`	`3`	`using cAlgo.API.Alert.Factories;`
`3`	`4`	`using cAlgo.API.Alert.Models;`
`4`	`5`	`using cAlgo.API.Alert.Utility;`
`@@ -41,22 +42,22 @@ static Launcher()`
`41`	`42`
`42`	`43`	`#region Methods`
`43`	`44`
`44`		`- public static void Launch(INotifications notifications, AlertModel alert, bool triggerAlerts = true, bool showPopup = true)`
	`45`	`+ public static void Launch(INotifications notifications, AlertModel alert, AlertType alertType)`
`45`	`46`	`{`
`46`	`47`	`UpdateAlerts();`
`47`	`48`
`48`	`49`	`DataManager.AddAlerts(alert);`
`49`	`50`
`50`	`51`	`_alerts.Add(alert);`
`51`	`52`
`52`		`- SettingsModel settings = SettingsFactory.GetSettings(Configuration.Current.SettingsFilePath);`
	`53`	`+ var settings = SettingsFactory.GetSettings(Configuration.Current.SettingsFilePath);`
`53`	`54`
`54`		`- if (triggerAlerts)`
	`55`	`+ if (alertType == AlertType.Triggers \|\| alertType == AlertType.Popup)`
`55`	`56`	`{`
`56`	`57`	`TriggerAlerts(notifications, settings, alert);`
`57`	`58`	`}`
`58`	`59`
`59`		`- if (showPopup)`
	`60`	`+ if (alertType == AlertType.Popup)`
`60`	`61`	`{`
`61`	`62`	`ShowPopup(alert);`
`62`	`63`	`}`
`@@ -85,15 +86,18 @@ private static void PlaySound(string path)`
`85`	`86`
`86`	`87`	`private static string PutObjectInTemplate(object obj, string template)`
`87`	`88`	`{`
`88`		`- Dictionary<string, object> properties = obj.GetType().GetProperties().Where(iProperty => iProperty.GetValue(obj) != null)`
	`89`	`+ Dictionary<string, object> properties = obj.GetType().GetProperties()`
	`90`	`+ .Where(iProperty => iProperty.GetValue(obj) != null)`
`89`	`91`	`.ToDictionary(propertyInfo => propertyInfo.Name,`
`90`	`92`	`propertyInfo => propertyInfo.GetValue(obj));`
`91`	`93`
`92`	`94`	`foreach (string keyword in _templateKeywords)`
`93`	`95`	`{`
`94`	`96`	`string propertyName = RemoveKeywordBrackets(keyword);`
`95`	`97`
`96`		`- template = template.Replace(keyword, properties.ContainsKey(propertyName) ? properties[propertyName].ToString() : string.Empty);`
	`98`	`+ template = template.Replace(keyword, properties.ContainsKey(propertyName)`
	`99`	`+ ? properties[propertyName].ToString()`
	`100`	`+ : string.Empty);`
`97`	`101`	`}`
`98`	`102`
`99`	`103`	`return template;`