Merge commit 'cecd9f90e9812a2bd84b2bb8026dbc9cce79741f'

.drone.yml

@@ -16,10 +16,31 @@ 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:
@@ -28,7 +49,6 @@ 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
@@ -41,7 +61,7 @@ steps:
                \"tag_name\": \"$VERSION\",
                \"target_commitish\": \"${DRONE_COMMIT_SHA}\",
                \"name\": \"Library Suite $VERSION\",
-               \"body\": \"### Published NuGet Packages\nAll packages versioned as **$VERSION**:\n* LiteCharms.Features\n\n[View in Nexus](https://nexus.khongisa.co.za/repository/nuget-group/)\",
+               \"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/)\",
                \"draft\": false,
                \"prerelease\": false
              }"

LiteCharms.Abstractions/Constants.cs

@@ -1,9 +1,13 @@
-namespace LiteCharms.Features.ServiceBus;
+namespace LiteCharms.Abstractions;
 
 public static class Constants
 {
     public const int QueueBounds = 100000;
 
+    public const string ShopSchedulerName = "shop";
+    public const string ShopEmailFromName = "Khongisa Shop";
+    public const string ShopEmailFromAddress = "shop@litecharms.co.za";
+
     public const string EmailServiceBus = nameof(EmailServiceBus);
     public const string GeneralServiceBus = nameof(GeneralServiceBus);
     public const string SalesServiceBus = nameof(SalesServiceBus);

LiteCharms.Abstractions/EventBase.cs

@@ -1,7 +1,6 @@
-using LiteCharms.Features.Extensions;
-using static LiteCharms.Features.Extensions.Timezones;
+using static LiteCharms.Abstractions.Timezones;
 
-namespace LiteCharms.Features.Abstractions;
+namespace LiteCharms.Abstractions;
 
 public abstract class EventBase
 {

LiteCharms.Abstractions/EventBusQueueBase.cs

@@ -1,6 +1,4 @@
-using LiteCharms.Features.Abstractions;
-
-namespace LiteCharms.Features.ServiceBus.Abstractions;
+namespace LiteCharms.Abstractions;
 
 public abstract class EventBusQueueBase
 {

LiteCharms.Abstractions/IEvent.cs

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

LiteCharms.Abstractions/IEventBus.cs

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

LiteCharms.Abstractions/IEventBusQueue.cs

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

LiteCharms.Abstractions/IJobOrchestrator.cs

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

LiteCharms.Abstractions/LiteCharms.Abstractions.csproj

@@ -0,0 +1,40 @@
+<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.Abstractions/Timezones.cs

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

LiteCharms.Entities/Configuration/CustomerConfiguration.cs

@@ -1,14 +1,14 @@
-namespace LiteCharms.Features.Shop.Customers.Entities;
+namespace LiteCharms.Entities.Configuration;
 
 public class CustomerConfiguration : IEntityTypeConfiguration<Customer>
 {
     public void Configure(EntityTypeBuilder<Customer> builder)
     {
-        builder.ToTable("Customers");
+        builder.ToTable(nameof(Customer));
 
         builder.HasKey(f => f.Id);
-        builder.Property(f => f.CreatedAt).ValueGeneratedOnAdd().HasDefaultValueSql("now()");
-        builder.Property(f => f.UpdatedAt).IsRequired(false).HasDefaultValueSql(null);
+        builder.Property(f => f.CreatedAt).ValueGeneratedOnAdd();
+        builder.Property(f => f.UpdatedAt).IsRequired(false).ValueGeneratedOnUpdate();
         builder.Property(f => f.Company);
         builder.Property(f => f.Name).IsRequired();
         builder.Property(f => f.LastName).IsRequired();
@@ -26,5 +26,10 @@ public class CustomerConfiguration : IEntityTypeConfiguration<Customer>
         builder.Property(f => f.Country);
         builder.Property(f => f.PostalCode);
         builder.Property(f => f.Active).HasDefaultValue(true);
+
+        builder.HasMany(f => f.Leads)
+            .WithOne(f => f.Customer)
+            .HasForeignKey(f => f.CustomerId)
+            .OnDelete(DeleteBehavior.NoAction);
     }
 }

LiteCharms.Entities/Configuration/LeadConfiguration.cs

@@ -1,15 +1,15 @@
-namespace LiteCharms.Features.Shop.Leads.Entities;
+namespace LiteCharms.Entities.Configuration;
 
 public class LeadConfiguration : IEntityTypeConfiguration<Lead>
 {
     public void Configure(EntityTypeBuilder<Lead> builder)
     {
-        builder.ToTable("Leads");
+        builder.ToTable(nameof(Lead));
 
         builder.HasKey(f => f.Id);
-        builder.Property(f => f.CreatedAt).ValueGeneratedOnAdd().HasDefaultValueSql("now()");
-        builder.Property(f => f.UpdatedAt).IsRequired(false).HasDefaultValueSql(null);
-        builder.Property(f => f.CustomerId);
+        builder.Property(f => f.CreatedAt).ValueGeneratedOnAdd();
+        builder.Property(f => f.UpdatedAt).IsRequired(false).ValueGeneratedOnUpdate();
+        builder.Property(f => f.CustomerId).IsRequired(false);
         builder.Property(f => f.Source);
         builder.Property(f => f.ClickId);
         builder.Property(f => f.WebClickId);
@@ -22,10 +22,5 @@ public class LeadConfiguration : IEntityTypeConfiguration<Lead>
         builder.Property(f => f.ClickLocation);
         builder.Property(f => f.Status).IsRequired();
         builder.Property(f => f.AttributionHash).IsRequired(true);
-
-        builder.HasOne(f => f.Customer)
-            .WithMany(f => f.Leads)
-            .HasForeignKey(f => f.CustomerId)
-            .OnDelete(DeleteBehavior.Restrict);
     }
 }

LiteCharms.Entities/Configuration/NotificationConfiguration.cs

@@ -1,22 +1,24 @@
-namespace LiteCharms.Features.Shop.Notifications.Entities;
+using LiteCharms.Models;
+
+namespace LiteCharms.Entities.Configuration;
 
 public class NotificationConfiguration : IEntityTypeConfiguration<Notification>
 {
     public void Configure(EntityTypeBuilder<Notification> builder)
     {
-        builder.ToTable("Notification");
+        builder.ToTable(nameof(Notification));
 
         builder.HasKey(f => f.Id);
-        builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd().HasDefaultValueSql("now()");
-        builder.Property(f => f.UpdatedAt).IsRequired(false).HasDefaultValueSql(null);
+        builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd();
+        builder.Property(f => f.UpdatedAt).IsRequired(false).ValueGeneratedOnUpdate();
         builder.Property(f => f.Direction).IsRequired().HasConversion<int>();
         builder.Property(f => f.Platform).IsRequired().HasConversion<int>();
         builder.Property(f => f.Priority).IsRequired().HasConversion<int>();
         builder.Property(f => f.CorrelationIdType).IsRequired().HasConversion<int>();
-        builder.Property(f => f.SenderAddress).IsRequired();
+        builder.Property(f => f.Sender).IsRequired();
         builder.Property(f => f.Subject).IsRequired();
         builder.Property(f => f.Message).IsRequired();
-        builder.Property(f => f.RecipientName).IsRequired();
+        builder.Property(f => f.Recipient).IsRequired();
         builder.Property(f => f.RecipientAddress).IsRequired();
         builder.Property(f => f.CorrelationId).IsRequired();
         builder.Property(f => f.IsHtml).HasDefaultValue(false);

LiteCharms.Entities/Configuration/OrderConfiguration.cs

@@ -0,0 +1,32 @@
+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/OrderRefundConfiguration.cs

@@ -1,21 +1,19 @@
-namespace LiteCharms.Features.Shop.Orders.Entities;
+namespace LiteCharms.Entities.Configuration;
 
 public class OrderRefundConfiguration : IEntityTypeConfiguration<OrderRefund>
 {
     public void Configure(EntityTypeBuilder<OrderRefund> builder)
     {
-        builder.ToTable("OrderRefunds");
+        builder.ToTable(nameof(OrderRefund));
 
         builder.HasKey(f => f.Id);
-        builder.Property(f => f.CreatedAt).ValueGeneratedOnAdd().HasDefaultValueSql("now()");
+        builder.Property(f => f.CreatedAt).ValueGeneratedOnAdd();
         builder.Property(f => f.OrderId).IsRequired();
         builder.Property(f => f.Reason).IsRequired();
         builder.Property(f => f.Amount).IsRequired().HasPrecision(18, 2);
 
-        builder.HasOne(r => r.Order)
-               .WithMany(o => o.Refunds)
-               .HasForeignKey(r => r.OrderId)
-               .IsRequired()
-               .OnDelete(DeleteBehavior.Cascade);
+        builder.HasOne(f => f.Order)
+            .WithOne(o => o.Refund)
+            .HasForeignKey<OrderRefund>(o => o.OrderId);
     }
 }

LiteCharms.Entities/Configuration/PackageConfirguration.cs

@@ -0,0 +1,16 @@
+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/PackageItemConfiguration.cs

@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.Shop.CartPackages.Entities;
+namespace LiteCharms.Entities.Configuration;
 
 public class PackageItemConfiguration : IEntityTypeConfiguration<PackageItem>
 {
@@ -7,21 +7,14 @@ public class PackageItemConfiguration : IEntityTypeConfiguration<PackageItem>
         builder.ToTable(nameof(PackageItem));
 
         builder.HasKey(f => f.Id);
-        builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd().HasDefaultValueSql("now()");
+        builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd();
         builder.Property(f => f.PackageId).IsRequired();
         builder.Property(f => f.ProductPriceId).IsRequired();
         builder.Property(f => f.Active);
 
         builder.HasOne(f => f.Package)
-            .WithMany(f => f.PackageItems)
-            .HasForeignKey(pi => pi.PackageId)
-            .IsRequired()
-            .OnDelete(DeleteBehavior.Cascade);
-
-        builder.HasOne(f => f.ProductPrice)
-               .WithMany()
-               .HasForeignKey(pi => pi.ProductPriceId)
-               .IsRequired()
-               .OnDelete(DeleteBehavior.Restrict);
+            .WithMany()
+            .HasForeignKey(f => f.PackageId)
+            .OnDelete(DeleteBehavior.NoAction);
     }
 }

LiteCharms.Entities/Configuration/ProductConfiguration.cs

@@ -0,0 +1,14 @@
+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/ProductPriceConfiguration.cs

@@ -1,23 +1,22 @@
-namespace LiteCharms.Features.Shop.Products.Entities;
+namespace LiteCharms.Entities.Configuration;
 
 public class ProductPriceConfiguration : IEntityTypeConfiguration<ProductPrice>
 {
     public void Configure(EntityTypeBuilder<ProductPrice> builder)
     {
-        builder.ToTable("ProductPrices");
+        builder.ToTable(nameof(ProductPrice));
 
         builder.HasKey(f => f.Id);
-        builder.Property(f => f.CreatedAt).ValueGeneratedOnAdd().HasDefaultValueSql("now()");
-        builder.Property(f => f.UpdatedAt).IsRequired(false);
+        builder.Property(f => f.CreatedAt).ValueGeneratedOnAdd();
+        builder.Property(f => f.UpdatedAt).IsRequired(false).ValueGeneratedOnUpdate();
         builder.Property(f => f.ProductId).IsRequired();
         builder.Property(f => f.Price).IsRequired().HasPrecision(18, 2);
         builder.Property(f => f.Discount).HasPrecision(18, 2);
         builder.Property(f => f.Active);
 
         builder.HasOne(f => f.Product)
-            .WithMany(f => f.ProductPrices)
-            .HasForeignKey(pp => pp.ProductId)
-            .IsRequired()
+            .WithMany(p => p.ProductPrices)
+            .HasForeignKey(f => f.ProductId)
             .OnDelete(DeleteBehavior.Restrict);
     }
 }

LiteCharms.Entities/Configuration/QuoteConfiguration.cs

@@ -0,0 +1,23 @@
+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().HasConversion<int>();
+        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

@@ -0,0 +1,31 @@
+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

@@ -0,0 +1,25 @@
+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

@@ -0,0 +1,24 @@
+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/Customer.cs

@@ -1,9 +1,6 @@
-using LiteCharms.Features.Shop.Leads.Entities;
-using LiteCharms.Features.Shop.Orders.Entities;
-using LiteCharms.Features.Shop.Quotes.Entities;
-using LiteCharms.Features.Shop.ShoppingCarts.Entities;
+using LiteCharms.Entities.Configuration;
 
-namespace LiteCharms.Features.Shop.Customers.Entities;
+namespace LiteCharms.Entities;
 
 [EntityTypeConfiguration<CustomerConfiguration, Customer>]
 public class Customer : Models.Customer

LiteCharms.Entities/Lead.cs

@@ -1,6 +1,6 @@
-using LiteCharms.Features.Shop.Customers.Entities;
+using LiteCharms.Entities.Configuration;
 
-namespace LiteCharms.Features.Shop.Leads.Entities;
+namespace LiteCharms.Entities;
 
 [EntityTypeConfiguration<LeadConfiguration, Lead>]
 public class Lead : Models.Lead

LiteCharms.Entities/LiteCharms.Entities.csproj

@@ -0,0 +1,45 @@
+<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/Notification.cs

@@ -1,4 +1,6 @@
-namespace LiteCharms.Features.Shop.Notifications.Entities;
+using LiteCharms.Entities.Configuration;
+
+namespace LiteCharms.Entities;
 
 [EntityTypeConfiguration<NotificationConfiguration, Notification>]
 public class Notification : Models.Notification;

LiteCharms.Entities/Order.cs

@@ -0,0 +1,15 @@
+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/OrderRefund.cs

@@ -1,8 +1,9 @@
-namespace LiteCharms.Features.Shop.Orders.Entities;
+using LiteCharms.Entities.Configuration;
+
+namespace LiteCharms.Entities;
 
 [EntityTypeConfiguration<OrderRefundConfiguration, OrderRefund>]
 public class OrderRefund : Models.OrderRefund
 {
-
     public virtual Order? Order { get; set; }
 }

LiteCharms.Entities/Package.cs

@@ -1,4 +1,6 @@
-namespace LiteCharms.Features.Shop.CartPackages.Entities;
+using LiteCharms.Entities.Configuration;
+
+namespace LiteCharms.Entities;
 
 [EntityTypeConfiguration<PackageConfirguration, Package>]
 public class Package : Models.Package

LiteCharms.Entities/PackageItem.cs

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

LiteCharms.Entities/Product.cs

@@ -1,8 +1,9 @@
-namespace LiteCharms.Features.Shop.Products.Entities;
+using LiteCharms.Entities.Configuration;
+
+namespace LiteCharms.Entities;
 
 [EntityTypeConfiguration<ProductConfiguration, Product>]
 public class Product : Models.Product
 {
-
     public virtual ICollection<ProductPrice>? ProductPrices { get; set; }
 }

LiteCharms.Entities/ProductPrice.cs

@@ -1,4 +1,6 @@
-namespace LiteCharms.Features.Shop.Products.Entities;
+using LiteCharms.Entities.Configuration;
+
+namespace LiteCharms.Entities;
 
 [EntityTypeConfiguration<ProductPriceConfiguration, ProductPrice>]
 public class ProductPrice : Models.ProductPrice

LiteCharms.Entities/Quote.cs

@@ -1,15 +1,13 @@
-using LiteCharms.Features.Shop.Customers.Entities;
-using LiteCharms.Features.Shop.Orders.Entities;
-using LiteCharms.Features.Shop.ShoppingCarts.Entities;
+using LiteCharms.Entities.Configuration;
 
-namespace LiteCharms.Features.Shop.Quotes.Entities;
+namespace LiteCharms.Entities;
 
 [EntityTypeConfiguration<QuoteConfiguration, Quote>]
 public class Quote : Models.Quote
 {
     public virtual Customer? Customer { get; set; }
 
-    public virtual Order? Order { get; set; }
-
     public virtual ShoppingCart? ShoppingCart { get; set; }
+
+    public virtual Order? Order { get; set; }
 }

LiteCharms.Entities/ShoppingCart.cs

@@ -1,8 +1,6 @@
-using LiteCharms.Features.Shop.Customers.Entities;
-using LiteCharms.Features.Shop.Orders.Entities;
-using LiteCharms.Features.Shop.Quotes.Entities;
+using LiteCharms.Entities.Configuration;
 
-namespace LiteCharms.Features.Shop.ShoppingCarts.Entities;
+namespace LiteCharms.Entities;
 
 [EntityTypeConfiguration<ShoppingCartConfiguration, ShoppingCart>]
 public class ShoppingCart : Models.ShoppingCart
@@ -15,5 +13,5 @@ public class ShoppingCart : Models.ShoppingCart
 
     public virtual ICollection<ShoppingCartItem>? ShoppingCartItems { get; set; }
 
-    public virtual ICollection<ShoppingCartPackage>? ShoppingCartPackages { get; set; }
+    public virtual ICollection<Package>? Packages { get; set; }
 }

LiteCharms.Entities/ShoppingCartItem.cs

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

LiteCharms.Entities/ShoppingCartPackage.cs

@@ -1,6 +1,6 @@
-using LiteCharms.Features.Shop.CartPackages.Entities;
+using LiteCharms.Entities.Configuration;
 
-namespace LiteCharms.Features.Shop.ShoppingCarts.Entities;
+namespace LiteCharms.Entities;
 
 [EntityTypeConfiguration<ShoppingCartPackageConfiguration, ShoppingCartPackage>]
 public class ShoppingCartPackage : Models.ShoppingCartPackage

LiteCharms.Extensions/Email.cs

@@ -0,0 +1,13 @@
+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/EntityModeMappers.cs

@@ -1,36 +1,29 @@
-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;
+using LiteCharms.Models;
 
-namespace LiteCharms.Features.Extensions;
+namespace LiteCharms.Extensions;
 
 public static class EntityModeMappers
 {
-    public static ShoppingCartPackage ToModel(this Features.Shop.ShoppingCarts.Entities.ShoppingCartPackage entity) =>
+    public static ShoppingCartPackage ToModel(this Entities.ShoppingCartPackage entity) =>
         new()
         {
             Id = entity.Id,
             CreatedAt = entity.CreatedAt,
             PackageId = entity.PackageId,
-            ShoppingCartId = entity.ShoppingCartId            
+            ShoppingCartId = entity.ShoppingCartId
         };
 
-    public static PackageItem ToModel(this Features.Shop.CartPackages.Entities.PackageItem entity) =>
+    public static PackageItem ToModel(this Entities.PackageItem entity) =>
         new()
         {
             Id = entity.Id,
             Active = entity.Active,
             CreatedAt = entity.CreatedAt,
             PackageId = entity.PackageId,
-            ProductPriceId = entity.ProductPriceId
+            ProductPriceId = entity.ProductPriceId            
         };
 
-    public static Package ToModel(this Features.Shop.CartPackages.Entities.Package entity) =>
+    public static Package ToModel(this Entities.Package entity) =>
         new()
         {
             Id = entity.Id,
@@ -38,12 +31,10 @@ public static class EntityModeMappers
             Active = entity.Active,
             Description = entity.Description,
             Name = entity.Name,
-            UpdatedAt = entity.UpdatedAt,
-            ImageUrl = entity.ImageUrl,
-            Summary = entity.Summary
+            UpdatedAt = entity.UpdatedAt
         };
 
-    public static ShoppingCartItem ToModel(this Features.Shop.ShoppingCarts.Entities.ShoppingCartItem entity) =>
+    public static ShoppingCartItem ToModel(this Entities.ShoppingCartItem entity) =>
         new()
         {
             Id = entity.Id,
@@ -51,20 +42,21 @@ public static class EntityModeMappers
             UpdatedAt = entity.UpdatedAt,
             ProductPriceId = entity.ProductPriceId,
             Quantity = entity.Quantity,
-            ShoppingCartId = entity.ShoppingCartId
+            ShoppingCartId = entity.ShoppingCartId            
         };
 
-    public static ShoppingCart ToModel(this Features.Shop.ShoppingCarts.Entities.ShoppingCart entity) =>
+    public static ShoppingCart ToModel(this 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 Features.Shop.Quotes.Entities.Quote entity) =>
+    public static Quote ToModel(this Entities.Quote entity) =>
         new()
         {
             Id = entity.Id,
@@ -74,12 +66,10 @@ public static class EntityModeMappers
             ExpiredAt = entity.ExpiredAt,
             Reason = entity.Reason,
             ShoppingCartId = entity.ShoppingCartId,
-            Status = entity.Status,
-            InvoiceUrl = entity.InvoiceUrl,
-            OrderId = entity.OrderId
+            Status = entity.Status
         };
 
-    public static Notification ToModel(this Features.Shop.Notifications.Entities.Notification entity) =>
+    public static Notification ToModel(this Entities.Notification entity) =>
         new()
         {
             Id = entity.Id,
@@ -89,9 +79,9 @@ public static class EntityModeMappers
             CorrelationId = entity.CorrelationId,
             CorrelationIdType = entity.CorrelationIdType,
             IsInternal = entity.IsInternal,
-            SenderAddress = entity.SenderAddress,
+            Sender = entity.Sender,
             Platform = entity.Platform,
-            RecipientName = entity.RecipientName,
+            Recipient = entity.Recipient,
             Subject = entity.Subject,
             Processed = entity.Processed,
             SenderName = entity.SenderName,
@@ -103,7 +93,7 @@ public static class EntityModeMappers
             Errors = entity.Errors
         };
 
-    public static Customer ToModel(this Features.Shop.Customers.Entities.Customer entity) =>
+    public static Customer ToModel(this Entities.Customer entity) =>
         new()
         {
             Id = entity.Id,
@@ -128,7 +118,7 @@ public static class EntityModeMappers
             Whatsapp = entity.Whatsapp
         };
 
-    public static Lead ToModel(this Features.Shop.Leads.Entities.Lead entity) =>
+    public static Lead ToModel(this Entities.Lead entity) =>
         new()
         {
             Id = entity.Id,
@@ -146,10 +136,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 Features.Shop.Orders.Entities.Order entity) =>
+    public static Order ToModel(this Entities.Order entity) =>
         new()
         {
             Id = entity.Id,
@@ -157,35 +147,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,
+            DepositRequired = entity.DepositRequired,
             Requirements = entity.Requirements,
-            Terms = entity.Terms,
-            InvoiceUrl = entity.InvoiceUrl            
+            Terms = entity.Terms
         };
 
-    public static OrderRefund ToModel(this Features.Shop.Orders.Entities.OrderRefund entity) =>
+    public static OrderRefund ToModel(this 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 Features.Shop.Products.Entities.Product entity) =>
+    public static Product ToModel(this Entities.Product entity) =>
         new()
         {
             Id = entity.Id,
             Name = entity.Name,
             Description = entity.Description,
-            Active = entity.Active,
-            Summary = entity.Summary,
-            ImageUrl = entity.ImageUrl,
-            Thumbnails = entity.Thumbnails
+            Active = entity.Active            
         };
 
-    public static ProductPrice ToModel(this Features.Shop.Products.Entities.ProductPrice entity) =>
+    public static ProductPrice ToModel(this Entities.ProductPrice entity) =>
         new()
         {
             Id = entity.Id,
@@ -194,6 +184,6 @@ public static class EntityModeMappers
             Active = entity.Active,
             CreatedAt = entity.CreatedAt,
             Discount = entity.Discount,
-            UpdatedAt = entity.UpdatedAt
+            UpdatedAt = entity.UpdatedAt            
         };
 }

LiteCharms.Extensions/HealthChecks.cs

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

LiteCharms.Extensions/LiteCharms.Extensions.csproj

@@ -0,0 +1,113 @@
+<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.Extensions/Monitoring.cs

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

LiteCharms.Extensions/Postgres.cs

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

LiteCharms.Extensions/Quartz.cs

@@ -1,7 +1,7 @@
-using LiteCharms.Features.Quartz;
-using LiteCharms.Features.Quartz.Abstractions;
+using LiteCharms.Abstractions;
+using LiteCharms.Infrastructure.Quartz;
 
-namespace LiteCharms.Features.Extensions;
+namespace LiteCharms.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(90);
+                    cluster.CheckinMisfireThreshold = TimeSpan.FromSeconds(2);
                 });
             });
         });
@@ -48,8 +48,6 @@ public static class Quartz
 
         services.ConfigureCommon();
 
-        services.AddQuartzHostedService(options => options.WaitForJobsToComplete = true);
-
         services.AddQuartz(config =>
         {
             config.SchedulerName = schedulerName;
@@ -62,8 +60,6 @@ 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;
@@ -76,7 +72,7 @@ public static class Quartz
                 storage.UseClustering(cluster =>
                 {
                     cluster.CheckinInterval = TimeSpan.FromSeconds(30);
-                    cluster.CheckinMisfireThreshold = TimeSpan.FromSeconds(90);
+                    cluster.CheckinMisfireThreshold = TimeSpan.FromSeconds(2);
                 });
             });
         });
@@ -90,14 +86,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.Extensions/ServiceBus.cs

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

LiteCharms.Features.Tests/CommonFixture.cs

@@ -1,35 +0,0 @@
-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

@@ -1,50 +0,0 @@
-<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

@@ -1,64 +0,0 @@
-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

@@ -1,22 +0,0 @@
-{
-  "Email": {
-    "Credentials": {
-      "Username": "shop@litecharms.co.za"
-    },
-    "Port": 465,
-    "Host": "mail.litecharms.co.za",
-    "UseSsl": true
-  },
-  "Monitoring": {
-    "ApiKey": "",
-    "Address": "http://aspire-dashboard-service.aspire.svc.cluster.local:18889",
-    "ServiceName": "LiteCharms.LeadGenerator"
-  },
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}

LiteCharms.Features/CartPackages/Commands/AddPackageItemsCommand.cs

@@ -0,0 +1,25 @@
+namespace LiteCharms.Features.CartPackages.Commands;
+
+public class AddPackageItemCommand : IRequest<Result<Guid>>
+{
+    public Guid PackageId { get; set; }
+
+    public Guid ProductPriceId { get; set; }
+
+    private AddPackageItemCommand(Guid packageId, Guid productPriceId)
+    {
+        PackageId = packageId;
+        ProductPriceId = productPriceId;
+    }
+
+    public static AddPackageItemCommand Create(Guid packageId, Guid productPriceId)
+    {
+        if (packageId == Guid.Empty)
+            throw new ArgumentException("Package id is required", nameof(packageId));
+
+        if (productPriceId == Guid.Empty)
+            throw new ArgumentException("Product price id is required", nameof(productPriceId));
+
+        return new(packageId, productPriceId);
+    }
+}

LiteCharms.Features/CartPackages/Commands/CreatePackageCommand.cs

@@ -0,0 +1,23 @@
+namespace LiteCharms.Features.CartPackages.Commands;
+
+public class CreatePackageCommand : IRequest<Result<Guid>>
+{
+    public string? Name { get; set; }
+
+    public string? Description { get; set; }
+
+    private CreatePackageCommand(string? name, string? description)
+    {
+        Name = name;
+        Description = description;
+    }
+
+    public static CreatePackageCommand Create(string? name, string? description)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(name, nameof(name));
+
+        ArgumentException.ThrowIfNullOrWhiteSpace(description, nameof(description));
+
+        return new(name, description);
+    }
+}

LiteCharms.Features/CartPackages/Commands/DeletePackageCommand.cs

@@ -0,0 +1,25 @@
+namespace LiteCharms.Features.CartPackages.Commands;
+
+public class DeletePackageItemCommand : IRequest<Result>
+{
+    public Guid PackageId { get; set; }
+
+    public Guid PackageItemId { get; set; }
+
+    private DeletePackageItemCommand(Guid packageId, Guid packageItemId)
+    {
+        PackageId = packageId;
+        PackageItemId = packageItemId;
+    }
+
+    public static DeletePackageItemCommand Create(Guid packageId, Guid packageItemId)
+    {
+        if (packageId == Guid.Empty)
+            throw new ArgumentException("Package id is required", nameof(packageId));
+
+        if (packageItemId == Guid.Empty)
+            throw new ArgumentException("Product price id is required", nameof(packageItemId));
+
+        return new(packageId, packageItemId);
+    }
+}

LiteCharms.Features/CartPackages/Commands/DeletePackageItemsCommand.cs

@@ -0,0 +1,16 @@
+namespace LiteCharms.Features.CartPackages.Commands;
+
+public class DeletePackageItemsCommand : IRequest<Result>
+{
+    public Guid PackageId { get; set; }
+
+    private DeletePackageItemsCommand(Guid packageId) => PackageId = packageId;
+
+    public static DeletePackageItemsCommand Create(Guid packageId)
+    {
+        if (packageId == Guid.Empty)
+            throw new ArgumentException("Package ID is required", nameof(packageId));
+
+        return new(packageId);
+    }
+}

LiteCharms.Features/CartPackages/Commands/Handlers/AddPackageItemCommandHandler.cs

@@ -0,0 +1,38 @@
+using LiteCharms.Infrastructure.Database;
+
+namespace LiteCharms.Features.CartPackages.Commands.Handlers;
+
+public class AddPackageItemCommandHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<AddPackageItemCommand, Result<Guid>>
+{
+    public async ValueTask<Result<Guid>> Handle(AddPackageItemCommand request, CancellationToken cancellationToken)
+    {
+        try
+        {
+            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+
+            if (!await context.Packages.AnyAsync(p => p.Id == request.PackageId, cancellationToken))
+                return Result.Fail($"Could not find package by ID {request.PackageId}");
+
+            if (!await context.ProductPrices.AnyAsync(p => p.Id == request.ProductPriceId && p.Active == true, cancellationToken))
+                return Result.Fail($"Could not find an active product price by ID {request.ProductPriceId}");
+
+            if (await context.PackageItems.AnyAsync(p => p.ProductPriceId == request.ProductPriceId && p.PackageId == request.PackageId, cancellationToken))
+                return Result.Fail<Guid>($"Product price {request.ProductPriceId} is already added to this package {request.PackageId}");
+
+            var newPackageItem = context.PackageItems.Add(new Entities.PackageItem
+            {
+                PackageId = request.PackageId,
+                ProductPriceId = request.ProductPriceId,
+                Active = true
+            });
+
+            return await context.SaveChangesAsync(cancellationToken) > 0
+                ? Result.Ok(newPackageItem.Entity.Id)
+                : Result.Fail<Guid>($"Failed to add new package item by ID {request.ProductPriceId}");
+        }
+        catch (Exception ex)
+        {
+            return Result.Fail<Guid>(new Error(ex.Message).CausedBy(ex));
+        }
+    }
+}

LiteCharms.Features/CartPackages/Commands/Handlers/CreatePackageCommandHandler.cs

@@ -0,0 +1,32 @@
+using LiteCharms.Infrastructure.Database;
+
+namespace LiteCharms.Features.CartPackages.Commands.Handlers;
+
+public class CreatePackageCommandHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<CreatePackageCommand, Result<Guid>>
+{
+    public async ValueTask<Result<Guid>> Handle(CreatePackageCommand request, CancellationToken cancellationToken)
+    {
+        try
+        {
+            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+
+            if (await context.Packages.AnyAsync(p => p.Name == request.Name, cancellationToken))
+                return Result.Fail($"A package by the same name already exists: {request.Name}");
+
+            var newPackage = context.Packages.Add(new Entities.Package
+            {
+                Name = request.Name,
+                Description = request.Description,
+                Active = true
+            });
+
+            return await context.SaveChangesAsync(cancellationToken) > 0
+                ? Result.Ok(newPackage.Entity.Id)
+                : Result.Fail($"Failed to create a new package by the name: {request.Name}");
+        }
+        catch (Exception ex)
+        {
+            return Result.Fail<Guid>(new Error(ex.Message).CausedBy(ex));
+        }
+    }
+}

LiteCharms.Features/CartPackages/Commands/Handlers/DeletePackageItemCommandHandler.cs

@@ -0,0 +1,32 @@
+using LiteCharms.Infrastructure.Database;
+
+namespace LiteCharms.Features.CartPackages.Commands.Handlers;
+
+public class DeletePackageItemCommandHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<DeletePackageItemCommand, Result>
+{
+    public async ValueTask<Result> Handle(DeletePackageItemCommand request, CancellationToken cancellationToken)
+    {
+        try
+        {
+            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+
+            if (!await context.Packages.AnyAsync(p => p.Id == request.PackageId, cancellationToken))
+                return Result.Fail($"Could not find package by ID {request.PackageId}");
+
+            var item = await context.PackageItems.FirstOrDefaultAsync(p => p.Id == request.PackageItemId && p.PackageId == request.PackageId, cancellationToken);
+
+            if(item is null)
+                return Result.Fail($"Product item {request.PackageItemId} is already added to this package {request.PackageId}");
+
+            context.PackageItems.Remove(item);
+
+            return await context.SaveChangesAsync(cancellationToken) > 0
+                ? Result.Ok()
+                : Result.Fail($"Failed to delete package item by id {request.PackageItemId}");
+        }
+        catch (Exception ex)
+        {
+            return Result.Fail(new Error(ex.Message).CausedBy(ex));
+        }
+    }
+}

LiteCharms.Features/CartPackages/Commands/Handlers/DeletePackageItemsCommandHandler.cs

@@ -0,0 +1,29 @@
+using LiteCharms.Infrastructure.Database;
+
+namespace LiteCharms.Features.CartPackages.Commands.Handlers;
+
+public class DeletePackageItemsCommandHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<DeletePackageItemsCommand, Result>
+{
+    public async ValueTask<Result> Handle(DeletePackageItemsCommand request, CancellationToken cancellationToken)
+    {
+        try
+        {
+            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+
+            if (!await context.Packages.AnyAsync(p => p.Id == request.PackageId, cancellationToken))
+                return Result.Fail($"Could not find package by ID {request.PackageId}");
+
+            var items = await context.PackageItems.Where(i => i.PackageId == request.PackageId).ToArrayAsync(cancellationToken);
+
+            context.PackageItems.RemoveRange(items);
+
+            return await context.SaveChangesAsync(cancellationToken) > 0
+                ? Result.Ok()
+                : Result.Fail($"Failed to delete package {request.PackageId} items");
+        }
+        catch (Exception ex)
+        {
+            return Result.Fail(new Error(ex.Message).CausedBy(ex));
+        }
+    }
+}

LiteCharms.Features/CartPackages/Commands/Handlers/UpdatePackageCommandHandler.cs

@@ -0,0 +1,33 @@
+using LiteCharms.Infrastructure.Database;
+
+namespace LiteCharms.Features.CartPackages.Commands.Handlers;
+
+public class UpdatePackageCommandHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<UpdatePackageCommand, Result>
+{
+    public async ValueTask<Result> Handle(UpdatePackageCommand request, CancellationToken cancellationToken)
+    {
+        try
+        {
+            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+
+            if (await context.Packages.AnyAsync(p => p.Name == request.Name, cancellationToken))
+                return Result.Fail($"A package by the same name already exists: {request.Name}");
+
+            var package = await context.Packages.FirstOrDefaultAsync(p => p.Id == request.PackageId, cancellationToken);
+
+            if (package is null)
+                return Result.Fail($"Could not find package by id {request.PackageId}");
+
+            package.Name = request.Name;
+            package.Description = request.Description;
+
+            return await context.SaveChangesAsync(cancellationToken) > 0
+                ? Result.Ok()
+                : Result.Fail($"Failed to update package with id {request.PackageId}");
+        }
+        catch (Exception ex)
+        {
+            return Result.Fail(new Error(ex.Message).CausedBy(ex));
+        }
+    }
+}

LiteCharms.Features/CartPackages/Commands/Handlers/UpdatePackageStatusCommandHandler.cs

@@ -0,0 +1,29 @@
+using LiteCharms.Infrastructure.Database;
+
+namespace LiteCharms.Features.CartPackages.Commands.Handlers;
+
+public class UpdatePackageStatusCommandHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<UpdatePackageStatusCommand, Result>
+{
+    public async ValueTask<Result> Handle(UpdatePackageStatusCommand request, CancellationToken cancellationToken)
+    {
+        try
+        {
+            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+
+            var package = await context.Packages.FirstOrDefaultAsync(p => p.Id == request.PackageId, cancellationToken);
+
+            if (package is null)
+                return Result.Fail($"Could not find package by id {request.PackageId}");
+
+            package.Active = request.Active;
+
+            return await context.SaveChangesAsync(cancellationToken) > 0
+                ? Result.Ok()
+                : Result.Fail($"Failed to update package with id {request.PackageId}");
+        }
+        catch (Exception ex)
+        {
+            return Result.Fail(new Error(ex.Message).CausedBy(ex));
+        }
+    }
+}

LiteCharms.Features/CartPackages/Commands/UpdatePackageCommand.cs

@@ -0,0 +1,28 @@
+namespace LiteCharms.Features.CartPackages.Commands;
+
+public class UpdatePackageCommand : IRequest<Result>
+{
+    public Guid PackageId { get; set; }
+
+    public string? Name { get; set; }
+
+    public string? Description { get; set; }
+
+    private UpdatePackageCommand(Guid packageId, string? name, string? description)
+    {
+        PackageId = packageId;
+        Name = name;
+        Description = description;
+    }
+
+    public static UpdatePackageCommand Create(Guid packageId, string? name, string? description)
+    {
+        if (packageId == Guid.Empty)
+            throw new ArgumentException($"Package ID is required", nameof(packageId));
+
+        ArgumentNullException.ThrowIfNullOrWhiteSpace(name, nameof(name));
+        ArgumentNullException.ThrowIfNullOrWhiteSpace(description, nameof(description));
+
+        return new(packageId, name, description);
+    }
+}

LiteCharms.Features/CartPackages/Commands/UpdatePackageStatusCommand.cs

@@ -0,0 +1,22 @@
+namespace LiteCharms.Features.CartPackages.Commands;
+
+public class UpdatePackageStatusCommand : IRequest<Result>
+{
+    public Guid PackageId { get; set; }
+
+    public bool Active { get; set; }
+
+    private UpdatePackageStatusCommand(Guid packageId, bool active)
+    {
+        PackageId = packageId;
+        Active = active;
+    }
+
+    public static UpdatePackageStatusCommand Create(Guid packageId, bool active)
+    {
+        if(packageId == Guid.Empty)
+            throw new ArgumentException($"Package id is required", nameof(packageId));
+        
+        return new(packageId, active);
+    }
+}

LiteCharms.Features/CartPackages/Queries/GetPackageItemsQuery.cs

@@ -0,0 +1,18 @@
+using LiteCharms.Models;
+
+namespace LiteCharms.Features.CartPackages.Queries;
+
+public class GetPackageItemsQuery : IRequest<Result<PackageItem[]>>
+{
+    public Guid PackageId { get; set; }
+
+    private GetPackageItemsQuery(Guid packageId) => PackageId = packageId;
+
+    public static GetPackageItemsQuery Create(Guid packageId)
+    {
+        if (packageId == Guid.Empty)
+            throw new ArgumentException("Package ID is required", nameof(packageId));
+
+        return new(packageId);
+    }
+}

LiteCharms.Features/CartPackages/Queries/GetPackageQuery.cs

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

LiteCharms.Features/CartPackages/Queries/GetPackagesQuery.cs

@@ -0,0 +1,33 @@
+using LiteCharms.Models;
+
+namespace LiteCharms.Features.CartPackages.Queries;
+
+public class GetPackagesQuery : IRequest<Result<Package[]>>
+{
+    public DateOnly From { get; set; }
+
+    public DateOnly To { get; set; }
+
+    public int MaxRecords { get; set; }
+
+    public bool Active { get; set; }
+
+    private GetPackagesQuery(DateOnly from, DateOnly to, int maxRecords = 1000, bool active = true)
+    {
+        From = from;
+        To = to;
+        MaxRecords = maxRecords;
+        Active = active;
+    }
+
+    public static GetPackagesQuery Create(DateOnly from, DateOnly to, int maxRecords = 1000, bool active = true)
+    {
+        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, active);
+    }
+}

LiteCharms.Features/CartPackages/Queries/Handlers/GetPackageItemsQueryHandler.cs

@@ -0,0 +1,32 @@
+using LiteCharms.Extensions;
+using LiteCharms.Infrastructure.Database;
+using LiteCharms.Models;
+
+namespace LiteCharms.Features.CartPackages.Queries.Handlers;
+
+public class GetPackageItemsQueryHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<GetPackageItemsQuery, Result<PackageItem[]>>
+{
+    public async ValueTask<Result<PackageItem[]>> Handle(GetPackageItemsQuery request, CancellationToken cancellationToken)
+    {
+        try
+        {
+            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+
+            if (!await context.Packages.AnyAsync(p => p.Id == request.PackageId, cancellationToken))
+                return Result.Fail<PackageItem[]>($"Package could not be found with ID {request.PackageId}");
+
+            var items = await context.PackageItems.AsNoTracking()
+                .OrderByDescending(o => o.CreatedAt)
+                .Where(p => p.PackageId == request.PackageId)
+                .ToArrayAsync(cancellationToken);
+
+            return items?.Length > 0
+                ? Result.Ok(items.Select(i => i.ToModel()).ToArray())
+                : Result.Fail<PackageItem[]>($"Could not find package items by package ID {request.PackageId}");
+        }
+        catch (Exception ex)
+        {
+            return Result.Fail<PackageItem[]>(new Error(ex.Message).CausedBy(ex));
+        }
+    }
+}

LiteCharms.Features/CartPackages/Queries/Handlers/GetPackageQueryHandler.cs

@@ -0,0 +1,27 @@
+using LiteCharms.Extensions;
+using LiteCharms.Infrastructure.Database;
+using LiteCharms.Models;
+
+namespace LiteCharms.Features.CartPackages.Queries.Handlers;
+
+public class GetPackageQueryHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<GetPackageQuery, Result<Package>>
+{
+    public async ValueTask<Result<Package>> Handle(GetPackageQuery request, CancellationToken cancellationToken)
+    {
+        try
+        {
+            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+
+            var package = await context.Packages.FirstOrDefaultAsync(p => p.Id == request.PackageId, cancellationToken);
+
+            return package is not null
+                ? Result.Ok(package.ToModel())
+                : Result.Fail($"Failed to find package by ID {request.PackageId}");
+
+        }
+        catch (Exception ex)
+        {
+            return Result.Fail<Package>(new Error(ex.Message).CausedBy(ex));
+        }
+    }
+}

LiteCharms.Features/CartPackages/Queries/Handlers/GetPackagesQueryHandler.cs

@@ -0,0 +1,35 @@
+using LiteCharms.Extensions;
+using LiteCharms.Infrastructure.Database;
+using LiteCharms.Models;
+
+namespace LiteCharms.Features.CartPackages.Queries.Handlers;
+
+public class GetPackagesQueryHandler(IDbContextFactory<ShopDbContext> contextFactory) : IRequestHandler<GetPackagesQuery, Result<Package[]>>
+{
+    public async ValueTask<Result<Package[]>> Handle(GetPackagesQuery 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 packages = await context.Packages
+                .AsNoTracking()
+                .OrderByDescending(o => o.CreatedAt)
+                .Where(p => p.CreatedAt >= fromDate && p.CreatedAt <= toDate)
+                .Where(p => p.Active == request.Active)
+                .Take(request.MaxRecords)
+                .ToArrayAsync(cancellationToken);
+
+            return packages?.Length > 0
+                ? Result.Ok(packages.Select(o => o.ToModel()).ToArray())
+                : Result.Fail<Package[]>(new Error($"No packages found for the specified date range {request.From} - {request.To}."));
+        }
+        catch (Exception ex)
+        {
+            return Result.Fail<Package[]>(new Error(ex.Message).CausedBy(ex));
+        }
+    }
+}

LiteCharms.Features/Customers/Commands/CreateCustomerCommand.cs

@@ -0,0 +1,64 @@
+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

@@ -0,0 +1,48 @@
+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

@@ -0,0 +1,44 @@
+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

@@ -0,0 +1,70 @@
+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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,30 @@
+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

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,33 @@
+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/Commands/Handlers/SendEmailCommandHandler.cs

@@ -0,0 +1,61 @@
+using LiteCharms.Features.Email.Commands;
+using LiteCharms.Models.Configuraton.Email;
+
+namespace LiteCharms.Features.Email.Commands.Handlers;
+
+public class SendEmailCommandHandler(IOptions<SmtpSettings> smtpOptions) : IRequestHandler<SendEmailCommand, Result>
+{
+    public async ValueTask<Result> Handle(SendEmailCommand request, CancellationToken cancellationToken)
+    {
+        try
+        {
+            var settings = smtpOptions.Value;
+
+            if(settings == null)
+                return Result.Fail(new Error("SMTP settings are not configured."));
+
+            if(settings.Credentials == null)
+                return Result.Fail(new Error("SMTP credentials are not configured."));
+
+            if(string.IsNullOrWhiteSpace(settings?.Credentials.Username) || string.IsNullOrWhiteSpace(settings.Credentials.Password))
+                return Result.Fail(new Error("SMTP credentials are incomplete."));
+
+            if(string.IsNullOrWhiteSpace(settings.Host) || settings.Port == 0)
+                return Result.Fail(new Error("SMTP host and port must be configured."));
+
+            var message = new MimeMessage();
+            message.From.Add(new MailboxAddress(request.SenderName, request.From!));
+            message.To.Add(new MailboxAddress(request.RecipientName, request.To!));
+            message.Subject = request.Subject!;
+
+            var bodyBuilder = new BodyBuilder();
+
+            if(request.Attachment?.Length > 0 && !string.IsNullOrEmpty(request.AttachmentFileName))
+                bodyBuilder.Attachments.Add(request.AttachmentFileName!, request.Attachment!, cancellationToken);
+
+            if (!request.IsHtml) bodyBuilder.TextBody = request.Message;
+            if (request.IsHtml) bodyBuilder.HtmlBody = request.Message;
+
+            message.Body = bodyBuilder.ToMessageBody();
+
+            using var client = new SmtpClient();
+
+            await client.ConnectAsync(settings.Host!, settings.Port, settings.UseSsl, cancellationToken);
+            await client.AuthenticateAsync(settings.Credentials!.Username!, settings.Credentials.Password!, cancellationToken);
+
+            var response = await client.SendAsync(message, cancellationToken);
+
+            bool emailSent = response.Contains("OK", StringComparison.InvariantCultureIgnoreCase);
+
+            await client.DisconnectAsync(true, cancellationToken);
+
+            return emailSent
+                ? Result.Ok()
+                : Result.Fail(new Error("Failed to send email. SMTP response: " + response));
+        }
+        catch (Exception ex)
+        {
+            return Result.Fail(new Error(ex.Message).CausedBy(ex));
+        }
+    }
+}

LiteCharms.Features/Email/Commands/SendEmailCommand.cs

@@ -0,0 +1,79 @@
+namespace LiteCharms.Features.Email.Commands;
+
+public class SendEmailCommand : IRequest<Result>
+{
+    public string? From { get; set; }
+
+    public string? SenderName { get; set; }
+
+    public string? To { get; set; }
+
+    public string? RecipientName { get; set; }
+
+    public string? Subject { get; set; }
+
+    public string? Message { get; set; }
+
+    public bool IsHtml { get; set; }
+
+    public Stream? Attachment { get; set; }
+
+    public string? AttachmentFileName { get; set; }
+
+    private SendEmailCommand(string from, string senderName, string to, string recipientName, string subject, string message, bool isHtml = false, Stream? attachment = null, string? attachmentFileName = null)
+    {
+        From = from;
+        To = to;
+        Subject = subject;
+        Message = message;
+        IsHtml = isHtml;
+        Attachment = attachment;
+        AttachmentFileName = attachmentFileName;
+        SenderName = senderName;
+        RecipientName = recipientName;
+    }
+
+    public static SendEmailCommand Create(string from, string senderName, string to, string recipientName, string subject, string message, bool isHtml = false, Stream? attachment = null, string? attachmentFileName = null)
+    {
+        if (string.IsNullOrWhiteSpace(from))
+            throw new ArgumentException("From address is required.");
+
+        if (string.IsNullOrWhiteSpace(senderName))
+            throw new ArgumentException("Sender name is required.");
+
+        if (!string.IsNullOrWhiteSpace(senderName) && senderName?.Length > 255)
+            throw new ArgumentException("Sender name cannot exceed 255 characters.");
+
+        if (string.IsNullOrWhiteSpace(to))
+            throw new ArgumentException("To address is required.");
+
+        if (string.IsNullOrWhiteSpace(recipientName))
+            throw new ArgumentException("Recipient name is required.");
+
+        if (!string.IsNullOrWhiteSpace(recipientName) && recipientName?.Length > 255)
+            throw new ArgumentException("Recipient name cannot exceed 255 characters.");
+
+        if (string.IsNullOrWhiteSpace(subject))
+            throw new ArgumentException("Subject is required.");
+
+        if (!string.IsNullOrWhiteSpace(subject) && subject?.Length > 2048)
+            throw new ArgumentException("Subject cannot exceed 2048 characters.");
+
+        if (string.IsNullOrWhiteSpace(message))
+            throw new ArgumentException("Message is required.");
+
+        if (message.Length > 10485760)
+            throw new ArgumentException("Message cannot exceed 10 MB.");
+
+        if (attachment != null && string.IsNullOrWhiteSpace(attachmentFileName))
+            throw new ArgumentException("Attachment file name must be provided when an attachment is included.");
+
+        if (attachment is not null && attachment.Length > 10485760)
+            throw new ArgumentException("Attachment cannot exceed 10 MB.");
+
+        if (!string.IsNullOrWhiteSpace(attachmentFileName) && attachmentFileName.Length > 255)
+            throw new ArgumentException("Attachment file name cannot exceed 255 characters.");
+
+        return new(from, senderName!, to, recipientName!, subject!, message, isHtml, attachment, attachmentFileName);
+    }
+}

LiteCharms.Features/Email/EmailService.cs

@@ -1,193 +0,0 @@
-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

@@ -1,27 +1,18 @@
-using LiteCharms.Features.Shop;
-using LiteCharms.Features.Shop.Notifications;
-using static LiteCharms.Features.Email.Extensions.Constants;
+using LiteCharms.Features.Notifications.Commands;
+using static LiteCharms.Abstractions.Constants;
 
 namespace LiteCharms.Features.Email.Events.Handlers;
 
-public class SendShopEmailEnquiryEventHandler(NotificationService notificationService) : 
+public class SendShopEmailEnquiryEventHandler(ISender mediator) : 
     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);
+    public async ValueTask Handle(SendShopEmailEnquiryEvent notification, CancellationToken cancellationToken)
+    {
+        var command = CreateNotificationCommand.Create(Models.NotificationDirection.Outgoing, notification.SenderName!,
+            notification.SenderAddress!, notification.Subject!, notification.Message!, Models.NotificationPlatforms.Email,
+            notification.Priority, ShopEmailFromName, ShopEmailFromAddress, Guid.CreateVersion7().ToString(),
+            Models.CorrelationIdTypes.None, isInternal: true, isHtml: false);
+
+        await mediator.Send(command, cancellationToken);
+    }
 }

LiteCharms.Features/Email/Events/SendShopEmailEnquiryEvent.cs

@@ -1,5 +1,5 @@
-using LiteCharms.Features.Abstractions;
-using LiteCharms.Features.Shop;
+using LiteCharms.Abstractions;
+using LiteCharms.Models;
 
 namespace LiteCharms.Features.Email.Events;
 

LiteCharms.Features/Email/Extensions/Constants.cs

@@ -1,8 +0,0 @@
-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

@@ -1,9 +0,0 @@
-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

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

LiteCharms.Features/Email/Models/Body.cs

@@ -1,26 +0,0 @@
-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

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

LiteCharms.Features/Email/Models/Message.cs

@@ -1,19 +0,0 @@
-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

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

LiteCharms.Features/Email/Models/Response.cs

@@ -1,22 +0,0 @@
-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

@@ -1,20 +0,0 @@
-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/Hash.cs

@@ -1,7 +0,0 @@
-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/Shop.cs

@@ -1,27 +0,0 @@
-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/Leads/Commands/CreateLeadCommand.cs

@@ -0,0 +1,55 @@
+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

@@ -0,0 +1,47 @@
+using LiteCharms.Features.Utilities.Hash.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

@@ -0,0 +1,29 @@
+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

@@ -0,0 +1,27 @@
+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

@@ -0,0 +1,30 @@
+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

@@ -0,0 +1,30 @@
+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

@@ -0,0 +1,33 @@
+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

@@ -0,0 +1,33 @@
+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,7 +21,6 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageTags>utility;dotnet</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
-    <UserSecretsId>8a78916e-c86b-4f4b-9f4e-d8e7769b5d23</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
@@ -29,86 +28,6 @@
     <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" />
@@ -131,26 +50,16 @@
 
   <!-- Shared Usings -->
   <ItemGroup>
-    <Using Include="Microsoft.AspNetCore.Builder" />
-    <Using Include="Microsoft.Extensions.Hosting" />
     <Using Include="System.Text" />
-    <Using Include="System.Text.Json" />
-    <Using Include="System.Threading.Channels" />
-    <Using Include="System.Collections.ObjectModel" />
-    <Using Include="System.Diagnostics" />
-    <Using Include="System.Diagnostics.Metrics" />    
-    <Using Include="Microsoft.Extensions.DependencyInjection" />
-    <Using Include="System.Security.Cryptography" />    
+    <Using Include="System.Security.Cryptography" />
+    <Using Include="Microsoft.EntityFrameworkCore" />
     <Using Include="Microsoft.Extensions.Options" />
     <Using Include="Microsoft.Extensions.Logging" />
   </ItemGroup>
-  <ItemGroup>
-    <None Update="appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Shop\Postgres\Migrations\" />
+
+  <ItemGroup>    
+    <ProjectReference Include="..\LiteCharms.Extensions\LiteCharms.Extensions.csproj" />
+    <ProjectReference Include="..\LiteCharms.Infrastructure\LiteCharms.Infrastructure.csproj" />
   </ItemGroup>
 
 </Project>