Corrected user notifications when an incident is being closed.

Author: jgauffin

src/Server/Coderr.Server.App/Core/Accounts/CommandHandlers/RequestPasswordResetHandler.cs

@@ -17,13 +17,13 @@ namespace codeRR.Server.App.Core.Accounts.CommandHandlers
     internal class RequestPasswordResetHandler : IMessageHandler<RequestPasswordReset>
     {
         private readonly IAccountRepository _accountRepository;
+        private readonly BaseConfiguration _baseConfig;
         private readonly ILog _logger = LogManager.GetLogger(typeof(RequestPasswordResetHandler));
-        private ConfigurationStore _configStore;
 
-        public RequestPasswordResetHandler(IAccountRepository accountRepository, ConfigurationStore configStore)
+        public RequestPasswordResetHandler(IAccountRepository accountRepository, BaseConfiguration baseConfig)
         {
             _accountRepository = accountRepository;
-            _configStore = configStore;
+            _baseConfig = baseConfig;
         }
 
         public async Task HandleAsync(IMessageContext context, RequestPasswordReset command)
@@ -38,16 +38,15 @@ public async Task HandleAsync(IMessageContext context, RequestPasswordReset comm
             account.RequestPasswordReset();
             await _accountRepository.UpdateAsync(account);
 
-            var config = _configStore.Load<BaseConfiguration>();
             var cmd = new SendTemplateEmail("Password reset", "ResetPassword")
             {
                 To = account.Email,
                 Model =
                     new
                     {
                         AccountName = account.UserName,
-                        ResetLink = //TODO: Remove app settings dependency
-                            config.BaseUrl + "/password/reset/" +
+                        ResetLink = 
+                            _baseConfig.BaseUrl + "/password/reset/" +
                             account.ActivationKey
                     },
                 Subject = "Reset password"

src/Server/Coderr.Server.App/Core/Incidents/Commands/CloseIncidentHandler.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using codeRR.Server.Api.Core.Incidents.Commands;
 using codeRR.Server.Api.Core.Messaging;
@@ -49,22 +51,18 @@ public async Task HandleAsync(IMessageContext context, CloseIncident command)
                 !string.IsNullOrEmpty(command.NotificationText))
             {
                 var emails = await _feedbackRepository.GetEmailAddressesAsync(command.IncidentId);
-                var emailMessage = new EmailMessage(emails)
+                if (emails.Any())
                 {
-                    Subject = command.NotificationTitle,
-                    TextBody = command.NotificationText
-                };
-                var sendMessage = new SendEmail(emailMessage);
-                await context.SendAsync(sendMessage);
+                    var emailMessage = new EmailMessage(emails)
+                    {
+                        Subject = command.NotificationTitle,
+                        TextBody = command.NotificationText
+                    };
+                    var sendMessage = new SendEmail(emailMessage);
+                    await context.SendAsync(sendMessage);
+                }
             }
 
-            //var reports = _reportsRepository.GetAll(incident.Reports.Select(x => x.ReportId).ToArray());
-            //foreach (var report in reports)
-            //{
-            //    report.Solve(command.Solution);
-            //    _reportsRepository.Update(report);
-            //}
-
             await _repository.UpdateAsync(incident);
         }
     }

src/Server/Coderr.Server.App/Modules/Messaging/Commands/SendEmailHandler.cs

@@ -10,6 +10,7 @@
 using Coderr.Server.PluginApi.Config;
 using DotNetCqs;
 using Griffin.Container;
+using Markdig;
 
 namespace codeRR.Server.App.Modules.Messaging.Commands
 {
@@ -41,7 +42,8 @@ public async Task HandleAsync(IMessageContext context, SendEmail command)
                 var address = new MailAddress(command.EmailMessage.ReplyTo.Address,command.EmailMessage.ReplyTo.Name);
                 email.ReplyToList.Add(address);
             }
-                
+
+            var markdownHtml = Markdown.ToHtml(command.EmailMessage.TextBody ?? "");
 
             foreach (var recipient in command.EmailMessage.Recipients)
             {
@@ -54,14 +56,17 @@ public async Task HandleAsync(IMessageContext context, SendEmail command)
                 else
                     email.To.Add(new MailAddress(recipient.Address, recipient.Name));
             }
-            if (string.IsNullOrEmpty(command.EmailMessage.HtmlBody))
+            if (string.IsNullOrEmpty(command.EmailMessage.HtmlBody) && markdownHtml == command.EmailMessage.TextBody)
             {
                 email.Body = command.EmailMessage.TextBody;
                 email.IsBodyHtml = false;
                 await client.SendMailAsync(email);
                 return;
             }
 
+            if (string.IsNullOrEmpty(command.EmailMessage.HtmlBody))
+                command.EmailMessage.HtmlBody = markdownHtml;
+
             var av = AlternateView.CreateAlternateViewFromString(command.EmailMessage.HtmlBody, null,
                 MediaTypeNames.Text.Html);
             if (!string.IsNullOrEmpty(command.EmailMessage.TextBody))

src/Server/Coderr.Server.App/Modules/Messaging/Templating/TemplateParser.cs

@@ -4,7 +4,6 @@
 using codeRR.Server.App.Modules.Messaging.Templating.Formatting;
 using ColorCode;
 using Griffin.Container;
-using MarkdownSharp;
 
 namespace codeRR.Server.App.Modules.Messaging.Templating
 {
@@ -78,8 +77,7 @@ private static string ColorizeCode(string html)
 
         private static string Markdown(string template)
         {
-            var md = new Markdown(new MarkdownOptions {AutoHyperlink = true, AutoNewLines = true});
-            return md.Transform(template);
+            return Markdig.Markdown.ToHtml(template);
         }
     }
 }

src/Server/Coderr.Server.App/codeRR.Server.App.csproj

@@ -11,7 +11,7 @@
     <PackageReference Include="Griffin.Container" Version="1.1.9" />
     <PackageReference Include="Griffin.Framework" Version="2.0.0-alpha01" />
     <PackageReference Include="log4net" Version="2.0.8" />
-    <PackageReference Include="MarkdownSharp" Version="1.13.0.0" />
+    <PackageReference Include="Markdig" Version="0.14.9" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="UAParser" Version="3.0.0" />
   </ItemGroup>