Added some of the backend bits for #182

PlexRequests.Core/Models/NotificationType.cs

@@ -0,0 +1,39 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: NotificationType.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+//    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//  ************************************************************************/
+#endregion
+namespace PlexRequests.Core.Models
+{
+    public enum NotificationType
+    {
+        NewRequest,
+        Issue,
+        RequestAvailable,
+        RequestApproved,
+        AdminNote,
+        Test,
+
+    }
+}

PlexRequests.Core/NotificationMessageResolver.cs

@@ -0,0 +1,102 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: CustomNotificationService.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+//    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//  ************************************************************************/
+#endregion
+using System.Collections.Generic;
+using System.Linq;
+
+using PlexRequests.Core.Models;
+using PlexRequests.Core.SettingModels;
+
+namespace PlexRequests.Core
+{
+    public class NotificationMessageResolver
+    {
+        public string ParseMessage<T>(T notification, NotificationType type) where T : NotificationSettings
+        {
+            var notificationToParse = notification.Message.FirstOrDefault(x => x.Key == type).Value;
+            if (string.IsNullOrEmpty(notificationToParse))
+                return string.Empty;
+
+            return Resolve(notificationToParse, notification.CustomParamaters);
+        }
+
+        private string Resolve(string message, Dictionary<string,string> paramaters)
+        {
+            var fields = FindCurlyFields(message);
+            
+
+            foreach (var f in fields)
+            {
+                string outString;
+                if (paramaters.TryGetValue(f, out outString))
+                {
+                    message = message.Replace($"{{{f}}}", outString);
+                }
+            }
+
+            return message;
+        }
+
+        private IEnumerable<string> FindCurlyFields(string message)
+        {
+            var insideCurly = false;
+            var fields = new List<string>();
+            var currentWord = string.Empty;
+            var chars = message.ToCharArray();
+
+            foreach (var c in chars)
+            {
+                if (char.IsWhiteSpace(c))
+                {
+                    currentWord = string.Empty;
+                    continue;
+                }
+
+                if (c == 123) // Start of curly '{'
+                {
+                    insideCurly = true;
+                    continue;
+                }
+
+                if (c == 125) // End of curly '}'
+                {
+                    fields.Add(currentWord); // We have finished the curly, add the word into the list
+                    currentWord = string.Empty;
+                    insideCurly = false;
+                    continue;
+                }
+
+                if (insideCurly)
+                {
+                    currentWord += c.ToString(); // Add the character onto the word.
+                }
+
+            }
+
+            return fields;
+        }
+    }
+}

PlexRequests.Core/PlexRequests.Core.csproj

@@ -67,17 +67,20 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CacheKeys.cs" />
+    <Compile Include="NotificationMessageResolver.cs" />
     <Compile Include="IIssueService.cs" />
     <Compile Include="IRequestService.cs" />
     <Compile Include="ISettingsService.cs" />
     <Compile Include="JsonIssuesModelRequestService.cs" />
     <Compile Include="JsonRequestModelRequestService.cs" />
     <Compile Include="Models\IssuesModel.cs" />
+    <Compile Include="Models\NotificationType.cs" />
     <Compile Include="Models\StatusModel.cs" />
     <Compile Include="Models\UserProperties.cs" />
     <Compile Include="SettingModels\AuthenticationSettings.cs" />
     <Compile Include="SettingModels\HeadphonesSettings.cs" />
     <Compile Include="SettingModels\LandingPageSettings.cs" />
+    <Compile Include="SettingModels\NotificationSettings.cs" />
     <Compile Include="SettingModels\ScheduledJobsSettings.cs" />
     <Compile Include="SettingModels\SlackNotificationSettings.cs" />
     <Compile Include="SettingModels\PushoverNotificationSettings.cs" />

PlexRequests.Core/SettingModels/EmailNotificationSettings.cs

@@ -1,40 +1,40 @@
-#region Copyright
-// /************************************************************************
-//    Copyright (c) 2016 Jamie Rees
-//    File: EmailNotificationSettings.cs
-//    Created By: Jamie Rees
-//   
-//    Permission is hereby granted, free of charge, to any person obtaining
-//    a copy of this software and associated documentation files (the
-//    "Software"), to deal in the Software without restriction, including
-//    without limitation the rights to use, copy, modify, merge, publish,
-//    distribute, sublicense, and/or sell copies of the Software, and to
-//    permit persons to whom the Software is furnished to do so, subject to
-//    the following conditions:
-//   
-//    The above copyright notice and this permission notice shall be
-//    included in all copies or substantial portions of the Software.
-//   
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-//    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//  ************************************************************************/
-#endregion
-namespace PlexRequests.Core.SettingModels
-{
-    public class EmailNotificationSettings : Settings
-    {
-        public string EmailHost { get; set; }
-        public string EmailPassword { get; set; }
-        public int EmailPort { get; set; }
-        public string EmailSender { get; set; }
-        public string EmailUsername { get; set; }
-        public bool Enabled { get; set; }
-        public bool EnableUserEmailNotifications { get; set; }
-        public string RecipientEmail { get; set; }
-    }
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: EmailNotificationSettings.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+//    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//  ************************************************************************/
+#endregion
+namespace PlexRequests.Core.SettingModels
+{
+    public class EmailNotificationSettings : NotificationSettings
+    {
+        public string EmailHost { get; set; }
+        public string EmailPassword { get; set; }
+        public int EmailPort { get; set; }
+        public string EmailSender { get; set; }
+        public string EmailUsername { get; set; }
+        public bool Enabled { get; set; }
+        public bool EnableUserEmailNotifications { get; set; }
+        public string RecipientEmail { get; set; }
+    }
 }

PlexRequests.Core/SettingModels/NotificationSettings.cs

@@ -0,0 +1,38 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: NotificationSettings.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+//    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//  ************************************************************************/
+#endregion
+using System.Collections.Generic;
+
+using PlexRequests.Core.Models;
+
+namespace PlexRequests.Core.SettingModels
+{
+    public class NotificationSettings : Settings
+    {
+        public Dictionary<NotificationType, string> Message { get; set; }
+        public Dictionary<string,string> CustomParamaters { get; set; }
+    }
+}

PlexRequests.Core/SettingModels/PushBulletNotificationSettings.cs

@@ -1,9 +1,9 @@
-namespace PlexRequests.Core.SettingModels
-{
-    public class PushbulletNotificationSettings : Settings
-    {
-        public bool Enabled { get; set; }
-        public string AccessToken { get; set; }
-        public string DeviceIdentifier { get; set; }
-    }
+namespace PlexRequests.Core.SettingModels
+{
+    public class PushbulletNotificationSettings : NotificationSettings
+    {
+        public bool Enabled { get; set; }
+        public string AccessToken { get; set; }
+        public string DeviceIdentifier { get; set; }
+    }
 }

PlexRequests.Core/SettingModels/PushoverNotificationSettings.cs

@@ -1,9 +1,9 @@
-namespace PlexRequests.Core.SettingModels
-{
-    public class PushoverNotificationSettings : Settings
-    {
-        public bool Enabled { get; set; }
-        public string AccessToken { get; set; }
-        public string UserToken { get; set; }
-    }
+namespace PlexRequests.Core.SettingModels
+{
+    public class PushoverNotificationSettings : NotificationSettings
+    {
+        public bool Enabled { get; set; }
+        public string AccessToken { get; set; }
+        public string UserToken { get; set; }
+    }
 }

PlexRequests.Core/SettingModels/SlackNotificationSettings.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 
 namespace PlexRequests.Core.SettingModels
 {
-    public class SlackNotificationSettings : Settings
+    public class SlackNotificationSettings : NotificationSettings
     {
         public bool Enabled { get; set; }
         public string WebhookUrl { get; set; }