Merge pull request #625 from mikecasas/feature-email

Send notification based on a future datetime
oqtane · Jun 19, 2020 · 65df054 · 65df054
2 parents 04ffb07 + 20b83c8
commit 65df054
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 3 deletions.
diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor
@@ -65,7 +65,8 @@
                 notification.ParentId = null;
                 notification.CreatedOn = DateTime.UtcNow;
                 notification.IsDelivered = false;
-                notification.DeliveredOn = null;
+                notification.DeliveredOn = null;
+                notification.SendOn = DateTime.UtcNow;
                 notification = await NotificationService.AddNotificationAsync(notification);
                 await logger.LogInformation("Notification Created {Notification}", notification);
                 NavigationManager.NavigateTo(NavigateUrl());

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -191,7 +191,8 @@
                 notification.ParentId = notificationid;
                 notification.CreatedOn = DateTime.UtcNow;
                 notification.IsDelivered = false;
-                notification.DeliveredOn = null;
+                notification.DeliveredOn = null;
+                notification.SendOn = DateTime.UtcNow;
                 notification = await NotificationService.AddNotificationAsync(notification);
                 await logger.LogInformation("Notification Created {Notification}", notification);
                 NavigationManager.NavigateTo(NavigateUrl());

diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs
@@ -148,7 +148,7 @@ private async Task<User> CreateUser(User user)
                             notification.SiteId = user.SiteId;
                             notification.FromUserId = null;
                             notification.ToUserId = newUser.UserId;
-                            notification.ToEmail = "";
+                            notification.ToEmail = newUser.Email;
                             notification.Subject = "User Account Verification";
                             string token = await _identityUserManager.GenerateEmailConfirmationTokenAsync(identityuser);
                             string url = HttpContext.Request.Scheme + "://" + _tenants.GetAlias().Name + "/login?name=" + user.Username + "&token=" + WebUtility.UrlEncode(token);
@@ -157,6 +157,7 @@ private async Task<User> CreateUser(User user)
                             notification.CreatedOn = DateTime.UtcNow;
                             notification.IsDelivered = false;
                             notification.DeliveredOn = null;
+                            notification.SendOn = DateTime.UtcNow;
                             _notifications.AddNotification(notification);
                         }
 
@@ -385,6 +386,7 @@ public async Task Forgot([FromBody] User user)
                     notification.CreatedOn = DateTime.UtcNow;
                     notification.IsDelivered = false;
                     notification.DeliveredOn = null;
+                    notification.SendOn = DateTime.UtcNow;
                     _notifications.AddNotification(notification);
                     _logger.Log(LogLevel.Information, this, LogFunction.Security, "Password Reset Notification Sent For {Username}", user.Username);
                 }

diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
@@ -22,10 +22,14 @@
     <Content Remove="wwwroot\Modules\Templates\**" />
     <EmbeddedResource Remove="wwwroot\Modules\Templates\**" />
   </ItemGroup>
+  <ItemGroup>
+    <None Remove="Scripts\Tenant.01.00.01.01.sql" />
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Scripts\Master.00.00.00.00.sql" />
     <EmbeddedResource Include="Scripts\Master.00.09.00.00.sql" />
     <EmbeddedResource Include="Scripts\Master.01.00.01.00.sql" />
+    <EmbeddedResource Include="Scripts\Tenant.01.00.01.01.sql" />
     <EmbeddedResource Include="Scripts\Tenant.00.00.00.00.sql" />
     <EmbeddedResource Include="Scripts\Tenant.00.09.00.00.sql" />
     <EmbeddedResource Include="Scripts\Tenant.00.09.01.00.sql" />

diff --git a/Oqtane.Server/Repository/NotificationRepository.cs b/Oqtane.Server/Repository/NotificationRepository.cs
@@ -21,6 +21,7 @@ public IEnumerable<Notification> GetNotifications(int siteId, int fromUserId, in
                 return _db.Notification
                     .Where(item => item.SiteId == siteId)
                     .Where(item => item.IsDelivered == false)
+                    .Where(item => item.SendOn < System.DateTime.UtcNow)
                     .ToList();
             }
 

diff --git a/Oqtane.Server/Scripts/Tenant.01.00.01.01.sql b/Oqtane.Server/Scripts/Tenant.01.00.01.01.sql
@@ -0,0 +1,12 @@
+/*  
+
+Version 1.0.1 Notification migration script
+
+*/
+
+ALTER TABLE [dbo].[Notification] ADD
+	[SendOn] [datetime] NULL
+GO
+
+UPDATE [dbo].[Notification] SET SendOn = CreatedOn WHERE SendOn IS NULL
+GO
diff --git a/Oqtane.Shared/Models/Notification.cs b/Oqtane.Shared/Models/Notification.cs
@@ -22,6 +22,7 @@ public class Notification : IDeletable
         public string DeletedBy { get; set; }
         public DateTime? DeletedOn { get; set; }
         public bool IsDeleted { get; set; }
+        public DateTime? SendOn { get; set; }
     }
 
 }