Directory.Packages.props

@@ -4,6 +4,8 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- Entity Framework Core -->
+    <PackageVersion Include="HrynCo.DAL.Abstract" Version="1.0.11" />
+    <PackageVersion Include="HrynCo.DAL.EF" Version="1.0.11" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.7" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.7" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.7" />
@@ -29,8 +31,6 @@
     <!-- HrynCo shared packages -->
     <PackageVersion Include="HrynCo.Common" Version="1.0.11" />
     <PackageVersion Include="HrynCo.RabbitMq" Version="1.0.15" />
-    <PackageVersion Include="HrynCo.DAL.Abstract" Version="1.0.10" />
-    <PackageVersion Include="HrynCo.DAL.EF" Version="1.0.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageVersion Include="coverlet.collector" Version="6.0.4" />
     <PackageVersion Include="xunit" Version="2.9.3" />

HrynCo.NotificationService.DAL.Abstract/HrynCo.NotificationService.DAL.Abstract.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <PackageReference Include="HrynCo.DAL.Abstract" />
-  </ItemGroup>
-
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="HrynCo.DAL.Abstract" />
+  </ItemGroup>
+
 </Project>

HrynCo.NotificationService.DAL.Abstract/Providers/EmailChannelUsage.cs

@@ -1,13 +1,14 @@
-using HrynCo.DAL.Abstract.Entities;
-
 namespace HrynCo.NotificationService.DAL.Abstract.Providers;
 
 /// <summary>
 /// Tracks email send counts per EmailChannel per calendar day.
 /// Monthly counts are derived by summing daily records within a month.
 /// </summary>
-public class EmailChannelUsage : Entity
+public class EmailChannelUsage
 {
+    public Guid Id { get; set; }
+    public DateTimeOffset Created { get; set; }
+    public DateTimeOffset? Updated { get; set; }
     public Guid ProviderId { get; set; }
     public DateOnly Date { get; set; }
     public int SentCount { get; set; }

HrynCo.NotificationService.DAL.EF/Core/NotificationBaseRepository.cs

@@ -0,0 +1,20 @@
+namespace HrynCo.NotificationService.DAL.EF.Core;
+
+using HrynCo.DAL.Abstract.Entities;
+using HrynCo.DAL.EF.Core;
+
+public abstract class NotificationBaseRepository<TEntity>
+    : BaseRepository<NotificationEfRepository<TEntity>, NotificationDbContext, TEntity, Guid> where TEntity : Entity
+{
+    protected NotificationBaseRepository(NotificationDbContext dbContext)
+    {
+        DbContext = dbContext;
+    }
+
+    private NotificationDbContext DbContext { get; set; }
+
+    protected override NotificationEfRepository<TEntity> CreateEfRepository()
+    {
+        return new NotificationEfRepository<TEntity>(DbContext);
+    }
+}

HrynCo.NotificationService.DAL.EF/Core/NotificationEfRepository.cs

@@ -0,0 +1,13 @@
+namespace HrynCo.NotificationService.DAL.EF.Core;
+
+using HrynCo.DAL.Abstract.Entities;
+using HrynCo.DAL.EF.Core;
+
+public class NotificationEfRepository<TEntity> : BaseEfRepository<NotificationDbContext, TEntity, Guid>
+    where TEntity : class, IEntity<Guid>
+{
+    public NotificationEfRepository(NotificationDbContext dbContext) :
+        base(dbContext)
+    {
+    }
+}

HrynCo.NotificationService.DAL.EF/Core/UnitOfWork.cs

@@ -1,10 +0,0 @@
-using HrynCo.DAL.EF.Core;
-
-namespace HrynCo.NotificationService.DAL.EF.Core;
-
-internal sealed class UnitOfWork : EfUnitOfWork<NotificationDbContext>
-{
-    public UnitOfWork(NotificationDbContext context) : base(context)
-    {
-    }
-}

HrynCo.NotificationService.DAL.EF/HrynCo.NotificationService.DAL.EF.csproj

@@ -6,7 +6,6 @@
 
   <ItemGroup>
     <PackageReference Include="HrynCo.DAL.EF" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

HrynCo.NotificationService.DAL.EF/NotificationUnitOfWork.cs

@@ -0,0 +1,10 @@
+namespace HrynCo.NotificationService.DAL.EF;
+
+using HrynCo.DAL.EF.Core;
+
+public class NotificationUnitOfWork : EfUnitOfWork<NotificationDbContext>
+{
+    public NotificationUnitOfWork(NotificationDbContext context) : base(context)
+    {
+    }
+}

HrynCo.NotificationService.DAL.EF/Repositories/EmailChannelRepository.cs

@@ -1,13 +1,13 @@
+namespace HrynCo.NotificationService.DAL.EF.Repositories;
+
 using System.Text.Json;
 using HrynCo.NotificationService.DAL.Abstract.Providers;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
-using HrynCo.DAL.EF.Core;
+using HrynCo.NotificationService.DAL.EF.Core;
 using HrynCo.NotificationService.DAL.EF.Entities;
 using Microsoft.EntityFrameworkCore;
 
-namespace HrynCo.NotificationService.DAL.EF.Repositories;
+internal sealed class EmailChannelRepository : NotificationBaseRepository<EmailChannelEntity>, IEmailChannelRepository
-
-internal sealed class EmailChannelRepository : EfRepository<NotificationDbContext, EmailChannelEntity>, IEmailChannelRepository
 {
     public EmailChannelRepository(NotificationDbContext dbContext) : base(dbContext)
     {
@@ -15,20 +15,14 @@ internal sealed class EmailChannelRepository : EfRepository<NotificationDbContex
 
     public async Task<IReadOnlyList<EmailChannel>> GetAllAsync(CancellationToken ct = default)
     {
-        var entities = await DbSet
+        var entities = await EfRepository.Get().ToListAsync(ct);
-            .AsNoTracking()
-            .OrderBy(x => x.ServiceName)
-            .ThenBy(x => x.Priority)
-            .ToListAsync(ct);
 
         return entities.Select(MapToDomain).ToList();
     }
 
     public async Task<IReadOnlyList<EmailChannel>> GetByServiceAsync(string serviceName, CancellationToken ct = default)
     {
-        var entities = await DbSet
+        var entities = await EfRepository.Get(x => x.ServiceName == serviceName)
-            .AsNoTracking()
-            .Where(x => x.ServiceName == serviceName)
             .OrderBy(x => x.Priority)
             .ToListAsync(ct);
 
@@ -38,8 +32,7 @@ internal sealed class EmailChannelRepository : EfRepository<NotificationDbContex
     public async Task<IReadOnlyList<ChannelWithUsage>> GetAllWithUsageSummaryAsync(
         DateOnly today, CancellationToken ct = default)
     {
-        var rows = await DbSet
+        var rows = await EfRepository.Get()
-            .AsNoTracking()
             .OrderBy(c => c.ServiceName)
             .ThenBy(c => c.Priority)
             .Select(c => new
@@ -61,30 +54,24 @@ internal sealed class EmailChannelRepository : EfRepository<NotificationDbContex
 
     public async Task<EmailChannel?> GetByIdAsync(Guid id, CancellationToken ct = default)
     {
-        EmailChannelEntity? entity = await DbSet.AsNoTracking().FirstOrDefaultAsync(x => x.Id == id, ct);
+        EmailChannelEntity? entity = await EfRepository.GetByIdAsync(id);
         return entity is null ? null : MapToDomain(entity);
     }
 
     public Task AddAsync(EmailChannel channel, CancellationToken ct = default)
     {
-        return base.AddAsync(MapToEntity(channel), ct);
+        return EfRepository.AddAsync(MapToEntity(channel));
     }
 
-    public Task UpdateAsync(EmailChannel channel, CancellationToken ct = default)
+    public async Task UpdateAsync(EmailChannel channel, CancellationToken ct = default)
     {
         EmailChannelEntity entity = MapToEntity(channel);
-        entity.Updated = DateTimeOffset.UtcNow;
+        await EfRepository.UpdateAsync(entity);
-        Update(entity);
-        return Task.CompletedTask;
     }
 
     public async Task DeleteAsync(EmailChannel channel, CancellationToken ct = default)
     {
-        EmailChannelEntity? entity = await DbSet.FindAsync([channel.Id], ct);
+        await EfRepository.DeleteAsync(channel.Id);
-        if (entity is not null)
-        {
-            Delete(entity);
-        }
     }
 
     private static EmailChannel MapToDomain(EmailChannelEntity e)
@@ -128,8 +115,8 @@ internal sealed class EmailChannelRepository : EfRepository<NotificationDbContex
         return type switch
         {
             EmailChannelType.Smtp => JsonSerializer.Deserialize<SmtpChannelSettings>(json)
-                                 ?? throw new InvalidOperationException(
+                                     ?? throw new InvalidOperationException(
-                                     "Failed to deserialize SMTP EmailChannel settings."),
+                                         "Failed to deserialize SMTP EmailChannel settings."),
             _ => throw new InvalidOperationException($"Unknown or undefined email channel type: {type}")
         };
     }

HrynCo.NotificationService.DAL.EF/Repositories/EmailChannelUsageRepository.cs

@@ -1,11 +1,11 @@
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
-using HrynCo.DAL.EF.Core;
+using HrynCo.NotificationService.DAL.EF.Core;
 using HrynCo.NotificationService.DAL.EF.Entities;
 using Microsoft.EntityFrameworkCore;
 
 namespace HrynCo.NotificationService.DAL.EF.Repositories;
 
-internal sealed class EmailChannelUsageRepository : EfRepository<NotificationDbContext, EmailChannelUsageEntity>, IEmailChannelUsageRepository
+internal sealed class EmailChannelUsageRepository : NotificationBaseRepository<EmailChannelUsageEntity>, IEmailChannelUsageRepository
 {
     public EmailChannelUsageRepository(NotificationDbContext dbContext) : base(dbContext)
     {
@@ -13,7 +13,8 @@ internal sealed class EmailChannelUsageRepository : EfRepository<NotificationDbC
 
     public async Task<int> GetDailyCountAsync(Guid providerId, DateOnly date, CancellationToken ct = default)
     {
-        EmailChannelUsageEntity? entity = await DbSet
+        EmailChannelUsageEntity? entity = await EfRepository.Get()
+            .AsNoTracking()
             .FirstOrDefaultAsync(x => x.ProviderId == providerId && x.Date == date, ct);
 
         return entity?.SentCount ?? 0;
@@ -21,7 +22,7 @@ internal sealed class EmailChannelUsageRepository : EfRepository<NotificationDbC
 
     public async Task<int> GetMonthlyCountAsync(Guid providerId, int year, int month, CancellationToken ct = default)
     {
-        return await DbSet
+        return await EfRepository.Get()
             .Where(x => x.ProviderId == providerId
                         && x.Date.Year == year
                         && x.Date.Month == month)
@@ -30,15 +31,16 @@ internal sealed class EmailChannelUsageRepository : EfRepository<NotificationDbC
 
     public async Task IncrementUsageAsync(Guid providerId, DateOnly date, CancellationToken ct = default)
     {
-        EmailChannelUsageEntity? entity = await DbSet
+        EmailChannelUsageEntity? entity = await EfRepository.Get()
+            .AsNoTracking()
             .FirstOrDefaultAsync(x => x.ProviderId == providerId && x.Date == date, ct);
 
         if (entity is null)
-            await AddAsync(new EmailChannelUsageEntity { ProviderId = providerId, Date = date, SentCount = 1 }, ct);
+            await EfRepository.AddAsync(new EmailChannelUsageEntity { ProviderId = providerId, Date = date, SentCount = 1 });
         else
         {
             entity.SentCount++;
-            Update(entity);
+            await EfRepository.UpdateAsync(entity);
         }
     }
 }

HrynCo.NotificationService.DAL.EF/Repositories/EmailTemplateRepository.cs

@@ -1,12 +1,13 @@
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.DAL.Abstract.Templates;
-using HrynCo.DAL.EF.Core;
+using HrynCo.NotificationService.DAL.EF.Core;
 using HrynCo.NotificationService.DAL.EF.Entities;
 using Microsoft.EntityFrameworkCore;
 
 namespace HrynCo.NotificationService.DAL.EF.Repositories;
 
-internal sealed class EmailTemplateRepository : EfRepository<NotificationDbContext, EmailTemplateEntity>, IEmailTemplateRepository
+internal sealed class EmailTemplateRepository
+    : NotificationBaseRepository<EmailTemplateEntity>, IEmailTemplateRepository
 {
     public EmailTemplateRepository(NotificationDbContext dbContext) : base(dbContext)
     {
@@ -14,7 +15,7 @@ internal sealed class EmailTemplateRepository : EfRepository<NotificationDbConte
 
     public async Task<IReadOnlyList<EmailTemplate>> GetAllAsync(CancellationToken ct = default)
     {
-        List<EmailTemplateEntity> entities = await DbSet
+        List<EmailTemplateEntity> entities = await EfRepository.Get()
             .AsNoTracking()
             .ToListAsync(ct);
         return entities.Select(MapToDomain).ToList();
@@ -22,7 +23,7 @@ internal sealed class EmailTemplateRepository : EfRepository<NotificationDbConte
 
     public async Task<IReadOnlyList<EmailTemplate>> GetByServiceAsync(string serviceName, CancellationToken ct = default)
     {
-        List<EmailTemplateEntity> entities = await DbSet
+        List<EmailTemplateEntity> entities = await EfRepository.Get()
             .AsNoTracking()
             .Where(x => x.ServiceName == serviceName)
             .ToListAsync(ct);
@@ -32,7 +33,7 @@ internal sealed class EmailTemplateRepository : EfRepository<NotificationDbConte
 
     public async Task<EmailTemplate?> GetAsync(string serviceName, string key, string languageCode, CancellationToken ct = default)
     {
-        EmailTemplateEntity? entity = await DbSet
+        EmailTemplateEntity? entity = await EfRepository.Get()
             .AsNoTracking()
             .FirstOrDefaultAsync(
                 x => x.ServiceName == serviceName && x.Key == key && x.LanguageCode == languageCode, ct);
@@ -40,22 +41,24 @@ internal sealed class EmailTemplateRepository : EfRepository<NotificationDbConte
         return entity is null ? null : MapToDomain(entity);
     }
 
-    public Task AddAsync(EmailTemplate EmailTemplate, CancellationToken ct = default) =>
+    public Task AddAsync(EmailTemplate EmailTemplate, CancellationToken ct = default)
-        base.AddAsync(MapToEntity(EmailTemplate), ct);
+    {
+        return EfRepository.AddAsync(MapToEntity(EmailTemplate));
+    }
 
     public Task UpdateAsync(EmailTemplate EmailTemplate, CancellationToken ct = default)
     {
         EmailTemplateEntity entity = MapToEntity(EmailTemplate);
         entity.Updated = DateTimeOffset.UtcNow;
-        Update(entity);
+        return EfRepository.UpdateAsync(entity);
-        return Task.CompletedTask;
     }
 
     public async Task DeleteAsync(EmailTemplate EmailTemplate, CancellationToken ct = default)
     {
-        EmailTemplateEntity? entity = await DbSet.FindAsync([EmailTemplate.Id], ct);
+        EmailTemplateEntity? entity = await EfRepository.Get()
+            .FirstOrDefaultAsync(x => x.Id == EmailTemplate.Id, ct);
         if (entity is not null)
-            Delete(entity);
+            await EfRepository.DeleteAsync(entity);
     }
 
     private static EmailTemplate MapToDomain(EmailTemplateEntity e) => new()

HrynCo.NotificationService.DAL.EF/ServiceCollectionExtensions.cs

@@ -16,10 +16,10 @@ public static class ServiceCollectionExtensions
         services.AddDbContext<NotificationDbContext>(options =>
             options.UseNpgsql(connectionString));
 
-        services.AddScoped<IUnitOfWork, UnitOfWork>();
         services.AddScoped<IEmailTemplateRepository, EmailTemplateRepository>();
         services.AddScoped<IEmailChannelRepository, EmailChannelRepository>();
         services.AddScoped<IEmailChannelUsageRepository, EmailChannelUsageRepository>();
+        services.AddScoped<IUnitOfWork, NotificationUnitOfWork>();
 
         return services;
     }

HrynCo.NotificationService.Services/Core/RequestHandler.cs

@@ -1,4 +1,3 @@
-using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.Services.Logging;
 using MediatR;
 using Serilog;
@@ -8,14 +7,12 @@ namespace HrynCo.NotificationService.Services.Core;
 public abstract class RequestHandler<TRequest, TResponse> : IRequestHandler<TRequest, TResponse>
     where TRequest : IRequest<TResponse>
 {
-    protected RequestHandler(IContextualSerilogLogger<TRequest> logger, IUnitOfWork unitOfWork)
+    protected RequestHandler(IContextualSerilogLogger<TRequest> logger)
     {
         Logger = logger.Logger;
-        UnitOfWork = unitOfWork;
     }
 
     protected ILogger Logger { get; }
-    protected IUnitOfWork UnitOfWork { get; }
 
     public Task<TResponse> Handle(TRequest request, CancellationToken cancellationToken)
     {

HrynCo.NotificationService.Services/EmailChannels/Create/CreateEmailChannelHandler.cs

@@ -14,9 +14,8 @@ internal sealed class CreateEmailChannelHandler
 
     public CreateEmailChannelHandler(
         IContextualSerilogLogger<CreateEmailChannelCommand> logger,
-        IUnitOfWork unitOfWork,
         IEmailChannelRepository channels)
-        : base(logger, unitOfWork)
+        : base(logger)
     {
         _channels = channels;
     }

HrynCo.NotificationService.Services/EmailChannels/Delete/DeleteEmailChannelHandler.cs

@@ -13,9 +13,8 @@ internal sealed class DeleteEmailChannelHandler
 
     public DeleteEmailChannelHandler(
         IContextualSerilogLogger<DeleteEmailChannelCommand> logger,
-        IUnitOfWork unitOfWork,
         IEmailChannelRepository channels)
-        : base(logger, unitOfWork)
+        : base(logger)
     {
         _channels = channels;
     }

HrynCo.NotificationService.Services/EmailChannels/Get/GetEmailChannelHandler.cs

@@ -1,4 +1,3 @@
-using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Providers;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.Services.Core;
@@ -14,9 +13,8 @@ internal sealed class GetEmailChannelHandler
 
     public GetEmailChannelHandler(
         IContextualSerilogLogger<GetEmailChannelQuery> logger,
-        IUnitOfWork unitOfWork,
         IEmailChannelRepository channels)
-        : base(logger, unitOfWork)
+        : base(logger)
     {
         _channels = channels;
     }

HrynCo.NotificationService.Services/EmailChannels/GetAll/GetAllEmailChannelsHandler.cs

@@ -1,4 +1,3 @@
-using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Providers;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.Services.Core;
@@ -14,9 +13,8 @@ internal sealed class GetAllEmailChannelsHandler
 
     public GetAllEmailChannelsHandler(
         IContextualSerilogLogger<GetAllEmailChannelsQuery> logger,
-        IUnitOfWork unitOfWork,
         IEmailChannelRepository channels)
-        : base(logger, unitOfWork)
+        : base(logger)
     {
         _channels = channels;
     }

HrynCo.NotificationService.Services/EmailChannels/GetByService/GetEmailChannelsHandler.cs

@@ -1,4 +1,3 @@
-using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Providers;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.Services.Core;
@@ -14,9 +13,8 @@ internal sealed class GetEmailChannelsHandler
 
     public GetEmailChannelsHandler(
         IContextualSerilogLogger<GetEmailChannelsQuery> logger,
-        IUnitOfWork unitOfWork,
         IEmailChannelRepository channels)
-        : base(logger, unitOfWork)
+        : base(logger)
     {
         _channels = channels;
     }

HrynCo.NotificationService.Services/EmailChannels/GetUsageSummary/GetChannelUsageSummaryHandler.cs

@@ -1,4 +1,3 @@
-using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.Services.Core;
 using HrynCo.NotificationService.Services.Logging;
@@ -13,9 +12,8 @@ internal sealed class GetChannelUsageSummaryHandler
 
     public GetChannelUsageSummaryHandler(
         IContextualSerilogLogger<GetChannelUsageSummaryQuery> logger,
-        IUnitOfWork unitOfWork,
         IEmailChannelRepository channelsRepository)
-        : base(logger, unitOfWork)
+        : base(logger)
     {
         _channelsRepository = channelsRepository;
     }

HrynCo.NotificationService.Services/EmailChannels/Send/SendEmailHandler.cs

@@ -1,6 +1,5 @@
 using System.Net;
 using System.Net.Mail;
-using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Providers;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.Services.Core;
@@ -17,10 +16,9 @@ internal sealed class SendEmailHandler
 
     public SendEmailHandler(
         IContextualSerilogLogger<SendEmailCommand> logger,
-        IUnitOfWork unitOfWork,
         IEmailChannelRepository channels,
         IEmailChannelUsageRepository usage)
-        : base(logger, unitOfWork)
+        : base(logger)
     {
         _channels = channels;
         _usage = usage;

HrynCo.NotificationService.Services/EmailChannels/TestSmtp/TestSmtpHandler.cs

@@ -1,6 +1,5 @@
 using System.Net;
 using System.Net.Mail;
-using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.Services.Core;
 using HrynCo.NotificationService.Services.Logging;
 using static HrynCo.NotificationService.Services.Core.ServiceResultHelper;
@@ -11,9 +10,8 @@ internal sealed class TestSmtpHandler
     : RequestHandler<TestSmtpCommand, ServiceResult<Unit>>
 {
     public TestSmtpHandler(
-        IContextualSerilogLogger<TestSmtpCommand> logger,
+        IContextualSerilogLogger<TestSmtpCommand> logger)
-        IUnitOfWork unitOfWork)
+        : base(logger)
-        : base(logger, unitOfWork)
     {
     }
 

HrynCo.NotificationService.Services/EmailChannels/Update/UpdateEmailChannelHandler.cs

@@ -13,9 +13,8 @@ internal sealed class UpdateEmailChannelHandler
 
     public UpdateEmailChannelHandler(
         IContextualSerilogLogger<UpdateEmailChannelCommand> logger,
-        IUnitOfWork unitOfWork,
         IEmailChannelRepository channels)
-        : base(logger, unitOfWork)
+        : base(logger)
     {
         _channels = channels;
     }

HrynCo.NotificationService.Services/EmailTemplates/Create/CreateEmailTemplateHandler.cs

@@ -1,4 +1,3 @@
-using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.DAL.Abstract.Templates;
 using HrynCo.NotificationService.Services.Core;
@@ -14,9 +13,8 @@ internal sealed class CreateEmailTemplateHandler
 
     public CreateEmailTemplateHandler(
         IContextualSerilogLogger<CreateEmailTemplateCommand> logger,
-        IUnitOfWork unitOfWork,
         IEmailTemplateRepository templates)
-        : base(logger, unitOfWork)
+        : base(logger)
     {
         _templates = templates;
     }

HrynCo.NotificationService.Services/EmailTemplates/Delete/DeleteEmailTemplateHandler.cs

@@ -13,9 +13,8 @@ internal sealed class DeleteEmailTemplateHandler
 
     public DeleteEmailTemplateHandler(
         IContextualSerilogLogger<DeleteEmailTemplateCommand> logger,
-        IUnitOfWork unitOfWork,
         IEmailTemplateRepository templates)
-        : base(logger, unitOfWork)
+        : base(logger)
     {
         _templates = templates;
     }

HrynCo.NotificationService.Services/EmailTemplates/Get/GetEmailTemplateHandler.cs

@@ -1,4 +1,3 @@
-using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.DAL.Abstract.Templates;
 using HrynCo.NotificationService.Services.Core;
@@ -14,9 +13,8 @@ internal sealed class GetEmailTemplateHandler
 
     public GetEmailTemplateHandler(
         IContextualSerilogLogger<GetEmailTemplateQuery> logger,
-        IUnitOfWork unitOfWork,
         IEmailTemplateRepository templates)
-        : base(logger, unitOfWork)
+        : base(logger)
     {
         _templates = templates;
     }

HrynCo.NotificationService.Services/EmailTemplates/GetAll/GetAllEmailTemplatesHandler.cs

@@ -1,4 +1,3 @@
-using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.DAL.Abstract.Templates;
 using HrynCo.NotificationService.Services.Core;
@@ -14,9 +13,8 @@ internal sealed class GetAllEmailTemplatesHandler
 
     public GetAllEmailTemplatesHandler(
         IContextualSerilogLogger<GetAllEmailTemplatesQuery> logger,
-        IUnitOfWork unitOfWork,
         IEmailTemplateRepository templates)
-        : base(logger, unitOfWork)
+        : base(logger)
     {
         _templates = templates;
     }

HrynCo.NotificationService.Services/EmailTemplates/GetByService/GetEmailTemplatesHandler.cs

@@ -1,4 +1,3 @@
-using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.DAL.Abstract.Templates;
 using HrynCo.NotificationService.Services.Core;
@@ -14,9 +13,8 @@ internal sealed class GetEmailTemplatesHandler
 
     public GetEmailTemplatesHandler(
         IContextualSerilogLogger<GetEmailTemplatesQuery> logger,
-        IUnitOfWork unitOfWork,
         IEmailTemplateRepository templates)
-        : base(logger, unitOfWork)
+        : base(logger)
     {
         _templates = templates;
     }

HrynCo.NotificationService.Services/EmailTemplates/Update/UpdateEmailTemplateHandler.cs

@@ -13,9 +13,8 @@ internal sealed class UpdateEmailTemplateHandler
 
     public UpdateEmailTemplateHandler(
         IContextualSerilogLogger<UpdateEmailTemplateCommand> logger,
-        IUnitOfWork unitOfWork,
         IEmailTemplateRepository templates)
-        : base(logger, unitOfWork)
+        : base(logger)
     {
         _templates = templates;
     }

HrynCo.NotificationService.Web/HrynCo.NotificationService.Web.http

@@ -1,6 +1,47 @@
-@HrynCo.NotificationService.Api_HostAddress = http://localhost:5188
+@host = http://localhost:5188
 
-GET {{HrynCo.NotificationService.Api_HostAddress}}/weatherforecast/
+### Create a new email template
-Accept: application/json
+POST {{host}}/api/v1/email-templates
+Content-Type: application/json
 
-###
+{
+  "ServiceName": "StoreMate-Prod",
+  "Key": "ShareInvite",
+  "LanguageCode": "uk",
+  "Subject": "Вас запрошено",
+  "HtmlBody": "<html><body><div style=\"font-family: Arial, sans-serif; color: #1f2937;\"><p>Вітаємо, \u007b\u007bRecipientName\u007d\u007d.</p><h1>Вас запрошено</h1><p>\u007b\u007bInviterName\u007d\u007d запросив вас приєднатися до \u007b\u007bAppName\u007d\u007d, щоб ви могли безпечно співпрацювати.</p><p><a href=\"\u007b\u007bInviteLink\u007d\u007d\">Відкрити запрошення</a></p><p>Запрошення дійсне до <strong>\u007b\u007bValidUntil\u007d\u007d</strong>.</p></div></body></html>",
+  "TextBody": "Вітаємо, \u007b\u007bRecipientName\u007d\u007d.\n\n\u007b\u007bInviterName\u007d\u007d запросив вас приєднатися до \u007b\u007bAppName\u007d\u007d, щоб ви могли безпечно співпрацювати.\n\nВідкрийте запрошення: \u007b\u007bInviteLink\u007d\u007d\nДійсне до: \u007b\u007bValidUntil\u007d\u007d",
+  "Variables": [
+    { "Name": "RecipientName", "Required": false },
+    { "Name": "InviterName", "Required": false },
+    { "Name": "AppName", "Required": false },
+    { "Name": "InviteLink", "Required": false },
+    { "Name": "ValidUntil", "Required": false }
+  ]
+}
+
+### Get the created template
+GET {{host}}/api/v1/email-templates/StoreMate-Prod/ShareInvite/uk
+
+### List all templates for the service
+GET {{host}}/api/v1/email-templates?serviceName=StoreMate-Prod
+
+### Update the template
+PUT {{host}}/api/v1/email-templates/StoreMate-Prod/ShareInvite/uk
+Content-Type: application/json
+
+{
+  "Subject": "Вас запрошено",
+  "HtmlBody": "<html><body><p>Вітаємо, \u007b\u007bRecipientName\u007d\u007d.</p><p>\u007b\u007bInviterName\u007d\u007d запросив вас приєднатися до \u007b\u007bAppName\u007d\u007d.</p><p><a href=\"\u007b\u007bInviteLink\u007d\u007d\">Відкрити запрошення</a></p><p>Дійсне до <strong>\u007b\u007bValidUntil\u007d\u007d</strong>.</p></body></html>",
+  "TextBody": "Вітаємо, \u007b\u007bRecipientName\u007d\u007d.\n\n\u007b\u007bInviterName\u007d\u007d запросив вас приєднатися до \u007b\u007bAppName\u007d\u007d.\n\nВідкрийте запрошення: \u007b\u007bInviteLink\u007d\u007d\nДійсне до: \u007b\u007bValidUntil\u007d\u007d",
+  "Variables": [
+    { "Name": "RecipientName", "Required": false },
+    { "Name": "InviterName", "Required": false },
+    { "Name": "AppName", "Required": false },
+    { "Name": "InviteLink", "Required": false },
+    { "Name": "ValidUntil", "Required": false }
+  ]
+}
+
+### Delete the template
+DELETE {{host}}/api/v1/email-templates/StoreMate-Prod/ShareInvite/uk

HrynCo.NotificationService.Web/Views/AdminTemplates/Edit.cshtml

@@ -21,74 +21,93 @@
         </div>
     }
 
-    <div class="row g-3 mb-3">
+    <ul class="nav nav-tabs template-editor-tabs mb-3" id="templateEditorTabs" role="tablist">
-        <div class="col-md-5">
+        <li class="nav-item" role="presentation">
-            <label asp-for="ServiceName" class="form-label fw-semibold">Service Name</label>
+            <button class="nav-link active" id="edit-tab" data-bs-toggle="tab" data-bs-target="#edit-pane" type="button" role="tab" aria-controls="edit-pane" aria-selected="true">
-            <input asp-for="ServiceName" class="form-control" readonly="@(!Model.IsNew)" />
+                Edit
-            <span asp-validation-for="ServiceName" class="text-danger small"></span>
+            </button>
-        </div>
+        </li>
-        <div class="col-md-5">
+        <li class="nav-item" role="presentation">
-            <label asp-for="Key" class="form-label fw-semibold">Key</label>
+            <button class="nav-link" id="preview-tab" data-bs-toggle="tab" data-bs-target="#preview-pane" type="button" role="tab" aria-controls="preview-pane" aria-selected="false">
-            <input asp-for="Key" class="form-control" readonly="@(!Model.IsNew)" />
+                Preview
-            <span asp-validation-for="Key" class="text-danger small"></span>
+            </button>
-        </div>
+        </li>
-        <div class="col-md-2">
+    </ul>
-            <label asp-for="LanguageCode" class="form-label fw-semibold">Language</label>
-            <input asp-for="LanguageCode" class="form-control" readonly="@(!Model.IsNew)" />
-            <span asp-validation-for="LanguageCode" class="text-danger small"></span>
-        </div>
-    </div>
 
-    <div class="mb-3">
+    <div class="tab-content">
-        <label asp-for="Subject" class="form-label fw-semibold">Subject</label>
+        <div class="tab-pane fade show active" id="edit-pane" role="tabpanel" aria-labelledby="edit-tab" tabindex="0">
-        <input asp-for="Subject" class="form-control" />
+            <div class="row g-3 mb-3">
-        <span asp-validation-for="Subject" class="text-danger small"></span>
+                <div class="col-md-5">
-    </div>
+                    <label asp-for="ServiceName" class="form-label fw-semibold">Service Name</label>
-
+                    <input asp-for="ServiceName" class="form-control" readonly="@(!Model.IsNew)" />
-    <div class="mb-3">
+                    <span asp-validation-for="ServiceName" class="text-danger small"></span>
-        <label asp-for="HtmlBody" class="form-label fw-semibold">HTML Body</label>
+                </div>
-        <textarea asp-for="HtmlBody" class="form-control font-monospace" rows="10"></textarea>
+                <div class="col-md-5">
-        <span asp-validation-for="HtmlBody" class="text-danger small"></span>
+                    <label asp-for="Key" class="form-label fw-semibold">Key</label>
-    </div>
+                    <input asp-for="Key" class="form-control" readonly="@(!Model.IsNew)" />
-
+                    <span asp-validation-for="Key" class="text-danger small"></span>
-    <div class="mb-3">
+                </div>
-        <label asp-for="TextBody" class="form-label fw-semibold">Text Body</label>
+                <div class="col-md-2">
-        <textarea asp-for="TextBody" class="form-control font-monospace" rows="5"></textarea>
+                    <label asp-for="LanguageCode" class="form-label fw-semibold">Language</label>
-    </div>
+                    <input asp-for="LanguageCode" class="form-control" readonly="@(!Model.IsNew)" />
-
+                    <span asp-validation-for="LanguageCode" class="text-danger small"></span>
-    <div class="mb-3">
+                </div>
-        <label asp-for="VariablesJson" class="form-label fw-semibold">Variables (JSON)</label>
-        <textarea asp-for="VariablesJson" class="form-control font-monospace" rows="4"
-                  placeholder='[{"name":"UserName","required":true}]'></textarea>
-        <span asp-validation-for="VariablesJson" class="text-danger small"></span>
-        <div class="form-text">JSON array of <code>{"name":"...", "required":true|false}</code></div>
-    </div>
-
-    <div class="template-preview-panel mb-3">
-        <div class="template-preview-panel-header">
-            <div>
-                <div class="template-preview-title">Preview</div>
-                <div class="template-preview-subtitle">Rendered with sample values from the variable list.</div>
-            </div>
-            <span id="previewStatus" class="badge text-bg-secondary">Ready</span>
-        </div>
-
-        <div class="template-preview-grid">
-            <div class="template-preview-source">
-                <div class="template-preview-section-title">Sample values</div>
-                <div id="previewVariables" class="template-preview-variables"></div>
-                <div class="form-text mt-2">Change these values to see the rendered output update immediately.</div>
             </div>
 
-            <div class="template-preview-output">
+            <div class="mb-3">
-                <div class="template-preview-section-title">Rendered subject</div>
+                <label asp-for="Subject" class="form-label fw-semibold">Subject</label>
-                <div id="previewSubject" class="template-preview-subject"></div>
+                <input asp-for="Subject" class="form-control" />
+                <span asp-validation-for="Subject" class="text-danger small"></span>
+            </div>
 
-                <div class="template-preview-section-title mt-3">Rendered HTML</div>
+            <div class="mb-3">
-                <iframe id="previewHtmlFrame" class="template-preview-frame" title="Email HTML preview"></iframe>
+                <label asp-for="HtmlBody" class="form-label fw-semibold">HTML Body</label>
+                <textarea asp-for="HtmlBody" class="form-control font-monospace" rows="10"></textarea>
+                <span asp-validation-for="HtmlBody" class="text-danger small"></span>
+            </div>
 
-                <div class="template-preview-section-title mt-3">Rendered text</div>
+            <div class="mb-3">
-                <pre id="previewText" class="template-preview-text mb-0"></pre>
+                <label asp-for="TextBody" class="form-label fw-semibold">Text Body</label>
+                <textarea asp-for="TextBody" class="form-control font-monospace" rows="5"></textarea>
+            </div>
+
+            <div class="mb-3">
+                <label asp-for="VariablesJson" class="form-label fw-semibold">Variables (JSON)</label>
+                <textarea asp-for="VariablesJson" class="form-control font-monospace" rows="4"
+                          placeholder='[{"name":"UserName","required":true}]'></textarea>
+                <span asp-validation-for="VariablesJson" class="text-danger small"></span>
+                <div class="form-text">JSON array of <code>{"name":"...", "required":true|false}</code></div>
+            </div>
+        </div>
+
+        <div class="tab-pane fade" id="preview-pane" role="tabpanel" aria-labelledby="preview-tab" tabindex="0">
+            <div class="template-preview-panel mb-3">
+                <div class="template-preview-panel-header">
+                    <div>
+                        <div class="template-preview-title">Preview</div>
+                        <div class="template-preview-subtitle">Rendered with sample values from the variable list.</div>
+                    </div>
+                    <span id="previewStatus" class="badge text-bg-secondary">Ready</span>
+                </div>
+
+                <div class="template-preview-body">
+                    <div class="template-preview-source template-preview-section-block">
+                        <div class="template-preview-section-title">Sample values</div>
+                        <div id="previewVariables" class="template-preview-variables"></div>
+                        <div class="form-text mt-2">Change these values to see the rendered output update immediately.</div>
+                    </div>
+
+                    <div class="template-preview-output">
+                        <div class="template-preview-section-title">Rendered subject</div>
+                        <div id="previewSubject" class="template-preview-subject"></div>
+
+                        <div class="template-preview-section-title mt-3">Rendered HTML</div>
+                        <iframe id="previewHtmlFrame" class="template-preview-frame" title="Email HTML preview"></iframe>
+
+                        <div class="template-preview-section-title mt-3">Rendered text</div>
+                        <pre id="previewText" class="template-preview-text mb-0"></pre>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
@@ -114,6 +133,7 @@
                 const previewText = document.getElementById('previewText');
                 const previewFrame = document.getElementById('previewHtmlFrame');
                 const previewStatus = document.getElementById('previewStatus');
+                const previewTab = document.getElementById('preview-tab');
 
                 if (!subjectField || !htmlField || !textField || !variablesField || !previewVariablesHost || !previewSubject || !previewText || !previewFrame || !previewStatus) {
                     return;
@@ -267,6 +287,9 @@
                 subjectField.addEventListener('input', updatePreview);
                 htmlField.addEventListener('input', updatePreview);
                 textField.addEventListener('input', updatePreview);
+                if (previewTab) {
+                    previewTab.addEventListener('shown.bs.tab', updatePreview);
+                }
 
                 renderVariableInputs();
             })();

HrynCo.NotificationService.Web/wwwroot/css/admin.css

@@ -118,9 +118,10 @@ body {
 .empty-state .bi { font-size: 2.5rem; opacity: .35; display: block; margin-bottom: .75rem; }
 .empty-state p { font-size: .9rem; margin-bottom: 0; }
 
-/* ── Editor wrapper — constrains width ───────────────── */
+/* ── Editor wrapper ──────────────────────────────────── */
 .editor-wrapper {
-    max-width: 860px;
+    width: 100%;
+    max-width: none;
 }
 
 /* ── Editor card ──────────────────────────────────────── */
@@ -154,6 +155,26 @@ body {
     border-radius: 0 0 .5rem .5rem !important;
 }
 
+/* ── Editor tabs ─────────────────────────────────────── */
+.template-editor-tabs {
+    border-bottom-color: #dce3eb;
+}
+
+.template-editor-tabs .nav-link {
+    color: #526072;
+    font-weight: 600;
+    border-radius: .5rem .5rem 0 0;
+}
+
+.template-editor-tabs .nav-link.active {
+    color: #0d6efd;
+}
+
+/* ── Tab content ──────────────────────────────────────── */
+.tab-content {
+    min-width: 0;
+}
+
 /* ── Email template preview ───────────────────────────── */
 .template-preview-panel {
     border: 1px solid #dce3eb;
@@ -185,9 +206,9 @@ body {
     margin-top: .15rem;
 }
 
-.template-preview-grid {
+.template-preview-body {
     display: grid;
-    grid-template-columns: minmax(240px, 300px) minmax(0, 1fr);
+    grid-template-columns: minmax(0, 1fr);
     gap: 1rem;
     padding: 1rem 1.25rem 1.25rem;
 }
@@ -197,6 +218,13 @@ body {
     min-width: 0;
 }
 
+.template-preview-section-block {
+    padding: 1rem;
+    border: 1px solid #e5ebf2;
+    border-radius: .65rem;
+    background: #fafcff;
+}
+
 .template-preview-section-title {
     font-size: .7rem;
     font-weight: 700;
@@ -210,6 +238,7 @@ body {
     display: flex;
     flex-direction: column;
     gap: .75rem;
+    max-width: 420px;
 }
 
 .template-preview-variables .form-control-sm {
@@ -248,7 +277,7 @@ body {
 }
 
 @media (max-width: 992px) {
-    .template-preview-grid {
+    .template-preview-body {
         grid-template-columns: 1fr;
     }