Merge pull request 'Simplified notification updating' (#30) from emailjobs into master

Reviewed-on: #30

LiteCharms.Features.Tests/NotificationsFeatureTests.cs

@@ -1,4 +1,6 @@
-using LiteCharms.Features.Shop.Notifications;
+using LiteCharms.Features.Models;
+using LiteCharms.Features.Shop.Notifications;
+using LiteCharms.Features.Shop.Notifications.Events;
 
 namespace LiteCharms.Features.Tests;
 
@@ -32,4 +34,31 @@ public class NotificationsFeatureTests(CommonFixture fixture, ITestOutputHelper
 
         foreach (var error in createResult.Errors) output.WriteLine(error.Message);
     }
+
+    [Fact]
+    public async Task GetNotifications_ShouldReturn_AllNotifications()
+    {
+        DateRange range = new()
+        {
+            From = DateOnly.FromDateTime(new DateTime(2026, 04, 01, 0, 0, 0, DateTimeKind.Utc)),
+            To = DateOnly.FromDateTime(DateTime.UtcNow),
+            MaxRecords = 10
+        };
+
+        var getResult = await notificationService.GetNotificationsAsync(range);
+
+        Assert.True(getResult.IsSuccess);
+
+        foreach (var error in getResult.Errors) output.WriteLine(error.Message);
+    }
+
+    [Fact]
+    public async Task ProcessEmailNotificationsEvent_ShouldSucceed()
+    {
+        var notification = ProcessEmailNotificationsEvent.Create();
+
+        await fixture.Mediator.Publish(notification);
+
+        Assert.True(true);
+    }
 }

LiteCharms.Features/Email/EmailService.cs

@@ -35,8 +35,9 @@ public class EmailService(IOptions<SmtpSettings> options) : IDisposable
 
             var bodyBuilder = new BodyBuilder();
 
-            foreach (var attachment in message.Body?.Attachments!)
-                bodyBuilder.Attachments.Add(attachment.Name!, attachment.FileStream!, cancellationToken);
+            if (message.Body!.Properties.HasAttachments)
+                foreach (var attachment in message.Body?.Attachments!)
+                    bodyBuilder.Attachments.Add(attachment.Name!, attachment.FileStream!, cancellationToken);
 
             if (!message.Body.Properties.IsHtml) bodyBuilder.TextBody = message.Body.Message;
             if (message.Body.Properties.IsHtml) bodyBuilder.HtmlBody = message.Body.Message;

LiteCharms.Features/Extensions/Quartz.cs

@@ -34,7 +34,7 @@ public static class Quartz
                 storage.UseClustering(cluster =>
                 {
                     cluster.CheckinInterval = TimeSpan.FromSeconds(30);
-                    cluster.CheckinMisfireThreshold = TimeSpan.FromSeconds(20);
+                    cluster.CheckinMisfireThreshold = TimeSpan.FromSeconds(90);
                 });
             });
         });
@@ -62,6 +62,8 @@ public static class Quartz
             config.UseDefaultThreadPool(options => options.MaxConcurrency = 1);
             config.UseTimeZoneConverter();
 
+            config.SetProperty("quartz.jobStore.misfireThreshold", TimeSpan.FromMinutes(2).TotalMilliseconds.ToString());
+
             config.UsePersistentStore(storage =>
             {
                 storage.PerformSchemaValidation = false;
@@ -74,7 +76,7 @@ public static class Quartz
                 storage.UseClustering(cluster =>
                 {
                     cluster.CheckinInterval = TimeSpan.FromSeconds(30);
-                    cluster.CheckinMisfireThreshold = TimeSpan.FromSeconds(20);
+                    cluster.CheckinMisfireThreshold = TimeSpan.FromSeconds(90);
                 });
             });
         });

LiteCharms.Features/Quartz/JobOrchestrator.cs

@@ -50,9 +50,9 @@ public class JobOrchestrator(ISchedulerFactory schedulerFactory) : IJobOrchestra
 
         var trigger = global::Quartz.TriggerBuilder.Create()
             .WithIdentity(triggerKey)
-            .WithDescription($"Scheduled via Main Job at {now:g} UTC")
+            .WithDescription($"Scheduled via Main Job at {now:g}")
             .WithCronSchedule(cronExpression, cron => cron
-                .WithMisfireHandlingInstructionFireAndProceed())
+                .WithMisfireHandlingInstructionIgnoreMisfires())
             .StartAt(now)
             .Build();
 

LiteCharms.Features/Quartz/MediatorJob.cs

@@ -10,16 +10,28 @@ public class MediatorJob<TNotification>(IMediator mediator) : IJob where TNotifi
     {
         var data = context.MergedJobDataMap["Payload"] as string;
 
-        if (string.IsNullOrWhiteSpace(data)) return;
+        if (string.IsNullOrWhiteSpace(data))
+        {
+            Trace.WriteLine("Job Payload missing, job ended");
+
+            return;
+        }
 
         var notification = JsonSerializer.Deserialize<TNotification>(data);
 
-        if (notification is null) return;
+        if (notification is null)
+        {
+            Trace.WriteLine("Notification could not be JSon converted from data string, job ended");
+
+            return;
+        }
                 
         using var activity = MediatorTelemetry.Source.StartActivity($"Quartz: {typeof(TNotification).Name}");
                 
         activity?.SetTag("event.correlation_id", notification.CorrelationId);
 
         await mediator.Publish(notification, context.CancellationToken);
+
+        Trace.WriteLine("Job published");
     }
 }

LiteCharms.Features/Shop/Notifications/Events/Handlers/ProcessEmailNotificationsEventHandler.cs

@@ -1,4 +1,5 @@
-using LiteCharms.Features.Email;
+using k8s.KubeConfigModels;
+using LiteCharms.Features.Email;
 using LiteCharms.Features.Shop.Notifications.Models;
 using LiteCharms.Features.Shop.Postgres;
 
@@ -15,17 +16,20 @@ public class ProcessEmailNotificationsEventHandler(IDbContextFactory<ShopDbConte
         {
             using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
 
+            if (emailService.Status != EmailStatuses.Connected)
+                await emailService.ConnectAsync(cancellationToken);
+
             var notifications = await context.Notifications
                 .OrderByDescending(o => o.CreatedAt)
                 .ThenBy(o => o.Priority)
-                .Where(n => n.CorrelationIdType == CorrelationIdTypes.Email)
-                .Where(n => n.Direction == NotificationDirection.Outgoing)
+                .Where(n => n.Platform == NotificationPlatforms.Email && 
+                    n.Direction == NotificationDirection.Outgoing && n.Processed == false)
                 .Take(message.MaxRecords)
                 .ToListAsync(cancellationToken);
 
             foreach (var notification in notifications)
             {
-                if (dropBatch || cancellationToken.IsCancellationRequested) break;
+                if (dropBatch) break;
 
                 var sendResult = await SendEmailAsync(notification,emailService, cancellationToken);
 
@@ -46,12 +50,16 @@ public class ProcessEmailNotificationsEventHandler(IDbContextFactory<ShopDbConte
                 notification.UpdatedAt = DateTime.UtcNow;
             }
 
-            await context.SaveChangesAsync(cancellationToken);
+            await context.SaveChangesAsync(cancellationToken);            
         }
         catch (Exception ex)
         {
             logger.LogError(ex, ex.Message);
         }
+        finally
+        {
+            await emailService.DisconnectAsync(cancellationToken);
+        }
     }
 
     private async Task<Result> SendEmailAsync(Notification notification, EmailService service, CancellationToken cancellationToken = default)

LiteCharms.Features/Shop/Notifications/Events/ProcessEmailNotificationsEvent.cs

@@ -8,6 +8,8 @@ public class ProcessEmailNotificationsEvent : EventBase, IEvent
 
     public int MaxRecords { get; set; }
 
+    public ProcessEmailNotificationsEvent() { MaxRecords = 1000; }
+
     private ProcessEmailNotificationsEvent(int maxRecords = 1000) => MaxRecords = maxRecords;
 
     public static ProcessEmailNotificationsEvent Create(int maxRecords = 1000) => new(maxRecords);

LiteCharms.Features/Shop/Notifications/NotificationService.cs

@@ -63,8 +63,8 @@ public class NotificationService(IDbContextFactory<ShopDbContext> contextFactory
     {
         try
         {
-            var fromDate = range.From.ToDateTime(TimeOnly.MinValue);
-            var toDate = range.To.ToDateTime(TimeOnly.MaxValue);
+            var fromDate = range.From.ToDateTime(TimeOnly.MinValue, DateTimeKind.Utc);
+            var toDate = range.To.ToDateTime(TimeOnly.MaxValue, DateTimeKind.Utc);
 
             using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
 
@@ -96,12 +96,9 @@ public class NotificationService(IDbContextFactory<ShopDbContext> contextFactory
                 return Result.Fail(new Error($"Notification with id {request.NotificationId} not found."));
 
             notification.Processed = request.Processed;
-
-            if (request.HasError)
-            {
-                notification.HasError = request.HasError;
-                notification.Errors = request.Errors;
-            }
+            notification.UpdatedAt = DateTime.UtcNow;
+            notification.HasError = request.HasError;
+            notification.Errors = request.Errors;
 
             return await context.SaveChangesAsync(cancellationToken) > 0
                 ? Result.Ok()