litecharms/components
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 114 Wiki Activity

Retructured solution

Browse Source
This commit is contained in:
Khwezi Mngoma
2026-05-13 20:06:24 +02:00
parent 26075cd9a7
commit a42c51d7b2
231 changed files with 1618 additions and 1408 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LiteCharms.Abstractions/LiteCharms.Abstractions.csproj
-40
View File
@@ -1,40 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\LiteCharms.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<!-- Nuget Package Details -->
<PropertyGroup>
<PackageId>LiteCharms.Abstractions</PackageId>
<Version>1.0.20</Version>
<Authors>Khwezi Mngoma</Authors>
<Company>Lite Charms (PTY) Ltd</Company>
<Description>Shared abstractions for Lite Charms applications.</Description>
<PackageProjectUrl>https://gitea.khongisa.co.za/litecharms/components</PackageProjectUrl>
<RepositoryUrl>https://gitea.khongisa.co.za/litecharms/components.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageTags>utility;dotnet</PackageTags>
<PackageIcon>icon.png</PackageIcon>
</PropertyGroup>
<ItemGroup>
<None Include="..\LICENSE" Pack="true" PackagePath="\" />
<None Include="..\icon.png" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FluentResults" Version="4.0.0" />
<PackageReference Include="Mediator.Abstractions" Version="3.0.2" />
<Using Include="Mediator" />
<Using Include="FluentResults" />
<Using Include="System.Threading.Channels" />
</ItemGroup>
</Project>
LiteCharms.Entities/Configuration/OrderConfiguration.cs
-32
View File
@@ -1,32 +0,0 @@
namespace LiteCharms.Entities.Configuration;
public class OrderConfiguration : IEntityTypeConfiguration<Order>
{
public void Configure(EntityTypeBuilder<Order> builder)
{
builder.ToTable(nameof(Order));
builder.HasKey(f => f.Id);
builder.Property(f => f.CreatedAt).ValueGeneratedOnAdd();
builder.Property(f => f.UpdatedAt).IsRequired(false).ValueGeneratedOnUpdate();
builder.Property(f => f.CustomerId).IsRequired();
builder.Property(f => f.QuoteId).IsRequired(false);
builder.Property(f => f.RefundId).IsRequired(false);
builder.Property(f => f.ShoppingCartId).IsRequired();
builder.Property(f => f.Status).HasConversion<int>().IsRequired();
builder.Property(f => f.Requirements).HasColumnType("jsonb").IsRequired(false);
builder.Property(f => f.Notes).HasColumnType("jsonb").IsRequired(false);
builder.Property(f => f.Terms).HasColumnType("jsonb").IsRequired(false);
builder.Property(f => f.DepositRequired);
builder.HasOne(f => f.Quote)
.WithOne(f => f.Order)
.HasForeignKey<Order>(f => f.QuoteId)
.OnDelete(DeleteBehavior.Restrict);
builder.HasOne(f => f.Customer)
.WithMany(f => f.Orders)
.HasForeignKey(f => f.CustomerId)
.OnDelete(DeleteBehavior.Restrict);
}
}
LiteCharms.Entities/Configuration/PackageConfirguration.cs
-16
View File
@@ -1,16 +0,0 @@
namespace LiteCharms.Entities.Configuration;
public class PackageConfirguration : IEntityTypeConfiguration<Package>
{
public void Configure(EntityTypeBuilder<Package> builder)
{
builder.ToTable(nameof(Package));
builder.HasKey(f => f.Id);
builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd();
builder.Property(f => f.UpdatedAt).IsRequired(false).ValueGeneratedOnUpdate();
builder.Property(f => f.Name).IsRequired();
builder.Property(f => f.Description).IsRequired();
builder.Property(f => f.Active);
}
}
LiteCharms.Entities/Configuration/ProductConfiguration.cs
-14
View File
@@ -1,14 +0,0 @@
namespace LiteCharms.Entities.Configuration;
public class ProductConfiguration : IEntityTypeConfiguration<Product>
{
public void Configure(EntityTypeBuilder<Product> builder)
{
builder.ToTable(nameof(Product));
builder.HasKey(f => f.Id);
builder.Property(f => f.Name).IsRequired();
builder.Property(f => f.Description).IsRequired();
builder.Property(f => f.Active).HasDefaultValue(true);
}
}
LiteCharms.Entities/Configuration/QuoteConfiguration.cs
-23
View File
@@ -1,23 +0,0 @@
namespace LiteCharms.Entities.Configuration;
public class QuoteConfiguration : IEntityTypeConfiguration<Quote>
{
public void Configure(EntityTypeBuilder<Quote> builder)
{
builder.ToTable(nameof(Quote));
builder.HasKey(f => f.Id);
builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd();
builder.Property(f => f.UpdatedAt).IsRequired(false).ValueGeneratedOnUpdate();
builder.Property(f => f.ExpiredAt).IsRequired(false);
builder.Property(f => f.CustomerId).IsRequired();
builder.Property(f => f.Status).IsRequired().HasConversion<int>();
builder.Property(f => f.ShoppingCartId).IsRequired();
builder.Property(f => f.Reason).IsRequired(false);
builder.HasOne(f => f.Customer)
.WithMany()
.HasForeignKey(f => f.CustomerId)
.OnDelete(DeleteBehavior.Cascade);
}
}
LiteCharms.Entities/Configuration/ShoppingCartConfiguration.cs
-31
View File
@@ -1,31 +0,0 @@
namespace LiteCharms.Entities.Configuration;
public class ShoppingCartConfiguration : IEntityTypeConfiguration<ShoppingCart>
{
public void Configure(EntityTypeBuilder<ShoppingCart> builder)
{
builder.ToTable(nameof(ShoppingCart));
builder.HasKey(f => f.Id);
builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd();
builder.Property(f => f.UpdatedAt).IsRequired(false).ValueGeneratedOnUpdate();
builder.Property(f => f.CustomerId).IsRequired(false);
builder.Property(f => f.OrderId).IsRequired(false);
builder.Property(f => f.QuoteId).IsRequired(false);
builder.HasOne(f => f.Customer)
.WithMany(c => c.ShoppingCarts)
.HasForeignKey(f => f.CustomerId)
.OnDelete(DeleteBehavior.NoAction);
builder.HasOne(f => f.Order)
.WithOne(o => o.ShoppingCart)
.HasForeignKey<Order>(o => o.ShoppingCartId)
.OnDelete(DeleteBehavior.NoAction);
builder.HasOne(f => f.Quote)
.WithOne(o => o.ShoppingCart)
.HasForeignKey<Quote>(o => o.ShoppingCartId)
.OnDelete(DeleteBehavior.NoAction);
}
}
LiteCharms.Entities/Configuration/ShoppingCartItemConfiguration.cs
-25
View File
@@ -1,25 +0,0 @@
namespace LiteCharms.Entities.Configuration;
public class ShoppingCartItemConfiguration : IEntityTypeConfiguration<ShoppingCartItem>
{
public void Configure(EntityTypeBuilder<ShoppingCartItem> builder)
{
builder.ToTable(nameof(ShoppingCartItem));
builder.HasKey(f => f.Id);
builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd();
builder.Property(f => f.UpdatedAt).IsRequired(false).ValueGeneratedOnUpdate();
builder.Property(f => f.Quantity).IsRequired().HasDefaultValue(1);
builder.Property(f => f.ProductPriceId).IsRequired();
builder.HasOne(f => f.ProductPrice)
.WithMany()
.HasForeignKey(f => f.ProductPriceId)
.OnDelete(DeleteBehavior.NoAction);
builder.HasOne(f => f.ShoppingCart)
.WithMany(f => f.ShoppingCartItems)
.HasForeignKey(f => f.ShoppingCartId)
.OnDelete(DeleteBehavior.NoAction);
}
}
LiteCharms.Entities/LiteCharms.Entities.csproj
-45
View File
@@ -1,45 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\LiteCharms.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<!-- Nuget Package Details -->
<PropertyGroup>
<PackageId>LiteCharms.Entities</PackageId>
<Version>1.0.20</Version>
<Authors>Khwezi Mngoma</Authors>
<Company>Lite Charms (PTY) Ltd</Company>
<Description>Shared entities for Lite Charms applications.</Description>
<PackageProjectUrl>https://gitea.khongisa.co.za/litecharms/components</PackageProjectUrl>
<RepositoryUrl>https://gitea.khongisa.co.za/litecharms/components.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageTags>utility;dotnet</PackageTags>
<PackageIcon>icon.png</PackageIcon>
</PropertyGroup>
<ItemGroup>
<None Include="..\LICENSE" Pack="true" PackagePath="\"/>
<None Include="..\icon.png" Pack="true" PackagePath="\" />
</ItemGroup>
<!-- Database -->
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.7" />
<!-- Global Usings -->
<Using Include="Microsoft.EntityFrameworkCore" />
<Using Include="Microsoft.EntityFrameworkCore.Metadata.Builders" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LiteCharms.Models\LiteCharms.Models.csproj" />
</ItemGroup>
</Project>
LiteCharms.Entities/Order.cs
-15
View File
@@ -1,15 +0,0 @@
using LiteCharms.Entities.Configuration;
namespace LiteCharms.Entities;
[EntityTypeConfiguration<OrderConfiguration, Order>]
public class Order : Models.Order
{
public virtual OrderRefund? Refund { get; set; }
public virtual Customer? Customer { get; set; }
public virtual Quote? Quote { get; set; }
public virtual ShoppingCart? ShoppingCart { get; set; }
}
LiteCharms.Entities/PackageItem.cs
-9
View File
@@ -1,9 +0,0 @@
using LiteCharms.Entities.Configuration;
namespace LiteCharms.Entities;
[EntityTypeConfiguration<PackageItemConfiguration, PackageItem>]
public class PackageItem : Models.PackageItem
{
public virtual Package? Package { get; set; }
}
LiteCharms.Extensions/Email.cs
-13
View File
@@ -1,13 +0,0 @@
using LiteCharms.Models.Configuraton.Email;
namespace LiteCharms.Extensions;
public static class Email
{
public static IServiceCollection AddEmailServices(this IServiceCollection services, IConfiguration configuration)
{
services.Configure<SmtpSettings>(configuration.GetSection("Email"));
return services;
}
}
LiteCharms.Extensions/LiteCharms.Extensions.csproj
-113
View File
@@ -1,113 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\LiteCharms.snk</AssemblyOriginatorKeyFile>
<JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
</PropertyGroup>
<!-- Warnings And Exclusions -->
<PropertyGroup>
<NoWarn>$(NoWarn);MA0004</NoWarn>
<!-- https://github.com/dotnet/aspnetcore/issues/50836 -->
<NoWarn>$(NoWarn);AD0001</NoWarn>
<PublishTrimmed>true</PublishTrimmed>
<NoWarn>$(NoWarn);IL2080;IL2065;IL2075;IL2087;IL2057;IL2060;IL2070;IL2067;IL2072;IL2026;IL2104</NoWarn>
<NoWarn>$(NoWarn);IL2110;IL2111</NoWarn>
</PropertyGroup>
<!-- Nuget Package Details -->
<PropertyGroup>
<PackageId>LiteCharms.Extensions</PackageId>
<Version>1.0.20</Version>
<Authors>Khwezi Mngoma</Authors>
<Company>Lite Charms (PTY) Ltd</Company>
<Description>Extension components for Lite Charms applications.</Description>
<PackageProjectUrl>https://gitea.khongisa.co.za/litecharms/components</PackageProjectUrl>
<RepositoryUrl>https://gitea.khongisa.co.za/litecharms/components.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageTags>utility;dotnet</PackageTags>
<PackageIcon>icon.png</PackageIcon>
</PropertyGroup>
<ItemGroup>
<None Include="..\LICENSE" Pack="true" PackagePath="\" />
<None Include="..\icon.png" Pack="true" PackagePath="\" />
</ItemGroup>
<!-- Health Checks -->
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Data" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.7" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.7" />
<PackageReference Include="Quartz.AspNetCore" Version="3.18.1" />
<PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.18.1" />
<!-- Global Usings -->
<Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
<Using Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" />
</ItemGroup>
<!-- Open Telemetry -->
<ItemGroup>
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
<!-- Global Usings -->
<Using Include="OpenTelemetry.Resources" />
<Using Include="OpenTelemetry.Exporter" />
<Using Include="OpenTelemetry.Logs" />
<Using Include="OpenTelemetry.Metrics" />
<Using Include="OpenTelemetry.Trace" />
</ItemGroup>
<!-- Database -->
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
<!-- Global Usings -->
<Using Include="Npgsql" />
<Using Include="Microsoft.EntityFrameworkCore" />
<Using Include="Microsoft.EntityFrameworkCore.Design" />
<Using Include="Microsoft.EntityFrameworkCore.Metadata.Builders" />
</ItemGroup>
<!-- Shared Usings -->
<ItemGroup>
<Using Include="Quartz" />
<Using Include="Microsoft.AspNetCore.Builder" />
<Using Include="Microsoft.Extensions.Configuration" />
<Using Include="Microsoft.Extensions.DependencyInjection" />
<Using Include="Microsoft.Extensions.Logging" />
</ItemGroup>
<!-- Project References -->
<ItemGroup>
<ProjectReference Include="..\LiteCharms.Entities\LiteCharms.Entities.csproj" />
<ProjectReference Include="..\LiteCharms.Infrastructure\LiteCharms.Infrastructure.csproj" />
<ProjectReference Include="..\LiteCharms.Models\LiteCharms.Models.csproj" />
</ItemGroup>
</Project>
LiteCharms.Features.Tests/CommonFixture.cs
+34
View File
@@ -0,0 +1,34 @@
using LiteCharms.Extensions;
namespace LiteCharms.Features.Tests;
public class CommonFixture : IDisposable
{
public IConfiguration Configuration { get; set; }
public IServiceProvider Services { get; set; }
public IMediator Mediator { get; set; }
public CommonFixture()
{
Configuration = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory())
.AddJsonFile("appsettings.json")
.AddUserSecrets<CommonFixture>()
.AddEnvironmentVariables()
.Build();
Services = new ServiceCollection()
.AddMediator()
.AddLogging()
.AddEmailServiceBus()
.AddShopDatabase(Configuration)
.AddEmailServices(Configuration)
.BuildServiceProvider();
Mediator = Services.GetRequiredService<IMediator>();
}
public void Dispose() { }
}
LiteCharms.Features.Tests/LiteCharms.Features.Tests.csproj
+50
View File
@@ -0,0 +1,50 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<UserSecretsId>62fa604a-1340-4edb-9ddd-3305fcf46fca</UserSecretsId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="coverlet.collector" Version="10.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<!-- Global Usings -->
<ItemGroup>
<Using Include="Mediator"/>
<Using Include="Xunit.Abstractions"/>
<Using Include="Microsoft.Extensions.DependencyInjection"/>
<Using Include="Microsoft.Extensions.Configuration"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
</ItemGroup>
<ItemGroup>
<Using Include="Xunit" />
</ItemGroup>
<ItemGroup>
<None Update="appsettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
LiteCharms.Features.Tests/NotificationsFeatureTests.cs
+19
View File
@@ -0,0 +1,19 @@
using LiteCharms.Features.Notifications.Commands;
namespace LiteCharms.Features.Tests;
public class NotificationsFeatureTests(CommonFixture fixture) : IClassFixture<CommonFixture>
{
[Fact]
public async Task CreateNotificationCommand_ShouldSucceed()
{
var command = CreateNotification.Create(Models.NotificationDirection.Outgoing, "UnitTest", "khwezi@mngoma.co.za",
"CreateNotificationCommand_ShouldSucceed Test", "Test Message", Models.NotificationPlatforms.Email, Models.Priorities.Medium,
"Khngisa Shop - Test", "shop@litecharms.co.za", Guid.NewGuid().ToString(), Models.CorrelationIdTypes.None,
true, false);
var result = await fixture.Mediator.Send(command);
Assert.True(result.IsSuccess);
}
}
LiteCharms.Features.Tests/appsettings.json
+22
View File
@@ -0,0 +1,22 @@
{
"Email": {
"Credentials": {
"Username": "shop@litecharms.co.za"
},
"Port": 465,
"Host": "mail.litecharms.co.za",
"UseSsl": true
},
"Monitoring": {
"ApiKey": "",
"Address": "http://aspire-dashboard-service.aspire.svc.cluster.local:18889",
"ServiceName": "LiteCharms.LeadGenerator"
},
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*"
}
LiteCharms.Abstractions/EventBase.cs → LiteCharms.Features/Abstractions/EventBase.cs
+3 -2
View File
@@ -1,6 +1,7 @@
using static LiteCharms.Abstractions.Timezones; using LiteCharms.Features.Extensions;
using static LiteCharms.Features.Extensions.Timezones;
namespace LiteCharms.Abstractions; namespace LiteCharms.Features.Abstractions;
public abstract class EventBase public abstract class EventBase
{ {
LiteCharms.Abstractions/IEvent.cs → LiteCharms.Features/Abstractions/IEvent.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace LiteCharms.Abstractions; namespace LiteCharms.Features.Abstractions;
public interface IEvent : INotification public interface IEvent : INotification
{ {
LiteCharms.Features/Email/Commands/Handlers/SendEmailCommandHandler.cs
-61
View File
@@ -1,61 +0,0 @@
using LiteCharms.Features.Email.Commands;
using LiteCharms.Models.Configuraton.Email;
namespace LiteCharms.Features.Email.Commands.Handlers;
public class SendEmailCommandHandler(IOptions<SmtpSettings> smtpOptions) : IRequestHandler<SendEmailCommand, Result>
{
public async ValueTask<Result> Handle(SendEmailCommand request, CancellationToken cancellationToken)
{
try
{
var settings = smtpOptions.Value;
if(settings == null)
return Result.Fail(new Error("SMTP settings are not configured."));
if(settings.Credentials == null)
return Result.Fail(new Error("SMTP credentials are not configured."));
if(string.IsNullOrWhiteSpace(settings?.Credentials.Username) || string.IsNullOrWhiteSpace(settings.Credentials.Password))
return Result.Fail(new Error("SMTP credentials are incomplete."));
if(string.IsNullOrWhiteSpace(settings.Host) || settings.Port == 0)
return Result.Fail(new Error("SMTP host and port must be configured."));
var message = new MimeMessage();
message.From.Add(new MailboxAddress(request.SenderName, request.From!));
message.To.Add(new MailboxAddress(request.RecipientName, request.To!));
message.Subject = request.Subject!;
var bodyBuilder = new BodyBuilder();
if(request.Attachment?.Length > 0 && !string.IsNullOrEmpty(request.AttachmentFileName))
bodyBuilder.Attachments.Add(request.AttachmentFileName!, request.Attachment!, cancellationToken);
if (!request.IsHtml) bodyBuilder.TextBody = request.Message;
if (request.IsHtml) bodyBuilder.HtmlBody = request.Message;
message.Body = bodyBuilder.ToMessageBody();
using var client = new SmtpClient();
await client.ConnectAsync(settings.Host!, settings.Port, settings.UseSsl, cancellationToken);
await client.AuthenticateAsync(settings.Credentials!.Username!, settings.Credentials.Password!, cancellationToken);
var response = await client.SendAsync(message, cancellationToken);
bool emailSent = response.Contains("OK", StringComparison.InvariantCultureIgnoreCase);
await client.DisconnectAsync(true, cancellationToken);
return emailSent
? Result.Ok()
: Result.Fail(new Error("Failed to send email. SMTP response: " + response));
}
catch (Exception ex)
{
return Result.Fail(new Error(ex.Message).CausedBy(ex));
}
}
}
LiteCharms.Features/Email/Commands/SendEmailCommand.cs
-79
View File
@@ -1,79 +0,0 @@
namespace LiteCharms.Features.Email.Commands;
public class SendEmailCommand : IRequest<Result>
{
public string? From { get; set; }
public string? SenderName { get; set; }
public string? To { get; set; }
public string? RecipientName { get; set; }
public string? Subject { get; set; }
public string? Message { get; set; }
public bool IsHtml { get; set; }
public Stream? Attachment { get; set; }
public string? AttachmentFileName { get; set; }
private SendEmailCommand(string from, string senderName, string to, string recipientName, string subject, string message, bool isHtml = false, Stream? attachment = null, string? attachmentFileName = null)
{
From = from;
To = to;
Subject = subject;
Message = message;
IsHtml = isHtml;
Attachment = attachment;
AttachmentFileName = attachmentFileName;
SenderName = senderName;
RecipientName = recipientName;
}
public static SendEmailCommand Create(string from, string senderName, string to, string recipientName, string subject, string message, bool isHtml = false, Stream? attachment = null, string? attachmentFileName = null)
{
if (string.IsNullOrWhiteSpace(from))
throw new ArgumentException("From address is required.");
if (string.IsNullOrWhiteSpace(senderName))
throw new ArgumentException("Sender name is required.");
if (!string.IsNullOrWhiteSpace(senderName) && senderName?.Length > 255)
throw new ArgumentException("Sender name cannot exceed 255 characters.");
if (string.IsNullOrWhiteSpace(to))
throw new ArgumentException("To address is required.");
if (string.IsNullOrWhiteSpace(recipientName))
throw new ArgumentException("Recipient name is required.");
if (!string.IsNullOrWhiteSpace(recipientName) && recipientName?.Length > 255)
throw new ArgumentException("Recipient name cannot exceed 255 characters.");
if (string.IsNullOrWhiteSpace(subject))
throw new ArgumentException("Subject is required.");
if (!string.IsNullOrWhiteSpace(subject) && subject?.Length > 2048)
throw new ArgumentException("Subject cannot exceed 2048 characters.");
if (string.IsNullOrWhiteSpace(message))
throw new ArgumentException("Message is required.");
if (message.Length > 10485760)
throw new ArgumentException("Message cannot exceed 10 MB.");
if (attachment != null && string.IsNullOrWhiteSpace(attachmentFileName))
throw new ArgumentException("Attachment file name must be provided when an attachment is included.");
if (attachment is not null && attachment.Length > 10485760)
throw new ArgumentException("Attachment cannot exceed 10 MB.");
if (!string.IsNullOrWhiteSpace(attachmentFileName) && attachmentFileName.Length > 255)
throw new ArgumentException("Attachment file name cannot exceed 255 characters.");
return new(from, senderName!, to, recipientName!, subject!, message, isHtml, attachment, attachmentFileName);
}
}
LiteCharms.Models/Configuraton/Email/Account.cs → LiteCharms.Features/Email/Configuration/Account.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace LiteCharms.Models.Configuraton.Email; namespace LiteCharms.Features.Email.Configuration;
public class Account public class Account
{ {
LiteCharms.Models/Configuraton/Email/SmtpSettings.cs → LiteCharms.Features/Email/Configuration/SmtpSettings.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace LiteCharms.Models.Configuraton.Email; namespace LiteCharms.Features.Email.Configuration;
public class SmtpSettings public class SmtpSettings
{ {
LiteCharms.Features/Email/EmailService.cs
+192
View File
@@ -0,0 +1,192 @@
using LiteCharms.Features.Email.Configuration;
using LiteCharms.Features.Email.Extensions;
using LiteCharms.Features.Email.Models;
using LiteCharms.Features.Shop;
namespace LiteCharms.Features.Email;
public class EmailService(IOptions<SmtpSettings> options) : IEmailService
{
private readonly SmtpSettings settings = options.Value;
private readonly SmtpClient client = new();
private readonly int sendMaxCount = 10;
private int sendCount = 0;
public EmailStatuses Status { get; private set; } = EmailStatuses.Disconnected;
public async Task<Result<Response>> SendEmailAsync(Message message, CancellationToken cancellationToken = default)
{
using var activity = EmailTelemetry.Source.StartActivity("Email Send");
activity?.SetTag("email.recipient", message.Recipient?.Address);
try
{
if (Status != EmailStatuses.Connected)
{
activity?.SetStatus(ActivityStatusCode.Error, "Disconnected");
return Result.Fail<Response>("Smtp service is disconnected.");
}
var email = new MimeMessage();
email.From.Add(new MailboxAddress(message.Sender!.Name, message.Sender.Address!));
email.To.Add(new MailboxAddress(message.Recipient!.Name, message.Recipient!.Address!));
email.Subject = message.Subject!;
var bodyBuilder = new BodyBuilder();
foreach (var attachment in message.Body?.Attachments!)
bodyBuilder.Attachments.Add(attachment.Name!, attachment.FileStream!, cancellationToken);
if (!message.Body.Properties.IsHtml) bodyBuilder.TextBody = message.Body.Message;
if (message.Body.Properties.IsHtml) bodyBuilder.HtmlBody = message.Body.Message;
email.Body = bodyBuilder.ToMessageBody();
var response = await client.SendAsync(email, cancellationToken);
bool emailSent = response.Contains("OK", StringComparison.InvariantCultureIgnoreCase);
message.Dispose();
Interlocked.Increment(ref sendCount);
if (sendCount % sendMaxCount == 0)
{
using var delayActivity = EmailTelemetry.Source.StartActivity("Rate Limit Pause");
sendCount = 0;
await Task.Delay(1000, cancellationToken);
}
if (emailSent)
{
EmailTelemetry.EmailsSent.Add(1, new TagList { { "host", settings.Host } });
return Result.Ok(Response.Create(EmailStatuses.Success));
}
await DisconnectAsync(cancellationToken);
if (response.Contains("421"))
{
Status = EmailStatuses.TooManyConnections;
return Result.Fail<Response>(response);
}
if (response.Contains("451"))
{
Status = EmailStatuses.ConnectionAborted;
return Result.Fail<Response>(response);
}
EmailTelemetry.EmailsFailed.Add(1, new TagList { { "error_message", response } });
Status = EmailStatuses.Disconnected;
return Result.Fail<Response>("General error, disconnected");
}
catch (Exception ex)
{
activity?.SetStatus(ActivityStatusCode.Error, ex.Message);
activity?.AddException(ex);
EmailTelemetry.EmailsFailed.Add(1, new TagList { { "exception", ex.GetType().Name } });
return Result.Fail(new Error(ex.Message).CausedBy(ex));
}
}
public async Task<Result<Response>> ConnectAsync(CancellationToken cancellationToken = default)
{
using var activity = EmailTelemetry.Source.StartActivity("Email Connect");
activity?.SetTag("email.smtp.connect", settings.Host);
try
{
if (Status is EmailStatuses.Connected) return Result.Ok(Response.Create(Status));
await client.ConnectAsync(settings.Host!, settings.Port, settings.UseSsl, cancellationToken);
await client.AuthenticateAsync(settings.Credentials!.Username!, settings.Credentials.Password!, cancellationToken);
Status = EmailStatuses.Connected;
activity?.SetStatus(ActivityStatusCode.Ok, "Connected");
return Result.Ok(Response.Create(Status));
}
catch (MailKit.ProtocolException ex)
{
activity?.SetStatus(ActivityStatusCode.Error, ex.Message);
activity?.AddException(ex);
EmailTelemetry.EmailsFailed.Add(1, new TagList { { "exception", ex.GetType().Name } });
Status = EmailStatuses.ProtocolError;
return Result.Fail<Response>(new Error(ex.Message).CausedBy(ex));
}
catch (Exception ex) when (ex is MailKit.Security.SslHandshakeException || ex is MailKit.Security.AuthenticationException)
{
activity?.SetStatus(ActivityStatusCode.Error, ex.Message);
activity?.AddException(ex);
EmailTelemetry.EmailsFailed.Add(1, new TagList { { "exception", ex.GetType().Name } });
Status = EmailStatuses.AuthenticationError;
return Result.Fail<Response>(new Error(ex.Message).CausedBy(ex));
}
catch (Exception ex)
{
activity?.SetStatus(ActivityStatusCode.Error, ex.Message);
activity?.AddException(ex);
EmailTelemetry.EmailsFailed.Add(1, new TagList { { "exception", ex.GetType().Name } });
Status = EmailStatuses.GeneralError;
return Result.Fail<Response>(new Error(ex.Message).CausedBy(ex));
}
}
public async Task<Result> DisconnectAsync(CancellationToken cancellationToken = default)
{
using var activity = EmailTelemetry.Source.StartActivity("Email Disconnect");
activity?.SetTag("email.smtp.disconnect", settings.Host);
try
{
if (Status is EmailStatuses.Disconnected) return Result.Ok();
await client.DisconnectAsync(true, cancellationToken);
activity?.SetStatus(ActivityStatusCode.Ok, "Disconnected");
Status = EmailStatuses.Disconnected;
return Result.Ok();
}
catch (Exception ex)
{
activity?.SetStatus(ActivityStatusCode.Error, ex.Message);
activity?.AddException(ex);
EmailTelemetry.EmailsFailed.Add(1, new TagList { { "exception", ex.GetType().Name } });
Status = EmailStatuses.GeneralError;
return Result.Fail(new Error(ex.Message).CausedBy(ex));
}
}
public void Dispose()
{
client.Dispose();
GC.SuppressFinalize(this);
}
}
LiteCharms.Features/Email/Events/Handlers/SendShopEmailEnquiryEventHandler.cs
+8 -4
View File
@@ -1,18 +1,22 @@
using LiteCharms.Features.Notifications.Commands; using LiteCharms.Features.Notifications.Commands;
using static LiteCharms.Abstractions.Constants; using LiteCharms.Features.Shop;
using static LiteCharms.Features.Email.Extensions.Constants;
namespace LiteCharms.Features.Email.Events.Handlers; namespace LiteCharms.Features.Email.Events.Handlers;
// TODO: Inject the INotificationService
public class SendShopEmailEnquiryEventHandler(ISender mediator) : public class SendShopEmailEnquiryEventHandler(ISender mediator) :
INotificationHandler<SendShopEmailEnquiryEvent> INotificationHandler<SendShopEmailEnquiryEvent>
{ {
public async ValueTask Handle(SendShopEmailEnquiryEvent notification, CancellationToken cancellationToken) public async ValueTask Handle(SendShopEmailEnquiryEvent notification, CancellationToken cancellationToken)
{ {
var command = CreateNotificationCommand.Create(Models.NotificationDirection.Outgoing, notification.SenderName!, // TODO: Refactor this to use the NotificationService
notification.SenderAddress!, notification.Subject!, notification.Message!, Models.NotificationPlatforms.Email, var command = CreateNotification.Create(NotificationDirection.Outgoing, notification.SenderName!,
notification.SenderAddress!, notification.Subject!, notification.Message!, NotificationPlatforms.Email,
notification.Priority, ShopEmailFromName, ShopEmailFromAddress, Guid.CreateVersion7().ToString(), notification.Priority, ShopEmailFromName, ShopEmailFromAddress, Guid.CreateVersion7().ToString(),
Models.CorrelationIdTypes.None, isInternal: true, isHtml: false); CorrelationIdTypes.None, isInternal: true, isHtml: false);
// TODO: Remove, deprecated
await mediator.Send(command, cancellationToken); await mediator.Send(command, cancellationToken);
} }
} }
LiteCharms.Features/Email/Events/SendShopEmailEnquiryEvent.cs
+2 -2
View File
@@ -1,5 +1,5 @@
using LiteCharms.Abstractions; using LiteCharms.Features.Abstractions;
using LiteCharms.Models; using LiteCharms.Features.Shop;
namespace LiteCharms.Features.Email.Events; namespace LiteCharms.Features.Email.Events;
LiteCharms.Features/Email/Extensions/Constants.cs
+8
View File
@@ -0,0 +1,8 @@
namespace LiteCharms.Features.Email.Extensions;
public static class Constants
{
public const string ShopSchedulerName = "shop";
public const string ShopEmailFromName = "Khongisa Shop";
public const string ShopEmailFromAddress = "shop@litecharms.co.za";
}
LiteCharms.Features/Email/Extensions/EmailTelemetry.cs
+9
View File
@@ -0,0 +1,9 @@
namespace LiteCharms.Features.Email.Extensions;
public static class EmailTelemetry
{
public static readonly ActivitySource Source = new("LiteCharms.EmailService");
public static readonly Meter Meter = new("LiteCharms.EmailService");
public static readonly Counter<long> EmailsSent = Meter.CreateCounter<long>("emails_sent_total", "count", "Total successful emails sent");
public static readonly Counter<long> EmailsFailed = Meter.CreateCounter<long>("emails_failed_total", "count", "Total failed email attempts");
}
LiteCharms.Features/Email/Extensions/Setup.cs
+19
View File
@@ -0,0 +1,19 @@
using LiteCharms.Features.Email.Configuration;
namespace LiteCharms.Features.Email.Extensions;
public static class Setup
{
public static IServiceCollection AddEmailServices(this IServiceCollection services, IConfiguration configuration)
{
services.Configure<SmtpSettings>(configuration.GetSection("Email"));
services.AddSingleton<IEmailService, EmailService>();
services.AddOpenTelemetry()
.WithTracing(tracing => tracing.AddSource("LiteCharms.EmailService"))
.WithMetrics(metrics => metrics.AddMeter("LiteCharms.EmailService"));
return services;
}
}
LiteCharms.Features/Email/IEmailService.cs
+15
View File
@@ -0,0 +1,15 @@
using LiteCharms.Features.Email.Models;
using LiteCharms.Features.Shop;
namespace LiteCharms.Features.Email;
public interface IEmailService : IDisposable
{
EmailStatuses Status { get; }
Task<Result<Response>> SendEmailAsync(Message message, CancellationToken cancellationToken = default);
Task<Result<Response>> ConnectAsync(CancellationToken cancellationToken = default);
Task<Result> DisconnectAsync(CancellationToken cancellationToken = default);
}
LiteCharms.Features/Email/Models/Attachment.cs
+8
View File
@@ -0,0 +1,8 @@
namespace LiteCharms.Features.Email.Models;
public class Attachment
{
public string? Name { get; set; }
public Stream? FileStream { get; set; }
}
LiteCharms.Features/Email/Models/Body.cs
+26
View File
@@ -0,0 +1,26 @@
namespace LiteCharms.Features.Email.Models;
public class Body : IDisposable
{
public string? Message { get; set; }
public ReadOnlyCollection<Attachment>? Attachments { get; set; }
public BodyProperties Properties { get; set; } = new();
public void Dispose()
{
if (Attachments is null) return;
foreach (var attachment in Attachments!)
{
if (attachment is not null)
{
attachment.FileStream!.Close();
attachment.FileStream!.Dispose();
}
}
GC.SuppressFinalize(this);
}
}
LiteCharms.Features/Email/Models/BodyProperties.cs
+8
View File
@@ -0,0 +1,8 @@
namespace LiteCharms.Features.Email.Models;
public class BodyProperties
{
public bool IsHtml { get; set; }
public bool HasAttachments { get; set; }
}
LiteCharms.Models/EmailEnquiry.cs → LiteCharms.Features/Email/Models/EmailEnquiry.cs
+3 -1
View File
@@ -1,4 +1,6 @@
namespace LiteCharms.Models; using System.ComponentModel.DataAnnotations;
namespace LiteCharms.Features.Email.Models;
public sealed class EmailEnquiry public sealed class EmailEnquiry
{ {
LiteCharms.Features/Email/Models/Message.cs
+19
View File
@@ -0,0 +1,19 @@
namespace LiteCharms.Features.Email.Models;
public class Message : IDisposable
{
public Party? Sender { get; set; }
public Party? Recipient { get; set; }
public string? Subject { get; set; }
public Body? Body { get; set; }
public void Dispose()
{
Body?.Dispose();
GC.SuppressFinalize(this);
}
}
LiteCharms.Features/Email/Models/Party.cs
+8
View File
@@ -0,0 +1,8 @@
namespace LiteCharms.Features.Email.Models;
public class Party
{
public string? Name { get; set; }
public string? Address { get; set; }
}
LiteCharms.Features/Email/Models/Response.cs
+22
View File
@@ -0,0 +1,22 @@
using LiteCharms.Features.Shop;
namespace LiteCharms.Features.Email.Models;
public class Response
{
public int Code { get; set; }
public string? Error { get; set; }
public EmailStatuses Status { get; set; }
private Response(EmailStatuses status, int code = 0, string? error = null)
{
Status = status;
Code = code;
Error = error;
}
public static Response Create(EmailStatuses status, int code = 0, string? error = null) =>
new(status, code, error);
}
LiteCharms.Features/Extensions/Constants.cs
+5
View File
@@ -0,0 +1,5 @@
namespace LiteCharms.Features.Extensions;
public static class Constants
{
}
LiteCharms.Extensions/EntityModeMappers.cs → LiteCharms.Features/Extensions/EntityModeMappers.cs
View File
LiteCharms.Features/Extensions/Hash.cs
+7
View File
@@ -0,0 +1,7 @@
namespace LiteCharms.Features.Extensions;
public static class Hash
{
public static Func<string?, string?> GenerateSha256HashString = (input) =>
Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(input!)));
}
LiteCharms.Extensions/HealthChecks.cs → LiteCharms.Features/Extensions/HealthChecks.cs
View File
LiteCharms.Extensions/Monitoring.cs → LiteCharms.Features/Extensions/Monitoring.cs
View File
LiteCharms.Extensions/Postgres.cs → LiteCharms.Features/Extensions/Postgres.cs
View File
LiteCharms.Extensions/Quartz.cs → LiteCharms.Features/Extensions/Quartz.cs
View File
LiteCharms.Extensions/ServiceBus.cs → LiteCharms.Features/Extensions/ServiceBus.cs
View File
LiteCharms.Abstractions/Timezones.cs → LiteCharms.Features/Extensions/Timezones.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace LiteCharms.Abstractions; namespace LiteCharms.Features.Extensions;
public static class Timezones public static class Timezones
{ {
LiteCharms.Infrastructure/HealthChecks/PostgresHealthCheck.cs → LiteCharms.Features/HealthChecks/PostgresHealthCheck.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace LiteCharms.Infrastructure.HealthChecks; namespace LiteCharms.Features.HealthChecks;
public class PostgresHealthCheck(IConfiguration configuration) : IHealthCheck public class PostgresHealthCheck(IConfiguration configuration) : IHealthCheck
{ {
LiteCharms.Infrastructure/HealthChecks/QuartzHealthCheck.cs → LiteCharms.Features/HealthChecks/QuartzHealthCheck.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace LiteCharms.Infrastructure.HealthChecks; namespace LiteCharms.Features.HealthChecks;
public class QuartzHealthCheck(ISchedulerFactory schedulerFactory) : IHealthCheck public class QuartzHealthCheck(ISchedulerFactory schedulerFactory) : IHealthCheck
{ {
LiteCharms.Features/LiteCharms.Features.csproj
+88 -7
View File
@@ -28,6 +28,86 @@
<None Include="..\icon.png" Pack="true" PackagePath="\" /> <None Include="..\icon.png" Pack="true" PackagePath="\" />
</ItemGroup> </ItemGroup>
<!-- Quartz Scheduler-->
<ItemGroup>
<PackageReference Include="OpenTelemetry" Version="1.15.3" />
<PackageReference Include="Quartz" Version="3.18.1" />
<PackageReference Include="Quartz.Plugins" Version="3.18.1" />
<PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.18.1" />
<PackageReference Include="Quartz.Serialization.SystemTextJson" Version="3.18.1" />
<PackageReference Include="Quartz.AspNetCore" Version="3.18.1" />
<PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.18.1" />
<!-- Global Usings -->
<Using Include="Quartz" />
</ItemGroup>
<!-- Configuration -->
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.8" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.8" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.8" />
<!-- Global Usings -->
<Using Include="Microsoft.Extensions.Configuration" />
</ItemGroup>
<!-- Health Checks -->
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Data" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.8" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.8" />
<!-- Global Usings -->
<Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
<Using Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" />
</ItemGroup>
<!-- Open Telemetry -->
<ItemGroup>
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
<!-- Global Usings -->
<Using Include="OpenTelemetry.Resources" />
<Using Include="OpenTelemetry.Exporter" />
<Using Include="OpenTelemetry.Logs" />
<Using Include="OpenTelemetry.Metrics" />
<Using Include="OpenTelemetry.Trace" />
</ItemGroup>
<!-- Database -->
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
<!-- Global Usings -->
<Using Include="Npgsql" />
<Using Include="Microsoft.EntityFrameworkCore" />
<Using Include="Microsoft.EntityFrameworkCore.Design" />
<Using Include="Microsoft.EntityFrameworkCore.Metadata.Builders" />
</ItemGroup>
<!-- Email --> <!-- Email -->
<ItemGroup> <ItemGroup>
<PackageReference Include="MailKit" Version="4.16.0" /> <PackageReference Include="MailKit" Version="4.16.0" />
@@ -50,16 +130,17 @@
<!-- Shared Usings --> <!-- Shared Usings -->
<ItemGroup> <ItemGroup>
<Using Include="Microsoft.Extensions.Hosting" />
<Using Include="System.Text" /> <Using Include="System.Text" />
<Using Include="System.Security.Cryptography" /> <Using Include="System.Text.Json" />
<Using Include="Microsoft.EntityFrameworkCore" /> <Using Include="System.Threading.Channels" />
<Using Include="System.Collections.ObjectModel" />
<Using Include="System.Diagnostics" />
<Using Include="System.Diagnostics.Metrics" />
<Using Include="Microsoft.Extensions.DependencyInjection" />
<Using Include="System.Security.Cryptography" />
<Using Include="Microsoft.Extensions.Options" /> <Using Include="Microsoft.Extensions.Options" />
<Using Include="Microsoft.Extensions.Logging" /> <Using Include="Microsoft.Extensions.Logging" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LiteCharms.Extensions\LiteCharms.Extensions.csproj" />
<ProjectReference Include="..\LiteCharms.Infrastructure\LiteCharms.Infrastructure.csproj" />
</ItemGroup>
</Project> </Project>
LiteCharms.Features/Mediator/LoggingPipelineBehavior.cs
+29
View File
@@ -0,0 +1,29 @@
namespace LiteCharms.Features.Mediator;
public sealed class LoggingPipelineBehavior<TRequest, TResponse>(ILogger<LoggingPipelineBehavior<TRequest, TResponse>> logger) :
IPipelineBehavior<TRequest, TResponse?>
where TRequest : IRequest<TResponse>
where TResponse : ResultBase, new()
{
public async ValueTask<TResponse?> Handle(TRequest message, MessageHandlerDelegate<TRequest, TResponse?> next, CancellationToken cancellationToken)
{
TResponse? response = await next(message, cancellationToken);
if (response is null)
logger.LogCritical("{Request} {TypeName} was returned as null", typeof(TRequest).Name, typeof(TRequest).Name);
if(response?.IsFailed == true || response?.Errors?.Any() == true)
{
foreach (var error in response.Errors)
{
if (!string.IsNullOrWhiteSpace(error.Message))
logger.LogWarning("{Request} {Error}", typeof(TRequest).Name, error.Message);
if (error?.Reasons?.Count > 0)
error.Reasons.ForEach(r => logger.LogError("{Request} {Reason}", typeof(TRequest).Name, r.ToString()));
}
}
return response;
}
}
LiteCharms.Features/Mediator/MediatorTelemetry.cs
+12
View File
@@ -0,0 +1,12 @@
namespace LiteCharms.Features.Mediator;
public static class MediatorTelemetry
{
public const string ServiceName = "LiteCharms.Mediator";
public static readonly ActivitySource Source = new(ServiceName);
public static readonly Meter Meter = new(ServiceName);
public static readonly Counter<long> RequestCounter = Meter.CreateCounter<long>("mediator_requests_total");
public static readonly Histogram<double> RequestDuration = Meter.CreateHistogram<double>("mediator_request_duration_ms");
}
LiteCharms.Features/Mediator/TelemetryPipelineBehavior.cs
+66
View File
@@ -0,0 +1,66 @@
namespace LiteCharms.Features.Mediator;
public sealed class TelemetryPipelineBehavior<TRequest, TResponse> :
IPipelineBehavior<TRequest, TResponse?>
where TRequest : IRequest<TResponse>
where TResponse : ResultBase, new()
{
public async ValueTask<TResponse?> Handle(TRequest message, MessageHandlerDelegate<TRequest, TResponse?> next, CancellationToken cancellationToken)
{
var requestName = typeof(TRequest).Name;
using var activity = MediatorTelemetry.Source.StartActivity(requestName);
activity?.SetTag("mediator.request_type", typeof(TRequest).FullName);
var stopWatch = Stopwatch.StartNew();
var status = "Success";
try
{
TResponse? response = await next(message, cancellationToken);
if (response is null)
{
status = "NullResponse";
activity?.SetStatus(ActivityStatusCode.Error, "Response was null");
return response;
}
if (response.IsFailed)
{
status = "Failed";
activity?.SetStatus(ActivityStatusCode.Error, "Request failed");
var firstError = response.Errors.FirstOrDefault()?.Message ?? "Unknown Error";
activity?.SetTag("error.message", firstError);
foreach (var error in response.Errors)
activity?.AddEvent(new ActivityEvent("Result Error", tags: new() { { "message", error.Message } }));
}
else
activity?.SetStatus(ActivityStatusCode.Ok);
return response;
}
catch (Exception ex)
{
status = "Exception";
activity?.SetStatus(ActivityStatusCode.Error, ex.Message);
activity?.AddException(ex);
throw;
}
finally
{
stopWatch.Stop();
var tags = new TagList { { "request", requestName }, { "status", status } };
MediatorTelemetry.RequestCounter.Add(1, tags);
MediatorTelemetry.RequestDuration.Record(stopWatch.Elapsed.TotalMilliseconds, tags);
}
}
}
LiteCharms.Abstractions/IJobOrchestrator.cs → LiteCharms.Features/Quartz/Abstractions/IJobOrchestrator.cs
+3 -1
View File
@@ -1,4 +1,6 @@
namespace LiteCharms.Abstractions; using LiteCharms.Features.Abstractions;
namespace LiteCharms.Features.Quartz.Abstractions;
public interface IJobOrchestrator public interface IJobOrchestrator
{ {
LiteCharms.Infrastructure/Quartz/JobOrchestrator.cs → LiteCharms.Features/Quartz/JobOrchestrator.cs
+4 -3
View File
@@ -1,7 +1,8 @@
using LiteCharms.Abstractions; using LiteCharms.Features.Abstractions;
using static LiteCharms.Abstractions.Timezones; using LiteCharms.Features.Quartz.Abstractions;
using static LiteCharms.Features.Extensions.Timezones;
namespace LiteCharms.Infrastructure.Quartz; namespace LiteCharms.Features.Quartz;
public class JobOrchestrator(ISchedulerFactory schedulerFactory) : IJobOrchestrator public class JobOrchestrator(ISchedulerFactory schedulerFactory) : IJobOrchestrator
{ {
LiteCharms.Infrastructure/Quartz/MediatorJob.cs → LiteCharms.Features/Quartz/MediatorJob.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using LiteCharms.Abstractions; using LiteCharms.Features.Abstractions;
namespace LiteCharms.Infrastructure.Quartz; namespace LiteCharms.Features.Quartz;
[DisallowConcurrentExecution] [DisallowConcurrentExecution]
public class MediatorJob<TNotification>(IMediator mediator) : IJob where TNotification : IEvent public class MediatorJob<TNotification>(IMediator mediator) : IJob where TNotification : IEvent
LiteCharms.Infrastructure/Quartz/RetryJobListener.cs → LiteCharms.Features/Quartz/RetryJobListener.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace LiteCharms.Infrastructure.Quartz; namespace LiteCharms.Features.Quartz;
public class RetryJobListener : IJobListener public class RetryJobListener : IJobListener
{ {
LiteCharms.Abstractions/EventBusQueueBase.cs → LiteCharms.Features/ServiceBus/Abstractions/EventBusQueueBase.cs
+3 -1
View File
@@ -1,4 +1,6 @@
namespace LiteCharms.Abstractions; using LiteCharms.Features.Abstractions;
namespace LiteCharms.Features.ServiceBus.Abstractions;
public abstract class EventBusQueueBase public abstract class EventBusQueueBase
{ {
LiteCharms.Abstractions/IEventBus.cs → LiteCharms.Features/ServiceBus/Abstractions/IEventBus.cs
+3 -1
View File
@@ -1,4 +1,6 @@
namespace LiteCharms.Abstractions; using LiteCharms.Features.Abstractions;
namespace LiteCharms.Features.ServiceBus.Abstractions;
public interface IEventBus public interface IEventBus
{ {
LiteCharms.Abstractions/IEventBusQueue.cs → LiteCharms.Features/ServiceBus/Abstractions/IEventBusQueue.cs
+3 -1
View File
@@ -1,4 +1,6 @@
namespace LiteCharms.Abstractions; using LiteCharms.Features.Abstractions;
namespace LiteCharms.Features.ServiceBus.Abstractions;
public interface IEventBusQueue public interface IEventBusQueue
{ {
LiteCharms.Abstractions/Constants.cs → LiteCharms.Features/ServiceBus/Constants.cs
+1 -5
View File
@@ -1,13 +1,9 @@
namespace LiteCharms.Abstractions; namespace LiteCharms.Features.ServiceBus;
public static class Constants public static class Constants
{ {
public const int QueueBounds = 100000; public const int QueueBounds = 100000;
public const string ShopSchedulerName = "shop";
public const string ShopEmailFromName = "Khongisa Shop";
public const string ShopEmailFromAddress = "shop@litecharms.co.za";
public const string EmailServiceBus = nameof(EmailServiceBus); public const string EmailServiceBus = nameof(EmailServiceBus);
public const string GeneralServiceBus = nameof(GeneralServiceBus); public const string GeneralServiceBus = nameof(GeneralServiceBus);
public const string SalesServiceBus = nameof(SalesServiceBus); public const string SalesServiceBus = nameof(SalesServiceBus);
LiteCharms.Infrastructure/ServiceBus/EmailServiceBus.cs → LiteCharms.Features/ServiceBus/EmailServiceBus.cs
+4 -3
View File
@@ -1,7 +1,8 @@
using LiteCharms.Abstractions; using LiteCharms.Features.Abstractions;
using LiteCharms.Infrastructure.ServiceBus.Queues; using LiteCharms.Features.ServiceBus.Abstractions;
using LiteCharms.Features.ServiceBus.Queues;
namespace LiteCharms.Infrastructure.ServiceBus; namespace LiteCharms.Features.ServiceBus;
public class EmailServiceBus(EmailQueue messages) : IEventBus public class EmailServiceBus(EmailQueue messages) : IEventBus
{ {
LiteCharms.Features/ServiceBus/Exchanges/EmailExchange.cs
+33
View File
@@ -0,0 +1,33 @@
using LiteCharms.Features.Abstractions;
using LiteCharms.Features.ServiceBus.Queues;
namespace LiteCharms.Features.ServiceBus.Exchanges;
public class EmailExchange(EmailQueue messages, ILogger<EmailExchange> logger, IPublisher mediator) : BackgroundService
{
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
await foreach(IEvent? message in messages.Incoming.ReadAllAsync(stoppingToken))
{
try
{
switch (message.Name)
{
case "SendShopEmailEnquiryEvent":
await mediator.Publish(message, stoppingToken);
break;
case "ProcessEmailNotificationsEvent":
await mediator.Publish(message, stoppingToken);
break;
default:
logger.LogWarning("Unsupported email event {Event}", message.Name);
break;
}
}
catch (Exception ex)
{
logger.LogError(ex, ex.Message);
}
}
}
}
LiteCharms.Infrastructure/ServiceBus/Exchanges/GeneralExchange.cs → LiteCharms.Features/ServiceBus/Exchanges/GeneralExchange.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using LiteCharms.Infrastructure.ServiceBus.Queues; using LiteCharms.Features.ServiceBus.Queues;
namespace LiteCharms.Infrastructure.ServiceBus.Exchanges; namespace LiteCharms.Features.ServiceBus.Exchanges;
public class GeneralExchange(GeneralQueue messages) : BackgroundService public class GeneralExchange(GeneralQueue messages) : BackgroundService
{ {
LiteCharms.Infrastructure/ServiceBus/Exchanges/SalesExchange.cs → LiteCharms.Features/ServiceBus/Exchanges/SalesExchange.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using LiteCharms.Infrastructure.ServiceBus.Queues; using LiteCharms.Features.ServiceBus.Queues;
namespace LiteCharms.Infrastructure.ServiceBus.Exchanges; namespace LiteCharms.Features.ServiceBus.Exchanges;
public class SalesExchange(SalesQueue messages) : BackgroundService public class SalesExchange(SalesQueue messages) : BackgroundService
{ {
LiteCharms.Infrastructure/ServiceBus/GeneralServiceBus.cs → LiteCharms.Features/ServiceBus/GeneralServiceBus.cs
+4 -3
View File
@@ -1,7 +1,8 @@
using LiteCharms.Abstractions; using LiteCharms.Features.Abstractions;
using LiteCharms.Infrastructure.ServiceBus.Queues; using LiteCharms.Features.ServiceBus.Abstractions;
using LiteCharms.Features.ServiceBus.Queues;
namespace LiteCharms.Infrastructure.ServiceBus; namespace LiteCharms.Features.ServiceBus;
public class GeneralServiceBus(GeneralQueue messages) : IEventBus public class GeneralServiceBus(GeneralQueue messages) : IEventBus
{ {
LiteCharms.Features/ServiceBus/Queues/EmailQueue.cs
+5
View File
@@ -0,0 +1,5 @@
using LiteCharms.Features.ServiceBus.Abstractions;
namespace LiteCharms.Features.ServiceBus.Queues;
public class EmailQueue : EventBusQueueBase, IEventBusQueue;
LiteCharms.Features/ServiceBus/Queues/GeneralQueue.cs
+5
View File
@@ -0,0 +1,5 @@
using LiteCharms.Features.ServiceBus.Abstractions;
namespace LiteCharms.Features.ServiceBus.Queues;
public class GeneralQueue : EventBusQueueBase, IEventBusQueue;
LiteCharms.Features/ServiceBus/Queues/SalesQueue.cs
+5
View File
@@ -0,0 +1,5 @@
using LiteCharms.Features.ServiceBus.Abstractions;
namespace LiteCharms.Features.ServiceBus.Queues;
public class SalesQueue : EventBusQueueBase, IEventBusQueue;
LiteCharms.Infrastructure/ServiceBus/SalesServiceBus.cs → LiteCharms.Features/ServiceBus/SalesServiceBus.cs
+4 -3
View File
@@ -1,7 +1,8 @@
using LiteCharms.Abstractions; using LiteCharms.Features.Abstractions;
using LiteCharms.Infrastructure.ServiceBus.Queues; using LiteCharms.Features.ServiceBus.Abstractions;
using LiteCharms.Features.ServiceBus.Queues;
namespace LiteCharms.Infrastructure.ServiceBus; namespace LiteCharms.Features.ServiceBus;
public class SalesServiceBus(SalesQueue messages) : IEventBus public class SalesServiceBus(SalesQueue messages) : IEventBus
{ {
LiteCharms.Features/CartPackages/Commands/AddPackageItemsCommand.cs → LiteCharms.Features/Shop/CartPackages/Commands/AddPackageItemsCommand.cs
View File
LiteCharms.Features/CartPackages/Commands/CreatePackageCommand.cs → LiteCharms.Features/Shop/CartPackages/Commands/CreatePackageCommand.cs
View File
LiteCharms.Features/CartPackages/Commands/DeletePackageCommand.cs → LiteCharms.Features/Shop/CartPackages/Commands/DeletePackageCommand.cs
View File
LiteCharms.Features/CartPackages/Commands/DeletePackageItemsCommand.cs → LiteCharms.Features/Shop/CartPackages/Commands/DeletePackageItemsCommand.cs
View File
LiteCharms.Features/CartPackages/Commands/Handlers/AddPackageItemCommandHandler.cs → LiteCharms.Features/Shop/CartPackages/Commands/Handlers/AddPackageItemCommandHandler.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using LiteCharms.Infrastructure.Database; using LiteCharms.Features.Shop.Postgres;
namespace LiteCharms.Features.CartPackages.Commands.Handlers; namespace LiteCharms.Features.CartPackages.Commands.Handlers;
LiteCharms.Features/CartPackages/Commands/Handlers/CreatePackageCommandHandler.cs → LiteCharms.Features/Shop/CartPackages/Commands/Handlers/CreatePackageCommandHandler.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using LiteCharms.Infrastructure.Database; using LiteCharms.Features.Shop.Postgres;
namespace LiteCharms.Features.CartPackages.Commands.Handlers; namespace LiteCharms.Features.CartPackages.Commands.Handlers;
LiteCharms.Features/CartPackages/Commands/Handlers/DeletePackageItemCommandHandler.cs → LiteCharms.Features/Shop/CartPackages/Commands/Handlers/DeletePackageItemCommandHandler.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using LiteCharms.Infrastructure.Database; using LiteCharms.Features.Shop.Postgres;
namespace LiteCharms.Features.CartPackages.Commands.Handlers; namespace LiteCharms.Features.CartPackages.Commands.Handlers;
LiteCharms.Features/CartPackages/Commands/Handlers/DeletePackageItemsCommandHandler.cs → LiteCharms.Features/Shop/CartPackages/Commands/Handlers/DeletePackageItemsCommandHandler.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using LiteCharms.Infrastructure.Database; using LiteCharms.Features.Shop.Postgres;
namespace LiteCharms.Features.CartPackages.Commands.Handlers; namespace LiteCharms.Features.CartPackages.Commands.Handlers;
LiteCharms.Features/CartPackages/Commands/Handlers/UpdatePackageCommandHandler.cs → LiteCharms.Features/Shop/CartPackages/Commands/Handlers/UpdatePackageCommandHandler.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using LiteCharms.Infrastructure.Database; using LiteCharms.Features.Shop.Postgres;
namespace LiteCharms.Features.CartPackages.Commands.Handlers; namespace LiteCharms.Features.CartPackages.Commands.Handlers;
LiteCharms.Features/CartPackages/Commands/Handlers/UpdatePackageStatusCommandHandler.cs → LiteCharms.Features/Shop/CartPackages/Commands/Handlers/UpdatePackageStatusCommandHandler.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using LiteCharms.Infrastructure.Database; using LiteCharms.Features.Shop.Postgres;
namespace LiteCharms.Features.CartPackages.Commands.Handlers; namespace LiteCharms.Features.CartPackages.Commands.Handlers;
LiteCharms.Features/CartPackages/Commands/UpdatePackageCommand.cs → LiteCharms.Features/Shop/CartPackages/Commands/UpdatePackageCommand.cs
View File
LiteCharms.Features/CartPackages/Commands/UpdatePackageStatusCommand.cs → LiteCharms.Features/Shop/CartPackages/Commands/UpdatePackageStatusCommand.cs
View File
LiteCharms.Entities/Package.cs → LiteCharms.Features/Shop/CartPackages/Entities/Package.cs
+1 -3
View File
@@ -1,6 +1,4 @@
using LiteCharms.Entities.Configuration; namespace LiteCharms.Features.Shop.CartPackages.Entities;
namespace LiteCharms.Entities;
[EntityTypeConfiguration<PackageConfirguration, Package>] [EntityTypeConfiguration<PackageConfirguration, Package>]
public class Package : Models.Package public class Package : Models.Package
LiteCharms.Features/Shop/CartPackages/Entities/PackageConfirguration.cs
+18
View File
@@ -0,0 +1,18 @@
namespace LiteCharms.Features.Shop.CartPackages.Entities;
public class PackageConfirguration : IEntityTypeConfiguration<Package>
{
public void Configure(EntityTypeBuilder<Package> builder)
{
builder.ToTable(nameof(Package));
builder.HasKey(f => f.Id);
builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd().HasDefaultValueSql("now()");
builder.Property(f => f.UpdatedAt).IsRequired(false);
builder.Property(f => f.Name).IsRequired();
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.Active);
}
}
LiteCharms.Features/Shop/CartPackages/Entities/PackageItem.cs
+11
View File
@@ -0,0 +1,11 @@
using LiteCharms.Features.Shop.Products.Entities;
namespace LiteCharms.Features.Shop.CartPackages.Entities;
[EntityTypeConfiguration<PackageItemConfiguration, PackageItem>]
public class PackageItem : Models.PackageItem
{
public virtual Package? Package { get; set; }
public virtual ProductPrice? ProductPrice { get; set; }
}
LiteCharms.Entities/Configuration/PackageItemConfiguration.cs → LiteCharms.Features/Shop/CartPackages/Entities/PackageItemConfiguration.cs
+12 -5
View File
@@ -1,4 +1,4 @@
namespace LiteCharms.Entities.Configuration; namespace LiteCharms.Features.Shop.CartPackages.Entities;
public class PackageItemConfiguration : IEntityTypeConfiguration<PackageItem> public class PackageItemConfiguration : IEntityTypeConfiguration<PackageItem>
{ {
@@ -7,14 +7,21 @@ public class PackageItemConfiguration : IEntityTypeConfiguration<PackageItem>
builder.ToTable(nameof(PackageItem)); builder.ToTable(nameof(PackageItem));
builder.HasKey(f => f.Id); builder.HasKey(f => f.Id);
builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd(); builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd().HasDefaultValueSql("now()");
builder.Property(f => f.PackageId).IsRequired(); builder.Property(f => f.PackageId).IsRequired();
builder.Property(f => f.ProductPriceId).IsRequired(); builder.Property(f => f.ProductPriceId).IsRequired();
builder.Property(f => f.Active); builder.Property(f => f.Active);
builder.HasOne(f => f.Package) builder.HasOne(f => f.Package)
.WithMany() .WithMany(f => f.PackageItems)
.HasForeignKey(f => f.PackageId) .HasForeignKey(pi => pi.PackageId)
.OnDelete(DeleteBehavior.NoAction); .IsRequired()
.OnDelete(DeleteBehavior.Cascade);
builder.HasOne(f => f.ProductPrice)
.WithMany()
.HasForeignKey(pi => pi.ProductPriceId)
.IsRequired()
.OnDelete(DeleteBehavior.Restrict);
} }
} }
LiteCharms.Models/Package.cs → LiteCharms.Features/Shop/CartPackages/Models/Package.cs
+5 -1
View File
@@ -1,4 +1,4 @@
namespace LiteCharms.Models; namespace LiteCharms.Features.Shop.CartPackages.Models;
public class Package public class Package
{ {
@@ -10,7 +10,11 @@ public class Package
public string? Name { get; set; } public string? Name { get; set; }
public string? Summary { get; set; }
public string? Description { get; set; } public string? Description { get; set; }
public string? ImageUrl { get; set; }
public bool Active { get; set; } public bool Active { get; set; }
} }
LiteCharms.Models/PackageItem.cs → LiteCharms.Features/Shop/CartPackages/Models/PackageItem.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace LiteCharms.Models; namespace LiteCharms.Features.Shop.CartPackages.Models;
public class PackageItem public class PackageItem
{ {
LiteCharms.Features/CartPackages/Queries/GetPackageItemsQuery.cs → LiteCharms.Features/Shop/CartPackages/Queries/GetPackageItemsQuery.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using LiteCharms.Models; using LiteCharms.Features.Shop.CartPackages.Models;
namespace LiteCharms.Features.CartPackages.Queries; namespace LiteCharms.Features.CartPackages.Queries;
LiteCharms.Features/CartPackages/Queries/GetPackageQuery.cs → LiteCharms.Features/Shop/CartPackages/Queries/GetPackageQuery.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using LiteCharms.Models; using LiteCharms.Features.Shop.CartPackages.Models;
namespace LiteCharms.Features.CartPackages.Queries; namespace LiteCharms.Features.CartPackages.Queries;
LiteCharms.Features/CartPackages/Queries/GetPackagesQuery.cs → LiteCharms.Features/Shop/CartPackages/Queries/GetPackagesQuery.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using LiteCharms.Models; using LiteCharms.Features.Shop.CartPackages.Models;
namespace LiteCharms.Features.CartPackages.Queries; namespace LiteCharms.Features.CartPackages.Queries;
LiteCharms.Features/CartPackages/Queries/Handlers/GetPackageItemsQueryHandler.cs → LiteCharms.Features/Shop/CartPackages/Queries/Handlers/GetPackageItemsQueryHandler.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using LiteCharms.Extensions; using LiteCharms.Extensions;
using LiteCharms.Infrastructure.Database; using LiteCharms.Features.Shop.CartPackages.Models;
using LiteCharms.Models; using LiteCharms.Features.Shop.Postgres;
namespace LiteCharms.Features.CartPackages.Queries.Handlers; namespace LiteCharms.Features.CartPackages.Queries.Handlers;
LiteCharms.Features/CartPackages/Queries/Handlers/GetPackageQueryHandler.cs → LiteCharms.Features/Shop/CartPackages/Queries/Handlers/GetPackageQueryHandler.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using LiteCharms.Extensions; using LiteCharms.Extensions;
using LiteCharms.Infrastructure.Database; using LiteCharms.Features.Shop.CartPackages.Models;
using LiteCharms.Models; using LiteCharms.Features.Shop.Postgres;
namespace LiteCharms.Features.CartPackages.Queries.Handlers; namespace LiteCharms.Features.CartPackages.Queries.Handlers;
LiteCharms.Features/CartPackages/Queries/Handlers/GetPackagesQueryHandler.cs → LiteCharms.Features/Shop/CartPackages/Queries/Handlers/GetPackagesQueryHandler.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using LiteCharms.Extensions; using LiteCharms.Extensions;
using LiteCharms.Infrastructure.Database; using LiteCharms.Features.Shop.CartPackages.Models;
using LiteCharms.Models; using LiteCharms.Features.Shop.Postgres;
namespace LiteCharms.Features.CartPackages.Queries.Handlers; namespace LiteCharms.Features.CartPackages.Queries.Handlers;
LiteCharms.Features/Customers/Commands/CreateCustomerCommand.cs → LiteCharms.Features/Shop/Customers/Commands/CreateCustomerCommand.cs
View File
LiteCharms.Features/Customers/Commands/Handlers/CreateCustomerCommandHandler.cs → LiteCharms.Features/Shop/Customers/Commands/Handlers/CreateCustomerCommandHandler.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using LiteCharms.Infrastructure.Database; using LiteCharms.Features.Shop.Postgres;
namespace LiteCharms.Features.Customers.Commands.Handlers; namespace LiteCharms.Features.Customers.Commands.Handlers;
LiteCharms.Features/Customers/Commands/Handlers/UpdateCustomerCommandHandler.cs → LiteCharms.Features/Shop/Customers/Commands/Handlers/UpdateCustomerCommandHandler.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using LiteCharms.Infrastructure.Database; using LiteCharms.Features.Shop.Postgres;
namespace LiteCharms.Features.Customers.Commands.Handlers; namespace LiteCharms.Features.Customers.Commands.Handlers;
LiteCharms.Features/Customers/Commands/UpdateCustomerCommand.cs → LiteCharms.Features/Shop/Customers/Commands/UpdateCustomerCommand.cs
View File
LiteCharms.Entities/Customer.cs → LiteCharms.Features/Shop/Customers/Entities/Customer.cs
+5 -2
View File
@@ -1,6 +1,9 @@
using LiteCharms.Entities.Configuration; using LiteCharms.Features.Shop.Leads.Entities;
using LiteCharms.Features.Shop.Orders.Entities;
using LiteCharms.Features.Shop.Quotes.Entities;
using LiteCharms.Features.Shop.ShoppingCarts.Entities;
namespace LiteCharms.Entities; namespace LiteCharms.Features.Shop.Customers.Entities;
[EntityTypeConfiguration<CustomerConfiguration, Customer>] [EntityTypeConfiguration<CustomerConfiguration, Customer>]
public class Customer : Models.Customer public class Customer : Models.Customer
LiteCharms.Entities/Configuration/CustomerConfiguration.cs → LiteCharms.Features/Shop/Customers/Entities/CustomerConfiguration.cs
+3 -8
View File
@@ -1,4 +1,4 @@
namespace LiteCharms.Entities.Configuration; namespace LiteCharms.Features.Shop.Customers.Entities;
public class CustomerConfiguration : IEntityTypeConfiguration<Customer> public class CustomerConfiguration : IEntityTypeConfiguration<Customer>
{ {
@@ -7,8 +7,8 @@ public class CustomerConfiguration : IEntityTypeConfiguration<Customer>
builder.ToTable(nameof(Customer)); builder.ToTable(nameof(Customer));
builder.HasKey(f => f.Id); builder.HasKey(f => f.Id);
builder.Property(f => f.CreatedAt).ValueGeneratedOnAdd(); builder.Property(f => f.CreatedAt).ValueGeneratedOnAdd().HasDefaultValueSql("now()");
builder.Property(f => f.UpdatedAt).IsRequired(false).ValueGeneratedOnUpdate(); builder.Property(f => f.UpdatedAt).IsRequired(false);
builder.Property(f => f.Company); builder.Property(f => f.Company);
builder.Property(f => f.Name).IsRequired(); builder.Property(f => f.Name).IsRequired();
builder.Property(f => f.LastName).IsRequired(); builder.Property(f => f.LastName).IsRequired();
@@ -26,10 +26,5 @@ public class CustomerConfiguration : IEntityTypeConfiguration<Customer>
builder.Property(f => f.Country); builder.Property(f => f.Country);
builder.Property(f => f.PostalCode); builder.Property(f => f.PostalCode);
builder.Property(f => f.Active).HasDefaultValue(true); builder.Property(f => f.Active).HasDefaultValue(true);
builder.HasMany(f => f.Leads)
.WithOne(f => f.Customer)
.HasForeignKey(f => f.CustomerId)
.OnDelete(DeleteBehavior.NoAction);
} }
} }
LiteCharms.Models/Customer.cs → LiteCharms.Features/Shop/Customers/Models/Customer.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace LiteCharms.Models; namespace LiteCharms.Features.Shop.Customers.Models;
public class Customer public class Customer
{ {
LiteCharms.Features/Customers/Queries/GetCustomerQuery.cs → LiteCharms.Features/Shop/Customers/Queries/GetCustomerQuery.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using LiteCharms.Models; using LiteCharms.Features.Shop.Customers.Models;
namespace LiteCharms.Features.Customers.Queries; namespace LiteCharms.Features.Customers.Queries;

Some files were not shown because too many files have changed in this diff Show More