Re-enable support for alerts in new DB

Author: NixFey

Data/FimDbContext.cs

@@ -1,6 +1,5 @@
 using fim_queueing_admin.Models;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace fim_queueing_admin.Data;
 

Hubs/AssistantHub.cs

@@ -87,9 +87,8 @@ public async Task GetStreamInfo()
 
     private async Task SendPendingAlertsToCaller()
     {
-        // var pendingAlerts = await dbContext.AlertCarts.Where(ac => ac.CartId == CartId && ac.ReadTime == null)
-        //     .Select(ac => ac.Alert).ToListAsync();
-        var pendingAlerts = new List<Alert>();
+        var pendingAlerts = await dbContext.AlertCarts.Where(ac => ac.CartId == CartId && ac.ReadTime == null)
+            .Select(ac => ac.Alert).ToListAsync();
 
         await Clients.Caller.SendAsync("PendingAlerts", pendingAlerts);
     }

Models/Alert.cs

@@ -20,6 +20,7 @@ public class AlertEntityTypeConfiguration : IEntityTypeConfiguration<Alert>
     public void Configure(EntityTypeBuilder<Alert> builder)
     {
         builder
+            .ToTable("alerts", "temp")
             .HasMany(a => a.AlertCarts)
             .WithOne(ac => ac.Alert);
     }

Models/AlertCart.cs

@@ -19,6 +19,8 @@ public class AlertCartEntityTypeConfiguration : IEntityTypeConfiguration<AlertCa
 {
     public void Configure(EntityTypeBuilder<AlertCart> builder)
     {
-        builder.HasKey(nameof(AlertCart.AlertId), nameof(AlertCart.CartId));
+        builder
+            .ToTable("alert_carts", "temp")
+            .HasKey(nameof(AlertCart.AlertId), nameof(AlertCart.CartId));
     }
 }

Models/Cart.cs

@@ -9,8 +9,7 @@ public class Cart : BaseEquipment
 {
     public AvCartConfiguration? Configuration { get; set; } = new();
 
-    // TODO: This is not yet implemented in Postgres
-    // public ICollection<AlertCart>? AlertCarts { get; set; }
+    public ICollection<AlertCart>? AlertCarts { get; set; }
 
     public class AvCartConfiguration
     {
@@ -25,9 +24,9 @@ public class CartEntityTypeConfiguration : BaseEquipmentEntityTypeConfiguration<
 {
     protected override void ConfigureEntity(EntityTypeBuilder<Cart> builder)
     {
-        // builder
-        //     .HasMany(a => a.AlertCarts)
-        //     .WithOne(ac => ac.Cart);
+        builder
+            .HasMany(a => a.AlertCarts)
+            .WithOne(ac => ac.Cart);
         builder.HasQueryFilter(c => c.EquipmentType == EquipmentType.AvCart);
         builder.OwnsOne(c => c.Configuration, d =>
         {

Program.cs

@@ -171,7 +171,7 @@ async Task<string> GetAccessToken()
     });
 }
 
-builder.Services.AddHostedService<DatabaseKeepAliveService>();
+// builder.Services.AddHostedService<DatabaseKeepAliveService>();
 
 builder.Services.AddCors(opt =>
 {

Services/AssistantService.cs

@@ -18,9 +18,8 @@ public async Task SendPendingAlertsToEveryone()
         var hubContext = serviceProvider.GetRequiredService<IHubContext<AssistantHub>>();
         var dbContext = serviceProvider.GetRequiredService<FimDbContext>();
 
-        // var pendingAlerts = await dbContext.AlertCarts.Where(ac => ac.ReadTime == null)
-        //     .GroupBy(k => k.CartId, v => v.Alert).ToListAsync();
-        var pendingAlerts = new List<IGrouping<Guid, Alert>>();
+        var pendingAlerts = await dbContext.AlertCarts.Where(ac => ac.ReadTime == null)
+            .GroupBy(k => k.CartId, v => v.Alert).ToListAsync();
 
         foreach (var group in pendingAlerts)
         {

Views/Alert/Index.cshtml

@@ -12,14 +12,12 @@
   </div>
   <div><a asp-action="Manage">Create Alert</a></div>
   @{
-    var alerts = new List<Alert>();
-    // TODO: Implement alerts in postgres
-    // var alerts = await DbContext.Alerts.OrderByDescending(c => c.CreatedAt).Select(a => new
-    // {
-    //   a.Id,
-    //   Content = a.Content.Substring(0, 50),
-    //   a.CreatedAt
-    // }).ToListAsync();
+    var alerts = await DbContext.Alerts.OrderByDescending(c => c.CreatedAt).Select(a => new
+    {
+      a.Id,
+      Content = a.Content.Substring(0, 50),
+      a.CreatedAt
+    }).ToListAsync();
   }
   @if (!alerts.Any())
   {