From de63e9f216c41ddbad36ed1578a7462c6cb74282 Mon Sep 17 00:00:00 2001 From: Aaron Po Date: Fri, 11 Sep 2026 23:46:04 -0400 Subject: [PATCH] Move Infrastructure.Email into Features.Emails (#288) --- web/backend/API/API.Core/Dockerfile | 1 - web/backend/API/API.Specs/API.Specs.csproj | 1 - web/backend/API/API.Specs/Dockerfile | 1 - .../API/API.Specs/Mocks/MockEmailProvider.cs | 2 +- web/backend/API/API.Specs/TestApiFactory.cs | 1 - web/backend/Biergarten.API.slnx | 1 - ...aturesEmailsServiceCollectionExtensions.cs | 1 - .../Features.Emails/Features.Emails.csproj | 2 +- .../Services/EmailDispatcher.cs | 1 - .../Services}/IEmailProvider.cs | 2 +- .../Services}/SmtpEmailProvider.cs | 2 +- .../Infrastructure.Email.csproj | 20 ------------------- 12 files changed, 4 insertions(+), 31 deletions(-) rename web/backend/{Infrastructure/Infrastructure.Email => Features/Features.Emails/Services}/IEmailProvider.cs (96%) rename web/backend/{Infrastructure/Infrastructure.Email => Features/Features.Emails/Services}/SmtpEmailProvider.cs (99%) delete mode 100644 web/backend/Infrastructure/Infrastructure.Email/Infrastructure.Email.csproj diff --git a/web/backend/API/API.Core/Dockerfile b/web/backend/API/API.Core/Dockerfile index c8b111bd..dbf2cb71 100644 --- a/web/backend/API/API.Core/Dockerfile +++ b/web/backend/API/API.Core/Dockerfile @@ -34,7 +34,6 @@ COPY ["Features/Features.PhotoUpload.Tests/Features.PhotoUpload.Tests.csproj", " COPY ["Features/Features.Users/Features.Users.csproj", "Features/Features.Users/"] COPY ["Features/Features.Users.Tests/Features.Users.Tests.csproj", "Features/Features.Users.Tests/"] COPY ["Infrastructure/Infrastructure.Configuration/Infrastructure.Configuration.csproj", "Infrastructure/Infrastructure.Configuration/"] -COPY ["Infrastructure/Infrastructure.Email/Infrastructure.Email.csproj", "Infrastructure/Infrastructure.Email/"] COPY ["Infrastructure/Infrastructure.FileUpload/Infrastructure.FileUpload.csproj", "Infrastructure/Infrastructure.FileUpload/"] COPY ["Shared/Shared.Application/Shared.Application.csproj", "Shared/Shared.Application/"] COPY ["Shared/Shared.Contracts/Shared.Contracts.csproj", "Shared/Shared.Contracts/"] diff --git a/web/backend/API/API.Specs/API.Specs.csproj b/web/backend/API/API.Specs/API.Specs.csproj index 527a04db..af456d56 100644 --- a/web/backend/API/API.Specs/API.Specs.csproj +++ b/web/backend/API/API.Specs/API.Specs.csproj @@ -39,7 +39,6 @@ - diff --git a/web/backend/API/API.Specs/Dockerfile b/web/backend/API/API.Specs/Dockerfile index c0b248a2..97033c14 100644 --- a/web/backend/API/API.Specs/Dockerfile +++ b/web/backend/API/API.Specs/Dockerfile @@ -24,7 +24,6 @@ COPY ["Features/Features.PhotoUpload.Tests/Features.PhotoUpload.Tests.csproj", " COPY ["Features/Features.Users/Features.Users.csproj", "Features/Features.Users/"] COPY ["Features/Features.Users.Tests/Features.Users.Tests.csproj", "Features/Features.Users.Tests/"] COPY ["Infrastructure/Infrastructure.Configuration/Infrastructure.Configuration.csproj", "Infrastructure/Infrastructure.Configuration/"] -COPY ["Infrastructure/Infrastructure.Email/Infrastructure.Email.csproj", "Infrastructure/Infrastructure.Email/"] COPY ["Infrastructure/Infrastructure.FileUpload/Infrastructure.FileUpload.csproj", "Infrastructure/Infrastructure.FileUpload/"] COPY ["Shared/Shared.Application/Shared.Application.csproj", "Shared/Shared.Application/"] COPY ["Shared/Shared.Contracts/Shared.Contracts.csproj", "Shared/Shared.Contracts/"] diff --git a/web/backend/API/API.Specs/Mocks/MockEmailProvider.cs b/web/backend/API/API.Specs/Mocks/MockEmailProvider.cs index 54ba74b3..82f73031 100644 --- a/web/backend/API/API.Specs/Mocks/MockEmailProvider.cs +++ b/web/backend/API/API.Specs/Mocks/MockEmailProvider.cs @@ -1,4 +1,4 @@ -using Infrastructure.Email; +using Features.Emails.Services; namespace API.Specs.Mocks; diff --git a/web/backend/API/API.Specs/TestApiFactory.cs b/web/backend/API/API.Specs/TestApiFactory.cs index 403dd49c..e6b5c1e0 100644 --- a/web/backend/API/API.Specs/TestApiFactory.cs +++ b/web/backend/API/API.Specs/TestApiFactory.cs @@ -1,7 +1,6 @@ using API.Core; using API.Specs.Mocks; using Features.Emails.Services; -using Infrastructure.Email; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc.Testing; using Microsoft.Extensions.DependencyInjection; diff --git a/web/backend/Biergarten.API.slnx b/web/backend/Biergarten.API.slnx index c49f3bee..415a0b56 100644 --- a/web/backend/Biergarten.API.slnx +++ b/web/backend/Biergarten.API.slnx @@ -21,7 +21,6 @@ - diff --git a/web/backend/Features/Features.Emails/DependencyInjection/FeaturesEmailsServiceCollectionExtensions.cs b/web/backend/Features/Features.Emails/DependencyInjection/FeaturesEmailsServiceCollectionExtensions.cs index ac8f43c1..4c177e9a 100644 --- a/web/backend/Features/Features.Emails/DependencyInjection/FeaturesEmailsServiceCollectionExtensions.cs +++ b/web/backend/Features/Features.Emails/DependencyInjection/FeaturesEmailsServiceCollectionExtensions.cs @@ -1,6 +1,5 @@ using Features.Emails.Services; using Features.Emails.Templates.Rendering; -using Infrastructure.Email; using Microsoft.Extensions.DependencyInjection; diff --git a/web/backend/Features/Features.Emails/Features.Emails.csproj b/web/backend/Features/Features.Emails/Features.Emails.csproj index f08e5bb5..3f7ceaf6 100644 --- a/web/backend/Features/Features.Emails/Features.Emails.csproj +++ b/web/backend/Features/Features.Emails/Features.Emails.csproj @@ -7,6 +7,7 @@ + - diff --git a/web/backend/Features/Features.Emails/Services/EmailDispatcher.cs b/web/backend/Features/Features.Emails/Services/EmailDispatcher.cs index 83e773a8..10a631ca 100644 --- a/web/backend/Features/Features.Emails/Services/EmailDispatcher.cs +++ b/web/backend/Features/Features.Emails/Services/EmailDispatcher.cs @@ -1,6 +1,5 @@ using Features.Emails.Templates.Rendering; using Infrastructure.Configuration; -using Infrastructure.Email; using Microsoft.Extensions.Configuration; namespace Features.Emails.Services; diff --git a/web/backend/Infrastructure/Infrastructure.Email/IEmailProvider.cs b/web/backend/Features/Features.Emails/Services/IEmailProvider.cs similarity index 96% rename from web/backend/Infrastructure/Infrastructure.Email/IEmailProvider.cs rename to web/backend/Features/Features.Emails/Services/IEmailProvider.cs index 94641d2c..a56a2ea5 100644 --- a/web/backend/Infrastructure/Infrastructure.Email/IEmailProvider.cs +++ b/web/backend/Features/Features.Emails/Services/IEmailProvider.cs @@ -1,4 +1,4 @@ -namespace Infrastructure.Email; +namespace Features.Emails.Services; /// /// Service for sending emails. diff --git a/web/backend/Infrastructure/Infrastructure.Email/SmtpEmailProvider.cs b/web/backend/Features/Features.Emails/Services/SmtpEmailProvider.cs similarity index 99% rename from web/backend/Infrastructure/Infrastructure.Email/SmtpEmailProvider.cs rename to web/backend/Features/Features.Emails/Services/SmtpEmailProvider.cs index 2c97a641..0626a2d7 100644 --- a/web/backend/Infrastructure/Infrastructure.Email/SmtpEmailProvider.cs +++ b/web/backend/Features/Features.Emails/Services/SmtpEmailProvider.cs @@ -4,7 +4,7 @@ using MailKit.Security; using Microsoft.Extensions.Configuration; using MimeKit; -namespace Infrastructure.Email; +namespace Features.Emails.Services; /// /// SMTP email service implementation using MailKit. diff --git a/web/backend/Infrastructure/Infrastructure.Email/Infrastructure.Email.csproj b/web/backend/Infrastructure/Infrastructure.Email/Infrastructure.Email.csproj deleted file mode 100644 index 7869192a..00000000 --- a/web/backend/Infrastructure/Infrastructure.Email/Infrastructure.Email.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - net10.0 - enable - enable - Infrastructure.Email - - - - - - - - - - -