Replace email-service project with NuGet package

Directory.Packages.props

@@ -8,6 +8,7 @@
     <PackageVersion Include="Dapper" Version="2.1.35" />
     <PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.0" />
     <PackageVersion Include="GaEpd.AppLibrary" Version="5.3.1" />
+    <PackageVersion Include="GaEpd.EmailService" Version="1.0.0" />
     <PackageVersion Include="GaEpd.FileService" Version="3.1.1" />
     <PackageVersion Include="HtmlSanitizer" Version="8.1.870" />
     <PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />

src/AppServices/AppServices.csproj

@@ -11,6 +11,7 @@
         <PackageReference Include="AutoMapper" />
         <PackageReference Include="ClosedXML" />
         <PackageReference Include="FluentValidation.AspNetCore" />
+        <PackageReference Include="GaEpd.EmailService"/>
         <PackageReference Include="GaEpd.FileService" />
         <PackageReference Include="JetBrains.Annotations" />
         <PackageReference Include="Microsoft.Identity.Web" />
@@ -22,7 +23,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\Domain\Domain.csproj" />
-        <ProjectReference Include="..\EmailService\EmailService.csproj" />
     </ItemGroup>
 
 </Project>

src/AppServices/Notifications/NotificationService.cs

@@ -1,5 +1,5 @@
 using GaEpd.EmailService;
-using GaEpd.EmailService.Repository;
+using GaEpd.EmailService.EmailLogRepository;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using MyApp.AppServices.ErrorLogging;
@@ -9,7 +9,7 @@ namespace MyApp.AppServices.Notifications;
 
 public class NotificationService(
     IEmailService emailService,
-    IEmailLogRepository repository,
+    IEmailLogRepository emailLogRepository,
     IHostEnvironment environment,
     IConfiguration configuration,
     IErrorLogger errorLogger) : INotificationService
@@ -39,15 +39,15 @@ public async Task<NotificationResult> SendNotificationAsync(Template template, s
         Message message;
         try
         {
-            message = Message.Create(subject, recipientEmail, settings.DefaultSender, textBody, htmlBody);
+            message = Message.Create(subject, recipientEmail, textBody, htmlBody);
         }
         catch (Exception e)
         {
             await errorLogger.LogErrorAsync(e, subject).ConfigureAwait(false);
             return NotificationResult.FailureResult($"{FailurePrefix} An error occurred when generating the email.");
         }
 
-        if (settings.SaveEmail) await repository.InsertAsync(EmailLog.Create(message), token).ConfigureAwait(false);
+        await emailLogRepository.InsertAsync(message, token).ConfigureAwait(false);
 
         if (settings is { EnableEmail: false, EnableEmailAuditing: false })
         {
@@ -56,7 +56,7 @@ public async Task<NotificationResult> SendNotificationAsync(Template template, s
 
         try
         {
-            await emailService.SendEmailAsync(message, settings, token).ConfigureAwait(false);
+            _ = emailService.SendEmailAsync(message, token);
         }
         catch (Exception e)
         {

src/AppServices/Permissions/Policies.cs

@@ -30,14 +30,16 @@ public static class Policies
     // These policies are for use in PageModel class attributes, e.g.:
     // [Authorize(Policy = nameof(Policies.ActiveUser))]
 
-    public static void AddAuthorizationPolicies(this IServiceCollection services)
+    public static IServiceCollection AddAuthorizationPolicies(this IServiceCollection services)
     {
         services.AddAuthorizationBuilder()
             .AddPolicy(nameof(ActiveUser), ActiveUser)
             .AddPolicy(nameof(Manager), Manager)
             .AddPolicy(nameof(SiteMaintainer), SiteMaintainer)
             .AddPolicy(nameof(StaffUser), StaffUser)
             .AddPolicy(nameof(UserAdministrator), UserAdministrator);
+
+        return services;
     }
 
     // Default policy builder

src/AppServices/RegisterServices/AutoMapperProfiles.cs

@@ -5,9 +5,9 @@ namespace MyApp.AppServices.RegisterServices;
 
 public static class AutoMapperProfiles
 {
-    public static void AddAutoMapperProfiles(this IServiceCollection services)
+    public static IServiceCollection AddAutoMapperProfiles(this IServiceCollection services)
     {
         // Add AutoMapper profiles
-        services.AddAutoMapper(expression => expression.AddProfile<AutoMapperProfile>());
+       return services.AddAutoMapper(expression => expression.AddProfile<AutoMapperProfile>());
     }
 }

src/AppServices/RegisterServices/RegisterAppServices.cs

@@ -1,5 +1,4 @@
-using GaEpd.EmailService;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using MyApp.AppServices.DataExport;
 using MyApp.AppServices.EntryActions;
 using MyApp.AppServices.EntryTypes;
@@ -14,7 +13,7 @@ namespace MyApp.AppServices.RegisterServices;
 
 public static class RegisterAppServices
 {
-    public static void AddAppServices(this IServiceCollection services)
+    public static IServiceCollection AddAppServices(this IServiceCollection services)
     {
         // Work Entries
         services.AddScoped<IWorkEntryManager, WorkEntryManager>();
@@ -26,9 +25,8 @@ public static void AddAppServices(this IServiceCollection services)
         // Entry Types
         services.AddScoped<IEntryTypeManager, EntryTypeManager>();
         services.AddScoped<IEntryTypeService, EntryTypeService>();
-
-        // Email
-        services.AddTransient<IEmailService, EmailService>();
+
+        // Notifications
         services.AddScoped<INotificationService, NotificationService>();
 
         // Offices
@@ -37,5 +35,7 @@ public static void AddAppServices(this IServiceCollection services)
 
         // Data Export
         services.AddScoped<ISearchResultsExportService, SearchResultsExportService>();
+
+        return services;
     }
 }

src/AppServices/RegisterServices/Validators.cs

@@ -6,6 +6,6 @@ namespace MyApp.AppServices.RegisterServices;
 public static class Validators
 {
     // Add all validators
-    public static void AddValidators(this IServiceCollection services) =>
+    public static IServiceCollection AddValidators(this IServiceCollection services) =>
         services.AddValidatorsFromAssemblyContaining(typeof(Validators));
 }

src/EfRepository/DbContext/AppDbContext.cs

@@ -1,4 +1,4 @@
-using GaEpd.EmailService.Repository;
+using GaEpd.EmailService.EmailLogRepository;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using MyApp.Domain.Entities.EntryActions;

src/EfRepository/EfRepository.csproj

@@ -8,6 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="GaEpd.EmailService"/>
         <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -21,7 +22,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\AppServices\AppServices.csproj" />
+        <ProjectReference Include="..\Domain\Domain.csproj"/>
         <ProjectReference Include="..\TestData\TestData.csproj" />
     </ItemGroup>
 

src/EfRepository/Repositories/EmailLogRepository.cs

@@ -1,16 +1,27 @@
-using GaEpd.EmailService.Repository;
+using GaEpd.EmailService;
+using GaEpd.EmailService.EmailLogRepository;
+using Microsoft.Extensions.Configuration;
 using MyApp.EfRepository.DbContext;
 
 namespace MyApp.EfRepository.Repositories;
 
-public sealed class EmailLogRepository(AppDbContext dbContext) : IEmailLogRepository
+public sealed class EmailLogRepository(AppDbContext context, IConfiguration configuration) : IEmailLogRepository
 {
-    public async Task InsertAsync(EmailLog emailLog, CancellationToken token = default)
+    public async Task InsertAsync(Message message, CancellationToken token = default)
     {
-        await dbContext.EmailLogs.AddAsync(emailLog, token).ConfigureAwait(false);
-        await dbContext.SaveChangesAsync(token).ConfigureAwait(false);
+        var settings = new EmailServiceSettings();
+        configuration.GetSection(nameof(EmailServiceSettings)).Bind(settings);
+        if (!settings.EnableEmailLog) return;
+
+        var emailLog = EmailLog.Create(message);
+        await context.EmailLogs.AddAsync(emailLog, token).ConfigureAwait(false);
+        await context.SaveChangesAsync(token).ConfigureAwait(false);
     }
 
-    public void Dispose() => dbContext.Dispose();
-    public ValueTask DisposeAsync() => dbContext.DisposeAsync();
+    #region IDisposable,  IAsyncDisposable
+
+    public void Dispose() => context.Dispose();
+    public ValueTask DisposeAsync() => context.DisposeAsync();
+
+    #endregion
 }