diff --git a/DigitalData.MessagingService.sln b/DigitalData.MessagingService.sln index cc5c98c..d64914f 100644 --- a/DigitalData.MessagingService.sln +++ b/DigitalData.MessagingService.sln @@ -27,8 +27,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingServic EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingService.Domain", "src\core\DigitalData.MessagingService.Domain\DigitalData.MessagingService.Domain.csproj", "{8E44FA5B-43DD-E273-C682-FC382A854A6D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingService.Publisher.Abstraction", "src\core\DigitalData.MessagingService.Publisher.Abstraction\DigitalData.MessagingService.Publisher.Abstraction.csproj", "{8A44EE33-02AA-8B3F-60F7-91BA483740A9}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingService.Infrastructure", "src\infrastructure\DigitalData.MessagingService.Infrastructure\DigitalData.MessagingService.Infrastructure.csproj", "{56607AAB-3DEC-CB78-3062-56A8EEF5E9D2}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingService.RabbitMQ", "src\infrastructure\DigitalData.MessagingService.RabbitMQ\DigitalData.MessagingService.RabbitMQ.csproj", "{4CF993A6-FA3E-CBF7-C4CB-FFAEBFCFF705}" @@ -39,6 +37,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingServic EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingService.Client", "src\presentation\DigitalData.MessagingService.Client\DigitalData.MessagingService.Client.csproj", "{770E96B0-C3C9-A9A3-4F98-F7A0295D1599}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingService.Abstraction", "src\core\DigitalData.MessagingService.Abstraction\DigitalData.MessagingService.Abstraction.csproj", "{6D5E14FC-E4E1-32E3-4F3F-19DE96233128}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -57,10 +57,6 @@ Global {8E44FA5B-43DD-E273-C682-FC382A854A6D}.Debug|Any CPU.Build.0 = Debug|Any CPU {8E44FA5B-43DD-E273-C682-FC382A854A6D}.Release|Any CPU.ActiveCfg = Release|Any CPU {8E44FA5B-43DD-E273-C682-FC382A854A6D}.Release|Any CPU.Build.0 = Release|Any CPU - {8A44EE33-02AA-8B3F-60F7-91BA483740A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A44EE33-02AA-8B3F-60F7-91BA483740A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A44EE33-02AA-8B3F-60F7-91BA483740A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A44EE33-02AA-8B3F-60F7-91BA483740A9}.Release|Any CPU.Build.0 = Release|Any CPU {56607AAB-3DEC-CB78-3062-56A8EEF5E9D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {56607AAB-3DEC-CB78-3062-56A8EEF5E9D2}.Debug|Any CPU.Build.0 = Debug|Any CPU {56607AAB-3DEC-CB78-3062-56A8EEF5E9D2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -81,6 +77,10 @@ Global {770E96B0-C3C9-A9A3-4F98-F7A0295D1599}.Debug|Any CPU.Build.0 = Release|Any CPU {770E96B0-C3C9-A9A3-4F98-F7A0295D1599}.Release|Any CPU.ActiveCfg = Release|Any CPU {770E96B0-C3C9-A9A3-4F98-F7A0295D1599}.Release|Any CPU.Build.0 = Release|Any CPU + {6D5E14FC-E4E1-32E3-4F3F-19DE96233128}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6D5E14FC-E4E1-32E3-4F3F-19DE96233128}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6D5E14FC-E4E1-32E3-4F3F-19DE96233128}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6D5E14FC-E4E1-32E3-4F3F-19DE96233128}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -92,12 +92,12 @@ Global {71BEA4D0-7835-4A8C-B11E-1088E0801DCE} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} {7CBE8648-F259-CC91-87FF-5859280867A8} = {DD9D4A3A-AB55-456E-80D3-54A2D4025E64} {8E44FA5B-43DD-E273-C682-FC382A854A6D} = {DD9D4A3A-AB55-456E-80D3-54A2D4025E64} - {8A44EE33-02AA-8B3F-60F7-91BA483740A9} = {DD9D4A3A-AB55-456E-80D3-54A2D4025E64} {56607AAB-3DEC-CB78-3062-56A8EEF5E9D2} = {71BEA4D0-7835-4A8C-B11E-1088E0801DCE} {4CF993A6-FA3E-CBF7-C4CB-FFAEBFCFF705} = {71BEA4D0-7835-4A8C-B11E-1088E0801DCE} {8BF22107-3CB9-C326-B94B-C40C99DA9B68} = {B52B4CEE-1C67-424B-8659-370FEA7EAF2A} {8DBBAA7C-C4D3-4ADD-8372-B0D6260C8FFC} = {71BEA4D0-7835-4A8C-B11E-1088E0801DCE} {770E96B0-C3C9-A9A3-4F98-F7A0295D1599} = {B52B4CEE-1C67-424B-8659-370FEA7EAF2A} + {6D5E14FC-E4E1-32E3-4F3F-19DE96233128} = {DD9D4A3A-AB55-456E-80D3-54A2D4025E64} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {90E29FDC-F6C6-414F-94BF-25DF61D18060} diff --git a/src/core/DigitalData.MessagingService.Publisher.Abstraction/DigitalData.MessagingService.Publisher.Abstraction.csproj b/src/core/DigitalData.MessagingService.Abstraction/DigitalData.MessagingService.Abstraction.csproj similarity index 100% rename from src/core/DigitalData.MessagingService.Publisher.Abstraction/DigitalData.MessagingService.Publisher.Abstraction.csproj rename to src/core/DigitalData.MessagingService.Abstraction/DigitalData.MessagingService.Abstraction.csproj diff --git a/src/core/DigitalData.MessagingService.Publisher.Abstraction/EmailAccountDto.cs b/src/core/DigitalData.MessagingService.Abstraction/EmailAccountDto.cs similarity index 92% rename from src/core/DigitalData.MessagingService.Publisher.Abstraction/EmailAccountDto.cs rename to src/core/DigitalData.MessagingService.Abstraction/EmailAccountDto.cs index 9579cc9..4ad1208 100644 --- a/src/core/DigitalData.MessagingService.Publisher.Abstraction/EmailAccountDto.cs +++ b/src/core/DigitalData.MessagingService.Abstraction/EmailAccountDto.cs @@ -1,4 +1,4 @@ -namespace DigitalData.MessagingService.Publisher.Abstraction; +namespace DigitalData.MessagingService.Abstraction; /// /// DTO for a single email account configuration. diff --git a/src/core/DigitalData.MessagingService.Publisher.Abstraction/IOutgoingEmailPublisher.cs b/src/core/DigitalData.MessagingService.Abstraction/IOutgoingEmailPublisher.cs similarity index 72% rename from src/core/DigitalData.MessagingService.Publisher.Abstraction/IOutgoingEmailPublisher.cs rename to src/core/DigitalData.MessagingService.Abstraction/IOutgoingEmailPublisher.cs index b30666a..5924446 100644 --- a/src/core/DigitalData.MessagingService.Publisher.Abstraction/IOutgoingEmailPublisher.cs +++ b/src/core/DigitalData.MessagingService.Abstraction/IOutgoingEmailPublisher.cs @@ -1,7 +1,4 @@ -using System.Threading; -using System.Threading.Tasks; - -namespace DigitalData.MessagingService.Publisher.Abstraction; +namespace DigitalData.MessagingService.Abstraction; /// /// Email queue interface for outgoing emails. diff --git a/src/core/DigitalData.MessagingService.Publisher.Abstraction/OutgoingEmailCreateDto.cs b/src/core/DigitalData.MessagingService.Abstraction/OutgoingEmailCreateDto.cs similarity index 89% rename from src/core/DigitalData.MessagingService.Publisher.Abstraction/OutgoingEmailCreateDto.cs rename to src/core/DigitalData.MessagingService.Abstraction/OutgoingEmailCreateDto.cs index 715f336..4f579d4 100644 --- a/src/core/DigitalData.MessagingService.Publisher.Abstraction/OutgoingEmailCreateDto.cs +++ b/src/core/DigitalData.MessagingService.Abstraction/OutgoingEmailCreateDto.cs @@ -1,4 +1,4 @@ -namespace DigitalData.MessagingService.Publisher.Abstraction; +namespace DigitalData.MessagingService.Abstraction; public record OutgoingEmailCreateDto { diff --git a/src/core/DigitalData.MessagingService.Publisher.Abstraction/OutgoingEmailEvent.cs b/src/core/DigitalData.MessagingService.Abstraction/OutgoingEmailEvent.cs similarity index 91% rename from src/core/DigitalData.MessagingService.Publisher.Abstraction/OutgoingEmailEvent.cs rename to src/core/DigitalData.MessagingService.Abstraction/OutgoingEmailEvent.cs index c8f10e1..344aeab 100644 --- a/src/core/DigitalData.MessagingService.Publisher.Abstraction/OutgoingEmailEvent.cs +++ b/src/core/DigitalData.MessagingService.Abstraction/OutgoingEmailEvent.cs @@ -1,4 +1,4 @@ -namespace DigitalData.MessagingService.Publisher.Abstraction; +namespace DigitalData.MessagingService.Abstraction; public record OutgoingEmailEvent { diff --git a/src/core/DigitalData.MessagingService.Application/Common/Interfaces/IEmailService.cs b/src/core/DigitalData.MessagingService.Application/Common/Interfaces/IEmailService.cs index f0f7c75..7a663ea 100644 --- a/src/core/DigitalData.MessagingService.Application/Common/Interfaces/IEmailService.cs +++ b/src/core/DigitalData.MessagingService.Application/Common/Interfaces/IEmailService.cs @@ -1,4 +1,4 @@ -using DigitalData.MessagingService.Publisher.Abstraction; +using DigitalData.MessagingService.Abstraction; namespace DigitalData.MessagingService.Application.Common.Interfaces; diff --git a/src/core/DigitalData.MessagingService.Application/Common/Mappings/EmailMappingProfile.cs b/src/core/DigitalData.MessagingService.Application/Common/Mappings/EmailMappingProfile.cs index fdb0c3b..70176a5 100644 --- a/src/core/DigitalData.MessagingService.Application/Common/Mappings/EmailMappingProfile.cs +++ b/src/core/DigitalData.MessagingService.Application/Common/Mappings/EmailMappingProfile.cs @@ -1,6 +1,6 @@ using AutoMapper; using DigitalData.MessagingService.Application.EmailSending.Commands; -using DigitalData.MessagingService.Publisher.Abstraction; +using DigitalData.MessagingService.Abstraction; namespace DigitalData.MessagingService.Application.Common.Mappings; diff --git a/src/core/DigitalData.MessagingService.Application/Common/Options/EmailAccountsOptions.cs b/src/core/DigitalData.MessagingService.Application/Common/Options/EmailAccountsOptions.cs index 3f2e5b9..763f430 100644 --- a/src/core/DigitalData.MessagingService.Application/Common/Options/EmailAccountsOptions.cs +++ b/src/core/DigitalData.MessagingService.Application/Common/Options/EmailAccountsOptions.cs @@ -1,4 +1,4 @@ -using DigitalData.MessagingService.Publisher.Abstraction; +using DigitalData.MessagingService.Abstraction; namespace DigitalData.MessagingService.Application.Common.Options; diff --git a/src/core/DigitalData.MessagingService.Application/DigitalData.MessagingService.Application.csproj b/src/core/DigitalData.MessagingService.Application/DigitalData.MessagingService.Application.csproj index b06f179..dc9a302 100644 --- a/src/core/DigitalData.MessagingService.Application/DigitalData.MessagingService.Application.csproj +++ b/src/core/DigitalData.MessagingService.Application/DigitalData.MessagingService.Application.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/core/DigitalData.MessagingService.Application/EmailAccount/Queries/GetSenderQuery.cs b/src/core/DigitalData.MessagingService.Application/EmailAccount/Queries/GetSenderQuery.cs index 5887584..ce492bc 100644 --- a/src/core/DigitalData.MessagingService.Application/EmailAccount/Queries/GetSenderQuery.cs +++ b/src/core/DigitalData.MessagingService.Application/EmailAccount/Queries/GetSenderQuery.cs @@ -1,5 +1,5 @@ using DigitalData.MessagingService.Application.Common.Options; -using DigitalData.MessagingService.Publisher.Abstraction; +using DigitalData.MessagingService.Abstraction; using MediatR; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/core/DigitalData.MessagingService.Application/EmailSending/Commands/SendEmailCommand.cs b/src/core/DigitalData.MessagingService.Application/EmailSending/Commands/SendEmailCommand.cs index 09ebc79..e153bbe 100644 --- a/src/core/DigitalData.MessagingService.Application/EmailSending/Commands/SendEmailCommand.cs +++ b/src/core/DigitalData.MessagingService.Application/EmailSending/Commands/SendEmailCommand.cs @@ -1,7 +1,7 @@ using AutoMapper; using DigitalData.MessagingService.Application.EmailAccount.Queries; using DigitalData.MessagingService.Domain.Exceptions; -using DigitalData.MessagingService.Publisher.Abstraction; +using DigitalData.MessagingService.Abstraction; using MediatR; namespace DigitalData.MessagingService.Application.EmailSending.Commands; diff --git a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Queue/OutgoingEmailConsumer.cs b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Queue/OutgoingEmailConsumer.cs index 6e5aa7c..a042c96 100644 --- a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Queue/OutgoingEmailConsumer.cs +++ b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Queue/OutgoingEmailConsumer.cs @@ -1,7 +1,7 @@ using System.Text; using System.Text.Json; using DigitalData.MessagingService.Application.Common.Interfaces; -using DigitalData.MessagingService.Publisher.Abstraction; +using DigitalData.MessagingService.Abstraction; using DigitalData.MessagingService.RabbitMQ; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsEmailService.cs b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsEmailService.cs index 569e119..f65f793 100644 --- a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsEmailService.cs +++ b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsEmailService.cs @@ -5,7 +5,7 @@ using Limilabs.Client.SMTP; using Limilabs.Mail; using Limilabs.Mail.Headers; using DigitalData.MessagingService.Infrastructure.Services.Extensions; -using DigitalData.MessagingService.Publisher.Abstraction; +using DigitalData.MessagingService.Abstraction; namespace DigitalData.MessagingService.Infrastructure.Services; diff --git a/src/infrastructure/DigitalData.MessagingService.Publisher/DependencyInjection.cs b/src/infrastructure/DigitalData.MessagingService.Publisher/DependencyInjection.cs index 6867dd9..3b75b88 100644 --- a/src/infrastructure/DigitalData.MessagingService.Publisher/DependencyInjection.cs +++ b/src/infrastructure/DigitalData.MessagingService.Publisher/DependencyInjection.cs @@ -1,4 +1,4 @@ -using DigitalData.MessagingService.Publisher.Abstraction; +using DigitalData.MessagingService.Abstraction; using DigitalData.MessagingService.RabbitMQ; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; diff --git a/src/infrastructure/DigitalData.MessagingService.Publisher/DigitalData.MessagingService.Publisher.csproj b/src/infrastructure/DigitalData.MessagingService.Publisher/DigitalData.MessagingService.Publisher.csproj index 0e91d78..46588ce 100644 --- a/src/infrastructure/DigitalData.MessagingService.Publisher/DigitalData.MessagingService.Publisher.csproj +++ b/src/infrastructure/DigitalData.MessagingService.Publisher/DigitalData.MessagingService.Publisher.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/infrastructure/DigitalData.MessagingService.Publisher/OutgoingEmailPublisher.cs b/src/infrastructure/DigitalData.MessagingService.Publisher/OutgoingEmailPublisher.cs index 4192f42..2be2a89 100644 --- a/src/infrastructure/DigitalData.MessagingService.Publisher/OutgoingEmailPublisher.cs +++ b/src/infrastructure/DigitalData.MessagingService.Publisher/OutgoingEmailPublisher.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using RabbitMQ.Client; using DigitalData.MessagingService.RabbitMQ; -using DigitalData.MessagingService.Publisher.Abstraction; +using DigitalData.MessagingService.Abstraction; namespace DigitalData.MessagingService.Publisher; diff --git a/src/presentation/DigitalData.MessagingService.Client/DigitalData.MessagingService.Client.csproj b/src/presentation/DigitalData.MessagingService.Client/DigitalData.MessagingService.Client.csproj index dd1bb6f..d4f0a75 100644 --- a/src/presentation/DigitalData.MessagingService.Client/DigitalData.MessagingService.Client.csproj +++ b/src/presentation/DigitalData.MessagingService.Client/DigitalData.MessagingService.Client.csproj @@ -35,7 +35,7 @@ - + diff --git a/src/presentation/DigitalData.MessagingService.Client/Email.cs b/src/presentation/DigitalData.MessagingService.Client/Email.cs index a47de18..85e46c2 100644 --- a/src/presentation/DigitalData.MessagingService.Client/Email.cs +++ b/src/presentation/DigitalData.MessagingService.Client/Email.cs @@ -1,4 +1,4 @@ -using DigitalData.MessagingService.Publisher.Abstraction; +using DigitalData.MessagingService.Abstraction; namespace DigitalData.MessagingService.Client; diff --git a/src/presentation/DigitalData.MessagingService.Client/EmailSender.cs b/src/presentation/DigitalData.MessagingService.Client/EmailSender.cs index 911f526..9f85111 100644 --- a/src/presentation/DigitalData.MessagingService.Client/EmailSender.cs +++ b/src/presentation/DigitalData.MessagingService.Client/EmailSender.cs @@ -1,5 +1,5 @@ using DigitalData.MessagingService.Publisher; -using DigitalData.MessagingService.Publisher.Abstraction; +using DigitalData.MessagingService.Abstraction; using DigitalData.MessagingService.RabbitMQ; using Microsoft.Extensions.DependencyInjection; diff --git a/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderTests.cs b/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderTests.cs index 0d01834..b69df3f 100644 --- a/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderTests.cs +++ b/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderTests.cs @@ -1,5 +1,5 @@ using DigitalData.MessagingService.Client; -using DigitalData.MessagingService.Publisher.Abstraction; +using DigitalData.MessagingService.Abstraction; namespace DigitalData.MessagingService.Tests.Integration; diff --git a/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderUrlOverloadTests.cs b/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderUrlOverloadTests.cs index 1072470..a145eff 100644 --- a/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderUrlOverloadTests.cs +++ b/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderUrlOverloadTests.cs @@ -1,5 +1,5 @@ using DigitalData.MessagingService.Client; -using DigitalData.MessagingService.Publisher.Abstraction; +using DigitalData.MessagingService.Abstraction; namespace DigitalData.MessagingService.Tests.Integration; diff --git a/tests/DigitalData.MessagingService.Tests/Integration/OutgoingEmailPublisherTests.cs b/tests/DigitalData.MessagingService.Tests/Integration/OutgoingEmailPublisherTests.cs index 9d20731..855ea68 100644 --- a/tests/DigitalData.MessagingService.Tests/Integration/OutgoingEmailPublisherTests.cs +++ b/tests/DigitalData.MessagingService.Tests/Integration/OutgoingEmailPublisherTests.cs @@ -1,7 +1,7 @@ using System.Text; using System.Text.Json; using DigitalData.MessagingService.Publisher; -using DigitalData.MessagingService.Publisher.Abstraction; +using DigitalData.MessagingService.Abstraction; using DigitalData.MessagingService.RabbitMQ; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging;