From 79db1c3a69048c3a337b85f3ce52e8ca423e4f30 Mon Sep 17 00:00:00 2001
From: TekH <h.tek@digitaldata.works>
Date: Fri, 7 Aug 2026 12:43:41 +0200
Subject: [PATCH] Refactor email query and controller endpoints

Refactored `FetchEmailsQuery` to encapsulate filtering and retrieval parameters (`UnseenOnly` and `MaxCount`) within a nested `MailQuery` record for better organization. Updated `FetchEmailsQueryHandler` to use the new structure.

Simplified `EmailController` endpoints:
- Replaced multiple query parameters in `FetchEmails` with a single `FetchEmailsQuery` object.
- Replaced multiple parameters in `MarkAsSeen` with a `MarkEmailAsSeenCommand` object.
- Adjusted the HTTP route for `MarkAsSeen` from `"{uid}/seen"` to `"seen"`.

Updated XML documentation to reflect these changes, improving maintainability and scalability.
---
 .../Queries/FetchEmailsQuery.cs               | 24 ++++++++----
 .../Controllers/EmailController.cs            | 39 +++----------------
 2 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/src/core/DigitalData.MessagingService.Application/EmailReceiving/Queries/FetchEmailsQuery.cs b/src/core/DigitalData.MessagingService.Application/EmailReceiving/Queries/FetchEmailsQuery.cs
index 0aaca2a..070d12b 100644
--- a/src/core/DigitalData.MessagingService.Application/EmailReceiving/Queries/FetchEmailsQuery.cs
+++ b/src/core/DigitalData.MessagingService.Application/EmailReceiving/Queries/FetchEmailsQuery.cs
@@ -22,14 +22,22 @@ public record FetchEmailsQuery : IRequest<IEnumerable<ReceivedEmailContext>>
     public string Folder { get; init; } = "INBOX";
 
     /// <summary>
-    /// When <see langword="true"/> returns only unread messages.
+    /// Mail query used to filter and limit the emails retrieved.
     /// </summary>
-    public bool UnseenOnly { get; init; } = false;
+    public MailQuery Mail { get; init; } = new();
 
-    /// <summary>
-    /// Maximum number of messages to retrieve (most-recent first). 0 = unlimited.
-    /// </summary>
-    public int MaxCount { get; init; } = 50;
+    public record MailQuery
+    {
+        /// <summary>
+        /// When <see langword="true"/> returns only unread messages.
+        /// </summary>
+        public bool UnseenOnly { get; init; } = false;
+
+        /// <summary>
+        /// Maximum number of messages to retrieve (most-recent first). 0 = unlimited.
+        /// </summary>
+        public int MaxCount { get; init; } = 50;
+    }
 }
 
 public class FetchEmailsQueryHandler(
@@ -49,8 +57,8 @@ public class FetchEmailsQueryHandler(
         return await ImapService.FetchEmailsAsync(
             account,
             request.Folder,
-            request.UnseenOnly,
-            request.MaxCount,
+            request.Mail.UnseenOnly,
+            request.Mail.MaxCount,
             cancellationToken);
     }
 }
diff --git a/src/presentation/DigitalData.MessagingService.API/Controllers/EmailController.cs b/src/presentation/DigitalData.MessagingService.API/Controllers/EmailController.cs
index d58f52f..da5f926 100644
--- a/src/presentation/DigitalData.MessagingService.API/Controllers/EmailController.cs
+++ b/src/presentation/DigitalData.MessagingService.API/Controllers/EmailController.cs
@@ -71,31 +71,15 @@ public class EmailController(IMediator mediator) : ControllerBase
     /// <summary>
     /// Fetch emails from an IMAP mailbox.
     /// </summary>
-    /// <param name="accountId">Id of the email account (must have ImapServer configured).</param>
-    /// <param name="folder">Mailbox folder to read (default: INBOX).</param>
-    /// <param name="unseenOnly">Return only unread messages.</param>
-    /// <param name="maxCount">Maximum number of messages to return (most-recent first, default: 50).</param>
+    /// <param name="query">Query parameters for filtering and fetching emails from the IMAP mailbox.</param>
     /// <param name="cancellationToken">Cancellation token.</param>
     /// <returns>HTTP 200 with list of received emails.</returns>
     [HttpGet]
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status400BadRequest)]
     [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<IActionResult> FetchEmails(
-        [FromQuery] int accountId,
-        [FromQuery] string folder = "INBOX",
-        [FromQuery] bool unseenOnly = false,
-        [FromQuery] int maxCount = 50,
-        CancellationToken cancellationToken = default)
+    public async Task<IActionResult> FetchEmails([FromQuery] FetchEmailsQuery query, CancellationToken cancellationToken = default)
     {
-        var query = new FetchEmailsQuery
-        {
-            Account = new GetSenderQuery { Id = accountId },
-            Folder = folder,
-            UnseenOnly = unseenOnly,
-            MaxCount = maxCount
-        };
-
         var emails = await mediator.Send(query, cancellationToken);
         return Ok(emails);
     }
@@ -103,28 +87,15 @@ public class EmailController(IMediator mediator) : ControllerBase
     /// <summary>
     /// Mark a single IMAP message as seen (read).
     /// </summary>
-    /// <param name="accountId">Id of the email account.</param>
-    /// <param name="uid">UID of the message on the IMAP server.</param>
-    /// <param name="folder">Mailbox folder the message resides in (default: INBOX).</param>
+    /// <param name="command">The command containing the mailbox account identifier and the unique identifier (UID) of the message to mark as seen.</param>
     /// <param name="cancellationToken">Cancellation token.</param>
     /// <returns>HTTP 204 No Content.</returns>
-    [HttpPatch("{uid}/seen")]
+    [HttpPatch("seen")]
     [ProducesResponseType(StatusCodes.Status204NoContent)]
     [ProducesResponseType(StatusCodes.Status400BadRequest)]
     [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<IActionResult> MarkAsSeen(
-        [FromRoute] long uid,
-        [FromQuery] int accountId,
-        [FromQuery] string folder = "INBOX",
-        CancellationToken cancellationToken = default)
+    public async Task<IActionResult> MarkAsSeen([FromRoute] MarkEmailAsSeenCommand command, CancellationToken cancellationToken = default)
     {
-        var command = new MarkEmailAsSeenCommand
-        {
-            Account = new GetSenderQuery { Id = accountId },
-            Uid = uid,
-            Folder = folder
-        };
-
         await mediator.Send(command, cancellationToken);
         return NoContent();
     }