Added some of the backend bits for #182

PlexRequests.Core.Tests/AuthenticationSettingsTests.cs

@@ -24,36 +24,68 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+using System;
+using System.Collections.Generic;
+
 using NUnit.Framework;
 
+using PlexRequests.Core.Models;
 using PlexRequests.Core.SettingModels;
 
 namespace PlexRequests.Core.Tests
 {
     [TestFixture]
-    public class AuthenticationSettingsTests
+    public class NotificationMessageResolverTests
     {
-        [Test, TestCaseSource(nameof(UserData))]
+        [TestCaseSource(nameof(MessageResolver))]
-        public void DeniedUserListTest(string users, string[] expected)
+        public string Resolve(Dictionary<NotificationType, string> message, Dictionary<string,string> param)
         {
-            var model = new AuthenticationSettings { DeniedUsers = users };
+            var n = new NotificationMessageResolver();
-
+            var s = new NotificationSettings
-            var result = model.DeniedUserList;
-
-            Assert.That(result.Count, Is.EqualTo(expected.Length));
-            for (var i = 0; i < expected.Length; i++)
             {
-                Assert.That(result[i], Is.EqualTo(expected[i]));
+                Message = message,
-            }
+                CustomParamaters = param
-        }
-
-        static readonly object[] UserData =
-        {
-            new object[] { "john", new [] {"john"} },
-            new object[] { "john , abc   ,", new [] {"john", "abc"} },
-            new object[] { "john,, cde", new [] {"john", "cde"} },
-            new object[] { "john,,, aaa , baaa  ,       ", new [] {"john","aaa","baaa"} },
-            new object[] { "john, aaa , baaa  ,       maaa, caaa", new [] {"john","aaa","baaa", "maaa", "caaa"} },
             };
+
+            return n.ParseMessage(s, NotificationType.NewRequest);
+        }
+
+        private static IEnumerable<TestCaseData> MessageResolver
+        {
+            get
+            {
+                yield return new TestCaseData(
+                    new Dictionary<NotificationType, string> { { NotificationType.NewRequest, "There has been a new request from {Username}, Title: {Title} for {Type}" } },
+                    new Dictionary<string, string>{{"Username", "Jamie" },{"Title", "Finding Dory" },{"Type", "Movie" }})
+                    .Returns("There has been a new request from Jamie, Title: Finding Dory for Movie")
+                    .SetName("FindingDory");
+
+                yield return new TestCaseData(
+                     new Dictionary<NotificationType, string> { { NotificationType.NewRequest, string.Empty } },
+                     new Dictionary<string, string>())
+                     .Returns(string.Empty)
+                     .SetName("Empty Message");
+
+                yield return new TestCaseData(
+                    new Dictionary<NotificationType, string> { { NotificationType.NewRequest, "{{Wowwzer}} Damn}{{son}}}}" } },
+                    new Dictionary<string, string> { {"son","HEY!"} })
+                    .Returns("{{Wowwzer}} Damn}{HEY!}}}")
+                    .SetName("Multiple Curlys");
+
+
+                yield return new TestCaseData(
+                    new Dictionary<NotificationType, string> { { NotificationType.NewRequest, "This is a message with no curlys" } },
+                    new Dictionary<string, string> { { "son", "HEY!" } })
+                    .Returns("This is a message with no curlys")
+                    .SetName("No Curlys");
+
+                yield return new TestCaseData(
+                    new Dictionary<NotificationType, string> { { NotificationType.NewRequest, new string(')', 5000)} },
+                    new Dictionary<string, string> { { "son", "HEY!" } })
+                    .Returns(new string(')', 5000))
+                    .SetName("Long String");
+            }
+        }
+
     }
 }

PlexRequests.Core.Tests/NotificationMessageResolverTests.cs

@@ -0,0 +1,59 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: AuthenticationSettingsTests.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 NUnit.Framework;
+
+using PlexRequests.Core.SettingModels;
+
+namespace PlexRequests.Core.Tests
+{
+    [TestFixture]
+    public class AuthenticationSettingsTests
+    {
+        [Test, TestCaseSource(nameof(UserData))]
+        public void DeniedUserListTest(string users, string[] expected)
+        {
+            var model = new AuthenticationSettings { DeniedUsers = users };
+
+            var result = model.DeniedUserList;
+
+            Assert.That(result.Count, Is.EqualTo(expected.Length));
+            for (var i = 0; i < expected.Length; i++)
+            {
+                Assert.That(result[i], Is.EqualTo(expected[i]));
+            }
+        }
+
+        static readonly object[] UserData =
+        {
+            new object[] { "john", new [] {"john"} },
+            new object[] { "john , abc   ,", new [] {"john", "abc"} },
+            new object[] { "john,, cde", new [] {"john", "cde"} },
+            new object[] { "john,,, aaa , baaa  ,       ", new [] {"john","aaa","baaa"} },
+            new object[] { "john, aaa , baaa  ,       maaa, caaa", new [] {"john","aaa","baaa", "maaa", "caaa"} },
+        };
+    }
+}

PlexRequests.Core.Tests/PlexRequests.Core.Tests.csproj

@@ -59,6 +59,7 @@
     <Otherwise />
   </Choose>
   <ItemGroup>
+    <Compile Include="NotificationMessageResolverTests.cs" />
     <Compile Include="StatusCheckerTests.cs" />
     <Compile Include="AuthenticationSettingsTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

PlexRequests.Core/Models/NotificationType.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Services.Notification
+namespace PlexRequests.Core.Models
 {
     public enum NotificationType
     {

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

@@ -26,7 +26,7 @@
 #endregion
 namespace PlexRequests.Core.SettingModels
 {
-    public class EmailNotificationSettings : Settings
+    public class EmailNotificationSettings : NotificationSettings
     {
         public string EmailHost { get; set; }
         public string EmailPassword { 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,6 +1,6 @@
 namespace PlexRequests.Core.SettingModels
 {
-    public class PushbulletNotificationSettings : Settings
+    public class PushbulletNotificationSettings : NotificationSettings
     {
         public bool Enabled { get; set; }
         public string AccessToken { get; set; }

PlexRequests.Core/SettingModels/PushoverNotificationSettings.cs

@@ -1,6 +1,6 @@
 namespace PlexRequests.Core.SettingModels
 {
-    public class PushoverNotificationSettings : Settings
+    public class PushoverNotificationSettings : NotificationSettings
     {
         public bool Enabled { get; set; }
         public string AccessToken { 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; }

PlexRequests.Services/Jobs/PlexAvailabilityChecker.cs

@@ -33,6 +33,7 @@ using NLog;
 using PlexRequests.Api.Interfaces;
 using PlexRequests.Api.Models.Plex;
 using PlexRequests.Core;
+using PlexRequests.Core.Models;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Helpers;
 using PlexRequests.Helpers.Analytics;

PlexRequests.Services/Notification/EmailMessageNotification.cs

@@ -33,6 +33,7 @@ using MimeKit;
 using NLog;
 
 using PlexRequests.Core;
+using PlexRequests.Core.Models;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Services.Interfaces;
 using SmtpClient = MailKit.Net.Smtp.SmtpClient;

PlexRequests.Services/Notification/NotificationModel.cs

@@ -27,6 +27,8 @@
 using PlexRequests.Store;
 using System;
 
+using PlexRequests.Core.Models;
+
 namespace PlexRequests.Services.Notification
 {
     public class NotificationModel

PlexRequests.Services/Notification/PushbulletNotification.cs

@@ -31,6 +31,7 @@ using NLog;
 
 using PlexRequests.Api.Interfaces;
 using PlexRequests.Core;
+using PlexRequests.Core.Models;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Services.Interfaces;
 using PlexRequests.Store;

PlexRequests.Services/Notification/PushoverNotification.cs

@@ -31,6 +31,7 @@ using NLog;
 
 using PlexRequests.Api.Interfaces;
 using PlexRequests.Core;
+using PlexRequests.Core.Models;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Services.Interfaces;
 using PlexRequests.Store;

PlexRequests.Services/Notification/SlackNotification.cs

@@ -32,6 +32,7 @@ using NLog;
 using PlexRequests.Api.Interfaces;
 using PlexRequests.Api.Models.Notifications;
 using PlexRequests.Core;
+using PlexRequests.Core.Models;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Services.Interfaces;
 

PlexRequests.Services/PlexRequests.Services.csproj

@@ -93,7 +93,6 @@
     <Compile Include="Notification\EmailMessageNotification.cs" />
     <Compile Include="Notification\NotificationModel.cs" />
     <Compile Include="Notification\NotificationService.cs" />
-    <Compile Include="Notification\NotificationType.cs" />
     <Compile Include="Notification\PushoverNotification.cs" />
     <Compile Include="Notification\PushbulletNotification.cs" />
     <Compile Include="Notification\SlackNotification.cs" />

PlexRequests.UI/Modules/AdminModule.cs

@@ -51,6 +51,7 @@ using Nancy.Responses;
 using PlexRequests.Api;
 using PlexRequests.Api.Interfaces;
 using PlexRequests.Core;
+using PlexRequests.Core.Models;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Helpers;
 using PlexRequests.Helpers.Analytics;

PlexRequests.UI/Modules/RequestsModule.cs

@@ -46,6 +46,8 @@ using System.Threading.Tasks;
 
 using NLog;
 
+using PlexRequests.Core.Models;
+
 namespace PlexRequests.UI.Modules
 {
     public class RequestsModule : BaseAuthModule