diff --git a/src/core/DigitalData.MessagingService.Abstraction/Email.cs b/src/core/DigitalData.MessagingService.Abstraction/EmailContext.cs similarity index 97% rename from src/core/DigitalData.MessagingService.Abstraction/Email.cs rename to src/core/DigitalData.MessagingService.Abstraction/EmailContext.cs index ab1650c..65d6127 100644 --- a/src/core/DigitalData.MessagingService.Abstraction/Email.cs +++ b/src/core/DigitalData.MessagingService.Abstraction/EmailContext.cs @@ -1,6 +1,6 @@ namespace DigitalData.MessagingService.Abstraction; -public record Email +public record EmailContext { #if NETFRAMEWORK public EmailAccountDto Sender { get; set; } = null!; diff --git a/src/core/DigitalData.MessagingService.Abstraction/SendingEmailEvent.cs b/src/core/DigitalData.MessagingService.Abstraction/SendingEmailEvent.cs index 4093cf1..5d9f315 100644 --- a/src/core/DigitalData.MessagingService.Abstraction/SendingEmailEvent.cs +++ b/src/core/DigitalData.MessagingService.Abstraction/SendingEmailEvent.cs @@ -9,9 +9,9 @@ public record SendingEmailEvent #endif #if NETFRAMEWORK - public Email Mail { get; set; } = null!; + public EmailContext Mail { get; set; } = null!; #else - public required Email Mail { get; init; } + public required EmailContext Mail { get; init; } #endif #if NETFRAMEWORK diff --git a/src/core/DigitalData.MessagingService.Application/Common/Mappings/EmailMappingProfile.cs b/src/core/DigitalData.MessagingService.Application/Common/Mappings/EmailMappingProfile.cs index 3972ab6..4726a32 100644 --- a/src/core/DigitalData.MessagingService.Application/Common/Mappings/EmailMappingProfile.cs +++ b/src/core/DigitalData.MessagingService.Application/Common/Mappings/EmailMappingProfile.cs @@ -13,6 +13,6 @@ public class EmailMappingProfile : Profile { // SendEmailCommand -> Email // Sender is resolved via MediatR in the handler and set separately after mapping. - CreateMap(); + CreateMap(); } } diff --git a/src/core/DigitalData.MessagingService.Application/EmailSending/Commands/SendEmailCommand.cs b/src/core/DigitalData.MessagingService.Application/EmailSending/Commands/SendEmailCommand.cs index f4a7e77..d376eb5 100644 --- a/src/core/DigitalData.MessagingService.Application/EmailSending/Commands/SendEmailCommand.cs +++ b/src/core/DigitalData.MessagingService.Application/EmailSending/Commands/SendEmailCommand.cs @@ -46,7 +46,7 @@ public class SendEmailCommandHandler(ISender Sender, ISendingEmailPublisher Publ ?? throw new NotFoundException( $"No email account found for the given sender criteria (Id: {request.Sender.Id}, Username: {request.Sender.Username})."); - var email = Mapper.Map(request) with { Sender = senderAccount }; + var email = Mapper.Map(request) with { Sender = senderAccount }; // Enqueue to RabbitMQ var sendingEmailEvent = new SendingEmailEvent() diff --git a/src/presentation/DigitalData.MessagingService.Client/EmailSender.cs b/src/presentation/DigitalData.MessagingService.Client/EmailSender.cs index 7a817e4..523f7f5 100644 --- a/src/presentation/DigitalData.MessagingService.Client/EmailSender.cs +++ b/src/presentation/DigitalData.MessagingService.Client/EmailSender.cs @@ -113,13 +113,13 @@ public static class EmailSender /// Thrown when has not been called prior to sending. /// /// - /// This method maps to , + /// This method maps to , /// then resolves from the internal /// service provider and calls EnqueueAsync in a fire-and-forget manner. /// Ensure that any unhandled exceptions from the async operation are handled /// at the publisher level. /// - public static void Send(Email email) + public static void Send(EmailContext email) { if(!IsConnected) throw new InvalidOperationException("Messaging service is not connected. Call ConnectRabbitMq first."); diff --git a/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderTests.cs b/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderTests.cs index 13ba0a9..0711572 100644 --- a/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderTests.cs +++ b/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderTests.cs @@ -75,7 +75,7 @@ public sealed class EmailSenderTests [Fact] public void Send_WithValidEmail_DoesNotThrow() { - var email = new Email + var email = new EmailContext { Sender = new EmailAccountDto { Username = "test@example.com", Password = "password", SmtpServer = "smtp.example.com" }, Recipients = ["hakanttek@gmail.com"], @@ -92,7 +92,7 @@ public sealed class EmailSenderTests [Fact] public void Send_WithPlainTextBody_DoesNotThrow() { - var email = new Email + var email = new EmailContext { Sender = new EmailAccountDto { Username = "test@example.com", Password = "password", SmtpServer = "smtp.example.com" }, Recipients = ["hakanttek@gmail.com"], diff --git a/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderUrlOverloadTests.cs b/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderUrlOverloadTests.cs index 46abc8e..8fe46a4 100644 --- a/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderUrlOverloadTests.cs +++ b/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderUrlOverloadTests.cs @@ -55,7 +55,7 @@ public sealed class EmailSenderUrlOverloadTests [Fact] public void Send_AfterUrlOverloadConnection_DoesNotThrow() { - var email = new Email + var email = new EmailContext { Sender = new EmailAccountDto { Username = "test@example.com", Password = "password", SmtpServer = "smtp.example.com" }, Recipients = ["url-overload-test@example.com"], diff --git a/tests/DigitalData.MessagingService.Tests/Integration/SendingEmailPublisherTests.cs b/tests/DigitalData.MessagingService.Tests/Integration/SendingEmailPublisherTests.cs index 506c4ff..1153075 100644 --- a/tests/DigitalData.MessagingService.Tests/Integration/SendingEmailPublisherTests.cs +++ b/tests/DigitalData.MessagingService.Tests/Integration/SendingEmailPublisherTests.cs @@ -37,7 +37,7 @@ public sealed class SendingEmailPublisherTests : IAsyncDisposable var email = new SendingEmailEvent { Id = Guid.NewGuid(), - Mail = new Email + Mail = new EmailContext { Sender = new EmailAccountDto { Username = "test@example.com", Password = "password", SmtpServer = "smtp.example.com" }, Recipients = ["test@example.com"], @@ -66,7 +66,7 @@ public sealed class SendingEmailPublisherTests : IAsyncDisposable var emails = Enumerable.Range(1, 3).Select(i => new SendingEmailEvent { Id = Guid.NewGuid(), - Mail = new Email + Mail = new EmailContext { Sender = new EmailAccountDto { Username = "test@example.com", Password = "password", SmtpServer = "smtp.example.com" }, Recipients = new List { $"recipient{i}@example.com" }, @@ -93,7 +93,7 @@ public sealed class SendingEmailPublisherTests : IAsyncDisposable var email = new SendingEmailEvent { Id = Guid.NewGuid(), - Mail = new Email + Mail = new EmailContext { Sender = new EmailAccountDto { Username = "test@example.com", Password = "password", SmtpServer = "smtp.example.com" }, Recipients = ["depth-test@example.com"], @@ -120,7 +120,7 @@ public sealed class SendingEmailPublisherTests : IAsyncDisposable var email = new SendingEmailEvent { Id = id, - Mail = new Email + Mail = new EmailContext { Sender = new EmailAccountDto { Username = "test@example.com", Password = "password", SmtpServer = "smtp.example.com" }, Recipients = new List { "serialize@example.com" },