Merge commit '3656223b5f596095383a95825e553b776a50145a'

2026-05-20 19:15:01 +00:00
104 changed files with 337 additions and 781 deletions
@@ -19,8 +19,6 @@ steps:
    commands:      
      - dotnet pack LiteCharms.Features/LiteCharms.Features.csproj -c Release -p:PackageVersion=$VERSION -o dist/
      - dotnet nuget push dist/LiteCharms.Features.$VERSION.nupkg --api-key $NEXUS_KEY --source $NEXUS_URL
      - dotnet pack LiteCharms.Features.TechShop/LiteCharms.Features.TechShop.csproj -c Release -p:PackageVersion=$VERSION -o dist/
      - dotnet nuget push dist/LiteCharms.Features.TechShop.$VERSION.nupkg --api-key $NEXUS_KEY --source $NEXUS_URL
  - name: gitea-tag-release
    image: alpine/git
@@ -43,7 +41,7 @@ steps:
               \"tag_name\": \"$VERSION\",
               \"target_commitish\": \"${DRONE_COMMIT_SHA}\",
               \"name\": \"Library Suite $VERSION\",
-               \"body\": \"### Published NuGet Packages\nAll packages versioned as **$VERSION**:\n* LiteCharms.Features\n* LiteCharms.Features.TechShop\n\n[View in Nexus](https://nexus.khongisa.co.za/repository/nuget-group/)\",
+               \"body\": \"### Published NuGet Packages\nAll packages versioned as **$VERSION**:\n* LiteCharms.Features\n\n[View in Nexus](https://nexus.khongisa.co.za/repository/nuget-group/)\",
               \"draft\": false,
               \"prerelease\": false
             }"
@@ -1,38 +0,0 @@
 using LiteCharms.Features.Extensions;
 using LiteCharms.Features.TechShop.Extensions;
 namespace LiteCharms.Features.TechShop.Tests;
 public class Fixture : IDisposable
 {
    public IConfiguration Configuration { get; set; }
    public IServiceProvider Services { get; set; }
    public IMediator Mediator { get; set; }
    public Fixture()
    {
        Configuration = new ConfigurationBuilder()
            .SetBasePath(Directory.GetCurrentDirectory())
            .AddUserSecrets<Fixture>()
            .AddJsonFile(Path.Combine(Directory.GetCurrentDirectory(), "appsettings.json"), optional: true, reloadOnChange: true)
            .AddEnvironmentVariables()
            .Build();
        Services = new ServiceCollection()            
            .AddMediator()
            .AddLogging()
            .AddTechShopServices()
            .AddEmailServiceBus()
            .AddGarageS3(Configuration)
            .AddTechShopDatabase(Configuration)
            .AddEmailServices(Configuration)
            .AddSingleton(Configuration)
            .BuildServiceProvider();
        Mediator = Services.GetRequiredService<IMediator>();
    }
    public void Dispose() { }
 }
@@ -1,57 +0,0 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net10.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <IsPackable>false</IsPackable>
    <UserSecretsId>fa06c1a6-2ba8-4c47-b19b-11e0f78e7b92</UserSecretsId>
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="coverlet.collector" Version="10.0.1">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
    <PackageReference Include="xunit" Version="2.9.3" />
    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
  </ItemGroup>
  <!-- Global Usings -->
  <ItemGroup>
    <Using Include="Mediator" />
    <Using Include="Xunit.Abstractions" />
    <Using Include="Microsoft.Extensions.DependencyInjection" />
    <Using Include="Microsoft.Extensions.Configuration" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\LiteCharms.Features.TechShop\LiteCharms.Features.TechShop.csproj" />
    <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
  </ItemGroup>
  <ItemGroup>
    <Using Include="Xunit" />
  </ItemGroup>
  <ItemGroup>
    <None Update="appsettings.json">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
  </ItemGroup>
  <ItemGroup>
    <None Update="appsettings.json">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
  </ItemGroup>
 </Project>
@@ -1,19 +0,0 @@
 using LiteCharms.Features.TechShop.Products;
 namespace LiteCharms.Features.TechShop.Tests;
 public class ProductsFeatureTests(Fixture fixture, ITestOutputHelper output) : IClassFixture<Fixture>
 {
    [Fact]
    public async Task GetProductsAsync_ReturnsProducts()
    {
        var productService = fixture.Services.GetRequiredService<ProductService>();
        var result = await productService.GetProductsAsync();
        Assert.True(result.IsSuccess);
        Assert.NotNull(result.Value);
        output.WriteLine($"Retrieved {result.Value.Length} products.");
    }
 }
@@ -1,34 +0,0 @@
 {
  "BookshopS3Settings": {
    "ServiceUrl": "http://192.168.1.177:30900",
    "Region": "garage",
    "BucketName": "bookshop",
    "CdnBaseUrl": "https://bookshop.cdn.khongisa.co.za"
  },
  "BookshopQuotesS3Settings": {
    "ServiceUrl": "http://192.168.1.177:30900",
    "Region": "garage",
    "BucketName": "bookshop.quotes",
    "CdnBaseUrl": "https://bookshop.quotes.cdn.khongisa.co.za"
  },
  "Email": {
    "Credentials": {
      "Username": "shop@litecharms.co.za"
    },
    "Port": 465,
    "Host": "mail.litecharms.co.za",
    "UseSsl": true
  },
  "Monitoring": {
    "ApiKey": "",
    "Address": "http://aspire-dashboard-service.aspire.svc.cluster.local:18889",
    "ServiceName": "LiteCharms.LeadGenerator"
  },
  "Logging": {
    "LogLevel": {
      "Default": "Information",
      "Microsoft.AspNetCore": "Warning"
    }
  },
  "AllowedHosts": "*"
 }
@@ -1,22 +0,0 @@
 using LiteCharms.Features.TechShop.HealthChecks;
 using static LiteCharms.Features.TechShop.Extensions.Postgres;
 namespace LiteCharms.Features.TechShop.Extensions;
 public static class HealthChecks
 {
    public static IServiceCollection AddShopQuartzHealthCheck(this IServiceCollection services)
    {
        services.AddHealthChecks().AddCheck<ShopQuartzHealthCheck>("ShopQuartz");
        return services;
    }
    public static IServiceCollection AddShopPostgresHealthCheck(this IServiceCollection services)
    {
        services.AddHealthChecks().AddCheck<PostgresShopHealthCheck>(ShopDbConfigName);
        return services;
    }    
 }
@@ -1,16 +0,0 @@
 using LiteCharms.Features.TechShop.Postgres;
 namespace LiteCharms.Features.TechShop.Extensions;
 public static class Postgres
 {
    public const string ShopDbConfigName = "PostgresShop";
    public static IServiceCollection AddTechShopDatabase(this IServiceCollection services, IConfiguration configuration)
    {
        services.AddPooledDbContextFactory<ShopDbContext>(options =>
            options.UseNpgsql(configuration.GetConnectionString(ShopDbConfigName)));
        return services;
    }
 }
@@ -1,27 +0,0 @@
 using LiteCharms.Features.TechShop.CartPackages;
 using LiteCharms.Features.TechShop.Customers;
 using LiteCharms.Features.TechShop.Leads;
 using LiteCharms.Features.TechShop.Notifications;
 using LiteCharms.Features.TechShop.Orders;
 using LiteCharms.Features.TechShop.Products;
 using LiteCharms.Features.TechShop.Quotes;
 using LiteCharms.Features.TechShop.ShoppingCarts;
 namespace LiteCharms.Features.TechShop.Extensions;
 public static class Shop
 {
    public static IServiceCollection AddTechShopServices(this IServiceCollection services)
    {
        services.AddSingleton<PackageService>()
            .AddSingleton<LeadService>()
            .AddSingleton<NotificationService>()
            .AddSingleton<OrderService>()
            .AddSingleton<ProductService>()
            .AddSingleton<QuoteService>()
            .AddSingleton<ShoppingCartService>()
            .AddSingleton<CustomerService>();
        return services;
    }
 }
@@ -1,28 +0,0 @@
 using static LiteCharms.Features.Extensions.Quartz;
 namespace LiteCharms.Features.TechShop.HealthChecks;
 public class ShopQuartzHealthCheck(ISchedulerFactory schedulerFactory) : IHealthCheck
 {
    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
    {
        try
        {
            var scheduler = await schedulerFactory.GetScheduler(ShopSchedulerName, cancellationToken);
            if(scheduler == null) 
                return HealthCheckResult.Unhealthy($"Scheduler with name '{ShopSchedulerName}' not found.");
            if (!scheduler.IsStarted)
                return HealthCheckResult.Unhealthy($"{ShopSchedulerName} Quartz scheduler is not running");
            await scheduler.CheckExists(new JobKey(Guid.NewGuid().ToString()), cancellationToken);
            return HealthCheckResult.Healthy($"{ShopSchedulerName} Quartz scheduler is ready");
        }
        catch (SchedulerException)
        {
            return HealthCheckResult.Unhealthy($"{ShopSchedulerName} Quartz scheduler cannot connect to the store");
        }
    }
 }
@@ -1,166 +0,0 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net10.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <SignAssembly>True</SignAssembly>
    <AssemblyOriginatorKeyFile>..\LiteCharms.snk</AssemblyOriginatorKeyFile>
    <UserSecretsId>fbd8f4a2-0420-44e2-baff-4678d9e7eee1</UserSecretsId>
  </PropertyGroup>
  <!-- Nuget Package Details -->
  <PropertyGroup>
    <PackageId>LiteCharms.Features.TechShop</PackageId>
    <Version>1.0.20</Version>
    <Authors>Khwezi Mngoma</Authors>
    <Company>Lite Charms (PTY) Ltd</Company>
    <Description>TechShop feature components for Lite Charms applications.</Description>
    <PackageProjectUrl>https://gitea.khongisa.co.za/litecharms/components</PackageProjectUrl>
    <RepositoryUrl>https://gitea.khongisa.co.za/litecharms/components.git</RepositoryUrl>
    <RepositoryType>git</RepositoryType>
    <PackageLicenseFile>LICENSE</PackageLicenseFile>
    <PackageTags>utility;dotnet</PackageTags>
    <PackageIcon>icon.png</PackageIcon>
  </PropertyGroup>
  <ItemGroup>
    <None Include="..\LICENSE" Pack="true" PackagePath="\" />
    <None Include="..\icon.png" Pack="true" PackagePath="\" />
  </ItemGroup>
  <!-- Quartz Scheduler-->
  <ItemGroup>
    <PackageReference Include="OpenTelemetry" Version="1.15.3" />
    <PackageReference Include="Quartz" Version="3.18.1" />
    <PackageReference Include="Quartz.Plugins" Version="3.18.1" />
    <PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.18.1" />
    <PackageReference Include="Quartz.Serialization.SystemTextJson" Version="3.18.1" />
    <PackageReference Include="Quartz.AspNetCore" Version="3.18.1" />
    <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.18.1" />
    <!-- Global Usings -->
    <Using Include="Quartz" />
  </ItemGroup>
  <!-- Configuration -->
  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.8" />
    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.8" />
    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.8" />
    <!-- Global Usings -->
    <Using Include="Microsoft.Extensions.Configuration" />
  </ItemGroup>
  <!-- Health Checks -->
  <ItemGroup>
    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
    <PackageReference Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
    <PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="9.0.0" />
    <PackageReference Include="AspNetCore.HealthChecks.UI.Data" Version="9.0.0" />
    <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.8" />
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.8" />
    <!-- Global Usings -->
    <Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
    <Using Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" />
  </ItemGroup>
  <!-- Open Telemetry -->
  <ItemGroup>
    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
    <!-- Global Usings -->
    <Using Include="OpenTelemetry.Resources" />
    <Using Include="OpenTelemetry.Exporter" />
    <Using Include="OpenTelemetry.Logs" />
    <Using Include="OpenTelemetry.Metrics" />
    <Using Include="OpenTelemetry.Trace" />
  </ItemGroup>
  <!-- Database -->
  <ItemGroup>
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.8" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
    <!-- Global Usings -->
    <Using Include="Npgsql" />
    <Using Include="Microsoft.EntityFrameworkCore" />
    <Using Include="Microsoft.EntityFrameworkCore.Design" />
    <Using Include="Microsoft.EntityFrameworkCore.Metadata.Builders" />
  </ItemGroup>
  <!-- Email -->
  <ItemGroup>
    <PackageReference Include="MailKit" Version="4.16.0" />
    <PackageReference Include="MimeKit" Version="4.16.0" />
    <!-- Global Usings-->
    <Using Include="MimeKit" />
    <Using Include="MailKit.Net.Smtp" />
  </ItemGroup>
  <!-- CQRS -->
  <ItemGroup>
    <PackageReference Include="FluentResults" Version="4.0.0" />
    <PackageReference Include="Mediator.Abstractions" Version="3.0.2" />
    <!-- Global Usings -->
    <Using Include="FluentResults" />
    <Using Include="Mediator" />
  </ItemGroup>
  <!-- Amazon S3 SDK -->
  <ItemGroup>
    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.1" />
    <PackageReference Include="AWSSDK.S3" Version="4.0.23.4" />
    <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
    <!-- global Usings -->
    <Using Include="Amazon.S3" />
    <Using Include="Amazon.S3.Model" />
    <Using Include="Amazon.Runtime" />
  </ItemGroup>
  <!-- Shared Usings -->
  <ItemGroup>
    <Using Include="Microsoft.AspNetCore.Builder" />
    <Using Include="Microsoft.Extensions.Hosting" />
    <Using Include="System.Text" />
    <Using Include="System.Text.Json" />
    <Using Include="System.Threading.Channels" />
    <Using Include="System.Collections.ObjectModel" />
    <Using Include="System.Diagnostics" />
    <Using Include="System.Diagnostics.Metrics" />
    <Using Include="Microsoft.Extensions.DependencyInjection" />
    <Using Include="System.Security.Cryptography" />
    <Using Include="Microsoft.Extensions.Options" />
    <Using Include="Microsoft.Extensions.Logging" />
  </ItemGroup>
  <ItemGroup>
    <None Update="appsettings.json">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
  </ItemGroup>
 </Project>
@@ -1,39 +0,0 @@
 using LiteCharms.Features.TechShop.CartPackages.Entities;
 using LiteCharms.Features.TechShop.Customers.Entities;
 using LiteCharms.Features.TechShop.Leads.Entities;
 using LiteCharms.Features.TechShop.Notifications.Entities;
 using LiteCharms.Features.TechShop.Orders.Entities;
 using LiteCharms.Features.TechShop.Products.Entities;
 using LiteCharms.Features.TechShop.Quotes.Entities;
 using LiteCharms.Features.TechShop.ShoppingCarts.Entities;
 namespace LiteCharms.Features.TechShop.Postgres;
 public class ShopDbContext(DbContextOptions<ShopDbContext> options) : DbContext(options)
 {
    public DbSet<Customer> Customers { get; set; }
    public DbSet<Lead> Leads { get; set; }
    public DbSet<Order> Orders { get; set; }
    public DbSet<OrderRefund> OrderRefunds { get; set; }
    public DbSet<Product> Products { get; set; }
    public DbSet<ProductPrice> ProductPrices { get; set; }
    public DbSet<Notification> Notifications { get; set; }
    public DbSet<Quote> Quotes { get; set; }
    public DbSet<ShoppingCart> ShoppingCarts { get; set; }
    public DbSet<ShoppingCartItem> ShoppingCartItems { get; set; }
    public DbSet<Package> Packages { get; set; }
    public DbSet<PackageItem> PackageItems { get; set; }
    public DbSet<ShoppingCartPackage> ShoppingCartPackages { get; set; }
 }
@@ -1,22 +0,0 @@
 {
  "Email": {
    "Credentials": {
      "Username": "shop@litecharms.co.za"
    },
    "Port": 465,
    "Host": "mail.litecharms.co.za",
    "UseSsl": true
  },
  "Monitoring": {
    "ApiKey": "",
    "Address": "http://aspire-dashboard-service.aspire.svc.cluster.local:18889",
    "ServiceName": "LiteCharms.LeadGenerator"
  },
  "Logging": {
    "LogLevel": {
      "Default": "Information",
      "Microsoft.AspNetCore": "Warning"
    }
  },
  "AllowedHosts": "*"
 }
@@ -2,7 +2,7 @@
 namespace LiteCharms.Features.Tests;
-public class Fixture : IDisposable
+public class CommonFixture : IDisposable
 {
    public IConfiguration Configuration { get; set; }
@@ -10,11 +10,11 @@ public class Fixture : IDisposable
    public IMediator Mediator { get; set; }
-    public Fixture()
+    public CommonFixture()
    {
        Configuration = new ConfigurationBuilder()
            .SetBasePath(Directory.GetCurrentDirectory())
-            .AddUserSecrets<Fixture>()
+            .AddUserSecrets<CommonFixture>()
            .AddJsonFile(Path.Combine(Directory.GetCurrentDirectory(), "appsettings.json"), optional: true, reloadOnChange: true)
            .AddEnvironmentVariables()
            .Build();
@@ -22,8 +22,10 @@ public class Fixture : IDisposable
        Services = new ServiceCollection()            
            .AddMediator()
            .AddLogging()
            .AddShopServices()
            .AddEmailServiceBus()
            .AddGarageS3(Configuration)
            .AddShopDatabase(Configuration)
            .AddEmailServices(Configuration)
            .AddSingleton(Configuration)
            .BuildServiceProvider();
@@ -9,7 +9,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="10.0.1">
+    <PackageReference Include="coverlet.collector" Version="10.0.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
@@ -1,28 +1,27 @@
 using LiteCharms.Features.Models;
-using LiteCharms.Features.TechShop.Notifications;
+using LiteCharms.Features.Shop.Notifications;
-using LiteCharms.Features.TechShop.Notifications.Events;
+using LiteCharms.Features.Shop.Notifications.Events;
 using static LiteCharms.Features.Extensions.Email;
-namespace LiteCharms.Features.TechShop.Tests;
+namespace LiteCharms.Features.Tests;
-public class NotificationsFeatureTests(Fixture fixture, ITestOutputHelper output) : IClassFixture<Fixture>
+public class NotificationsFeatureTests(CommonFixture fixture, ITestOutputHelper output) : IClassFixture<CommonFixture>
 {
    private readonly NotificationService notificationService = fixture.Services.GetRequiredService<NotificationService>();
    [Fact]
    public async Task CreateNotificationCommand_ShouldSucceed()
    {
-        Notifications.Models.CreateNotification request = new()
+        Shop.Notifications.Models.CreateNotification request = new()
        {
            CorrelationId = Guid.CreateVersion7().ToString(),
-            CorrelationIdType = CorrelationIdTypes.None,
+            CorrelationIdType = Shop.CorrelationIdTypes.None,
-            Direction = NotificationDirection.Outgoing,
+            Direction = Shop.NotificationDirection.Outgoing,
-            Platform = NotificationPlatforms.Email,
+            Platform = Shop.NotificationPlatforms.Email,
-            Priority = Priorities.Medium,
+            Priority = Shop.Priorities.Medium,
            Sender = "xUnit Test",
            SenderAddress = "khwezi@mngoma.africa",
-            Recipient = $"{ShopEmailFromName} [Test]",
+            Recipient = $"{Email.Extensions.Constants.ShopEmailFromName} [Test]",
-            RecipientAddress = ShopEmailFromAddress,
+            RecipientAddress = Email.Extensions.Constants.ShopEmailFromAddress,
            Subject = "Test Message",
            Message = "This is an automation test",
            IsHtml = false,
@@ -2,7 +2,7 @@
 namespace LiteCharms.Features.Tests;
-public class S3ServiceFeatureTests(Fixture fixture, ITestOutputHelper output) : IClassFixture<Fixture>
+public class S3ServiceFeatureTests(CommonFixture fixture, ITestOutputHelper output) : IClassFixture<CommonFixture>
 {
    [Fact]
    public async Task BookshopS3Service_MustReturnUrl()
@@ -1,6 +1,7 @@
 using LiteCharms.Features.Email.Configuration;
 using LiteCharms.Features.Email.Extensions;
 using LiteCharms.Features.Email.Models;
 using LiteCharms.Features.Shop;
 namespace LiteCharms.Features.Email;
@@ -1,12 +1,14 @@
-using static LiteCharms.Features.Extensions.Email;
+using LiteCharms.Features.Shop;
 using LiteCharms.Features.Shop.Notifications;
 using static LiteCharms.Features.Email.Extensions.Constants;
-namespace LiteCharms.Features.TechShop.Notifications.Events.Handlers;
+namespace LiteCharms.Features.Email.Events.Handlers;
 public class SendShopEmailEnquiryEventHandler(NotificationService notificationService) : 
    INotificationHandler<SendShopEmailEnquiryEvent>
 {
    public async ValueTask Handle(SendShopEmailEnquiryEvent notification, CancellationToken cancellationToken) =>
-        await notificationService.CreateNotificationAsync(new Models.CreateNotification
+        await notificationService.CreateNotificationAsync(new Shop.Notifications.Models.CreateNotification
        {
            CorrelationId = notification.CorrelationId,
            CorrelationIdType = CorrelationIdTypes.None,
@@ -1,6 +1,7 @@
 using LiteCharms.Features.Abstractions;
 using LiteCharms.Features.Shop;
-namespace LiteCharms.Features.TechShop.Notifications.Events;
+namespace LiteCharms.Features.Email.Events;
 public class SendShopEmailEnquiryEvent : EventBase, IEvent
 {
@@ -0,0 +1,8 @@
 namespace LiteCharms.Features.Email.Extensions;
 public static class Constants
 {
    public const string ShopSchedulerName = "shop";
    public const string ShopEmailFromName = "Khongisa Shop";
    public const string ShopEmailFromAddress = "shop@litecharms.co.za";
 }
@@ -1,4 +1,6 @@
-namespace LiteCharms.Features.Email.Models;
+using LiteCharms.Features.Shop;
 namespace LiteCharms.Features.Email.Models;
 public class Response
 {
@@ -1,20 +0,0 @@
 namespace LiteCharms.Features;
 public enum EmailStatuses : int
 {
    GeneralError = 0,
    AuthenticationError = 1,
    ProtocolError = 2,
    Connected = 3,
    Disconnected = 4,
    TooManyConnections = 5,
    ConnectionAborted = 6,
    Success = 7
 }
 public enum Priorities : int
 {
    Low = 0,
    Medium = 1,
    High = 2,
 }
@@ -5,9 +5,6 @@ namespace LiteCharms.Features.Extensions;
 public static class Email
 {
    public const string ShopEmailFromName = "Khongisa Shop";
    public const string ShopEmailFromAddress = "shop@litecharms.co.za";
    public static IServiceCollection AddEmailServices(this IServiceCollection services, IConfiguration configuration)
    {
        services.Configure<SmtpSettings>(configuration.GetSection("Email"));
@@ -1,18 +1,17 @@
-using LiteCharms.Features.TechShop.CartPackages.Models;
+using LiteCharms.Features.Shop.CartPackages.Models;
-using LiteCharms.Features.TechShop.Customers.Models;
+using LiteCharms.Features.Shop.Customers.Models;
-using LiteCharms.Features.TechShop.Leads.Models;
+using LiteCharms.Features.Shop.Leads.Models;
-using LiteCharms.Features.TechShop.Notifications.Models;
+using LiteCharms.Features.Shop.Notifications.Models;
-using LiteCharms.Features.TechShop.Orders.Models;
+using LiteCharms.Features.Shop.Orders.Models;
-using LiteCharms.Features.TechShop.Products.Entities;
+using LiteCharms.Features.Shop.Products.Models;
-using LiteCharms.Features.TechShop.Products.Models;
+using LiteCharms.Features.Shop.Quotes.Models;
-using LiteCharms.Features.TechShop.Quotes.Models;
+using LiteCharms.Features.Shop.ShoppingCarts.Models;
 using LiteCharms.Features.TechShop.ShoppingCarts.Models;
-namespace LiteCharms.Features.TechShop.Extensions;
+namespace LiteCharms.Features.Extensions;
-public static class Mappers
+public static class EntityModeMappers
 {
-    public static ShoppingCartPackage ToModel(this ShoppingCarts.Entities.ShoppingCartPackage entity) =>
+    public static ShoppingCartPackage ToModel(this Features.Shop.ShoppingCarts.Entities.ShoppingCartPackage entity) =>
        new()
        {
            Id = entity.Id,
@@ -21,7 +20,7 @@ public static class Mappers
            ShoppingCartId = entity.ShoppingCartId            
        };
-    public static PackageItem ToModel(this CartPackages.Entities.PackageItem entity) =>
+    public static PackageItem ToModel(this Features.Shop.CartPackages.Entities.PackageItem entity) =>
        new()
        {
            Id = entity.Id,
@@ -31,7 +30,7 @@ public static class Mappers
            ProductPriceId = entity.ProductPriceId
        };
-    public static Package ToModel(this CartPackages.Entities.Package entity) =>
+    public static Package ToModel(this Features.Shop.CartPackages.Entities.Package entity) =>
        new()
        {
            Id = entity.Id,
@@ -44,7 +43,7 @@ public static class Mappers
            Summary = entity.Summary
        };
-    public static ShoppingCartItem ToModel(this ShoppingCarts.Entities.ShoppingCartItem entity) =>
+    public static ShoppingCartItem ToModel(this Features.Shop.ShoppingCarts.Entities.ShoppingCartItem entity) =>
        new()
        {
            Id = entity.Id,
@@ -55,7 +54,7 @@ public static class Mappers
            ShoppingCartId = entity.ShoppingCartId
        };
-    public static ShoppingCart ToModel(this ShoppingCarts.Entities.ShoppingCart entity) =>
+    public static ShoppingCart ToModel(this Features.Shop.ShoppingCarts.Entities.ShoppingCart entity) =>
        new()
        {
            Id = entity.Id,
@@ -65,7 +64,7 @@ public static class Mappers
            OrderId = entity.OrderId
        };
-    public static Quote ToModel(this Quotes.Entities.Quote entity) =>
+    public static Quote ToModel(this Features.Shop.Quotes.Entities.Quote entity) =>
        new()
        {
            Id = entity.Id,
@@ -80,7 +79,7 @@ public static class Mappers
            OrderId = entity.OrderId
        };
-    public static Notification ToModel(this Notifications.Entities.Notification entity) =>
+    public static Notification ToModel(this Features.Shop.Notifications.Entities.Notification entity) =>
        new()
        {
            Id = entity.Id,
@@ -104,7 +103,7 @@ public static class Mappers
            Errors = entity.Errors
        };
-    public static Customer ToModel(this Customers.Entities.Customer entity) =>
+    public static Customer ToModel(this Features.Shop.Customers.Entities.Customer entity) =>
        new()
        {
            Id = entity.Id,
@@ -129,7 +128,7 @@ public static class Mappers
            Whatsapp = entity.Whatsapp
        };
-    public static Lead ToModel(this Leads.Entities.Lead entity) =>
+    public static Lead ToModel(this Features.Shop.Leads.Entities.Lead entity) =>
        new()
        {
            Id = entity.Id,
@@ -150,7 +149,7 @@ public static class Mappers
            Status = entity.Status
        };
-    public static Order ToModel(this Orders.Entities.Order entity) =>
+    public static Order ToModel(this Features.Shop.Orders.Entities.Order entity) =>
        new()
        {
            Id = entity.Id,
@@ -164,7 +163,7 @@ public static class Mappers
            InvoiceUrl = entity.InvoiceUrl            
        };
-    public static OrderRefund ToModel(this Orders.Entities.OrderRefund entity) =>
+    public static OrderRefund ToModel(this Features.Shop.Orders.Entities.OrderRefund entity) =>
        new()
        {
            Id = entity.Id,
@@ -174,7 +173,7 @@ public static class Mappers
            Amount = entity.Amount
        };
-    public static Products.Models.Product ToModel(this Products.Entities.Product entity) =>
+    public static Product ToModel(this Features.Shop.Products.Entities.Product entity) =>
        new()
        {
            Id = entity.Id,    
@@ -188,7 +187,7 @@ public static class Mappers
            Metadata = entity.Metadata,
        };
-    public static Products.Models.ProductPrice ToModel(this Products.Entities.ProductPrice entity) =>
+    public static ProductPrice ToModel(this Features.Shop.Products.Entities.ProductPrice entity) =>
        new()
        {
            Id = entity.Id,
@@ -1,20 +1,19 @@
 using LiteCharms.Features.HealthChecks;
 using static LiteCharms.Features.Extensions.Postgres;
 namespace LiteCharms.Features.Extensions;
 public static class HealthChecks
 {
-    public static IServiceCollection AddMidrandShopQuartzHealthCheck(this IServiceCollection services)
+    public static IServiceCollection AddQuartzHealtchCheck(this IServiceCollection services)
    {
-        services.AddHealthChecks().AddCheck<MidrandShopQuartzHealthCheck>("MidrandShopQuartz");
+        services.AddHealthChecks().AddCheck<QuartzHealthCheck>("Quartz");
        return services;
    }
-    public static IServiceCollection AddMidrandShopPostgresHealthCheck(this IServiceCollection services)
+    public static IServiceCollection AddPostgresHealtchCheck(this IServiceCollection services)
    {
-        services.AddHealthChecks().AddCheck<PostgresMidrandShopHealthCheck>(MidrandShopDbConfigName);
+        services.AddHealthChecks().AddCheck<PostgresHealthCheck>("PostgreSQL");
        return services;
    }
@@ -1,16 +1,13 @@
-using LiteCharms.Features.MidrandShop.Postgres;
+using LiteCharms.Features.Shop.Postgres;
 namespace LiteCharms.Features.Extensions;
 public static class Postgres
 {
-    public const string MidrandShopDbConfigName = "PostgresMidrandShop";
+    public static IServiceCollection AddShopDatabase(this IServiceCollection services, IConfiguration configuration)
    public const string SchedulerDbConfigName = "PostgresScheduler";    
    public static IServiceCollection AddMidrandShopDatabase(this IServiceCollection services, IConfiguration configuration)
    {
-        services.AddPooledDbContextFactory<MidrandShopDbContext>(options =>
+        services.AddPooledDbContextFactory<ShopDbContext>(options =>
-            options.UseNpgsql(configuration.GetConnectionString(MidrandShopDbConfigName)));
+            options.UseNpgsql(configuration.GetConnectionString("PostgresShop")));
        return services;
    }
@@ -1,17 +1,15 @@
 using LiteCharms.Features.Quartz;
 using LiteCharms.Features.Quartz.Abstractions;
 using static LiteCharms.Features.Extensions.Postgres;
 namespace LiteCharms.Features.Extensions;
 public static class Quartz
 {
-    public const string ShopSchedulerName = "shop";
+    private const string databaseConfigName = "PostgresScheduler";
    public const string MidrandShopSchedulerName = "midrandshop";
    public static IServiceCollection AddQuartzSchedulerClient(this IServiceCollection services, string schedulerName, IConfiguration configuration)
    {
-        var connectionString = configuration.GetConnectionString(SchedulerDbConfigName);
+        var connectionString = configuration.GetConnectionString(databaseConfigName);
        services.ConfigureCommon();
@@ -46,7 +44,7 @@ public static class Quartz
    public static IServiceCollection AddQuartzScheduler(this IServiceCollection services, string schedulerName, IConfiguration configuration)
    {
-        var connectionString = configuration.GetConnectionString(SchedulerDbConfigName);
+        var connectionString = configuration.GetConnectionString(databaseConfigName);
        services.ConfigureCommon();
@@ -0,0 +1,27 @@
 using LiteCharms.Features.Shop.CartPackages;
 using LiteCharms.Features.Shop.Customers;
 using LiteCharms.Features.Shop.Leads;
 using LiteCharms.Features.Shop.Notifications;
 using LiteCharms.Features.Shop.Orders;
 using LiteCharms.Features.Shop.Products;
 using LiteCharms.Features.Shop.Quotes;
 using LiteCharms.Features.Shop.ShoppingCarts;
 namespace LiteCharms.Features.Extensions;
 public static class Shop
 {
    public static IServiceCollection AddShopServices(this IServiceCollection services)
    {
        services.AddSingleton<PackageService>()
            .AddSingleton<LeadService>()
            .AddSingleton<NotificationService>()
            .AddSingleton<OrderService>()
            .AddSingleton<ProductService>()
            .AddSingleton<QuoteService>()
            .AddSingleton<ShoppingCartService>()
            .AddSingleton<CustomerService>();
        return services;
    }
 }
@@ -1,28 +0,0 @@
 using static LiteCharms.Features.Extensions.Quartz;
 namespace LiteCharms.Features.HealthChecks;
 public class MidrandShopQuartzHealthCheck(ISchedulerFactory schedulerFactory) : IHealthCheck
 {
    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
    {
        try
        {
            var scheduler = await schedulerFactory.GetScheduler(MidrandShopSchedulerName, cancellationToken);
            if(scheduler == null) 
                return HealthCheckResult.Unhealthy($"Scheduler with name '{MidrandShopSchedulerName}' not found.");
            if (!scheduler.IsStarted)
                return HealthCheckResult.Unhealthy($"{MidrandShopSchedulerName} Quartz scheduler is not running");
            await scheduler.CheckExists(new JobKey(Guid.NewGuid().ToString()), cancellationToken);
            return HealthCheckResult.Healthy($"{MidrandShopSchedulerName} Quartz scheduler is ready");
        }
        catch (SchedulerException)
        {
            return HealthCheckResult.Unhealthy($"{MidrandShopSchedulerName} Quartz scheduler cannot connect to the store");
        }
    }
 }
@@ -1,10 +1,8 @@
-using static LiteCharms.Features.TechShop.Extensions.Postgres;
+namespace LiteCharms.Features.HealthChecks;
-namespace LiteCharms.Features.TechShop.HealthChecks;
+public class PostgresHealthCheck(IConfiguration configuration) : IHealthCheck
 public class PostgresShopHealthCheck(IConfiguration configuration) : IHealthCheck
 {
-    private readonly string connectionString = configuration.GetConnectionString(ShopDbConfigName)!;
+    private readonly string connectionString = configuration.GetConnectionString("PostgresShop")!;
    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
    {
@@ -18,11 +16,11 @@ public class PostgresShopHealthCheck(IConfiguration configuration) : IHealthChec
            await command.ExecuteScalarAsync(cancellationToken);
-            return HealthCheckResult.Healthy($"{ShopDbConfigName} is responsive.");
+            return HealthCheckResult.Healthy("PostgreSQL is responsive.");
        }
        catch (Exception ex)
        {
-            return HealthCheckResult.Unhealthy($"{ShopDbConfigName} is unreachable.", ex);
+            return HealthCheckResult.Unhealthy("PostgreSQL is unreachable.", ex);
        }
    }
 }
@@ -1,28 +0,0 @@
 using static LiteCharms.Features.Extensions.Postgres;
 namespace LiteCharms.Features.HealthChecks;
 public class PostgresMidrandShopHealthCheck(IConfiguration configuration) : IHealthCheck
 {
    private readonly string connectionString = configuration.GetConnectionString(MidrandShopDbConfigName)!;
    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
    {
        try
        {
            await using var dataSource = NpgsqlDataSource.Create(connectionString);
            await using var connection = await dataSource.OpenConnectionAsync(cancellationToken);
            await using var command = connection.CreateCommand();
            command.CommandText = "SELECT 1";
            await command.ExecuteScalarAsync(cancellationToken);
            return HealthCheckResult.Healthy($"{MidrandShopDbConfigName} is responsive.");
        }
        catch (Exception ex)
        {
            return HealthCheckResult.Unhealthy($"{MidrandShopDbConfigName} is unreachable.", ex);
        }
    }
 }
@@ -0,0 +1,23 @@
 namespace LiteCharms.Features.HealthChecks;
 public class QuartzHealthCheck(ISchedulerFactory schedulerFactory) : IHealthCheck
 {
    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
    {
        try
        {
            var scheduler = await schedulerFactory.GetScheduler(cancellationToken);
            if (!scheduler.IsStarted)
                return HealthCheckResult.Unhealthy("Quartz scheduler is not running");
            await scheduler.CheckExists(new JobKey(Guid.NewGuid().ToString()), cancellationToken);
            return HealthCheckResult.Healthy("Quartz scheduler is ready");
        }
        catch (SchedulerException)
        {
            return HealthCheckResult.Unhealthy("Quartz scheduler cannot connect to the store");
        }
    }
 }
@@ -131,8 +131,8 @@
  <!-- Amazon S3 SDK -->
  <ItemGroup>
-    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.1" />
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.3.40" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.23.4" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.23.3" />
    <!-- global Usings -->
    <Using Include="Amazon.S3" />
@@ -160,5 +160,8 @@
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
  </ItemGroup>
  <ItemGroup>
    <Folder Include="Shop\Postgres\Migrations\" />
  </ItemGroup>
 </Project>
@@ -1,6 +0,0 @@
 namespace LiteCharms.Features.MidrandShop.Postgres;
 public class MidrandShopDbContext(DbContextOptions<MidrandShopDbContext> options) : DbContext(options)
 {
 }
@@ -1,21 +0,0 @@
 using static LiteCharms.Features.Extensions.Postgres;
 namespace LiteCharms.Features.MidrandShop.Postgres;
 public class MidrandShopDbContextFactory : IDesignTimeDbContextFactory<MidrandShopDbContext>
 {
    public MidrandShopDbContext CreateDbContext(string[] args)
    {
        var configuration = new ConfigurationBuilder()
            .SetBasePath(Directory.GetCurrentDirectory())
            .AddUserSecrets(typeof(MidrandShopDbContext).Assembly)
            .AddJsonFile("appsettings.json")
            .AddEnvironmentVariables()
            .Build();
        var optionsBuilder = new DbContextOptionsBuilder<MidrandShopDbContext>();
        optionsBuilder.UseNpgsql(configuration.GetConnectionString(MidrandShopDbConfigName));
        return new MidrandShopDbContext(optionsBuilder.Options);
    }
 }
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.CartPackages.Entities;
+namespace LiteCharms.Features.Shop.CartPackages.Entities;
 [EntityTypeConfiguration<PackageConfirguration, Package>]
 public class Package : Models.Package
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.CartPackages.Entities;
+namespace LiteCharms.Features.Shop.CartPackages.Entities;
 public class PackageConfirguration : IEntityTypeConfiguration<Package>
 {
@@ -1,6 +1,6 @@
-using LiteCharms.Features.TechShop.Products.Entities;
+using LiteCharms.Features.Shop.Products.Entities;
-namespace LiteCharms.Features.TechShop.CartPackages.Entities;
+namespace LiteCharms.Features.Shop.CartPackages.Entities;
 [EntityTypeConfiguration<PackageItemConfiguration, PackageItem>]
 public class PackageItem : Models.PackageItem
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.CartPackages.Entities;
+namespace LiteCharms.Features.Shop.CartPackages.Entities;
 public class PackageItemConfiguration : IEntityTypeConfiguration<PackageItem>
 {
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.CartPackages.Models;
+namespace LiteCharms.Features.Shop.CartPackages.Models;
 public class Package
 {
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.CartPackages.Models;
+namespace LiteCharms.Features.Shop.CartPackages.Models;
 public class PackageItem
 {
@@ -1,10 +1,9 @@
 using LiteCharms.Features.Extensions;
 using LiteCharms.Features.Models;
-using LiteCharms.Features.TechShop.CartPackages.Models;
+using LiteCharms.Features.Shop.CartPackages.Models;
-using LiteCharms.Features.TechShop.Extensions;
+using LiteCharms.Features.Shop.Postgres;
 using LiteCharms.Features.TechShop.Postgres;
-namespace LiteCharms.Features.TechShop.CartPackages;
+namespace LiteCharms.Features.Shop.CartPackages;
 public class PackageService(IDbContextFactory<ShopDbContext> contextFactory)
 {
@@ -1,10 +1,9 @@
 using LiteCharms.Features.Extensions;
 using LiteCharms.Features.Models;
-using LiteCharms.Features.TechShop.Customers.Models;
+using LiteCharms.Features.Shop.Customers.Models;
-using LiteCharms.Features.TechShop.Extensions;
+using LiteCharms.Features.Shop.Postgres;
 using LiteCharms.Features.TechShop.Postgres;
-namespace LiteCharms.Features.TechShop.Customers;
+namespace LiteCharms.Features.Shop.Customers;
 public class CustomerService(IDbContextFactory<ShopDbContext> contextFactory)
 {
@@ -1,9 +1,9 @@
-using LiteCharms.Features.TechShop.Leads.Entities;
+using LiteCharms.Features.Shop.Leads.Entities;
-using LiteCharms.Features.TechShop.Orders.Entities;
+using LiteCharms.Features.Shop.Orders.Entities;
-using LiteCharms.Features.TechShop.Quotes.Entities;
+using LiteCharms.Features.Shop.Quotes.Entities;
-using LiteCharms.Features.TechShop.ShoppingCarts.Entities;
+using LiteCharms.Features.Shop.ShoppingCarts.Entities;
-namespace LiteCharms.Features.TechShop.Customers.Entities;
+namespace LiteCharms.Features.Shop.Customers.Entities;
 [EntityTypeConfiguration<CustomerConfiguration, Customer>]
 public class Customer : Models.Customer
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Customers.Entities;
+namespace LiteCharms.Features.Shop.Customers.Entities;
 public class CustomerConfiguration : IEntityTypeConfiguration<Customer>
 {
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Customers.Models;
+namespace LiteCharms.Features.Shop.Customers.Models;
 public class Customer
 {
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Customers.Models;
+namespace LiteCharms.Features.Shop.Customers.Models;
 public record CreateCustomer
 {
@@ -1,4 +1,16 @@
-namespace LiteCharms.Features.TechShop;
+namespace LiteCharms.Features.Shop;
 public enum EmailStatuses : int
 {
    GeneralError = 0,
    AuthenticationError = 1,
    ProtocolError = 2,
    Connected = 3,
    Disconnected = 4,
    TooManyConnections = 5,
    ConnectionAborted = 6,
    Success = 7
 }
 public enum CorrelationIdTypes : int
 {
@@ -15,6 +27,13 @@ public enum CorrelationIdTypes : int
    LinkedIn = 10
 }
 public enum Priorities : int
 {
    Low = 0,
    Medium = 1,
    High = 2,
 }
 public enum NotificationPlatforms : int
 {
    Email = 1,
@@ -1,6 +1,6 @@
-using LiteCharms.Features.TechShop.Customers.Entities;
+using LiteCharms.Features.Shop.Customers.Entities;
-namespace LiteCharms.Features.TechShop.Leads.Entities;
+namespace LiteCharms.Features.Shop.Leads.Entities;
 [EntityTypeConfiguration<LeadConfiguration, Lead>]
 public class Lead : Models.Lead
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Leads.Entities;
+namespace LiteCharms.Features.Shop.Leads.Entities;
 public class LeadConfiguration : IEntityTypeConfiguration<Lead>
 {
@@ -1,11 +1,10 @@
 using LiteCharms.Features.Extensions;
 using LiteCharms.Features.Models;
-using LiteCharms.Features.TechShop.Extensions;
+using LiteCharms.Features.Shop.Leads.Models;
-using LiteCharms.Features.TechShop.Leads.Models;
+using LiteCharms.Features.Shop.Postgres;
 using LiteCharms.Features.TechShop.Postgres;
 using static LiteCharms.Features.Extensions.Hash;
-namespace LiteCharms.Features.TechShop.Leads;
+namespace LiteCharms.Features.Shop.Leads;
 public class LeadService(IDbContextFactory<ShopDbContext> contextFactory)
 {
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Leads.Models;
+namespace LiteCharms.Features.Shop.Leads.Models;
 public class Lead
 {
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Leads.Models;
+namespace LiteCharms.Features.Shop.Leads.Models;
 public record CreateLead
 {
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Notifications.Entities;
+namespace LiteCharms.Features.Shop.Notifications.Entities;
 [EntityTypeConfiguration<NotificationConfiguration, Notification>]
 public class Notification : Models.Notification;
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Notifications.Entities;
+namespace LiteCharms.Features.Shop.Notifications.Entities;
 public class NotificationConfiguration : IEntityTypeConfiguration<Notification>
 {
@@ -1,8 +1,9 @@
-using LiteCharms.Features.Email;
+using k8s.KubeConfigModels;
-using LiteCharms.Features.TechShop.Notifications.Models;
+using LiteCharms.Features.Email;
-using LiteCharms.Features.TechShop.Postgres;
+using LiteCharms.Features.Shop.Notifications.Models;
 using LiteCharms.Features.Shop.Postgres;
-namespace LiteCharms.Features.TechShop.Notifications.Events.Handlers;
+namespace LiteCharms.Features.Shop.Notifications.Events.Handlers;
 public class ProcessEmailNotificationsEventHandler(IDbContextFactory<ShopDbContext> contextFactory, ILogger<ProcessEmailNotificationsEvent> logger, 
    EmailService emailService) : INotificationHandler<ProcessEmailNotificationsEvent>
@@ -1,6 +1,6 @@
 using LiteCharms.Features.Abstractions;
-namespace LiteCharms.Features.TechShop.Notifications.Events;
+namespace LiteCharms.Features.Shop.Notifications.Events;
 public class ProcessEmailNotificationsEvent : EventBase, IEvent
 {
@@ -1,6 +1,4 @@
-using LiteCharms.Features.TechShop;
+namespace LiteCharms.Features.Shop.Notifications.Models;
 namespace LiteCharms.Features.TechShop.Notifications.Models;
 public class Notification
 {
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Notifications.Models;
+namespace LiteCharms.Features.Shop.Notifications.Models;
 public record CreateNotification
 {
@@ -1,10 +1,9 @@
 using LiteCharms.Features.Extensions;
 using LiteCharms.Features.Models;
-using LiteCharms.Features.TechShop.Extensions;
+using LiteCharms.Features.Shop.Notifications.Models;
-using LiteCharms.Features.TechShop.Notifications.Models;
+using LiteCharms.Features.Shop.Postgres;
 using LiteCharms.Features.TechShop.Postgres;
-namespace LiteCharms.Features.TechShop.Notifications;
+namespace LiteCharms.Features.Shop.Notifications;
 public class NotificationService(IDbContextFactory<ShopDbContext> contextFactory)
 {
@@ -1,8 +1,8 @@
-using LiteCharms.Features.TechShop.Customers.Entities;
+using LiteCharms.Features.Shop.Customers.Entities;
-using LiteCharms.Features.TechShop.Quotes.Entities;
+using LiteCharms.Features.Shop.Quotes.Entities;
-using LiteCharms.Features.TechShop.ShoppingCarts.Entities;
+using LiteCharms.Features.Shop.ShoppingCarts.Entities;
-namespace LiteCharms.Features.TechShop.Orders.Entities;
+namespace LiteCharms.Features.Shop.Orders.Entities;
 [EntityTypeConfiguration<OrderConfiguration, Order>]
 public class Order : Models.Order
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Orders.Entities;
+namespace LiteCharms.Features.Shop.Orders.Entities;
 public class OrderConfiguration : IEntityTypeConfiguration<Order>
 {
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Orders.Entities;
+namespace LiteCharms.Features.Shop.Orders.Entities;
 [EntityTypeConfiguration<OrderRefundConfiguration, OrderRefund>]
 public class OrderRefund : Models.OrderRefund
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Orders.Entities;
+namespace LiteCharms.Features.Shop.Orders.Entities;
 public class OrderRefundConfiguration : IEntityTypeConfiguration<OrderRefund>
 {
@@ -1,6 +1,4 @@
-using LiteCharms.Features.TechShop;
+namespace LiteCharms.Features.Shop.Orders.Models;
 namespace LiteCharms.Features.TechShop.Orders.Models;
 public class Order
 {
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Orders.Models;
+namespace LiteCharms.Features.Shop.Orders.Models;
 public class OrderRefund
 {
@@ -1,6 +1,4 @@
-using LiteCharms.Features.TechShop;
+namespace LiteCharms.Features.Shop.Orders.Models;
 namespace LiteCharms.Features.TechShop.Orders.Models;
 public record CreateOrder
 {
@@ -1,10 +1,9 @@
 using LiteCharms.Features.Extensions;
 using LiteCharms.Features.Models;
-using LiteCharms.Features.TechShop.Extensions;
+using LiteCharms.Features.Shop.Orders.Models;
-using LiteCharms.Features.TechShop.Orders.Models;
+using LiteCharms.Features.Shop.Postgres;
 using LiteCharms.Features.TechShop.Postgres;
-namespace LiteCharms.Features.TechShop.Orders;
+namespace LiteCharms.Features.Shop.Orders;
 public class OrderService(IDbContextFactory<ShopDbContext> contextFactory)
 {
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using LiteCharms.Features.TechShop.Postgres;
+using LiteCharms.Features.Shop.Postgres;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
@@ -9,7 +9,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 #nullable disable
-namespace LiteCharms.Features.TechShop.Postgres.Migrations
+namespace LiteCharms.Features.Shop.Postgres.Migrations
 {
    [DbContext(typeof(ShopDbContext))]
    [Migration("20260512065421_Init")]
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 #nullable disable
-namespace LiteCharms.Features.TechShop.Postgres.Migrations
+namespace LiteCharms.Features.Shop.Postgres.Migrations
 {
    /// <inheritdoc />
    public partial class Init : Migration
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using LiteCharms.Features.TechShop.Postgres;
+using LiteCharms.Features.Shop.Postgres;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
@@ -9,7 +9,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 #nullable disable
-namespace LiteCharms.Features.TechShop.Postgres.Migrations
+namespace LiteCharms.Features.Shop.Postgres.Migrations
 {
    [DbContext(typeof(ShopDbContext))]
    [Migration("20260514004002_UsedStringTableNames")]
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 #nullable disable
-namespace LiteCharms.Features.TechShop.Postgres.Migrations
+namespace LiteCharms.Features.Shop.Postgres.Migrations
 {
    /// <inheritdoc />
    public partial class UsedStringTableNames : Migration
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using LiteCharms.Features.TechShop.Postgres;
+using LiteCharms.Features.Shop.Postgres;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
@@ -9,7 +9,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 #nullable disable
-namespace LiteCharms.Features.TechShop.Postgres.Migrations
+namespace LiteCharms.Features.Shop.Postgres.Migrations
 {
    [DbContext(typeof(ShopDbContext))]
    [Migration("20260515055221_FixedLeadCustomerRelationship")]
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 #nullable disable
-namespace LiteCharms.Features.TechShop.Postgres.Migrations
+namespace LiteCharms.Features.Shop.Postgres.Migrations
 {
    /// <inheritdoc />
    public partial class FixedLeadCustomerRelationship : Migration
@@ -1,7 +1,7 @@
 // <auto-generated />
 using System;
-using LiteCharms.Features.TechShop.Postgres;
+using LiteCharms.Features.Shop.Postgres;
-using LiteCharms.Features.TechShop.Products.Models;
+using LiteCharms.Features.Shop.Products.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
@@ -10,7 +10,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 #nullable disable
-namespace LiteCharms.Features.TechShop.Postgres.Migrations
+namespace LiteCharms.Features.Shop.Postgres.Migrations
 {
    [DbContext(typeof(ShopDbContext))]
    [Migration("20260520191059_AddedProductMetadata")]
@@ -1,10 +1,10 @@
 using System;
-using LiteCharms.Features.TechShop.Products.Models;
+using LiteCharms.Features.Shop.Products.Models;
 using Microsoft.EntityFrameworkCore.Migrations;
 #nullable disable
-namespace LiteCharms.Features.TechShop.Postgres.Migrations
+namespace LiteCharms.Features.Shop.Postgres.Migrations
 {
    /// <inheritdoc />
    public partial class AddedProductMetadata : Migration
@@ -1,7 +1,7 @@
 // <auto-generated />
 using System;
-using LiteCharms.Features.TechShop.Postgres;
+using LiteCharms.Features.Shop.Postgres;
-using LiteCharms.Features.TechShop.Products.Models;
+using LiteCharms.Features.Shop.Products.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
@@ -9,7 +9,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 #nullable disable
-namespace LiteCharms.Features.TechShop.Postgres.Migrations
+namespace LiteCharms.Features.Shop.Postgres.Migrations
 {
    [DbContext(typeof(ShopDbContext))]
    partial class ShopDbContextModelSnapshot : ModelSnapshot
@@ -0,0 +1,69 @@
 using LiteCharms.Features.Shop.CartPackages.Entities;
 using LiteCharms.Features.Shop.Customers.Entities;
 using LiteCharms.Features.Shop.Leads.Entities;
 using LiteCharms.Features.Shop.Notifications.Entities;
 using LiteCharms.Features.Shop.Orders.Entities;
 using LiteCharms.Features.Shop.Products.Entities;
 using LiteCharms.Features.Shop.Quotes.Entities;
 using LiteCharms.Features.Shop.ShoppingCarts.Entities;
 namespace LiteCharms.Features.Shop.Postgres;
 public class ShopDbContext(DbContextOptions<ShopDbContext> options) : DbContext(options)
 {
    public DbSet<Customer> Customers { get; set; }
    public DbSet<Lead> Leads { get; set; }
    public DbSet<Order> Orders { get; set; }
    public DbSet<OrderRefund> OrderRefunds { get; set; }
    public DbSet<Product> Products { get; set; }
    public DbSet<ProductPrice> ProductPrices { get; set; }
    public DbSet<Notification> Notifications { get; set; }
    public DbSet<Quote> Quotes { get; set; }
    public DbSet<ShoppingCart> ShoppingCarts { get; set; }
    public DbSet<ShoppingCartItem> ShoppingCartItems { get; set; }
    public DbSet<Package> Packages { get; set; }
    public DbSet<PackageItem> PackageItems { get; set; }
    public DbSet<ShoppingCartPackage> ShoppingCartPackages { get; set; }
    //protected override void OnModelCreating(ModelBuilder modelBuilder)
    //{
    //    modelBuilder.Ignore<Customers.Models.Customer>();
    //    modelBuilder.Ignore<Leads.Models.Lead>();
    //    modelBuilder.Ignore<Orders.Models.Order>();
    //    modelBuilder.Ignore<Products.Models.Product>();
    //    modelBuilder.Ignore<Notifications.Models.Notification>();
    //    modelBuilder.Ignore<Quotes.Models.Quote>();
    //    modelBuilder.Ignore<ShoppingCarts.Models.ShoppingCart>();
    //    modelBuilder.Ignore<ShoppingCarts.Models.ShoppingCartItem>();
    //    modelBuilder.Ignore<CartPackages.Models.Package>();
    //    modelBuilder.Ignore<CartPackages.Models.PackageItem>();
    //    modelBuilder.Ignore<ShoppingCarts.Models.ShoppingCartPackage>();
    //    modelBuilder.ApplyConfiguration(new CustomerConfiguration());
    //    modelBuilder.ApplyConfiguration(new LeadConfiguration());
    //    modelBuilder.ApplyConfiguration(new OrderConfiguration());
    //    modelBuilder.ApplyConfiguration(new ProductConfiguration());
    //    modelBuilder.ApplyConfiguration(new ProductPriceConfiguration());
    //    modelBuilder.ApplyConfiguration(new NotificationConfiguration());
    //    modelBuilder.ApplyConfiguration(new QuoteConfiguration());
    //    modelBuilder.ApplyConfiguration(new ShoppingCartConfiguration());
    //    modelBuilder.ApplyConfiguration(new ShoppingCartItemConfiguration());
    //    modelBuilder.ApplyConfiguration(new PackageConfirguration());
    //    modelBuilder.ApplyConfiguration(new PackageItemConfiguration());
    //    modelBuilder.ApplyConfiguration(new ShoppingCartPackageConfiguration());
    //    base.OnModelCreating(modelBuilder);
    //}
 }
@@ -1,6 +1,4 @@
-using static LiteCharms.Features.TechShop.Extensions.Postgres;
+namespace LiteCharms.Features.Shop.Postgres;
 namespace LiteCharms.Features.TechShop.Postgres;
 public class ShopDbContextFactory : IDesignTimeDbContextFactory<ShopDbContext>
 {
@@ -14,7 +12,7 @@ public class ShopDbContextFactory : IDesignTimeDbContextFactory<ShopDbContext>
            .Build();
        var optionsBuilder = new DbContextOptionsBuilder<ShopDbContext>();
-        optionsBuilder.UseNpgsql(configuration.GetConnectionString(ShopDbConfigName));
+        optionsBuilder.UseNpgsql(configuration.GetConnectionString("PostgresShop"));
        return new ShopDbContext(optionsBuilder.Options);
    }
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Products.Entities;
+namespace LiteCharms.Features.Shop.Products.Entities;
 [EntityTypeConfiguration<ProductConfiguration, Product>]
 public class Product : Models.Product
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Products.Entities;
+namespace LiteCharms.Features.Shop.Products.Entities;
 public class ProductConfiguration : IEntityTypeConfiguration<Product>
 {
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Products.Entities;
+namespace LiteCharms.Features.Shop.Products.Entities;
 [EntityTypeConfiguration<ProductPriceConfiguration, ProductPrice>]
 public class ProductPrice : Models.ProductPrice
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Products.Entities;
+namespace LiteCharms.Features.Shop.Products.Entities;
 public class ProductPriceConfiguration : IEntityTypeConfiguration<ProductPrice>
 {
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
-namespace LiteCharms.Features.TechShop.Products.Models;
+namespace LiteCharms.Features.Shop.Products.Models;
 public class CreateProductModel
 {
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Products.Models;
+namespace LiteCharms.Features.Shop.Products.Models;
 public class Product
 {
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Products.Models;
+namespace LiteCharms.Features.Shop.Products.Models;
 public class ProductMetadata
 {
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Products.Models;
+namespace LiteCharms.Features.Shop.Products.Models;
 public class ProductPrice
 {
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Products.Models;
+namespace LiteCharms.Features.Shop.Products.Models;
 public record CreateProduct
 {
@@ -1,8 +1,8 @@
-using LiteCharms.Features.TechShop.Extensions;
+using LiteCharms.Features.Extensions;
-using LiteCharms.Features.TechShop.Postgres;
+using LiteCharms.Features.Shop.Postgres;
-using LiteCharms.Features.TechShop.Products.Models;
+using LiteCharms.Features.Shop.Products.Models;
-namespace LiteCharms.Features.TechShop.Products;
+namespace LiteCharms.Features.Shop.Products;
 public class ProductService(IDbContextFactory<ShopDbContext> contextFactory)
 {
@@ -1,8 +1,8 @@
-using LiteCharms.Features.TechShop.Customers.Entities;
+using LiteCharms.Features.Shop.Customers.Entities;
-using LiteCharms.Features.TechShop.Orders.Entities;
+using LiteCharms.Features.Shop.Orders.Entities;
-using LiteCharms.Features.TechShop.ShoppingCarts.Entities;
+using LiteCharms.Features.Shop.ShoppingCarts.Entities;
-namespace LiteCharms.Features.TechShop.Quotes.Entities;
+namespace LiteCharms.Features.Shop.Quotes.Entities;
 [EntityTypeConfiguration<QuoteConfiguration, Quote>]
 public class Quote : Models.Quote
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Quotes.Entities;
+namespace LiteCharms.Features.Shop.Quotes.Entities;
 public class QuoteConfiguration : IEntityTypeConfiguration<Quote>
 {
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.Quotes.Models;
+namespace LiteCharms.Features.Shop.Quotes.Models;
 public class Quote
 {
@@ -1,10 +1,9 @@
 using LiteCharms.Features.Extensions;
 using LiteCharms.Features.Models;
-using LiteCharms.Features.TechShop.Extensions;
+using LiteCharms.Features.Shop.Postgres;
-using LiteCharms.Features.TechShop.Postgres;
+using LiteCharms.Features.Shop.Quotes.Models;
 using LiteCharms.Features.TechShop.Quotes.Models;
-namespace LiteCharms.Features.TechShop.Quotes;
+namespace LiteCharms.Features.Shop.Quotes;
 public class QuoteService(IDbContextFactory<ShopDbContext> contextFactory)
 {
@@ -1,8 +1,8 @@
-using LiteCharms.Features.TechShop.Customers.Entities;
+using LiteCharms.Features.Shop.Customers.Entities;
-using LiteCharms.Features.TechShop.Orders.Entities;
+using LiteCharms.Features.Shop.Orders.Entities;
-using LiteCharms.Features.TechShop.Quotes.Entities;
+using LiteCharms.Features.Shop.Quotes.Entities;
-namespace LiteCharms.Features.TechShop.ShoppingCarts.Entities;
+namespace LiteCharms.Features.Shop.ShoppingCarts.Entities;
 [EntityTypeConfiguration<ShoppingCartConfiguration, ShoppingCart>]
 public class ShoppingCart : Models.ShoppingCart
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.ShoppingCarts.Entities;
+namespace LiteCharms.Features.Shop.ShoppingCarts.Entities;
 public class ShoppingCartConfiguration : IEntityTypeConfiguration<ShoppingCart>
 {
@@ -1,6 +1,6 @@
-using LiteCharms.Features.TechShop.Products.Entities;
+using LiteCharms.Features.Shop.Products.Entities;
-namespace LiteCharms.Features.TechShop.ShoppingCarts.Entities;
+namespace LiteCharms.Features.Shop.ShoppingCarts.Entities;
 [EntityTypeConfiguration<ShoppingCartItemConfiguration, ShoppingCartItem>]
 public class ShoppingCartItem : Models.ShoppingCartItem
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.ShoppingCarts.Entities;
+namespace LiteCharms.Features.Shop.ShoppingCarts.Entities;
 public class ShoppingCartItemConfiguration : IEntityTypeConfiguration<ShoppingCartItem>
 {
@@ -1,6 +1,6 @@
-using LiteCharms.Features.TechShop.CartPackages.Entities;
+using LiteCharms.Features.Shop.CartPackages.Entities;
-namespace LiteCharms.Features.TechShop.ShoppingCarts.Entities;
+namespace LiteCharms.Features.Shop.ShoppingCarts.Entities;
 [EntityTypeConfiguration<ShoppingCartPackageConfiguration, ShoppingCartPackage>]
 public class ShoppingCartPackage : Models.ShoppingCartPackage
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.ShoppingCarts.Entities;
+namespace LiteCharms.Features.Shop.ShoppingCarts.Entities;
 public class ShoppingCartPackageConfiguration : IEntityTypeConfiguration<ShoppingCartPackage>
 {
@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.TechShop.ShoppingCarts.Models;
+namespace LiteCharms.Features.Shop.ShoppingCarts.Models;
 public class ShoppingCart
 {
--- a/Show More
+++ b/Show More