Can now notify users properly when closing an incident

Author: gauffininteractive

src/Server/OneTrueError.Api/Core/Messaging/EmailMessage.cs

@@ -28,7 +28,7 @@ public EmailMessage()
         /// <param name="recipient">Destination</param>
         public EmailMessage(string recipient)
         {
-            if (recipient == null) throw new ArgumentNullException(nameof(recipient));
+            if (recipient == null) throw new ArgumentNullException("recipient");
             Recipients = new[] {new EmailAddress(recipient)};
             Resources = new List<EmailResource>();
         }
@@ -39,7 +39,7 @@ public EmailMessage(string recipient)
         /// <param name="recipients">List of recipients</param>
         public EmailMessage(IReadOnlyList<string> recipients)
         {
-            if (recipients == null) throw new ArgumentNullException(nameof(recipients));
+            if (recipients == null) throw new ArgumentNullException("recipients");
             if (recipients.Count == 0) throw new ArgumentException("Tried to send to an empty list.", "recipients");
 
             Recipients = recipients.Select(x => new EmailAddress(x)).ToArray();

src/Server/OneTrueError.SqlServer/Core/Feedback/FeedbackRepository.cs

@@ -4,7 +4,6 @@
 using Griffin.Data;
 using Griffin.Data.Mapper;
 using OneTrueError.App.Core.Feedback;
-using OneTrueError.SqlServer.Tools;
 
 namespace OneTrueError.SqlServer.Core.Feedback
 {
@@ -31,8 +30,21 @@ public async Task UpdateAsync(FeedbackEntity feedback)
         public async Task<IReadOnlyList<string>> GetEmailAddressesAsync(int incidentId)
         {
             var emailAddresses = new List<string>();
-            var items = await _unitOfWork.ToListAsync<string>("FROM Incidents WHERE Id = ?", incidentId);
-            return items;
+            using (var cmd = _unitOfWork.CreateDbCommand())
+            {
+                cmd.CommandText =
+                    "SELECT distinct EmailAddress FROM IncidentFeedback WHERE IncidentId = @id AND EmailAddress IS NOT NULL";
+                cmd.AddParameter("id", incidentId);
+                using (var reader = await cmd.ExecuteReaderAsync())
+                {
+                    while (await reader.ReadAsync())
+                    {
+                        emailAddresses.Add(reader.GetString(0));
+                    }
+                }
+            }
+
+            return emailAddresses;
         }
     }
 }

src/Server/OneTrueError.Web/ViewModels/Incident/CloseViewModel.js

@@ -60,14 +60,18 @@ module OneTrueError.Incident {
 
             var closeCmd = new CloseIncident(solution.value, this.incidentId);
 
-            var sendMessage = <HTMLInputElement>this.context.select.one('[name="sendCustomerMessage"]');
+            var sendMessage = <HTMLInputElement>this.context.select.one('sendCustomerMessage');
+            console.log(sendMessage);
             if (sendMessage.checked) {
                 var subject = (<HTMLInputElement>this.context.select.one('[name="UserSubject"]'));
                 var text = (<HTMLInputElement>this.context.select.one('[name="UserText"]'));
                 if (subject.value.length === 0 || text.value.length === 0) {
                     alert("You specified that you wanted to send a notification to your users, but you have not specified subject or body of the message.");
                     return;
                 }
+                closeCmd.NotificationText = text.value;
+                closeCmd.CanSendNotification = true;
+                closeCmd.NotificationTitle = subject.value;
             }
 
             CqsClient.command(closeCmd);

src/Server/OneTrueError.Web/ViewModels/Incident/CloseViewModel.js.map

@@ -79,7 +79,7 @@ <h2>Customer message</h2>
         </p>
         <div id="status-panel" style="display: none">
             <p>
-                This text will go out to all users that have subscribed on status updates for this error. (Currently <span data-name="SubscriberCount">0</span> people).
+                This text will go out to all users that have subscribed on status updates for this error. (Currently <span data-name="WaitingUserCount">0</span> people).
             </p>
             <p>
                 The text typically informs them about that the error is corrected and will be pushed out in the next release.

src/Server/OneTrueError.Web/ViewModels/Incident/CloseViewModel.ts

@@ -26,7 +26,7 @@ <h1 data-name="Description" style="display: inline"></h1>
         </p>
         <div data-if="vm.IsIgnored">
             <em>
-                Incident is ignored, i.e. no notifcations will be sent for this incident. New reports are thrown away (but the counter will increase to
+                Incident is ignored, i.e. no notifications will be sent for this incident. New reports are thrown away (but the counter will increase to
                 indicate that it's still active).
             </em>
         </div>
@@ -69,13 +69,13 @@ <h1 data-name="ReportCount"></h1>
                 </a>
             </div>
             <div class="tile-nephritis tile tile-medium">
-                <a href="/incident/:incidentId/users">
+                <a href="#/application/:applicationId/incident/:incidentId/users">
                     <h4 title="Number of users waiting for a fix">Users waiting</h4>
                     <h1 data-name="WaitingUserCount"></h1>
                 </a>
             </div>
             <div class="tile-nephritis tile tile-medium">
-                <a href="/incident/:incidentId/feedback">
+                <a href="#/application/:applicationId/incident/:incidentId/feedback">
                     <h4 title="Number of users waiting for a fix">Feedback count</h4>
                     <h1 data-name="FeedbackCount"></h1>
                 </a>