Fix clear old shocker control log

Author: LucHeart

Cron/Jobs/ClearOldShockerControlLogs.cs

@@ -1,13 +1,12 @@
 using Microsoft.EntityFrameworkCore;
-using OpenShock.Common;
 using OpenShock.Common.Constants;
 using OpenShock.Common.OpenShockDb;
 using OpenShock.Cron.Attributes;
 
 namespace OpenShock.Cron.Jobs;
 
 /// <summary>
-/// Deletes shocker control logs older than the retention period and enforces a maximum log count
+/// Deletes shocker control logs by enforcing a maximum log count per user
 /// </summary>
 [CronJob("0 0 * * *")] // Every day at midnight (https://crontab.guru/)
 public sealed class ClearOldShockerControlLogs
@@ -26,35 +25,30 @@ public ClearOldShockerControlLogs(OpenShockContext db, ILogger<ClearOldShockerCo
         _logger = logger;
     }
 
-    public async Task Execute()
+    public async Task<int> Execute()
     {
-        var userLogsCounts = await _db.ShockerControlLogs
-            .GroupBy(log => log.Shocker.DeviceNavigation.Owner)
-            .Select(group => new
-            {
-                UserId = group.Key,
-                CountToDelete = Math.Max(0, group.Count() - HardLimits.MaxShockerControlLogsPerUser),
-                DeleteBeforeDate = group
-                    .OrderByDescending(log => log.CreatedOn)
-                    .Skip(HardLimits.MaxShockerControlLogsPerUser)
-                    .Select(log => log.CreatedOn)
-                    .FirstOrDefault()
-            })
-            .Where(result => result.CountToDelete > 0)
-            .ToArrayAsync();
+        var deletedUserLimits = await _db.Database.ExecuteSqlAsync(
+            $"""
+             WITH ranked_logs AS (
+               SELECT
+                 l.id,
+                 ROW_NUMBER() OVER (PARTITION BY u.id ORDER BY l.created_on DESC) AS rn
+               FROM shocker_control_logs l
+               JOIN shockers s ON s.id = l.shocker_id
+               JOIN devices d ON d.id = s.device
+               JOIN users u ON d.owner = u.id
+             )
+             DELETE FROM shocker_control_logs
+             WHERE id IN (
+               SELECT id
+               FROM ranked_logs
+               WHERE rn > {HardLimits.MaxShockerControlLogsPerUser}
+             );
+             """);
 
-        if (userLogsCounts.Length != 0)
-        {
-            _logger.LogInformation("A total of {totalLogsToDelete} logs will be deleted to enforce per-user limits.", userLogsCounts.Sum(x => x.CountToDelete));
-        
-            foreach (var userLogCount in userLogsCounts)
-            {
-                await _db.ShockerControlLogs
-                    .Where(log => log.Shocker.DeviceNavigation.Owner == userLogCount.UserId && log.CreatedOn < userLogCount.DeleteBeforeDate)
-                    .ExecuteDeleteAsync();
-            }
-        }
+        _logger.LogInformation("Deleted {deletedUserLimits} shocker control logs exceeding the per-user limit",
+            deletedUserLimits);
 
-        _logger.LogInformation("Done!");
+        return deletedUserLimits;
     }
 }

Cron/Program.cs

@@ -27,9 +27,12 @@
 
 app.UseHangfireDashboard(options: new DashboardOptions
 {
-    AsyncAuthorization = [
+#if !DEBUG
+    AsyncAuthorization =
+    [
         new DashboardAdminAuth()
     ]
+#endif
 });
 
 app.MapControllers();