From 1b7de96301dff06ecd79dea60b5fef931727ebf7 Mon Sep 17 00:00:00 2001
From: MOHAMED RASHED <mohamedrashed1299@gmail.com>
Date: Sat, 13 Jun 2026 20:57:05 +0300
Subject: [PATCH 1/2] refactor: enhanc consumers + add s3 storage managment

---
 backend/Directory.Packages.props              |  23 +-
 .../CommunityJoinRequestedBusPublisher.cs     |   2 +-
 .../EventHandlers/PostCreatedBusPublisher.cs} |   2 +-
 .../EventHandlers}/PostVotedBusPublisher.cs   |   2 +-
 .../ReplyCreatedBusPublisher.cs               |   2 +-
 .../CCE.Infrastructure.csproj                 |   1 +
 .../CceInfrastructureOptions.cs               |  12 ++
 .../CCE.Infrastructure/DependencyInjection.cs |  10 +-
 .../CCE.Infrastructure/Files/S3FileStorage.cs |  72 +++++++
 .../Notifications/NotificationGateway.cs      |  24 ++-
 backend/src/CCE.Seeder/Program.cs             |   1 +
 .../Seeders/NotificationTemplateSeeder.cs     | 198 ++++++++++++++++++
 .../Country/CountryResourceRequestTests.cs    |   9 +-
 .../Identity/UserDefaultsTests.cs             |   2 +-
 .../Identity/UserMutationTests.cs             |  12 +-
 15 files changed, 330 insertions(+), 42 deletions(-)
 rename backend/src/CCE.Application/{Notifications/Handlers => Community/EventHandlers}/CommunityJoinRequestedBusPublisher.cs (95%)
 rename backend/src/CCE.Application/{Notifications/Handlers/PostCreatedIntegrationEventHandler.cs => Community/EventHandlers/PostCreatedBusPublisher.cs} (96%)
 rename backend/src/CCE.Application/{Notifications/Handlers => Community/EventHandlers}/PostVotedBusPublisher.cs (95%)
 rename backend/src/CCE.Application/{Notifications/Handlers => Community/EventHandlers}/ReplyCreatedBusPublisher.cs (95%)
 create mode 100644 backend/src/CCE.Infrastructure/Files/S3FileStorage.cs
 create mode 100644 backend/src/CCE.Seeder/Seeders/NotificationTemplateSeeder.cs

diff --git a/backend/Directory.Packages.props b/backend/Directory.Packages.props
index 6921bf9d..a5b081dc 100644
--- a/backend/Directory.Packages.props
+++ b/backend/Directory.Packages.props
@@ -1,11 +1,10 @@
 <Project>
-
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
-
   <ItemGroup Label="Core framework &amp; Testing">
+    <PackageVersion Include="AWSSDK.S3" Version="4.0.24.3" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
@@ -26,22 +25,18 @@
     <PackageVersion Include="Bogus" Version="35.6.1" />
     <PackageVersion Include="NetArchTest.Rules" Version="1.3.2" />
   </ItemGroup>
-
   <ItemGroup Label="Search &amp; Sanitization">
     <PackageVersion Include="HtmlSanitizer" Version="9.0.886" />
     <PackageVersion Include="Meilisearch" Version="0.15.5" />
   </ItemGroup>
-
   <ItemGroup Label="Email transport (SMTP)">
     <PackageVersion Include="MailKit" Version="4.8.0" />
   </ItemGroup>
-
   <ItemGroup Label="External API clients (Refit)">
     <PackageVersion Include="Refit" Version="8.0.0" />
     <PackageVersion Include="Refit.HttpClientFactory" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.4.0" />
   </ItemGroup>
-
   <ItemGroup Label="Application layer">
     <PackageVersion Include="CsvHelper" Version="33.0.1" />
     <PackageVersion Include="MediatR" Version="12.4.1" />
@@ -50,7 +45,6 @@
     <PackageVersion Include="Mapster" Version="7.4.0" />
     <PackageVersion Include="Mapster.DependencyInjection" Version="1.0.1" />
   </ItemGroup>
-
   <ItemGroup Label="Persistence (EF Core + SQL Server)">
     <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.1" />
@@ -60,12 +54,10 @@
     <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.1" />
     <PackageVersion Include="EFCore.NamingConventions" Version="10.0.0" />
   </ItemGroup>
-
   <ItemGroup Label="Redis">
     <PackageVersion Include="StackExchange.Redis" Version="2.8.31" />
     <PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.0" />
   </ItemGroup>
-
   <ItemGroup Label="ASP.NET Core web API">
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0" />
@@ -80,14 +72,12 @@
     <!-- SignalR Redis backplane — fans out hub messages across API instances + the Worker. -->
     <PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="10.0.0" />
   </ItemGroup>
-
   <ItemGroup Label="Identity (external users)">
     <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="10.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Identity" Version="2.3.1" />
     <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.0" />
   </ItemGroup>
-
   <ItemGroup Label="Observability (Serilog + Sentry + Prometheus)">
     <PackageVersion Include="Serilog" Version="4.2.0" />
     <PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
@@ -103,7 +93,6 @@
     <PackageVersion Include="prometheus-net.AspNetCore" Version="8.2.1" />
     <PackageVersion Include="Anthropic.SDK" Version="5.0.0" />
   </ItemGroup>
-
   <ItemGroup Label="Integration tests (Testcontainers)">
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
     <PackageVersion Include="Testcontainers" Version="4.4.0" />
@@ -111,7 +100,6 @@
     <PackageVersion Include="Testcontainers.Redis" Version="4.4.0" />
     <PackageVersion Include="WireMock.Net" Version="1.7.0" />
   </ItemGroup>
-
   <ItemGroup Label="Messaging (MassTransit)">
     <!-- MassTransit core + RabbitMQ transport. All MIT-licensed, no commercial licence required. -->
     <PackageVersion Include="MassTransit" Version="8.3.7" />
@@ -121,22 +109,18 @@
     <!-- In-memory transport used in tests and when Messaging:Transport=InMemory -->
     <PackageVersion Include="MassTransit.Testing.Helpers" Version="8.3.7" />
   </ItemGroup>
-
   <ItemGroup Label="Rate limiting (built-in 8+, no package) and problem-details helpers">
     <PackageVersion Include="Hellang.Middleware.ProblemDetails" Version="6.5.1" />
   </ItemGroup>
-
   <ItemGroup Label="Health checks">
     <PackageVersion Include="AspNetCore.HealthChecks.SqlServer" Version="9.0.0" />
     <PackageVersion Include="AspNetCore.HealthChecks.Redis" Version="9.0.0" />
   </ItemGroup>
-
   <ItemGroup Label="MediatR pipeline behaviors">
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.1" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
   </ItemGroup>
-
   <ItemGroup Label="Transitive vulnerability overrides">
     <!-- Microsoft.Graph 5.80.0 pulls in Kiota 1.17.1 which has GHSA-7j59-v9qr-6fq9.
          Pin to patched version until Microsoft.Graph updates its dependency. -->
@@ -145,7 +129,6 @@
          which has GHSA-37gx-xxp4-5rgx and GHSA-w3x6-4m5h-cxqf. Pin to .NET 10 patched version. -->
     <PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.0" />
   </ItemGroup>
-
   <ItemGroup Label="Roslyn source generators (used by Domain.SourceGenerators)">
     <!-- Pin to host-compatible Roslyn. SDK 10.0.2xx ships Roslyn 4.13; referencing incompatible version raises CS9057.
          Microsoft.CodeAnalysis.Common is added explicitly because EF Core's design package
@@ -157,7 +140,6 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
     <PackageVersion Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
-
   <ItemGroup Label="Seq + OpenTelemetry">
     <PackageVersion Include="Serilog.Sinks.Seq" Version="8.0.0" />
     <PackageVersion Include="OpenTelemetry" Version="1.11.2" />
@@ -166,5 +148,4 @@
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.11.0" />
   </ItemGroup>
-
-</Project>
+</Project>
\ No newline at end of file
diff --git a/backend/src/CCE.Application/Notifications/Handlers/CommunityJoinRequestedBusPublisher.cs b/backend/src/CCE.Application/Community/EventHandlers/CommunityJoinRequestedBusPublisher.cs
similarity index 95%
rename from backend/src/CCE.Application/Notifications/Handlers/CommunityJoinRequestedBusPublisher.cs
rename to backend/src/CCE.Application/Community/EventHandlers/CommunityJoinRequestedBusPublisher.cs
index 527c1574..46315c08 100644
--- a/backend/src/CCE.Application/Notifications/Handlers/CommunityJoinRequestedBusPublisher.cs
+++ b/backend/src/CCE.Application/Community/EventHandlers/CommunityJoinRequestedBusPublisher.cs
@@ -3,7 +3,7 @@
 using CCE.Domain.Community.Events;
 using MediatR;
 
-namespace CCE.Application.Notifications.Handlers;
+namespace CCE.Application.Community.EventHandlers;
 
 /// <summary>
 /// Bridge: translates the <see cref="CommunityJoinRequestedEvent"/> domain event into a
diff --git a/backend/src/CCE.Application/Notifications/Handlers/PostCreatedIntegrationEventHandler.cs b/backend/src/CCE.Application/Community/EventHandlers/PostCreatedBusPublisher.cs
similarity index 96%
rename from backend/src/CCE.Application/Notifications/Handlers/PostCreatedIntegrationEventHandler.cs
rename to backend/src/CCE.Application/Community/EventHandlers/PostCreatedBusPublisher.cs
index b9ca475c..365d2127 100644
--- a/backend/src/CCE.Application/Notifications/Handlers/PostCreatedIntegrationEventHandler.cs
+++ b/backend/src/CCE.Application/Community/EventHandlers/PostCreatedBusPublisher.cs
@@ -3,7 +3,7 @@
 using CCE.Domain.Community.Events;
 using MediatR;
 
-namespace CCE.Application.Notifications.Handlers;
+namespace CCE.Application.Community.EventHandlers;
 
 /// <summary>
 /// Bridge: when <see cref="PostCreatedEvent"/> is dispatched (pre-commit, inside the
diff --git a/backend/src/CCE.Application/Notifications/Handlers/PostVotedBusPublisher.cs b/backend/src/CCE.Application/Community/EventHandlers/PostVotedBusPublisher.cs
similarity index 95%
rename from backend/src/CCE.Application/Notifications/Handlers/PostVotedBusPublisher.cs
rename to backend/src/CCE.Application/Community/EventHandlers/PostVotedBusPublisher.cs
index 488f2cdc..ea666295 100644
--- a/backend/src/CCE.Application/Notifications/Handlers/PostVotedBusPublisher.cs
+++ b/backend/src/CCE.Application/Community/EventHandlers/PostVotedBusPublisher.cs
@@ -3,7 +3,7 @@
 using CCE.Domain.Community.Events;
 using MediatR;
 
-namespace CCE.Application.Notifications.Handlers;
+namespace CCE.Application.Community.EventHandlers;
 
 /// <summary>
 /// Bridge: translates the <see cref="PostVotedEvent"/> domain event into a
diff --git a/backend/src/CCE.Application/Notifications/Handlers/ReplyCreatedBusPublisher.cs b/backend/src/CCE.Application/Community/EventHandlers/ReplyCreatedBusPublisher.cs
similarity index 95%
rename from backend/src/CCE.Application/Notifications/Handlers/ReplyCreatedBusPublisher.cs
rename to backend/src/CCE.Application/Community/EventHandlers/ReplyCreatedBusPublisher.cs
index af69e3c6..7f783c9f 100644
--- a/backend/src/CCE.Application/Notifications/Handlers/ReplyCreatedBusPublisher.cs
+++ b/backend/src/CCE.Application/Community/EventHandlers/ReplyCreatedBusPublisher.cs
@@ -3,7 +3,7 @@
 using CCE.Domain.Community.Events;
 using MediatR;
 
-namespace CCE.Application.Notifications.Handlers;
+namespace CCE.Application.Community.EventHandlers;
 
 /// <summary>
 /// Bridge: translates the <see cref="ReplyCreatedEvent"/> domain event into a
diff --git a/backend/src/CCE.Infrastructure/CCE.Infrastructure.csproj b/backend/src/CCE.Infrastructure/CCE.Infrastructure.csproj
index c9e78f28..a6ddbac1 100644
--- a/backend/src/CCE.Infrastructure/CCE.Infrastructure.csproj
+++ b/backend/src/CCE.Infrastructure/CCE.Infrastructure.csproj
@@ -14,6 +14,7 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="AWSSDK.S3" />
 
     <PackageReference Include="Microsoft.EntityFrameworkCore" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
diff --git a/backend/src/CCE.Infrastructure/CceInfrastructureOptions.cs b/backend/src/CCE.Infrastructure/CceInfrastructureOptions.cs
index 70702d49..e01a56c7 100644
--- a/backend/src/CCE.Infrastructure/CceInfrastructureOptions.cs
+++ b/backend/src/CCE.Infrastructure/CceInfrastructureOptions.cs
@@ -32,6 +32,18 @@ public sealed class CceInfrastructureOptions
     /// <summary>Root directory for media file storage. When under wwwroot/, files are also served as static content.</summary>
     public string MediaUploadsRoot { get; init; } = "./wwwroot/media/";
 
+    /// <summary>S3-compatible object store endpoint (Supabase / MinIO / R2). Example: <c>https://xxx.supabase.co/storage/v1/s3</c>.</summary>
+    public string S3EndpointUrl { get; init; } = string.Empty;
+
+    /// <summary>S3 access key ID.</summary>
+    public string S3AccessKey { get; init; } = string.Empty;
+
+    /// <summary>S3 secret access key.</summary>
+    public string S3SecretKey { get; init; } = string.Empty;
+
+    /// <summary>S3 bucket name for all asset/media uploads.</summary>
+    public string S3BucketName { get; init; } = "uploads";
+
     /// <summary>Meilisearch HTTP base URL. Default <c>http://localhost:7700</c>.</summary>
     public string MeilisearchUrl { get; init; } = "http://localhost:7700";
 
diff --git a/backend/src/CCE.Infrastructure/DependencyInjection.cs b/backend/src/CCE.Infrastructure/DependencyInjection.cs
index 70fd5844..222c14a9 100644
--- a/backend/src/CCE.Infrastructure/DependencyInjection.cs
+++ b/backend/src/CCE.Infrastructure/DependencyInjection.cs
@@ -174,13 +174,11 @@ public static IServiceCollection AddInfrastructure(
         services.AddExternalApiClient<CCE.Integration.Kapsarc.IKapsarcGatewayClient>("KapsarcGateway");
         services.AddScoped<CCE.Application.Kapsarc.IKapsarcClient, CCE.Infrastructure.Kapsarc.GatewayKapsarcClient>();
 
-        // File storage + virus scanning
-        services.AddSingleton<IFileStorage, LocalFileStorage>();
+        // File storage — S3-backed (Supabase / MinIO / R2). Both asset and media slots
+        // use the same singleton S3 client. LocalFileStorage is no longer registered.
+        services.AddSingleton<IFileStorage, S3FileStorage>();
         services.AddKeyedSingleton<IFileStorage>("media", (sp, _) =>
-        {
-            var opts = sp.GetRequiredService<IOptions<CceInfrastructureOptions>>().Value;
-            return new LocalFileStorage(opts.MediaUploadsRoot);
-        });
+            sp.GetRequiredService<IFileStorage>());
         services.AddSingleton<IFileStorageFactory, FileStorageFactory>();
 
         // Media upload options (bound from "Media" section in appsettings)
diff --git a/backend/src/CCE.Infrastructure/Files/S3FileStorage.cs b/backend/src/CCE.Infrastructure/Files/S3FileStorage.cs
new file mode 100644
index 00000000..d47142a0
--- /dev/null
+++ b/backend/src/CCE.Infrastructure/Files/S3FileStorage.cs
@@ -0,0 +1,72 @@
+using Amazon.S3;
+using Amazon.S3.Model;
+using Amazon.Runtime;
+using CCE.Application.Content;
+using Microsoft.Extensions.Options;
+
+namespace CCE.Infrastructure.Files;
+
+public sealed class S3FileStorage : IFileStorage, IDisposable
+{
+    private readonly AmazonS3Client _client;
+    private readonly string _bucket;
+
+    public S3FileStorage(IOptions<CceInfrastructureOptions> options)
+    {
+        var opts = options.Value;
+        _bucket = opts.S3BucketName;
+
+        var config = new AmazonS3Config
+        {
+            ServiceURL = opts.S3EndpointUrl,
+            ForcePathStyle = true,
+            UseHttp = false,
+        };
+
+        var credentials = new BasicAWSCredentials(opts.S3AccessKey, opts.S3SecretKey);
+        _client = new AmazonS3Client(credentials, config);
+    }
+
+    public async Task<string> SaveAsync(Stream content, string suggestedFileName, CancellationToken ct)
+    {
+        var now = System.DateTimeOffset.UtcNow;
+        var ext = System.IO.Path.GetExtension(suggestedFileName);
+        var key = $"uploads/{now:yyyy}/{now:MM}/{System.Guid.NewGuid():N}{ext}";
+
+        var req = new PutObjectRequest
+        {
+            BucketName = _bucket,
+            Key = key,
+            InputStream = content,
+            AutoCloseStream = false,
+        };
+
+        await _client.PutObjectAsync(req, ct).ConfigureAwait(false);
+        return key;
+    }
+
+    public async Task<System.IO.Stream> OpenReadAsync(string storageKey, CancellationToken ct)
+    {
+        var req = new GetObjectRequest
+        {
+            BucketName = _bucket,
+            Key = storageKey,
+        };
+
+        var response = await _client.GetObjectAsync(req, ct).ConfigureAwait(false);
+        return response.ResponseStream;
+    }
+
+    public async Task DeleteAsync(string storageKey, CancellationToken ct)
+    {
+        var req = new DeleteObjectRequest
+        {
+            BucketName = _bucket,
+            Key = storageKey,
+        };
+
+        await _client.DeleteObjectAsync(req, ct).ConfigureAwait(false);
+    }
+
+    public void Dispose() => _client.Dispose();
+}
diff --git a/backend/src/CCE.Infrastructure/Notifications/NotificationGateway.cs b/backend/src/CCE.Infrastructure/Notifications/NotificationGateway.cs
index 12e82d4f..5bff6103 100644
--- a/backend/src/CCE.Infrastructure/Notifications/NotificationGateway.cs
+++ b/backend/src/CCE.Infrastructure/Notifications/NotificationGateway.cs
@@ -248,7 +248,29 @@ private async Task<NotificationChannelDispatchResult> DispatchChannelAsync(
                 Error: "Channel disabled by user settings.");
         }
 
-        var sendResult = await sender.SendAsync(rendered, cancellationToken).ConfigureAwait(false);
+        ChannelSendResult sendResult;
+#pragma warning disable CA1031 // Channels must fail independently — a single channel's exception is logged and recorded as Failed, then the remaining channels continue.
+        try
+        {
+            sendResult = await sender.SendAsync(rendered, cancellationToken).ConfigureAwait(false);
+        }
+        catch (Exception ex) when (ex is not OperationCanceledException)
+        {
+            _logger.LogError(
+                ex,
+                "Notification channel {Channel} threw while sending template {TemplateCode} to recipient {RecipientUserId}.",
+                channel,
+                request.TemplateCode,
+                request.RecipientUserId);
+
+            notificationLog.MarkFailed(ex.Message);
+            return new NotificationChannelDispatchResult(
+                channel,
+                NotificationDeliveryStatus.Failed,
+                NotificationLogId: notificationLog.Id,
+                Error: ex.Message);
+        }
+#pragma warning restore CA1031
 
         if (sendResult.Success)
         {
diff --git a/backend/src/CCE.Seeder/Program.cs b/backend/src/CCE.Seeder/Program.cs
index 5aca743e..56ee588b 100644
--- a/backend/src/CCE.Seeder/Program.cs
+++ b/backend/src/CCE.Seeder/Program.cs
@@ -78,6 +78,7 @@ static string FindApiAppSettingsDir()
     builder.Services.AddScoped<ISeeder, CountryCodeSeeder>();
     builder.Services.AddScoped<ISeeder, KnowledgeMapSeeder>();
 builder.Services.AddScoped<ISeeder, PlatformSettingsSeeder>();
+builder.Services.AddScoped<ISeeder, NotificationTemplateSeeder>();
 builder.Services.AddScoped<ISeeder, DemoDataSeeder>();
 builder.Services.AddScoped<SeedRunner>();
 
diff --git a/backend/src/CCE.Seeder/Seeders/NotificationTemplateSeeder.cs b/backend/src/CCE.Seeder/Seeders/NotificationTemplateSeeder.cs
new file mode 100644
index 00000000..5cb44d51
--- /dev/null
+++ b/backend/src/CCE.Seeder/Seeders/NotificationTemplateSeeder.cs
@@ -0,0 +1,198 @@
+using CCE.Domain.Notifications;
+using CCE.Infrastructure.Persistence;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+
+namespace CCE.Seeder.Seeders;
+
+/// <summary>
+/// Idempotent seeder for the <see cref="NotificationTemplate"/> rows that the notification
+/// gateway resolves at dispatch time. Every (TemplateCode × Channel) pair that any handler,
+/// consumer, or service actually dispatches must have a matching active template here —
+/// otherwise the gateway logs "No active template found for channel X" and silently skips it.
+///
+/// <para>
+/// Content is bilingual (ar/en) and uses <c>{{Variable}}</c> placeholders that match the
+/// variables the dispatcher supplies. <c>VariableSchemaJson</c> is left as <c>"{}"</c> (no
+/// required variables) so a missing variable degrades to the literal placeholder rather than
+/// throwing — tighten per-template later if strict validation is wanted. Copy is intentionally
+/// plain; edit freely.
+/// </para>
+/// </summary>
+public sealed class NotificationTemplateSeeder : ISeeder
+{
+    private readonly CceDbContext _ctx;
+    private readonly ILogger<NotificationTemplateSeeder> _logger;
+
+    public NotificationTemplateSeeder(CceDbContext ctx, ILogger<NotificationTemplateSeeder> logger)
+    {
+        _ctx = ctx;
+        _logger = logger;
+    }
+
+    // After PlatformSettings (40), before DemoData (100). Reference data — runs in every environment.
+    public int Order => 45;
+
+    public async Task SeedAsync(CancellationToken cancellationToken = default)
+    {
+        var added = 0;
+        foreach (var t in Templates)
+        {
+            var id = DeterministicGuid.From($"notif_template:{t.Code}:{t.Channel}");
+
+            if (await _ctx.NotificationTemplates.IgnoreQueryFilters()
+                .AnyAsync(x => x.Id == id, cancellationToken).ConfigureAwait(false))
+            {
+                continue;
+            }
+
+            var template = NotificationTemplate.Define(
+                t.Code, t.SubjectAr, t.SubjectEn, t.BodyAr, t.BodyEn, t.Channel, "{}");
+            typeof(NotificationTemplate).GetProperty(nameof(template.Id))!.SetValue(template, id);
+
+            _ctx.NotificationTemplates.Add(template);
+            added++;
+            _logger.LogInformation("Seeded notification template {Code}/{Channel}.", t.Code, t.Channel);
+        }
+
+        if (added > 0)
+        {
+            await _ctx.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+        }
+
+        _logger.LogInformation("NotificationTemplateSeeder complete ({Added} new).", added);
+    }
+
+    private sealed record TemplateSeed(
+        string Code,
+        NotificationChannel Channel,
+        string SubjectAr,
+        string SubjectEn,
+        string BodyAr,
+        string BodyEn);
+
+    // ─── Template definitions (one entry per code × channel that is actually dispatched) ───
+    private static readonly TemplateSeed[] Templates =
+    {
+        // Expert registration — approved (InApp + Email)
+        new("EXPERT_REQUEST_APPROVED", NotificationChannel.InApp,
+            "تمت الموافقة على طلب الخبير",
+            "Expert request approved",
+            "تهانينا! تمت الموافقة على طلب تسجيلك كخبير.",
+            "Congratulations! Your expert registration request has been approved."),
+        new("EXPERT_REQUEST_APPROVED", NotificationChannel.Email,
+            "تمت الموافقة على طلب الخبير",
+            "Expert request approved",
+            "<p>تهانينا! تمت الموافقة على طلب تسجيلك كخبير. يمكنك الآن الوصول إلى ميزات الخبراء على المنصة.</p>",
+            "<p>Congratulations! Your expert registration request has been approved. You now have access to expert features on the platform.</p>"),
+
+        // Expert registration — rejected (InApp + Email)
+        new("EXPERT_REQUEST_REJECTED", NotificationChannel.InApp,
+            "تم رفض طلب الخبير",
+            "Expert request rejected",
+            "نأسف لإبلاغك بأنه تم رفض طلب تسجيلك كخبير. السبب: {{Reason}}",
+            "We're sorry to inform you that your expert registration request was rejected. Reason: {{Reason}}"),
+        new("EXPERT_REQUEST_REJECTED", NotificationChannel.Email,
+            "تم رفض طلب الخبير",
+            "Expert request rejected",
+            "<p>نأسف لإبلاغك بأنه تم رفض طلب تسجيلك كخبير.</p><p>السبب: {{Reason}}</p>",
+            "<p>We're sorry to inform you that your expert registration request was rejected.</p><p>Reason: {{Reason}}</p>"),
+
+        // Country content request — approved (InApp + Email)
+        new("COUNTRY_CONTENT_REQUEST_APPROVED", NotificationChannel.InApp,
+            "تمت الموافقة على طلب المحتوى",
+            "Content request approved",
+            "تمت الموافقة على طلب المحتوى الخاص بك ({{Type}}).",
+            "Your content request ({{Type}}) has been approved."),
+        new("COUNTRY_CONTENT_REQUEST_APPROVED", NotificationChannel.Email,
+            "تمت الموافقة على طلب المحتوى",
+            "Content request approved",
+            "<p>تمت الموافقة على طلب المحتوى الخاص بك ({{Type}}) وأصبح الآن منشوراً.</p>",
+            "<p>Your content request ({{Type}}) has been approved and is now published.</p>"),
+
+        // Country content request — rejected (InApp + Email)
+        new("COUNTRY_CONTENT_REQUEST_REJECTED", NotificationChannel.InApp,
+            "تم رفض طلب المحتوى",
+            "Content request rejected",
+            "تم رفض طلب المحتوى الخاص بك ({{Type}}). ملاحظات: {{AdminNotesAr}}",
+            "Your content request ({{Type}}) was rejected. Notes: {{AdminNotesEn}}"),
+        new("COUNTRY_CONTENT_REQUEST_REJECTED", NotificationChannel.Email,
+            "تم رفض طلب المحتوى",
+            "Content request rejected",
+            "<p>تم رفض طلب المحتوى الخاص بك ({{Type}}).</p><p>ملاحظات المراجع: {{AdminNotesAr}}</p>",
+            "<p>Your content request ({{Type}}) was rejected.</p><p>Reviewer notes: {{AdminNotesEn}}</p>"),
+
+        // Country content submitted — admin/reviewer notice (InApp + Email)
+        new("COUNTRY_CONTENT_SUBMITTED", NotificationChannel.InApp,
+            "طلب محتوى جديد بانتظار المراجعة",
+            "New content request awaiting review",
+            "تم تقديم طلب محتوى جديد ({{Type}}) وبانتظار المراجعة.",
+            "A new content request ({{Type}}) has been submitted and is awaiting review."),
+        new("COUNTRY_CONTENT_SUBMITTED", NotificationChannel.Email,
+            "طلب محتوى جديد بانتظار المراجعة",
+            "New content request awaiting review",
+            "<p>تم تقديم طلب محتوى جديد ({{Type}}) وبانتظار المراجعة.</p>",
+            "<p>A new content request ({{Type}}) has been submitted and is awaiting review.</p>"),
+
+        // News published — author notice (InApp)
+        new("NEWS_PUBLISHED", NotificationChannel.InApp,
+            "تم نشر الخبر",
+            "News published",
+            "تم نشر الخبر الخاص بك على المنصة.",
+            "Your news article has been published on the platform."),
+
+        // Resource published — uploader notice (InApp)
+        new("RESOURCE_PUBLISHED", NotificationChannel.InApp,
+            "تم نشر المورد",
+            "Resource published",
+            "تم نشر المورد الذي قمت برفعه على المنصة.",
+            "The resource you uploaded has been published on the platform."),
+
+        // Community — new post for topic/community followers (InApp)
+        new("COMMUNITY_POST_CREATED", NotificationChannel.InApp,
+            "منشور جديد",
+            "New post",
+            "تم نشر منشور جديد في مجتمع تتابعه.",
+            "A new post was published in a community you follow."),
+
+        // Community — reply on a followed/authored post (InApp)
+        new("POST_REPLIED", NotificationChannel.InApp,
+            "رد جديد على منشور",
+            "New reply on a post",
+            "هناك رد جديد على منشور تتابعه.",
+            "There's a new reply on a post you follow."),
+
+        // Community — join request for moderators (InApp)
+        new("COMMUNITY_JOIN_REQUESTED", NotificationChannel.InApp,
+            "طلب انضمام جديد",
+            "New join request",
+            "هناك طلب انضمام جديد إلى مجتمع تشرف عليه.",
+            "There's a new request to join a community you moderate."),
+
+        // Community — user mentioned in a reply (InApp)
+        new("COMMUNITY_MENTION", NotificationChannel.InApp,
+            "تمت الإشارة إليك",
+            "You were mentioned",
+            "أشار إليك أحد المستخدمين في رد.",
+            "A user mentioned you in a reply."),
+
+        // OTP verification — Email + SMS (channel chosen at runtime)
+        new("OTP_VERIFICATION", NotificationChannel.Email,
+            "رمز التحقق",
+            "Verification code",
+            "<p>رمز التحقق الخاص بك هو: <strong>{{Code}}</strong></p>",
+            "<p>Your verification code is: <strong>{{Code}}</strong></p>"),
+        new("OTP_VERIFICATION", NotificationChannel.Sms,
+            "رمز التحقق",
+            "Verification code",
+            "رمز التحقق الخاص بك هو {{Code}}",
+            "Your verification code is {{Code}}"),
+
+        // Password reset — Email
+        new("PASSWORD_RESET", NotificationChannel.Email,
+            "إعادة تعيين كلمة المرور",
+            "Reset your password",
+            "<p>مرحباً {{Name}}،</p><p>لإعادة تعيين كلمة المرور الخاصة بك، يرجى الضغط على الرابط التالي:</p><p><a href=\"{{ResetUrl}}\">إعادة تعيين كلمة المرور</a></p>",
+            "<p>Hello {{Name}},</p><p>To reset your password, please click the link below:</p><p><a href=\"{{ResetUrl}}\">Reset password</a></p>"),
+    };
+}
diff --git a/backend/tests/CCE.Domain.Tests/Country/CountryResourceRequestTests.cs b/backend/tests/CCE.Domain.Tests/Country/CountryResourceRequestTests.cs
index 6e671b69..0765fc4c 100644
--- a/backend/tests/CCE.Domain.Tests/Country/CountryResourceRequestTests.cs
+++ b/backend/tests/CCE.Domain.Tests/Country/CountryResourceRequestTests.cs
@@ -18,6 +18,7 @@ private static CountryContentRequest NewPendingResource(FakeSystemClock clock) =
             descriptionAr: "وصف", descriptionEn: "Description",
             resourceType: ResourceType.Paper,
             assetFileId: System.Guid.NewGuid(),
+            categoryId: System.Guid.NewGuid(),
             clock: clock);
 
     // ─── SubmitResource ───────────────────────────────────────────────────────
@@ -49,7 +50,7 @@ public void SubmitResource_with_empty_required_field_throws(
         var act = () => CountryContentRequest.SubmitResource(
             System.Guid.NewGuid(), System.Guid.NewGuid(),
             titleAr, titleEn, descAr, descEn,
-            ResourceType.Paper, System.Guid.NewGuid(), clock);
+            ResourceType.Paper, System.Guid.NewGuid(), System.Guid.NewGuid(), clock);
         act.Should().Throw<DomainException>();
     }
 
@@ -60,7 +61,7 @@ public void SubmitResource_with_empty_assetFileId_throws()
         var act = () => CountryContentRequest.SubmitResource(
             System.Guid.NewGuid(), System.Guid.NewGuid(),
             "ا", "x", "ا", "x",
-            ResourceType.Paper, System.Guid.Empty, clock);
+            ResourceType.Paper, System.Guid.Empty, System.Guid.NewGuid(), clock);
         act.Should().Throw<DomainException>().WithMessage("*AssetFileId*");
     }
 
@@ -107,7 +108,7 @@ public void SubmitEvent_creates_pending_event_request()
         var r = CountryContentRequest.SubmitEvent(
             System.Guid.NewGuid(), System.Guid.NewGuid(),
             "عنوان", "Title", "وصف", "Description",
-            topicId, start, end, "الرياض", "Riyadh", null, clock);
+            topicId, start, end, "الرياض", "Riyadh", null, null, clock);
 
         r.Type.Should().Be(ContentType.Event);
         r.ProposedStartsOn.Should().Be(start);
@@ -125,7 +126,7 @@ public void SubmitEvent_with_startsOn_after_endsOn_throws()
             "ا", "x", "ا", "x",
             System.Guid.NewGuid(),
             clock.UtcNow.AddDays(2), clock.UtcNow.AddDays(1),
-            null, null, null, clock);
+            null, null, null, null, clock);
         act.Should().Throw<DomainException>().WithMessage("*StartsOn*");
     }
 
diff --git a/backend/tests/CCE.Domain.Tests/Identity/UserDefaultsTests.cs b/backend/tests/CCE.Domain.Tests/Identity/UserDefaultsTests.cs
index 10556870..7ef52fb1 100644
--- a/backend/tests/CCE.Domain.Tests/Identity/UserDefaultsTests.cs
+++ b/backend/tests/CCE.Domain.Tests/Identity/UserDefaultsTests.cs
@@ -22,7 +22,7 @@ public void New_user_defaults_KnowledgeLevel_to_Beginner()
     public void New_user_defaults_Interests_to_empty_list()
     {
         var user = new User();
-        user.Interests.Should().BeEmpty();
+        user.UserInterestTopics.Should().BeEmpty();
     }
 
     [Fact]
diff --git a/backend/tests/CCE.Domain.Tests/Identity/UserMutationTests.cs b/backend/tests/CCE.Domain.Tests/Identity/UserMutationTests.cs
index c0b8cb16..a8e49b9a 100644
--- a/backend/tests/CCE.Domain.Tests/Identity/UserMutationTests.cs
+++ b/backend/tests/CCE.Domain.Tests/Identity/UserMutationTests.cs
@@ -53,8 +53,9 @@ public void SetKnowledgeLevel_updates_field()
     public void UpdateInterests_replaces_list()
     {
         var user = new User();
-        user.UpdateInterests(new[] { "Solar", "Wind" });
-        user.Interests.Should().Equal("Solar", "Wind");
+        var topics = new[] { System.Guid.NewGuid(), System.Guid.NewGuid() };
+        user.UpdateInterests(topics);
+        user.UserInterestTopics.Select(t => t.TopicId).Should().BeEquivalentTo(topics);
     }
 
     [Fact]
@@ -66,11 +67,12 @@ public void UpdateInterests_with_null_throws()
     }
 
     [Fact]
-    public void UpdateInterests_deduplicates_and_trims()
+    public void UpdateInterests_deduplicates()
     {
         var user = new User();
-        user.UpdateInterests(new[] { " Solar ", "Solar", "Wind", "" });
-        user.Interests.Should().Equal("Solar", "Wind");
+        var id = System.Guid.NewGuid();
+        user.UpdateInterests(new[] { id, id, System.Guid.NewGuid() });
+        user.UserInterestTopics.Should().HaveCount(2);
     }
 
     [Fact]

From 0e507e680cca642f20a076c85c37d0f2cb22ed9d Mon Sep 17 00:00:00 2001
From: MOHAMED RASHED <mohamedrashed1299@gmail.com>
Date: Sun, 14 Jun 2026 02:16:54 +0300
Subject: [PATCH 2/2] feat(notifications): add content notification consumer
 with newsletter email support

- Add ContentNotificationConsumer handling News/Resource/Event publish events
  with per-subscriber fan-out (RecipientName, ContentBody, ArticleUrl)
- Fix DbContext concurrency bug in FanOutAsync (sequential awaits)
- Add NewsletterSubscriptionRepository + INewsletterSubscriptionRepository
  for fetching audience with user names (RecipientName)
- Add INewsRepository.GetNotificationDataAsync returning bilingual
  title + content body for email rendering
- Update SmtpEmailSender with shared responsive HTML layout wrapper
- Add NewsPublishedIntegrationEvent + bus publishers for async dispatch
- Update NotificationTemplateSeeder: NEWS_PUBLISHED Email now renders
  rich HTML with RecipientName, ContentBodyAr/En, and ArticleUrl CTA
- Add update-if-changed logic to seeder (no longer skip-only)
- Add fallback lookup by (Code, Channel) to fix duplicate-key on reseed
- Add Frontend:BaseUrl to appsettings for article link construction
- Add newsletter subscription endpoints to External API
---
 .../Newsletter/NewsletterEndpoints.cs         |   43 +
 backend/src/CCE.Api.External/Program.cs       |    2 +
 .../wwwroot/js/signalr-test.js                |  216 +
 .../wwwroot/js/signalr.min.js                 |    2 +
 .../wwwroot/signalr-test.html                 |  119 +
 .../EventScheduledIntegrationEvent.cs         |   13 +
 .../NewsPublishedIntegrationEvent.cs          |   12 +
 .../ResourcePublishedIntegrationEvent.cs      |   13 +
 .../SubscribeNewsletterCommand.cs             |    7 +
 .../SubscribeNewsletterCommandHandler.cs      |   52 +
 .../CCE.Application/Content/ContentTitle.cs   |    3 +
 .../EventScheduledBusPublisher.cs             |   29 +
 .../NewsPublishedBusPublisher.cs              |   28 +
 .../ResourcePublishedBusPublisher.cs          |   29 +
 .../Content/IEventRepository.cs               |    1 +
 .../Content/INewsRepository.cs                |    4 +
 .../INewsletterSubscriptionRepository.cs      |   21 +
 .../Content/IResourceRepository.cs            |    1 +
 .../EventScheduledNotificationHandler.cs      |   25 -
 .../NewsPublishedNotificationHandler.cs       |    6 +-
 .../ResourcePublishedNotificationHandler.cs   |    6 +-
 backend/src/CCE.Domain/Content/Event.cs       |    2 +-
 .../Content/Events/EventScheduledEvent.cs     |    1 +
 .../Content/Events/NewsPublishedEvent.cs      |    2 +
 .../Content/Events/ResourcePublishedEvent.cs  |    1 +
 backend/src/CCE.Domain/Content/News.cs        |    2 +-
 .../Content/NewsletterSubscription.cs         |   26 +-
 backend/src/CCE.Domain/Content/Resource.cs    |    1 +
 .../CceInfrastructureOptions.cs               |    6 +
 .../Content/EventRepository.cs                |    7 +
 .../Content/NewsRepository.cs                 |   14 +
 .../NewsletterSubscriptionRepository.cs       |   56 +
 .../Content/ResourceRepository.cs             |    7 +
 .../CCE.Infrastructure/DependencyInjection.cs |    1 +
 .../Email/SmtpEmailSender.cs                  |   48 +-
 .../Consumers/ContentNotificationConsumer.cs  |  197 +
 .../ContentNotificationConsumerDefinition.cs  |   20 +
 .../MassTransitIntegrationEventPublisher.cs   |   14 +-
 .../Messaging/MessagingServiceExtensions.cs   |   10 +
 .../Persistence/CceDbContext.cs               |    2 +-
 .../Interceptors/DomainEventDispatcher.cs     |    7 +-
 ...letterSubscriptionAuditColumns.Designer.cs | 5016 +++++++++++++++++
 ...1_AddNewsletterSubscriptionAuditColumns.cs |   97 +
 .../Seeders/NotificationTemplateSeeder.cs     |   82 +-
 .../CCE.Worker/appsettings.Development.json   |   12 +-
 .../Search/MeilisearchIndexerHandlerTests.cs  |    6 +-
 46 files changed, 6198 insertions(+), 71 deletions(-)
 create mode 100644 backend/src/CCE.Api.External/Endpoints/Newsletter/NewsletterEndpoints.cs
 create mode 100644 backend/src/CCE.Api.External/wwwroot/js/signalr-test.js
 create mode 100644 backend/src/CCE.Api.External/wwwroot/js/signalr.min.js
 create mode 100644 backend/src/CCE.Api.External/wwwroot/signalr-test.html
 create mode 100644 backend/src/CCE.Application/Common/Messaging/IntegrationEvents/EventScheduledIntegrationEvent.cs
 create mode 100644 backend/src/CCE.Application/Common/Messaging/IntegrationEvents/NewsPublishedIntegrationEvent.cs
 create mode 100644 backend/src/CCE.Application/Common/Messaging/IntegrationEvents/ResourcePublishedIntegrationEvent.cs
 create mode 100644 backend/src/CCE.Application/Content/Commands/SubscribeNewsletter/SubscribeNewsletterCommand.cs
 create mode 100644 backend/src/CCE.Application/Content/Commands/SubscribeNewsletter/SubscribeNewsletterCommandHandler.cs
 create mode 100644 backend/src/CCE.Application/Content/ContentTitle.cs
 create mode 100644 backend/src/CCE.Application/Content/EventHandlers/EventScheduledBusPublisher.cs
 create mode 100644 backend/src/CCE.Application/Content/EventHandlers/NewsPublishedBusPublisher.cs
 create mode 100644 backend/src/CCE.Application/Content/EventHandlers/ResourcePublishedBusPublisher.cs
 create mode 100644 backend/src/CCE.Application/Content/INewsletterSubscriptionRepository.cs
 delete mode 100644 backend/src/CCE.Application/Notifications/Handlers/EventScheduledNotificationHandler.cs
 create mode 100644 backend/src/CCE.Infrastructure/Content/NewsletterSubscriptionRepository.cs
 create mode 100644 backend/src/CCE.Infrastructure/Notifications/Messaging/Consumers/ContentNotificationConsumer.cs
 create mode 100644 backend/src/CCE.Infrastructure/Notifications/Messaging/Consumers/ContentNotificationConsumerDefinition.cs
 create mode 100644 backend/src/CCE.Infrastructure/Persistence/Migrations/20260613120001_AddNewsletterSubscriptionAuditColumns.Designer.cs
 create mode 100644 backend/src/CCE.Infrastructure/Persistence/Migrations/20260613120001_AddNewsletterSubscriptionAuditColumns.cs

diff --git a/backend/src/CCE.Api.External/Endpoints/Newsletter/NewsletterEndpoints.cs b/backend/src/CCE.Api.External/Endpoints/Newsletter/NewsletterEndpoints.cs
new file mode 100644
index 00000000..111de883
--- /dev/null
+++ b/backend/src/CCE.Api.External/Endpoints/Newsletter/NewsletterEndpoints.cs
@@ -0,0 +1,43 @@
+using CCE.Api.Common.Extensions;
+using CCE.Application.Content.Commands.SubscribeNewsletter;
+using MediatR;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CCE.Api.External.Endpoints.Newsletter;
+
+public static class NewsletterEndpoints
+{
+    public static IEndpointRouteBuilder MapNewsletterEndpoints(this IEndpointRouteBuilder app)
+    {
+        var newsletter = app.MapGroup("/newsletter").WithTags("Newsletter");
+
+        newsletter.MapPost("/subscribe", async (
+            SubscribeNewsletterRequest req,
+            [FromHeader(Name = "Accept-Language")] string? acceptLanguage,
+            ISender sender,
+            CancellationToken ct) =>
+        {
+            var cmd = new SubscribeNewsletterCommand(req.Email, ParseLocale(acceptLanguage));
+            var result = await sender.Send(cmd, ct).ConfigureAwait(false);
+            return result.ToHttpResult();
+        })
+        .AllowAnonymous()
+        .WithName("SubscribeNewsletter");
+
+        return app;
+    }
+
+    // Extracts the primary language tag and normalises to "ar" or "en".
+    // Accept-Language can be e.g. "ar-SA,ar;q=0.9,en;q=0.8" — take the first tag only.
+    private static string ParseLocale(string? acceptLanguage)
+    {
+        if (string.IsNullOrWhiteSpace(acceptLanguage))
+            return "en";
+
+        var primary = acceptLanguage.Split(',')[0].Split(';')[0].Trim();
+        var lang = primary.Split('-')[0].ToLowerInvariant();
+        return lang == "ar" ? "ar" : "en";
+    }
+}
+
+internal sealed record SubscribeNewsletterRequest(string Email);
diff --git a/backend/src/CCE.Api.External/Program.cs b/backend/src/CCE.Api.External/Program.cs
index eb3da8b8..9dcdf65e 100644
--- a/backend/src/CCE.Api.External/Program.cs
+++ b/backend/src/CCE.Api.External/Program.cs
@@ -9,6 +9,7 @@
 using CCE.Api.Common.RateLimiting;
 using CCE.Api.Common.SignalR;
 using CCE.Api.External.Endpoints;
+using CCE.Api.External.Endpoints.Newsletter;
 using CCE.Api.External.Endpoints.Verification;
 using CCE.Api.External.Hubs;
 using CCE.Application;
@@ -126,6 +127,7 @@
 app.MapPoliciesSettingsPublicEndpoints();
 app.MapMediaPublicEndpoints();
 app.MapVerificationEndpoints();
+app.MapNewsletterEndpoints();
 app.MapStateRepresentativeEndpoints();
 app.MapCountryCodesPublicEndpoints();
 app.MapRedisAdminEndpoints();
diff --git a/backend/src/CCE.Api.External/wwwroot/js/signalr-test.js b/backend/src/CCE.Api.External/wwwroot/js/signalr-test.js
new file mode 100644
index 00000000..eac01f9c
--- /dev/null
+++ b/backend/src/CCE.Api.External/wwwroot/js/signalr-test.js
@@ -0,0 +1,216 @@
+(function() {
+  'use strict';
+
+  let connection = null;
+  let eventCount = 0;
+
+  const PROD_URL = 'https://cce-external-api.runasp.net';
+
+  const $ = id => document.getElementById(id);
+  const logEl = $('log');
+  const eventCountEl = $('eventCount');
+
+  function toggleMode() {
+    var isProd = document.querySelector('input[name="mode"]:checked').value === 'prod';
+    $('serverUrl').value = isProd ? PROD_URL : '';
+    $('btnDevSignIn').disabled = isProd;
+    $('devRole').disabled = isProd;
+  }
+
+  window.toggleMode = toggleMode;
+
+  function log(type, eventName, payload) {
+    const now = new Date();
+    const time = now.toLocaleTimeString('en-US', { hour12: false }) + '.' + String(now.getMilliseconds()).padStart(3, '0');
+    const line = document.createElement('div');
+    line.className = 'log-entry';
+    const typeClass = type === 'error' ? 'log-error' : type === 'info' ? 'log-info' : type === 'event' ? 'log-event' : 'log-payload';
+    line.innerHTML = '<span class="log-time">[' + time + ']</span> <span class="' + typeClass + '">' + eventName + '</span>' + (payload ? ' ' + syntaxHighlight(payload) : '');
+    logEl.appendChild(line);
+    logEl.scrollTop = logEl.scrollHeight;
+    if (type !== 'info') {
+      eventCount++;
+      eventCountEl.textContent = eventCount + ' events';
+    }
+  }
+
+  function syntaxHighlight(obj) {
+    var json = typeof obj === 'string' ? obj : JSON.stringify(obj, null, 1);
+    return json.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
+      .replace(/"([^"]+)":/g, '<span style="color:#9cdcfe">"$1"</span>:')
+      .replace(/"([^"]+)"/g, '<span style="color:#ce9178">"$1"</span>')
+      .replace(/\b(true|false|null)\b/g, '<span style="color:#569cd6">$1</span>')
+      .replace(/\b(\d+\.?\d*)\b/g, '<span style="color:#b5cea8">$1</span>');
+  }
+
+  function setStatus(connected, connectionId) {
+    var badge = $('connectionStatus');
+    var idLabel = $('connectionIdLabel');
+    if (connected) {
+      badge.textContent = 'Connected';
+      badge.className = 'badge badge-connected';
+      idLabel.textContent = 'ConnectionId: ' + (connectionId || '');
+      $('btnConnect').disabled = true;
+      $('btnDisconnect').disabled = false;
+      $('serverUrl').disabled = true;
+      $('jwtToken').disabled = true;
+    } else {
+      badge.textContent = 'Disconnected';
+      badge.className = 'badge badge-disconnected';
+      idLabel.textContent = '';
+      $('btnConnect').disabled = false;
+      $('btnDisconnect').disabled = true;
+      $('serverUrl').disabled = false;
+      $('jwtToken').disabled = false;
+    }
+  }
+
+  function getGuid(id) {
+    var val = $(id).value.trim();
+    if (!val) throw new Error(id.replace('Id','') + ' ID is required');
+    return val;
+  }
+
+  var events = [
+    'ReceiveNotification', 'NewReply', 'VoteChanged', 'PollResultsChanged',
+    'NewPost', 'PostModerated', 'ContentModerated', 'PresenceChanged', 'TypingChanged'
+  ];
+
+  $('btnDevSignIn').addEventListener('click', async function() {
+    var baseUrl = $('serverUrl').value.trim() || '';
+    var role = $('devRole').value;
+    try {
+      var res = await fetch(baseUrl + '/dev/sign-in?role=' + encodeURIComponent(role), {
+        credentials: 'same-origin'
+      });
+      if (!res.ok) {
+        var text = await res.text();
+        log('error', 'Dev sign-in failed (' + res.status + ')', text);
+        return;
+      }
+      var data = await res.json();
+      log('info', 'Signed in as ' + role, data);
+    } catch (err) {
+      log('error', 'Dev sign-in error', err.message);
+    }
+  });
+
+  $('btnConnect').addEventListener('click', async function() {
+    if (connection) return;
+
+    var url = ($('serverUrl').value.trim().replace(/\/+$/, '') || '') + '/hubs/notifications';
+    var token = $('jwtToken').value.trim();
+
+    var options = {};
+
+    if (token) {
+      options.accessTokenFactory = function() { return token; };
+    }
+
+    connection = new signalR.HubConnectionBuilder()
+      .withUrl(url, options)
+      .withAutomaticReconnect([0, 2000, 5000, 10000, 30000])
+      .build();
+
+    events.forEach(function(evt) {
+      connection.on(evt, function() {
+        var args = Array.prototype.slice.call(arguments);
+        var payload = args.length === 1 ? args[0] : args;
+        log('event', evt, payload);
+      });
+    });
+
+    connection.onreconnecting(function() {
+      log('info', 'Connection reconnecting...');
+      setStatus(false);
+    });
+
+    connection.onreconnected(function(connectionId) {
+      log('info', 'Reconnected as ' + connectionId);
+      setStatus(true, connectionId);
+    });
+
+    connection.onclose(function(err) {
+      log(err ? 'error' : 'info', 'Connection closed' + (err ? ': ' + err.message : ''));
+      setStatus(false);
+      connection = null;
+    });
+
+    try {
+      await connection.start();
+      log('info', 'Connected to ' + url);
+      setStatus(true, connection.connectionId);
+    } catch (err) {
+      log('error', 'Connection failed', err.message);
+      connection = null;
+      setStatus(false);
+    }
+  });
+
+  $('btnDisconnect').addEventListener('click', async function() {
+    if (!connection) return;
+    try {
+      await connection.stop();
+    } catch (err) {
+      log('error', 'Disconnect error', err.message);
+    }
+    connection = null;
+    setStatus(false);
+  });
+
+  $('btnClearLog').addEventListener('click', function() {
+    logEl.innerHTML = '';
+    eventCount = 0;
+    eventCountEl.textContent = '0 events';
+  });
+
+  $('btnSubscribe').addEventListener('click', function() {
+    if (!connection) { log('error', 'Not connected'); return; }
+    try { connection.invoke('Subscribe', getGuid('postId')); log('info', 'Subscribe(' + $('postId').value.trim() + ')'); }
+    catch (e) { log('error', 'Subscribe failed', e.message); }
+  });
+
+  $('btnUnsubscribe').addEventListener('click', function() {
+    if (!connection) { log('error', 'Not connected'); return; }
+    try { connection.invoke('Unsubscribe', getGuid('postId')); log('info', 'Unsubscribe(' + $('postId').value.trim() + ')'); }
+    catch (e) { log('error', 'Unsubscribe failed', e.message); }
+  });
+
+  $('btnSubscribeCommunity').addEventListener('click', function() {
+    if (!connection) { log('error', 'Not connected'); return; }
+    try { connection.invoke('SubscribeCommunity', getGuid('communityId')); log('info', 'SubscribeCommunity(' + $('communityId').value.trim() + ')'); }
+    catch (e) { log('error', 'SubscribeCommunity failed', e.message); }
+  });
+
+  $('btnUnsubscribeCommunity').addEventListener('click', function() {
+    if (!connection) { log('error', 'Not connected'); return; }
+    try { connection.invoke('UnsubscribeCommunity', getGuid('communityId')); log('info', 'UnsubscribeCommunity(' + $('communityId').value.trim() + ')'); }
+    catch (e) { log('error', 'UnsubscribeCommunity failed', e.message); }
+  });
+
+  $('btnSubscribeTopic').addEventListener('click', function() {
+    if (!connection) { log('error', 'Not connected'); return; }
+    try { connection.invoke('SubscribeTopic', getGuid('topicId')); log('info', 'SubscribeTopic(' + $('topicId').value.trim() + ')'); }
+    catch (e) { log('error', 'SubscribeTopic failed', e.message); }
+  });
+
+  $('btnUnsubscribeTopic').addEventListener('click', function() {
+    if (!connection) { log('error', 'Not connected'); return; }
+    try { connection.invoke('UnsubscribeTopic', getGuid('topicId')); log('info', 'UnsubscribeTopic(' + $('topicId').value.trim() + ')'); }
+    catch (e) { log('error', 'UnsubscribeTopic failed', e.message); }
+  });
+
+  $('btnStartTyping').addEventListener('click', function() {
+    if (!connection) { log('error', 'Not connected'); return; }
+    try { connection.invoke('StartTyping', getGuid('postId')); log('info', 'StartTyping(' + $('postId').value.trim() + ')'); }
+    catch (e) { log('error', 'StartTyping failed', e.message); }
+  });
+
+  $('btnStopTyping').addEventListener('click', function() {
+    if (!connection) { log('error', 'Not connected'); return; }
+    try { connection.invoke('StopTyping', getGuid('postId')); log('info', 'StopTyping(' + $('postId').value.trim() + ')'); }
+    catch (e) { log('error', 'StopTyping failed', e.message); }
+  });
+
+  log('info', 'Ready. Enter your connection details and click Connect.');
+})();
diff --git a/backend/src/CCE.Api.External/wwwroot/js/signalr.min.js b/backend/src/CCE.Api.External/wwwroot/js/signalr.min.js
new file mode 100644
index 00000000..e4e442f4
--- /dev/null
+++ b/backend/src/CCE.Api.External/wwwroot/js/signalr.min.js
@@ -0,0 +1,2 @@
+var t,e;t=self,e=()=>(()=>{var t={d:(e,s)=>{for(var i in s)t.o(s,i)&&!t.o(e,i)&&Object.defineProperty(e,i,{enumerable:!0,get:s[i]})}};t.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(t){if("object"==typeof window)return window}}(),t.o=(t,e)=>Object.prototype.hasOwnProperty.call(t,e),t.r=t=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"t",{value:!0})};var e,s={};t.r(s),t.d(s,{AbortError:()=>r,DefaultHttpClient:()=>H,HttpClient:()=>d,HttpError:()=>i,HttpResponse:()=>u,HttpTransportType:()=>F,HubConnection:()=>q,HubConnectionBuilder:()=>tt,HubConnectionState:()=>A,JsonHubProtocol:()=>Y,LogLevel:()=>e,MessageType:()=>x,NullLogger:()=>f,Subject:()=>U,TimeoutError:()=>n,TransferFormat:()=>B,VERSION:()=>p});class i extends Error{constructor(t,e){const s=new.target.prototype;super(`${t}: Status code '${e}'`),this.statusCode=e,this.__proto__=s}}class n extends Error{constructor(t="A timeout occurred."){const e=new.target.prototype;super(t),this.__proto__=e}}class r extends Error{constructor(t="An abort occurred."){const e=new.target.prototype;super(t),this.__proto__=e}}class o extends Error{constructor(t,e){const s=new.target.prototype;super(t),this.transport=e,this.errorType="UnsupportedTransportError",this.__proto__=s}}class h extends Error{constructor(t,e){const s=new.target.prototype;super(t),this.transport=e,this.errorType="DisabledTransportError",this.__proto__=s}}class c extends Error{constructor(t,e){const s=new.target.prototype;super(t),this.transport=e,this.errorType="FailedToStartTransportError",this.__proto__=s}}class a extends Error{constructor(t){const e=new.target.prototype;super(t),this.errorType="FailedToNegotiateWithServerError",this.__proto__=e}}class l extends Error{constructor(t,e){const s=new.target.prototype;super(t),this.innerErrors=e,this.__proto__=s}}class u{constructor(t,e,s){this.statusCode=t,this.statusText=e,this.content=s}}class d{get(t,e){return this.send({...e,method:"GET",url:t})}post(t,e){return this.send({...e,method:"POST",url:t})}delete(t,e){return this.send({...e,method:"DELETE",url:t})}getCookieString(t){return""}}!function(t){t[t.Trace=0]="Trace",t[t.Debug=1]="Debug",t[t.Information=2]="Information",t[t.Warning=3]="Warning",t[t.Error=4]="Error",t[t.Critical=5]="Critical",t[t.None=6]="None"}(e||(e={}));class f{constructor(){}log(t,e){}}f.instance=new f;const p="8.0.0";class w{static isRequired(t,e){if(null==t)throw new Error(`The '${e}' argument is required.`)}static isNotEmpty(t,e){if(!t||t.match(/^\s*$/))throw new Error(`The '${e}' argument should not be empty.`)}static isIn(t,e,s){if(!(t in e))throw new Error(`Unknown ${s} value: ${t}.`)}}class g{static get isBrowser(){return!g.isNode&&"object"==typeof window&&"object"==typeof window.document}static get isWebWorker(){return!g.isNode&&"object"==typeof self&&"importScripts"in self}static get isReactNative(){return!g.isNode&&"object"==typeof window&&void 0===window.document}static get isNode(){return"undefined"!=typeof process&&process.release&&"node"===process.release.name}}function m(t,e){let s="";return y(t)?(s=`Binary data of length ${t.byteLength}`,e&&(s+=`. Content: '${function(t){const e=new Uint8Array(t);let s="";return e.forEach((t=>{s+=`0x${t<16?"0":""}${t.toString(16)} `})),s.substr(0,s.length-1)}(t)}'`)):"string"==typeof t&&(s=`String data of length ${t.length}`,e&&(s+=`. Content: '${t}'`)),s}function y(t){return t&&"undefined"!=typeof ArrayBuffer&&(t instanceof ArrayBuffer||t.constructor&&"ArrayBuffer"===t.constructor.name)}async function b(t,s,i,n,r,o){const h={},[c,a]=$();h[c]=a,t.log(e.Trace,`(${s} transport) sending data. ${m(r,o.logMessageContent)}.`);const l=y(r)?"arraybuffer":"text",u=await i.post(n,{content:r,headers:{...h,...o.headers},responseType:l,timeout:o.timeout,withCredentials:o.withCredentials});t.log(e.Trace,`(${s} transport) request complete. Response status: ${u.statusCode}.`)}class v{constructor(t,e){this.i=t,this.h=e}dispose(){const t=this.i.observers.indexOf(this.h);t>-1&&this.i.observers.splice(t,1),0===this.i.observers.length&&this.i.cancelCallback&&this.i.cancelCallback().catch((t=>{}))}}class E{constructor(t){this.l=t,this.out=console}log(t,s){if(t>=this.l){const i=`[${(new Date).toISOString()}] ${e[t]}: ${s}`;switch(t){case e.Critical:case e.Error:this.out.error(i);break;case e.Warning:this.out.warn(i);break;case e.Information:this.out.info(i);break;default:this.out.log(i)}}}}function $(){let t="X-SignalR-User-Agent";return g.isNode&&(t="User-Agent"),[t,C(p,S(),g.isNode?"NodeJS":"Browser",k())]}function C(t,e,s,i){let n="Microsoft SignalR/";const r=t.split(".");return n+=`${r[0]}.${r[1]}`,n+=` (${t}; `,n+=e&&""!==e?`${e}; `:"Unknown OS; ",n+=`${s}`,n+=i?`; ${i}`:"; Unknown Runtime Version",n+=")",n}function S(){if(!g.isNode)return"";switch(process.platform){case"win32":return"Windows NT";case"darwin":return"macOS";case"linux":return"Linux";default:return process.platform}}function k(){if(g.isNode)return process.versions.node}function P(t){return t.stack?t.stack:t.message?t.message:`${t}`}class T extends d{constructor(e){super(),this.u=e,this.p=fetch.bind(function(){if("undefined"!=typeof globalThis)return globalThis;if("undefined"!=typeof self)return self;if("undefined"!=typeof window)return window;if(void 0!==t.g)return t.g;throw new Error("could not find global")}()),this.m=AbortController,this.m}async send(t){if(t.abortSignal&&t.abortSignal.aborted)throw new r;if(!t.method)throw new Error("No method defined.");if(!t.url)throw new Error("No url defined.");const s=new this.m;let o;t.abortSignal&&(t.abortSignal.onabort=()=>{s.abort(),o=new r});let h,c=null;if(t.timeout){const i=t.timeout;c=setTimeout((()=>{s.abort(),this.u.log(e.Warning,"Timeout from HTTP request."),o=new n}),i)}""===t.content&&(t.content=void 0),t.content&&(t.headers=t.headers||{},y(t.content)?t.headers["Content-Type"]="application/octet-stream":t.headers["Content-Type"]="text/plain;charset=UTF-8");try{h=await this.p(t.url,{body:t.content,cache:"no-cache",credentials:!0===t.withCredentials?"include":"same-origin",headers:{"X-Requested-With":"XMLHttpRequest",...t.headers},method:t.method,mode:"cors",redirect:"follow",signal:s.signal})}catch(t){if(o)throw o;throw this.u.log(e.Warning,`Error from HTTP request. ${t}.`),t}finally{c&&clearTimeout(c),t.abortSignal&&(t.abortSignal.onabort=null)}if(!h.ok){const t=await I(h,"text");throw new i(t||h.statusText,h.status)}const a=I(h,t.responseType),l=await a;return new u(h.status,h.statusText,l)}getCookieString(t){let e="";return g.isNode&&this.v&&this.v.getCookies(t,((t,s)=>e=s.join("; "))),e}}function I(t,e){let s;switch(e){case"arraybuffer":s=t.arrayBuffer();break;case"text":default:s=t.text();break;case"blob":case"document":case"json":throw new Error(`${e} is not supported.`)}return s}class _ extends d{constructor(t){super(),this.u=t}send(t){return t.abortSignal&&t.abortSignal.aborted?Promise.reject(new r):t.method?t.url?new Promise(((s,o)=>{const h=new XMLHttpRequest;h.open(t.method,t.url,!0),h.withCredentials=void 0===t.withCredentials||t.withCredentials,h.setRequestHeader("X-Requested-With","XMLHttpRequest"),""===t.content&&(t.content=void 0),t.content&&(y(t.content)?h.setRequestHeader("Content-Type","application/octet-stream"):h.setRequestHeader("Content-Type","text/plain;charset=UTF-8"));const c=t.headers;c&&Object.keys(c).forEach((t=>{h.setRequestHeader(t,c[t])})),t.responseType&&(h.responseType=t.responseType),t.abortSignal&&(t.abortSignal.onabort=()=>{h.abort(),o(new r)}),t.timeout&&(h.timeout=t.timeout),h.onload=()=>{t.abortSignal&&(t.abortSignal.onabort=null),h.status>=200&&h.status<300?s(new u(h.status,h.statusText,h.response||h.responseText)):o(new i(h.response||h.responseText||h.statusText,h.status))},h.onerror=()=>{this.u.log(e.Warning,`Error from HTTP request. ${h.status}: ${h.statusText}.`),o(new i(h.statusText,h.status))},h.ontimeout=()=>{this.u.log(e.Warning,"Timeout from HTTP request."),o(new n)},h.send(t.content)})):Promise.reject(new Error("No url defined.")):Promise.reject(new Error("No method defined."))}}class H extends d{constructor(t){if(super(),"undefined"!=typeof fetch||g.isNode)this.$=new T(t);else{if("undefined"==typeof XMLHttpRequest)throw new Error("No usable HttpClient found.");this.$=new _(t)}}send(t){return t.abortSignal&&t.abortSignal.aborted?Promise.reject(new r):t.method?t.url?this.$.send(t):Promise.reject(new Error("No url defined.")):Promise.reject(new Error("No method defined."))}getCookieString(t){return this.$.getCookieString(t)}}class D{static write(t){return`${t}${D.RecordSeparator}`}static parse(t){if(t[t.length-1]!==D.RecordSeparator)throw new Error("Message is incomplete.");const e=t.split(D.RecordSeparator);return e.pop(),e}}D.RecordSeparatorCode=30,D.RecordSeparator=String.fromCharCode(D.RecordSeparatorCode);class R{writeHandshakeRequest(t){return D.write(JSON.stringify(t))}parseHandshakeResponse(t){let e,s;if(y(t)){const i=new Uint8Array(t),n=i.indexOf(D.RecordSeparatorCode);if(-1===n)throw new Error("Message is incomplete.");const r=n+1;e=String.fromCharCode.apply(null,Array.prototype.slice.call(i.slice(0,r))),s=i.byteLength>r?i.slice(r).buffer:null}else{const i=t,n=i.indexOf(D.RecordSeparator);if(-1===n)throw new Error("Message is incomplete.");const r=n+1;e=i.substring(0,r),s=i.length>r?i.substring(r):null}const i=D.parse(e),n=JSON.parse(i[0]);if(n.type)throw new Error("Expected a handshake response from the server.");return[s,n]}}var x,A;!function(t){t[t.Invocation=1]="Invocation",t[t.StreamItem=2]="StreamItem",t[t.Completion=3]="Completion",t[t.StreamInvocation=4]="StreamInvocation",t[t.CancelInvocation=5]="CancelInvocation",t[t.Ping=6]="Ping",t[t.Close=7]="Close",t[t.Ack=8]="Ack",t[t.Sequence=9]="Sequence"}(x||(x={}));class U{constructor(){this.observers=[]}next(t){for(const e of this.observers)e.next(t)}error(t){for(const e of this.observers)e.error&&e.error(t)}complete(){for(const t of this.observers)t.complete&&t.complete()}subscribe(t){return this.observers.push(t),new v(this,t)}}class L{constructor(t,e,s){this.C=1e5,this.S=[],this.k=0,this.P=!1,this.T=1,this.I=0,this._=0,this.H=!1,this.D=t,this.R=e,this.C=s}async A(t){const e=this.D.writeMessage(t);let s=Promise.resolve();if(this.U(t)){this.k++;let t=()=>{},i=()=>{};y(e)?this._+=e.byteLength:this._+=e.length,this._>=this.C&&(s=new Promise(((e,s)=>{t=e,i=s}))),this.S.push(new N(e,this.k,t,i))}try{this.H||await this.R.send(e)}catch{this.L()}await s}N(t){let e=-1;for(let s=0;s<this.S.length;s++){const i=this.S[s];if(i.q<=t.sequenceId)e=s,y(i.M)?this._-=i.M.byteLength:this._-=i.M.length,i.j();else{if(!(this._<this.C))break;i.j()}}-1!==e&&(this.S=this.S.slice(e+1))}W(t){if(this.P)return t.type===x.Sequence&&(this.P=!1,!0);if(!this.U(t))return!0;const e=this.T;return this.T++,e<=this.I?(e===this.I&&this.O(),!1):(this.I=e,this.O(),!0)}F(t){t.sequenceId>this.T?this.R.stop(new Error("Sequence ID greater than amount of messages we've received.")):this.T=t.sequenceId}L(){this.H=!0,this.P=!0}async B(){const t=0!==this.S.length?this.S[0].q:this.k+1;await this.R.send(this.D.writeMessage({type:x.Sequence,sequenceId:t}));const e=this.S;for(const t of e)await this.R.send(t.M);this.H=!1}X(t){null!=t||(t=new Error("Unable to reconnect to server."));for(const e of this.S)e.J(t)}U(t){switch(t.type){case x.Invocation:case x.StreamItem:case x.Completion:case x.StreamInvocation:case x.CancelInvocation:return!0;case x.Close:case x.Sequence:case x.Ping:case x.Ack:return!1}}O(){void 0===this.V&&(this.V=setTimeout((async()=>{try{this.H||await this.R.send(this.D.writeMessage({type:x.Ack,sequenceId:this.I}))}catch{}clearTimeout(this.V),this.V=void 0}),1e3))}}class N{constructor(t,e,s,i){this.M=t,this.q=e,this.j=s,this.J=i}}!function(t){t.Disconnected="Disconnected",t.Connecting="Connecting",t.Connected="Connected",t.Disconnecting="Disconnecting",t.Reconnecting="Reconnecting"}(A||(A={}));class q{static create(t,e,s,i,n,r,o){return new q(t,e,s,i,n,r,o)}constructor(t,s,i,n,r,o,h){this.K=0,this.G=()=>{this.u.log(e.Warning,"The page is being frozen, this will likely lead to the connection being closed and messages being lost. For more information see the docs at https://learn.microsoft.com/aspnet/core/signalr/javascript-client#bsleep")},w.isRequired(t,"connection"),w.isRequired(s,"logger"),w.isRequired(i,"protocol"),this.serverTimeoutInMilliseconds=null!=r?r:3e4,this.keepAliveIntervalInMilliseconds=null!=o?o:15e3,this.Y=null!=h?h:1e5,this.u=s,this.D=i,this.connection=t,this.Z=n,this.tt=new R,this.connection.onreceive=t=>this.et(t),this.connection.onclose=t=>this.st(t),this.it={},this.nt={},this.rt=[],this.ot=[],this.ht=[],this.ct=0,this.lt=!1,this.ut=A.Disconnected,this.dt=!1,this.ft=this.D.writeMessage({type:x.Ping})}get state(){return this.ut}get connectionId(){return this.connection&&this.connection.connectionId||null}get baseUrl(){return this.connection.baseUrl||""}set baseUrl(t){if(this.ut!==A.Disconnected&&this.ut!==A.Reconnecting)throw new Error("The HubConnection must be in the Disconnected or Reconnecting state to change the url.");if(!t)throw new Error("The HubConnection url must be a valid url.");this.connection.baseUrl=t}start(){return this.wt=this.gt(),this.wt}async gt(){if(this.ut!==A.Disconnected)return Promise.reject(new Error("Cannot start a HubConnection that is not in the 'Disconnected' state."));this.ut=A.Connecting,this.u.log(e.Debug,"Starting HubConnection.");try{await this.yt(),g.isBrowser&&window.document.addEventListener("freeze",this.G),this.ut=A.Connected,this.dt=!0,this.u.log(e.Debug,"HubConnection connected successfully.")}catch(t){return this.ut=A.Disconnected,this.u.log(e.Debug,`HubConnection failed to start successfully because of error '${t}'.`),Promise.reject(t)}}async yt(){this.bt=void 0,this.lt=!1;const t=new Promise(((t,e)=>{this.vt=t,this.Et=e}));await this.connection.start(this.D.transferFormat);try{let s=this.D.version;this.connection.features.reconnect||(s=1);const i={protocol:this.D.name,version:s};if(this.u.log(e.Debug,"Sending handshake request."),await this.$t(this.tt.writeHandshakeRequest(i)),this.u.log(e.Information,`Using HubProtocol '${this.D.name}'.`),this.Ct(),this.St(),this.kt(),await t,this.bt)throw this.bt;!!this.connection.features.reconnect&&(this.Pt=new L(this.D,this.connection,this.Y),this.connection.features.disconnected=this.Pt.L.bind(this.Pt),this.connection.features.resend=()=>{if(this.Pt)return this.Pt.B()}),this.connection.features.inherentKeepAlive||await this.$t(this.ft)}catch(t){throw this.u.log(e.Debug,`Hub handshake failed with error '${t}' during start(). Stopping HubConnection.`),this.Ct(),this.Tt(),await this.connection.stop(t),t}}async stop(){const t=this.wt;this.connection.features.reconnect=!1,this.It=this._t(),await this.It;try{await t}catch(t){}}_t(t){if(this.ut===A.Disconnected)return this.u.log(e.Debug,`Call to HubConnection.stop(${t}) ignored because it is already in the disconnected state.`),Promise.resolve();if(this.ut===A.Disconnecting)return this.u.log(e.Debug,`Call to HttpConnection.stop(${t}) ignored because the connection is already in the disconnecting state.`),this.It;const s=this.ut;return this.ut=A.Disconnecting,this.u.log(e.Debug,"Stopping HubConnection."),this.Ht?(this.u.log(e.Debug,"Connection stopped during reconnect delay. Done reconnecting."),clearTimeout(this.Ht),this.Ht=void 0,this.Dt(),Promise.resolve()):(s===A.Connected&&this.Rt(),this.Ct(),this.Tt(),this.bt=t||new r("The connection was stopped before the hub handshake could complete."),this.connection.stop(t))}async Rt(){try{await this.xt(this.At())}catch{}}stream(t,...e){const[s,i]=this.Ut(e),n=this.Lt(t,e,i);let r;const o=new U;return o.cancelCallback=()=>{const t=this.Nt(n.invocationId);return delete this.it[n.invocationId],r.then((()=>this.xt(t)))},this.it[n.invocationId]=(t,e)=>{e?o.error(e):t&&(t.type===x.Completion?t.error?o.error(new Error(t.error)):o.complete():o.next(t.item))},r=this.xt(n).catch((t=>{o.error(t),delete this.it[n.invocationId]})),this.qt(s,r),o}$t(t){return this.kt(),this.connection.send(t)}xt(t){return this.Pt?this.Pt.A(t):this.$t(this.D.writeMessage(t))}send(t,...e){const[s,i]=this.Ut(e),n=this.xt(this.Mt(t,e,!0,i));return this.qt(s,n),n}invoke(t,...e){const[s,i]=this.Ut(e),n=this.Mt(t,e,!1,i);return new Promise(((t,e)=>{this.it[n.invocationId]=(s,i)=>{i?e(i):s&&(s.type===x.Completion?s.error?e(new Error(s.error)):t(s.result):e(new Error(`Unexpected message type: ${s.type}`)))};const i=this.xt(n).catch((t=>{e(t),delete this.it[n.invocationId]}));this.qt(s,i)}))}on(t,e){t&&e&&(t=t.toLowerCase(),this.nt[t]||(this.nt[t]=[]),-1===this.nt[t].indexOf(e)&&this.nt[t].push(e))}off(t,e){if(!t)return;t=t.toLowerCase();const s=this.nt[t];if(s)if(e){const i=s.indexOf(e);-1!==i&&(s.splice(i,1),0===s.length&&delete this.nt[t])}else delete this.nt[t]}onclose(t){t&&this.rt.push(t)}onreconnecting(t){t&&this.ot.push(t)}onreconnected(t){t&&this.ht.push(t)}et(t){if(this.Ct(),this.lt||(t=this.jt(t),this.lt=!0),t){const s=this.D.parseMessages(t,this.u);for(const t of s)if(!this.Pt||this.Pt.W(t))switch(t.type){case x.Invocation:this.Wt(t);break;case x.StreamItem:case x.Completion:{const s=this.it[t.invocationId];if(s){t.type===x.Completion&&delete this.it[t.invocationId];try{s(t)}catch(t){this.u.log(e.Error,`Stream callback threw error: ${P(t)}`)}}break}case x.Ping:break;case x.Close:{this.u.log(e.Information,"Close message received from server.");const s=t.error?new Error("Server returned an error on close: "+t.error):void 0;!0===t.allowReconnect?this.connection.stop(s):this.It=this._t(s);break}case x.Ack:this.Pt&&this.Pt.N(t);break;case x.Sequence:this.Pt&&this.Pt.F(t);break;default:this.u.log(e.Warning,`Invalid message type: ${t.type}.`)}}this.St()}jt(t){let s,i;try{[i,s]=this.tt.parseHandshakeResponse(t)}catch(t){const s="Error parsing handshake response: "+t;this.u.log(e.Error,s);const i=new Error(s);throw this.Et(i),i}if(s.error){const t="Server returned handshake error: "+s.error;this.u.log(e.Error,t);const i=new Error(t);throw this.Et(i),i}return this.u.log(e.Debug,"Server handshake complete."),this.vt(),i}kt(){this.connection.features.inherentKeepAlive||(this.K=(new Date).getTime()+this.keepAliveIntervalInMilliseconds,this.Tt())}St(){if(!(this.connection.features&&this.connection.features.inherentKeepAlive||(this.Ot=setTimeout((()=>this.serverTimeout()),this.serverTimeoutInMilliseconds),void 0!==this.Ft))){let t=this.K-(new Date).getTime();t<0&&(t=0),this.Ft=setTimeout((async()=>{if(this.ut===A.Connected)try{await this.$t(this.ft)}catch{this.Tt()}}),t)}}serverTimeout(){this.connection.stop(new Error("Server timeout elapsed without receiving a message from the server."))}async Wt(t){const s=t.target.toLowerCase(),i=this.nt[s];if(!i)return this.u.log(e.Warning,`No client method with the name '${s}' found.`),void(t.invocationId&&(this.u.log(e.Warning,`No result given for '${s}' method and invocation ID '${t.invocationId}'.`),await this.xt(this.Bt(t.invocationId,"Client didn't provide a result.",null))));const n=i.slice(),r=!!t.invocationId;let o,h,c;for(const i of n)try{const n=o;o=await i.apply(this,t.arguments),r&&o&&n&&(this.u.log(e.Error,`Multiple results provided for '${s}'. Sending error to server.`),c=this.Bt(t.invocationId,"Client provided multiple results.",null)),h=void 0}catch(t){h=t,this.u.log(e.Error,`A callback for the method '${s}' threw error '${t}'.`)}c?await this.xt(c):r?(h?c=this.Bt(t.invocationId,`${h}`,null):void 0!==o?c=this.Bt(t.invocationId,null,o):(this.u.log(e.Warning,`No result given for '${s}' method and invocation ID '${t.invocationId}'.`),c=this.Bt(t.invocationId,"Client didn't provide a result.",null)),await this.xt(c)):o&&this.u.log(e.Error,`Result given for '${s}' method but server is not expecting a result.`)}st(t){this.u.log(e.Debug,`HubConnection.connectionClosed(${t}) called while in state ${this.ut}.`),this.bt=this.bt||t||new r("The underlying connection was closed before the hub handshake could complete."),this.vt&&this.vt(),this.Xt(t||new Error("Invocation canceled due to the underlying connection being closed.")),this.Ct(),this.Tt(),this.ut===A.Disconnecting?this.Dt(t):this.ut===A.Connected&&this.Z?this.Jt(t):this.ut===A.Connected&&this.Dt(t)}Dt(t){if(this.dt){this.ut=A.Disconnected,this.dt=!1,this.Pt&&(this.Pt.X(null!=t?t:new Error("Connection closed.")),this.Pt=void 0),g.isBrowser&&window.document.removeEventListener("freeze",this.G);try{this.rt.forEach((e=>e.apply(this,[t])))}catch(s){this.u.log(e.Error,`An onclose callback called with error '${t}' threw error '${s}'.`)}}}async Jt(t){const s=Date.now();let i=0,n=void 0!==t?t:new Error("Attempting to reconnect due to a unknown error."),r=this.zt(i++,0,n);if(null===r)return this.u.log(e.Debug,"Connection not reconnecting because the IRetryPolicy returned null on the first reconnect attempt."),void this.Dt(t);if(this.ut=A.Reconnecting,t?this.u.log(e.Information,`Connection reconnecting because of error '${t}'.`):this.u.log(e.Information,"Connection reconnecting."),0!==this.ot.length){try{this.ot.forEach((e=>e.apply(this,[t])))}catch(s){this.u.log(e.Error,`An onreconnecting callback called with error '${t}' threw error '${s}'.`)}if(this.ut!==A.Reconnecting)return void this.u.log(e.Debug,"Connection left the reconnecting state in onreconnecting callback. Done reconnecting.")}for(;null!==r;){if(this.u.log(e.Information,`Reconnect attempt number ${i} will start in ${r} ms.`),await new Promise((t=>{this.Ht=setTimeout(t,r)})),this.Ht=void 0,this.ut!==A.Reconnecting)return void this.u.log(e.Debug,"Connection left the reconnecting state during reconnect delay. Done reconnecting.");try{if(await this.yt(),this.ut=A.Connected,this.u.log(e.Information,"HubConnection reconnected successfully."),0!==this.ht.length)try{this.ht.forEach((t=>t.apply(this,[this.connection.connectionId])))}catch(t){this.u.log(e.Error,`An onreconnected callback called with connectionId '${this.connection.connectionId}; threw error '${t}'.`)}return}catch(t){if(this.u.log(e.Information,`Reconnect attempt failed because of error '${t}'.`),this.ut!==A.Reconnecting)return this.u.log(e.Debug,`Connection moved to the '${this.ut}' from the reconnecting state during reconnect attempt. Done reconnecting.`),void(this.ut===A.Disconnecting&&this.Dt());n=t instanceof Error?t:new Error(t.toString()),r=this.zt(i++,Date.now()-s,n)}}this.u.log(e.Information,`Reconnect retries have been exhausted after ${Date.now()-s} ms and ${i} failed attempts. Connection disconnecting.`),this.Dt()}zt(t,s,i){try{return this.Z.nextRetryDelayInMilliseconds({elapsedMilliseconds:s,previousRetryCount:t,retryReason:i})}catch(i){return this.u.log(e.Error,`IRetryPolicy.nextRetryDelayInMilliseconds(${t}, ${s}) threw error '${i}'.`),null}}Xt(t){const s=this.it;this.it={},Object.keys(s).forEach((i=>{const n=s[i];try{n(null,t)}catch(s){this.u.log(e.Error,`Stream 'error' callback called with '${t}' threw error: ${P(s)}`)}}))}Tt(){this.Ft&&(clearTimeout(this.Ft),this.Ft=void 0)}Ct(){this.Ot&&clearTimeout(this.Ot)}Mt(t,e,s,i){if(s)return 0!==i.length?{arguments:e,streamIds:i,target:t,type:x.Invocation}:{arguments:e,target:t,type:x.Invocation};{const s=this.ct;return this.ct++,0!==i.length?{arguments:e,invocationId:s.toString(),streamIds:i,target:t,type:x.Invocation}:{arguments:e,invocationId:s.toString(),target:t,type:x.Invocation}}}qt(t,e){if(0!==t.length){e||(e=Promise.resolve());for(const s in t)t[s].subscribe({complete:()=>{e=e.then((()=>this.xt(this.Bt(s))))},error:t=>{let i;i=t instanceof Error?t.message:t&&t.toString?t.toString():"Unknown error",e=e.then((()=>this.xt(this.Bt(s,i))))},next:t=>{e=e.then((()=>this.xt(this.Vt(s,t))))}})}}Ut(t){const e=[],s=[];for(let i=0;i<t.length;i++){const n=t[i];if(this.Kt(n)){const r=this.ct;this.ct++,e[r]=n,s.push(r.toString()),t.splice(i,1)}}return[e,s]}Kt(t){return t&&t.subscribe&&"function"==typeof t.subscribe}Lt(t,e,s){const i=this.ct;return this.ct++,0!==s.length?{arguments:e,invocationId:i.toString(),streamIds:s,target:t,type:x.StreamInvocation}:{arguments:e,invocationId:i.toString(),target:t,type:x.StreamInvocation}}Nt(t){return{invocationId:t,type:x.CancelInvocation}}Vt(t,e){return{invocationId:t,item:e,type:x.StreamItem}}Bt(t,e,s){return e?{error:e,invocationId:t,type:x.Completion}:{invocationId:t,result:s,type:x.Completion}}At(){return{type:x.Close}}}const M=[0,2e3,1e4,3e4,null];class j{constructor(t){this.Gt=void 0!==t?[...t,null]:M}nextRetryDelayInMilliseconds(t){return this.Gt[t.previousRetryCount]}}class W{}W.Authorization="Authorization",W.Cookie="Cookie";class O extends d{constructor(t,e){super(),this.Qt=t,this.Yt=e}async send(t){let e=!0;this.Yt&&(!this.Zt||t.url&&t.url.indexOf("/negotiate?")>0)&&(e=!1,this.Zt=await this.Yt()),this.te(t);const s=await this.Qt.send(t);return e&&401===s.statusCode&&this.Yt?(this.Zt=await this.Yt(),this.te(t),await this.Qt.send(t)):s}te(t){t.headers||(t.headers={}),this.Zt?t.headers[W.Authorization]=`Bearer ${this.Zt}`:this.Yt&&t.headers[W.Authorization]&&delete t.headers[W.Authorization]}getCookieString(t){return this.Qt.getCookieString(t)}}var F,B;!function(t){t[t.None=0]="None",t[t.WebSockets=1]="WebSockets",t[t.ServerSentEvents=2]="ServerSentEvents",t[t.LongPolling=4]="LongPolling"}(F||(F={})),function(t){t[t.Text=1]="Text",t[t.Binary=2]="Binary"}(B||(B={}));class X{constructor(){this.ee=!1,this.onabort=null}abort(){this.ee||(this.ee=!0,this.onabort&&this.onabort())}get signal(){return this}get aborted(){return this.ee}}class J{get pollAborted(){return this.se.aborted}constructor(t,e,s){this.$=t,this.u=e,this.se=new X,this.ie=s,this.ne=!1,this.onreceive=null,this.onclose=null}async connect(t,s){if(w.isRequired(t,"url"),w.isRequired(s,"transferFormat"),w.isIn(s,B,"transferFormat"),this.re=t,this.u.log(e.Trace,"(LongPolling transport) Connecting."),s===B.Binary&&"undefined"!=typeof XMLHttpRequest&&"string"!=typeof(new XMLHttpRequest).responseType)throw new Error("Binary protocols over XmlHttpRequest not implementing advanced features are not supported.");const[n,r]=$(),o={[n]:r,...this.ie.headers},h={abortSignal:this.se.signal,headers:o,timeout:1e5,withCredentials:this.ie.withCredentials};s===B.Binary&&(h.responseType="arraybuffer");const c=`${t}&_=${Date.now()}`;this.u.log(e.Trace,`(LongPolling transport) polling: ${c}.`);const a=await this.$.get(c,h);200!==a.statusCode?(this.u.log(e.Error,`(LongPolling transport) Unexpected response code: ${a.statusCode}.`),this.oe=new i(a.statusText||"",a.statusCode),this.ne=!1):this.ne=!0,this.he=this.ce(this.re,h)}async ce(t,s){try{for(;this.ne;)try{const n=`${t}&_=${Date.now()}`;this.u.log(e.Trace,`(LongPolling transport) polling: ${n}.`);const r=await this.$.get(n,s);204===r.statusCode?(this.u.log(e.Information,"(LongPolling transport) Poll terminated by server."),this.ne=!1):200!==r.statusCode?(this.u.log(e.Error,`(LongPolling transport) Unexpected response code: ${r.statusCode}.`),this.oe=new i(r.statusText||"",r.statusCode),this.ne=!1):r.content?(this.u.log(e.Trace,`(LongPolling transport) data received. ${m(r.content,this.ie.logMessageContent)}.`),this.onreceive&&this.onreceive(r.content)):this.u.log(e.Trace,"(LongPolling transport) Poll timed out, reissuing.")}catch(t){this.ne?t instanceof n?this.u.log(e.Trace,"(LongPolling transport) Poll timed out, reissuing."):(this.oe=t,this.ne=!1):this.u.log(e.Trace,`(LongPolling transport) Poll errored after shutdown: ${t.message}`)}}finally{this.u.log(e.Trace,"(LongPolling transport) Polling complete."),this.pollAborted||this.ae()}}async send(t){return this.ne?b(this.u,"LongPolling",this.$,this.re,t,this.ie):Promise.reject(new Error("Cannot send until the transport is connected"))}async stop(){this.u.log(e.Trace,"(LongPolling transport) Stopping polling."),this.ne=!1,this.se.abort();try{await this.he,this.u.log(e.Trace,`(LongPolling transport) sending DELETE request to ${this.re}.`);const t={},[s,n]=$();t[s]=n;const r={headers:{...t,...this.ie.headers},timeout:this.ie.timeout,withCredentials:this.ie.withCredentials};let o;try{await this.$.delete(this.re,r)}catch(t){o=t}o?o instanceof i&&(404===o.statusCode?this.u.log(e.Trace,"(LongPolling transport) A 404 response was returned from sending a DELETE request."):this.u.log(e.Trace,`(LongPolling transport) Error sending a DELETE request: ${o}`)):this.u.log(e.Trace,"(LongPolling transport) DELETE request accepted.")}finally{this.u.log(e.Trace,"(LongPolling transport) Stop finished."),this.ae()}}ae(){if(this.onclose){let t="(LongPolling transport) Firing onclose event.";this.oe&&(t+=" Error: "+this.oe),this.u.log(e.Trace,t),this.onclose(this.oe)}}}class z{constructor(t,e,s,i){this.$=t,this.Zt=e,this.u=s,this.ie=i,this.onreceive=null,this.onclose=null}async connect(t,s){return w.isRequired(t,"url"),w.isRequired(s,"transferFormat"),w.isIn(s,B,"transferFormat"),this.u.log(e.Trace,"(SSE transport) Connecting."),this.re=t,this.Zt&&(t+=(t.indexOf("?")<0?"?":"&")+`access_token=${encodeURIComponent(this.Zt)}`),new Promise(((i,n)=>{let r,o=!1;if(s===B.Text){if(g.isBrowser||g.isWebWorker)r=new this.ie.EventSource(t,{withCredentials:this.ie.withCredentials});else{const e=this.$.getCookieString(t),s={};s.Cookie=e;const[i,n]=$();s[i]=n,r=new this.ie.EventSource(t,{withCredentials:this.ie.withCredentials,headers:{...s,...this.ie.headers}})}try{r.onmessage=t=>{if(this.onreceive)try{this.u.log(e.Trace,`(SSE transport) data received. ${m(t.data,this.ie.logMessageContent)}.`),this.onreceive(t.data)}catch(t){return void this.le(t)}},r.onerror=t=>{o?this.le():n(new Error("EventSource failed to connect. The connection could not be found on the server, either the connection ID is not present on the server, or a proxy is refusing/buffering the connection. If you have multiple servers check that sticky sessions are enabled."))},r.onopen=()=>{this.u.log(e.Information,`SSE connected to ${this.re}`),this.ue=r,o=!0,i()}}catch(t){return void n(t)}}else n(new Error("The Server-Sent Events transport only supports the 'Text' transfer format"))}))}async send(t){return this.ue?b(this.u,"SSE",this.$,this.re,t,this.ie):Promise.reject(new Error("Cannot send until the transport is connected"))}stop(){return this.le(),Promise.resolve()}le(t){this.ue&&(this.ue.close(),this.ue=void 0,this.onclose&&this.onclose(t))}}class V{constructor(t,e,s,i,n,r){this.u=s,this.Yt=e,this.de=i,this.fe=n,this.$=t,this.onreceive=null,this.onclose=null,this.pe=r}async connect(t,s){let i;return w.isRequired(t,"url"),w.isRequired(s,"transferFormat"),w.isIn(s,B,"transferFormat"),this.u.log(e.Trace,"(WebSockets transport) Connecting."),this.Yt&&(i=await this.Yt()),new Promise(((n,r)=>{let o;t=t.replace(/^http/,"ws");const h=this.$.getCookieString(t);let c=!1;if(g.isNode||g.isReactNative){const e={},[s,n]=$();e[s]=n,i&&(e[W.Authorization]=`Bearer ${i}`),h&&(e[W.Cookie]=h),o=new this.fe(t,void 0,{headers:{...e,...this.pe}})}else i&&(t+=(t.indexOf("?")<0?"?":"&")+`access_token=${encodeURIComponent(i)}`);o||(o=new this.fe(t)),s===B.Binary&&(o.binaryType="arraybuffer"),o.onopen=s=>{this.u.log(e.Information,`WebSocket connected to ${t}.`),this.we=o,c=!0,n()},o.onerror=t=>{let s=null;s="undefined"!=typeof ErrorEvent&&t instanceof ErrorEvent?t.error:"There was an error with the transport",this.u.log(e.Information,`(WebSockets transport) ${s}.`)},o.onmessage=t=>{if(this.u.log(e.Trace,`(WebSockets transport) data received. ${m(t.data,this.de)}.`),this.onreceive)try{this.onreceive(t.data)}catch(t){return void this.le(t)}},o.onclose=t=>{if(c)this.le(t);else{let e=null;e="undefined"!=typeof ErrorEvent&&t instanceof ErrorEvent?t.error:"WebSocket failed to connect. The connection could not be found on the server, either the endpoint may not be a SignalR endpoint, the connection ID is not present on the server, or there is a proxy blocking WebSockets. If you have multiple servers check that sticky sessions are enabled.",r(new Error(e))}}}))}send(t){return this.we&&this.we.readyState===this.fe.OPEN?(this.u.log(e.Trace,`(WebSockets transport) sending data. ${m(t,this.de)}.`),this.we.send(t),Promise.resolve()):Promise.reject("WebSocket is not in the OPEN state")}stop(){return this.we&&this.le(void 0),Promise.resolve()}le(t){this.we&&(this.we.onclose=()=>{},this.we.onmessage=()=>{},this.we.onerror=()=>{},this.we.close(),this.we=void 0),this.u.log(e.Trace,"(WebSockets transport) socket closed."),this.onclose&&(!this.ge(t)||!1!==t.wasClean&&1e3===t.code?t instanceof Error?this.onclose(t):this.onclose():this.onclose(new Error(`WebSocket closed with status code: ${t.code} (${t.reason||"no reason given"}).`)))}ge(t){return t&&"boolean"==typeof t.wasClean&&"number"==typeof t.code}}class K{constructor(t,s={}){var i;if(this.me=()=>{},this.features={},this.ye=1,w.isRequired(t,"url"),this.u=void 0===(i=s.logger)?new E(e.Information):null===i?f.instance:void 0!==i.log?i:new E(i),this.baseUrl=this.be(t),(s=s||{}).logMessageContent=void 0!==s.logMessageContent&&s.logMessageContent,"boolean"!=typeof s.withCredentials&&void 0!==s.withCredentials)throw new Error("withCredentials option was not a 'boolean' or 'undefined' value");s.withCredentials=void 0===s.withCredentials||s.withCredentials,s.timeout=void 0===s.timeout?1e5:s.timeout;let n=null,r=null;g.isNode&&(n=function(){throw new Error("Trying to import 'ws' in the browser.")}(),r=function(){throw new Error("Trying to import 'eventsource' in the browser.")}()),g.isNode||"undefined"==typeof WebSocket||s.WebSocket?g.isNode&&!s.WebSocket&&n&&(s.WebSocket=n):s.WebSocket=WebSocket,g.isNode||"undefined"==typeof EventSource||s.EventSource?g.isNode&&!s.EventSource&&void 0!==r&&(s.EventSource=r):s.EventSource=EventSource,this.$=new O(s.httpClient||new H(this.u),s.accessTokenFactory),this.ut="Disconnected",this.dt=!1,this.ie=s,this.onreceive=null,this.onclose=null}async start(t){if(t=t||B.Binary,w.isIn(t,B,"transferFormat"),this.u.log(e.Debug,`Starting connection with transfer format '${B[t]}'.`),"Disconnected"!==this.ut)return Promise.reject(new Error("Cannot start an HttpConnection that is not in the 'Disconnected' state."));if(this.ut="Connecting",this.ve=this.yt(t),await this.ve,"Disconnecting"===this.ut){const t="Failed to start the HttpConnection before stop() was called.";return this.u.log(e.Error,t),await this.It,Promise.reject(new r(t))}if("Connected"!==this.ut){const t="HttpConnection.startInternal completed gracefully but didn't enter the connection into the connected state!";return this.u.log(e.Error,t),Promise.reject(new r(t))}this.dt=!0}send(t){return"Connected"!==this.ut?Promise.reject(new Error("Cannot send data if the connection is not in the 'Connected' State.")):(this.Ee||(this.Ee=new G(this.transport)),this.Ee.send(t))}async stop(t){return"Disconnected"===this.ut?(this.u.log(e.Debug,`Call to HttpConnection.stop(${t}) ignored because the connection is already in the disconnected state.`),Promise.resolve()):"Disconnecting"===this.ut?(this.u.log(e.Debug,`Call to HttpConnection.stop(${t}) ignored because the connection is already in the disconnecting state.`),this.It):(this.ut="Disconnecting",this.It=new Promise((t=>{this.me=t})),await this._t(t),void await this.It)}async _t(t){this.$e=t;try{await this.ve}catch(t){}if(this.transport){try{await this.transport.stop()}catch(t){this.u.log(e.Error,`HttpConnection.transport.stop() threw error '${t}'.`),this.Ce()}this.transport=void 0}else this.u.log(e.Debug,"HttpConnection.transport is undefined in HttpConnection.stop() because start() failed.")}async yt(t){let s=this.baseUrl;this.Yt=this.ie.accessTokenFactory,this.$.Yt=this.Yt;try{if(this.ie.skipNegotiation){if(this.ie.transport!==F.WebSockets)throw new Error("Negotiation can only be skipped when using the WebSocket transport directly.");this.transport=this.Se(F.WebSockets),await this.ke(s,t)}else{let e=null,i=0;do{if(e=await this.Pe(s),"Disconnecting"===this.ut||"Disconnected"===this.ut)throw new r("The connection was stopped during negotiation.");if(e.error)throw new Error(e.error);if(e.ProtocolVersion)throw new Error("Detected a connection attempt to an ASP.NET SignalR Server. This client only supports connecting to an ASP.NET Core SignalR Server. See https://aka.ms/signalr-core-differences for details.");if(e.url&&(s=e.url),e.accessToken){const t=e.accessToken;this.Yt=()=>t,this.$.Zt=t,this.$.Yt=void 0}i++}while(e.url&&i<100);if(100===i&&e.url)throw new Error("Negotiate redirection limit exceeded.");await this.Te(s,this.ie.transport,e,t)}this.transport instanceof J&&(this.features.inherentKeepAlive=!0),"Connecting"===this.ut&&(this.u.log(e.Debug,"The HttpConnection connected successfully."),this.ut="Connected")}catch(t){return this.u.log(e.Error,"Failed to start the connection: "+t),this.ut="Disconnected",this.transport=void 0,this.me(),Promise.reject(t)}}async Pe(t){const s={},[n,r]=$();s[n]=r;const o=this.Ie(t);this.u.log(e.Debug,`Sending negotiation request: ${o}.`);try{const t=await this.$.post(o,{content:"",headers:{...s,...this.ie.headers},timeout:this.ie.timeout,withCredentials:this.ie.withCredentials});if(200!==t.statusCode)return Promise.reject(new Error(`Unexpected status code returned from negotiate '${t.statusCode}'`));const e=JSON.parse(t.content);return(!e.negotiateVersion||e.negotiateVersion<1)&&(e.connectionToken=e.connectionId),e.useStatefulReconnect&&!0!==this.ie._e?Promise.reject(new a("Client didn't negotiate Stateful Reconnect but the server did.")):e}catch(t){let s="Failed to complete negotiation with the server: "+t;return t instanceof i&&404===t.statusCode&&(s+=" Either this is not a SignalR endpoint or there is a proxy blocking the connection."),this.u.log(e.Error,s),Promise.reject(new a(s))}}He(t,e){return e?t+(-1===t.indexOf("?")?"?":"&")+`id=${e}`:t}async Te(t,s,i,n){let o=this.He(t,i.connectionToken);if(this.De(s))return this.u.log(e.Debug,"Connection was provided an instance of ITransport, using that directly."),this.transport=s,await this.ke(o,n),void(this.connectionId=i.connectionId);const h=[],a=i.availableTransports||[];let u=i;for(const i of a){const a=this.Re(i,s,n,!0===(null==u?void 0:u.useStatefulReconnect));if(a instanceof Error)h.push(`${i.transport} failed:`),h.push(a);else if(this.De(a)){if(this.transport=a,!u){try{u=await this.Pe(t)}catch(t){return Promise.reject(t)}o=this.He(t,u.connectionToken)}try{return await this.ke(o,n),void(this.connectionId=u.connectionId)}catch(t){if(this.u.log(e.Error,`Failed to start the transport '${i.transport}': ${t}`),u=void 0,h.push(new c(`${i.transport} failed: ${t}`,F[i.transport])),"Connecting"!==this.ut){const t="Failed to select transport before stop() was called.";return this.u.log(e.Debug,t),Promise.reject(new r(t))}}}}return h.length>0?Promise.reject(new l(`Unable to connect to the server with any of the available transports. ${h.join(" ")}`,h)):Promise.reject(new Error("None of the transports supported by the client are supported by the server."))}Se(t){switch(t){case F.WebSockets:if(!this.ie.WebSocket)throw new Error("'WebSocket' is not supported in your environment.");return new V(this.$,this.Yt,this.u,this.ie.logMessageContent,this.ie.WebSocket,this.ie.headers||{});case F.ServerSentEvents:if(!this.ie.EventSource)throw new Error("'EventSource' is not supported in your environment.");return new z(this.$,this.$.Zt,this.u,this.ie);case F.LongPolling:return new J(this.$,this.u,this.ie);default:throw new Error(`Unknown transport: ${t}.`)}}ke(t,e){return this.transport.onreceive=this.onreceive,this.features.reconnect?this.transport.onclose=async s=>{let i=!1;if(this.features.reconnect){try{this.features.disconnected(),await this.transport.connect(t,e),await this.features.resend()}catch{i=!0}i&&this.Ce(s)}else this.Ce(s)}:this.transport.onclose=t=>this.Ce(t),this.transport.connect(t,e)}Re(t,s,i,n){const r=F[t.transport];if(null==r)return this.u.log(e.Debug,`Skipping transport '${t.transport}' because it is not supported by this client.`),new Error(`Skipping transport '${t.transport}' because it is not supported by this client.`);if(!function(t,e){return!t||0!=(e&t)}(s,r))return this.u.log(e.Debug,`Skipping transport '${F[r]}' because it was disabled by the client.`),new h(`'${F[r]}' is disabled by the client.`,r);if(!(t.transferFormats.map((t=>B[t])).indexOf(i)>=0))return this.u.log(e.Debug,`Skipping transport '${F[r]}' because it does not support the requested transfer format '${B[i]}'.`),new Error(`'${F[r]}' does not support ${B[i]}.`);if(r===F.WebSockets&&!this.ie.WebSocket||r===F.ServerSentEvents&&!this.ie.EventSource)return this.u.log(e.Debug,`Skipping transport '${F[r]}' because it is not supported in your environment.'`),new o(`'${F[r]}' is not supported in your environment.`,r);this.u.log(e.Debug,`Selecting transport '${F[r]}'.`);try{return this.features.reconnect=r===F.WebSockets?n:void 0,this.Se(r)}catch(t){return t}}De(t){return t&&"object"==typeof t&&"connect"in t}Ce(t){if(this.u.log(e.Debug,`HttpConnection.stopConnection(${t}) called while in state ${this.ut}.`),this.transport=void 0,t=this.$e||t,this.$e=void 0,"Disconnected"!==this.ut){if("Connecting"===this.ut)throw this.u.log(e.Warning,`Call to HttpConnection.stopConnection(${t}) was ignored because the connection is still in the connecting state.`),new Error(`HttpConnection.stopConnection(${t}) was called while the connection is still in the connecting state.`);if("Disconnecting"===this.ut&&this.me(),t?this.u.log(e.Error,`Connection disconnected with error '${t}'.`):this.u.log(e.Information,"Connection disconnected."),this.Ee&&(this.Ee.stop().catch((t=>{this.u.log(e.Error,`TransportSendQueue.stop() threw error '${t}'.`)})),this.Ee=void 0),this.connectionId=void 0,this.ut="Disconnected",this.dt){this.dt=!1;try{this.onclose&&this.onclose(t)}catch(s){this.u.log(e.Error,`HttpConnection.onclose(${t}) threw error '${s}'.`)}}}else this.u.log(e.Debug,`Call to HttpConnection.stopConnection(${t}) was ignored because the connection is already in the disconnected state.`)}be(t){if(0===t.lastIndexOf("https://",0)||0===t.lastIndexOf("http://",0))return t;if(!g.isBrowser)throw new Error(`Cannot resolve '${t}'.`);const s=window.document.createElement("a");return s.href=t,this.u.log(e.Information,`Normalizing '${t}' to '${s.href}'.`),s.href}Ie(t){const e=new URL(t);e.pathname.endsWith("/")?e.pathname+="negotiate":e.pathname+="/negotiate";const s=new URLSearchParams(e.searchParams);return s.has("negotiateVersion")||s.append("negotiateVersion",this.ye.toString()),s.has("useStatefulReconnect")?"true"===s.get("useStatefulReconnect")&&(this.ie._e=!0):!0===this.ie._e&&s.append("useStatefulReconnect","true"),e.search=s.toString(),e.toString()}}class G{constructor(t){this.xe=t,this.Ae=[],this.Ue=!0,this.Le=new Q,this.Ne=new Q,this.qe=this.Me()}send(t){return this.je(t),this.Ne||(this.Ne=new Q),this.Ne.promise}stop(){return this.Ue=!1,this.Le.resolve(),this.qe}je(t){if(this.Ae.length&&typeof this.Ae[0]!=typeof t)throw new Error(`Expected data to be of type ${typeof this.Ae} but was of type ${typeof t}`);this.Ae.push(t),this.Le.resolve()}async Me(){for(;;){if(await this.Le.promise,!this.Ue){this.Ne&&this.Ne.reject("Connection stopped.");break}this.Le=new Q;const t=this.Ne;this.Ne=void 0;const e="string"==typeof this.Ae[0]?this.Ae.join(""):G.We(this.Ae);this.Ae.length=0;try{await this.xe.send(e),t.resolve()}catch(e){t.reject(e)}}}static We(t){const e=t.map((t=>t.byteLength)).reduce(((t,e)=>t+e)),s=new Uint8Array(e);let i=0;for(const e of t)s.set(new Uint8Array(e),i),i+=e.byteLength;return s.buffer}}class Q{constructor(){this.promise=new Promise(((t,e)=>[this.j,this.Oe]=[t,e]))}resolve(){this.j()}reject(t){this.Oe(t)}}class Y{constructor(){this.name="json",this.version=2,this.transferFormat=B.Text}parseMessages(t,s){if("string"!=typeof t)throw new Error("Invalid input for JSON hub protocol. Expected a string.");if(!t)return[];null===s&&(s=f.instance);const i=D.parse(t),n=[];for(const t of i){const i=JSON.parse(t);if("number"!=typeof i.type)throw new Error("Invalid payload.");switch(i.type){case x.Invocation:this.U(i);break;case x.StreamItem:this.Fe(i);break;case x.Completion:this.Be(i);break;case x.Ping:case x.Close:break;case x.Ack:this.Xe(i);break;case x.Sequence:this.Je(i);break;default:s.log(e.Information,"Unknown message type '"+i.type+"' ignored.");continue}n.push(i)}return n}writeMessage(t){return D.write(JSON.stringify(t))}U(t){this.ze(t.target,"Invalid payload for Invocation message."),void 0!==t.invocationId&&this.ze(t.invocationId,"Invalid payload for Invocation message.")}Fe(t){if(this.ze(t.invocationId,"Invalid payload for StreamItem message."),void 0===t.item)throw new Error("Invalid payload for StreamItem message.")}Be(t){if(t.result&&t.error)throw new Error("Invalid payload for Completion message.");!t.result&&t.error&&this.ze(t.error,"Invalid payload for Completion message."),this.ze(t.invocationId,"Invalid payload for Completion message.")}Xe(t){if("number"!=typeof t.sequenceId)throw new Error("Invalid SequenceId for Ack message.")}Je(t){if("number"!=typeof t.sequenceId)throw new Error("Invalid SequenceId for Sequence message.")}ze(t,e){if("string"!=typeof t||""===t)throw new Error(e)}}const Z={trace:e.Trace,debug:e.Debug,info:e.Information,information:e.Information,warn:e.Warning,warning:e.Warning,error:e.Error,critical:e.Critical,none:e.None};class tt{configureLogging(t){if(w.isRequired(t,"logging"),void 0!==t.log)this.logger=t;else if("string"==typeof t){const e=function(t){const e=Z[t.toLowerCase()];if(void 0!==e)return e;throw new Error(`Unknown log level: ${t}`)}(t);this.logger=new E(e)}else this.logger=new E(t);return this}withUrl(t,e){return w.isRequired(t,"url"),w.isNotEmpty(t,"url"),this.url=t,this.httpConnectionOptions="object"==typeof e?{...this.httpConnectionOptions,...e}:{...this.httpConnectionOptions,transport:e},this}withHubProtocol(t){return w.isRequired(t,"protocol"),this.protocol=t,this}withAutomaticReconnect(t){if(this.reconnectPolicy)throw new Error("A reconnectPolicy has already been set.");return t?Array.isArray(t)?this.reconnectPolicy=new j(t):this.reconnectPolicy=t:this.reconnectPolicy=new j,this}withServerTimeout(t){return w.isRequired(t,"milliseconds"),this.Ve=t,this}withKeepAliveInterval(t){return w.isRequired(t,"milliseconds"),this.Ke=t,this}withStatefulReconnect(t){return void 0===this.httpConnectionOptions&&(this.httpConnectionOptions={}),this.httpConnectionOptions._e=!0,this.Y=null==t?void 0:t.bufferSize,this}build(){const t=this.httpConnectionOptions||{};if(void 0===t.logger&&(t.logger=this.logger),!this.url)throw new Error("The 'HubConnectionBuilder.withUrl' method must be called before building the connection.");const e=new K(this.url,t);return q.create(e,this.logger||f.instance,this.protocol||new Y,this.reconnectPolicy,this.Ve,this.Ke,this.Y)}}return Uint8Array.prototype.indexOf||Object.defineProperty(Uint8Array.prototype,"indexOf",{value:Array.prototype.indexOf,writable:!0}),Uint8Array.prototype.slice||Object.defineProperty(Uint8Array.prototype,"slice",{value:function(t,e){return new Uint8Array(Array.prototype.slice.call(this,t,e))},writable:!0}),Uint8Array.prototype.forEach||Object.defineProperty(Uint8Array.prototype,"forEach",{value:Array.prototype.forEach,writable:!0}),s})(),"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.signalR=e():t.signalR=e();
+//# sourceMappingURL=signalr.min.js.map
\ No newline at end of file
diff --git a/backend/src/CCE.Api.External/wwwroot/signalr-test.html b/backend/src/CCE.Api.External/wwwroot/signalr-test.html
new file mode 100644
index 00000000..e4c3c1c8
--- /dev/null
+++ b/backend/src/CCE.Api.External/wwwroot/signalr-test.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>SignalR Notification Test Harness</title>
+<script src="/js/signalr.min.js"></script>
+<style>
+  * { box-sizing: border-box; margin: 0; padding: 0; }
+  body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; background: #f5f5f5; padding: 20px; color: #333; }
+  h1 { font-size: 1.4rem; margin-bottom: 16px; }
+  h2 { font-size: 1rem; margin-bottom: 8px; }
+  .panel { background: #fff; border: 1px solid #ddd; border-radius: 8px; padding: 16px; margin-bottom: 16px; }
+  .panel-title { font-weight: 600; font-size: 0.85rem; text-transform: uppercase; letter-spacing: 0.5px; color: #666; margin-bottom: 10px; }
+  .row { display: flex; gap: 10px; flex-wrap: wrap; align-items: end; margin-bottom: 8px; }
+  .row label { font-size: 0.8rem; color: #555; display: flex; flex-direction: column; gap: 2px; flex: 1; min-width: 140px; }
+  .row input { padding: 6px 10px; border: 1px solid #ccc; border-radius: 4px; font-size: 0.85rem; font-family: monospace; width: 100%; }
+  .row input:focus { outline: none; border-color: #4a90d9; }
+  button { padding: 6px 14px; border: none; border-radius: 4px; cursor: pointer; font-size: 0.82rem; font-weight: 500; background: #e8e8e8; color: #333; transition: background 0.15s; }
+  button:hover { background: #d0d0d0; }
+  button:disabled { opacity: 0.4; cursor: not-allowed; }
+  .btn-primary { background: #4a90d9; color: #fff; }
+  .btn-primary:hover { background: #357abd; }
+  .btn-danger { background: #d9534f; color: #fff; }
+  .btn-danger:hover { background: #c9302c; }
+  .btn-success { background: #5cb85c; color: #fff; }
+  .btn-success:hover { background: #4cae4c; }
+  .btn-warning { background: #f0ad4e; color: #fff; }
+  .btn-warning:hover { background: #eea236; }
+  .badge { display: inline-block; padding: 2px 8px; border-radius: 10px; font-size: 0.72rem; font-weight: 600; }
+  .badge-connected { background: #d4edda; color: #155724; }
+  .badge-disconnected { background: #f8d7da; color: #721c24; }
+  .status-bar { display: flex; align-items: center; gap: 10px; margin-bottom: 12px; font-size: 0.85rem; }
+  #log { background: #1e1e1e; color: #d4d4d4; font-family: 'Cascadia Code', 'Fira Code', 'Consolas', monospace; font-size: 0.78rem; padding: 12px; border-radius: 6px; height: 400px; overflow-y: auto; white-space: pre-wrap; word-break: break-all; }
+  .log-entry { margin-bottom: 3px; }
+  .log-time { color: #6a9955; }
+  .log-event { color: #569cd6; }
+  .log-payload { color: #ce9178; }
+  .log-info { color: #9cdcfe; }
+  .log-error { color: #f48771; }
+  .actions { display: flex; gap: 6px; flex-wrap: wrap; }
+  .subsection { margin-top: 10px; padding-top: 10px; border-top: 1px solid #eee; }
+</style>
+</head>
+<body>
+
+<h1>SignalR Notification Test Harness</h1>
+
+<div class="status-bar">
+  <span>Status:</span>
+  <span class="badge badge-disconnected" id="connectionStatus">Disconnected</span>
+  <span id="connectionIdLabel" style="font-size:0.8rem;color:#888;"></span>
+</div>
+
+  <div class="panel">
+  <div class="panel-title">Connection</div>
+  <div class="row">
+    <label>Mode
+      <span style="display:flex;gap:4px;margin-top:2px">
+        <label class="mode-option" style="display:flex;align-items:center;gap:4px;padding:4px 10px;border:1px solid #ccc;border-radius:4px;cursor:pointer;font-size:0.82rem;background:#e8e8e8">
+          <input type="radio" name="mode" value="dev" checked onchange="toggleMode()" /> Dev
+        </label>
+        <label class="mode-option" style="display:flex;align-items:center;gap:4px;padding:4px 10px;border:1px solid #ccc;border-radius:4px;cursor:pointer;font-size:0.82rem;background:#fff">
+          <input type="radio" name="mode" value="prod" onchange="toggleMode()" /> Prod
+        </label>
+      </span>
+    </label>
+    <label>Server URL<input id="serverUrl" value="" placeholder="/hubs/notifications on same origin" /></label>
+    <label>JWT Token <small style="color:#999">(blank = use cookie)</small><input id="jwtToken" placeholder="dev:cce-user or real JWT" /></label>
+    <label>Dev Role<select id="devRole" style="padding:6px 10px;border:1px solid #ccc;border-radius:4px;font-size:0.85rem">
+      <option value="cce-super-admin">cce-super-admin</option>
+      <option value="cce-admin">cce-admin</option>
+      <option value="cce-content-manager">cce-content-manager</option>
+      <option value="cce-reviewer">cce-reviewer</option>
+      <option value="cce-expert">cce-expert</option>
+      <option value="cce-user" selected>cce-user</option>
+      <option value="cce-state-representative">cce-state-representative</option>
+    </select></label>
+  </div>
+  <div class="actions">
+    <button id="btnDevSignIn">Dev Sign-In</button>
+    <button class="btn-primary" id="btnConnect">Connect</button>
+    <button class="btn-danger" id="btnDisconnect" disabled>Disconnect</button>
+    <button id="btnClearLog">Clear Log</button>
+  </div>
+</div>
+
+<div class="panel">
+  <div class="panel-title">Rooms</div>
+  <div class="row">
+    <label>Post ID<input id="postId" placeholder="00000000-0000-0000-0000-000000000000" /></label>
+    <label>Community ID<input id="communityId" placeholder="00000000-0000-0000-0000-000000000000" /></label>
+    <label>Topic ID<input id="topicId" placeholder="00000000-0000-0000-0000-000000000000" /></label>
+  </div>
+  <div class="actions" style="margin-bottom:4px">
+    <button class="btn-success" id="btnSubscribe">Subscribe(post)</button>
+    <button class="btn-warning" id="btnUnsubscribe">Unsubscribe(post)</button>
+    <button class="btn-success" id="btnSubscribeCommunity">SubscribeCommunity</button>
+    <button class="btn-warning" id="btnUnsubscribeCommunity">UnsubscribeCommunity</button>
+    <button class="btn-success" id="btnSubscribeTopic">SubscribeTopic</button>
+    <button class="btn-warning" id="btnUnsubscribeTopic">UnsubscribeTopic</button>
+  </div>
+  <div class="subsection">
+    <div style="font-size:0.8rem; color:#888; margin-bottom:6px">Typing Indicators</div>
+    <div class="actions">
+      <button id="btnStartTyping">StartTyping</button>
+      <button id="btnStopTyping">StopTyping</button>
+    </div>
+  </div>
+</div>
+
+<div class="panel">
+  <div class="panel-title">Event Log <span id="eventCount" style="font-weight:normal;color:#999;margin-left:8px">0 events</span></div>
+  <div id="log">Waiting for connection...</div>
+</div>
+
+<script src="/js/signalr-test.js"></script>
+</body>
+</html>
diff --git a/backend/src/CCE.Application/Common/Messaging/IntegrationEvents/EventScheduledIntegrationEvent.cs b/backend/src/CCE.Application/Common/Messaging/IntegrationEvents/EventScheduledIntegrationEvent.cs
new file mode 100644
index 00000000..126ac0e7
--- /dev/null
+++ b/backend/src/CCE.Application/Common/Messaging/IntegrationEvents/EventScheduledIntegrationEvent.cs
@@ -0,0 +1,13 @@
+namespace CCE.Application.Common.Messaging.IntegrationEvents;
+
+/// <summary>
+/// Published when an Event is scheduled. Captured by the EF outbox atomically with the
+/// schedule transaction. <c>CCE.Worker</c>'s <c>ContentNotificationConsumer</c> fans out
+/// to newsletter subscribers.
+/// </summary>
+public sealed record EventScheduledIntegrationEvent(
+    System.Guid EventId,
+    System.Guid TopicId,
+    System.DateTimeOffset StartsOn,
+    System.DateTimeOffset EndsOn,
+    System.DateTimeOffset OccurredOn);
diff --git a/backend/src/CCE.Application/Common/Messaging/IntegrationEvents/NewsPublishedIntegrationEvent.cs b/backend/src/CCE.Application/Common/Messaging/IntegrationEvents/NewsPublishedIntegrationEvent.cs
new file mode 100644
index 00000000..089c90f6
--- /dev/null
+++ b/backend/src/CCE.Application/Common/Messaging/IntegrationEvents/NewsPublishedIntegrationEvent.cs
@@ -0,0 +1,12 @@
+namespace CCE.Application.Common.Messaging.IntegrationEvents;
+
+/// <summary>
+/// Published when a News article transitions to published. Captured by the EF outbox atomically
+/// with the publish transaction. <c>CCE.Worker</c>'s <c>ContentNotificationConsumer</c> fans out
+/// to newsletter subscribers.
+/// </summary>
+public sealed record NewsPublishedIntegrationEvent(
+    System.Guid NewsId,
+    System.Guid TopicId,
+    System.Guid AuthorId,
+    System.DateTimeOffset PublishedOn);
diff --git a/backend/src/CCE.Application/Common/Messaging/IntegrationEvents/ResourcePublishedIntegrationEvent.cs b/backend/src/CCE.Application/Common/Messaging/IntegrationEvents/ResourcePublishedIntegrationEvent.cs
new file mode 100644
index 00000000..0b1f4537
--- /dev/null
+++ b/backend/src/CCE.Application/Common/Messaging/IntegrationEvents/ResourcePublishedIntegrationEvent.cs
@@ -0,0 +1,13 @@
+namespace CCE.Application.Common.Messaging.IntegrationEvents;
+
+/// <summary>
+/// Published when a Resource transitions to published. Captured by the EF outbox atomically
+/// with the publish transaction. <c>CCE.Worker</c>'s <c>ContentNotificationConsumer</c> fans out
+/// to newsletter subscribers.
+/// </summary>
+public sealed record ResourcePublishedIntegrationEvent(
+    System.Guid ResourceId,
+    System.Guid CategoryId,
+    System.Guid? CountryId,
+    System.Guid UploadedById,
+    System.DateTimeOffset PublishedOn);
diff --git a/backend/src/CCE.Application/Content/Commands/SubscribeNewsletter/SubscribeNewsletterCommand.cs b/backend/src/CCE.Application/Content/Commands/SubscribeNewsletter/SubscribeNewsletterCommand.cs
new file mode 100644
index 00000000..aae876f8
--- /dev/null
+++ b/backend/src/CCE.Application/Content/Commands/SubscribeNewsletter/SubscribeNewsletterCommand.cs
@@ -0,0 +1,7 @@
+using CCE.Application.Common;
+using MediatR;
+
+namespace CCE.Application.Content.Commands.SubscribeNewsletter;
+
+public sealed record SubscribeNewsletterCommand(string Email, string Locale)
+    : IRequest<Response<VoidData>>;
diff --git a/backend/src/CCE.Application/Content/Commands/SubscribeNewsletter/SubscribeNewsletterCommandHandler.cs b/backend/src/CCE.Application/Content/Commands/SubscribeNewsletter/SubscribeNewsletterCommandHandler.cs
new file mode 100644
index 00000000..a371027c
--- /dev/null
+++ b/backend/src/CCE.Application/Content/Commands/SubscribeNewsletter/SubscribeNewsletterCommandHandler.cs
@@ -0,0 +1,52 @@
+using CCE.Application.Common;
+using CCE.Application.Common.Interfaces;
+using CCE.Application.Messages;
+using CCE.Domain.Common;
+using CCE.Domain.Content;
+using MediatR;
+
+namespace CCE.Application.Content.Commands.SubscribeNewsletter;
+
+public sealed class SubscribeNewsletterCommandHandler
+    : IRequestHandler<SubscribeNewsletterCommand, Response<VoidData>>
+{
+    private readonly INewsletterSubscriptionRepository _repo;
+    private readonly ICceDbContext _db;
+    private readonly ISystemClock _clock;
+    private readonly MessageFactory _messages;
+
+    public SubscribeNewsletterCommandHandler(
+        INewsletterSubscriptionRepository repo,
+        ICceDbContext db,
+        ISystemClock clock,
+        MessageFactory messages)
+    {
+        _repo = repo;
+        _db = db;
+        _clock = clock;
+        _messages = messages;
+    }
+
+    public async Task<Response<VoidData>> Handle(
+        SubscribeNewsletterCommand request, CancellationToken cancellationToken)
+    {
+        var existing = await _repo.FindByEmailAsync(request.Email, cancellationToken)
+            .ConfigureAwait(false);
+
+        if (existing is not null)
+        {
+            if (existing.UnsubscribedOn is null)
+                return _messages.Ok("NEWSLETTER_SUBSCRIBED");
+
+            existing.Resubscribe(request.Locale, _clock);
+        }
+        else
+        {
+            var subscription = NewsletterSubscription.Subscribe(request.Email, request.Locale, _clock);
+            await _repo.AddAsync(subscription, cancellationToken).ConfigureAwait(false);
+        }
+
+        await _db.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+        return _messages.Ok("NEWSLETTER_SUBSCRIBED");
+    }
+}
diff --git a/backend/src/CCE.Application/Content/ContentTitle.cs b/backend/src/CCE.Application/Content/ContentTitle.cs
new file mode 100644
index 00000000..45f440e3
--- /dev/null
+++ b/backend/src/CCE.Application/Content/ContentTitle.cs
@@ -0,0 +1,3 @@
+namespace CCE.Application.Content;
+
+public sealed record ContentTitle(string TitleAr, string TitleEn);
diff --git a/backend/src/CCE.Application/Content/EventHandlers/EventScheduledBusPublisher.cs b/backend/src/CCE.Application/Content/EventHandlers/EventScheduledBusPublisher.cs
new file mode 100644
index 00000000..2040b8d8
--- /dev/null
+++ b/backend/src/CCE.Application/Content/EventHandlers/EventScheduledBusPublisher.cs
@@ -0,0 +1,29 @@
+using CCE.Application.Common.Messaging;
+using CCE.Application.Common.Messaging.IntegrationEvents;
+using CCE.Domain.Content.Events;
+using MediatR;
+
+namespace CCE.Application.Content.EventHandlers;
+
+/// <summary>
+/// Bridge: translates the <see cref="EventScheduledEvent"/> domain event into an
+/// <see cref="EventScheduledIntegrationEvent"/> on the bus. Runs pre-commit inside
+/// <c>DomainEventDispatcher</c>, so the publish is captured by the MassTransit EF outbox
+/// and committed atomically with the aggregate save. The Worker's
+/// <c>ContentNotificationConsumer</c> fans out to newsletter subscribers.
+/// </summary>
+public sealed class EventScheduledBusPublisher : INotificationHandler<EventScheduledEvent>
+{
+    private readonly IIntegrationEventPublisher _publisher;
+
+    public EventScheduledBusPublisher(IIntegrationEventPublisher publisher)
+        => _publisher = publisher;
+
+    public Task Handle(EventScheduledEvent notification, CancellationToken cancellationToken)
+        => _publisher.PublishAsync(new EventScheduledIntegrationEvent(
+            notification.EventId,
+            notification.TopicId,
+            notification.StartsOn,
+            notification.EndsOn,
+            notification.OccurredOn), cancellationToken);
+}
diff --git a/backend/src/CCE.Application/Content/EventHandlers/NewsPublishedBusPublisher.cs b/backend/src/CCE.Application/Content/EventHandlers/NewsPublishedBusPublisher.cs
new file mode 100644
index 00000000..103f4d69
--- /dev/null
+++ b/backend/src/CCE.Application/Content/EventHandlers/NewsPublishedBusPublisher.cs
@@ -0,0 +1,28 @@
+using CCE.Application.Common.Messaging;
+using CCE.Application.Common.Messaging.IntegrationEvents;
+using CCE.Domain.Content.Events;
+using MediatR;
+
+namespace CCE.Application.Content.EventHandlers;
+
+/// <summary>
+/// Bridge: translates the <see cref="NewsPublishedEvent"/> domain event into a
+/// <see cref="NewsPublishedIntegrationEvent"/> on the bus. Runs pre-commit inside
+/// <c>DomainEventDispatcher</c>, so the publish is captured by the MassTransit EF outbox
+/// and committed atomically with the aggregate save. The Worker's
+/// <c>ContentNotificationConsumer</c> fans out to newsletter subscribers.
+/// </summary>
+public sealed class NewsPublishedBusPublisher : INotificationHandler<NewsPublishedEvent>
+{
+    private readonly IIntegrationEventPublisher _publisher;
+
+    public NewsPublishedBusPublisher(IIntegrationEventPublisher publisher)
+        => _publisher = publisher;
+
+    public Task Handle(NewsPublishedEvent notification, CancellationToken cancellationToken)
+        => _publisher.PublishAsync(new NewsPublishedIntegrationEvent(
+            notification.NewsId,
+            notification.TopicId,
+            notification.AuthorId,
+            notification.OccurredOn), cancellationToken);
+}
diff --git a/backend/src/CCE.Application/Content/EventHandlers/ResourcePublishedBusPublisher.cs b/backend/src/CCE.Application/Content/EventHandlers/ResourcePublishedBusPublisher.cs
new file mode 100644
index 00000000..f8a61b4e
--- /dev/null
+++ b/backend/src/CCE.Application/Content/EventHandlers/ResourcePublishedBusPublisher.cs
@@ -0,0 +1,29 @@
+using CCE.Application.Common.Messaging;
+using CCE.Application.Common.Messaging.IntegrationEvents;
+using CCE.Domain.Content.Events;
+using MediatR;
+
+namespace CCE.Application.Content.EventHandlers;
+
+/// <summary>
+/// Bridge: translates the <see cref="ResourcePublishedEvent"/> domain event into a
+/// <see cref="ResourcePublishedIntegrationEvent"/> on the bus. Runs pre-commit inside
+/// <c>DomainEventDispatcher</c>, so the publish is captured by the MassTransit EF outbox
+/// and committed atomically with the aggregate save. The Worker's
+/// <c>ContentNotificationConsumer</c> fans out to newsletter subscribers.
+/// </summary>
+public sealed class ResourcePublishedBusPublisher : INotificationHandler<ResourcePublishedEvent>
+{
+    private readonly IIntegrationEventPublisher _publisher;
+
+    public ResourcePublishedBusPublisher(IIntegrationEventPublisher publisher)
+        => _publisher = publisher;
+
+    public Task Handle(ResourcePublishedEvent notification, CancellationToken cancellationToken)
+        => _publisher.PublishAsync(new ResourcePublishedIntegrationEvent(
+            notification.ResourceId,
+            notification.CategoryId,
+            notification.CountryId,
+            notification.UploadedById,
+            notification.OccurredOn), cancellationToken);
+}
diff --git a/backend/src/CCE.Application/Content/IEventRepository.cs b/backend/src/CCE.Application/Content/IEventRepository.cs
index f2f2ce53..a376e02e 100644
--- a/backend/src/CCE.Application/Content/IEventRepository.cs
+++ b/backend/src/CCE.Application/Content/IEventRepository.cs
@@ -7,4 +7,5 @@ public interface IEventRepository
     Task SaveAsync(Event @event, CancellationToken ct);
     Task<Event?> FindAsync(System.Guid id, CancellationToken ct);
     Task UpdateAsync(Event @event, byte[] expectedRowVersion, CancellationToken ct);
+    Task<ContentTitle?> GetTitleAsync(System.Guid id, CancellationToken ct);
 }
diff --git a/backend/src/CCE.Application/Content/INewsRepository.cs b/backend/src/CCE.Application/Content/INewsRepository.cs
index f8b6ea41..bb57b21b 100644
--- a/backend/src/CCE.Application/Content/INewsRepository.cs
+++ b/backend/src/CCE.Application/Content/INewsRepository.cs
@@ -2,9 +2,13 @@
 
 namespace CCE.Application.Content;
 
+public sealed record NewsNotificationData(string TitleAr, string TitleEn, string ContentAr, string ContentEn);
+
 public interface INewsRepository
 {
     Task SaveAsync(News news, CancellationToken ct);
     Task<News?> FindAsync(System.Guid id, CancellationToken ct);
     Task UpdateAsync(News news, byte[] expectedRowVersion, CancellationToken ct);
+    Task<ContentTitle?> GetTitleAsync(System.Guid id, CancellationToken ct);
+    Task<NewsNotificationData?> GetNotificationDataAsync(System.Guid id, CancellationToken ct);
 }
diff --git a/backend/src/CCE.Application/Content/INewsletterSubscriptionRepository.cs b/backend/src/CCE.Application/Content/INewsletterSubscriptionRepository.cs
new file mode 100644
index 00000000..1b9053ea
--- /dev/null
+++ b/backend/src/CCE.Application/Content/INewsletterSubscriptionRepository.cs
@@ -0,0 +1,21 @@
+using CCE.Application.Common.Interfaces;
+using CCE.Domain.Content;
+
+namespace CCE.Application.Content;
+
+public sealed record NewsletterAudienceMember(string Email, string Locale, System.Guid? UserId, string RecipientName);
+
+public interface INewsletterSubscriptionRepository : IRepository<NewsletterSubscription, System.Guid>
+{
+    Task<CCE.Domain.Content.NewsletterSubscription?> FindByEmailAsync(string email, CancellationToken ct);
+
+    /// <summary>
+    /// Returns confirmed newsletter subscribers (not unsubscribed), enriched with registered-user
+    /// data via a LEFT JOIN on normalised email. Matched active users contribute UserId + their
+    /// LocalePreference; unmatched newsletter-only addresses get UserId = null and their
+    /// subscription locale. <paramref name="excludeUserId"/> removes the content author (who is
+    /// already notified by the in-process handler) from the broadcast set.
+    /// </summary>
+    Task<System.Collections.Generic.IReadOnlyList<NewsletterAudienceMember>> GetAudienceAsync(
+        System.Guid? excludeUserId, CancellationToken ct);
+}
diff --git a/backend/src/CCE.Application/Content/IResourceRepository.cs b/backend/src/CCE.Application/Content/IResourceRepository.cs
index 63361cc1..609c4821 100644
--- a/backend/src/CCE.Application/Content/IResourceRepository.cs
+++ b/backend/src/CCE.Application/Content/IResourceRepository.cs
@@ -7,4 +7,5 @@ public interface IResourceRepository
     Task SaveAsync(Resource resource, CancellationToken ct);
     Task<Resource?> FindAsync(System.Guid id, CancellationToken ct);
     Task UpdateAsync(Resource resource, byte[] expectedRowVersion, CancellationToken ct);
+    Task<ContentTitle?> GetTitleAsync(System.Guid id, CancellationToken ct);
 }
diff --git a/backend/src/CCE.Application/Notifications/Handlers/EventScheduledNotificationHandler.cs b/backend/src/CCE.Application/Notifications/Handlers/EventScheduledNotificationHandler.cs
deleted file mode 100644
index 1ddfe843..00000000
--- a/backend/src/CCE.Application/Notifications/Handlers/EventScheduledNotificationHandler.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using CCE.Domain.Content.Events;
-using MediatR;
-using Microsoft.Extensions.Logging;
-
-namespace CCE.Application.Notifications.Handlers;
-
-public sealed class EventScheduledNotificationHandler
-    : INotificationHandler<EventScheduledEvent>
-{
-    private readonly ILogger<EventScheduledNotificationHandler> _logger;
-
-    public EventScheduledNotificationHandler(
-        ILogger<EventScheduledNotificationHandler> logger)
-    {
-        _logger = logger;
-    }
-
-    public Task Handle(EventScheduledEvent notification, CancellationToken cancellationToken)
-    {
-        _logger.LogInformation(
-            "Event {EventId} scheduled. Audience notifications require explicit audience definition.",
-            notification.EventId);
-        return Task.CompletedTask;
-    }
-}
diff --git a/backend/src/CCE.Application/Notifications/Handlers/NewsPublishedNotificationHandler.cs b/backend/src/CCE.Application/Notifications/Handlers/NewsPublishedNotificationHandler.cs
index 6e634267..b5606143 100644
--- a/backend/src/CCE.Application/Notifications/Handlers/NewsPublishedNotificationHandler.cs
+++ b/backend/src/CCE.Application/Notifications/Handlers/NewsPublishedNotificationHandler.cs
@@ -42,7 +42,11 @@ await _dispatcher.DispatchAsync(new NotificationMessage(
             RecipientUserId: news.AuthorId,
             EventType: NotificationEventType.NewsPublished,
             Channels: [NotificationChannel.InApp],
-            MetaData: new Dictionary<string, string>(),
+            MetaData: new Dictionary<string, string>
+            {
+                ["TitleAr"] = news.TitleAr,
+                ["TitleEn"] = news.TitleEn,
+            },
             Locale: "en"), cancellationToken).ConfigureAwait(false);
     }
 }
diff --git a/backend/src/CCE.Application/Notifications/Handlers/ResourcePublishedNotificationHandler.cs b/backend/src/CCE.Application/Notifications/Handlers/ResourcePublishedNotificationHandler.cs
index 51e71790..af932eda 100644
--- a/backend/src/CCE.Application/Notifications/Handlers/ResourcePublishedNotificationHandler.cs
+++ b/backend/src/CCE.Application/Notifications/Handlers/ResourcePublishedNotificationHandler.cs
@@ -41,7 +41,11 @@ await _dispatcher.DispatchAsync(new NotificationMessage(
             RecipientUserId: resource.UploadedById,
             EventType: NotificationEventType.ResourcePublished,
             Channels: [NotificationChannel.InApp],
-            MetaData: new Dictionary<string, string>(),
+            MetaData: new Dictionary<string, string>
+            {
+                ["TitleAr"] = resource.TitleAr,
+                ["TitleEn"] = resource.TitleEn,
+            },
             Locale: "en"), cancellationToken).ConfigureAwait(false);
     }
 }
diff --git a/backend/src/CCE.Domain/Content/Event.cs b/backend/src/CCE.Domain/Content/Event.cs
index 132725f1..b5cbe5bc 100644
--- a/backend/src/CCE.Domain/Content/Event.cs
+++ b/backend/src/CCE.Domain/Content/Event.cs
@@ -104,7 +104,7 @@ public static Event Schedule(
         var iCalUid = $"{id:N}@cce.moenergy.gov.sa";
         var ev = new Event(id, titleAr, titleEn, descriptionAr, descriptionEn,
             startsOn, endsOn, locationAr, locationEn, onlineMeetingUrl, featuredImageUrl, iCalUid, topicId);
-        ev.RaiseDomainEvent(new EventScheduledEvent(id, startsOn, endsOn, clock.UtcNow));
+        ev.RaiseDomainEvent(new EventScheduledEvent(id, topicId, startsOn, endsOn, clock.UtcNow));
         return ev;
     }
 
diff --git a/backend/src/CCE.Domain/Content/Events/EventScheduledEvent.cs b/backend/src/CCE.Domain/Content/Events/EventScheduledEvent.cs
index fb992c13..1571eb37 100644
--- a/backend/src/CCE.Domain/Content/Events/EventScheduledEvent.cs
+++ b/backend/src/CCE.Domain/Content/Events/EventScheduledEvent.cs
@@ -4,6 +4,7 @@ namespace CCE.Domain.Content.Events;
 
 public sealed record EventScheduledEvent(
     System.Guid EventId,
+    System.Guid TopicId,
     System.DateTimeOffset StartsOn,
     System.DateTimeOffset EndsOn,
     System.DateTimeOffset OccurredOn) : IDomainEvent;
diff --git a/backend/src/CCE.Domain/Content/Events/NewsPublishedEvent.cs b/backend/src/CCE.Domain/Content/Events/NewsPublishedEvent.cs
index b9454041..1aeabae6 100644
--- a/backend/src/CCE.Domain/Content/Events/NewsPublishedEvent.cs
+++ b/backend/src/CCE.Domain/Content/Events/NewsPublishedEvent.cs
@@ -4,4 +4,6 @@ namespace CCE.Domain.Content.Events;
 
 public sealed record NewsPublishedEvent(
     System.Guid NewsId,
+    System.Guid TopicId,
+    System.Guid AuthorId,
     System.DateTimeOffset OccurredOn) : IDomainEvent;
diff --git a/backend/src/CCE.Domain/Content/Events/ResourcePublishedEvent.cs b/backend/src/CCE.Domain/Content/Events/ResourcePublishedEvent.cs
index b0642947..0e322292 100644
--- a/backend/src/CCE.Domain/Content/Events/ResourcePublishedEvent.cs
+++ b/backend/src/CCE.Domain/Content/Events/ResourcePublishedEvent.cs
@@ -10,4 +10,5 @@ public sealed record ResourcePublishedEvent(
     System.Guid ResourceId,
     System.Guid? CountryId,
     System.Guid CategoryId,
+    System.Guid UploadedById,
     System.DateTimeOffset OccurredOn) : IDomainEvent;
diff --git a/backend/src/CCE.Domain/Content/News.cs b/backend/src/CCE.Domain/Content/News.cs
index c8941fc7..fd191479 100644
--- a/backend/src/CCE.Domain/Content/News.cs
+++ b/backend/src/CCE.Domain/Content/News.cs
@@ -108,7 +108,7 @@ public void Publish(ISystemClock clock)
     {
         if (IsPublished) return;
         PublishedOn = clock.UtcNow;
-        RaiseDomainEvent(new NewsPublishedEvent(Id, PublishedOn.Value));
+        RaiseDomainEvent(new NewsPublishedEvent(Id, TopicId, AuthorId, PublishedOn.Value));
     }
 
     public void SetTags(IEnumerable<Tag> tags)
diff --git a/backend/src/CCE.Domain/Content/NewsletterSubscription.cs b/backend/src/CCE.Domain/Content/NewsletterSubscription.cs
index 3eb042d8..b8c770a1 100644
--- a/backend/src/CCE.Domain/Content/NewsletterSubscription.cs
+++ b/backend/src/CCE.Domain/Content/NewsletterSubscription.cs
@@ -34,20 +34,20 @@ private NewsletterSubscription(
 
     public static NewsletterSubscription Subscribe(string email, string localePreference, ISystemClock clock)
     {
-        _ = clock;
         if (string.IsNullOrWhiteSpace(email) || !EmailPattern.IsMatch(email))
-        {
             throw new DomainException($"email '{email}' is invalid.");
-        }
         if (localePreference != "ar" && localePreference != "en")
-        {
             throw new DomainException("locale must be 'ar' or 'en'.");
-        }
-        return new NewsletterSubscription(
+
+        var sub = new NewsletterSubscription(
             id: System.Guid.NewGuid(),
             email: email,
             localePreference: localePreference,
             confirmationToken: System.Guid.NewGuid().ToString("N"));
+
+        sub.IsConfirmed = true;
+        sub.ConfirmedOn = clock.UtcNow;
+        return sub;
     }
 
     public void Confirm(string token, ISystemClock clock)
@@ -69,4 +69,18 @@ public void Unsubscribe(ISystemClock clock)
     {
         UnsubscribedOn = clock.UtcNow;
     }
+
+    /// <summary>
+    /// Re-activates a previously unsubscribed address. Resets the confirmation state so the
+    /// double opt-in flow runs again, and clears <see cref="UnsubscribedOn"/>.
+    /// </summary>
+    public void Resubscribe(string localePreference, ISystemClock clock)
+    {
+        if (localePreference != "ar" && localePreference != "en")
+            throw new DomainException("locale must be 'ar' or 'en'.");
+        LocalePreference = localePreference;
+        UnsubscribedOn = null;
+        IsConfirmed = true;
+        ConfirmedOn = clock.UtcNow;
+    }
 }
diff --git a/backend/src/CCE.Domain/Content/Resource.cs b/backend/src/CCE.Domain/Content/Resource.cs
index 37d1a96c..cfd9071e 100644
--- a/backend/src/CCE.Domain/Content/Resource.cs
+++ b/backend/src/CCE.Domain/Content/Resource.cs
@@ -113,6 +113,7 @@ public void Publish(ISystemClock clock)
             ResourceId: Id,
             CountryId: CountryId,
             CategoryId: CategoryId,
+            UploadedById: UploadedById,
             OccurredOn: PublishedOn.Value));
     }
 
diff --git a/backend/src/CCE.Infrastructure/CceInfrastructureOptions.cs b/backend/src/CCE.Infrastructure/CceInfrastructureOptions.cs
index e01a56c7..5fdf0373 100644
--- a/backend/src/CCE.Infrastructure/CceInfrastructureOptions.cs
+++ b/backend/src/CCE.Infrastructure/CceInfrastructureOptions.cs
@@ -52,4 +52,10 @@ public sealed class CceInfrastructureOptions
 
     /// <summary>Output-cache TTL in seconds for anonymous reads. Default 60.</summary>
     public int OutputCacheTtlSeconds { get; init; } = 60;
+
+    /// <summary>
+    /// Max concurrent newsletter dispatch tasks per content-publish event.
+    /// Tune upward if subscriber lists are large and bus throughput allows it. Default 10.
+    /// </summary>
+    public int NewsletterFanOutConcurrency { get; init; } = 10;
 }
diff --git a/backend/src/CCE.Infrastructure/Content/EventRepository.cs b/backend/src/CCE.Infrastructure/Content/EventRepository.cs
index 611b405d..ee683d74 100644
--- a/backend/src/CCE.Infrastructure/Content/EventRepository.cs
+++ b/backend/src/CCE.Infrastructure/Content/EventRepository.cs
@@ -30,4 +30,11 @@ public async Task UpdateAsync(Event @event, byte[] expectedRowVersion, Cancellat
         _db.SetExpectedRowVersion(@event, expectedRowVersion);
         await _db.SaveChangesAsync(ct).ConfigureAwait(false);
     }
+
+    public Task<ContentTitle?> GetTitleAsync(System.Guid id, CancellationToken ct)
+        => _db.Events
+            .AsNoTracking()
+            .Where(e => e.Id == id)
+            .Select(e => new ContentTitle(e.TitleAr, e.TitleEn))
+            .FirstOrDefaultAsync(ct);
 }
diff --git a/backend/src/CCE.Infrastructure/Content/NewsRepository.cs b/backend/src/CCE.Infrastructure/Content/NewsRepository.cs
index 4368e2ba..76ccad33 100644
--- a/backend/src/CCE.Infrastructure/Content/NewsRepository.cs
+++ b/backend/src/CCE.Infrastructure/Content/NewsRepository.cs
@@ -30,4 +30,18 @@ public async Task UpdateAsync(News news, byte[] expectedRowVersion, Cancellation
         _db.SetExpectedRowVersion(news, expectedRowVersion);
         await _db.SaveChangesAsync(ct).ConfigureAwait(false);
     }
+
+    public Task<ContentTitle?> GetTitleAsync(System.Guid id, CancellationToken ct)
+        => _db.News
+            .AsNoTracking()
+            .Where(n => n.Id == id)
+            .Select(n => new ContentTitle(n.TitleAr, n.TitleEn))
+            .FirstOrDefaultAsync(ct);
+
+    public Task<NewsNotificationData?> GetNotificationDataAsync(System.Guid id, CancellationToken ct)
+        => _db.News
+            .AsNoTracking()
+            .Where(n => n.Id == id)
+            .Select(n => new NewsNotificationData(n.TitleAr, n.TitleEn, n.ContentAr, n.ContentEn))
+            .FirstOrDefaultAsync(ct);
 }
diff --git a/backend/src/CCE.Infrastructure/Content/NewsletterSubscriptionRepository.cs b/backend/src/CCE.Infrastructure/Content/NewsletterSubscriptionRepository.cs
new file mode 100644
index 00000000..bd7add33
--- /dev/null
+++ b/backend/src/CCE.Infrastructure/Content/NewsletterSubscriptionRepository.cs
@@ -0,0 +1,56 @@
+using CCE.Application.Content;
+using CCE.Domain.Content;
+using CCE.Domain.Identity;
+using CCE.Infrastructure.Persistence;
+using Microsoft.EntityFrameworkCore;
+
+namespace CCE.Infrastructure.Content;
+
+public sealed class NewsletterSubscriptionRepository
+    : Repository<NewsletterSubscription, Guid>, INewsletterSubscriptionRepository
+{
+    public NewsletterSubscriptionRepository(CceDbContext db) : base(db) { }
+
+    public Task<NewsletterSubscription?> FindByEmailAsync(string email, CancellationToken ct)
+        => Db.NewsletterSubscriptions
+            .FirstOrDefaultAsync(s => s.Email == email, ct);
+
+    public async Task<IReadOnlyList<NewsletterAudienceMember>> GetAudienceAsync(
+        Guid? excludeUserId, CancellationToken ct)
+    {
+        // Single LEFT JOIN query: newsletter_subscriptions LEFT JOIN asp_net_users.
+        // Join condition on NormalizedEmail (already stored uppercase) == sub.Email —
+        // SQL Server's default CI collation makes this case-insensitive at the DB level
+        // with no client-side string conversion. Filter conditions stay on the join side
+        // so unmatched subscribers still appear (newsletter-only, no account).
+        var rows = await (
+            from sub in Db.NewsletterSubscriptions.AsNoTracking()
+            where sub.IsConfirmed && sub.UnsubscribedOn == null
+            from u in Db.Users.AsNoTracking()
+                .Where(u => !u.IsDeleted
+                            && u.Status == UserStatus.Active
+                            && u.NormalizedEmail == sub.Email)
+                .DefaultIfEmpty()
+            where !excludeUserId.HasValue || u == null || u.Id != excludeUserId.Value
+            select new
+            {
+                sub.Email,
+                UserLocale = (string?)u.LocalePreference,
+                SubLocale = sub.LocalePreference,
+                UserId = (Guid?)u.Id,
+                FirstName = (string?)u.FirstName,
+                LastName = (string?)u.LastName,
+            }
+        ).ToListAsync(ct).ConfigureAwait(false);
+
+        return rows
+            .Select(r => new NewsletterAudienceMember(
+                r.Email,
+                r.UserLocale ?? r.SubLocale,
+                r.UserId,
+                r.UserId.HasValue
+                    ? $"{r.FirstName ?? string.Empty} {r.LastName ?? string.Empty}".Trim()
+                    : string.Empty))
+            .ToList();
+    }
+}
diff --git a/backend/src/CCE.Infrastructure/Content/ResourceRepository.cs b/backend/src/CCE.Infrastructure/Content/ResourceRepository.cs
index adee3d5a..d5266f25 100644
--- a/backend/src/CCE.Infrastructure/Content/ResourceRepository.cs
+++ b/backend/src/CCE.Infrastructure/Content/ResourceRepository.cs
@@ -30,4 +30,11 @@ public async Task UpdateAsync(Resource resource, byte[] expectedRowVersion, Canc
         _db.SetExpectedRowVersion(resource, expectedRowVersion);
         await _db.SaveChangesAsync(ct).ConfigureAwait(false);
     }
+
+    public Task<ContentTitle?> GetTitleAsync(System.Guid id, CancellationToken ct)
+        => _db.Resources
+            .AsNoTracking()
+            .Where(r => r.Id == id)
+            .Select(r => new ContentTitle(r.TitleAr, r.TitleEn))
+            .FirstOrDefaultAsync(ct);
 }
diff --git a/backend/src/CCE.Infrastructure/DependencyInjection.cs b/backend/src/CCE.Infrastructure/DependencyInjection.cs
index 222c14a9..e2d5f714 100644
--- a/backend/src/CCE.Infrastructure/DependencyInjection.cs
+++ b/backend/src/CCE.Infrastructure/DependencyInjection.cs
@@ -190,6 +190,7 @@ public static IServiceCollection AddInfrastructure(
         services.AddScoped<IResourceRepository, ResourceRepository>();
         services.AddScoped<INewsRepository, NewsRepository>();
         services.AddScoped<IEventRepository, EventRepository>();
+        services.AddScoped<INewsletterSubscriptionRepository, NewsletterSubscriptionRepository>();
         services.AddScoped<IPageRepository, PageRepository>();
         services.AddScoped<IHomepageSectionRepository, HomepageSectionRepository>();
         services.AddScoped<ICountryContentRequestRepository, CountryContentRequestRepository>();
diff --git a/backend/src/CCE.Infrastructure/Email/SmtpEmailSender.cs b/backend/src/CCE.Infrastructure/Email/SmtpEmailSender.cs
index ae64ca81..2842006a 100644
--- a/backend/src/CCE.Infrastructure/Email/SmtpEmailSender.cs
+++ b/backend/src/CCE.Infrastructure/Email/SmtpEmailSender.cs
@@ -30,7 +30,7 @@ public async Task SendAsync(string to, string subject, string htmlBody, string?
         message.From.Add(new MailboxAddress(opts.FromName, opts.FromAddress));
         message.To.Add(MailboxAddress.Parse(to));
         message.Subject = subject;
-        message.Body = new BodyBuilder { HtmlBody = htmlBody }.ToMessageBody();
+        message.Body = new BodyBuilder { HtmlBody = WrapInLayout(htmlBody) }.ToMessageBody();
 
         using var client = new SmtpClient();
         try
@@ -54,4 +54,50 @@ public async Task SendAsync(string to, string subject, string htmlBody, string?
             throw;
         }
     }
+
+    private static string WrapInLayout(string body)
+    {
+        // If the body already starts with <!DOCTYPE or <html, it's already a full document.
+        if (body.TrimStart().StartsWith("<!DOCTYPE", System.StringComparison.OrdinalIgnoreCase) ||
+            body.TrimStart().StartsWith("<html", System.StringComparison.OrdinalIgnoreCase))
+        {
+            return body;
+        }
+
+        return $@"<!DOCTYPE html>
+<html lang=""en"" dir=""ltr"">
+<head>
+    <meta charset=""UTF-8"" />
+    <meta name=""viewport"" content=""width=device-width, initial-scale=1.0"" />
+    <title></title>
+    <style type=""text/css"">
+        * {{ margin: 0; padding: 0; box-sizing: border-box; }}
+        body {{ background-color: #f4f6f9; font-family: 'Segoe UI', Tahoma, Arial, sans-serif; font-size: 16px; line-height: 1.6; color: #333; }}
+        .email-wrapper {{ max-width: 600px; margin: 0 auto; padding: 20px 10px; }}
+        .email-header {{ background: linear-gradient(135deg, #1a73e8, #0d47a1); padding: 30px 24px; border-radius: 8px 8px 0 0; text-align: center; }}
+        .email-header h1 {{ color: #fff; font-size: 22px; font-weight: 600; margin: 0; }}
+        .email-body {{ background-color: #fff; padding: 32px 24px; border-left: 1px solid #e0e0e0; border-right: 1px solid #e0e0e0; }}
+        .email-footer {{ background-color: #eef1f5; padding: 20px 24px; border-radius: 0 0 8px 8px; text-align: center; font-size: 13px; color: #777; border: 1px solid #e0e0e0; border-top: none; }}
+        .email-footer a {{ color: #1a73e8; text-decoration: none; }}
+        .btn {{ display: inline-block; padding: 12px 28px; background-color: #1a73e8; color: #fff !important; text-decoration: none; border-radius: 6px; font-size: 15px; font-weight: 500; margin: 16px 0; }}
+        .btn:hover {{ background-color: #1557b0; }}
+        h2 {{ font-size: 20px; margin: 20px 0 10px; color: #222; }}
+        p {{ margin: 10px 0; }}
+    </style>
+</head>
+<body>
+    <div class=""email-wrapper"">
+        <div class=""email-header"">
+            <h1>CCE Knowledge Center</h1>
+        </div>
+        <div class=""email-body"">
+            {body}
+        </div>
+        <div class=""email-footer"">
+            <p>&copy; {System.DateTime.Now.Year} CCE Knowledge Center. All rights reserved.</p>
+        </div>
+    </div>
+</body>
+</html>";
+    }
 }
diff --git a/backend/src/CCE.Infrastructure/Notifications/Messaging/Consumers/ContentNotificationConsumer.cs b/backend/src/CCE.Infrastructure/Notifications/Messaging/Consumers/ContentNotificationConsumer.cs
new file mode 100644
index 00000000..cddcfbd3
--- /dev/null
+++ b/backend/src/CCE.Infrastructure/Notifications/Messaging/Consumers/ContentNotificationConsumer.cs
@@ -0,0 +1,197 @@
+using System.Collections.Generic;
+using System.Globalization;
+using CCE.Application.Common.Messaging.IntegrationEvents;
+using CCE.Application.Content;
+using CCE.Application.Notifications.Messages;
+using CCE.Domain.Notifications;
+using MassTransit;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace CCE.Infrastructure.Notifications.Messaging.Consumers;
+
+public sealed class ContentNotificationConsumer :
+    IConsumer<NewsPublishedIntegrationEvent>,
+    IConsumer<ResourcePublishedIntegrationEvent>,
+    IConsumer<EventScheduledIntegrationEvent>
+{
+    private readonly INewsletterSubscriptionRepository _newsletterRepo;
+    private readonly INewsRepository _newsRepo;
+    private readonly IResourceRepository _resourceRepo;
+    private readonly IEventRepository _eventRepo;
+    private readonly INotificationMessageDispatcher _dispatcher;
+    private readonly ILogger<ContentNotificationConsumer> _logger;
+    private readonly int _fanOutConcurrency;
+    private readonly string _frontendBaseUrl;
+
+    public ContentNotificationConsumer(
+        INewsletterSubscriptionRepository newsletterRepo,
+        INewsRepository newsRepo,
+        IResourceRepository resourceRepo,
+        IEventRepository eventRepo,
+        INotificationMessageDispatcher dispatcher,
+        IOptions<CceInfrastructureOptions> options,
+        ILogger<ContentNotificationConsumer> logger,
+        IConfiguration configuration)
+    {
+        _newsletterRepo = newsletterRepo;
+        _newsRepo = newsRepo;
+        _resourceRepo = resourceRepo;
+        _eventRepo = eventRepo;
+        _dispatcher = dispatcher;
+        _logger = logger;
+        _fanOutConcurrency = options.Value.NewsletterFanOutConcurrency;
+        _frontendBaseUrl = configuration.GetValue<string>("Frontend:BaseUrl") ?? "http://localhost:4201";
+    }
+
+    // ── News ────────────────────────────────────────────────────────────────────
+
+    public async Task Consume(ConsumeContext<NewsPublishedIntegrationEvent> context)
+    {
+        var evt = context.Message;
+        var ct = context.CancellationToken;
+
+        _logger.LogInformation(
+            "ContentNotificationConsumer: News={Id} starting fan-out.", evt.NewsId);
+
+        var newsData = await _newsRepo
+            .GetNotificationDataAsync(evt.NewsId, ct)
+            .ConfigureAwait(false);
+
+        if (newsData is null)
+        {
+            _logger.LogWarning("News {NewsId} not found; skipping fan-out.", evt.NewsId);
+            return;
+        }
+
+        var articleUrl = $"{_frontendBaseUrl}/news/{evt.NewsId:D}";
+        var subscribers = await _newsletterRepo
+            .GetAudienceAsync(evt.AuthorId, ct)
+            .ConfigureAwait(false);
+
+        await Parallel.ForEachAsync(
+            subscribers,
+            new ParallelOptions { MaxDegreeOfParallelism = _fanOutConcurrency, CancellationToken = ct },
+            async (sub, token) =>
+            {
+                var recipientName = !string.IsNullOrEmpty(sub.RecipientName)
+                    ? sub.RecipientName
+                    : sub.Locale == "ar" ? "عزيزي المشترك" : "Dear Subscriber";
+
+                var meta = new Dictionary<string, string>
+                {
+                    ["TitleAr"] = newsData.TitleAr,
+                    ["TitleEn"] = newsData.TitleEn,
+                    ["ContentBodyAr"] = newsData.ContentAr,
+                    ["ContentBodyEn"] = newsData.ContentEn,
+                    ["ArticleUrl"] = articleUrl,
+                    ["RecipientName"] = recipientName,
+                };
+
+                NotificationChannel[] channels = sub.UserId.HasValue
+                    ? [NotificationChannel.InApp, NotificationChannel.Email]
+                    : [NotificationChannel.Email];
+
+                await _dispatcher.DispatchAsync(new NotificationMessage(
+                    TemplateCode: "NEWS_PUBLISHED",
+                    RecipientUserId: sub.UserId,
+                    EventType: NotificationEventType.NewsPublished,
+                    Channels: channels,
+                    MetaData: meta,
+                    Locale: sub.Locale,
+                    Email: sub.UserId.HasValue ? null : sub.Email), token).ConfigureAwait(false);
+            }).ConfigureAwait(false);
+
+        _logger.LogInformation(
+            "ContentNotificationConsumer: News={Id} dispatched {Count} notifications.",
+            evt.NewsId, subscribers.Count);
+    }
+
+    // ── Resource ────────────────────────────────────────────────────────────────
+
+    public Task Consume(ConsumeContext<ResourcePublishedIntegrationEvent> context)
+    {
+        var evt = context.Message;
+        return FanOutAsync("Resource", evt.ResourceId, _resourceRepo.GetTitleAsync,
+            excludeUserId: evt.UploadedById,
+            "RESOURCE_PUBLISHED", NotificationEventType.ResourcePublished,
+            enrichMeta: null, context.CancellationToken);
+    }
+
+    // ── Event ───────────────────────────────────────────────────────────────────
+
+    public Task Consume(ConsumeContext<EventScheduledIntegrationEvent> context)
+    {
+        var evt = context.Message;
+        return FanOutAsync("Event", evt.EventId, _eventRepo.GetTitleAsync,
+            excludeUserId: null,
+            "EVENT_SCHEDULED", NotificationEventType.EventScheduled,
+            enrichMeta: meta => meta["StartsOn"] =
+                evt.StartsOn.ToString("yyyy-MM-dd HH:mm UTC", CultureInfo.InvariantCulture),
+            context.CancellationToken);
+    }
+
+    // ── Generic fan-out (Resource, Event) ───────────────────────────────────────
+
+    private async Task FanOutAsync(
+        string entityKind,
+        Guid entityId,
+        Func<Guid, CancellationToken, Task<ContentTitle?>> getTitleAsync,
+        Guid? excludeUserId,
+        string templateCode,
+        NotificationEventType eventType,
+        Action<Dictionary<string, string>>? enrichMeta,
+        CancellationToken ct)
+    {
+        _logger.LogInformation(
+            "ContentNotificationConsumer: {Kind}={Id} starting fan-out.", entityKind, entityId);
+
+        var title = await getTitleAsync(entityId, ct).ConfigureAwait(false);
+        var meta = BuildTitleMeta(title);
+        enrichMeta?.Invoke(meta);
+
+        var subscribers = await _newsletterRepo
+            .GetAudienceAsync(excludeUserId, ct)
+            .ConfigureAwait(false);
+
+        await Parallel.ForEachAsync(
+            subscribers,
+            new ParallelOptions { MaxDegreeOfParallelism = _fanOutConcurrency, CancellationToken = ct },
+            async (sub, token) =>
+            {
+                var recipientName = !string.IsNullOrEmpty(sub.RecipientName)
+                    ? sub.RecipientName
+                    : sub.Locale == "ar" ? "عزيزي المشترك" : "Dear Subscriber";
+
+                var subscriberMeta = new Dictionary<string, string>(meta)
+                {
+                    ["RecipientName"] = recipientName,
+                };
+
+                NotificationChannel[] channels = sub.UserId.HasValue
+                    ? [NotificationChannel.InApp, NotificationChannel.Email]
+                    : [NotificationChannel.Email];
+
+                await _dispatcher.DispatchAsync(new NotificationMessage(
+                    TemplateCode: templateCode,
+                    RecipientUserId: sub.UserId,
+                    EventType: eventType,
+                    Channels: channels,
+                    MetaData: subscriberMeta,
+                    Locale: sub.Locale,
+                    Email: sub.UserId.HasValue ? null : sub.Email), token).ConfigureAwait(false);
+            }).ConfigureAwait(false);
+
+        _logger.LogInformation(
+            "ContentNotificationConsumer: {Kind}={Id} dispatched {Count} notifications.",
+            entityKind, entityId, subscribers.Count);
+    }
+
+    private static Dictionary<string, string> BuildTitleMeta(ContentTitle? title)
+        => new()
+        {
+            ["TitleAr"] = title?.TitleAr ?? string.Empty,
+            ["TitleEn"] = title?.TitleEn ?? string.Empty,
+        };
+}
diff --git a/backend/src/CCE.Infrastructure/Notifications/Messaging/Consumers/ContentNotificationConsumerDefinition.cs b/backend/src/CCE.Infrastructure/Notifications/Messaging/Consumers/ContentNotificationConsumerDefinition.cs
new file mode 100644
index 00000000..c3c1afe4
--- /dev/null
+++ b/backend/src/CCE.Infrastructure/Notifications/Messaging/Consumers/ContentNotificationConsumerDefinition.cs
@@ -0,0 +1,20 @@
+using MassTransit;
+
+namespace CCE.Infrastructure.Notifications.Messaging.Consumers;
+
+public sealed class ContentNotificationConsumerDefinition
+    : ConsumerDefinition<ContentNotificationConsumer>
+{
+    public ContentNotificationConsumerDefinition()
+    {
+        ConcurrentMessageLimit = 5;
+    }
+
+    protected override void ConfigureConsumer(
+        IReceiveEndpointConfigurator endpointConfigurator,
+        IConsumerConfigurator<ContentNotificationConsumer> consumerConfigurator,
+        IRegistrationContext context)
+    {
+        endpointConfigurator.UseMessageRetry(r => r.Intervals(500, 2000, 5000));
+    }
+}
diff --git a/backend/src/CCE.Infrastructure/Notifications/Messaging/MassTransitIntegrationEventPublisher.cs b/backend/src/CCE.Infrastructure/Notifications/Messaging/MassTransitIntegrationEventPublisher.cs
index 05b44e69..48471b0f 100644
--- a/backend/src/CCE.Infrastructure/Notifications/Messaging/MassTransitIntegrationEventPublisher.cs
+++ b/backend/src/CCE.Infrastructure/Notifications/Messaging/MassTransitIntegrationEventPublisher.cs
@@ -1,5 +1,6 @@
 using CCE.Application.Common.Messaging;
 using MassTransit;
+using Microsoft.Extensions.Logging;
 
 namespace CCE.Infrastructure.Notifications.Messaging;
 
@@ -16,11 +17,18 @@ namespace CCE.Infrastructure.Notifications.Messaging;
 public sealed class MassTransitIntegrationEventPublisher : IIntegrationEventPublisher
 {
     private readonly IPublishEndpoint _publishEndpoint;
+    private readonly ILogger<MassTransitIntegrationEventPublisher> _logger;
 
-    public MassTransitIntegrationEventPublisher(IPublishEndpoint publishEndpoint)
-        => _publishEndpoint = publishEndpoint;
+    public MassTransitIntegrationEventPublisher(IPublishEndpoint publishEndpoint, ILogger<MassTransitIntegrationEventPublisher> logger)
+    {
+        _publishEndpoint = publishEndpoint;
+        _logger = logger;
+    }
 
     public Task PublishAsync<T>(T @event, CancellationToken cancellationToken)
         where T : class
-        => _publishEndpoint.Publish(@event, cancellationToken);
+    {
+        _logger.LogInformation("MassTransitIntegrationEventPublisher.PublishAsync: type={Type}, endpointType={EndpointType}", typeof(T).Name, _publishEndpoint.GetType().FullName);
+        return _publishEndpoint.Publish(@event, cancellationToken);
+    }
 }
diff --git a/backend/src/CCE.Infrastructure/Notifications/Messaging/MessagingServiceExtensions.cs b/backend/src/CCE.Infrastructure/Notifications/Messaging/MessagingServiceExtensions.cs
index b1bac726..8b7f450e 100644
--- a/backend/src/CCE.Infrastructure/Notifications/Messaging/MessagingServiceExtensions.cs
+++ b/backend/src/CCE.Infrastructure/Notifications/Messaging/MessagingServiceExtensions.cs
@@ -61,6 +61,15 @@ public static IServiceCollection AddCceMessaging(
             registerConsumers = true;
         }
 
+        // An InMemory bus is per-process: messages published (and relayed out of the EF bus outbox)
+        // only reach consumers hosted in the SAME process. So whenever the effective transport is
+        // InMemory — whether configured directly or via the fallback above — the publishing process
+        // MUST also host the consumers, otherwise the outbox delivery service stamps sent_time and
+        // the message is dropped on a bus with no receive endpoints. (RabbitMQ is a shared broker, so
+        // a separate CCE.Worker can consume there; InMemory has no such option.)
+        if (!useRabbitMq)
+            registerConsumers = true;
+
         services.AddMassTransit(x =>
         {
             // EF Core transactional outbox. Publishing through IPublishEndpoint while a CceDbContext is
@@ -87,6 +96,7 @@ public static IServiceCollection AddCceMessaging(
                 x.AddConsumer<VoteConsumer, VoteConsumerDefinition>();
                 x.AddConsumer<RankingConsumer, RankingConsumerDefinition>();
                 x.AddConsumer<NotificationConsumer, NotificationConsumerDefinition>();
+                x.AddConsumer<ContentNotificationConsumer, ContentNotificationConsumerDefinition>();
                 x.AddConsumer<SignalRConsumer, SignalRConsumerDefinition>();
             }
 
diff --git a/backend/src/CCE.Infrastructure/Persistence/CceDbContext.cs b/backend/src/CCE.Infrastructure/Persistence/CceDbContext.cs
index f8870e85..52d2dc7d 100644
--- a/backend/src/CCE.Infrastructure/Persistence/CceDbContext.cs
+++ b/backend/src/CCE.Infrastructure/Persistence/CceDbContext.cs
@@ -204,7 +204,7 @@ public override async Task<int> SaveChangesAsync(CancellationToken cancellationT
         {
             return await base.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
         }
-        catch (DbUpdateConcurrencyException ex)
+         catch (DbUpdateConcurrencyException ex)
         {
             throw new ConcurrencyException("Concurrent update conflict.", ex);
         }
diff --git a/backend/src/CCE.Infrastructure/Persistence/Interceptors/DomainEventDispatcher.cs b/backend/src/CCE.Infrastructure/Persistence/Interceptors/DomainEventDispatcher.cs
index 5f56efa7..7b56f60e 100644
--- a/backend/src/CCE.Infrastructure/Persistence/Interceptors/DomainEventDispatcher.cs
+++ b/backend/src/CCE.Infrastructure/Persistence/Interceptors/DomainEventDispatcher.cs
@@ -2,6 +2,7 @@
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.Extensions.Logging;
 
 namespace CCE.Infrastructure.Persistence.Interceptors;
 
@@ -23,10 +24,12 @@ namespace CCE.Infrastructure.Persistence.Interceptors;
 public sealed class DomainEventDispatcher : SaveChangesInterceptor
 {
     private readonly IPublisher _publisher;
+    private readonly ILogger<DomainEventDispatcher> _logger;
 
-    public DomainEventDispatcher(IPublisher publisher)
+    public DomainEventDispatcher(IPublisher publisher, ILogger<DomainEventDispatcher> logger)
     {
         _publisher = publisher;
+        _logger = logger;
     }
 
     public override async ValueTask<InterceptionResult<int>> SavingChangesAsync(
@@ -43,6 +46,7 @@ public override async ValueTask<InterceptionResult<int>> SavingChangesAsync(
             .ToList();
 
         var allEvents = entriesWithEvents.SelectMany(e => e.DomainEvents).ToList();
+        _logger.LogInformation("DomainEventDispatcher: Found {Count} entities with events, {EventCount} total events", entriesWithEvents.Count, allEvents.Count);
 
         foreach (var entity in entriesWithEvents)
         {
@@ -51,6 +55,7 @@ public override async ValueTask<InterceptionResult<int>> SavingChangesAsync(
 
         foreach (var domainEvent in allEvents)
         {
+            _logger.LogInformation("DomainEventDispatcher: Publishing event {EventType}", domainEvent.GetType().Name);
             await _publisher.Publish(domainEvent, cancellationToken).ConfigureAwait(false);
         }
 
diff --git a/backend/src/CCE.Infrastructure/Persistence/Migrations/20260613120001_AddNewsletterSubscriptionAuditColumns.Designer.cs b/backend/src/CCE.Infrastructure/Persistence/Migrations/20260613120001_AddNewsletterSubscriptionAuditColumns.Designer.cs
new file mode 100644
index 00000000..0637cb8c
--- /dev/null
+++ b/backend/src/CCE.Infrastructure/Persistence/Migrations/20260613120001_AddNewsletterSubscriptionAuditColumns.Designer.cs
@@ -0,0 +1,5016 @@
+// <auto-generated />
+using System;
+using CCE.Infrastructure.Persistence;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace CCE.Infrastructure.Persistence.Migrations
+{
+    [DbContext(typeof(CceDbContext))]
+    [Migration("20260613120001_AddNewsletterSubscriptionAuditColumns")]
+    partial class AddNewsletterSubscriptionAuditColumns
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "10.0.1")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("CCE.Domain.Audit.AuditEvent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Action")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)")
+                        .HasColumnName("action");
+
+                    b.Property<string>("Actor")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("actor");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("correlation_id");
+
+                    b.Property<string>("Diff")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("diff");
+
+                    b.Property<DateTimeOffset>("OccurredOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("occurred_on");
+
+                    b.Property<string>("Resource")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("resource");
+
+                    b.HasKey("Id")
+                        .HasName("pk_audit_events");
+
+                    b.HasIndex("CorrelationId")
+                        .HasDatabaseName("ix_audit_events_correlation_id");
+
+                    b.HasIndex("Actor", "OccurredOn")
+                        .HasDatabaseName("ix_audit_events_actor_occurred_on");
+
+                    b.ToTable("audit_events", null, t =>
+                        {
+                            t.HasTrigger("trg_audit_events_no_update_delete");
+                        });
+
+                    b.HasAnnotation("SqlServer:UseSqlOutputClause", false);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.Community", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<string>("DescriptionAr")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("description_ar");
+
+                    b.Property<string>("DescriptionEn")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("description_en");
+
+                    b.Property<int>("FollowerCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int")
+                        .HasDefaultValue(0)
+                        .HasColumnName("follower_count");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_active");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<int>("MemberCount")
+                        .HasColumnType("int")
+                        .HasColumnName("member_count");
+
+                    b.Property<string>("NameAr")
+                        .IsRequired()
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)")
+                        .HasColumnName("name_ar");
+
+                    b.Property<string>("NameEn")
+                        .IsRequired()
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)")
+                        .HasColumnName("name_en");
+
+                    b.Property<int>("PostCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int")
+                        .HasDefaultValue(0)
+                        .HasColumnName("post_count");
+
+                    b.Property<string>("PresentationJson")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("presentation_json");
+
+                    b.Property<string>("Slug")
+                        .IsRequired()
+                        .HasMaxLength(160)
+                        .HasColumnType("nvarchar(160)")
+                        .HasColumnName("slug");
+
+                    b.Property<int>("Visibility")
+                        .HasColumnType("int")
+                        .HasColumnName("visibility");
+
+                    b.HasKey("Id")
+                        .HasName("pk_communities");
+
+                    b.HasIndex("Slug")
+                        .IsUnique()
+                        .HasDatabaseName("ux_community_slug_active")
+                        .HasFilter("[is_deleted] = 0");
+
+                    b.ToTable("communities", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.CommunityFollow", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CommunityId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("community_id");
+
+                    b.Property<DateTimeOffset>("FollowedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("followed_on");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_community_follows");
+
+                    b.HasIndex("CommunityId", "UserId")
+                        .IsUnique()
+                        .HasDatabaseName("ux_community_follow_community_user");
+
+                    b.ToTable("community_follows", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.CommunityJoinRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CommunityId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("community_id");
+
+                    b.Property<Guid?>("DecidedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("decided_by_id");
+
+                    b.Property<DateTimeOffset?>("DecidedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("decided_on");
+
+                    b.Property<DateTimeOffset>("RequestedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("requested_on");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int")
+                        .HasColumnName("status");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_community_join_requests");
+
+                    b.HasIndex("CommunityId", "Status")
+                        .HasDatabaseName("ix_community_join_request_community_status");
+
+                    b.HasIndex("CommunityId", "UserId")
+                        .IsUnique()
+                        .HasDatabaseName("ux_community_join_request_pending")
+                        .HasFilter("[status] = 0");
+
+                    b.ToTable("community_join_requests", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.CommunityMembership", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CommunityId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("community_id");
+
+                    b.Property<DateTimeOffset>("JoinedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("joined_on");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("int")
+                        .HasColumnName("role");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_community_memberships");
+
+                    b.HasIndex("CommunityId", "UserId")
+                        .IsUnique()
+                        .HasDatabaseName("ux_community_membership_community_user");
+
+                    b.ToTable("community_memberships", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.Mention", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid>("MentionedByUserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("mentioned_by_user_id");
+
+                    b.Property<Guid>("MentionedUserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("mentioned_user_id");
+
+                    b.Property<Guid>("SourceId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("source_id");
+
+                    b.Property<int>("SourceType")
+                        .HasColumnType("int")
+                        .HasColumnName("source_type");
+
+                    b.HasKey("Id")
+                        .HasName("pk_mentions");
+
+                    b.HasIndex("MentionedUserId", "CreatedOn")
+                        .HasDatabaseName("ix_mention_user_created");
+
+                    b.HasIndex("SourceType", "SourceId", "MentionedUserId")
+                        .IsUnique()
+                        .HasDatabaseName("ux_mention_source_user");
+
+                    b.ToTable("mentions", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.Poll", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<bool>("AllowMultiple")
+                        .HasColumnType("bit")
+                        .HasColumnName("allow_multiple");
+
+                    b.Property<DateTimeOffset>("Deadline")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deadline");
+
+                    b.Property<bool>("IsAnonymous")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_anonymous");
+
+                    b.Property<Guid>("PostId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("post_id");
+
+                    b.Property<bool>("ShowResultsBeforeClose")
+                        .HasColumnType("bit")
+                        .HasColumnName("show_results_before_close");
+
+                    b.HasKey("Id")
+                        .HasName("pk_polls");
+
+                    b.HasIndex("PostId")
+                        .IsUnique()
+                        .HasDatabaseName("ux_poll_post");
+
+                    b.ToTable("polls", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.PollOption", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)")
+                        .HasColumnName("label");
+
+                    b.Property<Guid>("PollId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("poll_id");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("int")
+                        .HasColumnName("sort_order");
+
+                    b.Property<int>("VoteCount")
+                        .HasColumnType("int")
+                        .HasColumnName("vote_count");
+
+                    b.HasKey("Id")
+                        .HasName("pk_poll_options");
+
+                    b.HasIndex("PollId", "SortOrder")
+                        .HasDatabaseName("ix_poll_option_poll_sort");
+
+                    b.ToTable("poll_options", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.PollVote", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("PollId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("poll_id");
+
+                    b.Property<Guid>("PollOptionId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("poll_option_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.Property<DateTimeOffset>("VotedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("voted_on");
+
+                    b.HasKey("Id")
+                        .HasName("pk_poll_votes");
+
+                    b.HasIndex("PollId", "UserId")
+                        .HasDatabaseName("ix_poll_vote_poll_user");
+
+                    b.HasIndex("PollOptionId", "UserId")
+                        .IsUnique()
+                        .HasDatabaseName("ux_poll_vote_option_user");
+
+                    b.ToTable("poll_votes", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.Post", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("AnsweredReplyId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("answered_reply_id");
+
+                    b.Property<Guid>("AuthorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("author_id");
+
+                    b.Property<int>("CommentsCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int")
+                        .HasDefaultValue(0)
+                        .HasColumnName("comments_count");
+
+                    b.Property<Guid>("CommunityId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("community_id");
+
+                    b.Property<string>("Content")
+                        .HasMaxLength(8000)
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("content");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<int>("DownvoteCount")
+                        .HasColumnType("int")
+                        .HasColumnName("downvote_count");
+
+                    b.Property<bool>("IsAnswerable")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_answerable");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<string>("Locale")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("nvarchar(2)")
+                        .HasColumnName("locale");
+
+                    b.Property<DateTimeOffset?>("PublishedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("published_on");
+
+                    b.Property<double>("Score")
+                        .HasColumnType("float")
+                        .HasColumnName("score");
+
+                    b.Property<int>("ShareCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int")
+                        .HasDefaultValue(0)
+                        .HasColumnName("share_count");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int")
+                        .HasColumnName("status");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)")
+                        .HasColumnName("title");
+
+                    b.Property<Guid>("TopicId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("topic_id");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("int")
+                        .HasColumnName("type");
+
+                    b.Property<int>("UpvoteCount")
+                        .HasColumnType("int")
+                        .HasColumnName("upvote_count");
+
+                    b.Property<int>("ViewCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int")
+                        .HasDefaultValue(0)
+                        .HasColumnName("view_count");
+
+                    b.HasKey("Id")
+                        .HasName("pk_posts");
+
+                    b.HasIndex("Score")
+                        .IsDescending()
+                        .HasDatabaseName("ix_post_score");
+
+                    b.HasIndex("TopicId")
+                        .HasDatabaseName("ix_post_topic_id");
+
+                    b.HasIndex("AuthorId", "CreatedOn")
+                        .HasDatabaseName("ix_post_author_created");
+
+                    b.HasIndex("AuthorId", "Status")
+                        .HasDatabaseName("ix_post_author_status");
+
+                    b.HasIndex("CommunityId", "Score")
+                        .IsDescending(false, true)
+                        .HasDatabaseName("ix_post_community_score");
+
+                    b.ToTable("posts", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.PostAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("AssetFileId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("asset_file_id");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("int")
+                        .HasColumnName("kind");
+
+                    b.Property<string>("MetadataJson")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("metadata_json");
+
+                    b.Property<Guid>("PostId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("post_id");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("int")
+                        .HasColumnName("sort_order");
+
+                    b.HasKey("Id")
+                        .HasName("pk_post_attachments");
+
+                    b.HasIndex("AssetFileId")
+                        .HasDatabaseName("ix_post_attachments_asset_file_id");
+
+                    b.HasIndex("PostId", "SortOrder")
+                        .HasDatabaseName("ix_post_attachment_post_sort");
+
+                    b.ToTable("post_attachments", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.PostFollow", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset>("FollowedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("followed_on");
+
+                    b.Property<Guid>("PostId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("post_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_post_follows");
+
+                    b.HasIndex("PostId", "UserId")
+                        .IsUnique()
+                        .HasDatabaseName("ux_post_follow_post_user");
+
+                    b.ToTable("post_follows", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.PostReply", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("AuthorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("author_id");
+
+                    b.Property<int>("ChildCount")
+                        .HasColumnType("int")
+                        .HasColumnName("child_count");
+
+                    b.Property<string>("Content")
+                        .IsRequired()
+                        .HasMaxLength(8000)
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("content");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<int>("Depth")
+                        .HasColumnType("int")
+                        .HasColumnName("depth");
+
+                    b.Property<int>("DownvoteCount")
+                        .HasColumnType("int")
+                        .HasColumnName("downvote_count");
+
+                    b.Property<bool>("IsByExpert")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_by_expert");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<string>("Locale")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("nvarchar(2)")
+                        .HasColumnName("locale");
+
+                    b.Property<Guid?>("ParentReplyId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("parent_reply_id");
+
+                    b.Property<Guid>("PostId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("post_id");
+
+                    b.Property<double>("Score")
+                        .HasColumnType("float")
+                        .HasColumnName("score");
+
+                    b.Property<string>("ThreadPath")
+                        .IsRequired()
+                        .HasMaxLength(900)
+                        .HasColumnType("nvarchar(900)")
+                        .HasColumnName("thread_path");
+
+                    b.Property<int>("UpvoteCount")
+                        .HasColumnType("int")
+                        .HasColumnName("upvote_count");
+
+                    b.HasKey("Id")
+                        .HasName("pk_post_replies");
+
+                    b.HasIndex("ParentReplyId")
+                        .HasDatabaseName("ix_post_reply_parent_id");
+
+                    b.HasIndex("ThreadPath")
+                        .HasDatabaseName("ix_post_reply_thread_path");
+
+                    b.HasIndex("PostId", "Score")
+                        .HasDatabaseName("ix_post_reply_post_score");
+
+                    b.ToTable("post_replies", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.PostVote", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("PostId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("post_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Value")
+                        .HasColumnType("int")
+                        .HasColumnName("value");
+
+                    b.Property<DateTimeOffset>("VotedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("voted_on");
+
+                    b.HasKey("Id")
+                        .HasName("pk_post_votes");
+
+                    b.HasIndex("PostId", "UserId")
+                        .IsUnique()
+                        .HasDatabaseName("ux_post_vote_post_user");
+
+                    b.ToTable("post_votes", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.ReplyVote", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("ReplyId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("reply_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Value")
+                        .HasColumnType("int")
+                        .HasColumnName("value");
+
+                    b.Property<DateTimeOffset>("VotedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("voted_on");
+
+                    b.HasKey("Id")
+                        .HasName("pk_reply_votes");
+
+                    b.HasIndex("ReplyId", "UserId")
+                        .IsUnique()
+                        .HasDatabaseName("ux_reply_vote_reply_user");
+
+                    b.ToTable("reply_votes", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.Topic", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<string>("DescriptionAr")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("description_ar");
+
+                    b.Property<string>("DescriptionEn")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("description_en");
+
+                    b.Property<string>("IconUrl")
+                        .HasMaxLength(2048)
+                        .HasColumnType("nvarchar(2048)")
+                        .HasColumnName("icon_url");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_active");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<string>("NameAr")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("name_ar");
+
+                    b.Property<string>("NameEn")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("name_en");
+
+                    b.Property<int>("OrderIndex")
+                        .HasColumnType("int")
+                        .HasColumnName("order_index");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("parent_id");
+
+                    b.Property<string>("Slug")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)")
+                        .HasColumnName("slug");
+
+                    b.HasKey("Id")
+                        .HasName("pk_topics");
+
+                    b.HasIndex("Slug")
+                        .IsUnique()
+                        .HasDatabaseName("ux_topic_slug_active")
+                        .HasFilter("[is_deleted] = 0");
+
+                    b.ToTable("topics", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.TopicFollow", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset>("FollowedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("followed_on");
+
+                    b.Property<Guid>("TopicId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("topic_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_topic_follows");
+
+                    b.HasIndex("TopicId", "UserId")
+                        .IsUnique()
+                        .HasDatabaseName("ux_topic_follow_topic_user");
+
+                    b.ToTable("topic_follows", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.UserFollow", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("FollowedId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("followed_id");
+
+                    b.Property<DateTimeOffset>("FollowedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("followed_on");
+
+                    b.Property<Guid>("FollowerId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("follower_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_user_follows");
+
+                    b.HasIndex("FollowerId", "FollowedId")
+                        .IsUnique()
+                        .HasDatabaseName("ux_user_follow_follower_followed");
+
+                    b.ToTable("user_follows", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Content.AssetFile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("MimeType")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)")
+                        .HasColumnName("mime_type");
+
+                    b.Property<string>("OriginalFileName")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("original_file_name");
+
+                    b.Property<DateTimeOffset?>("ScannedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("scanned_on");
+
+                    b.Property<long>("SizeBytes")
+                        .HasColumnType("bigint")
+                        .HasColumnName("size_bytes");
+
+                    b.Property<Guid>("UploadedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("uploaded_by_id");
+
+                    b.Property<DateTimeOffset>("UploadedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("uploaded_on");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasMaxLength(2048)
+                        .HasColumnType("nvarchar(2048)")
+                        .HasColumnName("url");
+
+                    b.Property<int>("VirusScanStatus")
+                        .HasColumnType("int")
+                        .HasColumnName("virus_scan_status");
+
+                    b.HasKey("Id")
+                        .HasName("pk_asset_files");
+
+                    b.HasIndex("VirusScanStatus")
+                        .HasDatabaseName("ix_asset_file_scan_status");
+
+                    b.ToTable("asset_files", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Content.Event", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<string>("DescriptionAr")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("description_ar");
+
+                    b.Property<string>("DescriptionEn")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("description_en");
+
+                    b.Property<DateTimeOffset>("EndsOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("ends_on");
+
+                    b.Property<string>("FeaturedImageUrl")
+                        .HasMaxLength(2048)
+                        .HasColumnType("nvarchar(2048)")
+                        .HasColumnName("featured_image_url");
+
+                    b.Property<string>("ICalUid")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("i_cal_uid");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<string>("LocationAr")
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("location_ar");
+
+                    b.Property<string>("LocationEn")
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("location_en");
+
+                    b.Property<string>("OnlineMeetingUrl")
+                        .HasMaxLength(2048)
+                        .HasColumnType("nvarchar(2048)")
+                        .HasColumnName("online_meeting_url");
+
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("rowversion")
+                        .HasColumnName("row_version");
+
+                    b.Property<DateTimeOffset>("StartsOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("starts_on");
+
+                    b.Property<string>("TitleAr")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("title_ar");
+
+                    b.Property<string>("TitleEn")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("title_en");
+
+                    b.Property<Guid>("TopicId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("topic_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_events");
+
+                    b.HasIndex("ICalUid")
+                        .IsUnique()
+                        .HasDatabaseName("ux_event_ical_uid");
+
+                    b.HasIndex("StartsOn")
+                        .HasDatabaseName("ix_event_starts_on");
+
+                    b.HasIndex("TopicId")
+                        .HasDatabaseName("ix_event_topic_id");
+
+                    b.ToTable("events", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Content.HomepageSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("ContentAr")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("content_ar");
+
+                    b.Property<string>("ContentEn")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("content_en");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_active");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<int>("OrderIndex")
+                        .HasColumnType("int")
+                        .HasColumnName("order_index");
+
+                    b.Property<int>("SectionType")
+                        .HasColumnType("int")
+                        .HasColumnName("section_type");
+
+                    b.HasKey("Id")
+                        .HasName("pk_homepage_sections");
+
+                    b.HasIndex("IsActive", "OrderIndex")
+                        .HasDatabaseName("ix_homepage_section_active_order");
+
+                    b.ToTable("homepage_sections", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Content.News", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("AuthorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("author_id");
+
+                    b.Property<string>("ContentAr")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("content_ar");
+
+                    b.Property<string>("ContentEn")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("content_en");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<string>("FeaturedImageUrl")
+                        .HasMaxLength(2048)
+                        .HasColumnType("nvarchar(2048)")
+                        .HasColumnName("featured_image_url");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<bool>("IsFeatured")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_featured");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<DateTimeOffset?>("PublishedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("published_on");
+
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("rowversion")
+                        .HasColumnName("row_version");
+
+                    b.Property<string>("TitleAr")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("title_ar");
+
+                    b.Property<string>("TitleEn")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("title_en");
+
+                    b.Property<Guid>("TopicId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("topic_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_news");
+
+                    b.HasIndex("PublishedOn")
+                        .HasDatabaseName("ix_news_published_on");
+
+                    b.HasIndex("TopicId")
+                        .HasDatabaseName("ix_news_topic_id");
+
+                    b.ToTable("news", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Content.NewsletterSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("ConfirmationToken")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)")
+                        .HasColumnName("confirmation_token");
+
+                    b.Property<DateTimeOffset?>("ConfirmedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("confirmed_on");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(320)
+                        .HasColumnType("nvarchar(320)")
+                        .HasColumnName("email");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_confirmed");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<string>("LocalePreference")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("nvarchar(2)")
+                        .HasColumnName("locale_preference");
+
+                    b.Property<DateTimeOffset?>("UnsubscribedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("unsubscribed_on");
+
+                    b.HasKey("Id")
+                        .HasName("pk_newsletter_subscriptions");
+
+                    b.HasIndex("ConfirmationToken")
+                        .HasDatabaseName("ix_newsletter_token");
+
+                    b.HasIndex("Email")
+                        .IsUnique()
+                        .HasDatabaseName("ux_newsletter_email");
+
+                    b.ToTable("newsletter_subscriptions", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Content.Page", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("ContentAr")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("content_ar");
+
+                    b.Property<string>("ContentEn")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("content_en");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<int>("PageType")
+                        .HasColumnType("int")
+                        .HasColumnName("page_type");
+
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("rowversion")
+                        .HasColumnName("row_version");
+
+                    b.Property<string>("Slug")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("slug");
+
+                    b.Property<string>("TitleAr")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("title_ar");
+
+                    b.Property<string>("TitleEn")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("title_en");
+
+                    b.HasKey("Id")
+                        .HasName("pk_pages");
+
+                    b.HasIndex("PageType", "Slug")
+                        .IsUnique()
+                        .HasDatabaseName("ux_page_type_slug_active")
+                        .HasFilter("[is_deleted] = 0");
+
+                    b.ToTable("pages", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Content.Resource", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("AssetFileId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("asset_file_id");
+
+                    b.Property<Guid>("CategoryId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("category_id");
+
+                    b.Property<Guid?>("CountryId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("country_id");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<string>("DescriptionAr")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("description_ar");
+
+                    b.Property<string>("DescriptionEn")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("description_en");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<DateTimeOffset?>("PublishedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("published_on");
+
+                    b.Property<int>("ResourceType")
+                        .HasColumnType("int")
+                        .HasColumnName("resource_type");
+
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("rowversion")
+                        .HasColumnName("row_version");
+
+                    b.Property<string>("TitleAr")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)")
+                        .HasColumnName("title_ar");
+
+                    b.Property<string>("TitleEn")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)")
+                        .HasColumnName("title_en");
+
+                    b.Property<Guid>("UploadedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("uploaded_by_id");
+
+                    b.Property<long>("ViewCount")
+                        .HasColumnType("bigint")
+                        .HasColumnName("view_count");
+
+                    b.HasKey("Id")
+                        .HasName("pk_resources");
+
+                    b.HasIndex("AssetFileId")
+                        .HasDatabaseName("ix_resource_asset_file_id");
+
+                    b.HasIndex("CategoryId", "PublishedOn")
+                        .HasDatabaseName("ix_resource_category_published");
+
+                    b.ToTable("resources", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Content.ResourceCategory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_active");
+
+                    b.Property<string>("NameAr")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("name_ar");
+
+                    b.Property<string>("NameEn")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("name_en");
+
+                    b.Property<int>("OrderIndex")
+                        .HasColumnType("int")
+                        .HasColumnName("order_index");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("parent_id");
+
+                    b.Property<string>("Slug")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)")
+                        .HasColumnName("slug");
+
+                    b.HasKey("Id")
+                        .HasName("pk_resource_categories");
+
+                    b.HasIndex("ParentId")
+                        .HasDatabaseName("ix_resource_category_parent_id");
+
+                    b.HasIndex("Slug")
+                        .IsUnique()
+                        .HasDatabaseName("ux_resource_category_slug");
+
+                    b.ToTable("resource_categories", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Content.ResourceCountry", b =>
+                {
+                    b.Property<Guid>("ResourceId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("resource_id");
+
+                    b.Property<Guid>("CountryId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("country_id");
+
+                    b.HasKey("ResourceId", "CountryId")
+                        .HasName("pk_resource_country");
+
+                    b.HasIndex("CountryId")
+                        .HasDatabaseName("ix_resource_country_country_id");
+
+                    b.ToTable("resource_country", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Content.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Color")
+                        .HasMaxLength(7)
+                        .HasColumnType("nvarchar(7)")
+                        .HasColumnName("color");
+
+                    b.Property<string>("NameAr")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)")
+                        .HasColumnName("name_ar");
+
+                    b.Property<string>("NameEn")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)")
+                        .HasColumnName("name_en");
+
+                    b.HasKey("Id")
+                        .HasName("pk_tags");
+
+                    b.HasIndex("NameEn")
+                        .IsUnique()
+                        .HasDatabaseName("ux_tag_name_en");
+
+                    b.ToTable("tags", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Country.Country", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<string>("FlagUrl")
+                        .IsRequired()
+                        .HasMaxLength(2048)
+                        .HasColumnType("nvarchar(2048)")
+                        .HasColumnName("flag_url");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_active");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<string>("IsoAlpha2")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("nvarchar(2)")
+                        .HasColumnName("iso_alpha2");
+
+                    b.Property<string>("IsoAlpha3")
+                        .IsRequired()
+                        .HasMaxLength(3)
+                        .HasColumnType("nvarchar(3)")
+                        .HasColumnName("iso_alpha3");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<Guid?>("LatestKapsarcSnapshotId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("latest_kapsarc_snapshot_id");
+
+                    b.Property<string>("NameAr")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("name_ar");
+
+                    b.Property<string>("NameEn")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("name_en");
+
+                    b.Property<string>("RegionAr")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)")
+                        .HasColumnName("region_ar");
+
+                    b.Property<string>("RegionEn")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)")
+                        .HasColumnName("region_en");
+
+                    b.HasKey("Id")
+                        .HasName("pk_countries");
+
+                    b.HasIndex("IsoAlpha2")
+                        .HasDatabaseName("ix_country_iso_alpha2");
+
+                    b.HasIndex("IsoAlpha3")
+                        .IsUnique()
+                        .HasDatabaseName("ux_country_iso_alpha3_active")
+                        .HasFilter("[is_deleted] = 0");
+
+                    b.ToTable("countries", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Country.CountryContentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("AdminNotesAr")
+                        .HasMaxLength(2000)
+                        .HasColumnType("nvarchar(2000)")
+                        .HasColumnName("admin_notes_ar");
+
+                    b.Property<string>("AdminNotesEn")
+                        .HasMaxLength(2000)
+                        .HasColumnType("nvarchar(2000)")
+                        .HasColumnName("admin_notes_en");
+
+                    b.Property<Guid>("CountryId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("country_id");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<Guid?>("ProcessedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("processed_by_id");
+
+                    b.Property<DateTimeOffset?>("ProcessedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("processed_on");
+
+                    b.Property<Guid?>("ProposedAssetFileId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("proposed_asset_file_id");
+
+                    b.Property<Guid?>("ProposedCategoryId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("proposed_category_id");
+
+                    b.Property<string>("ProposedDescriptionAr")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("proposed_description_ar");
+
+                    b.Property<string>("ProposedDescriptionEn")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("proposed_description_en");
+
+                    b.Property<DateTimeOffset?>("ProposedEndsOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("proposed_ends_on");
+
+                    b.Property<string>("ProposedLocationAr")
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("proposed_location_ar");
+
+                    b.Property<string>("ProposedLocationEn")
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("proposed_location_en");
+
+                    b.Property<string>("ProposedOnlineMeetingUrl")
+                        .HasMaxLength(2048)
+                        .HasColumnType("nvarchar(2048)")
+                        .HasColumnName("proposed_online_meeting_url");
+
+                    b.Property<int?>("ProposedResourceType")
+                        .HasColumnType("int")
+                        .HasColumnName("proposed_resource_type");
+
+                    b.Property<DateTimeOffset?>("ProposedStartsOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("proposed_starts_on");
+
+                    b.Property<string>("ProposedTitleAr")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("proposed_title_ar");
+
+                    b.Property<string>("ProposedTitleEn")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("proposed_title_en");
+
+                    b.Property<Guid?>("ProposedTopicId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("proposed_topic_id");
+
+                    b.Property<Guid>("RequestedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("requested_by_id");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int")
+                        .HasColumnName("status");
+
+                    b.Property<DateTimeOffset>("SubmittedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("submitted_on");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("int")
+                        .HasColumnName("type");
+
+                    b.HasKey("Id")
+                        .HasName("pk_country_content_requests");
+
+                    b.HasIndex("CountryId", "Status", "Type")
+                        .HasDatabaseName("ix_country_content_request_country_status_type");
+
+                    b.ToTable("country_content_requests", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Country.CountryKapsarcSnapshot", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Classification")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)")
+                        .HasColumnName("classification");
+
+                    b.Property<Guid>("CountryId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("country_id");
+
+                    b.Property<decimal>("PerformanceScore")
+                        .HasPrecision(5, 2)
+                        .HasColumnType("decimal(5,2)")
+                        .HasColumnName("performance_score");
+
+                    b.Property<DateTimeOffset>("SnapshotTakenOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("snapshot_taken_on");
+
+                    b.Property<string>("SourceVersion")
+                        .HasMaxLength(32)
+                        .HasColumnType("nvarchar(32)")
+                        .HasColumnName("source_version");
+
+                    b.Property<decimal>("TotalIndex")
+                        .HasPrecision(5, 2)
+                        .HasColumnType("decimal(5,2)")
+                        .HasColumnName("total_index");
+
+                    b.HasKey("Id")
+                        .HasName("pk_country_kapsarc_snapshots");
+
+                    b.HasIndex("CountryId", "SnapshotTakenOn")
+                        .HasDatabaseName("ix_kapsarc_snapshot_country_taken");
+
+                    b.ToTable("country_kapsarc_snapshots", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Country.CountryProfile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<decimal?>("AreaSqKm")
+                        .HasColumnType("decimal(18,2)")
+                        .HasColumnName("area_sq_km");
+
+                    b.Property<string>("ContactInfoAr")
+                        .HasMaxLength(2000)
+                        .HasColumnType("nvarchar(2000)")
+                        .HasColumnName("contact_info_ar");
+
+                    b.Property<string>("ContactInfoEn")
+                        .HasMaxLength(2000)
+                        .HasColumnType("nvarchar(2000)")
+                        .HasColumnName("contact_info_en");
+
+                    b.Property<Guid>("CountryId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("country_id");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<string>("DescriptionAr")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("description_ar");
+
+                    b.Property<string>("DescriptionEn")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("description_en");
+
+                    b.Property<decimal?>("GdpPerCapita")
+                        .HasColumnType("decimal(18,2)")
+                        .HasColumnName("gdp_per_capita");
+
+                    b.Property<string>("KeyInitiativesAr")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("key_initiatives_ar");
+
+                    b.Property<string>("KeyInitiativesEn")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("key_initiatives_en");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<Guid?>("NationallyDeterminedContributionAssetId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("nationally_determined_contribution_asset_id");
+
+                    b.Property<int?>("Population")
+                        .HasColumnType("int")
+                        .HasColumnName("population");
+
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("rowversion")
+                        .HasColumnName("row_version");
+
+                    b.HasKey("Id")
+                        .HasName("pk_country_profiles");
+
+                    b.HasIndex("CountryId")
+                        .IsUnique()
+                        .HasDatabaseName("ux_country_profile_country_id");
+
+                    b.ToTable("country_profiles", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Evaluation.ServiceEvaluation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<int>("ContentSuitability")
+                        .HasColumnType("int")
+                        .HasColumnName("content_suitability");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<int>("EaseOfUse")
+                        .HasColumnType("int")
+                        .HasColumnName("ease_of_use");
+
+                    b.Property<string>("Feedback")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)")
+                        .HasColumnName("feedback");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<int>("OverallSatisfaction")
+                        .HasColumnType("int")
+                        .HasColumnName("overall_satisfaction");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_service_evaluations");
+
+                    b.HasIndex("CreatedOn")
+                        .HasDatabaseName("ix_service_evaluation_created_on");
+
+                    b.ToTable("service_evaluations", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Identity.ExpertProfile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("AcademicTitleAr")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)")
+                        .HasColumnName("academic_title_ar");
+
+                    b.Property<string>("AcademicTitleEn")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)")
+                        .HasColumnName("academic_title_en");
+
+                    b.Property<Guid>("ApprovedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("approved_by_id");
+
+                    b.Property<DateTimeOffset>("ApprovedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("approved_on");
+
+                    b.Property<string>("BioAr")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("nvarchar(2000)")
+                        .HasColumnName("bio_ar");
+
+                    b.Property<string>("BioEn")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("nvarchar(2000)")
+                        .HasColumnName("bio_en");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.PrimitiveCollection<string>("ExpertiseTags")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("expertise_tags");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_expert_profiles");
+
+                    b.HasIndex("UserId")
+                        .IsUnique()
+                        .HasDatabaseName("ux_expert_profile_active_user")
+                        .HasFilter("[is_deleted] = 0");
+
+                    b.ToTable("expert_profiles", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Identity.ExpertRegistrationRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<Guid?>("ProcessedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("processed_by_id");
+
+                    b.Property<DateTimeOffset?>("ProcessedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("processed_on");
+
+                    b.Property<string>("RejectionReasonAr")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)")
+                        .HasColumnName("rejection_reason_ar");
+
+                    b.Property<string>("RejectionReasonEn")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)")
+                        .HasColumnName("rejection_reason_en");
+
+                    b.Property<string>("RequestedBioAr")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("nvarchar(2000)")
+                        .HasColumnName("requested_bio_ar");
+
+                    b.Property<string>("RequestedBioEn")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("nvarchar(2000)")
+                        .HasColumnName("requested_bio_en");
+
+                    b.Property<Guid>("RequestedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("requested_by_id");
+
+                    b.PrimitiveCollection<string>("RequestedTags")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("requested_tags");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int")
+                        .HasColumnName("status");
+
+                    b.Property<DateTimeOffset>("SubmittedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("submitted_on");
+
+                    b.HasKey("Id")
+                        .HasName("pk_expert_registration_requests");
+
+                    b.HasIndex("RequestedById")
+                        .HasDatabaseName("ix_expert_request_requested_by");
+
+                    b.HasIndex("Status")
+                        .HasDatabaseName("ix_expert_request_status");
+
+                    b.ToTable("expert_registration_requests", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Identity.ExpertRequestAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("AssetFileId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("asset_file_id");
+
+                    b.Property<int>("AttachmentType")
+                        .HasColumnType("int")
+                        .HasColumnName("attachment_type");
+
+                    b.Property<Guid>("ExpertRequestId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("expert_request_id");
+
+                    b.Property<DateTimeOffset>("UploadedAt")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("uploaded_at");
+
+                    b.HasKey("Id")
+                        .HasName("pk_expert_request_attachments");
+
+                    b.HasIndex("ExpertRequestId")
+                        .HasDatabaseName("ix_expert_request_attachments_expert_request_id");
+
+                    b.ToTable("expert_request_attachments", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Identity.InterestTopic", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Category")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)")
+                        .HasColumnName("category");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_active");
+
+                    b.Property<string>("NameAr")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("name_ar");
+
+                    b.Property<string>("NameEn")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("name_en");
+
+                    b.HasKey("Id")
+                        .HasName("pk_interest_topics");
+
+                    b.ToTable("interest_topics", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Identity.RefreshToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset>("CreatedAtUtc")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_at_utc");
+
+                    b.Property<string>("CreatedByIp")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)")
+                        .HasColumnName("created_by_ip");
+
+                    b.Property<DateTimeOffset>("ExpiresAtUtc")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("expires_at_utc");
+
+                    b.Property<string>("ReplacedByTokenHash")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)")
+                        .HasColumnName("replaced_by_token_hash");
+
+                    b.Property<DateTimeOffset?>("RevokedAtUtc")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("revoked_at_utc");
+
+                    b.Property<string>("RevokedByIp")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)")
+                        .HasColumnName("revoked_by_ip");
+
+                    b.Property<Guid>("TokenFamilyId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("token_family_id");
+
+                    b.Property<string>("TokenHash")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)")
+                        .HasColumnName("token_hash");
+
+                    b.Property<string>("UserAgent")
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("user_agent");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_refresh_tokens");
+
+                    b.HasIndex("TokenFamilyId")
+                        .HasDatabaseName("ix_refresh_tokens_token_family_id");
+
+                    b.HasIndex("TokenHash")
+                        .IsUnique()
+                        .HasDatabaseName("ux_refresh_tokens_token_hash");
+
+                    b.HasIndex("UserId")
+                        .HasDatabaseName("ix_refresh_tokens_user_id");
+
+                    b.ToTable("refresh_tokens", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Identity.Role", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("name");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("normalized_name");
+
+                    b.HasKey("Id")
+                        .HasName("pk_asp_net_roles");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex")
+                        .HasFilter("[normalized_name] IS NOT NULL");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Identity.StateRepresentativeAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("AssignedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("assigned_by_id");
+
+                    b.Property<DateTimeOffset>("AssignedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("assigned_on");
+
+                    b.Property<Guid>("CountryId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("country_id");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<Guid?>("RevokedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("revoked_by_id");
+
+                    b.Property<DateTimeOffset?>("RevokedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("revoked_on");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_state_representative_assignments");
+
+                    b.HasIndex("CountryId")
+                        .HasDatabaseName("ix_state_rep_country_id");
+
+                    b.HasIndex("UserId")
+                        .HasDatabaseName("ix_state_rep_user_id");
+
+                    b.HasIndex("UserId", "CountryId")
+                        .IsUnique()
+                        .HasDatabaseName("ux_state_rep_active_user_country")
+                        .HasFilter("[is_deleted] = 0");
+
+                    b.ToTable("state_representative_assignments", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Identity.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int")
+                        .HasColumnName("access_failed_count");
+
+                    b.Property<string>("AvatarUrl")
+                        .HasMaxLength(2048)
+                        .HasColumnType("nvarchar(2048)")
+                        .HasColumnName("avatar_url");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property<Guid?>("CountryCodeId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("country_code_id");
+
+                    b.Property<Guid?>("CountryId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("country_id");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("email");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("bit")
+                        .HasColumnName("email_confirmed");
+
+                    b.Property<Guid?>("EntraIdObjectId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("entra_id_object_id");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)")
+                        .HasColumnName("first_name");
+
+                    b.Property<int>("FollowerCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int")
+                        .HasDefaultValue(0)
+                        .HasColumnName("follower_count");
+
+                    b.Property<int>("FollowingCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int")
+                        .HasDefaultValue(0)
+                        .HasColumnName("following_count");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<string>("JobTitle")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)")
+                        .HasColumnName("job_title");
+
+                    b.Property<int>("KnowledgeLevel")
+                        .HasColumnType("int")
+                        .HasColumnName("knowledge_level");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)")
+                        .HasColumnName("last_name");
+
+                    b.Property<string>("LocalePreference")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("nvarchar(2)")
+                        .HasColumnName("locale_preference");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("bit")
+                        .HasColumnName("lockout_enabled");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("lockout_end");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("normalized_email");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("normalized_user_name");
+
+                    b.Property<string>("OrganizationName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)")
+                        .HasColumnName("organization_name");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("password_hash");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("phone_number");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("bit")
+                        .HasColumnName("phone_number_confirmed");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("security_stamp");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int")
+                        .HasColumnName("status");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("bit")
+                        .HasColumnName("two_factor_enabled");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("pk_asp_net_users");
+
+                    b.HasIndex("CountryCodeId")
+                        .HasDatabaseName("ix_users_country_code_id");
+
+                    b.HasIndex("CountryId")
+                        .HasDatabaseName("ix_users_country_id");
+
+                    b.HasIndex("EntraIdObjectId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_asp_net_users_entra_id_object_id")
+                        .HasFilter("[entra_id_object_id] IS NOT NULL");
+
+                    b.HasIndex("NormalizedEmail")
+                        .IsUnique()
+                        .HasDatabaseName("ix_users_normalized_email_unique")
+                        .HasFilter("[normalized_email] IS NOT NULL");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex")
+                        .HasFilter("[normalized_user_name] IS NOT NULL");
+
+                    b.ToTable("AspNetUsers", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Identity.UserInterestTopic", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.Property<Guid>("InterestTopicId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("interest_topic_id");
+
+                    b.HasKey("UserId", "InterestTopicId")
+                        .HasName("pk_user_interest_topics");
+
+                    b.HasIndex("InterestTopicId")
+                        .HasDatabaseName("ix_user_interest_topics_interest_topic_id");
+
+                    b.ToTable("user_interest_topics", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.InteractiveCity.CityScenario", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<int>("CityType")
+                        .HasColumnType("int")
+                        .HasColumnName("city_type");
+
+                    b.Property<string>("ConfigurationJson")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("configuration_json");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<string>("NameAr")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("name_ar");
+
+                    b.Property<string>("NameEn")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("name_en");
+
+                    b.Property<int>("TargetYear")
+                        .HasColumnType("int")
+                        .HasColumnName("target_year");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_city_scenarios");
+
+                    b.HasIndex("UserId", "LastModifiedOn")
+                        .HasDatabaseName("ix_city_scenario_user_modified");
+
+                    b.ToTable("city_scenarios", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.InteractiveCity.CityScenarioResult", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset>("ComputedAt")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("computed_at");
+
+                    b.Property<int?>("ComputedCarbonNeutralityYear")
+                        .HasColumnType("int")
+                        .HasColumnName("computed_carbon_neutrality_year");
+
+                    b.Property<decimal>("ComputedTotalCostUsd")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)")
+                        .HasColumnName("computed_total_cost_usd");
+
+                    b.Property<string>("EngineVersion")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)")
+                        .HasColumnName("engine_version");
+
+                    b.Property<Guid>("ScenarioId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("scenario_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_city_scenario_results");
+
+                    b.HasIndex("ScenarioId", "ComputedAt")
+                        .HasDatabaseName("ix_city_result_scenario_at");
+
+                    b.ToTable("city_scenario_results", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.InteractiveCity.CityTechnology", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<decimal>("CarbonImpactKgPerYear")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)")
+                        .HasColumnName("carbon_impact_kg_per_year");
+
+                    b.Property<string>("CategoryAr")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)")
+                        .HasColumnName("category_ar");
+
+                    b.Property<string>("CategoryEn")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)")
+                        .HasColumnName("category_en");
+
+                    b.Property<decimal>("CostUsd")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)")
+                        .HasColumnName("cost_usd");
+
+                    b.Property<string>("DescriptionAr")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("description_ar");
+
+                    b.Property<string>("DescriptionEn")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("description_en");
+
+                    b.Property<string>("IconUrl")
+                        .HasMaxLength(2048)
+                        .HasColumnType("nvarchar(2048)")
+                        .HasColumnName("icon_url");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_active");
+
+                    b.Property<string>("NameAr")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("name_ar");
+
+                    b.Property<string>("NameEn")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("name_en");
+
+                    b.HasKey("Id")
+                        .HasName("pk_city_technologies");
+
+                    b.HasIndex("IsActive")
+                        .HasDatabaseName("ix_city_tech_is_active");
+
+                    b.ToTable("city_technologies", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.KnowledgeMaps.KnowledgeMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<string>("DescriptionAr")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("description_ar");
+
+                    b.Property<string>("DescriptionEn")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("description_en");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_active");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<string>("NameAr")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("name_ar");
+
+                    b.Property<string>("NameEn")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("name_en");
+
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("rowversion")
+                        .HasColumnName("row_version");
+
+                    b.Property<string>("Slug")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)")
+                        .HasColumnName("slug");
+
+                    b.HasKey("Id")
+                        .HasName("pk_knowledge_maps");
+
+                    b.HasIndex("Slug")
+                        .IsUnique()
+                        .HasDatabaseName("ux_knowledge_map_slug_active")
+                        .HasFilter("[is_deleted] = 0");
+
+                    b.ToTable("knowledge_maps", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.KnowledgeMaps.KnowledgeMapAssociation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("AssociatedId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("associated_id");
+
+                    b.Property<int>("AssociatedType")
+                        .HasColumnType("int")
+                        .HasColumnName("associated_type");
+
+                    b.Property<Guid>("NodeId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("node_id");
+
+                    b.Property<int>("OrderIndex")
+                        .HasColumnType("int")
+                        .HasColumnName("order_index");
+
+                    b.HasKey("Id")
+                        .HasName("pk_knowledge_map_associations");
+
+                    b.HasIndex("NodeId", "AssociatedType", "AssociatedId")
+                        .IsUnique()
+                        .HasDatabaseName("ux_km_assoc_node_type_id");
+
+                    b.ToTable("knowledge_map_associations", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.KnowledgeMaps.KnowledgeMapEdge", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("FromNodeId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("from_node_id");
+
+                    b.Property<Guid>("MapId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("map_id");
+
+                    b.Property<int>("OrderIndex")
+                        .HasColumnType("int")
+                        .HasColumnName("order_index");
+
+                    b.Property<int>("RelationshipType")
+                        .HasColumnType("int")
+                        .HasColumnName("relationship_type");
+
+                    b.Property<Guid>("ToNodeId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("to_node_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_knowledge_map_edges");
+
+                    b.HasIndex("FromNodeId")
+                        .HasDatabaseName("ix_km_edge_from_node");
+
+                    b.HasIndex("ToNodeId")
+                        .HasDatabaseName("ix_km_edge_to_node");
+
+                    b.HasIndex("MapId", "FromNodeId", "ToNodeId", "RelationshipType")
+                        .IsUnique()
+                        .HasDatabaseName("ux_km_edge_map_from_to_relation");
+
+                    b.ToTable("knowledge_map_edges", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.KnowledgeMaps.KnowledgeMapNode", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("DescriptionAr")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("description_ar");
+
+                    b.Property<string>("DescriptionEn")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("description_en");
+
+                    b.Property<string>("IconUrl")
+                        .HasMaxLength(2048)
+                        .HasColumnType("nvarchar(2048)")
+                        .HasColumnName("icon_url");
+
+                    b.Property<double>("LayoutX")
+                        .HasColumnType("float")
+                        .HasColumnName("layout_x");
+
+                    b.Property<double>("LayoutY")
+                        .HasColumnType("float")
+                        .HasColumnName("layout_y");
+
+                    b.Property<Guid>("MapId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("map_id");
+
+                    b.Property<string>("NameAr")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("name_ar");
+
+                    b.Property<string>("NameEn")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("name_en");
+
+                    b.Property<int>("NodeType")
+                        .HasColumnType("int")
+                        .HasColumnName("node_type");
+
+                    b.Property<int>("OrderIndex")
+                        .HasColumnType("int")
+                        .HasColumnName("order_index");
+
+                    b.HasKey("Id")
+                        .HasName("pk_knowledge_map_nodes");
+
+                    b.HasIndex("MapId", "OrderIndex")
+                        .HasDatabaseName("ix_km_node_map_order");
+
+                    b.ToTable("knowledge_map_nodes", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Lookups.CountryCode", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<string>("DialCode")
+                        .IsRequired()
+                        .HasMaxLength(16)
+                        .HasColumnType("nvarchar(16)")
+                        .HasColumnName("dial_code");
+
+                    b.Property<string>("FlagUrl")
+                        .HasMaxLength(2048)
+                        .HasColumnType("nvarchar(2048)")
+                        .HasColumnName("flag_url");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_active");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.HasKey("Id")
+                        .HasName("pk_country_codes");
+
+                    b.HasIndex("DialCode")
+                        .HasDatabaseName("ix_country_code_dial_code");
+
+                    b.ToTable("country_codes", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Media.MediaFile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("AltTextAr")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)")
+                        .HasColumnName("alt_text_ar");
+
+                    b.Property<string>("AltTextEn")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)")
+                        .HasColumnName("alt_text_en");
+
+                    b.Property<string>("DescriptionAr")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)")
+                        .HasColumnName("description_ar");
+
+                    b.Property<string>("DescriptionEn")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)")
+                        .HasColumnName("description_en");
+
+                    b.Property<string>("MimeType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)")
+                        .HasColumnName("mime_type");
+
+                    b.Property<string>("OriginalFileName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)")
+                        .HasColumnName("original_file_name");
+
+                    b.Property<long>("SizeBytes")
+                        .HasColumnType("bigint")
+                        .HasColumnName("size_bytes");
+
+                    b.Property<string>("StorageKey")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)")
+                        .HasColumnName("storage_key");
+
+                    b.Property<string>("TitleAr")
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)")
+                        .HasColumnName("title_ar");
+
+                    b.Property<string>("TitleEn")
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)")
+                        .HasColumnName("title_en");
+
+                    b.Property<Guid>("UploadedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("uploaded_by_id");
+
+                    b.Property<DateTimeOffset>("UploadedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("uploaded_on");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasMaxLength(2048)
+                        .HasColumnType("nvarchar(2048)")
+                        .HasColumnName("url");
+
+                    b.HasKey("Id")
+                        .HasName("pk_media_files");
+
+                    b.ToTable("media_files", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Notifications.NotificationLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<int>("AttemptCount")
+                        .HasColumnType("int")
+                        .HasColumnName("attempt_count");
+
+                    b.Property<int>("Channel")
+                        .HasColumnType("int")
+                        .HasColumnName("channel");
+
+                    b.Property<string>("CorrelationId")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)")
+                        .HasColumnName("correlation_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<string>("Error")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("error");
+
+                    b.Property<DateTimeOffset?>("FailedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("failed_on");
+
+                    b.Property<string>("PayloadJson")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("payload_json");
+
+                    b.Property<string>("ProviderMessageId")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("provider_message_id");
+
+                    b.Property<Guid?>("RecipientUserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("recipient_user_id");
+
+                    b.Property<DateTimeOffset?>("SentOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("sent_on");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int")
+                        .HasColumnName("status");
+
+                    b.Property<string>("TemplateCode")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)")
+                        .HasColumnName("template_code");
+
+                    b.Property<Guid?>("TemplateId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("template_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_notification_logs");
+
+                    b.HasIndex("CorrelationId")
+                        .HasDatabaseName("ix_notification_log_correlation_id");
+
+                    b.HasIndex("TemplateCode", "Channel")
+                        .HasDatabaseName("ix_notification_log_template_channel");
+
+                    b.HasIndex("RecipientUserId", "Status", "CreatedOn")
+                        .HasDatabaseName("ix_notification_log_recipient_status_created");
+
+                    b.ToTable("notification_logs", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Notifications.NotificationTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("BodyAr")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("body_ar");
+
+                    b.Property<string>("BodyEn")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("body_en");
+
+                    b.Property<int>("Channel")
+                        .HasColumnType("int")
+                        .HasColumnName("channel");
+
+                    b.Property<string>("Code")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)")
+                        .HasColumnName("code");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_active");
+
+                    b.Property<string>("SubjectAr")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("subject_ar");
+
+                    b.Property<string>("SubjectEn")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("subject_en");
+
+                    b.Property<string>("VariableSchemaJson")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("variable_schema_json");
+
+                    b.HasKey("Id")
+                        .HasName("pk_notification_templates");
+
+                    b.HasIndex("Code", "Channel")
+                        .IsUnique()
+                        .HasDatabaseName("ux_notification_template_code_channel");
+
+                    b.ToTable("notification_templates", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Notifications.UserNotification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<int>("Channel")
+                        .HasColumnType("int")
+                        .HasColumnName("channel");
+
+                    b.Property<DateTimeOffset?>("ReadOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("read_on");
+
+                    b.Property<string>("RenderedBody")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("rendered_body");
+
+                    b.Property<string>("RenderedLocale")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("nvarchar(2)")
+                        .HasColumnName("rendered_locale");
+
+                    b.Property<string>("RenderedSubjectAr")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("rendered_subject_ar");
+
+                    b.Property<string>("RenderedSubjectEn")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("rendered_subject_en");
+
+                    b.Property<DateTimeOffset?>("SentOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("sent_on");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int")
+                        .HasColumnName("status");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("template_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_user_notifications");
+
+                    b.HasIndex("UserId", "Status")
+                        .HasDatabaseName("ix_user_notification_user_status");
+
+                    b.ToTable("user_notifications", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Notifications.UserNotificationSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<int>("Channel")
+                        .HasColumnType("int")
+                        .HasColumnName("channel");
+
+                    b.Property<string>("EventCode")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)")
+                        .HasColumnName("event_code");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_enabled");
+
+                    b.Property<DateTimeOffset>("UpdatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("updated_on");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_user_notification_settings");
+
+                    b.HasIndex("UserId", "Channel", "EventCode")
+                        .IsUnique()
+                        .HasDatabaseName("ux_user_notification_settings_user_channel_event")
+                        .HasFilter("[event_code] IS NOT NULL");
+
+                    b.ToTable("user_notification_settings", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.PlatformSettings.AboutSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<string>("HowToUseVideoUrl")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("how_to_use_video_url");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("rowversion")
+                        .HasColumnName("row_version");
+
+                    b.HasKey("Id")
+                        .HasName("pk_about_settings");
+
+                    b.ToTable("about_settings", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.PlatformSettings.GlossaryEntry", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("AboutSettingsId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("about_settings_id");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<int>("OrderIndex")
+                        .HasColumnType("int")
+                        .HasColumnName("order_index");
+
+                    b.HasKey("Id")
+                        .HasName("pk_glossary_entries");
+
+                    b.HasIndex("AboutSettingsId")
+                        .HasDatabaseName("ix_glossary_entries_about_settings_id");
+
+                    b.ToTable("glossary_entries", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.PlatformSettings.HomepageCountry", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CountryId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("country_id");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid>("HomepageSettingsId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("homepage_settings_id");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<int>("OrderIndex")
+                        .HasColumnType("int")
+                        .HasColumnName("order_index");
+
+                    b.HasKey("Id")
+                        .HasName("pk_homepage_countries");
+
+                    b.HasIndex("HomepageSettingsId", "CountryId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_homepage_country_settings_country");
+
+                    b.ToTable("homepage_countries", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.PlatformSettings.HomepageSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("CceConceptsAr")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("cce_concepts_ar");
+
+                    b.Property<string>("CceConceptsEn")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("cce_concepts_en");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("rowversion")
+                        .HasColumnName("row_version");
+
+                    b.Property<string>("VideoUrl")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("video_url");
+
+                    b.HasKey("Id")
+                        .HasName("pk_homepage_settings");
+
+                    b.ToTable("homepage_settings", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.PlatformSettings.KnowledgePartner", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("AboutSettingsId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("about_settings_id");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<string>("LogoUrl")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("logo_url");
+
+                    b.Property<int>("OrderIndex")
+                        .HasColumnType("int")
+                        .HasColumnName("order_index");
+
+                    b.Property<string>("WebsiteUrl")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("website_url");
+
+                    b.HasKey("Id")
+                        .HasName("pk_knowledge_partners");
+
+                    b.HasIndex("AboutSettingsId")
+                        .HasDatabaseName("ix_knowledge_partners_about_settings_id");
+
+                    b.ToTable("knowledge_partners", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.PlatformSettings.PoliciesSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("rowversion")
+                        .HasColumnName("row_version");
+
+                    b.HasKey("Id")
+                        .HasName("pk_policies_settings");
+
+                    b.ToTable("policies_settings", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.PlatformSettings.PolicySection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<int>("OrderIndex")
+                        .HasColumnType("int")
+                        .HasColumnName("order_index");
+
+                    b.Property<Guid>("PoliciesSettingsId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("policies_settings_id");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("int")
+                        .HasColumnName("type");
+
+                    b.HasKey("Id")
+                        .HasName("pk_policy_sections");
+
+                    b.HasIndex("PoliciesSettingsId")
+                        .HasDatabaseName("ix_policy_sections_policies_settings_id");
+
+                    b.ToTable("policy_sections", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Surveys.SearchQueryLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Locale")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("nvarchar(2)")
+                        .HasColumnName("locale");
+
+                    b.Property<string>("QueryText")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)")
+                        .HasColumnName("query_text");
+
+                    b.Property<int>("ResponseTimeMs")
+                        .HasColumnType("int")
+                        .HasColumnName("response_time_ms");
+
+                    b.Property<int>("ResultsCount")
+                        .HasColumnType("int")
+                        .HasColumnName("results_count");
+
+                    b.Property<DateTimeOffset>("SubmittedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("submitted_on");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_search_query_logs");
+
+                    b.HasIndex("SubmittedOn")
+                        .HasDatabaseName("ix_search_query_log_submitted_on");
+
+                    b.ToTable("search_query_logs", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Surveys.ServiceRating", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("CommentAr")
+                        .HasMaxLength(2000)
+                        .HasColumnType("nvarchar(2000)")
+                        .HasColumnName("comment_ar");
+
+                    b.Property<string>("CommentEn")
+                        .HasMaxLength(2000)
+                        .HasColumnType("nvarchar(2000)")
+                        .HasColumnName("comment_en");
+
+                    b.Property<string>("Locale")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("nvarchar(2)")
+                        .HasColumnName("locale");
+
+                    b.Property<string>("Page")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("page");
+
+                    b.Property<int>("Rating")
+                        .HasColumnType("int")
+                        .HasColumnName("rating");
+
+                    b.Property<DateTimeOffset>("SubmittedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("submitted_on");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_service_ratings");
+
+                    b.HasIndex("SubmittedOn")
+                        .HasDatabaseName("ix_service_rating_submitted_on");
+
+                    b.ToTable("service_ratings", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Verification.OtpVerification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<int>("AttemptCount")
+                        .HasColumnType("int")
+                        .HasColumnName("attempt_count");
+
+                    b.Property<string>("CodeHash")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)")
+                        .HasColumnName("code_hash");
+
+                    b.Property<string>("Contact")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("contact");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<DateTimeOffset>("ExpiresAt")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("expires_at");
+
+                    b.Property<string>("ExtraData")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("extra_data");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<bool>("IsInvalidated")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_invalidated");
+
+                    b.Property<bool>("IsVerified")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_verified");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<DateTimeOffset?>("LastSentAt")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_sent_at");
+
+                    b.Property<int>("TypeId")
+                        .HasColumnType("int")
+                        .HasColumnName("type_id");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_otp_verifications");
+
+                    b.HasIndex("Contact", "TypeId")
+                        .HasDatabaseName("ix_otp_verifications_contact_type_id");
+
+                    b.HasIndex("UserId", "Contact", "TypeId")
+                        .HasDatabaseName("ix_otp_verifications_user_contact_type");
+
+                    b.ToTable("otp_verifications", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Verification.UserVerification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Contact")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("contact");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("created_on");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTimeOffset?>("DeletedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("deleted_on");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<bool>("IsVerified")
+                        .HasColumnType("bit")
+                        .HasColumnName("is_verified");
+
+                    b.Property<Guid?>("LastModifiedById")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("last_modified_by_id");
+
+                    b.Property<DateTimeOffset?>("LastModifiedOn")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("last_modified_on");
+
+                    b.Property<int>("TypeId")
+                        .HasColumnType("int")
+                        .HasColumnName("type_id");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.Property<DateTimeOffset?>("VerifiedAt")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("verified_at");
+
+                    b.HasKey("Id")
+                        .HasName("pk_user_verifications");
+
+                    b.HasIndex("UserId")
+                        .HasDatabaseName("ix_user_verifications_user_id");
+
+                    b.HasIndex("Contact", "TypeId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_user_verifications_contact_type_id");
+
+                    b.ToTable("user_verifications", (string)null);
+                });
+
+            modelBuilder.Entity("EventTag", b =>
+                {
+                    b.Property<Guid>("EventId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("event_id");
+
+                    b.Property<Guid>("TagsId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("tags_id");
+
+                    b.HasKey("EventId", "TagsId")
+                        .HasName("pk_event_tag");
+
+                    b.HasIndex("TagsId")
+                        .HasDatabaseName("ix_event_tag_tags_id");
+
+                    b.ToTable("event_tag", (string)null);
+                });
+
+            modelBuilder.Entity("MassTransit.EntityFrameworkCoreIntegration.InboxState", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("id");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
+
+                    b.Property<DateTime?>("Consumed")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("consumed");
+
+                    b.Property<Guid>("ConsumerId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("consumer_id");
+
+                    b.Property<DateTime?>("Delivered")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("delivered");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<long?>("LastSequenceNumber")
+                        .HasColumnType("bigint")
+                        .HasColumnName("last_sequence_number");
+
+                    b.Property<Guid>("LockId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("lock_id");
+
+                    b.Property<Guid>("MessageId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("message_id");
+
+                    b.Property<int>("ReceiveCount")
+                        .HasColumnType("int")
+                        .HasColumnName("receive_count");
+
+                    b.Property<DateTime>("Received")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("received");
+
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("rowversion")
+                        .HasColumnName("row_version");
+
+                    b.HasKey("Id")
+                        .HasName("pk_inbox_state");
+
+                    b.HasAlternateKey("MessageId", "ConsumerId")
+                        .HasName("ak_inbox_state_message_id_consumer_id");
+
+                    b.HasIndex("Delivered")
+                        .HasDatabaseName("ix_inbox_state_delivered");
+
+                    b.ToTable("inbox_state", (string)null);
+                });
+
+            modelBuilder.Entity("MassTransit.EntityFrameworkCoreIntegration.OutboxMessage", b =>
+                {
+                    b.Property<long>("SequenceNumber")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("sequence_number");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("SequenceNumber"));
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("body");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("content_type");
+
+                    b.Property<Guid?>("ConversationId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("conversation_id");
+
+                    b.Property<Guid?>("CorrelationId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("correlation_id");
+
+                    b.Property<string>("DestinationAddress")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("destination_address");
+
+                    b.Property<DateTime?>("EnqueueTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("enqueue_time");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<string>("FaultAddress")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("fault_address");
+
+                    b.Property<string>("Headers")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("headers");
+
+                    b.Property<Guid?>("InboxConsumerId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("inbox_consumer_id");
+
+                    b.Property<Guid?>("InboxMessageId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("inbox_message_id");
+
+                    b.Property<Guid?>("InitiatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("initiator_id");
+
+                    b.Property<Guid>("MessageId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("message_id");
+
+                    b.Property<string>("MessageType")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("message_type");
+
+                    b.Property<Guid?>("OutboxId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("outbox_id");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("properties");
+
+                    b.Property<Guid?>("RequestId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("request_id");
+
+                    b.Property<string>("ResponseAddress")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("response_address");
+
+                    b.Property<DateTime>("SentTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("sent_time");
+
+                    b.Property<string>("SourceAddress")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("source_address");
+
+                    b.HasKey("SequenceNumber")
+                        .HasName("pk_outbox_message");
+
+                    b.HasIndex("EnqueueTime")
+                        .HasDatabaseName("ix_outbox_message_enqueue_time");
+
+                    b.HasIndex("ExpirationTime")
+                        .HasDatabaseName("ix_outbox_message_expiration_time");
+
+                    b.HasIndex("OutboxId", "SequenceNumber")
+                        .IsUnique()
+                        .HasDatabaseName("ix_outbox_message_outbox_id_sequence_number")
+                        .HasFilter("[outbox_id] IS NOT NULL");
+
+                    b.HasIndex("InboxMessageId", "InboxConsumerId", "SequenceNumber")
+                        .IsUnique()
+                        .HasDatabaseName("ix_outbox_message_inbox_message_id_inbox_consumer_id_sequence_number")
+                        .HasFilter("[inbox_message_id] IS NOT NULL AND [inbox_consumer_id] IS NOT NULL");
+
+                    b.ToTable("outbox_message", (string)null);
+                });
+
+            modelBuilder.Entity("MassTransit.EntityFrameworkCoreIntegration.OutboxState", b =>
+                {
+                    b.Property<Guid>("OutboxId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("outbox_id");
+
+                    b.Property<DateTime>("Created")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("created");
+
+                    b.Property<DateTime?>("Delivered")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("delivered");
+
+                    b.Property<long?>("LastSequenceNumber")
+                        .HasColumnType("bigint")
+                        .HasColumnName("last_sequence_number");
+
+                    b.Property<Guid>("LockId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("lock_id");
+
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("rowversion")
+                        .HasColumnName("row_version");
+
+                    b.HasKey("OutboxId")
+                        .HasName("pk_outbox_state");
+
+                    b.HasIndex("Created")
+                        .HasDatabaseName("ix_outbox_state_created");
+
+                    b.ToTable("outbox_state", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<System.Guid>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int")
+                        .HasColumnName("id");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("claim_type");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("claim_value");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_asp_net_role_claims");
+
+                    b.HasIndex("RoleId")
+                        .HasDatabaseName("ix_asp_net_role_claims_role_id");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<System.Guid>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int")
+                        .HasColumnName("id");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("claim_type");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("claim_value");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_asp_net_user_claims");
+
+                    b.HasIndex("UserId")
+                        .HasDatabaseName("ix_asp_net_user_claims_user_id");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<System.Guid>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(450)")
+                        .HasColumnName("login_provider");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("nvarchar(450)")
+                        .HasColumnName("provider_key");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("provider_display_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("LoginProvider", "ProviderKey")
+                        .HasName("pk_asp_net_user_logins");
+
+                    b.HasIndex("UserId")
+                        .HasDatabaseName("ix_asp_net_user_logins_user_id");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<System.Guid>", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("UserId", "RoleId")
+                        .HasName("pk_asp_net_user_roles");
+
+                    b.HasIndex("RoleId")
+                        .HasDatabaseName("ix_asp_net_user_roles_role_id");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<System.Guid>", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(450)")
+                        .HasColumnName("login_provider");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("nvarchar(450)")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("value");
+
+                    b.HasKey("UserId", "LoginProvider", "Name")
+                        .HasName("pk_asp_net_user_tokens");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("NewsTag", b =>
+                {
+                    b.Property<Guid>("NewsId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("news_id");
+
+                    b.Property<Guid>("TagsId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("tags_id");
+
+                    b.HasKey("NewsId", "TagsId")
+                        .HasName("pk_news_tag");
+
+                    b.HasIndex("TagsId")
+                        .HasDatabaseName("ix_news_tag_tags_id");
+
+                    b.ToTable("news_tag", (string)null);
+                });
+
+            modelBuilder.Entity("PostTag", b =>
+                {
+                    b.Property<Guid>("PostId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("post_id");
+
+                    b.Property<Guid>("TagsId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("tags_id");
+
+                    b.HasKey("PostId", "TagsId")
+                        .HasName("pk_post_tag");
+
+                    b.HasIndex("TagsId")
+                        .HasDatabaseName("ix_post_tag_tags_id");
+
+                    b.ToTable("post_tag", (string)null);
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.PollOption", b =>
+                {
+                    b.HasOne("CCE.Domain.Community.Poll", null)
+                        .WithMany("Options")
+                        .HasForeignKey("PollId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_poll_options_polls_poll_id");
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.Post", b =>
+                {
+                    b.HasOne("CCE.Domain.Community.Community", null)
+                        .WithMany()
+                        .HasForeignKey("CommunityId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired()
+                        .HasConstraintName("fk_posts_communities_community_id");
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.PostAttachment", b =>
+                {
+                    b.HasOne("CCE.Domain.Content.AssetFile", null)
+                        .WithMany()
+                        .HasForeignKey("AssetFileId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired()
+                        .HasConstraintName("fk_post_attachments_asset_files_asset_file_id");
+
+                    b.HasOne("CCE.Domain.Community.Post", null)
+                        .WithMany("Attachments")
+                        .HasForeignKey("PostId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_post_attachments_posts_post_id");
+                });
+
+            modelBuilder.Entity("CCE.Domain.Content.ResourceCountry", b =>
+                {
+                    b.HasOne("CCE.Domain.Content.Resource", null)
+                        .WithMany("Countries")
+                        .HasForeignKey("ResourceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_resource_country_resources_resource_id");
+                });
+
+            modelBuilder.Entity("CCE.Domain.Identity.ExpertRequestAttachment", b =>
+                {
+                    b.HasOne("CCE.Domain.Identity.ExpertRegistrationRequest", null)
+                        .WithMany("Attachments")
+                        .HasForeignKey("ExpertRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_expert_request_attachments_expert_registration_requests_expert_request_id");
+                });
+
+            modelBuilder.Entity("CCE.Domain.Identity.RefreshToken", b =>
+                {
+                    b.HasOne("CCE.Domain.Identity.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_refresh_tokens_asp_net_users_user_id");
+                });
+
+            modelBuilder.Entity("CCE.Domain.Identity.UserInterestTopic", b =>
+                {
+                    b.HasOne("CCE.Domain.Identity.InterestTopic", "InterestTopic")
+                        .WithMany()
+                        .HasForeignKey("InterestTopicId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_user_interest_topics_interest_topics_interest_topic_id");
+
+                    b.HasOne("CCE.Domain.Identity.User", "User")
+                        .WithMany("UserInterestTopics")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_user_interest_topics_users_user_id");
+
+                    b.Navigation("InterestTopic");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("CCE.Domain.Lookups.CountryCode", b =>
+                {
+                    b.OwnsOne("CCE.Domain.PlatformSettings.ValueObjects.LocalizedText", "Name", b1 =>
+                        {
+                            b1.Property<Guid>("CountryCodeId")
+                                .HasColumnType("uniqueidentifier")
+                                .HasColumnName("id");
+
+                            b1.Property<string>("Ar")
+                                .IsRequired()
+                                .HasMaxLength(256)
+                                .HasColumnType("nvarchar(256)")
+                                .HasColumnName("name_ar");
+
+                            b1.Property<string>("En")
+                                .IsRequired()
+                                .HasMaxLength(256)
+                                .HasColumnType("nvarchar(256)")
+                                .HasColumnName("name_en");
+
+                            b1.HasKey("CountryCodeId");
+
+                            b1.ToTable("country_codes");
+
+                            b1.WithOwner()
+                                .HasForeignKey("CountryCodeId")
+                                .HasConstraintName("fk_country_codes_country_codes_id");
+                        });
+
+                    b.Navigation("Name")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("CCE.Domain.PlatformSettings.AboutSettings", b =>
+                {
+                    b.OwnsOne("CCE.Domain.PlatformSettings.ValueObjects.LocalizedText", "Description", b1 =>
+                        {
+                            b1.Property<Guid>("AboutSettingsId")
+                                .HasColumnType("uniqueidentifier")
+                                .HasColumnName("id");
+
+                            b1.Property<string>("Ar")
+                                .IsRequired()
+                                .HasMaxLength(1000)
+                                .HasColumnType("nvarchar(1000)")
+                                .HasColumnName("description_ar");
+
+                            b1.Property<string>("En")
+                                .IsRequired()
+                                .HasMaxLength(1000)
+                                .HasColumnType("nvarchar(1000)")
+                                .HasColumnName("description_en");
+
+                            b1.HasKey("AboutSettingsId");
+
+                            b1.ToTable("about_settings");
+
+                            b1.WithOwner()
+                                .HasForeignKey("AboutSettingsId")
+                                .HasConstraintName("fk_about_settings_about_settings_id");
+                        });
+
+                    b.Navigation("Description")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("CCE.Domain.PlatformSettings.GlossaryEntry", b =>
+                {
+                    b.HasOne("CCE.Domain.PlatformSettings.AboutSettings", null)
+                        .WithMany("GlossaryEntries")
+                        .HasForeignKey("AboutSettingsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_glossary_entries_about_settings_about_settings_id");
+
+                    b.OwnsOne("CCE.Domain.PlatformSettings.ValueObjects.LocalizedText", "Definition", b1 =>
+                        {
+                            b1.Property<Guid>("GlossaryEntryId")
+                                .HasColumnType("uniqueidentifier")
+                                .HasColumnName("id");
+
+                            b1.Property<string>("Ar")
+                                .IsRequired()
+                                .HasMaxLength(1000)
+                                .HasColumnType("nvarchar(1000)")
+                                .HasColumnName("definition_ar");
+
+                            b1.Property<string>("En")
+                                .IsRequired()
+                                .HasMaxLength(1000)
+                                .HasColumnType("nvarchar(1000)")
+                                .HasColumnName("definition_en");
+
+                            b1.HasKey("GlossaryEntryId");
+
+                            b1.ToTable("glossary_entries");
+
+                            b1.WithOwner()
+                                .HasForeignKey("GlossaryEntryId")
+                                .HasConstraintName("fk_glossary_entries_glossary_entries_id");
+                        });
+
+                    b.OwnsOne("CCE.Domain.PlatformSettings.ValueObjects.LocalizedText", "Term", b1 =>
+                        {
+                            b1.Property<Guid>("GlossaryEntryId")
+                                .HasColumnType("uniqueidentifier")
+                                .HasColumnName("id");
+
+                            b1.Property<string>("Ar")
+                                .IsRequired()
+                                .HasMaxLength(100)
+                                .HasColumnType("nvarchar(100)")
+                                .HasColumnName("term_ar");
+
+                            b1.Property<string>("En")
+                                .IsRequired()
+                                .HasMaxLength(100)
+                                .HasColumnType("nvarchar(100)")
+                                .HasColumnName("term_en");
+
+                            b1.HasKey("GlossaryEntryId");
+
+                            b1.ToTable("glossary_entries");
+
+                            b1.WithOwner()
+                                .HasForeignKey("GlossaryEntryId")
+                                .HasConstraintName("fk_glossary_entries_glossary_entries_id");
+                        });
+
+                    b.Navigation("Definition")
+                        .IsRequired();
+
+                    b.Navigation("Term")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("CCE.Domain.PlatformSettings.HomepageCountry", b =>
+                {
+                    b.HasOne("CCE.Domain.PlatformSettings.HomepageSettings", null)
+                        .WithMany("Countries")
+                        .HasForeignKey("HomepageSettingsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_homepage_countries_homepage_settings_homepage_settings_id");
+                });
+
+            modelBuilder.Entity("CCE.Domain.PlatformSettings.HomepageSettings", b =>
+                {
+                    b.OwnsOne("CCE.Domain.PlatformSettings.ValueObjects.LocalizedText", "Objective", b1 =>
+                        {
+                            b1.Property<Guid>("HomepageSettingsId")
+                                .HasColumnType("uniqueidentifier")
+                                .HasColumnName("id");
+
+                            b1.Property<string>("Ar")
+                                .IsRequired()
+                                .HasMaxLength(1000)
+                                .HasColumnType("nvarchar(1000)")
+                                .HasColumnName("objective_ar");
+
+                            b1.Property<string>("En")
+                                .IsRequired()
+                                .HasMaxLength(1000)
+                                .HasColumnType("nvarchar(1000)")
+                                .HasColumnName("objective_en");
+
+                            b1.HasKey("HomepageSettingsId");
+
+                            b1.ToTable("homepage_settings");
+
+                            b1.WithOwner()
+                                .HasForeignKey("HomepageSettingsId")
+                                .HasConstraintName("fk_homepage_settings_homepage_settings_id");
+                        });
+
+                    b.Navigation("Objective")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("CCE.Domain.PlatformSettings.KnowledgePartner", b =>
+                {
+                    b.HasOne("CCE.Domain.PlatformSettings.AboutSettings", null)
+                        .WithMany("KnowledgePartners")
+                        .HasForeignKey("AboutSettingsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_knowledge_partners_about_settings_about_settings_id");
+
+                    b.OwnsOne("CCE.Domain.PlatformSettings.ValueObjects.LocalizedText", "Description", b1 =>
+                        {
+                            b1.Property<Guid>("KnowledgePartnerId")
+                                .HasColumnType("uniqueidentifier")
+                                .HasColumnName("id");
+
+                            b1.Property<string>("Ar")
+                                .IsRequired()
+                                .HasMaxLength(1000)
+                                .HasColumnType("nvarchar(1000)")
+                                .HasColumnName("description_ar");
+
+                            b1.Property<string>("En")
+                                .IsRequired()
+                                .HasMaxLength(1000)
+                                .HasColumnType("nvarchar(1000)")
+                                .HasColumnName("description_en");
+
+                            b1.HasKey("KnowledgePartnerId");
+
+                            b1.ToTable("knowledge_partners");
+
+                            b1.WithOwner()
+                                .HasForeignKey("KnowledgePartnerId")
+                                .HasConstraintName("fk_knowledge_partners_knowledge_partners_id");
+                        });
+
+                    b.OwnsOne("CCE.Domain.PlatformSettings.ValueObjects.LocalizedText", "Name", b1 =>
+                        {
+                            b1.Property<Guid>("KnowledgePartnerId")
+                                .HasColumnType("uniqueidentifier")
+                                .HasColumnName("id");
+
+                            b1.Property<string>("Ar")
+                                .IsRequired()
+                                .HasMaxLength(200)
+                                .HasColumnType("nvarchar(200)")
+                                .HasColumnName("name_ar");
+
+                            b1.Property<string>("En")
+                                .IsRequired()
+                                .HasMaxLength(200)
+                                .HasColumnType("nvarchar(200)")
+                                .HasColumnName("name_en");
+
+                            b1.HasKey("KnowledgePartnerId");
+
+                            b1.ToTable("knowledge_partners");
+
+                            b1.WithOwner()
+                                .HasForeignKey("KnowledgePartnerId")
+                                .HasConstraintName("fk_knowledge_partners_knowledge_partners_id");
+                        });
+
+                    b.Navigation("Description");
+
+                    b.Navigation("Name")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("CCE.Domain.PlatformSettings.PolicySection", b =>
+                {
+                    b.HasOne("CCE.Domain.PlatformSettings.PoliciesSettings", null)
+                        .WithMany("Sections")
+                        .HasForeignKey("PoliciesSettingsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_policy_sections_policies_settings_policies_settings_id");
+
+                    b.OwnsOne("CCE.Domain.PlatformSettings.ValueObjects.LocalizedText", "Content", b1 =>
+                        {
+                            b1.Property<Guid>("PolicySectionId")
+                                .HasColumnType("uniqueidentifier")
+                                .HasColumnName("id");
+
+                            b1.Property<string>("Ar")
+                                .IsRequired()
+                                .HasColumnType("nvarchar(max)")
+                                .HasColumnName("content_ar");
+
+                            b1.Property<string>("En")
+                                .IsRequired()
+                                .HasColumnType("nvarchar(max)")
+                                .HasColumnName("content_en");
+
+                            b1.HasKey("PolicySectionId");
+
+                            b1.ToTable("policy_sections");
+
+                            b1.WithOwner()
+                                .HasForeignKey("PolicySectionId")
+                                .HasConstraintName("fk_policy_sections_policy_sections_id");
+                        });
+
+                    b.OwnsOne("CCE.Domain.PlatformSettings.ValueObjects.LocalizedText", "Title", b1 =>
+                        {
+                            b1.Property<Guid>("PolicySectionId")
+                                .HasColumnType("uniqueidentifier")
+                                .HasColumnName("id");
+
+                            b1.Property<string>("Ar")
+                                .IsRequired()
+                                .HasMaxLength(500)
+                                .HasColumnType("nvarchar(500)")
+                                .HasColumnName("title_ar");
+
+                            b1.Property<string>("En")
+                                .IsRequired()
+                                .HasMaxLength(500)
+                                .HasColumnType("nvarchar(500)")
+                                .HasColumnName("title_en");
+
+                            b1.HasKey("PolicySectionId");
+
+                            b1.ToTable("policy_sections");
+
+                            b1.WithOwner()
+                                .HasForeignKey("PolicySectionId")
+                                .HasConstraintName("fk_policy_sections_policy_sections_id");
+                        });
+
+                    b.Navigation("Content")
+                        .IsRequired();
+
+                    b.Navigation("Title")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("CCE.Domain.Verification.UserVerification", b =>
+                {
+                    b.HasOne("CCE.Domain.Identity.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .HasConstraintName("fk_user_verifications_asp_net_users_user_id");
+                });
+
+            modelBuilder.Entity("EventTag", b =>
+                {
+                    b.HasOne("CCE.Domain.Content.Event", null)
+                        .WithMany()
+                        .HasForeignKey("EventId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_event_tag_events_event_id");
+
+                    b.HasOne("CCE.Domain.Content.Tag", null)
+                        .WithMany()
+                        .HasForeignKey("TagsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_event_tag_tags_tags_id");
+                });
+
+            modelBuilder.Entity("MassTransit.EntityFrameworkCoreIntegration.OutboxMessage", b =>
+                {
+                    b.HasOne("MassTransit.EntityFrameworkCoreIntegration.OutboxState", null)
+                        .WithMany()
+                        .HasForeignKey("OutboxId")
+                        .HasConstraintName("fk_outbox_message_outbox_state_outbox_id");
+
+                    b.HasOne("MassTransit.EntityFrameworkCoreIntegration.InboxState", null)
+                        .WithMany()
+                        .HasForeignKey("InboxMessageId", "InboxConsumerId")
+                        .HasPrincipalKey("MessageId", "ConsumerId")
+                        .HasConstraintName("fk_outbox_message_inbox_state_inbox_message_id_inbox_consumer_id");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<System.Guid>", b =>
+                {
+                    b.HasOne("CCE.Domain.Identity.Role", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_asp_net_role_claims_asp_net_roles_role_id");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<System.Guid>", b =>
+                {
+                    b.HasOne("CCE.Domain.Identity.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_asp_net_user_claims_asp_net_users_user_id");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<System.Guid>", b =>
+                {
+                    b.HasOne("CCE.Domain.Identity.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_asp_net_user_logins_asp_net_users_user_id");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<System.Guid>", b =>
+                {
+                    b.HasOne("CCE.Domain.Identity.Role", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_asp_net_user_roles_asp_net_roles_role_id");
+
+                    b.HasOne("CCE.Domain.Identity.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_asp_net_user_roles_asp_net_users_user_id");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<System.Guid>", b =>
+                {
+                    b.HasOne("CCE.Domain.Identity.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_asp_net_user_tokens_asp_net_users_user_id");
+                });
+
+            modelBuilder.Entity("NewsTag", b =>
+                {
+                    b.HasOne("CCE.Domain.Content.News", null)
+                        .WithMany()
+                        .HasForeignKey("NewsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_news_tag_news_news_id");
+
+                    b.HasOne("CCE.Domain.Content.Tag", null)
+                        .WithMany()
+                        .HasForeignKey("TagsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_news_tag_tags_tags_id");
+                });
+
+            modelBuilder.Entity("PostTag", b =>
+                {
+                    b.HasOne("CCE.Domain.Community.Post", null)
+                        .WithMany()
+                        .HasForeignKey("PostId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_post_tag_posts_post_id");
+
+                    b.HasOne("CCE.Domain.Content.Tag", null)
+                        .WithMany()
+                        .HasForeignKey("TagsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_post_tag_tags_tags_id");
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.Poll", b =>
+                {
+                    b.Navigation("Options");
+                });
+
+            modelBuilder.Entity("CCE.Domain.Community.Post", b =>
+                {
+                    b.Navigation("Attachments");
+                });
+
+            modelBuilder.Entity("CCE.Domain.Content.Resource", b =>
+                {
+                    b.Navigation("Countries");
+                });
+
+            modelBuilder.Entity("CCE.Domain.Identity.ExpertRegistrationRequest", b =>
+                {
+                    b.Navigation("Attachments");
+                });
+
+            modelBuilder.Entity("CCE.Domain.Identity.User", b =>
+                {
+                    b.Navigation("UserInterestTopics");
+                });
+
+            modelBuilder.Entity("CCE.Domain.PlatformSettings.AboutSettings", b =>
+                {
+                    b.Navigation("GlossaryEntries");
+
+                    b.Navigation("KnowledgePartners");
+                });
+
+            modelBuilder.Entity("CCE.Domain.PlatformSettings.HomepageSettings", b =>
+                {
+                    b.Navigation("Countries");
+                });
+
+            modelBuilder.Entity("CCE.Domain.PlatformSettings.PoliciesSettings", b =>
+                {
+                    b.Navigation("Sections");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/backend/src/CCE.Infrastructure/Persistence/Migrations/20260613120001_AddNewsletterSubscriptionAuditColumns.cs b/backend/src/CCE.Infrastructure/Persistence/Migrations/20260613120001_AddNewsletterSubscriptionAuditColumns.cs
new file mode 100644
index 00000000..0a4aa78f
--- /dev/null
+++ b/backend/src/CCE.Infrastructure/Persistence/Migrations/20260613120001_AddNewsletterSubscriptionAuditColumns.cs
@@ -0,0 +1,97 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CCE.Infrastructure.Persistence.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddNewsletterSubscriptionAuditColumns : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // Idempotent: AddUserStatus (20260520) should have added these columns,
+            // but they are missing from some DB instances. Use IF NOT EXISTS so this
+            // migration is safe to run regardless of the current column state.
+            migrationBuilder.Sql(@"
+                IF NOT EXISTS (
+                    SELECT 1 FROM sys.columns
+                    WHERE object_id = OBJECT_ID(N'newsletter_subscriptions') AND name = N'created_by_id'
+                )
+                BEGIN
+                    ALTER TABLE newsletter_subscriptions
+                        ADD created_by_id uniqueidentifier NOT NULL
+                            DEFAULT '00000000-0000-0000-0000-000000000000'
+                END
+
+                IF NOT EXISTS (
+                    SELECT 1 FROM sys.columns
+                    WHERE object_id = OBJECT_ID(N'newsletter_subscriptions') AND name = N'created_on'
+                )
+                BEGIN
+                    ALTER TABLE newsletter_subscriptions
+                        ADD created_on datetimeoffset NOT NULL
+                            DEFAULT '0001-01-01 00:00:00 +00:00'
+                END
+
+                IF NOT EXISTS (
+                    SELECT 1 FROM sys.columns
+                    WHERE object_id = OBJECT_ID(N'newsletter_subscriptions') AND name = N'is_deleted'
+                )
+                BEGIN
+                    ALTER TABLE newsletter_subscriptions
+                        ADD is_deleted bit NOT NULL DEFAULT 0
+                END
+
+                IF NOT EXISTS (
+                    SELECT 1 FROM sys.columns
+                    WHERE object_id = OBJECT_ID(N'newsletter_subscriptions') AND name = N'deleted_by_id'
+                )
+                BEGIN
+                    ALTER TABLE newsletter_subscriptions
+                        ADD deleted_by_id uniqueidentifier NULL
+                END
+
+                IF NOT EXISTS (
+                    SELECT 1 FROM sys.columns
+                    WHERE object_id = OBJECT_ID(N'newsletter_subscriptions') AND name = N'deleted_on'
+                )
+                BEGIN
+                    ALTER TABLE newsletter_subscriptions
+                        ADD deleted_on datetimeoffset NULL
+                END
+
+                IF NOT EXISTS (
+                    SELECT 1 FROM sys.columns
+                    WHERE object_id = OBJECT_ID(N'newsletter_subscriptions') AND name = N'last_modified_by_id'
+                )
+                BEGIN
+                    ALTER TABLE newsletter_subscriptions
+                        ADD last_modified_by_id uniqueidentifier NULL
+                END
+
+                IF NOT EXISTS (
+                    SELECT 1 FROM sys.columns
+                    WHERE object_id = OBJECT_ID(N'newsletter_subscriptions') AND name = N'last_modified_on'
+                )
+                BEGIN
+                    ALTER TABLE newsletter_subscriptions
+                        ADD last_modified_on datetimeoffset NULL
+                END
+            ");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(name: "created_by_id",      table: "newsletter_subscriptions");
+            migrationBuilder.DropColumn(name: "created_on",         table: "newsletter_subscriptions");
+            migrationBuilder.DropColumn(name: "is_deleted",         table: "newsletter_subscriptions");
+            migrationBuilder.DropColumn(name: "deleted_by_id",      table: "newsletter_subscriptions");
+            migrationBuilder.DropColumn(name: "deleted_on",         table: "newsletter_subscriptions");
+            migrationBuilder.DropColumn(name: "last_modified_by_id", table: "newsletter_subscriptions");
+            migrationBuilder.DropColumn(name: "last_modified_on",   table: "newsletter_subscriptions");
+        }
+    }
+}
diff --git a/backend/src/CCE.Seeder/Seeders/NotificationTemplateSeeder.cs b/backend/src/CCE.Seeder/Seeders/NotificationTemplateSeeder.cs
index 5cb44d51..2a1841c4 100644
--- a/backend/src/CCE.Seeder/Seeders/NotificationTemplateSeeder.cs
+++ b/backend/src/CCE.Seeder/Seeders/NotificationTemplateSeeder.cs
@@ -35,32 +35,50 @@ public NotificationTemplateSeeder(CceDbContext ctx, ILogger<NotificationTemplate
 
     public async Task SeedAsync(CancellationToken cancellationToken = default)
     {
-        var added = 0;
+        var changed = 0;
         foreach (var t in Templates)
         {
             var id = DeterministicGuid.From($"notif_template:{t.Code}:{t.Channel}");
 
-            if (await _ctx.NotificationTemplates.IgnoreQueryFilters()
-                .AnyAsync(x => x.Id == id, cancellationToken).ConfigureAwait(false))
+            var existing = await _ctx.NotificationTemplates.IgnoreQueryFilters()
+                .FirstOrDefaultAsync(x => x.Id == id, cancellationToken).ConfigureAwait(false);
+
+            // Fallback: previous versions may have used a different deterministic UUID
+            if (existing is null)
             {
-                continue;
+                existing = await _ctx.NotificationTemplates.IgnoreQueryFilters()
+                    .FirstOrDefaultAsync(x => x.Code == t.Code && x.Channel == t.Channel, cancellationToken)
+                    .ConfigureAwait(false);
             }
 
-            var template = NotificationTemplate.Define(
-                t.Code, t.SubjectAr, t.SubjectEn, t.BodyAr, t.BodyEn, t.Channel, "{}");
-            typeof(NotificationTemplate).GetProperty(nameof(template.Id))!.SetValue(template, id);
+            if (existing is null)
+            {
+                var template = NotificationTemplate.Define(
+                    t.Code, t.SubjectAr, t.SubjectEn, t.BodyAr, t.BodyEn, t.Channel, "{}");
+                typeof(NotificationTemplate).GetProperty(nameof(template.Id))!.SetValue(template, id);
 
-            _ctx.NotificationTemplates.Add(template);
-            added++;
-            _logger.LogInformation("Seeded notification template {Code}/{Channel}.", t.Code, t.Channel);
+                _ctx.NotificationTemplates.Add(template);
+                _logger.LogInformation("Seeded notification template {Code}/{Channel}.", t.Code, t.Channel);
+                changed++;
+            }
+            else if (existing.BodyAr != t.BodyAr || existing.BodyEn != t.BodyEn ||
+                     existing.SubjectAr != t.SubjectAr || existing.SubjectEn != t.SubjectEn)
+            {
+                typeof(NotificationTemplate).GetProperty(nameof(existing.BodyAr))!.SetValue(existing, t.BodyAr);
+                typeof(NotificationTemplate).GetProperty(nameof(existing.BodyEn))!.SetValue(existing, t.BodyEn);
+                typeof(NotificationTemplate).GetProperty(nameof(existing.SubjectAr))!.SetValue(existing, t.SubjectAr);
+                typeof(NotificationTemplate).GetProperty(nameof(existing.SubjectEn))!.SetValue(existing, t.SubjectEn);
+                _logger.LogInformation("Updated notification template {Code}/{Channel}.", t.Code, t.Channel);
+                changed++;
+            }
         }
 
-        if (added > 0)
+        if (changed > 0)
         {
             await _ctx.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
         }
 
-        _logger.LogInformation("NotificationTemplateSeeder complete ({Added} new).", added);
+        _logger.LogInformation("NotificationTemplateSeeder complete ({Changed} changed/added).", changed);
     }
 
     private sealed record TemplateSeed(
@@ -134,19 +152,41 @@ private sealed record TemplateSeed(
             "<p>تم تقديم طلب محتوى جديد ({{Type}}) وبانتظار المراجعة.</p>",
             "<p>A new content request ({{Type}}) has been submitted and is awaiting review.</p>"),
 
-        // News published — author notice (InApp)
+        // News published — InApp (author + subscribers) + Email (subscribers)
         new("NEWS_PUBLISHED", NotificationChannel.InApp,
-            "تم نشر الخبر",
+            "خبر جديد منشور",
             "News published",
-            "تم نشر الخبر الخاص بك على المنصة.",
-            "Your news article has been published on the platform."),
-
-        // Resource published — uploader notice (InApp)
+            "تم نشر خبر جديد: {{TitleAr}}",
+            "New article published: {{TitleEn}}"),
+        new("NEWS_PUBLISHED", NotificationChannel.Email,
+            "خبر جديد على المنصة",
+            "New article on the platform",
+            "<p>مرحباً {{RecipientName}}،</p><p>تم نشر خبر جديد على منصة CCE Knowledge Center:</p><h2>{{TitleAr}}</h2><p>{{ContentBodyAr}}</p><p style='text-align:center;'><a href='{{ArticleUrl}}' class='btn' style='display:inline-block;padding:12px 28px;background-color:#1a73e8;color:#fff;text-decoration:none;border-radius:6px;font-size:15px;font-weight:500;margin:16px 0;'>قراءة الخبر كاملاً</a></p><p>مع تحيات،<br/>فريق CCE Knowledge Center</p>",
+            "<p>Dear {{RecipientName}},</p><p>A new article has been published on CCE Knowledge Center:</p><h2>{{TitleEn}}</h2><p>{{ContentBodyEn}}</p><p style='text-align:center;'><a href='{{ArticleUrl}}' class='btn' style='display:inline-block;padding:12px 28px;background-color:#1a73e8;color:#fff;text-decoration:none;border-radius:6px;font-size:15px;font-weight:500;margin:16px 0;'>Read full article</a></p><p>Best regards,<br/>CCE Knowledge Center Team</p>"),
+
+        // Resource published — InApp (uploader + subscribers) + Email (subscribers)
         new("RESOURCE_PUBLISHED", NotificationChannel.InApp,
-            "تم نشر المورد",
+            "مورد جديد منشور",
             "Resource published",
-            "تم نشر المورد الذي قمت برفعه على المنصة.",
-            "The resource you uploaded has been published on the platform."),
+            "تم نشر مورد جديد: {{TitleAr}}",
+            "New resource published: {{TitleEn}}"),
+        new("RESOURCE_PUBLISHED", NotificationChannel.Email,
+            "مورد جديد على المنصة",
+            "New resource on the platform",
+            "<p>تم نشر مورد جديد على المنصة: <strong>{{TitleAr}}</strong></p>",
+            "<p>A new resource has been published on the platform: <strong>{{TitleEn}}</strong></p>"),
+
+        // Event scheduled — InApp + Email (subscribers)
+        new("EVENT_SCHEDULED", NotificationChannel.InApp,
+            "فعالية جديدة مجدولة",
+            "New event scheduled",
+            "تم تحديد موعد فعالية جديدة: {{TitleAr}} في {{StartsOn}}",
+            "A new event has been scheduled: {{TitleEn}} on {{StartsOn}}"),
+        new("EVENT_SCHEDULED", NotificationChannel.Email,
+            "فعالية جديدة على المنصة",
+            "New event on the platform",
+            "<p>تم تحديد موعد فعالية جديدة: <strong>{{TitleAr}}</strong></p><p>الموعد: {{StartsOn}}</p>",
+            "<p>A new event has been scheduled: <strong>{{TitleEn}}</strong></p><p>Date: {{StartsOn}}</p>"),
 
         // Community — new post for topic/community followers (InApp)
         new("COMMUNITY_POST_CREATED", NotificationChannel.InApp,
diff --git a/backend/src/CCE.Worker/appsettings.Development.json b/backend/src/CCE.Worker/appsettings.Development.json
index cb5ee0aa..50d1f7e6 100644
--- a/backend/src/CCE.Worker/appsettings.Development.json
+++ b/backend/src/CCE.Worker/appsettings.Development.json
@@ -11,13 +11,13 @@
   },
   "Email": {
     "Provider": "smtp",
-    "Host": "localhost",
-    "Port": 1025,
-    "FromAddress": "no-reply@cce.local",
+    "Host": "in-v3.mailjet.com",
+    "Port": 587,
+    "FromAddress": "rashk4490@gmail.com",
     "FromName": "CCE Knowledge Center",
-    "Username": "",
-    "Password": "",
-    "EnableSsl": false
+    "Username": "94ef75822646ac2ee0f5c870d92ca7c4",
+    "Password": "0090ed2329e85a329cf45ce4ea165595",
+    "EnableSsl": true
   },
   "Messaging": {
     "Transport": "InMemory",
diff --git a/backend/tests/CCE.Infrastructure.Tests/Search/MeilisearchIndexerHandlerTests.cs b/backend/tests/CCE.Infrastructure.Tests/Search/MeilisearchIndexerHandlerTests.cs
index b380ce27..33ba0438 100644
--- a/backend/tests/CCE.Infrastructure.Tests/Search/MeilisearchIndexerHandlerTests.cs
+++ b/backend/tests/CCE.Infrastructure.Tests/Search/MeilisearchIndexerHandlerTests.cs
@@ -51,7 +51,7 @@ public async Task News_published_handler_upserts_document()
         var search = Substitute.For<ISearchClient>();
         var sut = new NewsPublishedIndexHandler(db, search, NullLogger<NewsPublishedIndexHandler>.Instance);
 
-        var evt = new NewsPublishedEvent(news.Id, clock.UtcNow);
+        var evt = new NewsPublishedEvent(news.Id, news.TopicId, news.AuthorId, clock.UtcNow);
         await sut.Handle(evt, CancellationToken.None);
 
         await search.Received(1).UpsertAsync(
@@ -92,7 +92,7 @@ public async Task Resource_published_handler_upserts_document()
         var search = Substitute.For<ISearchClient>();
         var sut = new ResourcePublishedIndexHandler(db, search, NullLogger<ResourcePublishedIndexHandler>.Instance);
 
-        var evt = new ResourcePublishedEvent(resource.Id, null, resource.CategoryId, clock.UtcNow);
+        var evt = new ResourcePublishedEvent(resource.Id, null, resource.CategoryId, resource.UploadedById, clock.UtcNow);
         await sut.Handle(evt, CancellationToken.None);
 
         await search.Received(1).UpsertAsync(
@@ -133,7 +133,7 @@ public async Task Event_scheduled_handler_upserts_document()
         var search = Substitute.For<ISearchClient>();
         var sut = new EventScheduledIndexHandler(db, search, NullLogger<EventScheduledIndexHandler>.Instance);
 
-        var evt = new EventScheduledEvent(ev.Id, BaseTime, BaseTime.AddHours(2), clock.UtcNow);
+        var evt = new EventScheduledEvent(ev.Id, ev.TopicId, BaseTime, BaseTime.AddHours(2), clock.UtcNow);
         await sut.Handle(evt, CancellationToken.None);
 
         await search.Received(1).UpsertAsync(