Merge pull request 'refactor: replace local DAL abstractions with hrynco-ef packages' (#2) from use-hrynco-ef-packages into development

Remove duplicate IEntity, Entity, ITransaction, IUnitOfWork, EfRepository,
EfUnitOfWork, EfTransactionAdapter — now consumed from HrynCo.DAL.Abstract
and HrynCo.DAL.EF packages (1.0.1).

Ref: IT-0

Directory.Build.props

@@ -1,5 +1 @@
-<Project>
+<Project />
-    <PropertyGroup>
-        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    </PropertyGroup>
-</Project>

Directory.Packages.props

@@ -1,44 +1,42 @@
 <Project>
-
+  <PropertyGroup>
-    <ItemGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <!-- Entity Framework Core -->
+  </PropertyGroup>
-        <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
+  <ItemGroup>
-        <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.5" />
+    <!-- Entity Framework Core -->
-        <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
-        <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.5" />
-
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
-        <!-- MediatR -->
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
-        <PackageVersion Include="MediatR" Version="12.4.1" />
+    <!-- MediatR -->
-        <PackageVersion Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.1.0" />
+    <PackageVersion Include="MediatR" Version="12.4.1" />
-
+    <PackageVersion Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.1.0" />
-        <!-- Microsoft.Extensions -->
+    <!-- Microsoft.Extensions -->
-        <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.6" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.6" />
-        <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.6" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.6" />
-        <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.6" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.6" />
-        <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.6" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.6" />
-        <PackageVersion Include="Scalar.AspNetCore" Version="2.14.9" />
+    <PackageVersion Include="Scalar.AspNetCore" Version="2.14.9" />
-        <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.6" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.6" />
-        <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.6" />
+    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.6" />
-
+    <!-- Serilog -->
-        <!-- Serilog -->
+    <PackageVersion Include="Serilog" Version="4.2.0" />
-        <PackageVersion Include="Serilog" Version="4.2.0" />
+    <PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
-        <PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
+    <PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />
-        <PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />
+    <PackageVersion Include="Serilog.Settings.Configuration" Version="9.0.0" />
-        <PackageVersion Include="Serilog.Settings.Configuration" Version="9.0.0" />
+    <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
-        <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageVersion Include="Serilog.Sinks.Seq" Version="9.0.0" />
-        <PackageVersion Include="Serilog.Sinks.Seq" Version="9.0.0" />
+    <!-- HrynCo shared packages -->
-
+    <PackageVersion Include="HrynCo.Common" Version="1.0.11" />
-        <!-- HrynCo shared packages -->
+    <PackageVersion Include="HrynCo.RabbitMq" Version="1.0.15" />
-        <PackageVersion Include="HrynCo.Common" Version="1.0.0" />
+    <PackageVersion Include="HrynCo.DAL.Abstract" Version="1.0.1" />
-        <PackageVersion Include="HrynCo.RabbitMq" Version="1.0.14" />
+    <PackageVersion Include="HrynCo.DAL.EF" Version="1.0.1" />
-
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
-        <PackageVersion Include="coverlet.collector" Version="6.0.4" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
-        <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
-        <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
+    <PackageVersion Include="NSubstitute" Version="5.3.0" />
-        <PackageVersion Include="NSubstitute" Version="5.3.0" />
+    <PackageVersion Include="Testcontainers.PostgreSql" Version="4.6.0" />
-        <PackageVersion Include="Testcontainers.PostgreSql" Version="4.6.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.5" />
-        <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.5" />
+  </ItemGroup>
-    </ItemGroup>
-
 </Project>

HrynCo.NotificationService.Contracts/HrynCo.NotificationService.Contracts.csproj

@@ -4,6 +4,12 @@
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <PackageId>HrynCo.NotificationService.Contracts</PackageId>
+    <Authors>HrynCo</Authors>
+    <Description>RabbitMQ message contracts for HrynCo.NotificationService.</Description>
+    <PackageTags>hrynco notification email rabbitmq contracts</PackageTags>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://gitea.grynco.com.ua/hrynco/hrynco-notification-service.git</RepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>

HrynCo.NotificationService.DAL.Abstract/Entities/Entity.cs

@@ -1,17 +0,0 @@
-namespace HrynCo.NotificationService.DAL.Abstract.Entities;
-
-public abstract class Entity<TId> : IEntity<TId> where TId : struct
-{
-    public TId Id { get; set; }
-    public DateTimeOffset Created { get; set; }
-    public DateTimeOffset? Updated { get; set; }
-}
-
-public abstract class Entity : Entity<Guid>
-{
-    protected Entity()
-    {
-        Id = Guid.NewGuid();
-        Created = DateTimeOffset.UtcNow;
-    }
-}

HrynCo.NotificationService.DAL.Abstract/Entities/IEntity.cs

@@ -1,8 +0,0 @@
-namespace HrynCo.NotificationService.DAL.Abstract.Entities;
-
-public interface IEntity<TId> where TId : struct
-{
-    TId Id { get; set; }
-    DateTimeOffset Created { get; set; }
-    DateTimeOffset? Updated { get; set; }
-}

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

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

HrynCo.NotificationService.DAL.Abstract/ITransaction.cs

@@ -1,7 +0,0 @@
-namespace HrynCo.NotificationService.DAL.Abstract;
-
-public interface ITransaction : IAsyncDisposable
-{
-    Task CommitAsync(CancellationToken cancellationToken = default);
-    Task RollbackAsync(CancellationToken cancellationToken = default);
-}

HrynCo.NotificationService.DAL.Abstract/IUnitOfWork.cs

@@ -1,11 +0,0 @@
-namespace HrynCo.NotificationService.DAL.Abstract;
-
-public interface IUnitOfWork
-{
-    Task SaveChangesAsync(CancellationToken cancellationToken = default);
-    Task<ITransaction> BeginTransactionAsync(CancellationToken cancellationToken = default);
-    ITransaction? GetCurrentTransaction();
-
-    Task ExecuteInTransactionAsync(Func<Task> action);
-    Task<TResult> ExecuteInTransactionAsync<TResult>(Func<Task<TResult>> action);
-}

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

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract.Entities;
+using HrynCo.DAL.Abstract.Entities;
 
 namespace HrynCo.NotificationService.DAL.Abstract.Providers;
 

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

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract.Entities;
+using HrynCo.DAL.Abstract.Entities;
 
 namespace HrynCo.NotificationService.DAL.Abstract.Providers;
 

HrynCo.NotificationService.DAL.Abstract/Templates/EmailTemplate.cs

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract.Entities;
+using HrynCo.DAL.Abstract.Entities;
 
 namespace HrynCo.NotificationService.DAL.Abstract.Templates;
 

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

@@ -1,45 +0,0 @@
-using System.Linq.Expressions;
-using Microsoft.EntityFrameworkCore;
-
-namespace HrynCo.NotificationService.DAL.EF.Core;
-
-internal abstract class EfRepository<TEntity>
-    where TEntity : class
-{
-    protected NotificationDbContext DbContext { get; }
-    protected DbSet<TEntity> DbSet { get; }
-
-    protected EfRepository(NotificationDbContext dbContext)
-    {
-        DbContext = dbContext;
-        DbSet = dbContext.Set<TEntity>();
-    }
-
-    protected async Task AddAsync(TEntity entity, CancellationToken ct = default)
-    {
-        await DbSet.AddAsync(entity, ct);
-    }
-
-    protected async Task AddRangeAsync(IEnumerable<TEntity> entities, CancellationToken ct = default)
-    {
-        await DbSet.AddRangeAsync(entities, ct);
-    }
-
-    protected void Update(TEntity entity)
-    {
-        DbSet.Update(entity);
-    }
-
-    protected void Delete(TEntity entity)
-    {
-        DbSet.Remove(entity);
-    }
-
-    protected void DeleteRange(IEnumerable<TEntity> entities)
-    {
-        DbSet.RemoveRange(entities);
-    }
-
-    protected Task<bool> ExistsAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken ct = default) =>
-        DbSet.AnyAsync(predicate, ct);
-}

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

@@ -1,29 +0,0 @@
-using HrynCo.NotificationService.DAL.Abstract;
-using Microsoft.EntityFrameworkCore.Storage;
-
-namespace HrynCo.NotificationService.DAL.EF.Core;
-
-internal sealed class EfTransactionAdapter : ITransaction
-{
-    private readonly IDbContextTransaction _transaction;
-
-    internal EfTransactionAdapter(IDbContextTransaction transaction)
-    {
-        _transaction = transaction;
-    }
-
-    public Task CommitAsync(CancellationToken cancellationToken = default)
-    {
-        return _transaction.CommitAsync(cancellationToken);
-    }
-
-    public Task RollbackAsync(CancellationToken cancellationToken = default)
-    {
-        return _transaction.RollbackAsync(cancellationToken);
-    }
-
-    public ValueTask DisposeAsync()
-    {
-        return _transaction.DisposeAsync();
-    }
-}

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

@@ -1,105 +0,0 @@
-using HrynCo.NotificationService.DAL.Abstract;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Storage;
-
-namespace HrynCo.NotificationService.DAL.EF.Core;
-
-internal abstract class EfUnitOfWork<TDbContext> : IUnitOfWork
-    where TDbContext : DbContext
-{
-    private readonly TDbContext _context;
-    private EfTransactionAdapter? _currentTransaction;
-
-    protected EfUnitOfWork(TDbContext context)
-    {
-        _context = context;
-    }
-
-    public Task SaveChangesAsync(CancellationToken cancellationToken = default)
-    {
-        return _context.SaveChangesAsync(cancellationToken);
-    }
-
-    public async Task<ITransaction> BeginTransactionAsync(CancellationToken cancellationToken = default)
-    {
-        if (_currentTransaction != null)
-        {
-            return _currentTransaction;
-        }
-
-        IDbContextTransaction tx = await _context.Database.BeginTransactionAsync(cancellationToken);
-        _currentTransaction = new EfTransactionAdapter(tx);
-        return _currentTransaction;
-    }
-
-    public ITransaction? GetCurrentTransaction()
-    {
-        return _currentTransaction;
-    }
-
-    public async Task ExecuteInTransactionAsync(Func<Task> action)
-    {
-        ITransaction? existing = GetCurrentTransaction();
-        bool ownsTransaction = existing is null;
-        ITransaction tx = existing ?? await BeginTransactionAsync();
-
-        try
-        {
-            await action();
-            if (ownsTransaction)
-            {
-                await tx.CommitAsync();
-            }
-        }
-        catch
-        {
-            if (ownsTransaction)
-            {
-                await tx.RollbackAsync();
-            }
-
-            throw;
-        }
-        finally
-        {
-            if (ownsTransaction)
-            {
-                await tx.DisposeAsync();
-            }
-        }
-    }
-
-    public async Task<TResult> ExecuteInTransactionAsync<TResult>(Func<Task<TResult>> action)
-    {
-        ITransaction? existing = GetCurrentTransaction();
-        bool ownsTransaction = existing is null;
-        ITransaction tx = existing ?? await BeginTransactionAsync();
-
-        try
-        {
-            TResult result = await action();
-            if (ownsTransaction)
-            {
-                await tx.CommitAsync();
-            }
-
-            return result;
-        }
-        catch
-        {
-            if (ownsTransaction)
-            {
-                await tx.RollbackAsync();
-            }
-
-            throw;
-        }
-        finally
-        {
-            if (ownsTransaction)
-            {
-                await tx.DisposeAsync();
-            }
-        }
-    }
-}

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

@@ -1,3 +1,5 @@
+using HrynCo.DAL.EF.Core;
+
 namespace HrynCo.NotificationService.DAL.EF.Core;
 
 internal sealed class UnitOfWork : EfUnitOfWork<NotificationDbContext>

HrynCo.NotificationService.DAL.EF/Entities/EmailChannelEntity.cs

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract.Entities;
+using HrynCo.DAL.Abstract.Entities;
 using HrynCo.NotificationService.DAL.Abstract.Providers;
 
 namespace HrynCo.NotificationService.DAL.EF.Entities;

HrynCo.NotificationService.DAL.EF/Entities/EmailChannelUsageEntity.cs

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract.Entities;
+using HrynCo.DAL.Abstract.Entities;
 
 namespace HrynCo.NotificationService.DAL.EF.Entities;
 

HrynCo.NotificationService.DAL.EF/Entities/EmailTemplateEntity.cs

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract.Entities;
+using HrynCo.DAL.Abstract.Entities;
 
 namespace HrynCo.NotificationService.DAL.EF.Entities;
 

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

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

HrynCo.NotificationService.DAL.EF/Migrations/20260502154249_PendingChanges.Designer.cs

@@ -0,0 +1,225 @@
+// <auto-generated />
+using System;
+using HrynCo.NotificationService.DAL.EF;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace HrynCo.NotificationService.DAL.EF.Migrations
+{
+    [DbContext(typeof(NotificationDbContext))]
+    [Migration("20260502154249_PendingChanges")]
+    partial class PendingChanges
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "9.0.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("HrynCo.NotificationService.DAL.EF.Entities.EmailChannelEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset>("Created")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created");
+
+                    b.Property<int?>("DailyLimit")
+                        .HasColumnType("integer")
+                        .HasColumnName("daily_limit");
+
+                    b.Property<int>("EmailChannelType")
+                        .HasColumnType("integer")
+                        .HasColumnName("provider_type");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_active");
+
+                    b.Property<int?>("MonthlyLimit")
+                        .HasColumnType("integer")
+                        .HasColumnName("monthly_limit");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<string>("ServiceName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)")
+                        .HasColumnName("service_name");
+
+                    b.Property<string>("SettingsJson")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("settings");
+
+                    b.Property<DateTimeOffset?>("Updated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("updated");
+
+                    b.Property<int>("WarnThresholdPercent")
+                        .HasColumnType("integer")
+                        .HasColumnName("warn_threshold_percent");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ServiceName", "Priority");
+
+                    b.ToTable("email_channels", (string)null);
+                });
+
+            modelBuilder.Entity("HrynCo.NotificationService.DAL.EF.Entities.EmailChannelUsageEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset>("Created")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created");
+
+                    b.Property<DateOnly>("Date")
+                        .HasColumnType("date")
+                        .HasColumnName("date");
+
+                    b.Property<Guid>("ProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_id");
+
+                    b.Property<int>("SentCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("sent_count");
+
+                    b.Property<DateTimeOffset?>("Updated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("updated");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProviderId", "Date")
+                        .IsUnique();
+
+                    b.ToTable("email_channel_usage", (string)null);
+                });
+
+            modelBuilder.Entity("HrynCo.NotificationService.DAL.EF.Entities.EmailTemplateEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset>("Created")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created");
+
+                    b.Property<string>("HtmlBody")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("html_body");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)")
+                        .HasColumnName("key");
+
+                    b.Property<string>("LanguageCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)")
+                        .HasColumnName("language_code");
+
+                    b.Property<string>("ServiceName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)")
+                        .HasColumnName("service_name");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("subject");
+
+                    b.Property<string>("TextBody")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("text_body");
+
+                    b.Property<DateTimeOffset?>("Updated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("updated");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ServiceName", "Key", "LanguageCode")
+                        .IsUnique();
+
+                    b.ToTable("email_templates", (string)null);
+                });
+
+            modelBuilder.Entity("HrynCo.NotificationService.DAL.EF.Entities.EmailChannelUsageEntity", b =>
+                {
+                    b.HasOne("HrynCo.NotificationService.DAL.EF.Entities.EmailChannelEntity", null)
+                        .WithMany("UsageRecords")
+                        .HasForeignKey("ProviderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("HrynCo.NotificationService.DAL.EF.Entities.EmailTemplateEntity", b =>
+                {
+                    b.OwnsMany("HrynCo.NotificationService.DAL.EF.Entities.EmailTemplateVariableData", "Variables", b1 =>
+                        {
+                            b1.Property<Guid>("EmailTemplateEntityId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<int>("__synthesizedOrdinal")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer");
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasColumnType("text")
+                                .HasAnnotation("Relational:JsonPropertyName", "name");
+
+                            b1.Property<bool>("Required")
+                                .HasColumnType("boolean")
+                                .HasAnnotation("Relational:JsonPropertyName", "required");
+
+                            b1.HasKey("EmailTemplateEntityId", "__synthesizedOrdinal");
+
+                            b1.ToTable("email_templates");
+
+                            b1.ToJson("variables");
+
+                            b1.WithOwner()
+                                .HasForeignKey("EmailTemplateEntityId");
+                        });
+
+                    b.Navigation("Variables");
+                });
+
+            modelBuilder.Entity("HrynCo.NotificationService.DAL.EF.Entities.EmailChannelEntity", b =>
+                {
+                    b.Navigation("UsageRecords");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

HrynCo.NotificationService.DAL.EF/Migrations/20260502154249_PendingChanges.cs

@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace HrynCo.NotificationService.DAL.EF.Migrations
+{
+    /// <inheritdoc />
+    public partial class PendingChanges : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddForeignKey(
+                name: "FK_email_channel_usage_email_channels_provider_id",
+                table: "email_channel_usage",
+                column: "provider_id",
+                principalTable: "email_channels",
+                principalColumn: "id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_email_channel_usage_email_channels_provider_id",
+                table: "email_channel_usage");
+        }
+    }
+}

HrynCo.NotificationService.DAL.EF/Migrations/NotificationDbContextModelSnapshot.cs

@@ -170,6 +170,15 @@ namespace HrynCo.NotificationService.DAL.EF.Migrations
                     b.ToTable("email_templates", (string)null);
                 });
 
+            modelBuilder.Entity("HrynCo.NotificationService.DAL.EF.Entities.EmailChannelUsageEntity", b =>
+                {
+                    b.HasOne("HrynCo.NotificationService.DAL.EF.Entities.EmailChannelEntity", null)
+                        .WithMany("UsageRecords")
+                        .HasForeignKey("ProviderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
             modelBuilder.Entity("HrynCo.NotificationService.DAL.EF.Entities.EmailTemplateEntity", b =>
                 {
                     b.OwnsMany("HrynCo.NotificationService.DAL.EF.Entities.EmailTemplateVariableData", "Variables", b1 =>
@@ -202,6 +211,11 @@ namespace HrynCo.NotificationService.DAL.EF.Migrations
 
                     b.Navigation("Variables");
                 });
+
+            modelBuilder.Entity("HrynCo.NotificationService.DAL.EF.Entities.EmailChannelEntity", b =>
+                {
+                    b.Navigation("UsageRecords");
+                });
 #pragma warning restore 612, 618
         }
     }

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

@@ -1,13 +1,13 @@
 using System.Text.Json;
 using HrynCo.NotificationService.DAL.Abstract.Providers;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
-using HrynCo.NotificationService.DAL.EF.Core;
+using HrynCo.DAL.EF.Core;
 using HrynCo.NotificationService.DAL.EF.Entities;
 using Microsoft.EntityFrameworkCore;
 
 namespace HrynCo.NotificationService.DAL.EF.Repositories;
 
-internal sealed class EmailChannelRepository : EfRepository<EmailChannelEntity>, IEmailChannelRepository
+internal sealed class EmailChannelRepository : EfRepository<NotificationDbContext, EmailChannelEntity>, IEmailChannelRepository
 {
     public EmailChannelRepository(NotificationDbContext dbContext) : base(dbContext)
     {

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

@@ -1,11 +1,11 @@
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
-using HrynCo.NotificationService.DAL.EF.Core;
+using HrynCo.DAL.EF.Core;
 using HrynCo.NotificationService.DAL.EF.Entities;
 using Microsoft.EntityFrameworkCore;
 
 namespace HrynCo.NotificationService.DAL.EF.Repositories;
 
-internal sealed class EmailChannelUsageRepository : EfRepository<EmailChannelUsageEntity>, IEmailChannelUsageRepository
+internal sealed class EmailChannelUsageRepository : EfRepository<NotificationDbContext, EmailChannelUsageEntity>, IEmailChannelUsageRepository
 {
     public EmailChannelUsageRepository(NotificationDbContext dbContext) : base(dbContext)
     {

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

@@ -1,12 +1,12 @@
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.DAL.Abstract.Templates;
-using HrynCo.NotificationService.DAL.EF.Core;
+using HrynCo.DAL.EF.Core;
 using HrynCo.NotificationService.DAL.EF.Entities;
 using Microsoft.EntityFrameworkCore;
 
 namespace HrynCo.NotificationService.DAL.EF.Repositories;
 
-internal sealed class EmailTemplateRepository : EfRepository<EmailTemplateEntity>, IEmailTemplateRepository
+internal sealed class EmailTemplateRepository : EfRepository<NotificationDbContext, EmailTemplateEntity>, IEmailTemplateRepository
 {
     public EmailTemplateRepository(NotificationDbContext dbContext) : base(dbContext)
     {

HrynCo.NotificationService.DAL.EF/ServiceCollectionExtensions.cs

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract;
+using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.DAL.EF.Core;
 using HrynCo.NotificationService.DAL.EF.Repositories;

HrynCo.NotificationService.Services/Behaviors/TransactionBehavior.cs

@@ -1,5 +1,5 @@
 using HrynCo.Common;
-using HrynCo.NotificationService.DAL.Abstract;
+using HrynCo.DAL.Abstract;
 using MediatR;
 
 namespace HrynCo.NotificationService.Services.Behaviors;

HrynCo.NotificationService.Services/Core/RequestHandler.cs

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract;
+using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.Services.Logging;
 using MediatR;
 using Serilog;

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

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract;
+using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Providers;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.Services.Core;

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

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract;
+using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.Services.Core;
 using HrynCo.NotificationService.Services.Logging;

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

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract;
+using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Providers;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.Services.Core;

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

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract;
+using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Providers;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.Services.Core;

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

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract;
+using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Providers;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.Services.Core;

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

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract;
+using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.Services.Core;
 using HrynCo.NotificationService.Services.Logging;

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

@@ -1,6 +1,6 @@
 using System.Net;
 using System.Net.Mail;
-using HrynCo.NotificationService.DAL.Abstract;
+using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Providers;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.Services.Core;

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

@@ -0,0 +1,18 @@
+using HrynCo.NotificationService.Services.Core;
+using MediatR;
+
+namespace HrynCo.NotificationService.Services.EmailChannels.TestSmtp;
+
+/// <summary>
+/// Sends a test email using the provided SMTP settings without persisting anything.
+/// </summary>
+public sealed record TestSmtpCommand(
+    string Host,
+    int Port,
+    string Username,
+    string Password,
+    bool UseSsl,
+    string FromEmail,
+    string FromName,
+    string ToEmail
+) : IRequest<ServiceResult<Core.Unit>>;

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

@@ -0,0 +1,52 @@
+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;
+
+namespace HrynCo.NotificationService.Services.EmailChannels.TestSmtp;
+
+internal sealed class TestSmtpHandler
+    : RequestHandler<TestSmtpCommand, ServiceResult<Unit>>
+{
+    public TestSmtpHandler(
+        IContextualSerilogLogger<TestSmtpCommand> logger,
+        IUnitOfWork unitOfWork)
+        : base(logger, unitOfWork)
+    {
+    }
+
+    protected override async Task<ServiceResult<Unit>> DoOnHandle(
+        TestSmtpCommand request, CancellationToken cancellationToken)
+    {
+        try
+        {
+            using var client = new SmtpClient(request.Host, request.Port)
+            {
+                EnableSsl = request.UseSsl,
+                Credentials = string.IsNullOrWhiteSpace(request.Username)
+                    ? null
+                    : new NetworkCredential(request.Username, request.Password)
+            };
+
+            using var mail = new MailMessage
+            {
+                From = new MailAddress(request.FromEmail, request.FromName),
+                Subject = "✅ Test email from Notification Service",
+                Body = "<p>This is a test email sent from the <b>Notification Service</b> admin panel to verify the channel settings.</p>",
+                IsBodyHtml = true
+            };
+            mail.To.Add(new MailAddress(request.ToEmail));
+
+            await client.SendMailAsync(mail, cancellationToken);
+        }
+        catch (Exception ex)
+        {
+            Logger.Error(ex, "Ad-hoc SMTP test failed for host {Host}", request.Host);
+            return Failure<Unit>(ex.Message);
+        }
+
+        return Success(Unit.Value);
+    }
+}

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

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract;
+using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.Services.Core;
 using HrynCo.NotificationService.Services.Logging;

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

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract;
+using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.DAL.Abstract.Templates;
 using HrynCo.NotificationService.Services.Core;

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

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract;
+using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.Services.Core;
 using HrynCo.NotificationService.Services.Logging;

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

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract;
+using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.DAL.Abstract.Templates;
 using HrynCo.NotificationService.Services.Core;

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

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract;
+using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.DAL.Abstract.Templates;
 using HrynCo.NotificationService.Services.Core;

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

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract;
+using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.DAL.Abstract.Templates;
 using HrynCo.NotificationService.Services.Core;

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

@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.DAL.Abstract;
+using HrynCo.DAL.Abstract;
 using HrynCo.NotificationService.DAL.Abstract.Repositories;
 using HrynCo.NotificationService.Services.Core;
 using HrynCo.NotificationService.Services.Logging;

HrynCo.NotificationService.Web/Controllers/Admin/AdminChannelsController.cs

@@ -5,6 +5,7 @@ using HrynCo.NotificationService.Services.EmailChannels.Delete;
 using HrynCo.NotificationService.Services.EmailChannels.Get;
 using HrynCo.NotificationService.Services.EmailChannels.GetUsageSummary;
 using HrynCo.NotificationService.Services.EmailChannels.Send;
+using HrynCo.NotificationService.Services.EmailChannels.TestSmtp;
 using HrynCo.NotificationService.Services.EmailChannels.Update;
 using HrynCo.NotificationService.Web.Controllers.Admin.ViewModels;
 using MediatR;
@@ -133,6 +134,20 @@ public class AdminChannelsController(IMediator mediator) : Controller
         return RedirectToAction(nameof(Index));
     }
 
+    // POST /admin/channels/test-smtp
+    [HttpPost("test-smtp")]
+    public async Task<IActionResult> TestSmtp([FromBody] TestSmtpRequest request, CancellationToken ct)
+    {
+        var result = await mediator.Send(new TestSmtpCommand(
+            request.Host, request.Port, request.Username, request.Password,
+            request.UseSsl, request.FromEmail, request.FromName, request.ToEmail), ct);
+
+        if (!result.IsSuccess)
+            return Ok(new { success = false, message = result.Error?.Message });
+
+        return Ok(new { success = true, message = $"Test email sent to {request.ToEmail}." });
+    }
+
     // POST /admin/channels/{id}/test
     [HttpPost("{id:guid}/test")]
     public async Task<IActionResult> Test(Guid id, [FromBody] TestChannelRequest request, CancellationToken ct)
@@ -165,3 +180,6 @@ public class AdminChannelsController(IMediator mediator) : Controller
 }
 
 public record TestChannelRequest(string ToEmail);
+public record TestSmtpRequest(
+    string Host, int Port, string Username, string Password,
+    bool UseSsl, string FromEmail, string FromName, string ToEmail);

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

@@ -121,82 +121,90 @@
         <button type="submit" form="channelForm" class="btn btn-primary">
             <i class="bi bi-floppy me-1"></i> Save
         </button>
-        @if (!Model.IsNew)
+        <button type="button" class="btn btn-success" id="testModalBtn">
-        {
+            <i class="bi bi-send me-1"></i> Test
-            <button type="button" class="btn btn-success" id="testModalBtn">
+        </button>
-                <i class="bi bi-send me-1"></i> Test
-            </button>
-        }
         <a href="/admin/channels" class="btn btn-secondary">
             <i class="bi bi-x-lg me-1"></i> Cancel
         </a>
     }
 </form>
 
-@if (!Model.IsNew)
+<div class="modal fade" id="testModal" tabindex="-1">
-{
+    <div class="modal-dialog modal-dialog-centered">
-    <div class="modal fade" id="testModal" tabindex="-1">
+        <div class="modal-content">
-        <div class="modal-dialog modal-dialog-centered">
+            <div class="modal-header">
-            <div class="modal-content">
+                <h5 class="modal-title"><i class="bi bi-send me-2"></i>Send Test Email</h5>
-                <div class="modal-header">
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                    <h5 class="modal-title"><i class="bi bi-send me-2"></i>Send Test Email</h5>
+            </div>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+            <div class="modal-body">
-                </div>
+                <p class="text-muted small">Tests the current form settings — no need to save first.</p>
-                <div class="modal-body">
+                <label for="testToEmail" class="form-label fw-semibold">Recipient Email</label>
-                    <label for="testToEmail" class="form-label fw-semibold">Recipient Email</label>
+                <input type="email" id="testToEmail" class="form-control" placeholder="you@example.com" />
-                    <input type="email" id="testToEmail" class="form-control" placeholder="you@example.com" />
+                <div id="testResult" class="mt-3" style="display:none"></div>
-                    <div id="testResult" class="mt-3" style="display:none"></div>
+            </div>
-                </div>
+            <div class="modal-footer">
-                <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-success" id="testSendBtn" onclick="sendTestEmail()">
-                    <button type="button" class="btn btn-success" id="testSendBtn" onclick="sendTestEmail('@Model.Id')">
+                    <i class="bi bi-send me-1"></i> Send
-                        <i class="bi bi-send me-1"></i> Send
+                </button>
-                    </button>
-                </div>
             </div>
         </div>
     </div>
+</div>
 
-    <script>
+<script>
-        document.addEventListener('click', function (e) {
+    document.addEventListener('click', function (e) {
-            if (e.target.closest('#testModalBtn')) {
+        if (e.target.closest('#testModalBtn')) {
-                bootstrap.Modal.getOrCreateInstance(document.getElementById('testModal')).show();
+            document.getElementById('testResult').style.display = 'none';
-            }
+            bootstrap.Modal.getOrCreateInstance(document.getElementById('testModal')).show();
-        });
-
-        async function sendTestEmail(channelId) {
-            const toEmail = document.getElementById('testToEmail').value.trim();
-            const resultDiv = document.getElementById('testResult');
-            const sendBtn = document.getElementById('testSendBtn');
-
-            if (!toEmail) {
-                resultDiv.style.display = 'block';
-                resultDiv.innerHTML = '<div class="alert alert-warning mb-0">Please enter a recipient email.</div>';
-                return;
-            }
-
-            sendBtn.disabled = true;
-            sendBtn.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span> Sending…';
-            resultDiv.style.display = 'none';
-
-            try {
-                const resp = await fetch(`/admin/channels/${channelId}/test`, {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ toEmail })
-                });
-                const data = await resp.json();
-                resultDiv.style.display = 'block';
-                resultDiv.innerHTML = data.success
-                    ? `<div class="alert alert-success mb-0"><i class="bi bi-check-circle me-1"></i>${data.message}</div>`
-                    : `<div class="alert alert-danger mb-0"><i class="bi bi-x-circle me-1"></i>${data.message}</div>`;
-            } catch (e) {
-                resultDiv.style.display = 'block';
-                resultDiv.innerHTML = `<div class="alert alert-danger mb-0">Request failed: ${e.message}</div>`;
-            } finally {
-                sendBtn.disabled = false;
-                sendBtn.innerHTML = '<i class="bi bi-send me-1"></i> Send';
-            }
         }
-    </script>
+    });
-}
+
+    async function sendTestEmail() {
+        const toEmail = document.getElementById('testToEmail').value.trim();
+        const resultDiv = document.getElementById('testResult');
+        const sendBtn = document.getElementById('testSendBtn');
+
+        if (!toEmail) {
+            resultDiv.style.display = 'block';
+            resultDiv.innerHTML = '<div class="alert alert-warning mb-0">Please enter a recipient email.</div>';
+            return;
+        }
+
+        const form = document.getElementById('channelForm');
+        const payload = {
+            host: form.querySelector('[name="Host"]').value,
+            port: parseInt(form.querySelector('[name="Port"]').value, 10),
+            username: form.querySelector('[name="Username"]').value,
+            password: form.querySelector('[name="Password"]').value,
+            useSsl: form.querySelector('[name="UseSsl"]').checked,
+            fromEmail: form.querySelector('[name="FromEmail"]').value,
+            fromName: form.querySelector('[name="FromName"]').value,
+            toEmail
+        };
+
+        sendBtn.disabled = true;
+        sendBtn.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span> Sending…';
+        resultDiv.style.display = 'none';
+
+        try {
+            const resp = await fetch('/admin/channels/test-smtp', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify(payload)
+            });
+            const data = await resp.json();
+            resultDiv.style.display = 'block';
+            resultDiv.innerHTML = data.success
+                ? `<div class="alert alert-success mb-0"><i class="bi bi-check-circle me-1"></i>${data.message}</div>`
+                : `<div class="alert alert-danger mb-0"><i class="bi bi-x-circle me-1"></i>${data.message}</div>`;
+        } catch (e) {
+            resultDiv.style.display = 'block';
+            resultDiv.innerHTML = `<div class="alert alert-danger mb-0">Request failed: ${e.message}</div>`;
+        } finally {
+            sendBtn.disabled = false;
+            sendBtn.innerHTML = '<i class="bi bi-send me-1"></i> Send';
+        }
+    }
+</script>

HrynCo.NotificationService.Web/appsettings.json

@@ -20,7 +20,10 @@
         }
       }
     ],
-    "Enrich": [ "FromLogContext" ]
+    "Enrich": [ "FromLogContext" ],
+    "Properties": {
+      "Application": "hrynco-notification-service-web"
+    }
   },
   "AllowedHosts": "*"
 }

HrynCo.NotificationService.Worker/appsettings.json

@@ -27,6 +27,9 @@
         }
       }
     ],
-    "Enrich": [ "FromLogContext" ]
+    "Enrich": [ "FromLogContext" ],
+    "Properties": {
+      "Application": "hrynco-notification-service-worker"
+    }
   }
 }

docker/environments/docker-compose.Development.yml

@@ -5,7 +5,7 @@ services:
     environment:
       - App__ConnectionString=Host=db;Port=5432;Database=notification_service;Username=postgres;Password=postgres
 
-  api:
+  web:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - App__ConnectionString=Host=db;Port=5432;Database=notification_service;Username=postgres;Password=postgres
@@ -26,31 +26,22 @@ services:
         condition: service_healthy
 
   rabbitmq:
-    image: rabbitmq:4-management-alpine
     environment:
       RABBITMQ_DEFAULT_USER: guest
       RABBITMQ_DEFAULT_PASS: guest
     ports:
       - "5672:5672"
       - "15672:15672"
-    healthcheck:
+    networks:
-      test: ["CMD", "rabbitmq-diagnostics", "ping"]
+      - internal
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    volumes:
-      - notification_rabbitmq:/var/lib/rabbitmq
 
   db:
-    image: postgres:17
-    environment:
-      POSTGRES_DB: notification_service
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
     ports:
       - "5433:5432"
     volumes:
-      - notification_db:/var/lib/postgresql/data
+      - pgdata:/var/lib/postgresql/data
+    networks:
+      - internal
 
   seq:
     image: datalust/seq:2024
@@ -60,9 +51,14 @@ services:
     ports:
       - "5342:80"
     volumes:
-      - notification_seq:/data
+      - seq_data:/data
+    networks:
+      - internal
 
 volumes:
-  notification_db:
+  pgdata:
-  notification_seq:
+    name: ns-dev-pgdata
-  notification_rabbitmq:
+  rabbitmq_data:
+    name: ns-dev-rabbitmq-data
+  seq_data:
+    name: ns-dev-seq

docker/environments/docker-compose.prod.yml

@@ -0,0 +1,37 @@
+services:
+  migrator:
+    build: {}
+    image: registry.grynco.com.ua/hrynco.notification-service.migrator:${MIGRATOR_IMAGE_TAG:?MIGRATOR_IMAGE_TAG is required}
+
+  web:
+    build: {}
+    image: registry.grynco.com.ua/hrynco.notification-service.web:${WEB_IMAGE_TAG:?WEB_IMAGE_TAG is required}
+    ports:
+      - "${WEB_PORT:?WEB_PORT is required}:8080"
+    environment:
+      - Serilog__WriteTo__1__Args__serverUrl=${SEQ_URL:-}
+    restart: always
+
+  worker:
+    build: {}
+    image: registry.grynco.com.ua/hrynco.notification-service.worker:${WORKER_IMAGE_TAG:?WORKER_IMAGE_TAG is required}
+    environment:
+      - Serilog__WriteTo__1__Args__serverUrl=${SEQ_URL:-}
+    restart: always
+
+  rabbitmq:
+    restart: always
+    networks:
+      - internal
+      - hrynco-services
+
+  db:
+    ports:
+      - "${DB_PORT:?DB_PORT is required}:5432"
+    restart: always
+
+networks:
+  internal: {}
+  hrynco-services:
+    external: true
+    name: hrynco-services

docker/environments/docker-compose.yml

@@ -6,24 +6,28 @@ services:
       context: ../..
       dockerfile: HrynCo.NotificationService.Migrator/Dockerfile
     environment:
-      - App__ConnectionString=${CONNECTION_STRING}
+      - App__ConnectionString=Host=db;Port=5432;Database=${DB_NAME:?DB_NAME is required};Username=${DB_USER:?DB_USER is required};Password=${DB_PASS:?DB_PASS is required}
     depends_on:
       db:
-        condition: service_started
+        condition: service_healthy
+    networks:
+      - internal
     restart: "no"
 
-  api:
+  web:
     build:
       context: ../..
       dockerfile: HrynCo.NotificationService.Web/Dockerfile
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
-      - App__ConnectionString=${CONNECTION_STRING}
+      - App__ConnectionString=Host=db;Port=5432;Database=${DB_NAME:?DB_NAME is required};Username=${DB_USER:?DB_USER is required};Password=${DB_PASS:?DB_PASS is required}
     depends_on:
       db:
-        condition: service_started
+        condition: service_healthy
       migrator:
         condition: service_completed_successfully
+    networks:
+      - internal
 
   worker:
     build:
@@ -31,25 +35,61 @@ services:
       dockerfile: HrynCo.NotificationService.Worker/Dockerfile
     environment:
       - DOTNET_ENVIRONMENT=Production
-      - App__ConnectionString=${CONNECTION_STRING}
+      - App__ConnectionString=Host=db;Port=5432;Database=${DB_NAME:?DB_NAME is required};Username=${DB_USER:?DB_USER is required};Password=${DB_PASS:?DB_PASS is required}
       - App__RabbitMq__Host=rabbitmq
-      - App__RabbitMq__User=${RABBITMQ_USER:-guest}
+      - App__RabbitMq__Port=5672
-      - App__RabbitMq__Password=${RABBITMQ_PASSWORD:-guest}
+      - App__RabbitMq__User=${RABBITMQ_USER:?RABBITMQ_USER is required}
+      - App__RabbitMq__Password=${RABBITMQ_PASSWORD:?RABBITMQ_PASSWORD is required}
     depends_on:
       db:
-        condition: service_started
+        condition: service_healthy
       migrator:
         condition: service_completed_successfully
       rabbitmq:
         condition: service_healthy
+    networks:
+      - internal
 
   rabbitmq:
     image: rabbitmq:4-management-alpine
     environment:
-      RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER:-guest}
+      RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER:?RABBITMQ_USER is required}
-      RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD:-guest}
+      RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD:?RABBITMQ_PASSWORD is required}
+    ports:
+      - "${RABBITMQ_AMQP_PORT:?RABBITMQ_AMQP_PORT is required}:5672"
+      - "${RABBITMQ_MANAGEMENT_PORT:?RABBITMQ_MANAGEMENT_PORT is required}:15672"
+    volumes:
+      - rabbitmq_data:/var/lib/rabbitmq
+    networks:
+      - internal
     healthcheck:
       test: ["CMD", "rabbitmq-diagnostics", "ping"]
       interval: 10s
       timeout: 5s
       retries: 5
+
+  db:
+    image: postgres:17
+    environment:
+      - POSTGRES_DB=${DB_NAME:?DB_NAME is required}
+      - POSTGRES_USER=${DB_USER:?DB_USER is required}
+      - POSTGRES_PASSWORD=${DB_PASS:?DB_PASS is required}
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    networks:
+      - internal
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USER}"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+
+volumes:
+  pgdata:
+    name: ${VOLUME_PREFIX:?VOLUME_PREFIX is required}-pgdata
+  rabbitmq_data:
+    name: ${VOLUME_PREFIX:?VOLUME_PREFIX is required}-rabbitmq-data
+
+networks:
+  internal:
+    driver: bridge