From bfc84be7323405238ce2db944fc8c68a7ed20f1f Mon Sep 17 00:00:00 2001
From: Jared Goodwin <translucency@outlook.com>
Date: Wed, 25 Mar 2020 08:09:37 -0700
Subject: [PATCH] Update AddAlert params.

---
 Server/API/AlertsController.cs | 15 ++++-----------
 Server/Services/DataService.cs | 15 ++++++++++++---
 Tests/DataServiceTests.cs      | 11 +++++------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/Server/API/AlertsController.cs b/Server/API/AlertsController.cs
index 4cf87770..d2561084 100644
--- a/Server/API/AlertsController.cs
+++ b/Server/API/AlertsController.cs
@@ -40,14 +40,7 @@ namespace Remotely.Server.API
             {
                 try
                 {
-                    var alert = new Alert()
-                    {
-                        CreatedOn = DateTimeOffset.Now,
-                        DeviceID = alertOptions.AlertDeviceID,
-                        Message = alertOptions.AlertMessage,
-                        OrganizationID = orgID
-                    };
-                    await DataService.AddAlert(alert);
+                    await DataService.AddAlert(alertOptions, orgID);
                 }
                 catch (Exception ex)
                 {
@@ -60,9 +53,9 @@ namespace Remotely.Server.API
                 try
                 {
                     await EmailSender.SendEmailAsync(alertOptions.EmailTo,
-                  alertOptions.EmailSubject,
-                  alertOptions.EmailBody,
-                  orgID);
+                        alertOptions.EmailSubject,
+                        alertOptions.EmailBody,
+                        orgID);
                 }
                 catch (Exception ex)
                 {
diff --git a/Server/Services/DataService.cs b/Server/Services/DataService.cs
index 0b13981e..c4b6eca6 100644
--- a/Server/Services/DataService.cs
+++ b/Server/Services/DataService.cs
@@ -34,12 +34,21 @@ namespace Remotely.Server.Services
         private ApplicationDbContext RemotelyContext { get; }
         private UserManager<RemotelyUser> UserManager { get; }
 
-        public async Task AddAlert(Alert alert)
+        public async Task AddAlert(AlertOptions alertOptions, string organizationID)
         {
             await RemotelyContext.Users
                 .Include(x => x.Alerts)
-                .Where(x => x.OrganizationID == alert.OrganizationID)
-                .ForEachAsync(x => x.Alerts.Add(alert));
+                .Where(x => x.OrganizationID == organizationID)
+                .ForEachAsync(x => {
+                    var alert = new Alert()
+                    {
+                        CreatedOn = DateTimeOffset.Now,
+                        DeviceID = alertOptions.AlertDeviceID,
+                        Message = alertOptions.AlertMessage,
+                        OrganizationID = organizationID
+                    };
+                    x.Alerts.Add(alert);
+                });
 
             await RemotelyContext.SaveChangesAsync();
         }
diff --git a/Tests/DataServiceTests.cs b/Tests/DataServiceTests.cs
index 19b7bec1..46fff2f8 100644
--- a/Tests/DataServiceTests.cs
+++ b/Tests/DataServiceTests.cs
@@ -156,14 +156,13 @@ namespace Remotely.Tests
         [DoNotParallelize]
         public async Task AddAlert()
         {
-            var alert = new Alert()
+            var options = new AlertOptions()
             {
-                DeviceID = TestData.Device1.ID,
-                OrganizationID = TestData.OrganizationID,
-                Message = "Test Message",
-                UserID = TestData.Admin1.Id
+                AlertDeviceID = TestData.Device1.ID,
+                AlertMessage = "Test Message",
+                ShouldAlert = true
             };
-            await DataService.AddAlert(alert);
+            await DataService.AddAlert(options, TestData.OrganizationID);
         }
     }
 }