Implemented mailbox in ConsoleUI

PostFundManagement.Application/Abstractions/Services/ICommunicationsService.cs

@@ -1,4 +1,4 @@
-using PostFundManagement.Application.Services.Communications;
+using PostFundManagement.Application.Services.Communications;
 using PostFundManagement.Domain;
 using PostFundManagement.Domain.Attributes;
 using PostFundManagement.Domain.Models;
@@ -31,6 +31,9 @@ public interface ICommunicationsService
     [Log]
     Task<Result<Notification[]>> GetNotificationsAsync(string organisationIdHash, CancellationToken cancellationToken = default);
 
+    [Log]
+    Task<Result<Notification[]>> GetUserNotificationsAsync(Guid userId, CancellationToken cancellationToken = default);
+
     [Log]
     Task<Result<Notification>> GetNotificationAsync(string notificationIdHash, CancellationToken cancellationToken = default);
 

PostFundManagement.Application/Services/Communications/CommunicationsCacheService.cs

@@ -1,4 +1,4 @@
-using PostFundManagement.Application.Abstractions.Services;
+using PostFundManagement.Application.Abstractions.Services;
 using PostFundManagement.Application.Extensions;
 using PostFundManagement.Application.Services.Shared;
 using PostFundManagement.Domain;
@@ -152,6 +152,9 @@ public sealed class CommunicationsCacheService(CommunicationsService service, ID
             return Result.Ok(cached.FromJson<Notification[]>());
         }));
 
+    public async Task<Result<Notification[]>> GetUserNotificationsAsync(Guid userId, CancellationToken cancellationToken = default) =>
+        await service.GetUserNotificationsAsync(userId, cancellationToken);
+
     public async Task<Result<Invite>> SendInviteAsync(InviteRequest request, Guid userId, CancellationToken cancellationToken = default) =>
         await service.SendInviteAsync(request, userId, cancellationToken);
 

PostFundManagement.Application/Services/Communications/CommunicationsService.cs

@@ -1,4 +1,4 @@
-using PostFundManagement.Application.Abstractions.Services;
+using PostFundManagement.Application.Abstractions.Services;
 using PostFundManagement.Application.Services.Shared;
 using PostFundManagement.Domain;
 using PostFundManagement.Domain.Abstractions;
@@ -94,6 +94,8 @@ public sealed class CommunicationsService(IDbContextFactory<ApplicationDbContext
         {
             await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
 
+            var initialStatus = request.Status ?? (request.Platform == NotificationPlatform.InApp ? NotificationStatus.Delivered : NotificationStatus.Queued);
+
             context.Notifications.Add(new Domain.Entities.Notification
             {
                 CreatedAt = DateTime.UtcNow,
@@ -103,7 +105,7 @@ public sealed class CommunicationsService(IDbContextFactory<ApplicationDbContext
                 Subject = request.Subject,
                 Message = request.Message,
                 Platform = request.Platform,
-                Status = NotificationStatus.Queued,
+                Status = initialStatus,
                 TenantId = tenantContext.TenantId
             });
 
@@ -116,16 +118,17 @@ public sealed class CommunicationsService(IDbContextFactory<ApplicationDbContext
         {
             await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
 
-            var changedTotal = await context.Notifications
-                .Where(n => n.Id == request.NotificationId)
-                .ExecuteUpdateAsync(f => f
-                    .SetProperty(u => u.Destination, request.Destination)
-                    .SetProperty(u => u.SentAt, request.SentAt)
-                    .SetProperty(u => u.Error, request.Error)
-                    .SetProperty(u => u.UpdatedAt, DateTime.UtcNow)
-                    .SetProperty(u => u.Status, request.Status), cancellationToken);
+            var entity = await context.Notifications.FirstOrDefaultAsync(n => n.Id == request.NotificationId, cancellationToken);
+            if (entity is null)
+                return Result.Fail(NotFoundError.Create($"Notification #{request.NotificationId} not found"));
 
-            return Result.OkIf(changedTotal > 0, UpdateError.Create($"Failed to update notification: {request.NotificationId}, contact support"));
+            entity.Status = request.Status;
+            entity.UpdatedAt = DateTime.UtcNow;
+            if (request.SentAt.HasValue) entity.SentAt = request.SentAt.Value;
+            if (!string.IsNullOrWhiteSpace(request.Destination)) entity.Destination = request.Destination;
+            if (!string.IsNullOrWhiteSpace(request.Error)) entity.Error = request.Error;
+
+            return Result.OkIf(await context.SaveChangesAsync(cancellationToken) > 0, UpdateError.Create($"Failed to update notification: {request.NotificationId}, contact support"));
         }));
 
     public async Task<Result<Notification[]>> GetNotificationsAsync(string organisationIdHash, CancellationToken cancellationToken = default) =>
@@ -147,6 +150,19 @@ public sealed class CommunicationsService(IDbContextFactory<ApplicationDbContext
             return Result.Ok(notifications?.Select(i => i.Map()).ToArray() ?? []);
         }));
 
+    public async Task<Result<Notification[]>> GetUserNotificationsAsync(Guid userId, CancellationToken cancellationToken = default) =>
+        await Result.Try((Func<Task<Result<Notification[]>>>)(async () =>
+        {
+            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+
+            var notifications = await context.Notifications.AsNoTracking()
+                .Where(n => n.Recipient == userId)
+                .OrderByDescending(o => o.CreatedAt)
+                .ToListAsync(cancellationToken);
+
+            return Result.Ok(notifications?.Select(i => i.Map()).ToArray() ?? []);
+        }));
+
     public async Task<Result<Notification>> GetNotificationAsync(string notificationIdHash, CancellationToken cancellationToken = default) =>
         await Result.Try((Func<Task<Result<Notification>>>)(async () =>
         {

PostFundManagement.Application/Services/Communications/Records.cs

@@ -1,18 +1,20 @@
-using PostFundManagement.Domain;
+using PostFundManagement.Domain;
 
 namespace PostFundManagement.Application.Services.Communications;
 
-public sealed record UpdateNotificationRequest([Required] long NotificationId, string? Destination,
-    [Required] NotificationStatus Status,
-    [Required] DateTime SentAt,
-    [MaxLength(TextLength)] string? Error);
+public sealed record UpdateNotificationRequest([Required] long NotificationId,
+    string? Destination = null,
+    [Required] NotificationStatus Status = NotificationStatus.Read,
+    DateTime? SentAt = null,
+    [MaxLength(TextLength)] string? Error = null);
 
 public sealed record CreateNotificationRequest([Required] long OrganisationId,
     [Required] Guid Recipient,
     [Required] NotificationPlatform Platform,
     [Required][MaxLength(LabelLength)] string? Subject,
     [Required][MaxLength(LabelLength)] string? Destination,
-    [Required][MaxLength(TextLength)] string Message);
+    [Required][MaxLength(LargeTextLength)] string Message,
+    NotificationStatus? Status = null);
 
 public sealed record InviteRequest([Required] long OrganisationId,
     [Required] long InvitedOrganisationId,