Fix - replace KeyNotFoundException with NotFoundException for consistency across handlers

Author: Se3do

MailCore.Application.Tests/Commands/SendEmailCommandHandlerTests.cs

@@ -1,6 +1,7 @@
 using MailCore.Application.Commands.Emails.SendEmail;
 using MailCore.Application.DTOs.Emails;
 using MailCore.Application.Emails;
+using MailCore.Application.Exceptions;
 using MailCore.Application.Interfaces.Services;
 using MailCore.Domain.Entities;
 using MailCore.Domain.Enums;
@@ -106,35 +107,35 @@ public async Task Handle_AddsMailRecipientForEachToAddress()
     // ?? Failure paths ????????????????????????????????????????????????????????
 
     [Fact]
-    public async Task Handle_SenderNotFound_ThrowsKeyNotFoundException()
+    public async Task Handle_SenderNotFound_ThrowsNotFoundException()
     {
   _userRepo.Setup(r => r.GetByIdAsync(_userId, default)).ReturnsAsync((User?)null);
 
-        await Assert.ThrowsAsync<KeyNotFoundException>(
+        await Assert.ThrowsAsync<NotFoundException>(
         () => _sut.Handle(ValidCommand(), default));
 
     _emailRepo.Verify(r => r.AddAsync(It.IsAny<Email>(), default), Times.Never);
     }
 
     [Fact]
-    public async Task Handle_ThreadNotFound_ThrowsKeyNotFoundException()
+    public async Task Handle_ThreadNotFound_ThrowsNotFoundException()
 {
    var threadId = Guid.NewGuid();
         _userRepo.Setup(r => r.GetByIdAsync(_userId, default)).ReturnsAsync(_sender);
 _threadRepo.Setup(r => r.GetByIdAsync(threadId, default)).ReturnsAsync((Domain.Entities.Thread?)null);
 
-        await Assert.ThrowsAsync<KeyNotFoundException>(
+        await Assert.ThrowsAsync<NotFoundException>(
 () => _sut.Handle(ValidCommand(threadId), default));
     }
 
     [Fact]
-    public async Task Handle_RecipientNotFound_ThrowsKeyNotFoundException()
+    public async Task Handle_RecipientNotFound_ThrowsNotFoundException()
 {
         _userRepo.Setup(r => r.GetByIdAsync(_userId, default)).ReturnsAsync(_sender);
    _userRepo.Setup(r => r.GetByEmailAsync("recipient@example.com", default))
    .ReturnsAsync((User?)null);
 
-        await Assert.ThrowsAsync<KeyNotFoundException>(
+        await Assert.ThrowsAsync<NotFoundException>(
             () => _sut.Handle(ValidCommand(), default));
     }
 }

MailCore.Application/Commands/Emails/SendEmail/SendEmailCommandHandler.cs

@@ -1,4 +1,5 @@
 using MailCore.Application.Emails;
+using MailCore.Application.Exceptions;
 using MailCore.Application.Interfaces.Services;
 using MailCore.Application.Mappers;
 using MailCore.Application.Notifications;
@@ -44,7 +45,7 @@ public async Task Handle(SendEmailCommand command, CancellationToken cancellatio
             var sender = await _userRepository.GetByIdAsync(userId, cancellationToken);
             if (sender == null)
             {
-                throw new KeyNotFoundException("Sender not found.");
+                throw new NotFoundException("Sender not found.");
             }
 
             var now = DateTime.UtcNow;
@@ -79,7 +80,7 @@ await _publisher.Publish(new EmailSentNotification(
             if (threadId.HasValue)
             {
                 var thread = await _threadRepository.GetByIdAsync(threadId.Value, ct)
-                             ?? throw new KeyNotFoundException("Thread not found.");
+                             ?? throw new NotFoundException("Thread not found.");
 
                 thread.Touch();
                 return thread;

MailCore.Application/Emails/EmailComposer.cs

@@ -1,4 +1,5 @@
-using MailCore.Application.Interfaces.Services;
+using MailCore.Application.Exceptions;
+using MailCore.Application.Interfaces.Services;
 using MailCore.Application.Models;
 using MailCore.Domain.Entities;
 using MailCore.Domain.Enums;
@@ -34,7 +35,7 @@ public async Task AddRecipientsAsync(
                          .Distinct(StringComparer.OrdinalIgnoreCase))
             {
                 var user = await _userRepository.GetByEmailAsync(address, ct)
-                           ?? throw new KeyNotFoundException($"Recipient not found: {address}");
+                           ?? throw new NotFoundException($"Recipient not found: {address}");
 
                 var mr = MailRecipient.Create(user.Id, email.Id, type, receivedAt);
                 await _mailRecipientRepository.AddAsync(mr, ct);