Merge pull request 'Updated how i use configs' (#33) from s3service into master

Reviewed-on: #33

.drone.yml

@@ -16,31 +16,10 @@ steps:
       NEXUS_KEY: { from_secret: nexus_api_key }
       NEXUS_URL: https://nexus.khongisa.co.za/repository/nuget-hosted/
       VERSION: 1.${DRONE_BUILD_NUMBER}.0
-    commands:
+    commands:      
-      # Abstractions
-      - dotnet pack LiteCharms.Abstractions/LiteCharms.Abstractions.csproj -c Release -p:PackageVersion=$VERSION -o dist/
-      - dotnet nuget push dist/LiteCharms.Abstractions.$VERSION.nupkg --api-key $NEXUS_KEY --source $NEXUS_URL
-
-      # Models
-      - dotnet pack LiteCharms.Models/LiteCharms.Models.csproj -c Release -p:PackageVersion=$VERSION -o dist/
-      - dotnet nuget push dist/LiteCharms.Models.$VERSION.nupkg --api-key $NEXUS_KEY --source $NEXUS_URL
-
-      # Infrastructure
-      - dotnet pack LiteCharms.Infrastructure/LiteCharms.Infrastructure.csproj -c Release -p:PackageVersion=$VERSION -o dist/
-      - dotnet nuget push dist/LiteCharms.Infrastructure.$VERSION.nupkg --api-key $NEXUS_KEY --source $NEXUS_URL
-
-      # Features
       - 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
 
-      # Extensions
-      - dotnet pack LiteCharms.Extensions/LiteCharms.Extensions.csproj -c Release -p:PackageVersion=$VERSION -o dist/
-      - dotnet nuget push dist/LiteCharms.Extensions.$VERSION.nupkg --api-key $NEXUS_KEY --source $NEXUS_URL
-
-      # Entities
-      - dotnet pack LiteCharms.Entities/LiteCharms.Entities.csproj -c Release -p:PackageVersion=$VERSION -o dist/
-      - dotnet nuget push dist/LiteCharms.Entities.$VERSION.nupkg --api-key $NEXUS_KEY --source $NEXUS_URL
-
   - name: gitea-tag-release
     image: alpine/git
     environment:
@@ -49,6 +28,7 @@ steps:
       GITEA_PASS: { from_secret: git_password }
       VERSION: 1.${DRONE_BUILD_NUMBER}.0
     commands:
+      - echo "169.255.58.144 gitea.khongisa.co.za" >> /etc/hosts
       - apk add --no-cache curl
       - git remote set-url origin https://$${GITEA_USER}:$${GITEA_PASS}@gitea.khongisa.co.za/litecharms/components.git
       - git tag $VERSION
@@ -61,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.Abstractions\n* LiteCharms.Models\n* LiteCharms.Infrastructure\n* LiteCharms.Features\n* LiteCharms.Extensions\n* LiteCharms.Entities\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
              }"

LiteCharms.Abstractions/LiteCharms.Abstractions.csproj

@@ -1,40 +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>
-  </PropertyGroup>
-
-  <!-- Nuget Package Details -->
-  <PropertyGroup>
-    <PackageId>LiteCharms.Abstractions</PackageId>
-    <Version>1.0.20</Version>
-    <Authors>Khwezi Mngoma</Authors>
-    <Company>Lite Charms (PTY) Ltd</Company>
-    <Description>Shared abstractions 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>
-  
-  <ItemGroup>
-    <PackageReference Include="FluentResults" Version="4.0.0" />
-    <PackageReference Include="Mediator.Abstractions" Version="3.0.2" />
-
-    <Using Include="Mediator" />
-    <Using Include="FluentResults" />
-    <Using Include="System.Threading.Channels" />
-  </ItemGroup>
-
-</Project>

LiteCharms.Entities/Configuration/NotificationConfiguration.cs

@@ -1,26 +0,0 @@
-namespace LiteCharms.Entities.Configuration;
-
-public class NotificationConfiguration : IEntityTypeConfiguration<Notification>
-{
-    public void Configure(EntityTypeBuilder<Notification> builder)
-    {
-        builder.ToTable(nameof(Notification));
-
-        builder.HasKey(f => f.Id);
-        builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd();
-        builder.Property(f => f.UpdatedAt).IsRequired(false).ValueGeneratedOnUpdate();
-        builder.Property(f => f.Direction).IsRequired();
-        builder.Property(f => f.Platform).IsRequired();
-        builder.Property(f => f.Priority).IsRequired();
-        builder.Property(f => f.Sender).IsRequired();
-        builder.Property(f => f.Subject).IsRequired();
-        builder.Property(f => f.Message).IsRequired();
-        builder.Property(f => f.Recipient).IsRequired();
-        builder.Property(f => f.RecipientAddress).IsRequired();
-        builder.Property(f => f.CorrelationId).IsRequired();
-        builder.Property(f => f.CorrelationIdType).IsRequired();
-        builder.Property(f => f.IsHtml).HasDefaultValue(false);
-        builder.Property(f => f.IsInternal).HasDefaultValue(true);
-        builder.Property(f => f.Processed).HasDefaultValue(false);
-    }
-}

LiteCharms.Entities/Configuration/OrderConfiguration.cs

@@ -1,32 +0,0 @@
-namespace LiteCharms.Entities.Configuration;
-
-public class OrderConfiguration : IEntityTypeConfiguration<Order>
-{
-    public void Configure(EntityTypeBuilder<Order> builder)
-    {
-        builder.ToTable(nameof(Order));
-
-        builder.HasKey(f => f.Id);
-        builder.Property(f => f.CreatedAt).ValueGeneratedOnAdd();
-        builder.Property(f => f.UpdatedAt).IsRequired(false).ValueGeneratedOnUpdate();
-        builder.Property(f => f.CustomerId).IsRequired();
-        builder.Property(f => f.QuoteId).IsRequired(false);
-        builder.Property(f => f.RefundId).IsRequired(false);
-        builder.Property(f => f.ShoppingCartId).IsRequired();
-        builder.Property(f => f.Status).HasConversion<int>().IsRequired();
-        builder.Property(f => f.Requirements).HasColumnType("jsonb").IsRequired(false);
-        builder.Property(f => f.Notes).HasColumnType("jsonb").IsRequired(false);
-        builder.Property(f => f.Terms).HasColumnType("jsonb").IsRequired(false);
-        builder.Property(f => f.DepositRequired);
-
-        builder.HasOne(f => f.Quote)
-            .WithOne(f => f.Order)
-            .HasForeignKey<Order>(f => f.QuoteId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        builder.HasOne(f => f.Customer)
-            .WithMany(f => f.Orders)
-            .HasForeignKey(f => f.CustomerId)
-            .OnDelete(DeleteBehavior.Restrict);
-    }
-}

LiteCharms.Entities/Configuration/PackageConfirguration.cs

@@ -1,16 +0,0 @@
-namespace LiteCharms.Entities.Configuration;
-
-public class PackageConfirguration : IEntityTypeConfiguration<Package>
-{
-    public void Configure(EntityTypeBuilder<Package> builder)
-    {
-        builder.ToTable(nameof(Package));
-
-        builder.HasKey(f => f.Id);
-        builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd();
-        builder.Property(f => f.UpdatedAt).IsRequired(false).ValueGeneratedOnUpdate();
-        builder.Property(f => f.Name).IsRequired();
-        builder.Property(f => f.Description).IsRequired();
-        builder.Property(f => f.Active);
-    }
-}

LiteCharms.Entities/Configuration/ProductConfiguration.cs

@@ -1,14 +0,0 @@
-namespace LiteCharms.Entities.Configuration;
-
-public class ProductConfiguration : IEntityTypeConfiguration<Product>
-{
-    public void Configure(EntityTypeBuilder<Product> builder)
-    {
-        builder.ToTable(nameof(Product));
-
-        builder.HasKey(f => f.Id);
-        builder.Property(f => f.Name).IsRequired();
-        builder.Property(f => f.Description).IsRequired();
-        builder.Property(f => f.Active).HasDefaultValue(true);
-    }
-}

LiteCharms.Entities/Configuration/QuoteConfiguration.cs

@@ -1,23 +0,0 @@
-namespace LiteCharms.Entities.Configuration;
-
-public class QuoteConfiguration : IEntityTypeConfiguration<Quote>
-{
-    public void Configure(EntityTypeBuilder<Quote> builder)
-    {
-        builder.ToTable(nameof(Quote));
-
-        builder.HasKey(f => f.Id);
-        builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd();
-        builder.Property(f => f.UpdatedAt).IsRequired(false).ValueGeneratedOnUpdate();
-        builder.Property(f => f.ExpiredAt).IsRequired(false);
-        builder.Property(f => f.CustomerId).IsRequired();
-        builder.Property(f => f.Status).IsRequired();
-        builder.Property(f => f.ShoppingCartId).IsRequired();
-        builder.Property(f => f.Reason).IsRequired(false);
-
-        builder.HasOne(f => f.Customer)
-            .WithMany()
-            .HasForeignKey(f => f.CustomerId)
-            .OnDelete(DeleteBehavior.Cascade);
-    }
-}

LiteCharms.Entities/Configuration/ShoppingCartConfiguration.cs

@@ -1,31 +0,0 @@
-namespace LiteCharms.Entities.Configuration;
-
-public class ShoppingCartConfiguration : IEntityTypeConfiguration<ShoppingCart>
-{
-    public void Configure(EntityTypeBuilder<ShoppingCart> builder)
-    {
-        builder.ToTable(nameof(ShoppingCart));
-
-        builder.HasKey(f =>  f.Id);
-        builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd();
-        builder.Property(f => f.UpdatedAt).IsRequired(false).ValueGeneratedOnUpdate();
-        builder.Property(f => f.CustomerId).IsRequired(false);
-        builder.Property(f => f.OrderId).IsRequired(false);
-        builder.Property(f => f.QuoteId).IsRequired(false);        
-
-        builder.HasOne(f => f.Customer)
-            .WithMany(c => c.ShoppingCarts)
-            .HasForeignKey(f => f.CustomerId)
-            .OnDelete(DeleteBehavior.NoAction);
-
-        builder.HasOne(f => f.Order)
-            .WithOne(o => o.ShoppingCart)
-            .HasForeignKey<Order>(o => o.ShoppingCartId)
-            .OnDelete(DeleteBehavior.NoAction);
-
-        builder.HasOne(f => f.Quote)
-            .WithOne(o => o.ShoppingCart)
-            .HasForeignKey<Quote>(o => o.ShoppingCartId)
-            .OnDelete(DeleteBehavior.NoAction);
-    }
-}

LiteCharms.Entities/Configuration/ShoppingCartItemConfiguration.cs

@@ -1,25 +0,0 @@
-namespace LiteCharms.Entities.Configuration;
-
-public class ShoppingCartItemConfiguration : IEntityTypeConfiguration<ShoppingCartItem>
-{
-    public void Configure(EntityTypeBuilder<ShoppingCartItem> builder)
-    {
-        builder.ToTable(nameof(ShoppingCartItem));
-
-        builder.HasKey(f => f.Id);
-        builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd();
-        builder.Property(f => f.UpdatedAt).IsRequired(false).ValueGeneratedOnUpdate();
-        builder.Property(f => f.Quantity).IsRequired().HasDefaultValue(1);
-        builder.Property(f => f.ProductPriceId).IsRequired();
-
-        builder.HasOne(f => f.ProductPrice)
-            .WithMany()
-            .HasForeignKey(f => f.ProductPriceId)
-            .OnDelete(DeleteBehavior.NoAction);
-
-        builder.HasOne(f => f.ShoppingCart)
-            .WithMany(f => f.ShoppingCartItems)
-            .HasForeignKey(f => f.ShoppingCartId)
-            .OnDelete(DeleteBehavior.NoAction);
-    }
-}

LiteCharms.Entities/Configuration/ShoppingCartPackageConfiguration.cs

@@ -1,24 +0,0 @@
-namespace LiteCharms.Entities.Configuration;
-
-public class ShoppingCartPackageConfiguration : IEntityTypeConfiguration<ShoppingCartPackage>
-{
-    public void Configure(EntityTypeBuilder<ShoppingCartPackage> builder)
-    {
-        builder.ToTable(nameof(ShoppingCartPackage));
-
-        builder.HasKey(f => f.Id);
-        builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd();
-        builder.Property(f => f.ShoppingCartId).IsRequired();
-        builder.Property(f => f.PackageId).IsRequired();
-
-        builder.HasOne(f => f.Package)
-            .WithMany()
-            .HasForeignKey(f => f.PackageId)
-            .OnDelete(DeleteBehavior.NoAction);
-
-        builder.HasOne(f => f.ShoppingCart)
-            .WithMany()
-            .HasForeignKey(f => f.ShoppingCartId)
-            .OnDelete(DeleteBehavior.NoAction);
-    }
-}

LiteCharms.Entities/LiteCharms.Entities.csproj

@@ -1,45 +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>
-  </PropertyGroup>
-
-  <!-- Nuget Package Details -->
-  <PropertyGroup>
-    <PackageId>LiteCharms.Entities</PackageId>
-    <Version>1.0.20</Version>
-    <Authors>Khwezi Mngoma</Authors>
-    <Company>Lite Charms (PTY) Ltd</Company>
-    <Description>Shared entities 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>
-
-  <!-- Database -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.7" />    
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.7" />    
-
-    <!-- Global Usings -->    
-    <Using Include="Microsoft.EntityFrameworkCore" />
-    <Using Include="Microsoft.EntityFrameworkCore.Metadata.Builders" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\LiteCharms.Models\LiteCharms.Models.csproj" />
-  </ItemGroup>
-
-</Project>

LiteCharms.Entities/Order.cs

@@ -1,15 +0,0 @@
-using LiteCharms.Entities.Configuration;
-
-namespace LiteCharms.Entities;
-
-[EntityTypeConfiguration<OrderConfiguration, Order>]
-public class Order : Models.Order
-{
-    public virtual OrderRefund? Refund { get; set; }
-
-    public virtual Customer? Customer { get; set; }
-
-    public virtual Quote? Quote { get; set; }
-
-    public virtual ShoppingCart? ShoppingCart { get; set; }
-}

LiteCharms.Entities/PackageItem.cs

@@ -1,9 +0,0 @@
-using LiteCharms.Entities.Configuration;
-
-namespace LiteCharms.Entities;
-
-[EntityTypeConfiguration<PackageItemConfiguration, PackageItem>]
-public class PackageItem : Models.PackageItem
-{
-    public virtual Package? Package { get; set; }
-}

LiteCharms.Entities/ShoppingCartItem.cs

@@ -1,8 +0,0 @@
-namespace LiteCharms.Entities;
-
-public class ShoppingCartItem : Models.ShoppingCartItem
-{
-    public virtual ShoppingCart? ShoppingCart { get; set; }
-
-    public virtual ProductPrice? ProductPrice { get; set; }
-}

LiteCharms.Extensions/Email.cs

@@ -1,13 +0,0 @@
-using LiteCharms.Models.Configuraton.Email;
-
-namespace LiteCharms.Extensions;
-
-public static class Email
-{
-    public static IServiceCollection AddEmailServices(this IServiceCollection services, IConfiguration configuration)
-    {
-        services.Configure<SmtpSettings>(configuration.GetSection("Email"));
-
-        return services;
-    }
-}

LiteCharms.Extensions/LiteCharms.Extensions.csproj

@@ -1,113 +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>
-    <JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
-  </PropertyGroup>
-
-  <!-- Warnings And Exclusions -->
-  <PropertyGroup>
-    <NoWarn>$(NoWarn);MA0004</NoWarn>
-    <!-- https://github.com/dotnet/aspnetcore/issues/50836 -->
-    <NoWarn>$(NoWarn);AD0001</NoWarn>
-    <PublishTrimmed>true</PublishTrimmed>
-    <NoWarn>$(NoWarn);IL2080;IL2065;IL2075;IL2087;IL2057;IL2060;IL2070;IL2067;IL2072;IL2026;IL2104</NoWarn>
-    <NoWarn>$(NoWarn);IL2110;IL2111</NoWarn>
-  </PropertyGroup>
-  
-  <!-- Nuget Package Details -->
-  <PropertyGroup>
-    <PackageId>LiteCharms.Extensions</PackageId>
-    <Version>1.0.20</Version>
-    <Authors>Khwezi Mngoma</Authors>
-    <Company>Lite Charms (PTY) Ltd</Company>
-    <Description>Extension 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>
-
-  <!-- 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.7" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.7" />
-    <PackageReference Include="Quartz.AspNetCore" Version="3.18.1" />
-    <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.18.1" />
-
-    <!-- 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.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.7">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.7">
-      <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>
-
-  <!-- Shared Usings -->
-  <ItemGroup>
-    <Using Include="Quartz" />
-    <Using Include="Microsoft.AspNetCore.Builder" />
-    <Using Include="Microsoft.Extensions.Configuration" />
-    <Using Include="Microsoft.Extensions.DependencyInjection" />
-    <Using Include="Microsoft.Extensions.Logging" />
-  </ItemGroup>
-  
-  <!-- Project References -->
-  <ItemGroup>
-    <ProjectReference Include="..\LiteCharms.Entities\LiteCharms.Entities.csproj" />
-    <ProjectReference Include="..\LiteCharms.Infrastructure\LiteCharms.Infrastructure.csproj" />
-    <ProjectReference Include="..\LiteCharms.Models\LiteCharms.Models.csproj" />
-  </ItemGroup>
-
-</Project>

LiteCharms.Features.Tests/CommonFixture.cs

@@ -0,0 +1,35 @@
+using LiteCharms.Features.Extensions;
+
+namespace LiteCharms.Features.Tests;
+
+public class CommonFixture : IDisposable
+{
+    public IConfiguration Configuration { get; set; }
+
+    public IServiceProvider Services { get; set; }
+
+    public IMediator Mediator { get; set; }
+
+    public CommonFixture()
+    {
+        Configuration = new ConfigurationBuilder()
+            .SetBasePath(Directory.GetCurrentDirectory())
+            .AddJsonFile("appsettings.json")
+            .AddUserSecrets<CommonFixture>()
+            .AddEnvironmentVariables()
+            .Build();
+
+        Services = new ServiceCollection()
+            .AddMediator()
+            .AddLogging()
+            .AddShopServices()
+            .AddEmailServiceBus()
+            .AddShopDatabase(Configuration)
+            .AddEmailServices(Configuration)
+            .BuildServiceProvider();
+
+        Mediator = Services.GetRequiredService<IMediator>();
+    }
+
+    public void Dispose() { }
+}

LiteCharms.Features.Tests/LiteCharms.Features.Tests.csproj

@@ -0,0 +1,50 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+    <UserSecretsId>62fa604a-1340-4edb-9ddd-3305fcf46fca</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="10.0.0">
+      <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\LiteCharms.Features.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Xunit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>

LiteCharms.Features.Tests/NotificationsFeatureTests.cs

@@ -0,0 +1,64 @@
+using LiteCharms.Features.Models;
+using LiteCharms.Features.Shop.Notifications;
+using LiteCharms.Features.Shop.Notifications.Events;
+
+namespace LiteCharms.Features.Tests;
+
+public class NotificationsFeatureTests(CommonFixture fixture, ITestOutputHelper output) : IClassFixture<CommonFixture>
+{
+    private readonly NotificationService notificationService = fixture.Services.GetRequiredService<NotificationService>();
+
+    [Fact]
+    public async Task CreateNotificationCommand_ShouldSucceed()
+    {
+        Shop.Notifications.Models.CreateNotification request = new()
+        {
+            CorrelationId = Guid.CreateVersion7().ToString(),
+            CorrelationIdType = Shop.CorrelationIdTypes.None,
+            Direction = Shop.NotificationDirection.Outgoing,
+            Platform = Shop.NotificationPlatforms.Email,
+            Priority = Shop.Priorities.Medium,
+            Sender = "xUnit Test",
+            SenderAddress = "khwezi@mngoma.africa",
+            Recipient = $"{Email.Extensions.Constants.ShopEmailFromName} [Test]",
+            RecipientAddress = Email.Extensions.Constants.ShopEmailFromAddress,
+            Subject = "Test Message",
+            Message = "This is an automation test",
+            IsHtml = false,
+            IsInternal = true,
+        };
+
+        var createResult = await notificationService.CreateNotificationAsync(request);
+
+        Assert.True(createResult.IsSuccess);
+
+        foreach (var error in createResult.Errors) output.WriteLine(error.Message);
+    }
+
+    [Fact]
+    public async Task GetNotifications_ShouldReturn_AllNotifications()
+    {
+        DateRange range = new()
+        {
+            From = DateOnly.FromDateTime(new DateTime(2026, 04, 01, 0, 0, 0, DateTimeKind.Utc)),
+            To = DateOnly.FromDateTime(DateTime.UtcNow),
+            MaxRecords = 10
+        };
+
+        var getResult = await notificationService.GetNotificationsAsync(range);
+
+        Assert.True(getResult.IsSuccess);
+
+        foreach (var error in getResult.Errors) output.WriteLine(error.Message);
+    }
+
+    [Fact]
+    public async Task ProcessEmailNotificationsEvent_ShouldSucceed()
+    {
+        var notification = ProcessEmailNotificationsEvent.Create();
+
+        await fixture.Mediator.Publish(notification);
+
+        Assert.True(true);
+    }
+}

LiteCharms.Features.Tests/appsettings.json

@@ -0,0 +1,22 @@
+{
+  "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": "*"
+}

LiteCharms.Features/Abstractions/EventBase.cs

@@ -0,0 +1,13 @@
+using LiteCharms.Features.Extensions;
+using static LiteCharms.Features.Extensions.Timezones;
+
+namespace LiteCharms.Features.Abstractions;
+
+public abstract class EventBase
+{
+    public Guid Id { get; set; } = Guid.CreateVersion7();
+
+    public DateTimeOffset EnqueueAt { get; set; } = SouthAfricanTimeZone.UtcNow();
+
+    public string CorrelationId { get; set; } = Guid.CreateVersion7().ToString();
+}

LiteCharms.Features/Abstractions/IEvent.cs

@@ -1,4 +1,4 @@
-namespace LiteCharms.Abstractions;
+namespace LiteCharms.Features.Abstractions;
 
 public interface IEvent : INotification
 {

LiteCharms.Features/Customers/Commands/CreateCustomerCommand.cs

@@ -1,64 +0,0 @@
-namespace LiteCharms.Features.Customers.Commands;
-
-public class CreateCustomerCommand : IRequest<Result<Guid>>
-{
-    public string? Company { get; set; }
-
-    public string Name { get; set; }
-
-    public string LastName { get; set; }
-
-    public string? Tax { get; set; }
-
-    public string Email { get; set; }
-
-    public string? Discord { get; set; }
-
-    public string? Slack { get; set; }
-
-    public string? LinkedIn { get; set; }
-
-    public string? Whatsapp { get; set; }
-
-    public string? Website { get; set; }
-
-    public string? Phone { get; set; }
-
-    public string? Address { get; set; }
-
-    public string? City { get; set; }
-
-    public string? Region { get; set; }
-
-    public string? Country { get; set; }
-
-    public string? PostalCode { get; set; }
-
-    private CreateCustomerCommand(string name, string lastName, string? company, string? tax, string email, string? discord, string? slack, string? linkedIn, string? whatsapp, string? website, string? phone, string? address, string? city, string? region, string? country, string? postalCode)
-    {
-        Name = name;
-        LastName = lastName;
-        Company = company;
-        Tax = tax;
-        Email = email;
-        Discord = discord;
-        Slack = slack;
-        LinkedIn = linkedIn;
-        Whatsapp = whatsapp;
-        Website = website;
-        Phone = phone;
-        Address = address;
-        City = city;
-        Region = region;
-        Country = country;
-        PostalCode = postalCode;
-    }
-
-    public static CreateCustomerCommand Create(string name, string lastName, string? company, string? tax, string email, string? discord, string? slack, string? linkedIn, string? whatsapp, string? website, string? phone, string? address, string? city, string? region, string? country, string? postalCode)
-    {
-        if (string.IsNullOrWhiteSpace(name) && string.IsNullOrWhiteSpace(lastName) && string.IsNullOrWhiteSpace(email))
-            throw new ArgumentException("At the following fields must be provided: Name, LastName, Email");
-
-        return new(name, lastName, company, tax, email, discord, slack, linkedIn, whatsapp, website, phone, address, city, region, country, postalCode);
-    }
-}

LiteCharms.Features/Customers/Commands/Handlers/CreateCustomerCommandHandler.cs

@@ -1,48 +0,0 @@
-using LiteCharms.Infrastructure.Database;
-
-namespace LiteCharms.Features.Customers.Commands.Handlers;
-
-public class CreateCustomerCommandHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<CreateCustomerCommand, Result<Guid>>
-{
-    public async ValueTask<Result<Guid>> Handle(CreateCustomerCommand request, CancellationToken cancellationToken)
-    {
-		try
-		{
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var customerEmail = request.Email.ToLower().Trim();
-
-            if (await context.Customers.AnyAsync(c => c.Email == customerEmail, cancellationToken))
-                return Result.Fail<Guid>(new Error($"A customer with the email {customerEmail} already exists"));
-
-            var newCustomer = context.Customers.Add(new Entities.Customer
-            {
-                Company = request.Company,
-                Name = request.Name,
-                LastName = request.LastName,
-                Tax = request.Tax,
-                Email = customerEmail,
-                Discord = request.Discord,
-                Slack = request.Slack,
-                LinkedIn = request.LinkedIn,
-                Whatsapp = request.Whatsapp,
-                Website = request.Website,
-                Phone = request.Phone,
-                Address = request.Address,
-                City = request.City,
-                Region = request.Region,
-                Country = request.Country,
-                PostalCode = request.PostalCode,
-                Active = true,
-            });
-
-            return await context.SaveChangesAsync(cancellationToken) > 0
-                ? Result.Ok(newCustomer.Entity.Id)
-                : Result.Fail<Guid>(new Error($"Failed to create customer {customerEmail}"));
-        }
-		catch (Exception ex)
-		{
-            return Result.Fail<Guid>(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Customers/Commands/Handlers/UpdateCustomerCommandHandler.cs

@@ -1,44 +0,0 @@
-using LiteCharms.Infrastructure.Database;
-
-namespace LiteCharms.Features.Customers.Commands.Handlers;
-
-public class UpdateCustomerCommandHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<UpdateCustomerCommand, Result>
-{
-    public async ValueTask<Result> Handle(UpdateCustomerCommand request, CancellationToken cancellationToken)
-    {
-        try
-        {
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var customer = await context.Customers.FirstOrDefaultAsync(c => c.Id == request.CustomerId, cancellationToken);
-
-            if (customer is null)
-                return Result.Fail(new Error($"Customer with ID {request.CustomerId} not found."));
-
-            customer.Name = request.Name;
-            customer.LastName = request.LastName;
-            customer.Email = request.Email;
-            customer.Company = request.Company;
-            customer.Address = request.Address;
-            customer.City = request.City;
-            customer.Region = request.Region;
-            customer.Country = request.Country;
-            customer.PostalCode = request.PostalCode;
-            customer.Phone = request.Phone;
-            customer.Tax = request.Tax;
-            customer.City = request.City;
-            customer.Discord = request.Discord;
-            customer.Slack = request.Slack;
-            customer.LinkedIn = request.LinkedIn;
-            customer.Whatsapp = request.Whatsapp;
-
-            return await context.SaveChangesAsync(cancellationToken) > 0
-                ? Result.Ok()
-                : Result.Fail(new Error($"Failed to update the customer {request.CustomerId}."));
-        }
-        catch (Exception ex)
-        {
-            return Result.Fail(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Customers/Commands/UpdateCustomerCommand.cs

@@ -1,70 +0,0 @@
-namespace LiteCharms.Features.Customers.Commands;
-
-public class UpdateCustomerCommand : IRequest<Result>
-{
-    public Guid CustomerId { get; set; }
-
-    public string? Company { get; set; }
-
-    public string? Name { get; set; }
-
-    public string? LastName { get; set; }
-
-    public string? Tax { get; set; }
-
-    public string? Email { get; set; }
-
-    public string? Discord { get; set; }
-
-    public string? Slack { get; set; }
-
-    public string? LinkedIn { get; set; }
-
-    public string? Whatsapp { get; set; }
-
-    public string? Website { get; set; }
-
-    public string? Phone { get; set; }
-
-    public string? Address { get; set; }
-
-    public string? City { get; set; }
-
-    public string? Region { get; set; }
-
-    public string? Country { get; set; }
-
-    public string? PostalCode { get; set; }
-
-    private UpdateCustomerCommand(Guid customerId, string name, string lastName, string? company, string? tax, string email, string? discord, string? slack, string? linkedIn, string? whatsapp, string? website, string? phone, string? address, string? city, string? region, string? country, string? postalCode)
-    {
-        CustomerId = customerId;
-        Name = name;
-        LastName = lastName;
-        Company = company;
-        Tax = tax;
-        Email = email;
-        Discord = discord;
-        Slack = slack;
-        LinkedIn = linkedIn;
-        Whatsapp = whatsapp;
-        Website = website;
-        Phone = phone;
-        Address = address;
-        City = city;
-        Region = region;
-        Country = country;
-        PostalCode = postalCode;
-    }
-
-    public static UpdateCustomerCommand Create(Guid customerId, string name, string lastName, string? company, string? tax, string email, string? discord, string? slack, string? linkedIn, string? whatsapp, string? website, string? phone, string? address, string? city, string? region, string? country, string? postalCode)
-    {
-        if (customerId == Guid.Empty)
-            throw new ArgumentException("Customer ID is required.", nameof(customerId));
-
-        if (string.IsNullOrWhiteSpace(name) && string.IsNullOrWhiteSpace(lastName) && string.IsNullOrWhiteSpace(email))
-            throw new ArgumentException("At the following fields must be provided: Name, LastName, Email");
-
-        return new(customerId, name, lastName, company, tax, email, discord, slack, linkedIn, whatsapp, website, phone, address, city, region, country, postalCode);
-    }
-}

LiteCharms.Features/Customers/Queries/GetCustomerQuery.cs

@@ -1,18 +0,0 @@
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Customers.Queries;
-
-public class GetCustomerQuery : IRequest<Result<Customer>>
-{
-    public Guid CustomerId { get; set; }
-
-    private GetCustomerQuery(Guid customerId) => CustomerId = customerId;
-
-    public static GetCustomerQuery Create(Guid customerId)
-    {
-        if(customerId == Guid.Empty)
-            throw new ArgumentException("Customer ID is required.", nameof(customerId));
-
-        return new(customerId);
-    }
-}

LiteCharms.Features/Customers/Queries/GetCustomersQuery.cs

@@ -1,30 +0,0 @@
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Customers.Queries;
-
-public class GetCustomersQuery : IRequest<Result<Customer[]>>
-{
-    public DateOnly From { get; set; }
-
-    public DateOnly To { get; set; }
-
-    public int MaxRecords { get; set; }
-
-    private GetCustomersQuery(DateOnly from, DateOnly to, int maxRecords = 1000)
-    {
-        From = from;
-        To = to;
-        MaxRecords = maxRecords;
-    }
-
-    public static GetCustomersQuery Create(DateOnly from, DateOnly to, int maxRecords = 1000)
-    {
-        if (from > to)
-            throw new ArgumentException("From date cannot be greater than To date.");
-
-        if(maxRecords <= 0)
-            throw new ArgumentException("MaxRecords must be a positive integer.");
-
-        return new(from, to, maxRecords);
-    }
-}

LiteCharms.Features/Customers/Queries/Handlers/GetCustomerQueryHandler.cs

@@ -1,26 +0,0 @@
-using LiteCharms.Extensions;
-using LiteCharms.Infrastructure.Database;
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Customers.Queries.Handlers;
-
-public class GetCustomerQueryHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<GetCustomerQuery, Result<Customer>>
-{
-    public async ValueTask<Result<Customer>> Handle(GetCustomerQuery request, CancellationToken cancellationToken)
-    {
-		try
-		{
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var customer = await context.Customers.FirstOrDefaultAsync(c => c.Id == request.CustomerId, cancellationToken);
-
-            return customer is not null
-                ? Result.Ok(customer.ToModel())
-                : Result.Fail<Customer>($"Customer not found with id {request.CustomerId}");
-        }
-		catch (Exception ex)
-		{
-            return Result.Fail<Customer>(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Customers/Queries/Handlers/GetCustomersQueryHandler.cs

@@ -1,33 +0,0 @@
-using LiteCharms.Extensions;
-using LiteCharms.Infrastructure.Database;
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Customers.Queries.Handlers;
-
-public class GetCustomersQueryHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<GetCustomersQuery, Result<Customer[]>>
-{
-    public async ValueTask<Result<Customer[]>> Handle(GetCustomersQuery request, CancellationToken cancellationToken)
-    {
-		try
-		{
-            var fromDate = request.From.ToDateTime(TimeOnly.MinValue);
-            var toDate = request.To.ToDateTime(TimeOnly.MaxValue);
-
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var customers = await context.Customers.AsNoTracking()
-                .OrderByDescending(o => o.CreatedAt)
-                .Where(c => c.CreatedAt >= fromDate && c.CreatedAt <= toDate)
-                .Take(request.MaxRecords)
-                .ToArrayAsync(cancellationToken);
-
-            return customers?.Length > 0
-                ? Result.Ok(customers.Select(c => c.ToModel()).ToArray())
-                : Result.Fail<Customer[]>(new Error("No customers found in the specified date range."));
-        }
-		catch (Exception ex)
-		{
-            return Result.Fail<Customer[]>(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Email/Configuration/Account.cs

@@ -1,4 +1,4 @@
-namespace LiteCharms.Models.Configuraton.Email;
+namespace LiteCharms.Features.Email.Configuration;
 
 public class Account
 {

LiteCharms.Features/Email/Configuration/SmtpSettings.cs

@@ -1,4 +1,4 @@
-namespace LiteCharms.Models.Configuraton.Email;
+namespace LiteCharms.Features.Email.Configuration;
 
 public class SmtpSettings
 {

LiteCharms.Features/Email/EmailService.cs

@@ -0,0 +1,193 @@
+using LiteCharms.Features.Email.Configuration;
+using LiteCharms.Features.Email.Extensions;
+using LiteCharms.Features.Email.Models;
+using LiteCharms.Features.Shop;
+
+namespace LiteCharms.Features.Email;
+
+public class EmailService(IOptions<SmtpSettings> options) : IDisposable
+{
+    private readonly SmtpSettings settings = options.Value;
+    private readonly SmtpClient client = new();
+    private readonly int sendMaxCount = 10;
+    private int sendCount = 0;
+
+    public EmailStatuses Status { get; private set; } = EmailStatuses.Disconnected;
+
+    public async ValueTask<Result<Response>> SendEmailAsync(Message message, CancellationToken cancellationToken = default)
+    {
+        using var activity = EmailTelemetry.Source.StartActivity("Email Send");
+        activity?.SetTag("email.recipient", message.Recipient?.Address);
+
+        try
+        {
+            if (Status != EmailStatuses.Connected)
+            {
+                activity?.SetStatus(ActivityStatusCode.Error, "Disconnected");
+
+                return Result.Fail<Response>("Smtp service is disconnected.");
+            }
+
+            var email = new MimeMessage();
+            email.From.Add(new MailboxAddress(message.Sender!.Name, message.Sender.Address!));
+            email.To.Add(new MailboxAddress(message.Recipient!.Name, message.Recipient!.Address!));
+            email.Subject = message.Subject!;
+
+            var bodyBuilder = new BodyBuilder();
+
+            if (message.Body!.Properties.HasAttachments)
+                foreach (var attachment in message.Body?.Attachments!)
+                    bodyBuilder.Attachments.Add(attachment.Name!, attachment.FileStream!, cancellationToken);
+
+            if (!message.Body.Properties.IsHtml) bodyBuilder.TextBody = message.Body.Message;
+            if (message.Body.Properties.IsHtml) bodyBuilder.HtmlBody = message.Body.Message;
+
+            email.Body = bodyBuilder.ToMessageBody();
+
+            var response = await client.SendAsync(email, cancellationToken);
+
+            bool emailSent = response.Contains("OK", StringComparison.InvariantCultureIgnoreCase);
+
+            message.Dispose();
+
+            Interlocked.Increment(ref sendCount);
+
+            if (sendCount % sendMaxCount == 0)
+            {
+                using var delayActivity = EmailTelemetry.Source.StartActivity("Rate Limit Pause");
+
+                sendCount = 0;
+
+                await Task.Delay(1000, cancellationToken);
+            }
+
+            if (emailSent)
+            {
+                EmailTelemetry.EmailsSent.Add(1, new TagList { { "host", settings.Host } });
+
+                return Result.Ok(Response.Create(EmailStatuses.Success));
+            }
+
+            await DisconnectAsync(cancellationToken);
+
+            if (response.Contains("421"))
+            {
+                Status = EmailStatuses.TooManyConnections;
+
+                return Result.Fail<Response>(response);
+            }
+
+            if (response.Contains("451"))
+            {
+                Status = EmailStatuses.ConnectionAborted;
+
+                return Result.Fail<Response>(response);
+            }
+
+            EmailTelemetry.EmailsFailed.Add(1, new TagList { { "error_message", response } });
+
+            Status = EmailStatuses.Disconnected;
+
+            return Result.Fail<Response>("General error, disconnected");
+        }
+        catch (Exception ex)
+        {
+            activity?.SetStatus(ActivityStatusCode.Error, ex.Message);
+            activity?.AddException(ex);
+
+            EmailTelemetry.EmailsFailed.Add(1, new TagList { { "exception", ex.GetType().Name } });
+
+            return Result.Fail(new Error(ex.Message).CausedBy(ex));
+        }
+    }
+
+    public async ValueTask<Result<Response>> ConnectAsync(CancellationToken cancellationToken = default)
+    {
+        using var activity = EmailTelemetry.Source.StartActivity("Email Connect");
+        activity?.SetTag("email.smtp.connect", settings.Host);
+
+        try
+        {
+            if (Status is EmailStatuses.Connected) return Result.Ok(Response.Create(Status));
+
+            await client.ConnectAsync(settings.Host!, settings.Port, settings.UseSsl, cancellationToken);
+            await client.AuthenticateAsync(settings.Credentials!.Username!, settings.Credentials.Password!, cancellationToken);
+
+            Status = EmailStatuses.Connected;
+
+            activity?.SetStatus(ActivityStatusCode.Ok, "Connected");
+
+            return Result.Ok(Response.Create(Status));
+        }
+        catch (MailKit.ProtocolException ex)
+        {
+            activity?.SetStatus(ActivityStatusCode.Error, ex.Message);
+            activity?.AddException(ex);
+
+            EmailTelemetry.EmailsFailed.Add(1, new TagList { { "exception", ex.GetType().Name } });
+
+            Status = EmailStatuses.ProtocolError;
+
+            return Result.Fail<Response>(new Error(ex.Message).CausedBy(ex));
+        }
+        catch (Exception ex) when (ex is MailKit.Security.SslHandshakeException || ex is MailKit.Security.AuthenticationException)
+        {
+            activity?.SetStatus(ActivityStatusCode.Error, ex.Message);
+            activity?.AddException(ex);
+
+            EmailTelemetry.EmailsFailed.Add(1, new TagList { { "exception", ex.GetType().Name } });
+
+            Status = EmailStatuses.AuthenticationError;
+
+            return Result.Fail<Response>(new Error(ex.Message).CausedBy(ex));
+        }
+        catch (Exception ex)
+        {
+            activity?.SetStatus(ActivityStatusCode.Error, ex.Message);
+            activity?.AddException(ex);
+
+            EmailTelemetry.EmailsFailed.Add(1, new TagList { { "exception", ex.GetType().Name } });
+
+            Status = EmailStatuses.GeneralError;
+
+            return Result.Fail<Response>(new Error(ex.Message).CausedBy(ex));
+        }
+    }
+
+    public async ValueTask<Result> DisconnectAsync(CancellationToken cancellationToken = default)
+    {
+        using var activity = EmailTelemetry.Source.StartActivity("Email Disconnect");
+        activity?.SetTag("email.smtp.disconnect", settings.Host);
+
+        try
+        {
+            if (Status is EmailStatuses.Disconnected) return Result.Ok();
+
+            await client.DisconnectAsync(true, cancellationToken);
+
+            activity?.SetStatus(ActivityStatusCode.Ok, "Disconnected");
+
+            Status = EmailStatuses.Disconnected;
+
+            return Result.Ok();
+        }
+        catch (Exception ex)
+        {
+            activity?.SetStatus(ActivityStatusCode.Error, ex.Message);
+            activity?.AddException(ex);
+
+            EmailTelemetry.EmailsFailed.Add(1, new TagList { { "exception", ex.GetType().Name } });
+
+            Status = EmailStatuses.GeneralError;
+
+            return Result.Fail(new Error(ex.Message).CausedBy(ex));
+        }
+    }
+
+    public void Dispose()
+    {
+        client.Dispose();
+
+        GC.SuppressFinalize(this);
+    }
+}

LiteCharms.Features/Email/Events/Handlers/SendShopEmailEnquiryEventHandler.cs

@@ -0,0 +1,27 @@
+using LiteCharms.Features.Shop;
+using LiteCharms.Features.Shop.Notifications;
+using static LiteCharms.Features.Email.Extensions.Constants;
+
+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 Shop.Notifications.Models.CreateNotification
+        {
+            CorrelationId = notification.CorrelationId,
+            CorrelationIdType = CorrelationIdTypes.None,
+            Direction = NotificationDirection.Outgoing,
+            IsHtml = false,
+            IsInternal = true,
+            Message = notification.Message,
+            Platform = NotificationPlatforms.Email,
+            Priority = notification.Priority,
+            Subject = notification.Subject!,
+            Sender = notification.SenderName!,
+            SenderAddress = notification.SenderAddress!,
+            Recipient = ShopEmailFromName,
+            RecipientAddress = ShopEmailFromAddress
+        }, cancellationToken);
+}

LiteCharms.Features/Email/Events/SendShopEmailEnquiryEvent.cs

@@ -0,0 +1,40 @@
+using LiteCharms.Features.Abstractions;
+using LiteCharms.Features.Shop;
+
+namespace LiteCharms.Features.Email.Events;
+
+public class SendShopEmailEnquiryEvent : EventBase, IEvent
+{
+    public string Name { get; set; } = nameof(SendShopEmailEnquiryEvent);
+
+    public string? SenderName { get; set; }
+
+    public string? SenderAddress { get; set; }
+
+    public string? Subject { get; set; }
+
+    public string? Message { get; set; }
+
+    public Priorities Priority { get; set; }
+
+    public SendShopEmailEnquiryEvent() { }
+
+    private SendShopEmailEnquiryEvent(string senderName, string senderAddress, string subject, string message, Priorities priority = Priorities.Medium)
+    {
+        SenderName = senderName;
+        SenderAddress = senderAddress;
+        Subject = subject;
+        Message = message;
+        Priority = priority;
+    }
+
+    public static SendShopEmailEnquiryEvent Create(string senderName, string senderAddress, string subject, string message, Priorities priority = Priorities.Medium)
+    {
+        ArgumentNullException.ThrowIfNullOrWhiteSpace(senderName, nameof(senderName));
+        ArgumentNullException.ThrowIfNullOrWhiteSpace(senderAddress, nameof(senderAddress));
+        ArgumentNullException.ThrowIfNullOrWhiteSpace(subject, nameof(subject));
+        ArgumentNullException.ThrowIfNullOrWhiteSpace(message, nameof(message));
+
+        return new(senderName, senderAddress, subject, message, priority);
+    }
+}

LiteCharms.Features/Email/Extensions/Constants.cs

@@ -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";
+}

LiteCharms.Features/Email/Extensions/EmailTelemetry.cs

@@ -0,0 +1,9 @@
+namespace LiteCharms.Features.Email.Extensions;
+
+public static class EmailTelemetry
+{
+    public static readonly ActivitySource Source = new("LiteCharms.EmailService");
+    public static readonly Meter Meter = new("LiteCharms.EmailService");
+    public static readonly Counter<long> EmailsSent = Meter.CreateCounter<long>("emails_sent_total", "count", "Total successful emails sent");
+    public static readonly Counter<long> EmailsFailed = Meter.CreateCounter<long>("emails_failed_total", "count", "Total failed email attempts");
+}

LiteCharms.Features/Email/Models/Attachment.cs

@@ -0,0 +1,8 @@
+namespace LiteCharms.Features.Email.Models;
+
+public class Attachment
+{
+    public string? Name { get; set; }
+
+    public Stream? FileStream { get; set; }
+}

LiteCharms.Features/Email/Models/Body.cs

@@ -0,0 +1,26 @@
+namespace LiteCharms.Features.Email.Models;
+
+public class Body : IDisposable
+{
+    public string? Message { get; set; }
+
+    public ReadOnlyCollection<Attachment>? Attachments { get; set; }
+
+    public BodyProperties Properties { get; set; } = new();
+
+    public void Dispose()
+    {
+        if (Attachments is null) return;
+
+        foreach (var attachment in Attachments!)
+        {
+            if (attachment is not null)
+            {
+                attachment.FileStream!.Close();
+                attachment.FileStream!.Dispose();
+            }
+        }
+
+        GC.SuppressFinalize(this);
+    }
+}

LiteCharms.Features/Email/Models/BodyProperties.cs

@@ -0,0 +1,8 @@
+namespace LiteCharms.Features.Email.Models;
+
+public class BodyProperties
+{
+    public bool IsHtml { get; set; }
+
+    public bool HasAttachments { get; set; }
+}

LiteCharms.Features/Email/Models/EmailEnquiry.cs

@@ -1,4 +1,6 @@
-namespace LiteCharms.Models;
+using System.ComponentModel.DataAnnotations;
+
+namespace LiteCharms.Features.Email.Models;
 
 public sealed class EmailEnquiry
 {

LiteCharms.Features/Email/Models/Message.cs

@@ -0,0 +1,19 @@
+namespace LiteCharms.Features.Email.Models;
+
+public class Message : IDisposable
+{
+    public Party? Sender { get; set; }
+
+    public Party? Recipient { get; set; }
+
+    public string? Subject { get; set; }
+
+    public Body? Body { get; set; }
+
+    public void Dispose()
+    {
+        Body?.Dispose();
+
+        GC.SuppressFinalize(this);
+    }
+}

LiteCharms.Features/Email/Models/Party.cs

@@ -0,0 +1,8 @@
+namespace LiteCharms.Features.Email.Models;
+
+public class Party
+{
+    public string? Name { get; set; }
+
+    public string? Address { get; set; }
+}

LiteCharms.Features/Email/Models/Response.cs

@@ -0,0 +1,22 @@
+using LiteCharms.Features.Shop;
+
+namespace LiteCharms.Features.Email.Models;
+
+public class Response
+{
+    public int Code { get; set; }
+
+    public string? Error { get; set; }
+
+    public EmailStatuses Status { get; set; }
+
+    private Response(EmailStatuses status, int code = 0, string? error = null)
+    {
+        Status = status;
+        Code = code;
+        Error = error;
+    }
+
+    public static Response Create(EmailStatuses status, int code = 0, string? error = null) =>
+        new(status, code, error);
+}

LiteCharms.Features/Extensions/Email.cs

@@ -0,0 +1,20 @@
+using LiteCharms.Features.Email;
+using LiteCharms.Features.Email.Configuration;
+
+namespace LiteCharms.Features.Extensions;
+
+public static class Email
+{
+    public static IServiceCollection AddEmailServices(this IServiceCollection services, IConfiguration configuration)
+    {
+        services.Configure<SmtpSettings>(configuration.GetSection("Email"));
+
+        services.AddSingleton<EmailService>();
+
+        services.AddOpenTelemetry()
+            .WithTracing(tracing => tracing.AddSource("LiteCharms.EmailService"))
+            .WithMetrics(metrics => metrics.AddMeter("LiteCharms.EmailService"));
+
+        return services;
+    }
+}

LiteCharms.Features/Extensions/EntityModeMappers.cs

@@ -1,10 +1,49 @@
-using LiteCharms.Models;
+using LiteCharms.Features.Shop.CartPackages.Models;
+using LiteCharms.Features.Shop.Customers.Models;
+using LiteCharms.Features.Shop.Leads.Models;
+using LiteCharms.Features.Shop.Notifications.Models;
+using LiteCharms.Features.Shop.Orders.Models;
+using LiteCharms.Features.Shop.Products.Models;
+using LiteCharms.Features.Shop.Quotes.Models;
+using LiteCharms.Features.Shop.ShoppingCarts.Models;
 
-namespace LiteCharms.Extensions;
+namespace LiteCharms.Features.Extensions;
 
 public static class EntityModeMappers
 {
-    public static ShoppingCartItem ToModel(this Entities.ShoppingCartItem entity) =>
+    public static ShoppingCartPackage ToModel(this Features.Shop.ShoppingCarts.Entities.ShoppingCartPackage entity) =>
+        new()
+        {
+            Id = entity.Id,
+            CreatedAt = entity.CreatedAt,
+            PackageId = entity.PackageId,
+            ShoppingCartId = entity.ShoppingCartId            
+        };
+
+    public static PackageItem ToModel(this Features.Shop.CartPackages.Entities.PackageItem entity) =>
+        new()
+        {
+            Id = entity.Id,
+            Active = entity.Active,
+            CreatedAt = entity.CreatedAt,
+            PackageId = entity.PackageId,
+            ProductPriceId = entity.ProductPriceId
+        };
+
+    public static Package ToModel(this Features.Shop.CartPackages.Entities.Package entity) =>
+        new()
+        {
+            Id = entity.Id,
+            CreatedAt = entity.CreatedAt,
+            Active = entity.Active,
+            Description = entity.Description,
+            Name = entity.Name,
+            UpdatedAt = entity.UpdatedAt,
+            ImageUrl = entity.ImageUrl,
+            Summary = entity.Summary
+        };
+
+    public static ShoppingCartItem ToModel(this Features.Shop.ShoppingCarts.Entities.ShoppingCartItem entity) =>
         new()
         {
             Id = entity.Id,
@@ -12,21 +51,20 @@ public static class EntityModeMappers
             UpdatedAt = entity.UpdatedAt,
             ProductPriceId = entity.ProductPriceId,
             Quantity = entity.Quantity,
-            ShoppingCartId = entity.ShoppingCartId            
+            ShoppingCartId = entity.ShoppingCartId
         };
 
-    public static ShoppingCart ToModel(this Entities.ShoppingCart entity) =>
+    public static ShoppingCart ToModel(this Features.Shop.ShoppingCarts.Entities.ShoppingCart entity) =>
         new()
         {
             Id = entity.Id,
             CreatedAt = entity.CreatedAt,
             UpdatedAt = entity.UpdatedAt,
             CustomerId = entity.CustomerId,
-            OrderId = entity.OrderId,
+            OrderId = entity.OrderId
-            QuoteId = entity.QuoteId            
         };
 
-    public static Quote ToModel(this Entities.Quote entity) =>
+    public static Quote ToModel(this Features.Shop.Quotes.Entities.Quote entity) =>
         new()
         {
             Id = entity.Id,
@@ -36,10 +74,12 @@ public static class EntityModeMappers
             ExpiredAt = entity.ExpiredAt,
             Reason = entity.Reason,
             ShoppingCartId = entity.ShoppingCartId,
-            Status = entity.Status            
+            Status = entity.Status,
+            InvoiceUrl = entity.InvoiceUrl,
+            OrderId = entity.OrderId
         };
 
-    public static Notification ToModel(this Entities.Notification entity) =>
+    public static Notification ToModel(this Features.Shop.Notifications.Entities.Notification entity) =>
         new()
         {
             Id = entity.Id,
@@ -49,14 +89,21 @@ public static class EntityModeMappers
             CorrelationId = entity.CorrelationId,
             CorrelationIdType = entity.CorrelationIdType,
             IsInternal = entity.IsInternal,
-            Sender = entity.Sender,
+            SenderAddress = entity.SenderAddress,
             Platform = entity.Platform,
-            Recipient = entity.Recipient,
+            RecipientName = entity.RecipientName,
             Subject = entity.Subject,
-            Processed = entity.Processed            
+            Processed = entity.Processed,
+            SenderName = entity.SenderName,
+            RecipientAddress = entity.RecipientAddress,
+            Priority = entity.Priority,
+            UpdatedAt = entity?.UpdatedAt,
+            IsHtml = entity!.IsHtml,
+            HasError = entity.HasError,
+            Errors = entity.Errors
         };
 
-    public static Customer ToModel(this Entities.Customer entity) =>
+    public static Customer ToModel(this Features.Shop.Customers.Entities.Customer entity) =>
         new()
         {
             Id = entity.Id,
@@ -78,10 +125,10 @@ public static class EntityModeMappers
             Slack = entity.Slack,
             Tax = entity.Tax,
             Website = entity.Website,
-            Whatsapp = entity.Whatsapp            
+            Whatsapp = entity.Whatsapp
         };
 
-    public static Lead ToModel(this Entities.Lead entity) =>
+    public static Lead ToModel(this Features.Shop.Leads.Entities.Lead entity) =>
         new()
         {
             Id = entity.Id,
@@ -99,10 +146,10 @@ public static class EntityModeMappers
             ClickId = entity.ClickId,
             TargetId = entity.TargetId,
             WebClickId = entity.WebClickId,
-            Status = entity.Status            
+            Status = entity.Status
         };
 
-    public static Order ToModel(this Entities.Order entity) =>
+    public static Order ToModel(this Features.Shop.Orders.Entities.Order entity) =>
         new()
         {
             Id = entity.Id,
@@ -110,32 +157,35 @@ public static class EntityModeMappers
             UpdatedAt = entity.UpdatedAt,
             CustomerId = entity.CustomerId,            
             Notes = entity.Notes,
-            RefundId = entity.RefundId,
-            QuoteId = entity.QuoteId,
             Status = entity.Status,
-            ShoppingCartId = entity.ShoppingCartId            
+            Requirements = entity.Requirements,
+            Terms = entity.Terms,
+            InvoiceUrl = entity.InvoiceUrl            
         };
 
-    public static OrderRefund ToModel(this Entities.OrderRefund entity) =>
+    public static OrderRefund ToModel(this Features.Shop.Orders.Entities.OrderRefund entity) =>
         new()
         {
             Id = entity.Id,
             CreatedAt = entity.CreatedAt,
             OrderId = entity.OrderId,
             Reason = entity.Reason,
-            Amount = entity.Amount            
+            Amount = entity.Amount
         };
 
-    public static Product ToModel(this Entities.Product entity) =>
+    public static Product ToModel(this Features.Shop.Products.Entities.Product entity) =>
         new()
         {
             Id = entity.Id,
             Name = entity.Name,
             Description = entity.Description,
-            Active = entity.Active            
+            Active = entity.Active,
+            Summary = entity.Summary,
+            ImageUrl = entity.ImageUrl,
+            Thumbnails = entity.Thumbnails
         };
 
-    public static ProductPrice ToModel(this Entities.ProductPrice entity) =>
+    public static ProductPrice ToModel(this Features.Shop.Products.Entities.ProductPrice entity) =>
         new()
         {
             Id = entity.Id,
@@ -144,6 +194,6 @@ public static class EntityModeMappers
             Active = entity.Active,
             CreatedAt = entity.CreatedAt,
             Discount = entity.Discount,
-            UpdatedAt = entity.UpdatedAt            
+            UpdatedAt = entity.UpdatedAt
         };
 }

LiteCharms.Features/Extensions/Hash.cs

@@ -0,0 +1,7 @@
+namespace LiteCharms.Features.Extensions;
+
+public static class Hash
+{
+    public static Func<string?, string?> GenerateSha256HashString = (input) => 
+        Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(input!)));
+}

LiteCharms.Features/Extensions/HealthChecks.cs

@@ -1,6 +1,6 @@
-using LiteCharms.Infrastructure.HealthChecks;
+using LiteCharms.Features.HealthChecks;
 
-namespace LiteCharms.Extensions;
+namespace LiteCharms.Features.Extensions;
 
 public static class HealthChecks
 {

LiteCharms.Features/Extensions/Monitoring.cs

@@ -1,4 +1,4 @@
-namespace LiteCharms.Extensions;
+namespace LiteCharms.Features.Extensions;
 
 public static class Monitoring
 {

LiteCharms.Features/Extensions/Postgres.cs

@@ -1,6 +1,6 @@
-using LiteCharms.Infrastructure.Database;
+using LiteCharms.Features.Shop.Postgres;
 
-namespace LiteCharms.Extensions;
+namespace LiteCharms.Features.Extensions;
 
 public static class Postgres
 {

LiteCharms.Features/Extensions/Quartz.cs

@@ -1,7 +1,7 @@
-using LiteCharms.Abstractions;
+using LiteCharms.Features.Quartz;
-using LiteCharms.Infrastructure.Quartz;
+using LiteCharms.Features.Quartz.Abstractions;
 
-namespace LiteCharms.Extensions;
+namespace LiteCharms.Features.Extensions;
 
 public static class Quartz
 {
@@ -34,7 +34,7 @@ public static class Quartz
                 storage.UseClustering(cluster =>
                 {
                     cluster.CheckinInterval = TimeSpan.FromSeconds(30);
-                    cluster.CheckinMisfireThreshold = TimeSpan.FromSeconds(2);
+                    cluster.CheckinMisfireThreshold = TimeSpan.FromSeconds(90);
                 });
             });
         });
@@ -48,6 +48,8 @@ public static class Quartz
 
         services.ConfigureCommon();
 
+        services.AddQuartzHostedService(options => options.WaitForJobsToComplete = true);
+
         services.AddQuartz(config =>
         {
             config.SchedulerName = schedulerName;
@@ -60,6 +62,8 @@ public static class Quartz
             config.UseDefaultThreadPool(options => options.MaxConcurrency = 1);
             config.UseTimeZoneConverter();
 
+            config.SetProperty("quartz.jobStore.misfireThreshold", TimeSpan.FromMinutes(2).TotalMilliseconds.ToString());
+
             config.UsePersistentStore(storage =>
             {
                 storage.PerformSchemaValidation = false;
@@ -72,7 +76,7 @@ public static class Quartz
                 storage.UseClustering(cluster =>
                 {
                     cluster.CheckinInterval = TimeSpan.FromSeconds(30);
-                    cluster.CheckinMisfireThreshold = TimeSpan.FromSeconds(2);
+                    cluster.CheckinMisfireThreshold = TimeSpan.FromSeconds(90);
                 });
             });
         });
@@ -86,14 +90,14 @@ public static class Quartz
         {
             options.Scheduling.IgnoreDuplicates = true;
             options.Scheduling.OverWriteExistingData = true;
+
             options["quartz.plugin.jobHistory.type"] = "Quartz.Plugin.History.LoggingJobHistoryPlugin, Quartz.Plugins";
             options["quartz.plugin.triggerHistory.type"] = "Quartz.Plugin.History.LoggingTriggerHistoryPlugin, Quartz.Plugins";
         });
 
         services.AddTransient<RetryJobListener>();
         services.AddTransient<IJobOrchestrator, JobOrchestrator>();
-        services.AddQuartzHostedService(options => options.WaitForJobsToComplete = true);
+        
-
         return services;
     }
 }

LiteCharms.Features/Extensions/S3.cs

@@ -0,0 +1,58 @@
+using LiteCharms.Features.S3;
+using LiteCharms.Features.S3.Abstractions;
+using static LiteCharms.Features.S3.Constants;
+
+namespace LiteCharms.Features.Extensions;
+
+public static class S3
+{
+    public static IServiceCollection AddGarageS3(this IServiceCollection services, IConfiguration configuration)
+    {
+        if (configuration.GetSection(BookshopBucketName) is not null)
+        {
+            services.AddKeyedSingleton<IAmazonS3, AmazonS3Client>(BookshopBucketName, (provider, client) =>
+                new AmazonS3Client(new BasicAWSCredentials(configuration.GetSection($"{BookshopS3SettingsSection}:AccessKey").Value,
+                configuration.GetSection($"{BookshopS3SettingsSection}:SecretKey").Value),
+                new AmazonS3Config
+                {
+                    ServiceURL = configuration.GetSection($"{BookshopS3SettingsSection}:ServiceUrl").Value,
+                    AuthenticationRegion = configuration.GetSection($"{BookshopS3SettingsSection}:Region").Value,
+                    ForcePathStyle = true,
+                }));
+
+            services.AddKeyedScoped<IS3Service, BookstoreS3Service>(BookshopBucketName); 
+        }
+
+        if (configuration.GetSection(BookshopInvoicesBucketName) is not null)
+        {
+            services.AddKeyedSingleton<IAmazonS3, AmazonS3Client>(BookshopInvoicesBucketName, (provider, client) =>
+                new AmazonS3Client(new BasicAWSCredentials(configuration.GetSection($"{BookshopInvoicesBucketName}:AccessKey").Value,
+                configuration.GetSection($"{BookshopInvoicesBucketName}:SecretKey").Value),
+                new AmazonS3Config
+                {
+                    ServiceURL = configuration.GetSection($"{BookshopInvoicesBucketName}:ServiceUrl").Value,
+                AuthenticationRegion = configuration.GetSection($"{BookshopInvoicesBucketName}:Region").Value,
+                ForcePathStyle = true,
+            }));
+
+            services.AddKeyedScoped<IS3Service, BookstoreInvoicesS3Service>(BookshopInvoicesBucketName);
+        }
+
+        if (configuration.GetSection(BookshopQuotesBucketName) is not null)
+        {
+            services.AddKeyedSingleton<IAmazonS3, AmazonS3Client>(BookshopQuotesBucketName, (provider, client) =>
+                new AmazonS3Client(new BasicAWSCredentials(configuration.GetSection($"{BookshopQuotesBucketName}:AccessKey").Value,
+                configuration.GetSection($"{BookshopQuotesBucketName}:SecretKey").Value),
+                new AmazonS3Config
+                {
+                    ServiceURL = configuration.GetSection($"{BookshopQuotesBucketName}:ServiceUrl").Value,
+                    AuthenticationRegion = configuration.GetSection($"{BookshopQuotesBucketName}:Region").Value,
+                    ForcePathStyle = true,
+                }));
+
+            services.AddKeyedScoped<IS3Service, BookstoreQuotesS3Service>(BookshopQuotesBucketName);
+        }
+
+        return services;
+    }
+}

LiteCharms.Features/Extensions/ServiceBus.cs

@@ -1,9 +1,9 @@
-using LiteCharms.Abstractions;
+using LiteCharms.Features.ServiceBus;
-using LiteCharms.Infrastructure.ServiceBus;
+using LiteCharms.Features.ServiceBus.Abstractions;
-using LiteCharms.Infrastructure.ServiceBus.Exchanges;
+using LiteCharms.Features.ServiceBus.Exchanges;
-using LiteCharms.Infrastructure.ServiceBus.Queues;
+using LiteCharms.Features.ServiceBus.Queues;
 
-namespace LiteCharms.Extensions;
+namespace LiteCharms.Features.Extensions;
 
 public static class ServiceBus
 {

LiteCharms.Features/Extensions/Shop.cs

@@ -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;
+    }
+}

LiteCharms.Features/Extensions/Timezones.cs

@@ -1,4 +1,4 @@
-namespace LiteCharms.Abstractions;
+namespace LiteCharms.Features.Extensions;
 
 public static class Timezones
 {
@@ -23,5 +23,5 @@ public static class Timezones
         return DateTimeOffset.Parse(localised!);
     }
 
-    public static DateTimeOffset UtcNow(this TimeZoneInfo timezone) => ToDateTimeWithTimeZone(DateTime.Now, timezone);
+    public static DateTime UtcNow(this TimeZoneInfo timezone) => ToDateTimeWithTimeZone(DateTime.Now, timezone).UtcDateTime;
 }

LiteCharms.Features/HealthChecks/PostgresHealthCheck.cs

@@ -1,4 +1,4 @@
-namespace LiteCharms.Infrastructure.HealthChecks;
+namespace LiteCharms.Features.HealthChecks;
 
 public class PostgresHealthCheck(IConfiguration configuration) : IHealthCheck
 {

LiteCharms.Features/HealthChecks/QuartzHealthCheck.cs

@@ -1,4 +1,4 @@
-namespace LiteCharms.Infrastructure.HealthChecks;
+namespace LiteCharms.Features.HealthChecks;
 
 public class QuartzHealthCheck(ISchedulerFactory schedulerFactory) : IHealthCheck
 {

LiteCharms.Features/Leads/Commands/CreateLeadCommand.cs

@@ -1,55 +0,0 @@
-namespace LiteCharms.Features.Leads.Commands;
-
-public class CreateLeadCommand : IRequest<Result<Guid>>
-{
-    public Guid? CustomerId { get; set; }
-
-    public string? Source { get; set; }
-
-    public string? ClickId { get; set; }
-
-    public string? WebClickId { get; set; }
-
-    public string? AppClickId { get; set; }
-
-    public long? CampaignId { get; set; }
-
-    public long? AdGroupId { get; set; }
-
-    public long? AdName { get; set; }
-
-    public long? TargetId { get; set; }
-
-    public long? FeedItemId { get; set; }
-
-    public string? ClickLocation { get; set; }
-
-    public string? AttribusionHash { get; set; }
-
-    private CreateLeadCommand(Guid? customerId, string source, string clickId, string webClickId, string appClickId, long? campaignId, long? adGroupId, long? adName, long? targetId, long? feedItemId, string? clickLocation, string? attribusionHash)
-    {
-        CustomerId = customerId;
-        Source = source;
-        ClickId = clickId;
-        WebClickId = webClickId;
-        AppClickId = appClickId;
-        CampaignId = campaignId;
-        AdGroupId = adGroupId;
-        AdName = adName;
-        TargetId = targetId;
-        FeedItemId = feedItemId;
-        ClickLocation = clickLocation;
-        AttribusionHash = attribusionHash;
-    }
-
-    public static CreateLeadCommand Create(Guid? customerId, string source, string clickId, string webClickId, string appClickId, long? campaignId, long? adGroupId, long? adName, long? targetId, long? feedItemId, string? clickLocation, string? attribusionHash)
-    {
-        if(string.IsNullOrWhiteSpace(source))
-            throw new ArgumentNullException("Lead source is required to create a lead.", nameof(source));
-
-        if (string.IsNullOrWhiteSpace(clickId) || string.IsNullOrWhiteSpace(appClickId) || string.IsNullOrWhiteSpace(webClickId))
-            throw new ArgumentException("ClickId, App ClickId and Web ClickId are required to create a lead.");
-
-        return new(customerId, source, clickId, webClickId, appClickId, campaignId, adGroupId, adName, targetId, feedItemId, clickLocation, attribusionHash);
-    }
-}

LiteCharms.Features/Leads/Commands/Handlers/CreateLeadCommandHandler.cs

@@ -1,47 +0,0 @@
-using LiteCharms.Features.Utilities.Commands;
-using LiteCharms.Infrastructure.Database;
-
-namespace LiteCharms.Features.Leads.Commands.Handlers;
-
-public class CreateLeadCommandHandler(IDbContextFactory<ShopDbContext> contextFactory, ISender mediator) : IRequestHandler<CreateLeadCommand, Result<Guid>>
-{
-    public async ValueTask<Result<Guid>> Handle(CreateLeadCommand request, CancellationToken cancellationToken)
-    {
-        try
-        {
-            var hashCommand = ComputeHashCommand.Create($"{request.ClickId}{request.AppClickId}{request.WebClickId}");
-            var hashResult = await mediator.Send(hashCommand, cancellationToken);
-
-            if(hashResult.IsFailed)
-                return Result.Fail<Guid>(new Error($"Failed to compute hash for lead -> Google ClickId: {request.ClickId}, App ClickId: {request.AppClickId}, Web ClickId: {request.WebClickId}")
-                    .CausedBy(hashResult.Errors));
-
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var newLead = context.Leads.Add(new Entities.Lead
-            {
-                WebClickId = request.WebClickId,
-                AppClickId = request.AppClickId,
-                Source = request.Source,
-                ClickId = request.ClickId,
-                AdGroupId = request.AdGroupId,
-                AdName = request.AdName,
-                CampaignId = request.CampaignId,
-                ClickLocation = request.ClickLocation,
-                CustomerId = request.CustomerId,
-                FeedItemId = request.FeedItemId,
-                Status = Models.LeadStatus.New,
-                TargetId = request.TargetId,
-                AttributionHash = hashResult.Value
-            });
-
-            return await context.SaveChangesAsync(cancellationToken) > 0
-                ? Result.Ok(newLead.Entity.Id)
-                : Result.Fail<Guid>(new Error($"Failed to create lead -> Google ClickId: {request.ClickId}, App ClickId: {request.AppClickId}, Web ClickId: {request.WebClickId}"));
-        }
-        catch (Exception ex)
-        {
-            return Result.Fail<Guid>(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Leads/Commands/Handlers/UpdateLeadCommandHandler.cs

@@ -1,29 +0,0 @@
-using LiteCharms.Infrastructure.Database;
-
-namespace LiteCharms.Features.Leads.Commands.Handlers;
-
-public class UpdateLeadCommandHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<UpdateLeadCommand, Result>
-{
-    public async ValueTask<Result> Handle(UpdateLeadCommand request, CancellationToken cancellationToken)
-    {
-        try
-        {
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var lead = await context.Leads.FirstOrDefaultAsync(l => l.Id == request.LeadId, cancellationToken);
-
-            if (lead is null)
-                return Result.Fail(new Error($"Lead with ID {request.LeadId} not found."));
-
-            lead.Status = request.Status;
-
-            return await context.SaveChangesAsync(cancellationToken) > 0
-                ? Result.Ok()
-                : Result.Fail(new Error($"Failed to update the lead {request.LeadId}."));
-        }
-        catch (Exception ex)
-        {
-            return Result.Fail(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Leads/Commands/UpdateLeadCommand.cs

@@ -1,27 +0,0 @@
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Leads.Commands;
-
-public class UpdateLeadCommand : IRequest<Result>
-{
-    public Guid LeadId { get; set; }
-
-    public LeadStatus Status { get; set; }
-
-    private UpdateLeadCommand(Guid leadId, LeadStatus status)
-    {
-        LeadId = leadId;
-        Status = status;
-    }
-
-    public static UpdateLeadCommand Create(Guid leadId, LeadStatus status)
-    {
-        if (leadId == Guid.Empty)
-            throw new ArgumentException("Lead ID cannot be empty.", nameof(leadId));
-
-        if (!Enum.IsDefined(typeof(LeadStatus), status))
-            throw new ArgumentException("Invalid lead status.", nameof(status));
-
-        return new(leadId, status);
-    }
-}

LiteCharms.Features/Leads/Queries/GetCustomerLeadsQuery.cs

@@ -1,30 +0,0 @@
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Leads.Queries;
-
-public class GetCustomerLeadsQuery : IRequest<Result<Lead[]>>
-{
-    public Guid CustomerId { get; }
-
-    public DateOnly From { get; set; }
-
-    public DateOnly To { get; set; }
-
-    private GetCustomerLeadsQuery(Guid customerId, DateOnly from, DateOnly to)
-    {
-        CustomerId = customerId;
-        From = from;
-        To = to;
-    }
-
-    public static GetCustomerLeadsQuery Create(Guid customerId, DateOnly from, DateOnly to)
-    {
-        if(customerId == Guid.Empty)
-            throw new ArgumentException("Customer ID cannot be empty.", nameof(customerId));
-
-        if(from > to)
-            throw new ArgumentException("The 'From' date cannot be later than the 'To' date.");
-
-        return new(customerId, from, to);
-    }
-}

LiteCharms.Features/Leads/Queries/GetLeadsQuery.cs

@@ -1,30 +0,0 @@
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Leads.Queries;
-
-public class GetLeadsQuery : IRequest<Result<Lead[]>>
-{
-    public DateOnly From { get; set; }
-
-    public DateOnly To { get; set; }
-
-    public int MaxRecords { get; set; }
-
-    private GetLeadsQuery(DateOnly from, DateOnly to, int maxRecords = 1000)
-    {
-        From = from;
-        To = to;
-        MaxRecords = maxRecords;
-    }
-
-    public static GetLeadsQuery Create(DateOnly from, DateOnly to, int maxRecords = 1000)
-    {
-        if (from > to)
-            throw new ArgumentException("From date cannot be greater than To date.");
-
-        if(maxRecords <= 0)
-            throw new ArgumentException("MaxRecords must be a positive integer.");
-
-        return new(from, to, maxRecords);
-    }
-}

LiteCharms.Features/Leads/Queries/Handlers/GetCustomerLeadsQueryHandler.cs

@@ -1,33 +0,0 @@
-using LiteCharms.Extensions;
-using LiteCharms.Infrastructure.Database;
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Leads.Queries.Handlers;
-
-public class GetCustomerLeadsQueryHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<GetCustomerLeadsQuery, Result<Lead[]>>
-{
-    public async ValueTask<Result<Lead[]>> Handle(GetCustomerLeadsQuery request, CancellationToken cancellationToken)
-    {
-		try
-		{
-            var fromDate = request.From.ToDateTime(TimeOnly.MinValue);
-            var toDate = request.To.ToDateTime(TimeOnly.MaxValue);
-
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var leads = await context.Leads.AsNoTracking()
-                .OrderByDescending(o => o.CreatedAt)
-                .Where(lead => lead.CustomerId == request.CustomerId)
-                .Where(lead => lead.CreatedAt.Date >= fromDate && lead.CreatedAt.Date <= toDate)
-                .ToArrayAsync(cancellationToken);
-
-            return leads?.Length > 0
-                ? Result.Ok(leads.Select(l => l.ToModel()).ToArray())
-                : Result.Fail(new Error($"No customer {request.CustomerId} leads found for the specified date range {request.From} to {request.To}."));
-        }
-		catch (Exception ex)
-		{
-            return Result.Fail<Lead[]>(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Leads/Queries/Handlers/GetLeadsQueryHandler.cs

@@ -1,33 +0,0 @@
-using LiteCharms.Extensions;
-using LiteCharms.Infrastructure.Database;
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Leads.Queries.Handlers;
-
-public class GetLeadsQueryHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<GetLeadsQuery, Result<Lead[]>>
-{
-    public async ValueTask<Result<Lead[]>> Handle(GetLeadsQuery request, CancellationToken cancellationToken)
-    {
-		try
-		{
-            var fromDate = request.From.ToDateTime(TimeOnly.MinValue);
-            var toDate = request.To.ToDateTime(TimeOnly.MaxValue);
-
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var leads = await context.Leads.AsNoTracking()
-                .OrderByDescending(o => o.CreatedAt)
-                .Where(l => l.CreatedAt.Date >= fromDate && l.CreatedAt.Date <= toDate)
-                .Take(request.MaxRecords)
-                .ToArrayAsync(cancellationToken);
-
-            return leads?.Length > 0 
-                ? Result.Ok(leads.Select(l => l.ToModel()).ToArray()) 
-                : Result.Fail(new Error($"No leads found for the specified date range {request.From} to {request.To}."));
-        }
-		catch (Exception ex)
-		{
-            return Result.Fail(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/LiteCharms.Features.csproj

@@ -21,6 +21,7 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageTags>utility;dotnet</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
+    <UserSecretsId>8a78916e-c86b-4f4b-9f4e-d8e7769b5d23</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
@@ -28,6 +29,86 @@
     <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" />
@@ -47,18 +128,40 @@
     <Using Include="FluentResults" />
     <Using Include="Mediator" />
   </ItemGroup>
+  
+  <!-- Amazon S3 SDK -->
+  <ItemGroup>
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.3.40" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.23.3" />
+    
+    <!-- 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.Security.Cryptography" />
+    <Using Include="System.Text.Json" />
-    <Using Include="Microsoft.EntityFrameworkCore" />
+    <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>
-  <ItemGroup>    
+    <None Update="appsettings.json">
-    <ProjectReference Include="..\LiteCharms.Extensions\LiteCharms.Extensions.csproj" />
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    <ProjectReference Include="..\LiteCharms.Infrastructure\LiteCharms.Infrastructure.csproj" />
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Shop\Postgres\Migrations\" />
   </ItemGroup>
 
 </Project>

LiteCharms.Features/Mediator/LoggingPipelineBehavior.cs

@@ -0,0 +1,29 @@
+namespace LiteCharms.Features.Mediator;
+
+public sealed class LoggingPipelineBehavior<TRequest, TResponse>(ILogger<LoggingPipelineBehavior<TRequest, TResponse>> logger) :
+    IPipelineBehavior<TRequest, TResponse?>
+    where TRequest : IRequest<TResponse>
+    where TResponse : ResultBase, new()
+{
+    public async ValueTask<TResponse?> Handle(TRequest message, MessageHandlerDelegate<TRequest, TResponse?> next, CancellationToken cancellationToken)
+    {
+        TResponse? response = await next(message, cancellationToken);
+
+        if (response is null)
+            logger.LogCritical("{Request} {TypeName} was returned as null", typeof(TRequest).Name, typeof(TRequest).Name);
+
+        if(response?.IsFailed == true || response?.Errors?.Any() == true)
+        {
+            foreach (var error in response.Errors)
+            {
+                if (!string.IsNullOrWhiteSpace(error.Message))
+                    logger.LogWarning("{Request} {Error}", typeof(TRequest).Name, error.Message);
+
+                if (error?.Reasons?.Count > 0)
+                    error.Reasons.ForEach(r => logger.LogError("{Request} {Reason}", typeof(TRequest).Name, r.ToString()));
+            }
+        }
+
+        return response;
+    }
+}

LiteCharms.Features/Mediator/MediatorTelemetry.cs

@@ -0,0 +1,12 @@
+namespace LiteCharms.Features.Mediator;
+
+public static class MediatorTelemetry
+{
+    public const string ServiceName = "LiteCharms.Mediator";
+
+    public static readonly ActivitySource Source = new(ServiceName);
+    public static readonly Meter Meter = new(ServiceName);
+
+    public static readonly Counter<long> RequestCounter = Meter.CreateCounter<long>("mediator_requests_total");
+    public static readonly Histogram<double> RequestDuration = Meter.CreateHistogram<double>("mediator_request_duration_ms");
+}

LiteCharms.Features/Mediator/TelemetryPipelineBehavior.cs

@@ -0,0 +1,66 @@
+namespace LiteCharms.Features.Mediator;
+
+public sealed class TelemetryPipelineBehavior<TRequest, TResponse> :
+    IPipelineBehavior<TRequest, TResponse?>
+    where TRequest : IRequest<TResponse>
+    where TResponse : ResultBase, new()
+{
+    public async ValueTask<TResponse?> Handle(TRequest message, MessageHandlerDelegate<TRequest, TResponse?> next, CancellationToken cancellationToken)
+    {
+        var requestName = typeof(TRequest).Name;
+
+        using var activity = MediatorTelemetry.Source.StartActivity(requestName);
+
+        activity?.SetTag("mediator.request_type", typeof(TRequest).FullName);
+
+        var stopWatch = Stopwatch.StartNew();
+        var status = "Success";
+
+        try
+        {
+            TResponse? response = await next(message, cancellationToken);
+
+            if (response is null)
+            {
+                status = "NullResponse";
+                activity?.SetStatus(ActivityStatusCode.Error, "Response was null");
+
+                return response;
+            }
+
+            if (response.IsFailed)
+            {
+                status = "Failed";
+                activity?.SetStatus(ActivityStatusCode.Error, "Request failed");
+
+                var firstError = response.Errors.FirstOrDefault()?.Message ?? "Unknown Error";
+                activity?.SetTag("error.message", firstError);
+
+                foreach (var error in response.Errors)
+                    activity?.AddEvent(new ActivityEvent("Result Error", tags: new() { { "message", error.Message } }));
+            }
+            else
+                activity?.SetStatus(ActivityStatusCode.Ok);
+
+            return response;
+        }
+        catch (Exception ex)
+        {
+            status = "Exception";
+            activity?.SetStatus(ActivityStatusCode.Error, ex.Message);
+            
+            activity?.AddException(ex);
+
+            throw;
+        }
+        finally
+        {
+            stopWatch.Stop();
+
+            var tags = new TagList { { "request", requestName }, { "status", status } };
+
+            MediatorTelemetry.RequestCounter.Add(1, tags);
+            MediatorTelemetry.RequestDuration.Record(stopWatch.Elapsed.TotalMilliseconds, tags);
+        }
+    }
+}

LiteCharms.Features/Models/DateRange.cs

@@ -0,0 +1,10 @@
+namespace LiteCharms.Features.Models;
+
+public class DateRange
+{
+    public DateOnly From { get; set; }
+
+    public DateOnly To { get; set; }
+
+    public int MaxRecords { get; set; }
+}

LiteCharms.Features/Notifications/Commands/CreateNotificationCommand.cs

@@ -1,60 +0,0 @@
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Notifications.Commands;
-
-public class CreateNotificationCommand : IRequest<Result<Guid>>
-{
-    public NotificationDirection Direction { get; set; }
-
-    public string? Author { get; set; }
-
-    public string? Title { get; set; }
-
-    public string? Description { get; set; }
-
-    public NotificationPlatforms Platform { get; set; }
-
-    public string? PlatformAddress { get; set; }
-
-    public string? CorrelationId { get; set; }
-
-    public string? CorrelationIdType { get; set; }
-
-    public bool IsInternal { get; set; }
-
-    private CreateNotificationCommand(NotificationDirection direction, string author, string title, string description, NotificationPlatforms platform, string platformAddress, string correlationId, string correlationIdType, bool isInternal)
-    {
-        Direction = direction;
-        Author = author;
-        Title = title;
-        Description = description;
-        Platform = platform;
-        PlatformAddress = platformAddress;
-        CorrelationId = correlationId;
-        CorrelationIdType = correlationIdType;
-        IsInternal = isInternal;
-    }
-
-    public static CreateNotificationCommand Create(NotificationDirection direction, string author, string title, string description, NotificationPlatforms platform, string platformAddress, string correlationId, string correlationIdType, bool isInternal)
-    {
-        if (string.IsNullOrWhiteSpace(author))
-            throw new ArgumentException("Author cannot be null or whitespace.", nameof(author));
-
-        if (string.IsNullOrWhiteSpace(title))
-            throw new ArgumentException("Title cannot be null or whitespace.", nameof(title));
-
-        if (string.IsNullOrWhiteSpace(description))
-            throw new ArgumentException("Description cannot be null or whitespace.", nameof(description));
-
-        if (string.IsNullOrWhiteSpace(platformAddress))
-            throw new ArgumentException("PlatformAddress cannot be null or whitespace.", nameof(platformAddress));
-
-        if (string.IsNullOrWhiteSpace(correlationId))
-            throw new ArgumentException("CorrelationId cannot be null or whitespace.", nameof(correlationId));
-
-        if (string.IsNullOrWhiteSpace(correlationIdType))
-            throw new ArgumentException("CorrelationIdType cannot be null or whitespace.", nameof(correlationIdType));
-
-        return new(direction, author, title, description, platform, platformAddress, correlationId, correlationIdType, isInternal);
-    }
-}

LiteCharms.Features/Notifications/Commands/Handlers/CreateNotificationCommandHandler.cs

@@ -1,35 +0,0 @@
-using LiteCharms.Infrastructure.Database;
-
-namespace LiteCharms.Features.Notifications.Commands.Handlers;
-
-public class CreateNotificationCommandHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<CreateNotificationCommand, Result<Guid>>
-{
-    public async ValueTask<Result<Guid>> Handle(CreateNotificationCommand request, CancellationToken cancellationToken)
-    {
-		try
-		{
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var newNotification = context.Notifications.Add(new Entities.Notification
-            {
-                Direction = request.Direction,
-                Sender = request.Author,
-                Subject = request.Title,
-                Message = request.Description,
-                Platform = request.Platform,
-                Recipient = request.PlatformAddress,
-                CorrelationId = request.CorrelationId,
-                CorrelationIdType = request.CorrelationIdType,
-                IsInternal = request.IsInternal,
-            });
-
-            return newNotification is not null 
-                ? Result.Ok(newNotification.Entity.Id) 
-                : Result.Fail(new Error("Failed to create notification"));
-        }
-		catch (Exception ex)
-		{
-            return Result.Fail(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Notifications/Commands/Handlers/UpdateNotificationCommandHandler.cs

@@ -1,29 +0,0 @@
-using LiteCharms.Infrastructure.Database;
-
-namespace LiteCharms.Features.Notifications.Commands.Handlers;
-
-public class UpdateNotificationCommandHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<UpdateNotificationCommand, Result>
-{
-    public async ValueTask<Result> Handle(UpdateNotificationCommand request, CancellationToken cancellationToken)
-    {
-		try
-		{
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var notification = await context.Notifications.FirstOrDefaultAsync(n => n.Id == request.NotificationId, cancellationToken);
-
-            if(notification is null)
-                return Result.Fail(new Error($"Notification with id {request.NotificationId} not found."));
-
-            notification.Processed = request.Processed;
-
-            return await context.SaveChangesAsync(cancellationToken) > 0
-                ? Result.Ok()
-                : Result.Fail(new Error($"Failed to update notification with id {request.NotificationId}."));
-        }
-		catch (Exception ex)
-		{
-            return Result.Fail(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Notifications/Commands/UpdateNotificationCommand.cs

@@ -1,22 +0,0 @@
-namespace LiteCharms.Features.Notifications.Commands;
-
-public class UpdateNotificationCommand : IRequest<Result>
-{
-    public Guid NotificationId { get; set; }
-
-    public bool Processed { get; set; }
-
-    private UpdateNotificationCommand(Guid notificationId, bool processed)
-    {
-        NotificationId = notificationId;
-        Processed = processed;
-    }
-
-    public static UpdateNotificationCommand Create(Guid notificationId, bool processed) 
-    { 
-        if(notificationId == Guid.Empty)
-            throw new ArgumentException("Notification ID cannot be empty.", nameof(notificationId));
-
-        return new(notificationId, processed);
-    }
-}

LiteCharms.Features/Notifications/Queries/GetNotificationQuery.cs

@@ -1,18 +0,0 @@
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Notifications.Queries;
-
-public class GetNotificationQuery : IRequest<Result<Notification>>
-{
-    public Guid NotificationId { get; set; }
-
-    private GetNotificationQuery(Guid notificationId) => NotificationId = notificationId;
-
-    public static GetNotificationQuery Create(Guid notificationId)
-    {
-        if (notificationId == Guid.Empty)
-            throw new ArgumentException("Notification ID is required.", nameof(notificationId));
-
-        return new(notificationId);
-    }
-}

LiteCharms.Features/Notifications/Queries/GetNotificationsQuery.cs

@@ -1,30 +0,0 @@
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Notifications.Queries;
-
-public class GetNotificationsQuery : IRequest<Result<Notification[]>>
-{
-    public DateOnly From { get; set; }
-
-    public DateOnly To { get; set; }
-
-    public int MaxRecords { get; set; }
-
-    private GetNotificationsQuery(DateOnly from, DateOnly to, int maxRecords = 1000)
-    {
-        From = from;
-        To = to;
-        MaxRecords = maxRecords;
-    }
-
-    public static GetNotificationsQuery Create(DateOnly from, DateOnly to, int maxRecords = 1000)
-    {
-        if (from > to)  
-            throw new ArgumentException("From date cannot be greater than To date.");
-
-        if(maxRecords <= 0)  
-            throw new ArgumentException("MaxRecords must be a positive integer.", nameof(maxRecords));
-
-        return new(from, to, maxRecords);
-    }
-}

LiteCharms.Features/Notifications/Queries/Handlers/GetNotificationQueryHandler.cs

@@ -1,26 +0,0 @@
-using LiteCharms.Extensions;
-using LiteCharms.Infrastructure.Database;
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Notifications.Queries.Handlers;
-
-public class GetNotificationQueryHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<GetNotificationQuery, Result<Notification>>
-{
-    public async ValueTask<Result<Notification>> Handle(GetNotificationQuery request, CancellationToken cancellationToken)
-    {
-        try
-        {
-            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var notification = await context.Notifications.FindAsync(new object[] { request.NotificationId }, cancellationToken);
-
-            return notification is not null 
-                ? Result.Ok(notification.ToModel())
-                : Result.Fail<Notification>(new Error($"Notification with id {request.NotificationId} not found"));
-        }
-        catch (Exception ex)
-        {
-            return Result.Fail<Notification>(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Notifications/Queries/Handlers/GetNotificationsQueryHandler.cs

@@ -1,33 +0,0 @@
-using LiteCharms.Extensions;
-using LiteCharms.Infrastructure.Database;
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Notifications.Queries.Handlers;
-
-public class GetNotificationsQueryHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<GetNotificationsQuery, Result<Notification[]>>
-{
-    public async ValueTask<Result<Notification[]>> Handle(GetNotificationsQuery request, CancellationToken cancellationToken)
-    {
-		try
-		{
-            var fromDate = request.From.ToDateTime(TimeOnly.MinValue);
-            var toDate = request.To.ToDateTime(TimeOnly.MaxValue);
-
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var notifications = await context.Notifications.AsNoTracking()
-                .Where(n => n.CreatedAt >= fromDate && n.CreatedAt <= toDate)
-                .OrderByDescending(n => n.CreatedAt)
-                .Take(request.MaxRecords)
-                .ToArrayAsync(cancellationToken);
-
-            return notifications?.Length > 0 
-                ? Result.Ok(notifications.Select(n => n.ToModel()).ToArray()) 
-                : Result.Fail(new Error($"No notifications found for the specified date range {request.From} to {request.To}."));
-        }
-		catch (Exception ex)
-		{
-            return Result.Fail(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Orders/Commands/CreateOrderCommand.cs

@@ -1,28 +0,0 @@
-namespace LiteCharms.Features.Orders.Commands;
-
-public class CreateOrderCommand : IRequest<Result<Guid>>
-{
-    public Guid CustomerId { get; set; }
-
-    public Guid ShoppingCartId { get; set; }
-
-    public Guid? QuoteId { get; set; }
-
-    private CreateOrderCommand(Guid customerId, Guid shoppingCartId, Guid? quoteId = null)
-    {
-        CustomerId = customerId;
-        ShoppingCartId = shoppingCartId;
-        QuoteId = quoteId;
-    }
-
-    public static CreateOrderCommand Create(Guid customerId, Guid shoppingCartId, Guid? quoteId = null)
-    {
-        if (customerId == Guid.Empty)
-            throw new ArgumentException("CustomerId is required.", nameof(customerId));
-
-        if (shoppingCartId == Guid.Empty)
-            throw new ArgumentException("ShoppingCartId is required.", nameof(shoppingCartId));
-
-        return new(customerId, shoppingCartId, quoteId);
-    }
-}

LiteCharms.Features/Orders/Commands/Handlers/CreateOrderCommandHandler.cs

@@ -1,39 +0,0 @@
-using LiteCharms.Infrastructure.Database;
-
-namespace LiteCharms.Features.Orders.Commands.Handlers;
-
-public class CreateOrderCommandHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<CreateOrderCommand, Result<Guid>>
-{
-    public async ValueTask<Result<Guid>> Handle(CreateOrderCommand request, CancellationToken cancellationToken)
-    {
-		try
-		{
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            if(!await context.Customers.AnyAsync(c => c.Id == request.CustomerId, cancellationToken))
-                return Result.Fail<Guid>(new Error($"Customer {request.CustomerId} does not exist."));
-
-            if(!await context.ShoppingCarts.AnyAsync(sc => sc.Id == request.ShoppingCartId, cancellationToken))
-                return Result.Fail<Guid>(new Error($"Shopping cart {request.ShoppingCartId} does not exist."));
-
-            if(request.QuoteId.HasValue && !await context.Quotes.AnyAsync(q => q.Id == request.QuoteId.Value, cancellationToken))
-                return Result.Fail<Guid>(new Error($"Quote {request.QuoteId.Value} does not exist."));
-
-            var newOrder = context.Orders.Add(new Entities.Order
-            {
-                CustomerId = request.CustomerId,
-                ShoppingCartId = request.ShoppingCartId,
-                QuoteId = request.QuoteId,
-                CreatedAt = DateTime.UtcNow
-            });
-
-            return await context.SaveChangesAsync(cancellationToken) > 0
-                ? Result.Ok(newOrder.Entity.Id)
-                : Result.Fail<Guid>(new Error($"Failed to create customer {request.CustomerId} order using shopping cart {request.ShoppingCartId}."));
-        }
-		catch (Exception ex)
-		{
-            return Result.Fail<Guid>(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Orders/Commands/Handlers/UpdateOrderStatusCommandHandler.cs

@@ -1,29 +0,0 @@
-using LiteCharms.Infrastructure.Database;
-
-namespace LiteCharms.Features.Orders.Commands.Handlers;
-
-public class UpdateOrderStatusCommandHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<UpdateOrderStatusCommand, Result>
-{
-    public async ValueTask<Result> Handle(UpdateOrderStatusCommand request, CancellationToken cancellationToken)
-    {
-		try
-		{
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var order = await context.Orders.FirstOrDefaultAsync(o => o.Id == request.OrderId, cancellationToken);
-
-            if (order is null)
-                return Result.Fail(new Error($"Order {request.OrderId} not found"));
-
-            order.Status = request.Status;
-
-            return await context.SaveChangesAsync(cancellationToken) > 0
-                ? Result.Ok()
-                : Result.Fail(new Error($"Failed to update order {request.OrderId}"));
-        }
-		catch (Exception ex)
-		{
-            return Result.Fail(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Orders/Commands/UpdateOrderStatusCommand.cs

@@ -1,30 +0,0 @@
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Orders.Commands;
-
-public class UpdateOrderStatusCommand : IRequest<Result>
-{
-    public Guid OrderId { get; set; }
-
-    public OrderStatus Status { get; set; }
-
-    public string? Note { get; set; }
-
-    private UpdateOrderStatusCommand(Guid orderId, OrderStatus status, string? note)
-    {
-        OrderId = orderId;
-        Status = status;
-        Note = note;
-    }
-
-    public static UpdateOrderStatusCommand Create(Guid orderId, OrderStatus status, string? note)
-    {
-        if (orderId == Guid.Empty)
-            throw new ArgumentException("OrderId is required.", nameof(orderId));
-
-        if (!Enum.IsDefined(typeof(OrderStatus), status))
-            throw new ArgumentException("Invalid order status.", nameof(status));
-
-        return new(orderId, status, note);
-    }
-}

LiteCharms.Features/Orders/Queries/GetCustomerOrdersQuery.cs

@@ -1,18 +0,0 @@
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Orders.Queries;
-
-public class GetCustomerOrdersQuery : IRequest<Result<Order[]>>
-{
-    public Guid CustomerId { get; }
-
-    private GetCustomerOrdersQuery(Guid customerId) => CustomerId = customerId;
-
-    public static GetCustomerOrdersQuery Create(Guid customerId)
-    {
-        if (customerId == Guid.Empty)
-            throw new ArgumentException("CustomerId is required.", nameof(customerId));
-
-        return new(customerId);
-    }
-}

LiteCharms.Features/Orders/Queries/GetOrderRefundQuery.cs

@@ -1,27 +0,0 @@
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Orders.Queries;
-
-public class GetOrderRefundQuery : IRequest<Result<OrderRefund>>
-{
-    public Guid OrderId { get; set; }
-
-    public Guid OrderRefundId { get; set; }
-
-    private GetOrderRefundQuery(Guid orderId, Guid orderRefundId)
-    {
-        OrderId = orderId;
-        OrderRefundId = orderRefundId;
-    }
-
-    public static GetOrderRefundQuery Create(Guid orderId, Guid orderRefundId)
-    {
-        if (orderId == Guid.Empty)
-            throw new ArgumentException("OrderId is required.", nameof(orderId));
-
-        if (orderRefundId == Guid.Empty)
-            throw new ArgumentException("OrderRefundId is required.", nameof(orderRefundId));
-
-        return new(orderId, orderRefundId);
-    }
-}

LiteCharms.Features/Orders/Queries/GetOrdersQuery.cs

@@ -1,30 +0,0 @@
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Orders.Queries;
-
-public class GetOrdersQuery : IRequest<Result<Order[]>>
-{
-    public DateOnly From { get; set; }
-
-    public DateOnly To { get; set; }
-
-    public int MaxRecords { get; set; }
-
-    private GetOrdersQuery(DateOnly from, DateOnly to, int maxRecords = 1000)
-    {
-        From = from;
-        To = to;
-        MaxRecords = maxRecords;
-    }
-
-    public static GetOrdersQuery Create(DateOnly from, DateOnly to, int maxRecords = 1000)
-    {
-        if (from > to)
-            throw new ArgumentException("From date cannot be greater than To date.");
-
-        if(maxRecords <= 0)
-            throw new ArgumentException("MaxRecords must be a positive integer.");
-
-        return new(from, to, maxRecords);
-    }
-}

LiteCharms.Features/Orders/Queries/Handlers/GetCustomerOrdersQueryHandler.cs

@@ -1,32 +0,0 @@
-using LiteCharms.Extensions;
-using LiteCharms.Infrastructure.Database;
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Orders.Queries.Handlers;
-
-public class GetCustomerOrdersQueryHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<GetCustomerOrdersQuery, Result<Order[]>>
-{
-    public async ValueTask<Result<Order[]>> Handle(GetCustomerOrdersQuery request, CancellationToken cancellationToken)
-    {
-		try
-		{
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            if(!await context.Customers.AsNoTracking().AnyAsync(c => c.Id == request.CustomerId, cancellationToken))
-                return Result.Fail<Order[]>(new Error($"Customer with Id {request.CustomerId} does not exist."));
-
-            var orders = await context.Orders.AsNoTracking()
-                .OrderByDescending(o => o.CreatedAt)
-                .Where(o => o.CustomerId == request.CustomerId)
-                .ToArrayAsync(cancellationToken);
-
-            return orders?.Length > 0
-                ? Result.Ok(orders.Select(o => o.ToModel()).ToArray())
-                : Result.Fail<Order[]>(new Error($"No orders found for customer with Id {request.CustomerId}."));
-        }
-		catch (Exception ex)
-		{
-            return Result.Fail<Order[]>(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Orders/Queries/Handlers/GetOrderRefundQueryHandler.cs

@@ -1,27 +0,0 @@
-using LiteCharms.Extensions;
-using LiteCharms.Infrastructure.Database;
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Orders.Queries.Handlers;
-
-public class GetOrderRefundQueryHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<GetOrderRefundQuery, Result<OrderRefund>>
-{
-    public async ValueTask<Result<OrderRefund>> Handle(GetOrderRefundQuery request, CancellationToken cancellationToken)
-    {
-		try
-		{
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var refund = await context.OrderRefunds.AsNoTracking()
-                .FirstOrDefaultAsync(r => r.OrderId == request.OrderId && r.Id == request.OrderRefundId, cancellationToken);
-            
-            return refund is not null
-                ? Result.Ok(refund.ToModel())
-                : Result.Fail<OrderRefund>(new Error($"Refund {request.OrderRefundId} not found for the given OrderId: {request.OrderId}"));
-        }
-		catch (Exception ex)
-		{
-            return Result.Fail<OrderRefund>(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Orders/Queries/Handlers/GetOrdersQueryHandler.cs

@@ -1,33 +0,0 @@
-using LiteCharms.Extensions;
-using LiteCharms.Infrastructure.Database;
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Orders.Queries.Handlers;
-
-public class GetOrdersQueryHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<GetOrdersQuery, Result<Order[]>>
-{
-    public async ValueTask<Result<Order[]>> Handle(GetOrdersQuery request, CancellationToken cancellationToken)
-    {
-		try
-		{
-            var fromDate = request.From.ToDateTime(TimeOnly.MinValue);
-            var toDate = request.To.ToDateTime(TimeOnly.MaxValue);
-
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var orders = await context.Orders
-                .OrderByDescending(o => o.CreatedAt)
-                .Where(o => o.CreatedAt >= fromDate && o.CreatedAt <= toDate)
-                .Take(request.MaxRecords)
-                .ToArrayAsync(cancellationToken);   
-
-            return orders?.Length > 0
-                ? Result.Ok(orders.Select(o => o.ToModel()).ToArray())
-                : Result.Fail<Order[]>(new Error($"No orders found for the specified date range {request.From} - {request.To}."));
-        }
-		catch (Exception ex)
-		{
-            return Result.Fail<Order[]>(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Products/Queries/GetProductPriceQuery.cs

@@ -1,18 +0,0 @@
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Products.Queries;
-
-public class GetProductPriceQuery : IRequest<Result<ProductPrice>>
-{
-    public Guid ProductId { get; set; }
-
-    private GetProductPriceQuery(Guid productId) => ProductId = productId;
-
-    public static GetProductPriceQuery Create(Guid productId)
-    {
-        if (productId == Guid.Empty)
-            throw new ArgumentException("ProductId is required.", nameof(productId));
-
-        return new(productId);
-    }
-}

LiteCharms.Features/Products/Queries/GetProductPricesQuery.cs

@@ -1,18 +0,0 @@
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Products.Queries;
-
-public class GetProductPricesQuery : IRequest<Result<ProductPrice[]>>
-{
-    public int MaxRecords { get; set; }
-
-    private GetProductPricesQuery(int maxRecords = 1000) => MaxRecords = maxRecords;
-
-    public static GetProductPricesQuery Create(int maxRecords = 1000)
-    {
-        if (maxRecords <= 0)
-            throw new ArgumentOutOfRangeException(nameof(maxRecords), "MaxRecords must be greater than zero.");
-
-        return new(maxRecords);
-    }
-}

LiteCharms.Features/Products/Queries/GetProductQuery.cs

@@ -1,18 +0,0 @@
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Products.Queries;
-
-public class GetProductQuery : IRequest<Result<Product>>
-{
-    public Guid ProductId { get; set; }
-
-    private GetProductQuery(Guid productId) => ProductId = productId;
-
-    public static GetProductQuery Create(Guid productId)
-    {
-        if(productId == Guid.Empty)
-            throw new ArgumentException("Product ID is required.", nameof(productId));
-
-        return new(productId);
-    }
-}

LiteCharms.Features/Products/Queries/GetProductsQuery.cs

@@ -1,18 +0,0 @@
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Products.Queries;
-
-public class GetProductsQuery : IRequest<Result<Product[]>>
-{
-    public int MaxRecords { get; set; }
-
-    private GetProductsQuery(int maxRecords = 1000) => MaxRecords = maxRecords;
-
-    public static GetProductsQuery Create(int maxRecords = 1000)
-    {
-        if (maxRecords <= 0)
-            throw new ArgumentException("MaxRecords must be a positive integer.");
-
-        return new(maxRecords);
-    }
-}

LiteCharms.Features/Products/Queries/Handlers/GetProductPriceQueryHandler.cs

@@ -1,32 +0,0 @@
-using LiteCharms.Extensions;
-using LiteCharms.Infrastructure.Database;
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Products.Queries.Handlers;
-
-public class GetProductPriceQueryHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<GetProductPriceQuery, Result<ProductPrice>>
-{
-    public async ValueTask<Result<ProductPrice>> Handle(GetProductPriceQuery request, CancellationToken cancellationToken)
-    {
-		try
-		{
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            if(!await context.Products.AnyAsync(p => p.Id == request.ProductId, cancellationToken))
-                return Result.Fail<ProductPrice>(new Error($"Product {request.ProductId} not found."));
-
-            var productPrice = await context.ProductPrices.AsNoTracking()
-                .Where(pp => pp.ProductId == request.ProductId && pp.Active)
-                .OrderByDescending(pp => pp.CreatedAt)
-                .FirstOrDefaultAsync(cancellationToken);
-
-            return productPrice is not null 
-                ? Result.Ok(productPrice.ToModel())
-                : Result.Fail<ProductPrice>(new Error($"Product price {request.ProductId} not found."));
-        }
-        catch (Exception ex)
-		{
-            return Result.Fail<ProductPrice>(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Products/Queries/Handlers/GetProductPricesQueryHandler.cs

@@ -1,27 +0,0 @@
-using LiteCharms.Extensions;
-using LiteCharms.Infrastructure.Database;
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Products.Queries.Handlers;
-
-public class GetProductPricesQueryHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<GetProductPricesQuery, Result<ProductPrice[]>>
-{
-    public async ValueTask<Result<ProductPrice[]>> Handle(GetProductPricesQuery request, CancellationToken cancellationToken)
-    {
-        try
-        {
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var products = await context.ProductPrices.AsNoTracking()
-                .OrderByDescending(o => o.Id)
-                .Take(request.MaxRecords)
-                .ToArrayAsync(cancellationToken);
-
-            return Result.Ok(products.Select(p => p.ToModel()).ToArray());
-        }
-        catch (Exception ex)
-        {
-            return Result.Fail<ProductPrice[]>(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Products/Queries/Handlers/GetProductQueryHandler.cs

@@ -1,26 +0,0 @@
-using LiteCharms.Extensions;
-using LiteCharms.Infrastructure.Database;
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Products.Queries.Handlers;
-
-public class GetProductQueryHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<GetProductQuery, Result<Product>>
-{
-    public async ValueTask<Result<Product>> Handle(GetProductQuery request, CancellationToken cancellationToken)
-    {
-		try
-		{
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var product = await context.Products.FirstOrDefaultAsync(p => p.Id == request.ProductId, cancellationToken);
-
-            return product is not null
-                ? Result.Ok(product.ToModel())
-                : Result.Fail<Product>(new Error($"Product with ID {request.ProductId} not found."));
-        }
-		catch (Exception ex)
-		{
-            return Result.Fail<Product>(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Products/Queries/Handlers/GetProductsQueryHandler.cs

@@ -1,27 +0,0 @@
-using LiteCharms.Extensions;
-using LiteCharms.Infrastructure.Database;
-using LiteCharms.Models;
-
-namespace LiteCharms.Features.Products.Queries.Handlers;
-
-public class GetProductsQueryHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<GetProductsQuery, Result<Product[]>>
-{
-    public async ValueTask<Result<Product[]>> Handle(GetProductsQuery request, CancellationToken cancellationToken)
-    {
-		try
-		{
-            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var products = await context.Products.AsNoTracking()
-                .OrderByDescending(o => o.Id)
-                .Take(request.MaxRecords)
-                .ToArrayAsync(cancellationToken);
-
-            return Result.Ok(products.Select(p => p.ToModel()).ToArray());
-        }
-		catch (Exception ex)
-		{
-            return Result.Fail<Product[]>(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Quartz/Abstractions/IJobOrchestrator.cs

@@ -1,4 +1,6 @@
-namespace LiteCharms.Abstractions;
+using LiteCharms.Features.Abstractions;
+
+namespace LiteCharms.Features.Quartz.Abstractions;
 
 public interface IJobOrchestrator
 {

LiteCharms.Features/Quartz/JobOrchestrator.cs

@@ -1,7 +1,7 @@
-using LiteCharms.Abstractions;
+using LiteCharms.Features.Abstractions;
-using static LiteCharms.Abstractions.Timezones;
+using LiteCharms.Features.Quartz.Abstractions;
 
-namespace LiteCharms.Infrastructure.Quartz;
+namespace LiteCharms.Features.Quartz;
 
 public class JobOrchestrator(ISchedulerFactory schedulerFactory) : IJobOrchestrator
 {
@@ -35,7 +35,7 @@ public class JobOrchestrator(ISchedulerFactory schedulerFactory) : IJobOrchestra
         var chainedJobGroup = "scheduled-jobs";
 
         var scheduler = await schedulerFactory.GetScheduler(cancellationToken);
-        var jobKey = new JobKey($"{notification.Name.ToLower()}-{notification.CorrelationId.ToLower()}", chainedJobGroup);
+        var jobKey = new JobKey($"{notification.Name.ToLower()}", chainedJobGroup);
         var triggerKey = new TriggerKey($"{jobKey.Name}-trigger", chainedJobGroup);
 
         var job = JobBuilder.Create<MediatorJob<TNotification>>()
@@ -46,13 +46,13 @@ public class JobOrchestrator(ISchedulerFactory schedulerFactory) : IJobOrchestra
             .StoreDurably()
             .Build();
 
-        var now = SouthAfricanTimeZone.UtcNow();
+        var now = DateTime.UtcNow;
 
         var trigger = global::Quartz.TriggerBuilder.Create()
             .WithIdentity(triggerKey)
             .WithDescription($"Scheduled via Main Job at {now:g}")
-            .WithCronSchedule(cronExpression, cron => cron.InTimeZone(SouthAfricanTimeZone)
+            .WithCronSchedule(cronExpression, cron => cron
-                .WithMisfireHandlingInstructionFireAndProceed())
+                .WithMisfireHandlingInstructionIgnoreMisfires())
             .StartAt(now)
             .Build();
 

LiteCharms.Features/Quartz/MediatorJob.cs

@@ -0,0 +1,37 @@
+using LiteCharms.Features.Abstractions;
+using LiteCharms.Features.Mediator;
+
+namespace LiteCharms.Features.Quartz;
+
+[DisallowConcurrentExecution]
+public class MediatorJob<TNotification>(IMediator mediator) : IJob where TNotification : IEvent
+{
+    public async Task Execute(IJobExecutionContext context)
+    {
+        var data = context.MergedJobDataMap["Payload"] as string;
+
+        if (string.IsNullOrWhiteSpace(data))
+        {
+            Trace.WriteLine("Job Payload missing, job ended");
+
+            return;
+        }
+
+        var notification = JsonSerializer.Deserialize<TNotification>(data);
+
+        if (notification is null)
+        {
+            Trace.WriteLine("Notification could not be JSon converted from data string, job ended");
+
+            return;
+        }
+                
+        using var activity = MediatorTelemetry.Source.StartActivity($"Quartz: {typeof(TNotification).Name}");
+                
+        activity?.SetTag("event.correlation_id", notification.CorrelationId);
+
+        await mediator.Publish(notification, context.CancellationToken);
+
+        Trace.WriteLine("Job published");
+    }
+}

LiteCharms.Features/Quartz/RetryJobListener.cs

@@ -1,4 +1,4 @@
-namespace LiteCharms.Infrastructure.Quartz;
+namespace LiteCharms.Features.Quartz;
 
 public class RetryJobListener : IJobListener
 {