WIP on notification resolver

PlexRequests.Core.Tests/AuthenticationSettingsTests.cs

@@ -38,12 +38,13 @@ namespace PlexRequests.Core.Tests
     public class NotificationMessageResolverTests
     {
         [TestCaseSource(nameof(MessageResolver))]
-        public string Resolve(Dictionary<NotificationType, string> message, Dictionary<string,string> param)
+        [Ignore("WIP")]
+        public NotificationMessageResolution Resolve(Dictionary<NotificationType, string> body, Dictionary<string,string> param)
         {
             var n = new NotificationMessageResolver();
             var s = new NotificationSettings
             {
-                Message = message,
+                Message = body,
                 CustomParamaters = param
             };
 

PlexRequests.Core/NotificationMessageResolution.cs

@@ -0,0 +1,34 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: NotificationMessageResolution.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
+{
+    public class NotificationMessageResolution
+    {
+        public string Subject { get; set; }
+        public string Body { get; set; }
+    }
+}

PlexRequests.Core/NotificationMessageResolver.cs

@@ -36,30 +36,41 @@ namespace PlexRequests.Core
     {
         private const char StartChar = (char)123;
         private const char EndChar = (char)125;
-        public string ParseMessage<T>(T notification, NotificationType type) where T : NotificationSettings
+        public NotificationMessageResolution 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;
+            var bodyToParse = notification.Message.FirstOrDefault(x => x.Key == type).Value;
+            var subjectToParse = notification.Subject.FirstOrDefault(x => x.Key == type).Value;
+            //if (string.IsNullOrEmpty(notificationToParse))
+            //    return string.Empty;
 
-            return Resolve(notificationToParse, notification.CustomParamaters);
+            return Resolve(bodyToParse, subjectToParse, notification.CustomParamaters);
         }
 
-        private string Resolve(string message, Dictionary<string,string> paramaters)
+        private NotificationMessageResolution Resolve(string body, string subject, Dictionary<string, string> paramaters)
         {
-            var fields = FindCurlyFields(message);
 
+            var bodyFields = FindCurlyFields(body);
+            var subjectFields = FindCurlyFields(subject);
 
-            foreach (var f in fields)
+            foreach (var f in bodyFields)
             {
                 string outString;
                 if (paramaters.TryGetValue(f, out outString))
                 {
-                    message = message.Replace($"{{{f}}}", outString);
+                    body = body.Replace($"{{{f}}}", outString);
                 }
             }
 
-            return message;
+            foreach (var s in subjectFields)
+            {
+                string outString;
+                if (paramaters.TryGetValue(s, out outString))
+                {
+                    subject = subject.Replace($"{{{s}}}", outString);
+                }
+            }
+
+            return new NotificationMessageResolution { Body = body, Subject = subject };
         }
 
         private IEnumerable<string> FindCurlyFields(string message)

PlexRequests.Core/PlexRequests.Core.csproj

@@ -71,6 +71,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CacheKeys.cs" />
+    <Compile Include="NotificationMessageResolution.cs" />
     <Compile Include="NotificationMessageResolver.cs" />
     <Compile Include="IIssueService.cs" />
     <Compile Include="IRequestService.cs" />

PlexRequests.Core/SettingModels/NotificationSettings.cs

@@ -32,7 +32,20 @@ namespace PlexRequests.Core.SettingModels
 {
     public class NotificationSettings : Settings
     {
+        public NotificationSettings()
+        {
+            CustomParamaters = new Dictionary<string, string>
+            {
+                {"Username", string.Empty },
+                {"Date", string.Empty },
+                {"Title", string.Empty },
+                {"RequestType", string.Empty },
+                {"Issue", string.Empty },
+               
+            };
+        }
         public Dictionary<NotificationType, string> Message { get; set; }
+        public Dictionary<NotificationType, string> Subject { get; set; }
         public Dictionary<string,string> CustomParamaters { get; set; }
     }
 }