Merge pull request 'midrandshop' (#38) from midrandshop into master

Reviewed-on: #38

.drone.yml

@@ -28,6 +28,7 @@ steps:
       GITEA_PASS: { from_secret: git_password }
       VERSION: 1.${DRONE_BUILD_NUMBER}.0
     commands:
+      - echo "169.255.58.144 gitea.khongisa.co.za" >> /etc/hosts
       - apk add --no-cache curl
       - git remote set-url origin https://$${GITEA_USER}:$${GITEA_PASS}@gitea.khongisa.co.za/litecharms/components.git
       - git tag $VERSION
@@ -40,7 +41,7 @@ steps:
                \"tag_name\": \"$VERSION\",
                \"target_commitish\": \"${DRONE_COMMIT_SHA}\",
                \"name\": \"Library Suite $VERSION\",
-               \"body\": \"### Published NuGet Packages\nAll packages versioned as **$VERSION**:\n* LiteCharms.Abstractions\n* LiteCharms.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.Features\n\n[View in Nexus](https://nexus.khongisa.co.za/repository/nuget-group/)\",
                \"draft\": false,
                \"prerelease\": false
              }"

LiteCharms.Features.Tests/CommonFixture.cs

@@ -14,18 +14,20 @@ public class CommonFixture : IDisposable
     {
         Configuration = new ConfigurationBuilder()
             .SetBasePath(Directory.GetCurrentDirectory())
-            .AddJsonFile("appsettings.json")
             .AddUserSecrets<CommonFixture>()
+            .AddJsonFile(Path.Combine(Directory.GetCurrentDirectory(), "appsettings.json"), optional: true, reloadOnChange: true)
             .AddEnvironmentVariables()
             .Build();
 
-        Services = new ServiceCollection()
+        Services = new ServiceCollection()            
             .AddMediator()
             .AddLogging()
             .AddShopServices()
             .AddEmailServiceBus()
+            .AddGarageS3(Configuration)
             .AddShopDatabase(Configuration)
             .AddEmailServices(Configuration)
+            .AddSingleton(Configuration)
             .BuildServiceProvider();
 
         Mediator = Services.GetRequiredService<IMediator>();

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

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="10.0.0">
+    <PackageReference Include="coverlet.collector" Version="10.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -27,10 +27,10 @@
 
   <!-- Global Usings -->
   <ItemGroup>
-    <Using Include="Mediator"/>
-    <Using Include="Xunit.Abstractions"/>
-    <Using Include="Microsoft.Extensions.DependencyInjection"/>
-    <Using Include="Microsoft.Extensions.Configuration"/>
+    <Using Include="Mediator" />
+    <Using Include="Xunit.Abstractions" />
+    <Using Include="Microsoft.Extensions.DependencyInjection" />
+    <Using Include="Microsoft.Extensions.Configuration" />
   </ItemGroup>
 
   <ItemGroup>
@@ -43,7 +43,7 @@
 
   <ItemGroup>
     <None Update="appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 

LiteCharms.Features.Tests/NotificationsFeatureTests.cs

@@ -1,4 +1,7 @@
-using LiteCharms.Features.Shop.Notifications;
+using LiteCharms.Features.Models;
+using LiteCharms.Features.Shop.Notifications;
+using LiteCharms.Features.Shop.Notifications.Events;
+using static LiteCharms.Features.Extensions.Email;
 
 namespace LiteCharms.Features.Tests;
 
@@ -18,8 +21,8 @@ public class NotificationsFeatureTests(CommonFixture fixture, ITestOutputHelper
             Priority = Shop.Priorities.Medium,
             Sender = "xUnit Test",
             SenderAddress = "khwezi@mngoma.africa",
-            Recipient = $"{Email.Extensions.Constants.ShopEmailFromName} [Test]",
-            RecipientAddress = Email.Extensions.Constants.ShopEmailFromAddress,
+            Recipient = $"{ShopEmailFromName} [Test]",
+            RecipientAddress = ShopEmailFromAddress,
             Subject = "Test Message",
             Message = "This is an automation test",
             IsHtml = false,
@@ -32,4 +35,31 @@ public class NotificationsFeatureTests(CommonFixture fixture, ITestOutputHelper
 
         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/ProductsFeatureTests.cs

@@ -0,0 +1,19 @@
+using LiteCharms.Features.Shop.Products;
+
+namespace LiteCharms.Features.Tests;
+
+public class ProductsFeatureTests(CommonFixture fixture, ITestOutputHelper output) : IClassFixture<CommonFixture>
+{
+    [Fact]
+    public async Task GetProductsAsync_ReturnsProducts()
+    {
+        var productService = fixture.Services.GetRequiredService<ProductService>();
+
+        var result = await productService.GetProductsAsync();
+
+        Assert.True(result.IsSuccess);
+        Assert.NotNull(result.Value);
+
+        output.WriteLine($"Retrieved {result.Value.Length} products.");
+    }
+}

LiteCharms.Features.Tests/S3ServiceFeatureTests.cs

@@ -0,0 +1,54 @@
+using LiteCharms.Features.S3.Abstractions;
+
+namespace LiteCharms.Features.Tests;
+
+public class S3ServiceFeatureTests(CommonFixture fixture, ITestOutputHelper output) : IClassFixture<CommonFixture>
+{
+    [Fact]
+    public async Task BookshopS3Service_MustReturnUrl()
+    {
+        var service = fixture.Services.GetKeyedService<IS3Service>(S3.Constants.BookshopBucketName);
+
+        var fileName = "appsettings.json";
+
+        string path = Path.Combine(Directory.GetCurrentDirectory(), fileName);
+
+        Assert.True(File.Exists(path));
+
+        var stream = File.OpenRead(path);
+
+        var result = await service!.UploadFileAsync(fileName, stream, MimeKit.MimeTypes.GetMimeType(fileName));
+
+        Assert.True(result.IsSuccess);
+        Assert.NotNull(result.Value);
+        Assert.NotEmpty(result.Value);
+
+        output.WriteLine(result.Value);        
+    }
+
+    [Fact]
+    public async Task BookshopS3Service_MustDeleteFile()
+    {
+        var service = fixture.Services.GetKeyedService<IS3Service>(S3.Constants.BookshopBucketName);
+
+        var fileName = "appsettings.json";
+
+        string path = Path.Combine(Directory.GetCurrentDirectory(), fileName);
+
+        Assert.True(File.Exists(path));
+
+        var stream = File.OpenRead(path);
+
+        var uploadResult = await service!.UploadFileAsync(fileName, stream, MimeKit.MimeTypes.GetMimeType(fileName));
+
+        Assert.True(uploadResult.IsSuccess);
+        Assert.NotNull(uploadResult.Value);
+        Assert.NotEmpty(uploadResult.Value);
+
+        var fileKey = uploadResult.Value.Split('/').Last();
+
+        var deleteResult = await service!.DeleteFileAsync(fileKey);
+
+        Assert.True(deleteResult.IsSuccess);
+    }
+}

LiteCharms.Features.Tests/appsettings.json

@@ -1,4 +1,16 @@
 {
+  "BookshopS3Settings": {
+    "ServiceUrl": "http://192.168.1.177:30900",
+    "Region": "garage",
+    "BucketName": "bookshop",
+    "CdnBaseUrl": "https://bookshop.cdn.khongisa.co.za"
+  },
+  "BookshopQuotesS3Settings": {
+    "ServiceUrl": "http://192.168.1.177:30900",
+    "Region": "garage",
+    "BucketName": "bookshop.quotes",
+    "CdnBaseUrl": "https://bookshop.quotes.cdn.khongisa.co.za"
+  },
   "Email": {
     "Credentials": {
       "Username": "shop@litecharms.co.za"

LiteCharms.Features/Email/EmailService.cs

@@ -35,8 +35,9 @@ public class EmailService(IOptions<SmtpSettings> options) : IDisposable
 
             var bodyBuilder = new BodyBuilder();
 
-            foreach (var attachment in message.Body?.Attachments!)
-                bodyBuilder.Attachments.Add(attachment.Name!, attachment.FileStream!, cancellationToken);
+            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;

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

@@ -1,6 +1,6 @@
 using LiteCharms.Features.Shop;
 using LiteCharms.Features.Shop.Notifications;
-using static LiteCharms.Features.Email.Extensions.Constants;
+using static LiteCharms.Features.Extensions.Email;
 
 namespace LiteCharms.Features.Email.Events.Handlers;
 

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/Models/EmailEnquiryModel.cs

@@ -2,7 +2,7 @@
 
 namespace LiteCharms.Features.Email.Models;
 
-public sealed class EmailEnquiry
+public sealed class EmailEnquiryModel
 {
     [Required]
     [MinLength(2)]

LiteCharms.Features/Extensions/Email.cs

@@ -4,7 +4,10 @@ using LiteCharms.Features.Email.Configuration;
 namespace LiteCharms.Features.Extensions;
 
 public static class Email
-{
+{    
+    public const string ShopEmailFromName = "Khongisa Shop";
+    public const string ShopEmailFromAddress = "shop@litecharms.co.za";
+
     public static IServiceCollection AddEmailServices(this IServiceCollection services, IConfiguration configuration)
     {
         services.Configure<SmtpSettings>(configuration.GetSection("Email"));

LiteCharms.Features/Extensions/EntityModeMappers.cs

@@ -176,13 +176,15 @@ public static class EntityModeMappers
     public static Product ToModel(this Features.Shop.Products.Entities.Product entity) =>
         new()
         {
-            Id = entity.Id,
+            Id = entity.Id,    
+            CreatedAt = entity.CreatedAt,
             Name = entity.Name,
             Description = entity.Description,
             Active = entity.Active,
             Summary = entity.Summary,
             ImageUrl = entity.ImageUrl,
-            Thumbnails = entity.Thumbnails
+            Thumbnails = entity.Thumbnails,
+            Metadata = entity.Metadata,
         };
 
     public static ProductPrice ToModel(this Features.Shop.Products.Entities.ProductPrice entity) =>

LiteCharms.Features/Extensions/Hash.cs

@@ -2,6 +2,12 @@
 
 public static class Hash
 {
-    public static Func<string?, string?> GenerateSha256HashString = (input) => 
+    public static Func<string?, string?> StringToSha256Hash = (input) => 
         Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(input!)));
+
+    public static Func<Stream, string?> StreamToSha256Hash = (stream) =>
+        Convert.ToHexString(SHA256.HashData(stream));
+
+    public static Func<byte[], string?> BytesToSha256Hash = (bytes) =>
+        Convert.ToHexString(SHA256.HashData(bytes));
 }

LiteCharms.Features/Extensions/HealthChecks.cs

@@ -1,19 +1,34 @@
 using LiteCharms.Features.HealthChecks;
+using static LiteCharms.Features.Extensions.Postgres;
 
 namespace LiteCharms.Features.Extensions;
 
 public static class HealthChecks
 {
-    public static IServiceCollection AddQuartzHealtchCheck(this IServiceCollection services)
+    public static IServiceCollection AddShopQuartzHealthCheck(this IServiceCollection services)
     {
-        services.AddHealthChecks().AddCheck<QuartzHealthCheck>("Quartz");
+        services.AddHealthChecks().AddCheck<ShopQuartzHealthCheck>("ShopQuartz");
 
         return services;
     }
 
-    public static IServiceCollection AddPostgresHealtchCheck(this IServiceCollection services)
+    public static IServiceCollection AddMidrandShopQuartzHealthCheck(this IServiceCollection services)
     {
-        services.AddHealthChecks().AddCheck<PostgresHealthCheck>("PostgreSQL");
+        services.AddHealthChecks().AddCheck<MidrandShopQuartzHealthCheck>("MidrandShopQuartz");
+
+        return services;
+    }
+
+    public static IServiceCollection AddShopPostgresHealthCheck(this IServiceCollection services)
+    {
+        services.AddHealthChecks().AddCheck<PostgresShopHealthCheck>(ShopDbConfigName);
+
+        return services;
+    }
+
+    public static IServiceCollection AddMidrandShopPostgresHealthCheck(this IServiceCollection services)
+    {
+        services.AddHealthChecks().AddCheck<PostgresMidrandShopHealthCheck>(MidrandShopDbConfigName);
 
         return services;
     }

LiteCharms.Features/Extensions/Postgres.cs

@@ -1,13 +1,26 @@
-using LiteCharms.Features.Shop.Postgres;
+using LiteCharms.Features.MidrandShop.Postgres;
+using LiteCharms.Features.Shop.Postgres;
 
 namespace LiteCharms.Features.Extensions;
 
 public static class Postgres
 {
+    public const string MidrandShopDbConfigName = "PostgresMidrandShop";
+    public const string ShopDbConfigName = "PostgresShop";
+    public const string SchedulerDbConfigName = "PostgresScheduler";    
+
     public static IServiceCollection AddShopDatabase(this IServiceCollection services, IConfiguration configuration)
     {
         services.AddPooledDbContextFactory<ShopDbContext>(options =>
-            options.UseNpgsql(configuration.GetConnectionString("PostgresShop")));
+            options.UseNpgsql(configuration.GetConnectionString(ShopDbConfigName)));
+
+        return services;
+    }
+
+    public static IServiceCollection AddMidrandShopDatabase(this IServiceCollection services, IConfiguration configuration)
+    {
+        services.AddPooledDbContextFactory<MidrandShopDbContext>(options =>
+            options.UseNpgsql(configuration.GetConnectionString(MidrandShopDbConfigName)));
 
         return services;
     }

LiteCharms.Features/Extensions/Quartz.cs

@@ -1,15 +1,17 @@
 using LiteCharms.Features.Quartz;
 using LiteCharms.Features.Quartz.Abstractions;
+using static LiteCharms.Features.Extensions.Postgres;
 
 namespace LiteCharms.Features.Extensions;
 
 public static class Quartz
 {
-    private const string databaseConfigName = "PostgresScheduler";
+    public const string ShopSchedulerName = "shop";
+    public const string MidrandShopSchedulerName = "midrandshop";
 
     public static IServiceCollection AddQuartzSchedulerClient(this IServiceCollection services, string schedulerName, IConfiguration configuration)
     {
-        var connectionString = configuration.GetConnectionString(databaseConfigName);
+        var connectionString = configuration.GetConnectionString(SchedulerDbConfigName);
 
         services.ConfigureCommon();
 
@@ -34,7 +36,7 @@ public static class Quartz
                 storage.UseClustering(cluster =>
                 {
                     cluster.CheckinInterval = TimeSpan.FromSeconds(30);
-                    cluster.CheckinMisfireThreshold = TimeSpan.FromSeconds(2);
+                    cluster.CheckinMisfireThreshold = TimeSpan.FromSeconds(90);
                 });
             });
         });
@@ -44,10 +46,12 @@ public static class Quartz
 
     public static IServiceCollection AddQuartzScheduler(this IServiceCollection services, string schedulerName, IConfiguration configuration)
     {
-        var connectionString = configuration.GetConnectionString(databaseConfigName);
+        var connectionString = configuration.GetConnectionString(SchedulerDbConfigName);
 
         services.ConfigureCommon();
 
+        services.AddQuartzHostedService(options => options.WaitForJobsToComplete = true);
+
         services.AddQuartz(config =>
         {
             config.SchedulerName = schedulerName;
@@ -60,6 +64,8 @@ public static class Quartz
             config.UseDefaultThreadPool(options => options.MaxConcurrency = 1);
             config.UseTimeZoneConverter();
 
+            config.SetProperty("quartz.jobStore.misfireThreshold", TimeSpan.FromMinutes(2).TotalMilliseconds.ToString());
+
             config.UsePersistentStore(storage =>
             {
                 storage.PerformSchemaValidation = false;
@@ -72,7 +78,7 @@ public static class Quartz
                 storage.UseClustering(cluster =>
                 {
                     cluster.CheckinInterval = TimeSpan.FromSeconds(30);
-                    cluster.CheckinMisfireThreshold = TimeSpan.FromSeconds(2);
+                    cluster.CheckinMisfireThreshold = TimeSpan.FromSeconds(90);
                 });
             });
         });
@@ -86,14 +92,14 @@ public static class Quartz
         {
             options.Scheduling.IgnoreDuplicates = true;
             options.Scheduling.OverWriteExistingData = true;
+
             options["quartz.plugin.jobHistory.type"] = "Quartz.Plugin.History.LoggingJobHistoryPlugin, Quartz.Plugins";
             options["quartz.plugin.triggerHistory.type"] = "Quartz.Plugin.History.LoggingTriggerHistoryPlugin, Quartz.Plugins";
         });
 
         services.AddTransient<RetryJobListener>();
         services.AddTransient<IJobOrchestrator, JobOrchestrator>();
-        services.AddQuartzHostedService(options => options.WaitForJobsToComplete = true);
-
+        
         return services;
     }
 }

LiteCharms.Features/Extensions/S3.cs

@@ -0,0 +1,64 @@
+using LiteCharms.Features.S3;
+using LiteCharms.Features.S3.Abstractions;
+using static LiteCharms.Features.S3.Constants;
+
+namespace LiteCharms.Features.Extensions;
+
+public static class S3
+{
+    public static IServiceCollection AddGarageS3(this IServiceCollection services, IConfiguration configuration)
+    {        
+        if (!string.IsNullOrWhiteSpace(configuration.GetSection($"{BookshopS3SettingsSection}:ServiceUrl").Value))
+        {
+            services.AddKeyedSingleton<IAmazonS3, AmazonS3Client>(BookshopBucketName, (provider, client) =>
+                new AmazonS3Client(new BasicAWSCredentials(configuration.GetSection($"{BookshopS3SettingsSection}:AccessKey").Value,
+                configuration.GetSection($"{BookshopS3SettingsSection}:SecretKey").Value),
+                new AmazonS3Config
+                {
+                    ServiceURL = configuration.GetSection($"{BookshopS3SettingsSection}:ServiceUrl").Value,
+                    AuthenticationRegion = configuration.GetSection($"{BookshopS3SettingsSection}:Region").Value,
+                    ForcePathStyle = true,
+                    EndpointDiscoveryEnabled = true,
+                    UseHttp = configuration.GetSection($"{BookshopS3SettingsSection}:ServiceUrl").Value!.Contains("http://")
+                }));
+
+            services.AddKeyedScoped<IS3Service, BookshopS3Service>(BookshopBucketName); 
+        }
+
+        if (!string.IsNullOrWhiteSpace(configuration.GetSection($"{BookshopInvoicesS3SettingsSection}:ServiceUrl").Value))
+        {
+            services.AddKeyedSingleton<IAmazonS3, AmazonS3Client>(BookshopInvoicesBucketName, (provider, client) =>
+                new AmazonS3Client(new BasicAWSCredentials(configuration.GetSection($"{BookshopInvoicesS3SettingsSection}:AccessKey").Value,
+                configuration.GetSection($"{BookshopInvoicesS3SettingsSection}:SecretKey").Value),
+                new AmazonS3Config
+                {
+                    ServiceURL = configuration.GetSection($"{BookshopInvoicesS3SettingsSection}:ServiceUrl").Value,
+                    AuthenticationRegion = configuration.GetSection($"{BookshopInvoicesS3SettingsSection}:Region").Value,
+                    ForcePathStyle = true,
+                    EndpointDiscoveryEnabled = true,
+                    UseHttp = configuration.GetSection($"{BookshopS3SettingsSection}:ServiceUrl").Value!.Contains("http://")
+                }));
+
+            services.AddKeyedScoped<IS3Service, BookshopInvoicesS3Service>(BookshopInvoicesBucketName);
+        }
+
+        if (!string.IsNullOrWhiteSpace(configuration.GetSection($"{BookshopQuotesS3SettingsSection}:ServiceUrl").Value))
+        {
+            services.AddKeyedSingleton<IAmazonS3, AmazonS3Client>(BookshopQuotesBucketName, (provider, client) =>
+                new AmazonS3Client(new BasicAWSCredentials(configuration.GetSection($"{BookshopQuotesS3SettingsSection}:AccessKey").Value,
+                configuration.GetSection($"{BookshopQuotesS3SettingsSection}:SecretKey").Value),
+                new AmazonS3Config
+                {
+                    ServiceURL = configuration.GetSection($"{BookshopQuotesS3SettingsSection}:ServiceUrl").Value,
+                    AuthenticationRegion = configuration.GetSection($"{BookshopQuotesS3SettingsSection}:Region").Value,
+                    ForcePathStyle = true,
+                    EndpointDiscoveryEnabled = true,
+                    UseHttp = configuration.GetSection($"{BookshopS3SettingsSection}:ServiceUrl").Value!.Contains("http://")
+                }));
+
+            services.AddKeyedScoped<IS3Service, BookshopQuotesS3Service>(BookshopQuotesBucketName);
+        }
+
+        return services;
+    }
+}

LiteCharms.Features/HealthChecks/MidrandShopQuartzHealthCheck.cs

@@ -0,0 +1,28 @@
+using static LiteCharms.Features.Extensions.Quartz;
+
+namespace LiteCharms.Features.HealthChecks;
+
+public class MidrandShopQuartzHealthCheck(ISchedulerFactory schedulerFactory) : IHealthCheck
+{
+    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            var scheduler = await schedulerFactory.GetScheduler(MidrandShopSchedulerName, cancellationToken);
+
+            if(scheduler == null) 
+                return HealthCheckResult.Unhealthy($"Scheduler with name '{MidrandShopSchedulerName}' not found.");
+
+            if (!scheduler.IsStarted)
+                return HealthCheckResult.Unhealthy($"{MidrandShopSchedulerName} Quartz scheduler is not running");
+
+            await scheduler.CheckExists(new JobKey(Guid.NewGuid().ToString()), cancellationToken);
+
+            return HealthCheckResult.Healthy($"{MidrandShopSchedulerName} Quartz scheduler is ready");
+        }
+        catch (SchedulerException)
+        {
+            return HealthCheckResult.Unhealthy($"{MidrandShopSchedulerName} Quartz scheduler cannot connect to the store");
+        }
+    }
+}

LiteCharms.Features/HealthChecks/PostgresMidrandShopHealthCheck.cs

@@ -0,0 +1,28 @@
+using static LiteCharms.Features.Extensions.Postgres;
+
+namespace LiteCharms.Features.HealthChecks;
+
+public class PostgresMidrandShopHealthCheck(IConfiguration configuration) : IHealthCheck
+{
+    private readonly string connectionString = configuration.GetConnectionString(MidrandShopDbConfigName)!;
+
+    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            await using var dataSource = NpgsqlDataSource.Create(connectionString);
+            await using var connection = await dataSource.OpenConnectionAsync(cancellationToken);
+
+            await using var command = connection.CreateCommand();
+            command.CommandText = "SELECT 1";
+
+            await command.ExecuteScalarAsync(cancellationToken);
+
+            return HealthCheckResult.Healthy($"{MidrandShopDbConfigName} is responsive.");
+        }
+        catch (Exception ex)
+        {
+            return HealthCheckResult.Unhealthy($"{MidrandShopDbConfigName} is unreachable.", ex);
+        }
+    }
+}

LiteCharms.Features/HealthChecks/PostgresShopHealthCheck.cs

@@ -1,8 +1,10 @@
-namespace LiteCharms.Features.HealthChecks;
+using static LiteCharms.Features.Extensions.Postgres;
 
-public class PostgresHealthCheck(IConfiguration configuration) : IHealthCheck
+namespace LiteCharms.Features.HealthChecks;
+
+public class PostgresShopHealthCheck(IConfiguration configuration) : IHealthCheck
 {
-    private readonly string connectionString = configuration.GetConnectionString("PostgresShop")!;
+    private readonly string connectionString = configuration.GetConnectionString(ShopDbConfigName)!;
 
     public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
     {
@@ -16,11 +18,11 @@ public class PostgresHealthCheck(IConfiguration configuration) : IHealthCheck
 
             await command.ExecuteScalarAsync(cancellationToken);
 
-            return HealthCheckResult.Healthy("PostgreSQL is responsive.");
+            return HealthCheckResult.Healthy($"{ShopDbConfigName} is responsive.");
         }
         catch (Exception ex)
         {
-            return HealthCheckResult.Unhealthy("PostgreSQL is unreachable.", ex);
+            return HealthCheckResult.Unhealthy($"{ShopDbConfigName} is unreachable.", ex);
         }
     }
 }

LiteCharms.Features/HealthChecks/QuartzHealthCheck.cs

@@ -1,23 +0,0 @@
-namespace LiteCharms.Features.HealthChecks;
-
-public class QuartzHealthCheck(ISchedulerFactory schedulerFactory) : IHealthCheck
-{
-    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
-    {
-        try
-        {
-            var scheduler = await schedulerFactory.GetScheduler(cancellationToken);
-
-            if (!scheduler.IsStarted)
-                return HealthCheckResult.Unhealthy("Quartz scheduler is not running");
-
-            await scheduler.CheckExists(new JobKey(Guid.NewGuid().ToString()), cancellationToken);
-
-            return HealthCheckResult.Healthy("Quartz scheduler is ready");
-        }
-        catch (SchedulerException)
-        {
-            return HealthCheckResult.Unhealthy("Quartz scheduler cannot connect to the store");
-        }
-    }
-}

LiteCharms.Features/HealthChecks/ShopQuartzHealthCheck.cs

@@ -0,0 +1,28 @@
+using static LiteCharms.Features.Extensions.Quartz;
+
+namespace LiteCharms.Features.HealthChecks;
+
+public class ShopQuartzHealthCheck(ISchedulerFactory schedulerFactory) : IHealthCheck
+{
+    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            var scheduler = await schedulerFactory.GetScheduler(ShopSchedulerName, cancellationToken);
+
+            if(scheduler == null) 
+                return HealthCheckResult.Unhealthy($"Scheduler with name '{ShopSchedulerName}' not found.");
+
+            if (!scheduler.IsStarted)
+                return HealthCheckResult.Unhealthy($"{ShopSchedulerName} Quartz scheduler is not running");
+
+            await scheduler.CheckExists(new JobKey(Guid.NewGuid().ToString()), cancellationToken);
+
+            return HealthCheckResult.Healthy($"{ShopSchedulerName} Quartz scheduler is ready");
+        }
+        catch (SchedulerException)
+        {
+            return HealthCheckResult.Unhealthy($"{ShopSchedulerName} Quartz scheduler cannot connect to the store");
+        }
+    }
+}

LiteCharms.Features/LiteCharms.Features.csproj

@@ -128,6 +128,17 @@
     <Using Include="FluentResults" />
     <Using Include="Mediator" />
   </ItemGroup>
+  
+  <!-- Amazon S3 SDK -->
+  <ItemGroup>
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.1" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.23.4" />
+    
+    <!-- global Usings -->
+    <Using Include="Amazon.S3" />
+    <Using Include="Amazon.S3.Model" />
+    <Using Include="Amazon.Runtime" />
+  </ItemGroup>
 
   <!-- Shared Usings -->
   <ItemGroup>

LiteCharms.Features/MidrandShop/Postgres/MidrandShopDbContext.cs

@@ -0,0 +1,6 @@
+namespace LiteCharms.Features.MidrandShop.Postgres;
+
+public class MidrandShopDbContext(DbContextOptions<MidrandShopDbContext> options) : DbContext(options)
+{
+
+}

LiteCharms.Features/MidrandShop/Postgres/MidrandShopDbContextFactory.cs

@@ -0,0 +1,21 @@
+using static LiteCharms.Features.Extensions.Postgres;
+
+namespace LiteCharms.Features.MidrandShop.Postgres;
+
+public class MidrandShopDbContextFactory : IDesignTimeDbContextFactory<MidrandShopDbContext>
+{
+    public MidrandShopDbContext CreateDbContext(string[] args)
+    {
+        var configuration = new ConfigurationBuilder()
+            .SetBasePath(Directory.GetCurrentDirectory())
+            .AddUserSecrets(typeof(MidrandShopDbContext).Assembly)
+            .AddJsonFile("appsettings.json")
+            .AddEnvironmentVariables()
+            .Build();
+
+        var optionsBuilder = new DbContextOptionsBuilder<MidrandShopDbContext>();
+        optionsBuilder.UseNpgsql(configuration.GetConnectionString(MidrandShopDbConfigName));
+
+        return new MidrandShopDbContext(optionsBuilder.Options);
+    }
+}

LiteCharms.Features/Quartz/JobOrchestrator.cs

@@ -1,6 +1,5 @@
 using LiteCharms.Features.Abstractions;
 using LiteCharms.Features.Quartz.Abstractions;
-using static LiteCharms.Features.Extensions.Timezones;
 
 namespace LiteCharms.Features.Quartz;
 
@@ -47,13 +46,13 @@ public class JobOrchestrator(ISchedulerFactory schedulerFactory) : IJobOrchestra
             .StoreDurably()
             .Build();
 
-        var now = SouthAfricanTimeZone.UtcNow();
+        var now = DateTime.UtcNow;
 
         var trigger = global::Quartz.TriggerBuilder.Create()
             .WithIdentity(triggerKey)
             .WithDescription($"Scheduled via Main Job at {now:g}")
-            .WithCronSchedule(cronExpression, cron => cron.InTimeZone(SouthAfricanTimeZone)
-                .WithMisfireHandlingInstructionFireAndProceed())
+            .WithCronSchedule(cronExpression, cron => cron
+                .WithMisfireHandlingInstructionIgnoreMisfires())
             .StartAt(now)
             .Build();
 

LiteCharms.Features/Quartz/MediatorJob.cs

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

LiteCharms.Features/S3/Abstractions/IS3Service.cs

@@ -0,0 +1,7 @@
+namespace LiteCharms.Features.S3.Abstractions;
+
+public interface IS3Service
+{
+    Task<Result<string>> UploadFileAsync(string fileName, Stream fileStream, string contentType, CancellationToken cancellationToken = default);
+    Task<Result> DeleteFileAsync(string fileKey, CancellationToken cancellationToken = default);
+}

LiteCharms.Features/S3/Abstractions/S3ServiceBase.cs

@@ -0,0 +1,83 @@
+using static LiteCharms.Features.Extensions.Hash;
+
+namespace LiteCharms.Features.S3.Abstractions;
+
+public abstract class S3ServiceBase(IAmazonS3 amazonS3)
+{
+    protected readonly IAmazonS3 Client = amazonS3;
+
+    protected abstract string BucketName { get; }
+    protected abstract string CdnBaseUrl { get; }
+
+    public virtual async Task<Result<string>> UploadFileAsync(string fileName, Stream fileStream, string contentType, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            if (string.IsNullOrWhiteSpace(BucketName))
+                return Result.Fail<string>("Bucket name is not configured.");
+
+            if (string.IsNullOrWhiteSpace(CdnBaseUrl))
+                return Result.Fail<string>("CDN base URL is not configured.");
+
+            using var stream = new MemoryStream();
+
+            await fileStream.CopyToAsync(stream, cancellationToken);
+            await fileStream.DisposeAsync();
+
+            stream.Seek(0, SeekOrigin.Begin);
+
+            var fileHash = StreamToSha256Hash(stream);
+
+            if(string.IsNullOrWhiteSpace(fileHash))
+                return Result.Fail<string>("Failed to compute file hash.");
+
+            var fileKey = $"{fileHash.ToLower()}{Path.GetExtension(fileName)}";
+
+            var putRequest = new PutObjectRequest
+            {
+                BucketName = BucketName,
+                Key = fileKey,
+                InputStream = stream,
+                ContentType = contentType,
+                UseChunkEncoding = false
+            };
+
+            stream.Seek(0, SeekOrigin.Begin);
+
+            var response = await Client.PutObjectAsync(putRequest, cancellationToken);
+
+            return response.HttpStatusCode != System.Net.HttpStatusCode.OK
+                ? Result.Fail<string>($"Failed to upload {fileName} to S3.")
+                : Result.Ok($"{CdnBaseUrl}/{fileKey}");
+        }
+        catch (Exception ex)
+        {
+            return Result.Fail<string>(new Error($"Error uploading {fileName} to S3: {ex.Message}").CausedBy(ex));
+        }
+    }
+
+    public virtual async Task<Result> DeleteFileAsync(string fileKey, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            if (string.IsNullOrWhiteSpace(BucketName))
+                return Result.Fail("Bucket name is not configured.");
+
+            var deleteRequest = new DeleteObjectRequest
+            {
+                BucketName = BucketName,
+                Key = fileKey
+            };
+
+            var response = await Client.DeleteObjectAsync(deleteRequest, cancellationToken);
+
+            return response.HttpStatusCode != System.Net.HttpStatusCode.NoContent
+                ? Result.Fail($"Failed to delete {fileKey} from S3.")
+                : Result.Ok();
+        }
+        catch (Exception ex)
+        {
+            return Result.Fail(new Error($"Error deleting {fileKey} from S3: {ex.Message}").CausedBy(ex));
+        }
+    }
+}

LiteCharms.Features/S3/BookshopInvoicesS3Service.cs

@@ -0,0 +1,11 @@
+using LiteCharms.Features.S3.Abstractions;
+using static LiteCharms.Features.S3.Constants;
+
+namespace LiteCharms.Features.S3;
+
+public class BookshopInvoicesS3Service(IConfiguration configuration, [FromKeyedServices(BookshopInvoicesBucketName)] IAmazonS3 amazonS3) :
+    S3ServiceBase(amazonS3), IS3Service
+{
+    protected override string BucketName => configuration.GetSection($"{BookshopInvoicesS3SettingsSection}:BucketName").Value ?? "";
+    protected override string CdnBaseUrl => configuration.GetSection($"{BookshopInvoicesS3SettingsSection}:CdnBaseUrl").Value ?? "";
+}

LiteCharms.Features/S3/BookshopQuotesS3Service.cs

@@ -0,0 +1,11 @@
+using LiteCharms.Features.S3.Abstractions;
+using static LiteCharms.Features.S3.Constants;
+
+namespace LiteCharms.Features.S3;
+
+public class BookshopQuotesS3Service(IConfiguration configuration, [FromKeyedServices(BookshopQuotesBucketName)] IAmazonS3 amazonS3) :
+    S3ServiceBase(amazonS3), IS3Service
+{
+    protected override string BucketName => configuration.GetSection($"{BookshopQuotesS3SettingsSection}:BucketName").Value ?? "";
+    protected override string CdnBaseUrl => configuration.GetSection($"{BookshopQuotesS3SettingsSection}:CdnBaseUrl").Value ?? "";
+}

LiteCharms.Features/S3/BookshopS3Service.cs

@@ -0,0 +1,11 @@
+using LiteCharms.Features.S3.Abstractions;
+using static LiteCharms.Features.S3.Constants;
+
+namespace LiteCharms.Features.S3;
+
+public class BookshopS3Service(IConfiguration configuration, [FromKeyedServices(BookshopBucketName)] IAmazonS3 amazonS3) :
+    S3ServiceBase(amazonS3), IS3Service
+{
+    protected override string BucketName => configuration.GetSection($"{BookshopS3SettingsSection}:BucketName").Value ?? "";
+    protected override string CdnBaseUrl => configuration.GetSection($"{BookshopS3SettingsSection}:CdnBaseUrl").Value ?? "";
+}

LiteCharms.Features/S3/Configuration/S3Settings.cs

@@ -0,0 +1,16 @@
+namespace LiteCharms.Features.S3.Configuration;
+
+public class S3Settings
+{
+    public string? ServiceUrl { get; set; }
+
+    public string? AccessKey { get; set; }
+
+    public string? SecretKey { get; set; }
+
+    public string? BucketName { get; set; }
+
+    public string? Region { get; set; }
+
+    public string? CdnBaseUrl { get; set; }
+}

LiteCharms.Features/S3/Constants.cs

@@ -0,0 +1,12 @@
+namespace LiteCharms.Features.S3;
+
+public static class Constants
+{
+    public const string BookshopS3SettingsSection = "BookshopS3Settings";
+    public const string BookshopInvoicesS3SettingsSection = "BookshopInvoicesS3Settings";
+    public const string BookshopQuotesS3SettingsSection = "BookshopQuotesS3Settings";
+
+    public const string BookshopBucketName = "bookshop";
+    public const string BookshopInvoicesBucketName = "bookshop.invoices";
+    public const string BookshopQuotesBucketName = "bookshop.quotes";
+}

LiteCharms.Features/Shop/CartPackages/PackageService.cs

@@ -2,7 +2,6 @@
 using LiteCharms.Features.Models;
 using LiteCharms.Features.Shop.CartPackages.Models;
 using LiteCharms.Features.Shop.Postgres;
-using static LiteCharms.Features.Extensions.Timezones;
 
 namespace LiteCharms.Features.Shop.CartPackages;
 
@@ -51,7 +50,6 @@ public class PackageService(IDbContextFactory<ShopDbContext> contextFactory)
 
             var newPackage = context.Packages.Add(new Entities.Package
             {
-                UpdatedAt = null,
                 Name = name,
                 Summary = summary,
                 Description = description,
@@ -206,7 +204,7 @@ public class PackageService(IDbContextFactory<ShopDbContext> contextFactory)
             package.Summary = summary;
             package.Description = description;
             package.ImageUrl = ImageUrl;
-            package.UpdatedAt = SouthAfricanTimeZone.UtcNow();
+            package.UpdatedAt = DateTime.UtcNow;
 
             return await context.SaveChangesAsync(cancellationToken) > 0
                 ? Result.Ok()

LiteCharms.Features/Shop/Leads/Entities/Lead.cs

@@ -1,4 +1,4 @@
-using LiteCharms.Features.Shop.Customers.Models;
+using LiteCharms.Features.Shop.Customers.Entities;
 
 namespace LiteCharms.Features.Shop.Leads.Entities;
 

LiteCharms.Features/Shop/Leads/Entities/LeadConfiguration.cs

@@ -24,7 +24,7 @@ public class LeadConfiguration : IEntityTypeConfiguration<Lead>
         builder.Property(f => f.AttributionHash).IsRequired(true);
 
         builder.HasOne(f => f.Customer)
-            .WithMany()
+            .WithMany(f => f.Leads)
             .HasForeignKey(f => f.CustomerId)
             .OnDelete(DeleteBehavior.Restrict);
     }

LiteCharms.Features/Shop/Leads/LeadService.cs

@@ -28,7 +28,7 @@ public class LeadService(IDbContextFactory<ShopDbContext> contextFactory)
                 FeedItemId = request.FeedItemId,
                 Status = LeadStatus.New,
                 TargetId = request.TargetId,
-                AttributionHash = GenerateSha256HashString.Invoke($"{request.ClickId}{request.AppClickId}{request.WebClickId}")
+                AttributionHash = StringToSha256Hash.Invoke($"{request.ClickId}{request.AppClickId}{request.WebClickId}")
             });
 
             return await context.SaveChangesAsync(cancellationToken) > 0
@@ -103,6 +103,7 @@ public class LeadService(IDbContextFactory<ShopDbContext> contextFactory)
                 return Result.Fail(new Error($"Lead with ID {leadId} not found."));
 
             lead.Status = status;
+            lead.UpdatedAt = DateTime.UtcNow;
 
             return await context.SaveChangesAsync(cancellationToken) > 0
                 ? Result.Ok()

LiteCharms.Features/Shop/Notifications/Events/Handlers/ProcessEmailNotificationsEventHandler.cs

@@ -1,7 +1,7 @@
-using LiteCharms.Features.Email;
-using LiteCharms.Features.Shop.Notifications.Entities;
+using k8s.KubeConfigModels;
+using LiteCharms.Features.Email;
+using LiteCharms.Features.Shop.Notifications.Models;
 using LiteCharms.Features.Shop.Postgres;
-using static LiteCharms.Features.Extensions.Timezones;
 
 namespace LiteCharms.Features.Shop.Notifications.Events.Handlers;
 
@@ -16,17 +16,20 @@ public class ProcessEmailNotificationsEventHandler(IDbContextFactory<ShopDbConte
         {
             using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
 
+            if (emailService.Status != EmailStatuses.Connected)
+                await emailService.ConnectAsync(cancellationToken);
+
             var notifications = await context.Notifications
-                .OrderByDescending(o => o.Priority)
-                .ThenBy(o => o.CreatedAt)
-                .Where(n => n.CorrelationIdType == CorrelationIdTypes.Email)
-                .Where(n => n.Direction == NotificationDirection.Outgoing)
+                .OrderByDescending(o => o.CreatedAt)
+                .ThenBy(o => o.Priority)
+                .Where(n => n.Platform == NotificationPlatforms.Email && 
+                    n.Direction == NotificationDirection.Outgoing && n.Processed == false)
                 .Take(message.MaxRecords)
                 .ToListAsync(cancellationToken);
 
             foreach (var notification in notifications)
             {
-                if (dropBatch || cancellationToken.IsCancellationRequested) break;
+                if (dropBatch) break;
 
                 var sendResult = await SendEmailAsync(notification,emailService, cancellationToken);
 
@@ -44,15 +47,19 @@ public class ProcessEmailNotificationsEventHandler(IDbContextFactory<ShopDbConte
                 }
 
                 notification.Processed = true;
-                notification.UpdatedAt = SouthAfricanTimeZone.UtcNow();
+                notification.UpdatedAt = DateTime.UtcNow;
             }
 
-            await context.SaveChangesAsync(cancellationToken);
+            await context.SaveChangesAsync(cancellationToken);            
         }
         catch (Exception ex)
         {
             logger.LogError(ex, ex.Message);
         }
+        finally
+        {
+            await emailService.DisconnectAsync(cancellationToken);
+        }
     }
 
     private async Task<Result> SendEmailAsync(Notification notification, EmailService service, CancellationToken cancellationToken = default)

LiteCharms.Features/Shop/Notifications/Events/ProcessEmailNotificationsEvent.cs

@@ -8,6 +8,8 @@ public class ProcessEmailNotificationsEvent : EventBase, IEvent
 
     public int MaxRecords { get; set; }
 
+    public ProcessEmailNotificationsEvent() { MaxRecords = 1000; }
+
     private ProcessEmailNotificationsEvent(int maxRecords = 1000) => MaxRecords = maxRecords;
 
     public static ProcessEmailNotificationsEvent Create(int maxRecords = 1000) => new(maxRecords);

LiteCharms.Features/Shop/Notifications/NotificationService.cs

@@ -63,8 +63,8 @@ public class NotificationService(IDbContextFactory<ShopDbContext> contextFactory
     {
         try
         {
-            var fromDate = range.From.ToDateTime(TimeOnly.MinValue);
-            var toDate = range.To.ToDateTime(TimeOnly.MaxValue);
+            var fromDate = range.From.ToDateTime(TimeOnly.MinValue, DateTimeKind.Utc);
+            var toDate = range.To.ToDateTime(TimeOnly.MaxValue, DateTimeKind.Utc);
 
             using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
 
@@ -96,12 +96,9 @@ public class NotificationService(IDbContextFactory<ShopDbContext> contextFactory
                 return Result.Fail(new Error($"Notification with id {request.NotificationId} not found."));
 
             notification.Processed = request.Processed;
-
-            if (request.HasError)
-            {
-                notification.HasError = request.HasError;
-                notification.Errors = request.Errors;
-            }
+            notification.UpdatedAt = DateTime.UtcNow;
+            notification.HasError = request.HasError;
+            notification.Errors = request.Errors;
 
             return await context.SaveChangesAsync(cancellationToken) > 0
                 ? Result.Ok()

LiteCharms.Features/Shop/Orders/OrderService.cs

@@ -2,7 +2,6 @@
 using LiteCharms.Features.Models;
 using LiteCharms.Features.Shop.Orders.Models;
 using LiteCharms.Features.Shop.Postgres;
-using static LiteCharms.Features.Extensions.Timezones;
 
 namespace LiteCharms.Features.Shop.Orders;
 
@@ -241,7 +240,7 @@ public class OrderService(IDbContextFactory<ShopDbContext> contextFactory)
                 return Result.Fail(new Error($"Order {request.OrderId} not found"));
 
             order.Status = request.Status;
-            order.UpdatedAt = SouthAfricanTimeZone.UtcNow();
+            order.UpdatedAt = DateTime.UtcNow;
 
             if(!string.IsNullOrWhiteSpace(request.InvoiceUrl)) order.InvoiceUrl = request.InvoiceUrl;
 

LiteCharms.Features/Shop/Postgres/Migrations/20260515055221_FixedLeadCustomerRelationship.Designer.cs

@@ -0,0 +1,776 @@
+// <auto-generated />
+using System;
+using LiteCharms.Features.Shop.Postgres;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace LiteCharms.Features.Shop.Postgres.Migrations
+{
+    [DbContext(typeof(ShopDbContext))]
+    [Migration("20260515055221_FixedLeadCustomerRelationship")]
+    partial class FixedLeadCustomerRelationship
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "10.0.8")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.CartPackages.Entities.Package", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.Property<string>("ImageUrl")
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Summary")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Package", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.CartPackages.Entities.PackageItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("PackageId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ProductPriceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PackageId");
+
+                    b.HasIndex("ProductPriceId");
+
+                    b.ToTable("PackageItem", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Customers.Entities.Customer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(true);
+
+                    b.Property<string>("Address")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Company")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Discord")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("LinkedIn")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Region")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Slack")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tax")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Website")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Whatsapp")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Customers", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Leads.Entities.Lead", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<long?>("AdGroupId")
+                        .HasColumnType("bigint");
+
+                    b.Property<long?>("AdName")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("AppClickId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AttributionHash")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long?>("CampaignId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("ClickId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClickLocation")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid?>("CustomerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<long?>("FeedItemId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Source")
+                        .HasColumnType("text");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<long?>("TargetId")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("WebClickId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CustomerId");
+
+                    b.ToTable("Leads", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Notifications.Entities.Notification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("CorrelationIdType")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<int>("Direction")
+                        .HasColumnType("integer");
+
+                    b.PrimitiveCollection<string>("Errors")
+                        .HasColumnType("jsonb");
+
+                    b.Property<bool>("HasError")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false);
+
+                    b.Property<bool>("IsHtml")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false);
+
+                    b.Property<bool>("IsInternal")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(true);
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("Platform")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("Processed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("RecipientAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RecipientName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SenderAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SenderName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Notification", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Orders.Entities.Order", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("CustomerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("InvoiceUrl")
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.PrimitiveCollection<string>("Notes")
+                        .HasColumnType("jsonb");
+
+                    b.PrimitiveCollection<string>("Requirements")
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.PrimitiveCollection<string>("Terms")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CustomerId");
+
+                    b.ToTable("Orders", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Orders.Entities.OrderRefund", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("numeric(18,2)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("OrderId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrderId");
+
+                    b.ToTable("OrderRefunds", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Products.Entities.Product", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(true);
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.Property<string>("ImageUrl")
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Summary")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.PrimitiveCollection<string>("Thumbnails")
+                        .HasColumnType("jsonb");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Products", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Products.Entities.ProductPrice", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<decimal>("Discount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("numeric(18,2)");
+
+                    b.Property<decimal>("Price")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("numeric(18,2)");
+
+                    b.Property<Guid>("ProductId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProductId");
+
+                    b.ToTable("ProductPrices", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Quotes.Entities.Quote", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("CustomerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("ExpiredAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("InvoiceUrl")
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.Property<Guid?>("OrderId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Reason")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ShoppingCartId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CustomerId");
+
+                    b.HasIndex("OrderId")
+                        .IsUnique();
+
+                    b.HasIndex("ShoppingCartId")
+                        .IsUnique();
+
+                    b.ToTable("Quotes", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCart", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("CustomerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("OrderId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CustomerId");
+
+                    b.HasIndex("OrderId")
+                        .IsUnique();
+
+                    b.ToTable("ShoppingCarts", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCartItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("ProductPriceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Quantity")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(1);
+
+                    b.Property<Guid>("ShoppingCartId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProductPriceId");
+
+                    b.HasIndex("ShoppingCartId");
+
+                    b.ToTable("ShoppingCartItems", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCartPackage", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("PackageId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ShoppingCartId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PackageId");
+
+                    b.HasIndex("ShoppingCartId");
+
+                    b.ToTable("ShoppingCartPackages", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.CartPackages.Entities.PackageItem", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.CartPackages.Entities.Package", "Package")
+                        .WithMany("PackageItems")
+                        .HasForeignKey("PackageId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("LiteCharms.Features.Shop.Products.Entities.ProductPrice", "ProductPrice")
+                        .WithMany()
+                        .HasForeignKey("ProductPriceId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Package");
+
+                    b.Navigation("ProductPrice");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Leads.Entities.Lead", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.Customers.Entities.Customer", "Customer")
+                        .WithMany("Leads")
+                        .HasForeignKey("CustomerId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.Navigation("Customer");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Orders.Entities.Order", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.Customers.Entities.Customer", "Customer")
+                        .WithMany("Orders")
+                        .HasForeignKey("CustomerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Customer");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Orders.Entities.OrderRefund", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.Orders.Entities.Order", "Order")
+                        .WithMany("Refunds")
+                        .HasForeignKey("OrderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Order");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Products.Entities.ProductPrice", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.Products.Entities.Product", "Product")
+                        .WithMany("ProductPrices")
+                        .HasForeignKey("ProductId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Product");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Quotes.Entities.Quote", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.Customers.Entities.Customer", "Customer")
+                        .WithMany("Quotes")
+                        .HasForeignKey("CustomerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("LiteCharms.Features.Shop.Orders.Entities.Order", "Order")
+                        .WithOne("Quote")
+                        .HasForeignKey("LiteCharms.Features.Shop.Quotes.Entities.Quote", "OrderId");
+
+                    b.HasOne("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCart", "ShoppingCart")
+                        .WithOne("Quote")
+                        .HasForeignKey("LiteCharms.Features.Shop.Quotes.Entities.Quote", "ShoppingCartId");
+
+                    b.Navigation("Customer");
+
+                    b.Navigation("Order");
+
+                    b.Navigation("ShoppingCart");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCart", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.Customers.Entities.Customer", "Customer")
+                        .WithMany("ShoppingCarts")
+                        .HasForeignKey("CustomerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("LiteCharms.Features.Shop.Orders.Entities.Order", "Order")
+                        .WithOne("ShoppingCart")
+                        .HasForeignKey("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCart", "OrderId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Customer");
+
+                    b.Navigation("Order");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCartItem", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.Products.Entities.ProductPrice", "ProductPrice")
+                        .WithMany()
+                        .HasForeignKey("ProductPriceId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCart", "ShoppingCart")
+                        .WithMany("ShoppingCartItems")
+                        .HasForeignKey("ShoppingCartId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ProductPrice");
+
+                    b.Navigation("ShoppingCart");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCartPackage", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.CartPackages.Entities.Package", "Package")
+                        .WithMany()
+                        .HasForeignKey("PackageId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCart", "ShoppingCart")
+                        .WithMany("ShoppingCartPackages")
+                        .HasForeignKey("ShoppingCartId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Package");
+
+                    b.Navigation("ShoppingCart");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.CartPackages.Entities.Package", b =>
+                {
+                    b.Navigation("PackageItems");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Customers.Entities.Customer", b =>
+                {
+                    b.Navigation("Leads");
+
+                    b.Navigation("Orders");
+
+                    b.Navigation("Quotes");
+
+                    b.Navigation("ShoppingCarts");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Orders.Entities.Order", b =>
+                {
+                    b.Navigation("Quote");
+
+                    b.Navigation("Refunds");
+
+                    b.Navigation("ShoppingCart");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Products.Entities.Product", b =>
+                {
+                    b.Navigation("ProductPrices");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCart", b =>
+                {
+                    b.Navigation("Quote");
+
+                    b.Navigation("ShoppingCartItems");
+
+                    b.Navigation("ShoppingCartPackages");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

LiteCharms.Features/Shop/Postgres/Migrations/20260515055221_FixedLeadCustomerRelationship.cs

@@ -0,0 +1,166 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace LiteCharms.Features.Shop.Postgres.Migrations
+{
+    /// <inheritdoc />
+    public partial class FixedLeadCustomerRelationship : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Leads_Customer_CustomerId",
+                table: "Leads");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Leads_Customers_CustomerId1",
+                table: "Leads");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_ShoppingCartItems_ProductPrices_ProductPriceId1",
+                table: "ShoppingCartItems");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_ShoppingCartItems_ShoppingCarts_ShoppingCartId1",
+                table: "ShoppingCartItems");
+
+            migrationBuilder.DropTable(
+                name: "Customer");
+
+            migrationBuilder.DropIndex(
+                name: "IX_ShoppingCartItems_ProductPriceId1",
+                table: "ShoppingCartItems");
+
+            migrationBuilder.DropIndex(
+                name: "IX_ShoppingCartItems_ShoppingCartId1",
+                table: "ShoppingCartItems");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Leads_CustomerId1",
+                table: "Leads");
+
+            migrationBuilder.DropColumn(
+                name: "ProductPriceId1",
+                table: "ShoppingCartItems");
+
+            migrationBuilder.DropColumn(
+                name: "ShoppingCartId1",
+                table: "ShoppingCartItems");
+
+            migrationBuilder.DropColumn(
+                name: "CustomerId1",
+                table: "Leads");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Leads_Customers_CustomerId",
+                table: "Leads",
+                column: "CustomerId",
+                principalTable: "Customers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Leads_Customers_CustomerId",
+                table: "Leads");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ProductPriceId1",
+                table: "ShoppingCartItems",
+                type: "uuid",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ShoppingCartId1",
+                table: "ShoppingCartItems",
+                type: "uuid",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "CustomerId1",
+                table: "Leads",
+                type: "uuid",
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "Customer",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uuid", nullable: false),
+                    Active = table.Column<bool>(type: "boolean", nullable: false),
+                    Address = table.Column<string>(type: "text", nullable: true),
+                    City = table.Column<string>(type: "text", nullable: true),
+                    Company = table.Column<string>(type: "text", nullable: true),
+                    Country = table.Column<string>(type: "text", nullable: true),
+                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
+                    Discord = table.Column<string>(type: "text", nullable: true),
+                    Email = table.Column<string>(type: "text", nullable: true),
+                    LastName = table.Column<string>(type: "text", nullable: true),
+                    LinkedIn = table.Column<string>(type: "text", nullable: true),
+                    Name = table.Column<string>(type: "text", nullable: true),
+                    Phone = table.Column<string>(type: "text", nullable: true),
+                    PostalCode = table.Column<string>(type: "text", nullable: true),
+                    Region = table.Column<string>(type: "text", nullable: true),
+                    Slack = table.Column<string>(type: "text", nullable: true),
+                    Tax = table.Column<string>(type: "text", nullable: true),
+                    UpdatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
+                    Website = table.Column<string>(type: "text", nullable: true),
+                    Whatsapp = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Customer", x => x.Id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ShoppingCartItems_ProductPriceId1",
+                table: "ShoppingCartItems",
+                column: "ProductPriceId1");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ShoppingCartItems_ShoppingCartId1",
+                table: "ShoppingCartItems",
+                column: "ShoppingCartId1");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Leads_CustomerId1",
+                table: "Leads",
+                column: "CustomerId1");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Leads_Customer_CustomerId",
+                table: "Leads",
+                column: "CustomerId",
+                principalTable: "Customer",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Leads_Customers_CustomerId1",
+                table: "Leads",
+                column: "CustomerId1",
+                principalTable: "Customers",
+                principalColumn: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_ShoppingCartItems_ProductPrices_ProductPriceId1",
+                table: "ShoppingCartItems",
+                column: "ProductPriceId1",
+                principalTable: "ProductPrices",
+                principalColumn: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_ShoppingCartItems_ShoppingCarts_ShoppingCartId1",
+                table: "ShoppingCartItems",
+                column: "ShoppingCartId1",
+                principalTable: "ShoppingCarts",
+                principalColumn: "Id");
+        }
+    }
+}

LiteCharms.Features/Shop/Postgres/Migrations/20260520191059_AddedProductMetadata.Designer.cs

@@ -0,0 +1,788 @@
+// <auto-generated />
+using System;
+using LiteCharms.Features.Shop.Postgres;
+using LiteCharms.Features.Shop.Products.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace LiteCharms.Features.Shop.Postgres.Migrations
+{
+    [DbContext(typeof(ShopDbContext))]
+    [Migration("20260520191059_AddedProductMetadata")]
+    partial class AddedProductMetadata
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "10.0.8")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.CartPackages.Entities.Package", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.Property<string>("ImageUrl")
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Summary")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Package", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.CartPackages.Entities.PackageItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("PackageId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ProductPriceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PackageId");
+
+                    b.HasIndex("ProductPriceId");
+
+                    b.ToTable("PackageItem", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Customers.Entities.Customer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(true);
+
+                    b.Property<string>("Address")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Company")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Discord")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("LinkedIn")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Region")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Slack")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tax")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Website")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Whatsapp")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Customers", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Leads.Entities.Lead", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<long?>("AdGroupId")
+                        .HasColumnType("bigint");
+
+                    b.Property<long?>("AdName")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("AppClickId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AttributionHash")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long?>("CampaignId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("ClickId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClickLocation")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid?>("CustomerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<long?>("FeedItemId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Source")
+                        .HasColumnType("text");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<long?>("TargetId")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("WebClickId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CustomerId");
+
+                    b.ToTable("Leads", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Notifications.Entities.Notification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("CorrelationIdType")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<int>("Direction")
+                        .HasColumnType("integer");
+
+                    b.PrimitiveCollection<string>("Errors")
+                        .HasColumnType("jsonb");
+
+                    b.Property<bool>("HasError")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false);
+
+                    b.Property<bool>("IsHtml")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false);
+
+                    b.Property<bool>("IsInternal")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(true);
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("Platform")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("Processed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("RecipientAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RecipientName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SenderAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SenderName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Notification", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Orders.Entities.Order", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("CustomerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("InvoiceUrl")
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.PrimitiveCollection<string>("Notes")
+                        .HasColumnType("jsonb");
+
+                    b.PrimitiveCollection<string>("Requirements")
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.PrimitiveCollection<string>("Terms")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CustomerId");
+
+                    b.ToTable("Orders", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Orders.Entities.OrderRefund", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("numeric(18,2)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("OrderId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrderId");
+
+                    b.ToTable("OrderRefunds", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Products.Entities.Product", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.Property<string>("ImageUrl")
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.Property<ProductMetadata>("Metadata")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Summary")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.PrimitiveCollection<string>("Thumbnails")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Products", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Products.Entities.ProductPrice", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<decimal>("Discount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("numeric(18,2)");
+
+                    b.Property<decimal>("Price")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("numeric(18,2)");
+
+                    b.Property<Guid>("ProductId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProductId");
+
+                    b.ToTable("ProductPrices", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Quotes.Entities.Quote", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("CustomerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("ExpiredAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("InvoiceUrl")
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.Property<Guid?>("OrderId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Reason")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ShoppingCartId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CustomerId");
+
+                    b.HasIndex("OrderId")
+                        .IsUnique();
+
+                    b.HasIndex("ShoppingCartId")
+                        .IsUnique();
+
+                    b.ToTable("Quotes", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCart", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("CustomerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("OrderId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CustomerId");
+
+                    b.HasIndex("OrderId")
+                        .IsUnique();
+
+                    b.ToTable("ShoppingCarts", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCartItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("ProductPriceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Quantity")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(1);
+
+                    b.Property<Guid>("ShoppingCartId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProductPriceId");
+
+                    b.HasIndex("ShoppingCartId");
+
+                    b.ToTable("ShoppingCartItems", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCartPackage", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("PackageId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ShoppingCartId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PackageId");
+
+                    b.HasIndex("ShoppingCartId");
+
+                    b.ToTable("ShoppingCartPackages", (string)null);
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.CartPackages.Entities.PackageItem", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.CartPackages.Entities.Package", "Package")
+                        .WithMany("PackageItems")
+                        .HasForeignKey("PackageId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("LiteCharms.Features.Shop.Products.Entities.ProductPrice", "ProductPrice")
+                        .WithMany()
+                        .HasForeignKey("ProductPriceId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Package");
+
+                    b.Navigation("ProductPrice");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Leads.Entities.Lead", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.Customers.Entities.Customer", "Customer")
+                        .WithMany("Leads")
+                        .HasForeignKey("CustomerId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.Navigation("Customer");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Orders.Entities.Order", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.Customers.Entities.Customer", "Customer")
+                        .WithMany("Orders")
+                        .HasForeignKey("CustomerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Customer");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Orders.Entities.OrderRefund", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.Orders.Entities.Order", "Order")
+                        .WithMany("Refunds")
+                        .HasForeignKey("OrderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Order");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Products.Entities.ProductPrice", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.Products.Entities.Product", "Product")
+                        .WithMany("ProductPrices")
+                        .HasForeignKey("ProductId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Product");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Quotes.Entities.Quote", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.Customers.Entities.Customer", "Customer")
+                        .WithMany("Quotes")
+                        .HasForeignKey("CustomerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("LiteCharms.Features.Shop.Orders.Entities.Order", "Order")
+                        .WithOne("Quote")
+                        .HasForeignKey("LiteCharms.Features.Shop.Quotes.Entities.Quote", "OrderId");
+
+                    b.HasOne("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCart", "ShoppingCart")
+                        .WithOne("Quote")
+                        .HasForeignKey("LiteCharms.Features.Shop.Quotes.Entities.Quote", "ShoppingCartId");
+
+                    b.Navigation("Customer");
+
+                    b.Navigation("Order");
+
+                    b.Navigation("ShoppingCart");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCart", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.Customers.Entities.Customer", "Customer")
+                        .WithMany("ShoppingCarts")
+                        .HasForeignKey("CustomerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("LiteCharms.Features.Shop.Orders.Entities.Order", "Order")
+                        .WithOne("ShoppingCart")
+                        .HasForeignKey("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCart", "OrderId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Customer");
+
+                    b.Navigation("Order");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCartItem", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.Products.Entities.ProductPrice", "ProductPrice")
+                        .WithMany()
+                        .HasForeignKey("ProductPriceId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCart", "ShoppingCart")
+                        .WithMany("ShoppingCartItems")
+                        .HasForeignKey("ShoppingCartId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ProductPrice");
+
+                    b.Navigation("ShoppingCart");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCartPackage", b =>
+                {
+                    b.HasOne("LiteCharms.Features.Shop.CartPackages.Entities.Package", "Package")
+                        .WithMany()
+                        .HasForeignKey("PackageId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCart", "ShoppingCart")
+                        .WithMany("ShoppingCartPackages")
+                        .HasForeignKey("ShoppingCartId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Package");
+
+                    b.Navigation("ShoppingCart");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.CartPackages.Entities.Package", b =>
+                {
+                    b.Navigation("PackageItems");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Customers.Entities.Customer", b =>
+                {
+                    b.Navigation("Leads");
+
+                    b.Navigation("Orders");
+
+                    b.Navigation("Quotes");
+
+                    b.Navigation("ShoppingCarts");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Orders.Entities.Order", b =>
+                {
+                    b.Navigation("Quote");
+
+                    b.Navigation("Refunds");
+
+                    b.Navigation("ShoppingCart");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.Products.Entities.Product", b =>
+                {
+                    b.Navigation("ProductPrices");
+                });
+
+            modelBuilder.Entity("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCart", b =>
+                {
+                    b.Navigation("Quote");
+
+                    b.Navigation("ShoppingCartItems");
+
+                    b.Navigation("ShoppingCartPackages");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

LiteCharms.Features/Shop/Postgres/Migrations/20260520191059_AddedProductMetadata.cs

@@ -0,0 +1,71 @@
+using System;
+using LiteCharms.Features.Shop.Products.Models;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace LiteCharms.Features.Shop.Postgres.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddedProductMetadata : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<bool>(
+                name: "Active",
+                table: "Products",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false,
+                oldClrType: typeof(bool),
+                oldType: "boolean",
+                oldDefaultValue: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "CreatedAt",
+                table: "Products",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<ProductMetadata>(
+                name: "Metadata",
+                table: "Products",
+                type: "jsonb",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "UpdatedAt",
+                table: "Products",
+                type: "timestamp with time zone",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                table: "Products");
+
+            migrationBuilder.DropColumn(
+                name: "Metadata",
+                table: "Products");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                table: "Products");
+
+            migrationBuilder.AlterColumn<bool>(
+                name: "Active",
+                table: "Products",
+                type: "boolean",
+                nullable: false,
+                defaultValue: true,
+                oldClrType: typeof(bool),
+                oldType: "boolean",
+                oldDefaultValue: false);
+        }
+    }
+}

LiteCharms.Features/Shop/Postgres/Migrations/ShopDbContextModelSnapshot.cs

@@ -1,6 +1,7 @@
 // <auto-generated />
 using System;
 using LiteCharms.Features.Shop.Postgres;
+using LiteCharms.Features.Shop.Products.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
@@ -166,74 +167,6 @@ namespace LiteCharms.Features.Shop.Postgres.Migrations
                     b.ToTable("Customers", (string)null);
                 });
 
-            modelBuilder.Entity("LiteCharms.Features.Shop.Customers.Models.Customer", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<bool>("Active")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("Address")
-                        .HasColumnType("text");
-
-                    b.Property<string>("City")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Company")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Country")
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Discord")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Email")
-                        .HasColumnType("text");
-
-                    b.Property<string>("LastName")
-                        .HasColumnType("text");
-
-                    b.Property<string>("LinkedIn")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Phone")
-                        .HasColumnType("text");
-
-                    b.Property<string>("PostalCode")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Region")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Slack")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Tax")
-                        .HasColumnType("text");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Website")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Whatsapp")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Customer");
-                });
-
             modelBuilder.Entity("LiteCharms.Features.Shop.Leads.Entities.Lead", b =>
                 {
                     b.Property<Guid>("Id")
@@ -270,9 +203,6 @@ namespace LiteCharms.Features.Shop.Postgres.Migrations
                     b.Property<Guid?>("CustomerId")
                         .HasColumnType("uuid");
 
-                    b.Property<Guid?>("CustomerId1")
-                        .HasColumnType("uuid");
-
                     b.Property<long?>("FeedItemId")
                         .HasColumnType("bigint");
 
@@ -295,8 +225,6 @@ namespace LiteCharms.Features.Shop.Postgres.Migrations
 
                     b.HasIndex("CustomerId");
 
-                    b.HasIndex("CustomerId1");
-
                     b.ToTable("Leads", (string)null);
                 });
 
@@ -459,7 +387,12 @@ namespace LiteCharms.Features.Shop.Postgres.Migrations
                     b.Property<bool>("Active")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("boolean")
-                        .HasDefaultValue(true);
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
 
                     b.Property<string>("Description")
                         .IsRequired()
@@ -470,6 +403,9 @@ namespace LiteCharms.Features.Shop.Postgres.Migrations
                         .HasMaxLength(2048)
                         .HasColumnType("character varying(2048)");
 
+                    b.Property<ProductMetadata>("Metadata")
+                        .HasColumnType("jsonb");
+
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasColumnType("text");
@@ -482,6 +418,9 @@ namespace LiteCharms.Features.Shop.Postgres.Migrations
                     b.PrimitiveCollection<string>("Thumbnails")
                         .HasColumnType("jsonb");
 
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
                     b.HasKey("Id");
 
                     b.ToTable("Products", (string)null);
@@ -615,9 +554,6 @@ namespace LiteCharms.Features.Shop.Postgres.Migrations
                     b.Property<Guid>("ProductPriceId")
                         .HasColumnType("uuid");
 
-                    b.Property<Guid?>("ProductPriceId1")
-                        .HasColumnType("uuid");
-
                     b.Property<int>("Quantity")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("integer")
@@ -626,9 +562,6 @@ namespace LiteCharms.Features.Shop.Postgres.Migrations
                     b.Property<Guid>("ShoppingCartId")
                         .HasColumnType("uuid");
 
-                    b.Property<Guid?>("ShoppingCartId1")
-                        .HasColumnType("uuid");
-
                     b.Property<DateTime?>("UpdatedAt")
                         .HasColumnType("timestamp with time zone");
 
@@ -636,12 +569,8 @@ namespace LiteCharms.Features.Shop.Postgres.Migrations
 
                     b.HasIndex("ProductPriceId");
 
-                    b.HasIndex("ProductPriceId1");
-
                     b.HasIndex("ShoppingCartId");
 
-                    b.HasIndex("ShoppingCartId1");
-
                     b.ToTable("ShoppingCartItems", (string)null);
                 });
 
@@ -692,15 +621,11 @@ namespace LiteCharms.Features.Shop.Postgres.Migrations
 
             modelBuilder.Entity("LiteCharms.Features.Shop.Leads.Entities.Lead", b =>
                 {
-                    b.HasOne("LiteCharms.Features.Shop.Customers.Models.Customer", "Customer")
-                        .WithMany()
+                    b.HasOne("LiteCharms.Features.Shop.Customers.Entities.Customer", "Customer")
+                        .WithMany("Leads")
                         .HasForeignKey("CustomerId")
                         .OnDelete(DeleteBehavior.Restrict);
 
-                    b.HasOne("LiteCharms.Features.Shop.Customers.Entities.Customer", null)
-                        .WithMany("Leads")
-                        .HasForeignKey("CustomerId1");
-
                     b.Navigation("Customer");
                 });
 
@@ -780,26 +705,18 @@ namespace LiteCharms.Features.Shop.Postgres.Migrations
 
             modelBuilder.Entity("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCartItem", b =>
                 {
-                    b.HasOne("LiteCharms.Features.Shop.Products.Entities.ProductPrice", null)
+                    b.HasOne("LiteCharms.Features.Shop.Products.Entities.ProductPrice", "ProductPrice")
                         .WithMany()
                         .HasForeignKey("ProductPriceId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
 
-                    b.HasOne("LiteCharms.Features.Shop.Products.Entities.ProductPrice", "ProductPrice")
-                        .WithMany()
-                        .HasForeignKey("ProductPriceId1");
-
-                    b.HasOne("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCart", null)
+                    b.HasOne("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCart", "ShoppingCart")
                         .WithMany("ShoppingCartItems")
                         .HasForeignKey("ShoppingCartId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("LiteCharms.Features.Shop.ShoppingCarts.Entities.ShoppingCart", "ShoppingCart")
-                        .WithMany()
-                        .HasForeignKey("ShoppingCartId1");
-
                     b.Navigation("ProductPrice");
 
                     b.Navigation("ShoppingCart");

LiteCharms.Features/Shop/Postgres/ShopDbContextFactory.cs

@@ -1,4 +1,6 @@
-namespace LiteCharms.Features.Shop.Postgres;
+using static LiteCharms.Features.Extensions.Postgres;
+
+namespace LiteCharms.Features.Shop.Postgres;
 
 public class ShopDbContextFactory : IDesignTimeDbContextFactory<ShopDbContext>
 {
@@ -12,7 +14,7 @@ public class ShopDbContextFactory : IDesignTimeDbContextFactory<ShopDbContext>
             .Build();
 
         var optionsBuilder = new DbContextOptionsBuilder<ShopDbContext>();
-        optionsBuilder.UseNpgsql(configuration.GetConnectionString("PostgresShop"));
+        optionsBuilder.UseNpgsql(configuration.GetConnectionString(ShopDbConfigName));
 
         return new ShopDbContext(optionsBuilder.Options);
     }

LiteCharms.Features/Shop/Products/Entities/ProductConfiguration.cs

@@ -8,10 +8,13 @@ public class ProductConfiguration : IEntityTypeConfiguration<Product>
 
         builder.HasKey(f => f.Id);
         builder.Property(f => f.Name).IsRequired();
+        builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd().HasDefaultValueSql("now()");
+        builder.Property(f => f.UpdatedAt).IsRequired(false);
         builder.Property(f => f.Summary).IsRequired().HasMaxLength(512);
         builder.Property(f => f.Description).IsRequired().HasMaxLength(2048);
         builder.Property(f => f.ImageUrl).IsRequired(false).HasMaxLength(2048);
         builder.Property(f => f.Thumbnails).HasColumnType("jsonb").IsRequired(false);
-        builder.Property(f => f.Active).HasDefaultValue(true);
+        builder.Property(f => f.Active).HasDefaultValue(false);
+        builder.Property(f => f.Metadata).HasColumnType("jsonb").IsRequired(false);        
     }
 }

LiteCharms.Features/Shop/Products/Entities/ProductPriceConfiguration.cs

@@ -7,7 +7,7 @@ public class ProductPriceConfiguration : IEntityTypeConfiguration<ProductPrice>
         builder.ToTable("ProductPrices");
 
         builder.HasKey(f => f.Id);
-        builder.Property(f => f.CreatedAt).ValueGeneratedOnAdd().HasDefaultValueSql("now()");
+        builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd().HasDefaultValueSql("now()");
         builder.Property(f => f.UpdatedAt).IsRequired(false);
         builder.Property(f => f.ProductId).IsRequired();
         builder.Property(f => f.Price).IsRequired().HasPrecision(18, 2);

LiteCharms.Features/Shop/Products/Models/CreateProductModel.cs

@@ -0,0 +1,42 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace LiteCharms.Features.Shop.Products.Models;
+
+public class CreateProductModel
+{
+    [MaxLength(128)]
+    [Required(ErrorMessage = "Product name is required.")]
+    public string? Name { get; set; }
+
+    [MaxLength(512)]
+    [Required(ErrorMessage = "Summary is required.")]
+    public string? Summary { get; set; }
+
+    [MaxLength(2048)]
+    [Required(ErrorMessage = "Description is required.")]
+    public string? Description { get; set; }
+
+    [Range(0.01, double.MaxValue, ErrorMessage = "Price must be greater than zero.")]
+    public decimal Price { get; set; }
+
+    [MaxLength(128)]
+    [Required(ErrorMessage = "Author metadata is required.")]
+    public string? Author { get; set; }
+
+    [Required(ErrorMessage = "Publication Date is required.")]
+    public DateTime PublishDate { get; set; } = DateTime.Today;
+
+    [MaxLength(255)]
+    [Required(ErrorMessage = "Copyright Information field is required.")]
+    public string? CopyrightInfo { get; set; }
+
+    [MaxLength(128)]
+    [Required(ErrorMessage = "ISBN code is required.")]
+    [RegularExpression(@"^(?=(?:\D*\d){10}(?:(?:\D*\d){3})?$)[\d-]+$", ErrorMessage = "Please enter a valid ISBN-10 or ISBN-13 string.")]
+    public string? Isbn { get; set; }
+
+    [Required(ErrorMessage = "Primary image is required.")]
+    public string? ImageUrl { get; set; }
+
+    public List<string> Thumbnails { get; set; } = [];
+}

LiteCharms.Features/Shop/Products/Models/Product.cs

@@ -4,6 +4,10 @@ public class Product
 {
     public Guid Id { get; set; }
 
+    public DateTime CreatedAt { get; set; }
+
+    public DateTime? UpdatedAt { get; set; }
+
     public string? Name { get; set; }
 
     public string? Summary { get; set; }
@@ -15,4 +19,6 @@ public class Product
     public string[]? Thumbnails { get; set; }
 
     public bool Active { get; set; }
+
+    public ProductMetadata? Metadata { get; set; }
 }

LiteCharms.Features/Shop/Products/Models/ProductMetadata.cs

@@ -0,0 +1,12 @@
+namespace LiteCharms.Features.Shop.Products.Models;
+
+public class ProductMetadata
+{
+    public string? Manufacturer { get; set; }
+
+    public string? ManufactureDate { get; set; }
+
+    public string? CopyrightInfo { get; set; }
+
+    public string? SerialNumber { get; set; }
+}

LiteCharms.Features/Shop/Products/Models/Records.cs

@@ -11,4 +11,6 @@ public record CreateProduct
     public required string ImageUrl { get; set; }
 
     public string[]? Thumbnails { get; set; }
+
+    public ProductMetadata? Metadata { get; set; }
 }

LiteCharms.Features/Shop/Products/ProductService.cs

@@ -1,7 +1,6 @@
 using LiteCharms.Features.Extensions;
 using LiteCharms.Features.Shop.Postgres;
 using LiteCharms.Features.Shop.Products.Models;
-using static LiteCharms.Features.Extensions.Timezones;
 
 namespace LiteCharms.Features.Shop.Products;
 
@@ -19,7 +18,7 @@ public class ProductService(IDbContextFactory<ShopDbContext> contextFactory)
                 return Result.Fail($"Could not find product price with ID {productPriceId}");
 
             price.Active = active;
-            price.UpdatedAt = SouthAfricanTimeZone.UtcNow();
+            price.UpdatedAt = DateTime.UtcNow;
 
             return await context.SaveChangesAsync(cancellationToken) > 0
                 ? Result.Ok()
@@ -68,10 +67,11 @@ public class ProductService(IDbContextFactory<ShopDbContext> contextFactory)
             var newProduct = context.Products.Add(new Entities.Product
             {
                 Name = request.Name,
-                Summary = request.Summary,                
+                Summary = request.Summary,
                 Description = request.Description,
                 ImageUrl = request.ImageUrl,
-                Thumbnails = request.Thumbnails
+                Thumbnails = request.Thumbnails,
+                Metadata = request.Metadata
             });
 
             return await context.SaveChangesAsync(cancellationToken) > 0
@@ -90,12 +90,12 @@ public class ProductService(IDbContextFactory<ShopDbContext> contextFactory)
         try
         {
             using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-                        
+
             var newProductPrice = context.ProductPrices.Add(new Entities.ProductPrice
             {
                 Price = price,
                 Discount = discount,
-                ProductId = productId                
+                ProductId = productId
             });
 
             return await context.SaveChangesAsync(cancellationToken) > 0
@@ -200,19 +200,19 @@ public class ProductService(IDbContextFactory<ShopDbContext> contextFactory)
                 return Result.Fail($"Could not find product price with ID {productPriceId}");
 
             existingPrice.Active = false;
-            existingPrice.UpdatedAt = SouthAfricanTimeZone.UtcNow();
+            existingPrice.UpdatedAt = DateTime.UtcNow;
 
             if (!(await context.SaveChangesAsync(cancellationToken) > 0))
                 return Result.Fail<Guid>($"Failed to deactivate existing price of ID {productPriceId}, try again later");
 
             var result = await CreateProductPriceAsync(existingPrice.ProductId, price, discount, cancellationToken);
 
-            if(result.IsFailed)
+            if (result.IsFailed)
             {
                 var deactivatedPrice = await context.ProductPrices.FirstOrDefaultAsync(p => p.Id == productPriceId, cancellationToken);
 
                 existingPrice.Active = true;
-                existingPrice.UpdatedAt = SouthAfricanTimeZone.UtcNow();
+                existingPrice.UpdatedAt = DateTime.UtcNow;
 
                 return await context.SaveChangesAsync(cancellationToken) > 0
                     ? Result.Fail<Guid>("Reverted to old price, creation of new price failed")
@@ -226,4 +226,52 @@ public class ProductService(IDbContextFactory<ShopDbContext> contextFactory)
             return Result.Fail(new Error(ex.Message).CausedBy(ex));
         }
     }
+
+    public async ValueTask<Result> SetProductPriceStatusAsync(Guid productPriceId, bool active, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+
+            var productPrice = await context.ProductPrices.FirstOrDefaultAsync(p => p.Id == productPriceId, cancellationToken);
+
+            if (productPrice is null)
+                return Result.Fail($"Could not find product price with ID {productPriceId}");
+
+            productPrice.Active = active;
+            productPrice.UpdatedAt = DateTime.UtcNow;
+
+            return await context.SaveChangesAsync(cancellationToken) > 0
+                ? Result.Ok()
+                : Result.Fail($"Failed to change product price status by ID {productPriceId}");
+        }
+        catch (Exception ex)
+        {
+            return Result.Fail(new Error(ex.Message).CausedBy(ex));
+        }
+    }
+
+    public async ValueTask<Result> UpdateProductMetadataAsync(Guid productId, ProductMetadata metadata, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+            
+            var product = await context.Products.FirstOrDefaultAsync(p => p.Id == productId, cancellationToken);
+            
+            if (product is null)
+                return Result.Fail($"Could not find product with ID {productId}");
+            
+            product.Metadata = metadata;
+            product.UpdatedAt = DateTime.UtcNow;
+
+            return await context.SaveChangesAsync(cancellationToken) > 0
+                ? Result.Ok()
+                : Result.Fail($"Failed to update product metadata by ID {productId}");
+        }
+        catch (Exception ex)
+        {
+            return Result.Fail(new Error(ex.Message).CausedBy(ex));
+        }
+    }
 }

LiteCharms.Features/Shop/Quotes/QuoteService.cs

@@ -2,7 +2,6 @@
 using LiteCharms.Features.Models;
 using LiteCharms.Features.Shop.Postgres;
 using LiteCharms.Features.Shop.Quotes.Models;
-using static LiteCharms.Features.Extensions.Timezones;
 
 namespace LiteCharms.Features.Shop.Quotes;
 
@@ -26,6 +25,7 @@ public class QuoteService(IDbContextFactory<ShopDbContext> contextFactory)
                 return Result.Fail(new Error($"Quote with id {quoteId} is already assigned to order with id {orderId}"));
 
             quote.OrderId = orderId;
+            quote.UpdatedAt = DateTime.UtcNow;
 
             return await context.SaveChangesAsync(cancellationToken) > 0
                 ? Result.Ok()
@@ -52,6 +52,7 @@ public class QuoteService(IDbContextFactory<ShopDbContext> contextFactory)
                 return Result.Fail(new Error($"Shopping Cart with id {shoppingCartId} not found"));
 
             quote.ShoppingCartId = shoppingCartId;
+            quote.UpdatedAt = DateTime.UtcNow;
 
             return await context.SaveChangesAsync(cancellationToken) > 0
                 ? Result.Ok()
@@ -140,7 +141,7 @@ public class QuoteService(IDbContextFactory<ShopDbContext> contextFactory)
                 return Result.Fail(new Error("Quote not found."));
 
             quote.Status = status;
-            quote.UpdatedAt = SouthAfricanTimeZone.UtcNow();
+            quote.UpdatedAt = DateTime.UtcNow;
 
             return await context.SaveChangesAsync(cancellationToken) > 0
                 ? Result.Ok()

LiteCharms.Features/Shop/ShoppingCarts/Entities/ShoppingCartItemConfiguration.cs

@@ -1,6 +1,4 @@
-using LiteCharms.Features.Shop.Products.Entities;
-
-namespace LiteCharms.Features.Shop.ShoppingCarts.Entities;
+namespace LiteCharms.Features.Shop.ShoppingCarts.Entities;
 
 public class ShoppingCartItemConfiguration : IEntityTypeConfiguration<ShoppingCartItem>
 {
@@ -15,13 +13,13 @@ public class ShoppingCartItemConfiguration : IEntityTypeConfiguration<ShoppingCa
         builder.Property(f => f.ShoppingCartId).IsRequired();
         builder.Property(f => f.ProductPriceId).IsRequired();
 
-        builder.HasOne<ShoppingCart>()
+        builder.HasOne(f => f.ShoppingCart)
             .WithMany(s => s.ShoppingCartItems)
             .HasForeignKey(f => f.ShoppingCartId)
             .IsRequired()
             .OnDelete(DeleteBehavior.Cascade);
 
-        builder.HasOne<ProductPrice>()
+        builder.HasOne(f => f.ProductPrice)
                .WithMany()
                .HasForeignKey(f => f.ProductPriceId)
                .IsRequired()

LiteCharms.Features/Shop/ShoppingCarts/ShoppingCartService.cs

@@ -1,7 +1,6 @@
 using LiteCharms.Features.Extensions;
 using LiteCharms.Features.Shop.Postgres;
 using LiteCharms.Features.Shop.ShoppingCarts.Models;
-using static LiteCharms.Features.Extensions.Timezones;
 
 namespace LiteCharms.Features.Shop.ShoppingCarts;
 
@@ -284,7 +283,7 @@ public class ShoppingCartService(IDbContextFactory<ShopDbContext> contextFactory
                 return Result.Fail($"Shopping cart item could not be found with id {shoppingCartItemId}");
 
             item.Quantity = quantity;
-            item.UpdatedAt = SouthAfricanTimeZone.UtcNow();
+            item.UpdatedAt = DateTime.UtcNow;
 
             return await context.SaveChangesAsync(cancellationToken) > 0
                 ? Result.Ok()