Compare commits
169 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f5a69de0a0 | |||
| 40a5f94941 | |||
| fc4db32f20 | |||
| 9cb4b8264d | |||
| ddd823afab | |||
| a9aa0a675a | |||
| 6418d27f5a | |||
| a763e5e40e | |||
| 9b15e296df | |||
| 1ef5e52ed9 | |||
| f4a615277f | |||
| c06cf13add | |||
| 4e9e428ab5 | |||
| 92c60e6616 | |||
| 9099610185 | |||
| 21788c66a3 | |||
| dfaa62ea75 | |||
| 54ef7a6e5f | |||
| 0ec7ef4861 | |||
| 6594e0aecd | |||
| 088e64f28f | |||
| 3803ae2999 | |||
| 398a8d3827 | |||
| b09af460f1 | |||
| 7c5b5f1728 | |||
| 50db61b3ee | |||
| 94b0084d75 | |||
| f5ad8e2d50 | |||
| 8e2942487d | |||
| fa79a58004 | |||
| 9997d4f0ed | |||
| 33edae9eff | |||
| c1e52ea908 | |||
| 0d5702f0fe | |||
| e4c3779092 | |||
| da5f233c3b | |||
| 02d89eec4f | |||
| 95dc2e2da2 | |||
| 59fc0432b4 | |||
| 99c0508f6f | |||
| b984dab2be | |||
| 157f097dfb | |||
| 630e74814b | |||
| 6248d03ead | |||
| 9b474a398b | |||
| 3deae15f5a | |||
| 8e1df7938b | |||
| d9f2d32c76 | |||
| 9296f0331e | |||
| 1ace61baa5 | |||
| e3e49b8db2 | |||
| 2ed15b548f | |||
| 7d2bc7f1f2 | |||
| ef2428f8e3 | |||
| 5edff5e272 | |||
| b424b24c2e | |||
| 310c1237b1 | |||
| cadc5888cc | |||
| 618e57074a | |||
| 92abf6c5be | |||
| b60b8236af | |||
| 37e0d3b93f | |||
| 4d2b37ace7 | |||
| b42c0fcc4f | |||
| 3daf192ce9 | |||
| 9418c77f0e | |||
| a98adea8f3 | |||
| 2bb1c8c3bc | |||
| f5f1035598 | |||
| 388a5f4c87 | |||
| 40f4656036 | |||
| c31dd308a4 | |||
| 11dfd18a44 | |||
| e7f02eca9b | |||
| 787507bed9 | |||
| 59af9a5406 | |||
| 5140da2c6c | |||
| 02ff14ccc8 | |||
| 0ad410c64e | |||
| e193aa7c1c | |||
| 840d4568e2 | |||
| 6e580ecdf6 | |||
| 60095057b7 | |||
| 4c194c1141 | |||
| b41136e2c7 | |||
| 41eb4daeb4 | |||
| c423f04b42 | |||
| 7fe5f7aef3 | |||
| a567fc7cd7 | |||
| 31254932ae | |||
| c53434a578 | |||
| 5a0aae8182 | |||
| 3f3e0dbe88 | |||
| 8d8ebffabf | |||
| dc4addb43a | |||
| e2d29261da | |||
| 5d5b59d610 | |||
| f001b02633 | |||
| 90a11dc65e | |||
| de955a96a8 | |||
| cdf5cfb5cd | |||
| c4d3bb4cdf | |||
| 65f102f18a | |||
| cdc80db214 | |||
| 4576b5aa2b | |||
| 3847927ace | |||
| d38d1dd059 | |||
| c27aba1954 | |||
| e646d16053 | |||
| 1c946dab26 | |||
| 20c3ad9569 | |||
| 9977cf27b9 | |||
| cf7eed0603 | |||
| 8e9ac1e1ad | |||
| fa79bd8021 | |||
| 16dae7c9fb | |||
| 5666ffd474 | |||
| f8153e86b4 | |||
| eef1096ec5 | |||
| 84d33d3607 | |||
| 8f97d7cf38 | |||
| f51cc03327 | |||
| 652ca82a57 | |||
| aff6fcabf4 | |||
| a50830ffaa | |||
| ee6f8a283e | |||
| 8140b5fe65 | |||
| fda97db5fa | |||
| 9285cedfa9 | |||
| 29574f4df0 | |||
| 343874551a | |||
| b4a48c9cbf | |||
| 0eac9d533f | |||
| 961f03c1c7 | |||
| a0cf847e51 | |||
| 24ba609e0c | |||
| 4bac14881d | |||
| 29f6d66c44 | |||
| fd6057d691 | |||
| bcfc9ef962 | |||
| 7961d934ba | |||
| b4e967acc9 | |||
| 0a95df4c39 | |||
| ad9fa0ab91 | |||
| 4df903e456 | |||
| 205bbb9f3f | |||
| 763d24f11f | |||
| 0ed04211bf | |||
| 73ef4b04a9 | |||
| 5ab2d29aac | |||
| 780415b6d4 | |||
| 139ca1f866 | |||
| 879094073a | |||
| 45c2e8310a | |||
| b369dad452 | |||
| ac31c6ada8 | |||
| c938bfec09 | |||
| 5eb6dbc8b2 | |||
| adc14038db | |||
| afc984f3bc | |||
| 61cb6c2228 | |||
| f1ef614cbb | |||
| 8fe129e19c | |||
| c4f73fd999 | |||
| 48f4cd45f1 | |||
| f88cc42a88 | |||
| 0e21ec283d | |||
| e7a798b5e9 | |||
| 494b806744 |
@@ -361,3 +361,6 @@ MigrationBackup/
|
|||||||
|
|
||||||
# Fody - auto-generated XML schema
|
# Fody - auto-generated XML schema
|
||||||
FodyWeavers.xsd
|
FodyWeavers.xsd
|
||||||
|
/LiteCharms.Features.Tests/http/http-client.env.json
|
||||||
|
/LiteCharms.Features.Tests/http/midrandshop-api/http-client.env.json
|
||||||
|
/LiteCharms.Features.Tests/http/authentik/http-client.env.json
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<SignAssembly>True</SignAssembly>
|
||||||
|
<AssemblyOriginatorKeyFile>..\LiteCharms.snk</AssemblyOriginatorKeyFile>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<!-- Nuget Package Details -->
|
||||||
|
<PropertyGroup>
|
||||||
|
<PackageId>LiteCharms.Abstractions</PackageId>
|
||||||
|
<Version>1.0.20</Version>
|
||||||
|
<Authors>Khwezi Mngoma</Authors>
|
||||||
|
<Company>Lite Charms (PTY) Ltd</Company>
|
||||||
|
<Description>Shared abstractions for Lite Charms applications.</Description>
|
||||||
|
<PackageProjectUrl>https://gitea.khongisa.co.za/litecharms/components</PackageProjectUrl>
|
||||||
|
<RepositoryUrl>https://gitea.khongisa.co.za/litecharms/components.git</RepositoryUrl>
|
||||||
|
<RepositoryType>git</RepositoryType>
|
||||||
|
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||||
|
<PackageTags>utility;dotnet</PackageTags>
|
||||||
|
<PackageIcon>icon.png</PackageIcon>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="..\LICENSE" Pack="true" PackagePath="\" />
|
||||||
|
<None Include="..\icon.png" Pack="true" PackagePath="\" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="FluentResults" Version="4.0.0" />
|
||||||
|
<PackageReference Include="Mediator.Abstractions" Version="3.0.2" />
|
||||||
|
|
||||||
|
<Using Include="Mediator" />
|
||||||
|
<Using Include="FluentResults" />
|
||||||
|
<Using Include="System.Threading.Channels" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<SignAssembly>True</SignAssembly>
|
||||||
|
<AssemblyOriginatorKeyFile>..\LiteCharms.snk</AssemblyOriginatorKeyFile>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<!-- Nuget Package Details -->
|
||||||
|
<PropertyGroup>
|
||||||
|
<PackageId>LiteCharms.Entities</PackageId>
|
||||||
|
<Version>1.0.20</Version>
|
||||||
|
<Authors>Khwezi Mngoma</Authors>
|
||||||
|
<Company>Lite Charms (PTY) Ltd</Company>
|
||||||
|
<Description>Shared entities for Lite Charms applications.</Description>
|
||||||
|
<PackageProjectUrl>https://gitea.khongisa.co.za/litecharms/components</PackageProjectUrl>
|
||||||
|
<RepositoryUrl>https://gitea.khongisa.co.za/litecharms/components.git</RepositoryUrl>
|
||||||
|
<RepositoryType>git</RepositoryType>
|
||||||
|
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||||
|
<PackageTags>utility;dotnet</PackageTags>
|
||||||
|
<PackageIcon>icon.png</PackageIcon>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="..\LICENSE" Pack="true" PackagePath="\"/>
|
||||||
|
<None Include="..\icon.png" Pack="true" PackagePath="\" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<!-- Database -->
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.7" />
|
||||||
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.7" />
|
||||||
|
|
||||||
|
<!-- Global Usings -->
|
||||||
|
<Using Include="Microsoft.EntityFrameworkCore" />
|
||||||
|
<Using Include="Microsoft.EntityFrameworkCore.Metadata.Builders" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\LiteCharms.Models\LiteCharms.Models.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@@ -3,7 +3,7 @@ using LiteCharms.Features.MidrandBooks.Products;
|
|||||||
|
|
||||||
namespace LiteCharms.Features.MidrandBooks.Seed;
|
namespace LiteCharms.Features.MidrandBooks.Seed;
|
||||||
|
|
||||||
public class CategorySeederService(CategoryService categoryService, ProductService productService, IFeatureManager features,
|
public sealed class CategorySeederService(CategoryService categoryService, ProductService productService, IFeatureManager features,
|
||||||
ILogger<CategorySeederService> logger) : BackgroundService
|
ILogger<CategorySeederService> logger) : BackgroundService
|
||||||
{
|
{
|
||||||
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
namespace LiteCharms.Features.MidrandBooks.Seed.Configuration;
|
namespace LiteCharms.Features.MidrandBooks.Seed.Configuration;
|
||||||
|
|
||||||
public class CdnSettings
|
public sealed class CdnSettings
|
||||||
{
|
{
|
||||||
public string? BaseCdn { get; set; }
|
public string? BaseCdn { get; set; }
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ using LiteCharms.Features.MidrandBooks.Orders.Models;
|
|||||||
|
|
||||||
namespace LiteCharms.Features.MidrandBooks.Seed;
|
namespace LiteCharms.Features.MidrandBooks.Seed;
|
||||||
|
|
||||||
public class CustomerSeederService(CustomerService customerService, OrderService orderService, IFeatureManager features,
|
public sealed class CustomerSeederService(CustomerService customerService, OrderService orderService, IFeatureManager features,
|
||||||
ILogger<CustomerSeederService> logger) : BackgroundService
|
ILogger<CustomerSeederService> logger) : BackgroundService
|
||||||
{
|
{
|
||||||
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
||||||
|
|||||||
+19
-19
@@ -11,12 +11,12 @@
|
|||||||
<!-- Quartz Scheduler-->
|
<!-- Quartz Scheduler-->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Bogus" Version="35.6.5" />
|
<PackageReference Include="Bogus" Version="35.6.5" />
|
||||||
<PackageReference Include="Meziantou.Analyzer" Version="3.0.98">
|
<PackageReference Include="Meziantou.Analyzer" Version="3.0.103">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="4.5.0" />
|
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="4.5.0" />
|
||||||
<PackageReference Include="OpenTelemetry" Version="1.15.3" />
|
<PackageReference Include="OpenTelemetry" Version="1.16.0" />
|
||||||
<PackageReference Include="Quartz" Version="3.18.1" />
|
<PackageReference Include="Quartz" Version="3.18.1" />
|
||||||
<PackageReference Include="Quartz.Plugins" Version="3.18.1" />
|
<PackageReference Include="Quartz.Plugins" Version="3.18.1" />
|
||||||
<PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.18.1" />
|
<PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.18.1" />
|
||||||
@@ -30,11 +30,11 @@
|
|||||||
|
|
||||||
<!-- Configuration -->
|
<!-- Configuration -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.9" />
|
||||||
|
|
||||||
<!-- Global Usings -->
|
<!-- Global Usings -->
|
||||||
<Using Include="Microsoft.Extensions.Configuration" />
|
<Using Include="Microsoft.Extensions.Configuration" />
|
||||||
@@ -47,9 +47,9 @@
|
|||||||
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" 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.Data" Version="9.0.0" />
|
||||||
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" 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.EntityFrameworkCore.InMemory" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.9" />
|
||||||
|
|
||||||
<!-- Global Usings -->
|
<!-- Global Usings -->
|
||||||
<Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
|
<Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
|
||||||
@@ -58,12 +58,12 @@
|
|||||||
|
|
||||||
<!-- Open Telemetry -->
|
<!-- Open Telemetry -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
|
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.16.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
|
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.16.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
|
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
|
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
|
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
|
||||||
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
|
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.16.0" />
|
||||||
|
|
||||||
<!-- Global Usings -->
|
<!-- Global Usings -->
|
||||||
<Using Include="OpenTelemetry.Resources" />
|
<Using Include="OpenTelemetry.Resources" />
|
||||||
@@ -75,13 +75,13 @@
|
|||||||
|
|
||||||
<!-- Database -->
|
<!-- Database -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.8" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.9">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
@@ -116,8 +116,8 @@
|
|||||||
|
|
||||||
<!-- Amazon S3 SDK -->
|
<!-- Amazon S3 SDK -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.1" />
|
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.7" />
|
||||||
<PackageReference Include="AWSSDK.S3" Version="4.0.23.4" />
|
<PackageReference Include="AWSSDK.S3" Version="4.0.24.4" />
|
||||||
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
|
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
|
||||||
|
|
||||||
<!-- global Usings -->
|
<!-- global Usings -->
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ using LiteCharms.Features.MidrandBooks.Seed.Configuration;
|
|||||||
|
|
||||||
namespace LiteCharms.Features.MidrandBooks.Seed;
|
namespace LiteCharms.Features.MidrandBooks.Seed;
|
||||||
|
|
||||||
public class ProductsSeederService(ProductService productService, AuthorService authorService, BooksService booksService,
|
public sealed class ProductsSeederService(ProductService productService, AuthorService authorService, BooksService booksService,
|
||||||
IFeatureManager features, IOptions<CdnSettings> options, ILogger<ProductsSeederService> logger) : BackgroundService
|
IFeatureManager features, IOptions<CdnSettings> options, ILogger<ProductsSeederService> logger) : BackgroundService
|
||||||
{
|
{
|
||||||
private readonly CdnSettings cdnSettings = options.Value;
|
private readonly CdnSettings cdnSettings = options.Value;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"FeatureManagement": {
|
"FeatureManagement": {
|
||||||
"CategorySeederService": true,
|
"CategorySeederService": false,
|
||||||
"CustomerSeederService": false,
|
"CustomerSeederService": false,
|
||||||
"ProductsSeederService": false
|
"ProductsSeederService": false
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
using LiteCharms.Features.MidrandBooks.Authors;
|
using LiteCharms.Features.MidrandBooks.Authors;
|
||||||
using LiteCharms.Features.MidrandBooks.Authors.Models;
|
using LiteCharms.Features.MidrandBooks.Authors.Models;
|
||||||
using LiteCharms.Features.MidrandBooks.Tests.Common;
|
|
||||||
using LiteCharms.Features.Models;
|
using LiteCharms.Features.Models;
|
||||||
|
using LiteCharms.Features.Tests.Common;
|
||||||
|
|
||||||
namespace LiteCharms.Features.MidrandBooks.Tests;
|
namespace LiteCharms.Features.MidrandBooks.Tests;
|
||||||
|
|
||||||
public class AuthorServiceFeatureTests(Fixture fixture, ITestOutputHelper output) : IClassFixture<Fixture>
|
public class AuthorServiceFeatureTests(Fixture fixture) : IClassFixture<Fixture>
|
||||||
{
|
{
|
||||||
private readonly AuthorService authorService = fixture.Services.GetRequiredService<AuthorService>();
|
private readonly AuthorService authorService = fixture.Services.GetRequiredService<AuthorService>();
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
using LiteCharms.Features.MidrandBooks.AuthorBooks;
|
using LiteCharms.Features.MidrandBooks.AuthorBooks;
|
||||||
using LiteCharms.Features.MidrandBooks.Tests.Common;
|
using LiteCharms.Features.Tests.Common;
|
||||||
|
|
||||||
namespace LiteCharms.Features.MidrandBooks.Tests;
|
namespace LiteCharms.Features.MidrandBooks.Tests;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
using LiteCharms.Features.MidrandBooks.Categories;
|
using LiteCharms.Features.MidrandBooks.Categories;
|
||||||
using LiteCharms.Features.MidrandBooks.Tests.Common;
|
using LiteCharms.Features.Tests.Common;
|
||||||
|
|
||||||
namespace LiteCharms.Features.MidrandBooks.Tests;
|
namespace LiteCharms.Features.MidrandBooks.Tests;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
using LiteCharms.Features.MidrandBooks.Customers;
|
using LiteCharms.Features.MidrandBooks.Customers;
|
||||||
using LiteCharms.Features.MidrandBooks.Customers.Models;
|
using LiteCharms.Features.MidrandBooks.Customers.Models;
|
||||||
using LiteCharms.Features.MidrandBooks.Tests.Common;
|
using LiteCharms.Features.Tests.Common;
|
||||||
|
|
||||||
namespace LiteCharms.Features.MidrandBooks.Tests;
|
namespace LiteCharms.Features.MidrandBooks.Tests;
|
||||||
|
|
||||||
|
|||||||
+3
-7
@@ -17,7 +17,7 @@
|
|||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
|
||||||
<PackageReference Include="xunit" Version="2.9.3" />
|
<PackageReference Include="xunit" Version="2.9.3" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
|
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
@@ -35,19 +35,15 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\LiteCharms.Features.MidrandBooks\LiteCharms.Features.MidrandBooks.csproj" />
|
<ProjectReference Include="..\LiteCharms.Features.MidrandBooks\LiteCharms.Features.MidrandBooks.csproj" />
|
||||||
|
<ProjectReference Include="..\LiteCharms.Features.Tests.Common\LiteCharms.Features.Tests.Common.csproj" />
|
||||||
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
|
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Using Include="System.Net" />
|
||||||
<Using Include="System.Text.Json" />
|
<Using Include="System.Text.Json" />
|
||||||
<Using Include="System.Diagnostics" />
|
<Using Include="System.Diagnostics" />
|
||||||
<Using Include="Xunit" />
|
<Using Include="Xunit" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<None Update="appsettings.json">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using LiteCharms.Features.MidrandBooks.Orders;
|
using LiteCharms.Features.MidrandBooks.Orders;
|
||||||
using LiteCharms.Features.MidrandBooks.Orders.Models;
|
using LiteCharms.Features.MidrandBooks.Orders.Models;
|
||||||
using LiteCharms.Features.MidrandBooks.Tests.Common;
|
|
||||||
using LiteCharms.Features.Models;
|
using LiteCharms.Features.Models;
|
||||||
|
using LiteCharms.Features.Tests.Common;
|
||||||
|
|
||||||
namespace LiteCharms.Features.MidrandBooks.Tests;
|
namespace LiteCharms.Features.MidrandBooks.Tests;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
using LiteCharms.Features.MidrandBooks.Pages;
|
using LiteCharms.Features.MidrandBooks.Pages;
|
||||||
using LiteCharms.Features.MidrandBooks.Tests.Common;
|
using LiteCharms.Features.Tests.Common;
|
||||||
|
|
||||||
namespace LiteCharms.Features.MidrandBooks.Tests;
|
namespace LiteCharms.Features.MidrandBooks.Tests;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,113 @@
|
|||||||
|
using LiteCharms.Features.MidrandBooks.Payments;
|
||||||
|
using LiteCharms.Features.MidrandBooks.Payments.Models;
|
||||||
|
using LiteCharms.Features.Tests.Common;
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.MidrandBooks.Tests;
|
||||||
|
|
||||||
|
public sealed class PayfastServiceFeatureTests(Fixture fixture) : IClassFixture<Fixture>
|
||||||
|
{
|
||||||
|
private readonly PayfastService payfastService = fixture.Services.GetRequiredService<PayfastService>();
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public async Task WriteLedgerEntryAsync_ShouldReturn_ResultWithGatewayLedgerId()
|
||||||
|
{
|
||||||
|
var request = new CreateGatewayLedgerEntry
|
||||||
|
{
|
||||||
|
OrderId = 1,
|
||||||
|
PaymentId = 1,
|
||||||
|
MerchantPaymentId = "M_REF_TEST_99",
|
||||||
|
PayfastPaymentId = "PF_SYS_ID_10023",
|
||||||
|
CustomerEmail = "buyer@litecharms.co.za",
|
||||||
|
AmountGross = 350.00m,
|
||||||
|
AmountFee = 12.50m,
|
||||||
|
AmountNet = 337.50m,
|
||||||
|
PaymentStatus = "COMPLETE"
|
||||||
|
};
|
||||||
|
|
||||||
|
var result = await payfastService.WriteLedgerEntryAsync(request, fixture.CancellationToken);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.True(result.Value > 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public async Task ValidateReferrerIpAsync_WithValidPayfastHostIp_ShouldReturnTrue()
|
||||||
|
{
|
||||||
|
var addresses = await Dns.GetHostAddressesAsync("sandbox.payfast.co.za", fixture.CancellationToken);
|
||||||
|
|
||||||
|
string liveTargetIp = addresses.First().ToString();
|
||||||
|
|
||||||
|
var result = await payfastService.ValidateReferrerIpAsync(liveTargetIp, true, fixture.CancellationToken);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.True(result.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public async Task ValidateReferrerIpAsync_WithUntrustedIp_ShouldReturnFalse()
|
||||||
|
{
|
||||||
|
string rogueIp = "8.8.8.8";
|
||||||
|
|
||||||
|
var result = await payfastService.ValidateReferrerIpAsync(rogueIp, true, fixture.CancellationToken);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.False(result.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public void ValidatePaymentAmount_WhenWithinAllowableDelta_ShouldReturnTrue()
|
||||||
|
{
|
||||||
|
decimal systemExpectedTotal = 199.99m;
|
||||||
|
string gatewayClearedGross = "200.00"; // Variance is exactly R0.01
|
||||||
|
|
||||||
|
var result = payfastService.ValidatePaymentAmount(systemExpectedTotal, gatewayClearedGross);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.True(result.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public void ValidatePaymentAmount_WhenVarianceBreachesDeltaBounds_ShouldReturnFalse()
|
||||||
|
{
|
||||||
|
decimal systemExpectedTotal = 199.99m;
|
||||||
|
string gatewayClearedGross = "150.00";
|
||||||
|
|
||||||
|
var result = payfastService.ValidatePaymentAmount(systemExpectedTotal, gatewayClearedGross);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.False(result.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public async Task ValidateServerConfirmationAsync_WithUnrecognizedPayload_ShouldReturnFalseFromCentralGateway()
|
||||||
|
{
|
||||||
|
// Arrange - Execute against actual Payfast servers using raw mock parameters.
|
||||||
|
// The server handshake will return 200 OK with string payload 'INVALID'
|
||||||
|
string arbitraryParameters = "merchant_id=10000000&payment_status=COMPLETE";
|
||||||
|
|
||||||
|
var result = await payfastService.ValidateServerConfirmationAsync(arbitraryParameters, isSandbox: true, fixture.CancellationToken);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.False(result.Value); // Handshake data rejected as fraudulent/unrecognized
|
||||||
|
}
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public void GenerateSignature_WithStandardTelemetryData_ShouldSucceedAndHashString()
|
||||||
|
{
|
||||||
|
var telemetryPayload = new Dictionary<string, string?>
|
||||||
|
{
|
||||||
|
{ "merchant_id", "10049307" },
|
||||||
|
{ "merchant_key", "ju6navn0jcbf0" },
|
||||||
|
{ "amount_gross", "250.00" },
|
||||||
|
{ "item_name", "Midrand School Textbook Variant A" }
|
||||||
|
};
|
||||||
|
|
||||||
|
string passphrase = "oauth_test_signature_pass";
|
||||||
|
|
||||||
|
var result = PayfastService.GenerateSignature(telemetryPayload, passphrase);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.False(string.IsNullOrWhiteSpace(result.Value));
|
||||||
|
Assert.Equal(32, result.Value.Length); // MD5 outputs hex representations totaling 32 characters
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
using LiteCharms.Features.MidrandBooks.Payments;
|
||||||
|
using LiteCharms.Features.MidrandBooks.Payments.Models;
|
||||||
|
using LiteCharms.Features.Tests.Common;
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.MidrandBooks.Tests;
|
||||||
|
|
||||||
|
public sealed class PaymentServiceFeatureTests(Fixture fixture) : IClassFixture<Fixture>
|
||||||
|
{
|
||||||
|
private readonly PaymentService paymentService = fixture.Services.GetRequiredService<PaymentService>();
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public async Task CreateRefundAsync_ShouldReturn_ResultWithRefundId()
|
||||||
|
{
|
||||||
|
var request = new CreateRefund
|
||||||
|
{
|
||||||
|
Amount = 50,
|
||||||
|
OrderId = 2,
|
||||||
|
Type = RefundTypes.Partial,
|
||||||
|
Reason = "Returned damaged book",
|
||||||
|
Status = RefundStatus.Completed,
|
||||||
|
};
|
||||||
|
|
||||||
|
var result = await paymentService.CreateRefundAsync(request, fixture.CancellationToken);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.True(result.Value > 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public async Task WriteLedgerEntryAsync_ShouldReturn_ResultWithSuccess()
|
||||||
|
{
|
||||||
|
var request = new CreateLedgerEntry
|
||||||
|
{
|
||||||
|
CustomerId = 1,
|
||||||
|
OrderId = 1,
|
||||||
|
PaymentGatewayId = 1,
|
||||||
|
PaymentGatewayReference = "TEST REFERENCE",
|
||||||
|
PaymentId = 1,
|
||||||
|
Status = LedgerStatuses.Received,
|
||||||
|
};
|
||||||
|
|
||||||
|
var result = await paymentService.WriteLedgerEntryAsync(request, fixture.CancellationToken);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
}
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public async Task GetPaymentGatewayAsync_ShouldReturn_ResultWithPaymentGateway()
|
||||||
|
{
|
||||||
|
var result = await paymentService.GetPaymentGatewayAsync(1, fixture.CancellationToken);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.NotNull(result.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public async Task CreatePaymentGatewayAsync_ShouldReturn_ResultWithGatewayId()
|
||||||
|
{
|
||||||
|
var request = new CreatePaymentGateway
|
||||||
|
{
|
||||||
|
IsSandbox = true,
|
||||||
|
MerchantId = "10049307",
|
||||||
|
MerchantKey = "ju6navn0jcbf0",
|
||||||
|
Name = "Payfast",
|
||||||
|
Website = "https://sandbox.payfast.co.za/eng/process",
|
||||||
|
};
|
||||||
|
|
||||||
|
var result = await paymentService.CreatePaymentGatewayAsync(request, fixture.CancellationToken);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.True(result.Value > 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public async Task CompletePaymentAsync_ShouldReturn_ResultWithSuccess()
|
||||||
|
{
|
||||||
|
var result = await paymentService.CompletePaymentAsync(1, PaymentStatuses.Paid, fixture.CancellationToken);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
}
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public async Task UpdatePaymentAsync_ShouldReturn_ResultWithSuccess()
|
||||||
|
{
|
||||||
|
var result = await paymentService.UpdatePaymentAsync(1, 200, fixture.CancellationToken);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
}
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public async Task CreatePaymentAsync_ShouldReturn_ResultWithPaymentId()
|
||||||
|
{
|
||||||
|
var result = await paymentService.CreatePaymentAsync(100, 1, "HASHEDID", fixture.CancellationToken);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.True(result.Value > 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using LiteCharms.Features.MidrandBooks.Products;
|
using LiteCharms.Features.MidrandBooks.Products;
|
||||||
using LiteCharms.Features.MidrandBooks.Products.Models;
|
using LiteCharms.Features.MidrandBooks.Products.Models;
|
||||||
using LiteCharms.Features.MidrandBooks.Tests.Common;
|
|
||||||
using LiteCharms.Features.Models;
|
using LiteCharms.Features.Models;
|
||||||
|
using LiteCharms.Features.Tests.Common;
|
||||||
|
|
||||||
namespace LiteCharms.Features.MidrandBooks.Tests;
|
namespace LiteCharms.Features.MidrandBooks.Tests;
|
||||||
|
|
||||||
@@ -9,6 +9,47 @@ public class ProductServiceFeatureTests(Fixture fixture, ITestOutputHelper outpu
|
|||||||
{
|
{
|
||||||
private readonly ProductService productService = fixture.Services.GetRequiredService<ProductService>();
|
private readonly ProductService productService = fixture.Services.GetRequiredService<ProductService>();
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public async Task CheckProductStockAvailabilityAsync_ShouldReturn_ResultWithProductInventory()
|
||||||
|
{
|
||||||
|
var result = await productService.CheckProductStockAvailabilityAsync(1, 1, fixture.CancellationToken);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.NotNull(result.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public async Task ReserveProductInventoryAsync_ShouldReturn_ResultWithSuccess()
|
||||||
|
{
|
||||||
|
var request = new ReserveStock
|
||||||
|
{
|
||||||
|
ProductId = 1,
|
||||||
|
ProductPriceId = 1,
|
||||||
|
Reservation = 100,
|
||||||
|
};
|
||||||
|
|
||||||
|
var result = await productService.ReserveProductInventoryAsync(request, fixture.CancellationToken);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.True(result.Value > 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public async Task AllocateProductInventoryAsync_ShouldReturn_ResultWithSuccess()
|
||||||
|
{
|
||||||
|
var request = new AllocateStock
|
||||||
|
{
|
||||||
|
ProductId = 1,
|
||||||
|
ProductPriceId = 1,
|
||||||
|
Allocation = 500,
|
||||||
|
};
|
||||||
|
|
||||||
|
var result = await productService.AllocateProductInventoryAsync(request, fixture.CancellationToken);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.True(result.Value > 0);
|
||||||
|
}
|
||||||
|
|
||||||
[IntegrationFact]
|
[IntegrationFact]
|
||||||
public async Task AddProductCategoryAsync_ShouldReturn_ResultWithId()
|
public async Task AddProductCategoryAsync_ShouldReturn_ResultWithId()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
{
|
|
||||||
"BookshopS3Settings": {
|
|
||||||
"ServiceUrl": "http://192.168.1.177:30900",
|
|
||||||
"Region": "garage",
|
|
||||||
"BucketName": "bookshop",
|
|
||||||
"CdnBaseUrl": "https://bookshop.cdn.khongisa.co.za"
|
|
||||||
},
|
|
||||||
"Email": {
|
|
||||||
"Credentials": {
|
|
||||||
"Username": "shop@litecharms.co.za"
|
|
||||||
},
|
|
||||||
"Port": 465,
|
|
||||||
"Host": "mail.litecharms.co.za",
|
|
||||||
"UseSsl": true
|
|
||||||
},
|
|
||||||
"Monitoring": {
|
|
||||||
"ApiKey": "",
|
|
||||||
"Address": "http://aspire-dashboard-service.aspire.svc.cluster.local:18889",
|
|
||||||
"ServiceName": "LiteCharms.LeadGenerator"
|
|
||||||
},
|
|
||||||
"Logging": {
|
|
||||||
"LogLevel": {
|
|
||||||
"Default": "Information",
|
|
||||||
"Microsoft.AspNetCore": "Warning"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"AllowedHosts": "*"
|
|
||||||
}
|
|
||||||
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
namespace LiteCharms.Features.MidrandBooks.Abstractions;
|
namespace LiteCharms.Features.MidrandBooks.Abstractions;
|
||||||
|
|
||||||
public interface IService;
|
public interface IMidrandBooks;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
using LiteCharms.Features.MidrandBooks.Abstractions;
|
using LiteCharms.Features.Abstractions;
|
||||||
using LiteCharms.Features.MidrandBooks.AuthorBooks.Models;
|
using LiteCharms.Features.MidrandBooks.AuthorBooks.Models;
|
||||||
using LiteCharms.Features.MidrandBooks.Extensions;
|
using LiteCharms.Features.MidrandBooks.Extensions;
|
||||||
using LiteCharms.Features.MidrandBooks.Postgres;
|
using LiteCharms.Features.MidrandBooks.Postgres;
|
||||||
@@ -58,6 +58,30 @@ public sealed class BooksService(IDbContextFactory<MidrandBooksDbContext> contex
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<AuthorBook>> GetBookByProductIdAsync(long productId, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var book = await context.Books
|
||||||
|
.AsNoTracking()
|
||||||
|
.Include(b => b.Author)
|
||||||
|
.Include(b => b.Product)
|
||||||
|
.ThenInclude(b => b!.Prices)
|
||||||
|
.Include(b => b.Pages)
|
||||||
|
.FirstOrDefaultAsync(b => b.ProductId == productId, cancellationToken);
|
||||||
|
|
||||||
|
return book is null
|
||||||
|
? Result.Fail<AuthorBook>(new Error($"Book with product ID {productId} not found"))
|
||||||
|
: Result.Ok(book.ToModel());
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail<AuthorBook>(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public async ValueTask<Result<AuthorBook>> GetBookAsync(long bookId, CancellationToken cancellationToken = default)
|
public async ValueTask<Result<AuthorBook>> GetBookAsync(long bookId, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using LiteCharms.Features.MidrandBooks.Abstractions;
|
using LiteCharms.Features.Abstractions;
|
||||||
using LiteCharms.Features.MidrandBooks.Authors.Models;
|
using LiteCharms.Features.MidrandBooks.Authors.Models;
|
||||||
using LiteCharms.Features.MidrandBooks.Extensions;
|
using LiteCharms.Features.MidrandBooks.Extensions;
|
||||||
using LiteCharms.Features.MidrandBooks.Postgres;
|
using LiteCharms.Features.MidrandBooks.Postgres;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using LiteCharms.Features.MidrandBooks.Abstractions;
|
using LiteCharms.Features.Abstractions;
|
||||||
using LiteCharms.Features.MidrandBooks.Categories.Models;
|
using LiteCharms.Features.MidrandBooks.Categories.Models;
|
||||||
using LiteCharms.Features.MidrandBooks.Extensions;
|
using LiteCharms.Features.MidrandBooks.Extensions;
|
||||||
using LiteCharms.Features.MidrandBooks.Postgres;
|
using LiteCharms.Features.MidrandBooks.Postgres;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using LiteCharms.Features.MidrandBooks.Abstractions;
|
using LiteCharms.Features.Abstractions;
|
||||||
using LiteCharms.Features.MidrandBooks.Customers.Models;
|
using LiteCharms.Features.MidrandBooks.Customers.Models;
|
||||||
using LiteCharms.Features.MidrandBooks.Extensions;
|
using LiteCharms.Features.MidrandBooks.Extensions;
|
||||||
using LiteCharms.Features.MidrandBooks.Postgres;
|
using LiteCharms.Features.MidrandBooks.Postgres;
|
||||||
@@ -334,6 +334,28 @@ public sealed class CustomerService(IDbContextFactory<MidrandBooksDbContext> con
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<Customer>> GetCustomerAsync(string email, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var customer = await context.Customers
|
||||||
|
.AsNoTracking()
|
||||||
|
.Include(c => c.Contacts)
|
||||||
|
.Include(c => c.Addresses)
|
||||||
|
.FirstOrDefaultAsync(c => c.Email == email, cancellationToken);
|
||||||
|
|
||||||
|
return customer is not null
|
||||||
|
? Result.Ok(customer.ToModel())
|
||||||
|
: Result.Fail<Customer>(new Error($"Customer with email '{email}' does not exist."));
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail<Customer>(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public async ValueTask<Result<Customer>> GetCustomerAsync(long customerId, CancellationToken cancellationToken = default)
|
public async ValueTask<Result<Customer>> GetCustomerAsync(long customerId, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ public sealed class CustomerConfiguration : IEntityTypeConfiguration<Customer>
|
|||||||
builder.Property(c => c.Company).IsRequired(false);
|
builder.Property(c => c.Company).IsRequired(false);
|
||||||
builder.Property(c => c.VatNumber).IsRequired(false);
|
builder.Property(c => c.VatNumber).IsRequired(false);
|
||||||
builder.Property(c => c.Email).IsRequired();
|
builder.Property(c => c.Email).IsRequired();
|
||||||
builder.Property(c => c.Phone).IsRequired();
|
builder.Property(c => c.Phone).IsRequired(false);
|
||||||
builder.Property(c => c.Website).IsRequired();
|
builder.Property(c => c.Website).IsRequired(false);
|
||||||
builder.Property(c => c.Enabled).HasDefaultValue(true);
|
builder.Property(c => c.Enabled).HasDefaultValue(true);
|
||||||
|
|
||||||
builder.OwnsMany(f => f.SocialMedia, b => { b.ToJson(); });
|
builder.OwnsMany(f => f.SocialMedia, b => { b.ToJson(); });
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
namespace LiteCharms.Features.MidrandBooks;
|
|
||||||
|
|
||||||
public enum PublisherTypes : int
|
|
||||||
{
|
|
||||||
Individual = 0,
|
|
||||||
Company = 1,
|
|
||||||
Organization = 2,
|
|
||||||
SelfPublished = 3,
|
|
||||||
UniversityPress = 4,
|
|
||||||
GovernmentAgency = 5,
|
|
||||||
NonProfit = 6,
|
|
||||||
Independent = 7
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum BookTypes : int
|
|
||||||
{
|
|
||||||
Fiction = 0,
|
|
||||||
NonFiction = 1,
|
|
||||||
Academic = 2,
|
|
||||||
SelfHelp = 3,
|
|
||||||
Biography = 4,
|
|
||||||
Poetry = 5,
|
|
||||||
Children = 6,
|
|
||||||
YoungAdult = 7,
|
|
||||||
ScienceFiction = 8,
|
|
||||||
Fantasy = 9
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum BookContentTypes : int
|
|
||||||
{
|
|
||||||
Text = 0,
|
|
||||||
Image = 1,
|
|
||||||
Video = 2,
|
|
||||||
Audio = 3,
|
|
||||||
Interactive = 4,
|
|
||||||
Markdown = 5,
|
|
||||||
Html = 6,
|
|
||||||
Json = 7,
|
|
||||||
Yaml = 8
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum BookPageTypes : int
|
|
||||||
{
|
|
||||||
Cover = 0,
|
|
||||||
Preface = 1,
|
|
||||||
Introduction = 2,
|
|
||||||
Content = 3,
|
|
||||||
Closing = 4,
|
|
||||||
Referencer = 5,
|
|
||||||
Credits = 6,
|
|
||||||
BackCover = 7
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum ProductTypes : int
|
|
||||||
{
|
|
||||||
Book = 1,
|
|
||||||
Journal = 2,
|
|
||||||
Magazine = 3,
|
|
||||||
EBook = 4,
|
|
||||||
Audiobook = 5,
|
|
||||||
Accessory = 6
|
|
||||||
}
|
|
||||||
@@ -4,12 +4,86 @@ using LiteCharms.Features.MidrandBooks.Categories.Models;
|
|||||||
using LiteCharms.Features.MidrandBooks.Customers.Models;
|
using LiteCharms.Features.MidrandBooks.Customers.Models;
|
||||||
using LiteCharms.Features.MidrandBooks.Orders.Models;
|
using LiteCharms.Features.MidrandBooks.Orders.Models;
|
||||||
using LiteCharms.Features.MidrandBooks.Pages.Models;
|
using LiteCharms.Features.MidrandBooks.Pages.Models;
|
||||||
|
using LiteCharms.Features.MidrandBooks.Payments.Models;
|
||||||
using LiteCharms.Features.MidrandBooks.Products.Models;
|
using LiteCharms.Features.MidrandBooks.Products.Models;
|
||||||
|
|
||||||
namespace LiteCharms.Features.MidrandBooks.Extensions;
|
namespace LiteCharms.Features.MidrandBooks.Extensions;
|
||||||
|
|
||||||
public static class Mappers
|
public static class Mappers
|
||||||
{
|
{
|
||||||
|
public static PaymentGatewayLedger ToModel(this Payments.Entities.PaymentGatewayLedger entity) => new()
|
||||||
|
{
|
||||||
|
Id = entity.Id,
|
||||||
|
CreatedAt = entity.CreatedAt,
|
||||||
|
CustomerEmail = entity.CustomerEmail,
|
||||||
|
OrderId = entity.OrderId,
|
||||||
|
PaymentId = entity.PaymentId,
|
||||||
|
MerchantPaymentId = entity.MerchantPaymentId,
|
||||||
|
PayfastPaymentId = entity.PayfastPaymentId,
|
||||||
|
PaymentStatus = entity.PaymentStatus,
|
||||||
|
AmountGross = entity.AmountGross,
|
||||||
|
AmountFee = entity.AmountFee,
|
||||||
|
AmountNet = entity.AmountNet
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Refund ToModel(this Payments.Entities.Refund entity) => new()
|
||||||
|
{
|
||||||
|
CreatedAt = entity.CreatedAt,
|
||||||
|
Amount = entity.Amount,
|
||||||
|
Id = entity.Id,
|
||||||
|
OrderId = entity.OrderId,
|
||||||
|
Reason = entity.Reason,
|
||||||
|
Status = entity.Status,
|
||||||
|
Type = entity.Type,
|
||||||
|
UpdatedAt = entity.UpdatedAt,
|
||||||
|
};
|
||||||
|
|
||||||
|
public static PaymentLedger ToModel(this Payments.Entities.PaymentLedger entity) => new()
|
||||||
|
{
|
||||||
|
Id = entity.Id,
|
||||||
|
CreatedAt = entity.CreatedAt,
|
||||||
|
CustomerId = entity.CustomerId,
|
||||||
|
OrderId = entity.OrderId,
|
||||||
|
PaymentId = entity.PaymentId,
|
||||||
|
Status = entity.Status,
|
||||||
|
MerchantPaymentId = entity.MerchantPaymentId,
|
||||||
|
};
|
||||||
|
|
||||||
|
public static PaymentGateway ToModel(this Payments.Entities.PaymentGateway entity) => new()
|
||||||
|
{
|
||||||
|
Id = entity.Id,
|
||||||
|
CreatedAt = entity.CreatedAt,
|
||||||
|
UpdatedAt = entity.UpdatedAt,
|
||||||
|
Enabled = entity.Enabled,
|
||||||
|
IsSandbox = entity.IsSandbox,
|
||||||
|
MerchantId = entity.MerchantId,
|
||||||
|
MerchantKey = entity.MerchantKey,
|
||||||
|
Name = entity.Name,
|
||||||
|
Website = entity.Website,
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Payment ToModel(this Payments.Entities.Payment entity) => new()
|
||||||
|
{
|
||||||
|
Id = entity.Id,
|
||||||
|
Amount = entity.Amount,
|
||||||
|
CreatedAt = entity.CreatedAt,
|
||||||
|
OrderId = entity.OrderId,
|
||||||
|
Reference = entity.Reference,
|
||||||
|
Status = entity.Status,
|
||||||
|
UpdatedAt = entity.UpdatedAt,
|
||||||
|
};
|
||||||
|
|
||||||
|
public static ProductInventory ToModel(this Products.Entities.ProductInventory entity) => new()
|
||||||
|
{
|
||||||
|
Id = entity.Id,
|
||||||
|
CreatedAt = entity.CreatedAt,
|
||||||
|
ProductId = entity.ProductId,
|
||||||
|
ProductPriceId = entity.ProductPriceId,
|
||||||
|
Status = entity.Status,
|
||||||
|
TotalAllocated = entity.TotalAllocated,
|
||||||
|
TotalReserved = entity.TotalReserved,
|
||||||
|
};
|
||||||
|
|
||||||
public static Category ToModel(this Categories.Entities.Category entity) => new()
|
public static Category ToModel(this Categories.Entities.Category entity) => new()
|
||||||
{
|
{
|
||||||
Id = entity.Id,
|
Id = entity.Id,
|
||||||
|
|||||||
@@ -1,18 +1,27 @@
|
|||||||
using LiteCharms.Features.MidrandBooks.Abstractions;
|
using LiteCharms.Features.Abstractions;
|
||||||
|
using LiteCharms.Features.Browser;
|
||||||
|
using LiteCharms.Features.MidrandBooks.Abstractions;
|
||||||
|
|
||||||
namespace LiteCharms.Features.MidrandBooks.Extensions;
|
namespace LiteCharms.Features.MidrandBooks.Extensions;
|
||||||
|
|
||||||
public static class Shop
|
public static class Shop
|
||||||
{
|
{
|
||||||
public static IServiceCollection AddShopServices(this IServiceCollection services)
|
public static IServiceCollection AddShopServices(this IServiceCollection services, bool includeLocalStorage = false)
|
||||||
{
|
{
|
||||||
var serviceType = typeof(IService);
|
var serviceType = typeof(IService);
|
||||||
|
|
||||||
var implementations = Assembly.GetExecutingAssembly().GetTypes()
|
var sharedImplementations = typeof(IFeatures).Assembly.GetTypes()
|
||||||
.Where(t => serviceType.IsAssignableFrom(t) && t.IsClass && !t.IsAbstract);
|
.Where(t => serviceType.IsAssignableFrom(t) && t.IsClass && !t.IsAbstract);
|
||||||
|
|
||||||
foreach (var implementation in implementations)
|
foreach (var sharedImplementation in sharedImplementations) services.AddScoped(sharedImplementation);
|
||||||
services.AddScoped(implementation);
|
|
||||||
|
var coreImplementations = typeof(IMidrandBooks).Assembly.GetTypes()
|
||||||
|
.Where(t => serviceType.IsAssignableFrom(t) && t.IsClass && !t.IsAbstract);
|
||||||
|
|
||||||
|
foreach (var coreImplementation in coreImplementations) services.AddScoped(coreImplementation);
|
||||||
|
|
||||||
|
if (includeLocalStorage)
|
||||||
|
services.AddScoped<LocalStorageService>();
|
||||||
|
|
||||||
return services;
|
return services;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,11 +32,11 @@
|
|||||||
<!-- Quartz Scheduler-->
|
<!-- Quartz Scheduler-->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Humanizer" Version="3.0.10" />
|
<PackageReference Include="Humanizer" Version="3.0.10" />
|
||||||
<PackageReference Include="Meziantou.Analyzer" Version="3.0.98">
|
<PackageReference Include="Meziantou.Analyzer" Version="3.0.103">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="OpenTelemetry" Version="1.15.3" />
|
<PackageReference Include="OpenTelemetry" Version="1.16.0" />
|
||||||
<PackageReference Include="Quartz" Version="3.18.1" />
|
<PackageReference Include="Quartz" Version="3.18.1" />
|
||||||
<PackageReference Include="Quartz.Plugins" Version="3.18.1" />
|
<PackageReference Include="Quartz.Plugins" Version="3.18.1" />
|
||||||
<PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.18.1" />
|
<PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.18.1" />
|
||||||
@@ -50,11 +50,11 @@
|
|||||||
|
|
||||||
<!-- Configuration -->
|
<!-- Configuration -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.9" />
|
||||||
|
|
||||||
<!-- Global Usings -->
|
<!-- Global Usings -->
|
||||||
<Using Include="Microsoft.Extensions.Configuration" />
|
<Using Include="Microsoft.Extensions.Configuration" />
|
||||||
@@ -67,9 +67,9 @@
|
|||||||
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" 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.Data" Version="9.0.0" />
|
||||||
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" 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.EntityFrameworkCore.InMemory" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.9" />
|
||||||
|
|
||||||
<!-- Global Usings -->
|
<!-- Global Usings -->
|
||||||
<Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
|
<Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
|
||||||
@@ -78,12 +78,12 @@
|
|||||||
|
|
||||||
<!-- Open Telemetry -->
|
<!-- Open Telemetry -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
|
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.16.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
|
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.16.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
|
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
|
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
|
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
|
||||||
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
|
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.16.0" />
|
||||||
|
|
||||||
<!-- Global Usings -->
|
<!-- Global Usings -->
|
||||||
<Using Include="OpenTelemetry.Resources" />
|
<Using Include="OpenTelemetry.Resources" />
|
||||||
@@ -95,13 +95,13 @@
|
|||||||
|
|
||||||
<!-- Database -->
|
<!-- Database -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.8" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.9">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
@@ -136,8 +136,8 @@
|
|||||||
|
|
||||||
<!-- Amazon S3 SDK -->
|
<!-- Amazon S3 SDK -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.1" />
|
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.7" />
|
||||||
<PackageReference Include="AWSSDK.S3" Version="4.0.23.4" />
|
<PackageReference Include="AWSSDK.S3" Version="4.0.24.4" />
|
||||||
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
|
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
|
||||||
|
|
||||||
<!-- global Usings -->
|
<!-- global Usings -->
|
||||||
@@ -148,6 +148,11 @@
|
|||||||
|
|
||||||
<!-- Shared Usings -->
|
<!-- Shared Usings -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Using Include="Microsoft.AspNetCore.Http" />
|
||||||
|
<Using Include="System.Net.Sockets" />
|
||||||
|
<Using Include="System.Text.RegularExpressions" />
|
||||||
|
<Using Include="System.Web" />
|
||||||
|
<Using Include="System.Net" />
|
||||||
<Using Include="Humanizer" />
|
<Using Include="Humanizer" />
|
||||||
<Using Include="System.Globalization" />
|
<Using Include="System.Globalization" />
|
||||||
<Using Include="System.Reflection" />
|
<Using Include="System.Reflection" />
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using LiteCharms.Features.MidrandBooks.Abstractions;
|
using LiteCharms.Features.Abstractions;
|
||||||
using LiteCharms.Features.MidrandBooks.Extensions;
|
using LiteCharms.Features.MidrandBooks.Extensions;
|
||||||
using LiteCharms.Features.MidrandBooks.Orders.Models;
|
using LiteCharms.Features.MidrandBooks.Orders.Models;
|
||||||
using LiteCharms.Features.MidrandBooks.Postgres;
|
using LiteCharms.Features.MidrandBooks.Postgres;
|
||||||
@@ -164,6 +164,27 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
|
|||||||
public async ValueTask<Result> CancelOrderAsync(long orderId, CancellationToken cancellationToken = default) =>
|
public async ValueTask<Result> CancelOrderAsync(long orderId, CancellationToken cancellationToken = default) =>
|
||||||
await UpdateOrderStatusAsync(orderId, OrderStatus.Cancelled, cancellationToken);
|
await UpdateOrderStatusAsync(orderId, OrderStatus.Cancelled, cancellationToken);
|
||||||
|
|
||||||
|
public async ValueTask<Result<Order>> GetPendingOrderAsync(long customerId, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var order = await context.Orders.AsNoTracking()
|
||||||
|
.Where(o => o.Status == OrderStatus.Pending && o.CustomerId == customerId)
|
||||||
|
.OrderByDescending(o => o.Id)
|
||||||
|
.FirstOrDefaultAsync(cancellationToken);
|
||||||
|
|
||||||
|
return order is not null
|
||||||
|
? Result.Ok(order.ToModel())
|
||||||
|
: Result.Fail<Order>("Order not found.");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail<Order>(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public async ValueTask<Result<Order>> GetOrderAsync(long orderId, CancellationToken cancellationToken = default)
|
public async ValueTask<Result<Order>> GetOrderAsync(long orderId, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using LiteCharms.Features.MidrandBooks.Abstractions;
|
using LiteCharms.Features.Abstractions;
|
||||||
using LiteCharms.Features.MidrandBooks.Extensions;
|
using LiteCharms.Features.MidrandBooks.Extensions;
|
||||||
using LiteCharms.Features.MidrandBooks.Pages.Models;
|
using LiteCharms.Features.MidrandBooks.Pages.Models;
|
||||||
using LiteCharms.Features.MidrandBooks.Postgres;
|
using LiteCharms.Features.MidrandBooks.Postgres;
|
||||||
|
|||||||
@@ -0,0 +1,153 @@
|
|||||||
|
using LiteCharms.Features.Browser;
|
||||||
|
using LiteCharms.Features.Hasher;
|
||||||
|
using LiteCharms.Features.MidrandBooks.Authors.Models;
|
||||||
|
using LiteCharms.Features.MidrandBooks.Payments.Models;
|
||||||
|
using LiteCharms.Features.MidrandBooks.Products.Models;
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments;
|
||||||
|
|
||||||
|
public sealed class CartService(LocalStorageService localStorage)
|
||||||
|
{
|
||||||
|
private readonly string CartStorageKey = HashService.ToMd5Hash(nameof(Cart)).Value;
|
||||||
|
|
||||||
|
public Cart ShoppingCart { get; private set; } = new();
|
||||||
|
|
||||||
|
public event Action? OnCartChanged;
|
||||||
|
|
||||||
|
public static Func<Cart, long, int> GetCartItemQuantity = (shoppingCart, productPriceId) =>
|
||||||
|
shoppingCart.Items.FirstOrDefault(p => p.Price!.Id == productPriceId)?.Quantity ?? 1;
|
||||||
|
|
||||||
|
public Cart GetCart() => ShoppingCart;
|
||||||
|
|
||||||
|
public void NotifyStateChanged() => OnCartChanged?.Invoke();
|
||||||
|
|
||||||
|
public async Task LoadCartFromStorageAsync()
|
||||||
|
{
|
||||||
|
var loadResult = await localStorage.GetAsync<Cart>(CartStorageKey);
|
||||||
|
|
||||||
|
if (loadResult.IsFailed) await localStorage.SaveAsync(CartStorageKey, ShoppingCart);
|
||||||
|
|
||||||
|
if (loadResult.IsSuccess) ShoppingCart = loadResult.Value;
|
||||||
|
|
||||||
|
NotifyStateChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task SaveCartToStorageAsync() => await localStorage.SaveAsync(CartStorageKey, ShoppingCart);
|
||||||
|
|
||||||
|
public void AddItem(ProductPrice productPrice, Product product, Author author)
|
||||||
|
{
|
||||||
|
var itemExists = false;
|
||||||
|
|
||||||
|
for (var i = 0; i < ShoppingCart.Items.Count; i++)
|
||||||
|
{
|
||||||
|
if (ShoppingCart.Items[i].Price!.Id == productPrice.Id)
|
||||||
|
{
|
||||||
|
ShoppingCart.Items[i].Quantity++;
|
||||||
|
ShoppingCart.Items[i].Amount += productPrice.Amount;
|
||||||
|
|
||||||
|
itemExists = true;
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!itemExists)
|
||||||
|
ShoppingCart.Items.Add(new CartItem
|
||||||
|
{
|
||||||
|
Product = product,
|
||||||
|
Author = author,
|
||||||
|
Price = productPrice,
|
||||||
|
Amount = productPrice.Amount,
|
||||||
|
Quantity = 1,
|
||||||
|
});
|
||||||
|
|
||||||
|
CalculateTotalPrice();
|
||||||
|
NotifyStateChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void UpdateQuantity(long productPriceId, int delta)
|
||||||
|
{
|
||||||
|
for (var i = 0; i < ShoppingCart.Items.Count; i++)
|
||||||
|
{
|
||||||
|
if (ShoppingCart.Items[i].Price!.Id == productPriceId)
|
||||||
|
{
|
||||||
|
var oldQuantity = ShoppingCart.Items[i].Quantity;
|
||||||
|
var pricePerUnit = ShoppingCart.Items[i].Price!.Amount;
|
||||||
|
|
||||||
|
ShoppingCart.Items[i].Quantity += delta;
|
||||||
|
ShoppingCart.Items[i].Amount = pricePerUnit * ShoppingCart.Items[i].Quantity;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
CalculateTotalPrice();
|
||||||
|
NotifyStateChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RemoveOneItem(long productPriceId)
|
||||||
|
{
|
||||||
|
for (var i = 0; i < ShoppingCart.Items.Count; i++)
|
||||||
|
{
|
||||||
|
if (ShoppingCart.Items[i].Price!.Id == productPriceId)
|
||||||
|
{
|
||||||
|
if (ShoppingCart.Items[i].Quantity <= 1)
|
||||||
|
{
|
||||||
|
ShoppingCart.Items.Remove(ShoppingCart.Items[i]);
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ShoppingCart.Items[i].Quantity--;
|
||||||
|
ShoppingCart.Items[i].Amount -= ShoppingCart.Items[i].Price!.Amount;
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
CalculateTotalPrice();
|
||||||
|
NotifyStateChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RemoveAllSameItem(long productPriceId)
|
||||||
|
{
|
||||||
|
if (ShoppingCart.Items.Count == 0) return;
|
||||||
|
|
||||||
|
var item = ShoppingCart.Items.FirstOrDefault(i => i.Price?.Id == productPriceId);
|
||||||
|
|
||||||
|
if (item is not null) ShoppingCart.Items.Remove(item);
|
||||||
|
|
||||||
|
CalculateTotalPrice();
|
||||||
|
NotifyStateChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Clear()
|
||||||
|
{
|
||||||
|
if(ShoppingCart.CustomerId is not null || ShoppingCart.OrderId is not null)
|
||||||
|
{
|
||||||
|
ShoppingCart.TotalAmount = 0;
|
||||||
|
ShoppingCart.TotalVat = 0;
|
||||||
|
ShoppingCart.Items.Clear();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ShoppingCart = new Cart();
|
||||||
|
|
||||||
|
NotifyStateChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
public decimal CalculateTotalPrice()
|
||||||
|
{
|
||||||
|
if (ShoppingCart.Items.Count == 0) return 0;
|
||||||
|
|
||||||
|
var gross = ShoppingCart.Items.Sum(i => i.Amount);
|
||||||
|
|
||||||
|
if (!ShoppingCart.IsVatInclusive) ShoppingCart.TotalVat = gross * ShoppingCart.VatRate;
|
||||||
|
|
||||||
|
ShoppingCart.TotalAmount = gross + ShoppingCart.TotalVat;
|
||||||
|
|
||||||
|
return ShoppingCart.TotalAmount;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
using LiteCharms.Features.MidrandBooks.Orders.Entities;
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Entities;
|
||||||
|
|
||||||
|
[EntityTypeConfiguration<PaymentConfiguration, Payment>]
|
||||||
|
public class Payment : Models.Payment
|
||||||
|
{
|
||||||
|
public virtual Order? Order { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Entities;
|
||||||
|
|
||||||
|
public sealed class PaymentConfiguration : IEntityTypeConfiguration<Payment>
|
||||||
|
{
|
||||||
|
public void Configure(EntityTypeBuilder<Payment> builder)
|
||||||
|
{
|
||||||
|
builder.ToTable("Payments");
|
||||||
|
|
||||||
|
builder.HasKey(f => f.Id);
|
||||||
|
builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd().HasDefaultValueSql("now()");
|
||||||
|
builder.Property(f => f.UpdatedAt);
|
||||||
|
builder.Property(f => f.Status).IsRequired();
|
||||||
|
builder.Property(f => f.Reference).IsRequired();
|
||||||
|
builder.Property(f => f.OrderId).IsRequired();
|
||||||
|
builder.Property(f => f.Amount).IsRequired().HasPrecision(18, 2);
|
||||||
|
|
||||||
|
builder.HasOne(f => f.Order)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey(f => f.OrderId)
|
||||||
|
.OnDelete(DeleteBehavior.Restrict);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Entities;
|
||||||
|
|
||||||
|
[EntityTypeConfiguration<PaymentGatewayConfiguration, PaymentGateway>]
|
||||||
|
public class PaymentGateway : Models.PaymentGateway;
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Entities;
|
||||||
|
|
||||||
|
public sealed class PaymentGatewayConfiguration : IEntityTypeConfiguration<PaymentGateway>
|
||||||
|
{
|
||||||
|
public void Configure(EntityTypeBuilder<PaymentGateway> builder)
|
||||||
|
{
|
||||||
|
builder.ToTable("Gateways");
|
||||||
|
|
||||||
|
builder.HasKey(f => f.Id);
|
||||||
|
builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd().HasDefaultValueSql("now()");
|
||||||
|
builder.Property(f => f.UpdatedAt);
|
||||||
|
builder.Property(f => f.Website).IsRequired(false);
|
||||||
|
builder.Property(f => f.IsSandbox);
|
||||||
|
builder.Property(f => f.MerchantKey).IsRequired();
|
||||||
|
builder.Property(f => f.MerchantId).IsRequired();
|
||||||
|
builder.Property(f => f.Enabled);
|
||||||
|
builder.Property(f => f.Name).IsRequired();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
using LiteCharms.Features.MidrandBooks.Orders.Entities;
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Entities;
|
||||||
|
|
||||||
|
[EntityTypeConfiguration<PaymentGatewayLedgerConfiguration, PaymentGatewayLedger>]
|
||||||
|
public class PaymentGatewayLedger : Models.PaymentGatewayLedger
|
||||||
|
{
|
||||||
|
public virtual Order? Order { get; set; }
|
||||||
|
|
||||||
|
public virtual Payment? Payment { get; set; }
|
||||||
|
}
|
||||||
+30
@@ -0,0 +1,30 @@
|
|||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Entities;
|
||||||
|
|
||||||
|
public sealed class PaymentGatewayLedgerConfiguration : IEntityTypeConfiguration<PaymentGatewayLedger>
|
||||||
|
{
|
||||||
|
public void Configure(EntityTypeBuilder<PaymentGatewayLedger> builder)
|
||||||
|
{
|
||||||
|
builder.ToTable("GatewayLedger");
|
||||||
|
|
||||||
|
builder.HasKey(f => f.Id);
|
||||||
|
builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd().HasDefaultValueSql("now()");
|
||||||
|
builder.Property(f => f.OrderId).IsRequired();
|
||||||
|
builder.Property(f => f.PaymentId).IsRequired();
|
||||||
|
builder.Property(f => f.PayfastPaymentId).IsRequired();
|
||||||
|
builder.Property(f => f.MerchantPaymentId).IsRequired();
|
||||||
|
builder.Property(f => f.AmountGross).IsRequired().HasPrecision(18, 2);
|
||||||
|
builder.Property(f => f.AmountFee).IsRequired().HasPrecision(18, 2);
|
||||||
|
builder.Property(f => f.AmountNet).IsRequired().HasPrecision(18, 2);
|
||||||
|
builder.Property(f => f.CustomerEmail).IsRequired(false);
|
||||||
|
|
||||||
|
builder.HasOne(f => f.Order)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey(f => f.OrderId)
|
||||||
|
.OnDelete(DeleteBehavior.Cascade);
|
||||||
|
|
||||||
|
builder.HasOne(f => f.Payment)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey(f => f.PaymentId)
|
||||||
|
.OnDelete(DeleteBehavior.Cascade);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
using LiteCharms.Features.MidrandBooks.Customers.Entities;
|
||||||
|
using LiteCharms.Features.MidrandBooks.Orders.Entities;
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Entities;
|
||||||
|
|
||||||
|
[EntityTypeConfiguration<PaymentLedgerConfiguration, PaymentLedger>]
|
||||||
|
public class PaymentLedger : Models.PaymentLedger
|
||||||
|
{
|
||||||
|
public virtual Payment? Payment { get; set; }
|
||||||
|
|
||||||
|
public virtual Order? Order { get; set; }
|
||||||
|
|
||||||
|
public virtual Customer? Customer { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Entities;
|
||||||
|
|
||||||
|
public sealed class PaymentLedgerConfiguration : IEntityTypeConfiguration<PaymentLedger>
|
||||||
|
{
|
||||||
|
public void Configure(EntityTypeBuilder<PaymentLedger> builder)
|
||||||
|
{
|
||||||
|
builder.ToTable("Ledger");
|
||||||
|
|
||||||
|
builder.HasKey(f => f.Id);
|
||||||
|
builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd().HasDefaultValueSql("now()");
|
||||||
|
builder.Property(f => f.Status).IsRequired();
|
||||||
|
builder.Property(f => f.MerchantPaymentId).IsRequired(false);
|
||||||
|
builder.Property(f => f.OrderId).IsRequired();
|
||||||
|
builder.Property(f => f.CustomerId).IsRequired();
|
||||||
|
builder.Property(f => f.PaymentId).IsRequired();
|
||||||
|
|
||||||
|
builder.HasOne(f => f.Payment)
|
||||||
|
.WithMany()
|
||||||
|
.IsRequired()
|
||||||
|
.HasForeignKey(f => f.PaymentId)
|
||||||
|
.OnDelete(DeleteBehavior.Cascade);
|
||||||
|
|
||||||
|
builder.HasOne(f => f.Order)
|
||||||
|
.WithMany()
|
||||||
|
.IsRequired()
|
||||||
|
.HasForeignKey(f => f.OrderId)
|
||||||
|
.OnDelete(DeleteBehavior.Cascade);
|
||||||
|
|
||||||
|
builder.HasOne(f => f.Customer)
|
||||||
|
.WithMany()
|
||||||
|
.IsRequired()
|
||||||
|
.HasForeignKey(f => f.CustomerId);
|
||||||
|
}
|
||||||
|
}
|
||||||
+104
@@ -0,0 +1,104 @@
|
|||||||
|
using LiteCharms.Features.Hasher;
|
||||||
|
using LiteCharms.Features.Mediator;
|
||||||
|
using LiteCharms.Features.MidrandBooks.Orders;
|
||||||
|
using LiteCharms.Features.MidrandBooks.Payments.Models;
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Events.Handlers;
|
||||||
|
|
||||||
|
public sealed class PayfastPaymentConfirmationReceivedEventHandler(IServiceProvider services, ILogger<PayfastPaymentConfirmationReceivedEvent> logger) :
|
||||||
|
INotificationHandler<PayfastPaymentConfirmationReceivedEvent>
|
||||||
|
{
|
||||||
|
public async ValueTask Handle(PayfastPaymentConfirmationReceivedEvent notification, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
using var activity = MediatorTelemetry.Source.StartActivity($"Quartz: {typeof(PayfastPaymentConfirmationReceivedEvent).Name}");
|
||||||
|
activity?.SetTag("event.correlation_id", notification.CorrelationId);
|
||||||
|
|
||||||
|
await using var scope = services.CreateAsyncScope();
|
||||||
|
var hashService = scope.ServiceProvider.GetRequiredService<HashService>();
|
||||||
|
var orderService = scope.ServiceProvider.GetRequiredService<OrderService>();
|
||||||
|
var paymentService = scope.ServiceProvider.GetRequiredService<PaymentService>();
|
||||||
|
var payfastService = scope.ServiceProvider.GetRequiredService<PayfastService>();
|
||||||
|
|
||||||
|
var payload = notification.Payload ?? throw new Exception("Payload metadata context is null.");
|
||||||
|
|
||||||
|
var hashResult = hashService.DecodeLongIdHash(payload.MerchantPaymentId!);
|
||||||
|
if (hashResult.IsFailed) throw new Exception("Failed to decode application tracking hash key identifier.");
|
||||||
|
|
||||||
|
var orderResult = await orderService.GetOrderAsync(hashResult.Value, cancellationToken);
|
||||||
|
if (orderResult.IsFailed) throw new Exception("Target system order entity context cannot be traced.");
|
||||||
|
|
||||||
|
var paymentResult = await paymentService.GetOrderPaymentAsync(orderResult.Value.Id, cancellationToken);
|
||||||
|
if (paymentResult.IsFailed) throw new Exception("Target payment ledger entity cannot be resolved.");
|
||||||
|
|
||||||
|
var isAlreadyProcessed = await paymentService.HasLedgerEntryAsync(orderResult.Value.Id, paymentResult.Value.Id, cancellationToken);
|
||||||
|
if (isAlreadyProcessed.Value)
|
||||||
|
{
|
||||||
|
logger.LogWarning("Webhook reference token '{Ref}' already verified. Skipping processing routines.", payload.MerchantPaymentId);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var isAmountValid = payfastService.ValidatePaymentAmount(orderResult.Value.Total, payload.AmountGross);
|
||||||
|
if (!isAmountValid.Value)
|
||||||
|
throw new Exception("Security validation exception: Transaction cost variance bounds breached (Price Tampering Detected).");
|
||||||
|
|
||||||
|
decimal.TryParse(payload.AmountGross, CultureInfo.InvariantCulture, out var gross);
|
||||||
|
decimal.TryParse(payload.AmountFee, CultureInfo.InvariantCulture, out var fee);
|
||||||
|
decimal.TryParse(payload.AmountNet, CultureInfo.InvariantCulture, out var net);
|
||||||
|
string status = payload.PaymentStatus ?? "UNKNOWN";
|
||||||
|
|
||||||
|
await payfastService.WriteLedgerEntryAsync(new CreateGatewayLedgerEntry
|
||||||
|
{
|
||||||
|
OrderId = orderResult.Value.Id,
|
||||||
|
PaymentId = paymentResult.Value.Id,
|
||||||
|
MerchantPaymentId = payload.MerchantPaymentId!,
|
||||||
|
PayfastPaymentId = payload.PaymentId,
|
||||||
|
CustomerEmail = payload.EmailAddress,
|
||||||
|
AmountFee = fee,
|
||||||
|
AmountGross = gross,
|
||||||
|
AmountNet = net,
|
||||||
|
PaymentStatus = status,
|
||||||
|
}, cancellationToken);
|
||||||
|
|
||||||
|
if (status.Equals("COMPLETE", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
var ledgerWriteResult = await paymentService.WriteLedgerEntryAsync(new CreateLedgerEntry
|
||||||
|
{
|
||||||
|
OrderId = orderResult.Value.Id,
|
||||||
|
PaymentId = paymentResult.Value.Id,
|
||||||
|
PaymentGatewayReference = payload.MerchantPaymentId!,
|
||||||
|
Status = LedgerStatuses.Completed,
|
||||||
|
CustomerId = orderResult.Value.CustomerId,
|
||||||
|
}, cancellationToken);
|
||||||
|
|
||||||
|
if (ledgerWriteResult.IsFailed) throw new Exception("Failed to write ledger entry for payment confirmation.");
|
||||||
|
|
||||||
|
var completePaymentResult = await paymentService.CompletePaymentAsync(paymentResult.Value.Id, PaymentStatuses.Paid, cancellationToken);
|
||||||
|
if (completePaymentResult.IsFailed) throw new Exception("Failed to update payment status to 'Paid'.");
|
||||||
|
|
||||||
|
var updateOrderResult = await orderService.UpdateOrderStatusAsync(orderResult.Value.Id, OrderStatus.Completed, cancellationToken);
|
||||||
|
if (updateOrderResult.IsFailed) throw new Exception("Failed to update order status to 'Completed'.");
|
||||||
|
|
||||||
|
logger.LogInformation("Order payment verified secure and cleared successfully.");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
LedgerStatuses ledgerStatus = status.Equals("CANCELLED", StringComparison.OrdinalIgnoreCase)
|
||||||
|
? LedgerStatuses.Cancelled
|
||||||
|
: LedgerStatuses.Failed;
|
||||||
|
|
||||||
|
await paymentService.WriteLedgerEntryAsync(new CreateLedgerEntry
|
||||||
|
{
|
||||||
|
OrderId = orderResult.Value.Id,
|
||||||
|
PaymentId = paymentResult.Value.Id,
|
||||||
|
PaymentGatewayReference = payload.MerchantPaymentId!,
|
||||||
|
Status = ledgerStatus,
|
||||||
|
CustomerId = orderResult.Value.CustomerId,
|
||||||
|
}, cancellationToken);
|
||||||
|
|
||||||
|
logger.LogInformation("Webhook pipeline logged non-success entry to ledger with status: {Status}", status);
|
||||||
|
}
|
||||||
|
|
||||||
|
activity?.SetStatus(ActivityStatusCode.Ok);
|
||||||
|
}
|
||||||
|
}
|
||||||
+30
@@ -0,0 +1,30 @@
|
|||||||
|
using LiteCharms.Features.Abstractions;
|
||||||
|
using LiteCharms.Features.MidrandBooks.Payments.Models;
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Events;
|
||||||
|
|
||||||
|
public sealed class PayfastPaymentConfirmationReceivedEvent : EventBase, IEvent
|
||||||
|
{
|
||||||
|
public string Name { get; set; } = nameof(PayfastPaymentConfirmationReceivedEvent);
|
||||||
|
|
||||||
|
public PayfastWebhookPayload? Payload { get; set; }
|
||||||
|
|
||||||
|
public string? RemoteIpAddress { get; set; }
|
||||||
|
|
||||||
|
public bool PerformBackgroundChecks { get; set; }
|
||||||
|
|
||||||
|
public bool AllowLoopback { get; set; }
|
||||||
|
|
||||||
|
public PayfastPaymentConfirmationReceivedEvent() { }
|
||||||
|
|
||||||
|
private PayfastPaymentConfirmationReceivedEvent(PayfastWebhookPayload? payload, string paymentId, bool performBackgroundChecks = true, bool allowLoopback = false)
|
||||||
|
{
|
||||||
|
Payload = payload;
|
||||||
|
CorrelationId = paymentId;
|
||||||
|
PerformBackgroundChecks = performBackgroundChecks;
|
||||||
|
AllowLoopback = allowLoopback;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static PayfastPaymentConfirmationReceivedEvent Create(PayfastWebhookPayload? payload, string paymentId, bool performBackgroundChecks = true, bool allowLoopback = false) =>
|
||||||
|
new(payload, paymentId, performBackgroundChecks, allowLoopback);
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Models;
|
||||||
|
|
||||||
|
public sealed class Cart
|
||||||
|
{
|
||||||
|
public long? CustomerId { get; set; }
|
||||||
|
|
||||||
|
public long? OrderId { get; set; }
|
||||||
|
|
||||||
|
public decimal TotalAmount { get; set; }
|
||||||
|
|
||||||
|
public decimal TotalVat { get; set; }
|
||||||
|
|
||||||
|
public decimal VatRate { get; set; } = 0.15m;
|
||||||
|
|
||||||
|
public bool IsVatInclusive { get; set; } = true;
|
||||||
|
|
||||||
|
public IList<CartItem> Items { get; set; } = [];
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
using LiteCharms.Features.MidrandBooks.Authors.Models;
|
||||||
|
using LiteCharms.Features.MidrandBooks.Products.Models;
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Models;
|
||||||
|
|
||||||
|
public sealed class CartItem
|
||||||
|
{
|
||||||
|
public Author? Author { get; set; }
|
||||||
|
|
||||||
|
public Product? Product { get; set; }
|
||||||
|
|
||||||
|
public ProductPrice? Price { get; set; }
|
||||||
|
|
||||||
|
public int Quantity { get; set; }
|
||||||
|
|
||||||
|
public decimal Amount { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Models;
|
||||||
|
|
||||||
|
public sealed class PayfastWebhookPayload
|
||||||
|
{
|
||||||
|
public string? MerchantId { get; set; }
|
||||||
|
|
||||||
|
public string? MerchantKey { get; set; }
|
||||||
|
|
||||||
|
public string? Signature { get; set; }
|
||||||
|
|
||||||
|
public string? MerchantPaymentId { get; set; }
|
||||||
|
|
||||||
|
public string? PaymentId { get; set; }
|
||||||
|
|
||||||
|
public string? PaymentStatus { get; set; }
|
||||||
|
|
||||||
|
public string? ItemName { get; set; }
|
||||||
|
|
||||||
|
public string? ItemDescription { get; set; }
|
||||||
|
|
||||||
|
public string? AmountGross { get; set; }
|
||||||
|
|
||||||
|
public string? AmountFee { get; set; }
|
||||||
|
|
||||||
|
public string? AmountNet { get; set; }
|
||||||
|
|
||||||
|
public string? NameFirst { get; set; }
|
||||||
|
|
||||||
|
public string? NameLast { get; set; }
|
||||||
|
|
||||||
|
public string? EmailAddress { get; set; }
|
||||||
|
|
||||||
|
public string? CustomStr1 { get; set; }
|
||||||
|
|
||||||
|
public string? CustomInt1 { get; set; }
|
||||||
|
|
||||||
|
public string? Token { get; set; }
|
||||||
|
|
||||||
|
public IDictionary<string, string?> ToParamDictionary() => new Dictionary<string, string?>
|
||||||
|
(StringComparer.Ordinal)
|
||||||
|
{
|
||||||
|
{ "merchant_id", MerchantId },
|
||||||
|
{ "merchant_key", MerchantKey },
|
||||||
|
{ "m_payment_id", MerchantPaymentId },
|
||||||
|
{ "pf_payment_id", PaymentId },
|
||||||
|
{ "payment_status", PaymentStatus },
|
||||||
|
{ "item_name", ItemName },
|
||||||
|
{ "item_description", ItemDescription },
|
||||||
|
{ "amount_gross", AmountGross },
|
||||||
|
{ "amount_fee", AmountFee },
|
||||||
|
{ "amount_net", AmountNet },
|
||||||
|
{ "custom_str1", CustomStr1 },
|
||||||
|
{ "custom_int1", CustomInt1 },
|
||||||
|
{ "name_first", NameFirst },
|
||||||
|
{ "name_last", NameLast },
|
||||||
|
{ "email_address", EmailAddress },
|
||||||
|
{ "token", Token }
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Models;
|
||||||
|
|
||||||
|
public class Payment
|
||||||
|
{
|
||||||
|
public long Id { get; set; }
|
||||||
|
|
||||||
|
public DateTime CreatedAt { get; set; }
|
||||||
|
|
||||||
|
public DateTime? UpdatedAt { get; set; }
|
||||||
|
|
||||||
|
public decimal Amount { get; set; }
|
||||||
|
|
||||||
|
public long OrderId { get; set; }
|
||||||
|
|
||||||
|
public string? Reference { get; set; }
|
||||||
|
|
||||||
|
public PaymentStatuses Status { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Models;
|
||||||
|
|
||||||
|
public class PaymentGateway
|
||||||
|
{
|
||||||
|
public long Id { get; set; }
|
||||||
|
|
||||||
|
public DateTime CreatedAt { get; set; }
|
||||||
|
|
||||||
|
public DateTime? UpdatedAt { get; set; }
|
||||||
|
|
||||||
|
public string? Name { get; set; }
|
||||||
|
|
||||||
|
public string? Website { get; set; }
|
||||||
|
|
||||||
|
public string? MerchantId { get; set; }
|
||||||
|
|
||||||
|
public string? MerchantKey { get; set; }
|
||||||
|
|
||||||
|
public bool IsSandbox { get; set; }
|
||||||
|
|
||||||
|
public bool Enabled { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Models;
|
||||||
|
|
||||||
|
public class PaymentGatewayLedger
|
||||||
|
{
|
||||||
|
public long Id { get; set; }
|
||||||
|
|
||||||
|
public DateTime CreatedAt { get; set; }
|
||||||
|
|
||||||
|
public string? CustomerEmail { get; set; }
|
||||||
|
|
||||||
|
public long OrderId { get; set; }
|
||||||
|
|
||||||
|
public long PaymentId { get; set; }
|
||||||
|
|
||||||
|
public string? MerchantPaymentId { get; set; }
|
||||||
|
|
||||||
|
public string? PayfastPaymentId { get; set; }
|
||||||
|
|
||||||
|
public string? PaymentStatus { get; set; }
|
||||||
|
|
||||||
|
public decimal AmountGross { get; set; }
|
||||||
|
|
||||||
|
public decimal AmountFee { get; set; }
|
||||||
|
|
||||||
|
public decimal AmountNet { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Models;
|
||||||
|
|
||||||
|
public class PaymentLedger
|
||||||
|
{
|
||||||
|
public long Id { get; set; }
|
||||||
|
|
||||||
|
public DateTime CreatedAt { get; set; }
|
||||||
|
|
||||||
|
public LedgerStatuses Status { get; set; }
|
||||||
|
|
||||||
|
public long OrderId { get; set; }
|
||||||
|
|
||||||
|
public long PaymentId { get; set; }
|
||||||
|
|
||||||
|
public long CustomerId { get; set; }
|
||||||
|
|
||||||
|
public string? MerchantPaymentId { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments.Models;
|
||||||
|
|
||||||
|
public sealed record CreateGatewayLedgerEntry
|
||||||
|
{
|
||||||
|
public string? CustomerEmail { get; set; }
|
||||||
|
|
||||||
|
public required long OrderId { get; set; }
|
||||||
|
|
||||||
|
public required long PaymentId { get; set; }
|
||||||
|
|
||||||
|
public string? MerchantPaymentId { get; set; }
|
||||||
|
|
||||||
|
public string? PayfastPaymentId { get; set; }
|
||||||
|
|
||||||
|
public string? PaymentStatus { get; set; }
|
||||||
|
|
||||||
|
public decimal AmountGross { get; set; }
|
||||||
|
|
||||||
|
public decimal AmountFee { get; set; }
|
||||||
|
|
||||||
|
public decimal AmountNet { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed record UpdateRefund
|
||||||
|
{
|
||||||
|
public long OrderId { get; set; }
|
||||||
|
|
||||||
|
public RefundStatus Status { get; set; }
|
||||||
|
|
||||||
|
public string? Reason { get; set; }
|
||||||
|
|
||||||
|
public decimal Amount { get; set; }
|
||||||
|
};
|
||||||
|
|
||||||
|
public sealed record CreateRefund
|
||||||
|
{
|
||||||
|
public long OrderId { get; set; }
|
||||||
|
|
||||||
|
public RefundTypes Type { get; set; }
|
||||||
|
|
||||||
|
public RefundStatus Status { get; set; }
|
||||||
|
|
||||||
|
public string? Reason { get; set; }
|
||||||
|
|
||||||
|
public decimal Amount { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed record CreateLedgerEntry
|
||||||
|
{
|
||||||
|
public required LedgerStatuses Status { get; set; }
|
||||||
|
|
||||||
|
public required long OrderId { get; set; }
|
||||||
|
|
||||||
|
public required long PaymentId { get; set; }
|
||||||
|
|
||||||
|
public required long CustomerId { get; set; }
|
||||||
|
|
||||||
|
public string? PaymentGatewayReference { get; set; }
|
||||||
|
|
||||||
|
public long? PaymentGatewayId { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed record CreatePaymentGateway
|
||||||
|
{
|
||||||
|
public required string? Name { get; set; }
|
||||||
|
|
||||||
|
public string? Website { get; set; }
|
||||||
|
|
||||||
|
public required string? MerchantId { get; set; }
|
||||||
|
|
||||||
|
public required string? MerchantKey { get; set; }
|
||||||
|
|
||||||
|
public bool IsSandbox { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,245 @@
|
|||||||
|
using LiteCharms.Features.Abstractions;
|
||||||
|
using LiteCharms.Features.Api.Configuration;
|
||||||
|
using LiteCharms.Features.Hasher;
|
||||||
|
using LiteCharms.Features.MidrandBooks.Payments.Models;
|
||||||
|
using LiteCharms.Features.MidrandBooks.Postgres;
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.MidrandBooks.Payments;
|
||||||
|
|
||||||
|
public sealed partial class PayfastService(IDbContextFactory<MidrandBooksDbContext> contextFactory,
|
||||||
|
IOptions<PayfastSettings> payfastOptions, ILogger<PayfastService> logger, IHttpClientFactory httpClientFactory) : IService
|
||||||
|
{
|
||||||
|
[GeneratedRegex(@"%[0-9A-Fa-f]{2}", RegexOptions.None, matchTimeoutMilliseconds: 1000)]
|
||||||
|
public static partial Regex PercentEncodingRegex { get; }
|
||||||
|
|
||||||
|
public async ValueTask<Result<long>> WriteLedgerEntryAsync(CreateGatewayLedgerEntry request, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
if(!await context.Orders.AnyAsync(o => o.Id == request.OrderId, cancellationToken))
|
||||||
|
return Result.Fail<long>("Referenced order ID does not exist in database.");
|
||||||
|
|
||||||
|
if(!await context.Payments.AnyAsync(p => p.Id == request.PaymentId, cancellationToken))
|
||||||
|
return Result.Fail<long>("Referenced payment ID does not exist in database.");
|
||||||
|
|
||||||
|
var entry = context.GatewayLedger.Add(new Entities.PaymentGatewayLedger
|
||||||
|
{
|
||||||
|
CustomerEmail = request.CustomerEmail,
|
||||||
|
OrderId = request.OrderId,
|
||||||
|
PaymentId = request.PaymentId,
|
||||||
|
MerchantPaymentId = request.MerchantPaymentId,
|
||||||
|
PayfastPaymentId = request.PayfastPaymentId,
|
||||||
|
PaymentStatus = request.PaymentStatus,
|
||||||
|
AmountGross = request.AmountGross,
|
||||||
|
AmountFee = request.AmountFee,
|
||||||
|
AmountNet = request.AmountNet,
|
||||||
|
CreatedAt = DateTime.UtcNow,
|
||||||
|
});
|
||||||
|
|
||||||
|
return await context.SaveChangesAsync(cancellationToken) > 0
|
||||||
|
? Result.Ok(entry.Entity.Id)
|
||||||
|
: Result.Fail<long>("Failed to save Payfast ledger entry to database.");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail<long>(new Error("Failed to write Payfast ledger entry to database.").CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool VerifyIncomingSignatureFromForm(IFormCollection formCollection, string passphrase)
|
||||||
|
{
|
||||||
|
var sortedFields = new Dictionary<string, string>(StringComparer.Ordinal);
|
||||||
|
|
||||||
|
foreach (var field in formCollection)
|
||||||
|
{
|
||||||
|
sortedFields.Add(field.Key, field.Value.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!sortedFields.TryGetValue("signature", out var incomingSignature)) return false;
|
||||||
|
|
||||||
|
var stringBuilder = new StringBuilder();
|
||||||
|
|
||||||
|
foreach (var key in sortedFields.Keys)
|
||||||
|
{
|
||||||
|
if (key.Equals("signature", StringComparison.OrdinalIgnoreCase)) continue;
|
||||||
|
|
||||||
|
string encodedVal = HttpUtility.UrlEncode(sortedFields[key].Trim());
|
||||||
|
string cleanVal = PercentEncodingRegex.Replace(encodedVal, m => m.Value.ToUpperInvariant());
|
||||||
|
|
||||||
|
stringBuilder.Append($"{key}={cleanVal}&");
|
||||||
|
}
|
||||||
|
|
||||||
|
string encodedPassphrase = HttpUtility.UrlEncode(passphrase.Trim());
|
||||||
|
string safePassphrase = PercentEncodingRegex.Replace(encodedPassphrase, m => m.Value.ToUpperInvariant());
|
||||||
|
|
||||||
|
stringBuilder.Append($"passphrase={safePassphrase}");
|
||||||
|
|
||||||
|
string generatedSignature = HashService.ToMd5Hash(stringBuilder.ToString()).Value;
|
||||||
|
|
||||||
|
return incomingSignature.Equals(generatedSignature, StringComparison.OrdinalIgnoreCase);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<bool>> ValidateReferrerIpAsync(string remoteIpAddress, bool allowLoopback = false, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
if(payfastOptions.Value?.ValidHosts?.Length == 0)
|
||||||
|
return Result.Fail<bool>("Valid payfast hosts not configured.");
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(remoteIpAddress))
|
||||||
|
return Result.Fail<bool>("Remote IP address is null or whitespace.");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var validIps = new HashSet<IPAddress>();
|
||||||
|
|
||||||
|
foreach (var host in payfastOptions.Value!.ValidHosts!)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var addresses = await Dns.GetHostAddressesAsync(host, cancellationToken);
|
||||||
|
|
||||||
|
foreach (var addr in addresses) validIps.Add(addr);
|
||||||
|
}
|
||||||
|
catch (SocketException ex)
|
||||||
|
{
|
||||||
|
logger.LogWarning(ex, "DNS warning: Failed to resolve Payfast node '{Host}'. It may be decommissioned or unreachable.", host);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (IPAddress.TryParse(remoteIpAddress, out var incomingIp))
|
||||||
|
{
|
||||||
|
if (allowLoopback && IPAddress.IsLoopback(incomingIp))
|
||||||
|
{
|
||||||
|
logger.LogInformation("Local development loopback IP '{RemoteIp}' allowed bypassing DNS verification.", remoteIpAddress);
|
||||||
|
return Result.Ok(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool isValid = validIps.Contains(incomingIp);
|
||||||
|
|
||||||
|
if (!isValid)
|
||||||
|
logger.LogWarning("SECURITY ALERT: Webhook IP '{RemoteIp}' originated from an unlisted host schema.", remoteIpAddress);
|
||||||
|
|
||||||
|
return Result.Ok(isValid);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Result.Fail<bool>("Invalid remote IP address format.");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail<bool>(new Error("DNS Verification error while scanning Payfast IP nodes.").CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public Result<bool> ValidatePaymentAmount(decimal expectedTotal, string? amountGrossString)
|
||||||
|
{
|
||||||
|
if (!decimal.TryParse(amountGrossString, CultureInfo.InvariantCulture, out decimal grossAmount))
|
||||||
|
return Result.Fail<bool>("Failed to parse payment amount.");
|
||||||
|
|
||||||
|
decimal delta = Math.Abs(expectedTotal - grossAmount);
|
||||||
|
|
||||||
|
bool isAmountValid = delta <= 0.01m;
|
||||||
|
|
||||||
|
if (!isAmountValid)
|
||||||
|
logger.LogError("FINANCIAL DRIFT EXCEPTION: Expected order total R{Expected} but gateway cleared R{Cleared}.", expectedTotal, grossAmount);
|
||||||
|
|
||||||
|
return Result.Ok(isAmountValid);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<bool>> ValidateServerConfirmationAsync(string rawQueryParamString, bool isSandbox, CancellationToken ct)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
string host = isSandbox ? "sandbox.payfast.co.za" : "www.payfast.co.za";
|
||||||
|
string targetUrl = $"https://{host}/eng/query/validate";
|
||||||
|
|
||||||
|
using var content = new StringContent(rawQueryParamString, Encoding.UTF8, "application/x-www-form-urlencoded");
|
||||||
|
|
||||||
|
var httpClient = httpClientFactory.CreateClient();
|
||||||
|
|
||||||
|
var response = await httpClient.PostAsync(targetUrl, content, ct);
|
||||||
|
|
||||||
|
if (!response.IsSuccessStatusCode) return Result.Fail<bool>("Failed to validate server confirmation.");
|
||||||
|
|
||||||
|
string responseText = await response.Content.ReadAsStringAsync(ct);
|
||||||
|
|
||||||
|
bool isValidated = string.Equals(responseText.Trim(), "VALID", StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
||||||
|
if (!isValidated)
|
||||||
|
logger.LogWarning("SECURITY WARNING: Payfast back-channel returned validation response: '{Response}'", responseText);
|
||||||
|
|
||||||
|
return Result.Ok(isValidated);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail<bool>(new Error("Failed to complete back-channel cURL verification handshakes with Payfast remote endpoints.").CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Result<string> GenerateSignature(IDictionary<string, string?> data, string? passPhrase = null)
|
||||||
|
{
|
||||||
|
var pfOutput = new StringBuilder();
|
||||||
|
|
||||||
|
var mandatorySequence = GetPayfastMandatoryFieldSequence();
|
||||||
|
|
||||||
|
foreach (string key in mandatorySequence)
|
||||||
|
{
|
||||||
|
if (data.TryGetValue(key, out string? rawValue) && !string.IsNullOrEmpty(rawValue))
|
||||||
|
{
|
||||||
|
string encodedVal = HttpUtility.UrlEncode(rawValue.Trim());
|
||||||
|
string val = PercentEncodingRegex.Replace(encodedVal, m => m.Value.ToUpperInvariant());
|
||||||
|
|
||||||
|
pfOutput.Append($"{key}={val}&");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var getString = pfOutput.Length > 0
|
||||||
|
? pfOutput.ToString()[..^1]
|
||||||
|
: string.Empty;
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(passPhrase))
|
||||||
|
{
|
||||||
|
string encodedPassphrase = HttpUtility.UrlEncode(passPhrase.Trim());
|
||||||
|
string safePassphrase = PercentEncodingRegex.Replace(encodedPassphrase, m => m.Value.ToUpperInvariant());
|
||||||
|
|
||||||
|
getString += $"&passphrase={safePassphrase}";
|
||||||
|
}
|
||||||
|
|
||||||
|
return HashService.ToMd5Hash(getString);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string[] GetPayfastMandatoryFieldSequence() =>
|
||||||
|
[
|
||||||
|
"merchant_id",
|
||||||
|
"merchant_key",
|
||||||
|
"return_url",
|
||||||
|
"cancel_url",
|
||||||
|
"notify_url",
|
||||||
|
"name_first",
|
||||||
|
"name_last",
|
||||||
|
"email_address",
|
||||||
|
"cell_number",
|
||||||
|
"m_payment_id",
|
||||||
|
"amount",
|
||||||
|
"item_name",
|
||||||
|
"item_description",
|
||||||
|
"custom_int1",
|
||||||
|
"custom_int2",
|
||||||
|
"custom_int3",
|
||||||
|
"custom_int4",
|
||||||
|
"custom_int5",
|
||||||
|
"custom_str1",
|
||||||
|
"custom_str2",
|
||||||
|
"custom_str3",
|
||||||
|
"custom_str4",
|
||||||
|
"custom_str5",
|
||||||
|
"email_confirmation",
|
||||||
|
"confirmation_address",
|
||||||
|
"payment_method",
|
||||||
|
"subscription_type",
|
||||||
|
"billing_date",
|
||||||
|
"recurring_amount",
|
||||||
|
"frequency",
|
||||||
|
"cycles"
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -1,7 +1,301 @@
|
|||||||
using LiteCharms.Features.MidrandBooks.Abstractions;
|
using LiteCharms.Features.Abstractions;
|
||||||
|
using LiteCharms.Features.MidrandBooks.Extensions;
|
||||||
|
using LiteCharms.Features.MidrandBooks.Payments.Models;
|
||||||
|
using LiteCharms.Features.MidrandBooks.Postgres;
|
||||||
|
|
||||||
namespace LiteCharms.Features.MidrandBooks.Payments;
|
namespace LiteCharms.Features.MidrandBooks.Payments;
|
||||||
|
|
||||||
public sealed class PaymentService : IService
|
public sealed class PaymentService(IDbContextFactory<MidrandBooksDbContext> contextFactory) : IService
|
||||||
{
|
{
|
||||||
|
public async ValueTask<Result<Payment>> GetOrderPaymentAsync(long orderId, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var payment = await context.Payments.AsNoTracking()
|
||||||
|
.Where(p => p.OrderId == orderId)
|
||||||
|
.OrderByDescending(p => p.Id)
|
||||||
|
.FirstOrDefaultAsync(cancellationToken);
|
||||||
|
|
||||||
|
return payment is not null
|
||||||
|
? Result.Ok(payment.ToModel())
|
||||||
|
: Result.Fail<Payment>("Could not find payment for the order");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail<Payment>(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<Refund>> GetRefundAsync(long refundId, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var refund = await context.Refunds.AsNoTracking()
|
||||||
|
.FirstOrDefaultAsync(r => r.Id == refundId, cancellationToken);
|
||||||
|
|
||||||
|
return refund is not null
|
||||||
|
? Result.Ok(refund.ToModel())
|
||||||
|
: Result.Fail<Refund>("Could not find refund");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail<Refund>(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result> UpdateRefundAsync(long refundId, UpdateRefund request, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
if (!await context.Orders.AnyAsync(o => o.Id == request.OrderId, cancellationToken))
|
||||||
|
return Result.Fail("Order not found");
|
||||||
|
|
||||||
|
var updatedRows = await context.Refunds
|
||||||
|
.Where(r => r.Id == refundId && r.OrderId == request.OrderId)
|
||||||
|
.ExecuteUpdateAsync(setters => setters
|
||||||
|
.SetProperty(r => r.Status, request.Status)
|
||||||
|
.SetProperty(r => r.Reason, request.Reason)
|
||||||
|
.SetProperty(r => r.UpdatedAt, DateTime.UtcNow)
|
||||||
|
.SetProperty(r => r.Amount, request.Amount), cancellationToken);
|
||||||
|
|
||||||
|
return updatedRows > 0
|
||||||
|
? Result.Ok()
|
||||||
|
: Result.Fail("Failed to update refund");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<long>> CreateRefundAsync(CreateRefund request, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var order = await context.Orders.AsNoTracking()
|
||||||
|
.FirstOrDefaultAsync(o => o.Id == request.OrderId
|
||||||
|
&& o.Status == OrderStatus.Completed, cancellationToken);
|
||||||
|
|
||||||
|
if (order is null) return Result.Fail("Order not found");
|
||||||
|
|
||||||
|
if (request.Amount > order.Total)
|
||||||
|
return Result.Fail<long>("Refund amount cannot be greater than order total");
|
||||||
|
|
||||||
|
var totalRefundsPaid = await context.Refunds
|
||||||
|
.Where(r => r.OrderId == request.OrderId)
|
||||||
|
.SumAsync(r => r.Amount, cancellationToken);
|
||||||
|
|
||||||
|
if (request.Amount > (order.Total - totalRefundsPaid))
|
||||||
|
return Result.Fail<long>("Refund amount exceeds amount available for refund");
|
||||||
|
|
||||||
|
var refund = context.Refunds.Add(new Entities.Refund
|
||||||
|
{
|
||||||
|
Amount = request.Amount,
|
||||||
|
CreatedAt = DateTime.UtcNow,
|
||||||
|
OrderId = request.OrderId,
|
||||||
|
Reason = request.Reason,
|
||||||
|
Status = request.Status,
|
||||||
|
Type = request.Type,
|
||||||
|
});
|
||||||
|
|
||||||
|
return await context.SaveChangesAsync(cancellationToken) > 0
|
||||||
|
? Result.Ok(refund.Entity.Id)
|
||||||
|
: Result.Fail<long>("Failed to create refund");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<bool>> HasLedgerEntryAsync(long orderId, long paymentId, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var exists = await context.Ledger.AnyAsync(l =>
|
||||||
|
l.OrderId == orderId && l.PaymentId == paymentId && l.Status == LedgerStatuses.Completed, cancellationToken);
|
||||||
|
|
||||||
|
return Result.Ok(exists);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result> WriteLedgerEntryAsync(CreateLedgerEntry request, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
if (!await context.Orders.AnyAsync(o => o.Id == request.OrderId, cancellationToken))
|
||||||
|
return Result.Fail("Order not found");
|
||||||
|
|
||||||
|
if (!await context.Customers.AnyAsync(o => o.Id == request.CustomerId, cancellationToken))
|
||||||
|
return Result.Fail("Customer not found");
|
||||||
|
|
||||||
|
if (!await context.Orders.AnyAsync(oc => oc.Id == request.OrderId && oc.CustomerId == request.CustomerId, cancellationToken))
|
||||||
|
return Result.Fail("Customer does not match the order");
|
||||||
|
|
||||||
|
if (!await context.Payments.AnyAsync(o => o.Id == request.PaymentId && o.OrderId == request.OrderId, cancellationToken))
|
||||||
|
return Result.Fail("Payment not found");
|
||||||
|
|
||||||
|
if (request.PaymentGatewayId is not null)
|
||||||
|
if (!await context.Gateways.AnyAsync(o => o.Id == request.PaymentGatewayId, cancellationToken))
|
||||||
|
return Result.Fail("Gateway not found");
|
||||||
|
|
||||||
|
context.Ledger.Add(new Entities.PaymentLedger
|
||||||
|
{
|
||||||
|
CreatedAt = DateTime.UtcNow,
|
||||||
|
CustomerId = request.CustomerId,
|
||||||
|
OrderId = request.OrderId,
|
||||||
|
PaymentId = request.PaymentId,
|
||||||
|
MerchantPaymentId = request.PaymentGatewayReference,
|
||||||
|
Status = request.Status,
|
||||||
|
});
|
||||||
|
|
||||||
|
return await context.SaveChangesAsync(cancellationToken) > 0
|
||||||
|
? Result.Ok()
|
||||||
|
: Result.Fail("Failed to create ledger entry");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<PaymentGateway>> GetPaymentGatewayAsync(long paymentGatewayId, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var gateway = await context.Gateways.AsNoTracking().FirstOrDefaultAsync(g => g.Id == paymentGatewayId, cancellationToken);
|
||||||
|
|
||||||
|
return gateway is not null
|
||||||
|
? Result.Ok(gateway.ToModel())
|
||||||
|
: Result.Fail<PaymentGateway>("Could not find gateway");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail<PaymentGateway>(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<long>> CreatePaymentGatewayAsync(CreatePaymentGateway request, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
if (await context.Gateways.AnyAsync(g => g.MerchantId == request.MerchantId && g.MerchantKey == request.MerchantKey, cancellationToken))
|
||||||
|
return Result.Fail<long>("A gateway with the same credentials already exists");
|
||||||
|
|
||||||
|
var gateway = context.Gateways.Add(new Entities.PaymentGateway
|
||||||
|
{
|
||||||
|
CreatedAt = DateTime.UtcNow,
|
||||||
|
Enabled = true,
|
||||||
|
IsSandbox = request.IsSandbox,
|
||||||
|
MerchantId = request.MerchantId,
|
||||||
|
MerchantKey = request.MerchantKey,
|
||||||
|
Name = request.Name,
|
||||||
|
Website = request.Website,
|
||||||
|
});
|
||||||
|
|
||||||
|
return await context.SaveChangesAsync(cancellationToken) > 0
|
||||||
|
? Result.Ok(gateway.Entity.Id)
|
||||||
|
: Result.Fail<long>("Failed to create payment gateway");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail<long>(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result> CompletePaymentAsync(long paymentId, PaymentStatuses status, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
if (status == PaymentStatuses.NotPaid)
|
||||||
|
return Result.Fail("Cannot finalise a payment using NotPaid status");
|
||||||
|
|
||||||
|
var updatedRecords = await context.Payments
|
||||||
|
.Where(p => p.Id == paymentId && p.Status != PaymentStatuses.Paid && p.Status != status)
|
||||||
|
.ExecuteUpdateAsync(setters => setters
|
||||||
|
.SetProperty(u => u.Status, status)
|
||||||
|
.SetProperty(u => u.UpdatedAt, DateTime.UtcNow), cancellationToken);
|
||||||
|
|
||||||
|
return updatedRecords > 0
|
||||||
|
? Result.Ok()
|
||||||
|
: Result.Fail("Failed to update payment");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result> UpdatePaymentAsync(long paymentId, decimal amount, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var updatedRecords = await context.Payments
|
||||||
|
.Where(p => p.Id == paymentId && p.Status == PaymentStatuses.NotPaid)
|
||||||
|
.ExecuteUpdateAsync(setters => setters
|
||||||
|
.SetProperty(u => u.Amount, amount)
|
||||||
|
.SetProperty(u => u.Status, PaymentStatuses.NotPaid)
|
||||||
|
.SetProperty(u => u.UpdatedAt, DateTime.UtcNow), cancellationToken);
|
||||||
|
|
||||||
|
return updatedRecords > 0
|
||||||
|
? Result.Ok()
|
||||||
|
: Result.Fail("Failed to update payment");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<long>> CreatePaymentAsync(decimal amount, long orderId, string reference, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
if (await context.Payments.AnyAsync(p => p.OrderId == orderId && p.Amount == amount && p.Status != PaymentStatuses.Paid, cancellationToken))
|
||||||
|
return Result.Fail<long>("An order with the same amount already exists in the system");
|
||||||
|
|
||||||
|
var payment = context.Payments.Add(new Entities.Payment
|
||||||
|
{
|
||||||
|
CreatedAt = DateTime.UtcNow,
|
||||||
|
Amount = amount,
|
||||||
|
OrderId = orderId,
|
||||||
|
Reference = reference,
|
||||||
|
Status = PaymentStatuses.NotPaid,
|
||||||
|
});
|
||||||
|
|
||||||
|
return await context.SaveChangesAsync(cancellationToken) > 0
|
||||||
|
? Result.Ok(payment.Entity.Id)
|
||||||
|
: Result.Fail<long>("Failed to make payment");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail<long>(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,4 +40,14 @@ public sealed class MidrandBooksDbContext(DbContextOptions<MidrandBooksDbContext
|
|||||||
public DbSet<Category> Categories => Set<Category>();
|
public DbSet<Category> Categories => Set<Category>();
|
||||||
|
|
||||||
public DbSet<ProductCategory> ProductCategories => Set<ProductCategory>();
|
public DbSet<ProductCategory> ProductCategories => Set<ProductCategory>();
|
||||||
|
|
||||||
|
public DbSet<ProductInventory> Inventories => Set<ProductInventory>();
|
||||||
|
|
||||||
|
public DbSet<Payment> Payments => Set<Payment>();
|
||||||
|
|
||||||
|
public DbSet<PaymentGateway> Gateways => Set<PaymentGateway>();
|
||||||
|
|
||||||
|
public DbSet<PaymentLedger> Ledger => Set<PaymentLedger>();
|
||||||
|
|
||||||
|
public DbSet<PaymentGatewayLedger> GatewayLedger => Set<PaymentGatewayLedger>();
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+1235
File diff suppressed because it is too large
Load Diff
+185
@@ -0,0 +1,185 @@
|
|||||||
|
using System;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class AddedPaymentObjects : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "Gateways",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<long>(type: "bigint", nullable: false)
|
||||||
|
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||||
|
CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false, defaultValueSql: "now()"),
|
||||||
|
UpdatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
|
||||||
|
Name = table.Column<string>(type: "text", nullable: false),
|
||||||
|
Website = table.Column<string>(type: "text", nullable: true),
|
||||||
|
MerchantId = table.Column<string>(type: "text", nullable: false),
|
||||||
|
MerchantKey = table.Column<string>(type: "text", nullable: false),
|
||||||
|
Passphrase = table.Column<string>(type: "text", nullable: false),
|
||||||
|
IsSandbox = table.Column<bool>(type: "boolean", nullable: false),
|
||||||
|
Enabled = table.Column<bool>(type: "boolean", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_Gateways", x => x.Id);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "Inventories",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<long>(type: "bigint", nullable: false)
|
||||||
|
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||||
|
CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false, defaultValueSql: "now()"),
|
||||||
|
Status = table.Column<int>(type: "integer", nullable: false),
|
||||||
|
ProductId = table.Column<long>(type: "bigint", nullable: false),
|
||||||
|
ProductPriceId = table.Column<long>(type: "bigint", nullable: false),
|
||||||
|
TotalAllocated = table.Column<int>(type: "integer", nullable: false),
|
||||||
|
TotalReserved = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_Inventories", x => x.Id);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_Inventories_Prices_ProductPriceId",
|
||||||
|
column: x => x.ProductPriceId,
|
||||||
|
principalTable: "Prices",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_Inventories_Products_ProductId",
|
||||||
|
column: x => x.ProductId,
|
||||||
|
principalTable: "Products",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "Payments",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<long>(type: "bigint", nullable: false)
|
||||||
|
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||||
|
CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false, defaultValueSql: "now()"),
|
||||||
|
UpdatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
|
||||||
|
Amount = table.Column<decimal>(type: "numeric(18,2)", precision: 18, scale: 2, nullable: false),
|
||||||
|
OrderId = table.Column<long>(type: "bigint", nullable: false),
|
||||||
|
Reference = table.Column<string>(type: "text", nullable: false),
|
||||||
|
Status = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_Payments", x => x.Id);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_Payments_Orders_OrderId",
|
||||||
|
column: x => x.OrderId,
|
||||||
|
principalTable: "Orders",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Restrict);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "Ledger",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<long>(type: "bigint", nullable: false)
|
||||||
|
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||||
|
CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false, defaultValueSql: "now()"),
|
||||||
|
Status = table.Column<int>(type: "integer", nullable: false),
|
||||||
|
OrderId = table.Column<long>(type: "bigint", nullable: false),
|
||||||
|
PaymentId = table.Column<long>(type: "bigint", nullable: false),
|
||||||
|
CustomerId = table.Column<long>(type: "bigint", nullable: false),
|
||||||
|
PaymentGatewayReference = table.Column<string>(type: "text", nullable: true),
|
||||||
|
PaymentGatewayId = table.Column<long>(type: "bigint", nullable: true)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_Ledger", x => x.Id);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_Ledger_Customers_CustomerId",
|
||||||
|
column: x => x.CustomerId,
|
||||||
|
principalTable: "Customers",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_Ledger_Gateways_PaymentGatewayId",
|
||||||
|
column: x => x.PaymentGatewayId,
|
||||||
|
principalTable: "Gateways",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_Ledger_Orders_OrderId",
|
||||||
|
column: x => x.OrderId,
|
||||||
|
principalTable: "Orders",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_Ledger_Payments_PaymentId",
|
||||||
|
column: x => x.PaymentId,
|
||||||
|
principalTable: "Payments",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_Inventories_ProductId",
|
||||||
|
table: "Inventories",
|
||||||
|
column: "ProductId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_Inventories_ProductPriceId",
|
||||||
|
table: "Inventories",
|
||||||
|
column: "ProductPriceId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_Ledger_CustomerId",
|
||||||
|
table: "Ledger",
|
||||||
|
column: "CustomerId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_Ledger_OrderId",
|
||||||
|
table: "Ledger",
|
||||||
|
column: "OrderId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_Ledger_PaymentGatewayId",
|
||||||
|
table: "Ledger",
|
||||||
|
column: "PaymentGatewayId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_Ledger_PaymentId",
|
||||||
|
table: "Ledger",
|
||||||
|
column: "PaymentId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_Payments_OrderId",
|
||||||
|
table: "Payments",
|
||||||
|
column: "OrderId");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "Inventories");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "Ledger");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "Gateways");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "Payments");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+1231
File diff suppressed because it is too large
Load Diff
+29
@@ -0,0 +1,29 @@
|
|||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class RemovedPassphraseFromPaymentGateway : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "Passphrase",
|
||||||
|
table: "Gateways");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AddColumn<string>(
|
||||||
|
name: "Passphrase",
|
||||||
|
table: "Gateways",
|
||||||
|
type: "text",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: "");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+1291
File diff suppressed because it is too large
Load Diff
+108
@@ -0,0 +1,108 @@
|
|||||||
|
using System;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class AddedPaymentGatewayLedger : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropForeignKey(
|
||||||
|
name: "FK_Ledger_Gateways_PaymentGatewayId",
|
||||||
|
table: "Ledger");
|
||||||
|
|
||||||
|
migrationBuilder.DropIndex(
|
||||||
|
name: "IX_Ledger_PaymentGatewayId",
|
||||||
|
table: "Ledger");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "PaymentGatewayId",
|
||||||
|
table: "Ledger");
|
||||||
|
|
||||||
|
migrationBuilder.RenameColumn(
|
||||||
|
name: "PaymentGatewayReference",
|
||||||
|
table: "Ledger",
|
||||||
|
newName: "MerchantPaymentId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "GatewayLedger",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<long>(type: "bigint", nullable: false)
|
||||||
|
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||||
|
CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false, defaultValueSql: "now()"),
|
||||||
|
CustomerEmail = table.Column<string>(type: "text", nullable: true),
|
||||||
|
OrderId = table.Column<long>(type: "bigint", nullable: false),
|
||||||
|
PaymentId = table.Column<long>(type: "bigint", nullable: false),
|
||||||
|
MerchantPaymentId = table.Column<string>(type: "text", nullable: true),
|
||||||
|
PayfastPaymentId = table.Column<string>(type: "text", nullable: false),
|
||||||
|
PaymentStatus = table.Column<string>(type: "text", nullable: true),
|
||||||
|
AmountGross = table.Column<decimal>(type: "numeric(18,2)", precision: 18, scale: 2, nullable: false),
|
||||||
|
AmountFee = table.Column<decimal>(type: "numeric(18,2)", precision: 18, scale: 2, nullable: false),
|
||||||
|
AmountNet = table.Column<decimal>(type: "numeric(18,2)", precision: 18, scale: 2, nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_GatewayLedger", x => x.Id);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_GatewayLedger_Orders_OrderId",
|
||||||
|
column: x => x.OrderId,
|
||||||
|
principalTable: "Orders",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_GatewayLedger_Payments_PaymentId",
|
||||||
|
column: x => x.PaymentId,
|
||||||
|
principalTable: "Payments",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_GatewayLedger_OrderId",
|
||||||
|
table: "GatewayLedger",
|
||||||
|
column: "OrderId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_GatewayLedger_PaymentId",
|
||||||
|
table: "GatewayLedger",
|
||||||
|
column: "PaymentId");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "GatewayLedger");
|
||||||
|
|
||||||
|
migrationBuilder.RenameColumn(
|
||||||
|
name: "MerchantPaymentId",
|
||||||
|
table: "Ledger",
|
||||||
|
newName: "PaymentGatewayReference");
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<long>(
|
||||||
|
name: "PaymentGatewayId",
|
||||||
|
table: "Ledger",
|
||||||
|
type: "bigint",
|
||||||
|
nullable: true);
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_Ledger_PaymentGatewayId",
|
||||||
|
table: "Ledger",
|
||||||
|
column: "PaymentGatewayId");
|
||||||
|
|
||||||
|
migrationBuilder.AddForeignKey(
|
||||||
|
name: "FK_Ledger_Gateways_PaymentGatewayId",
|
||||||
|
table: "Ledger",
|
||||||
|
column: "PaymentGatewayId",
|
||||||
|
principalTable: "Gateways",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+1292
File diff suppressed because it is too large
Load Diff
+36
@@ -0,0 +1,36 @@
|
|||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class AddedPayfastPaymentIdToPaymentGatewayLedger : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AlterColumn<string>(
|
||||||
|
name: "MerchantPaymentId",
|
||||||
|
table: "GatewayLedger",
|
||||||
|
type: "text",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: "",
|
||||||
|
oldClrType: typeof(string),
|
||||||
|
oldType: "text",
|
||||||
|
oldNullable: true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AlterColumn<string>(
|
||||||
|
name: "MerchantPaymentId",
|
||||||
|
table: "GatewayLedger",
|
||||||
|
type: "text",
|
||||||
|
nullable: true,
|
||||||
|
oldClrType: typeof(string),
|
||||||
|
oldType: "text");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+1290
File diff suppressed because it is too large
Load Diff
+54
@@ -0,0 +1,54 @@
|
|||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class OnlyEmailIsMandatoryOnCustomer : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AlterColumn<string>(
|
||||||
|
name: "Website",
|
||||||
|
table: "Customers",
|
||||||
|
type: "text",
|
||||||
|
nullable: true,
|
||||||
|
oldClrType: typeof(string),
|
||||||
|
oldType: "text");
|
||||||
|
|
||||||
|
migrationBuilder.AlterColumn<string>(
|
||||||
|
name: "Phone",
|
||||||
|
table: "Customers",
|
||||||
|
type: "text",
|
||||||
|
nullable: true,
|
||||||
|
oldClrType: typeof(string),
|
||||||
|
oldType: "text");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AlterColumn<string>(
|
||||||
|
name: "Website",
|
||||||
|
table: "Customers",
|
||||||
|
type: "text",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: "",
|
||||||
|
oldClrType: typeof(string),
|
||||||
|
oldType: "text",
|
||||||
|
oldNullable: true);
|
||||||
|
|
||||||
|
migrationBuilder.AlterColumn<string>(
|
||||||
|
name: "Phone",
|
||||||
|
table: "Customers",
|
||||||
|
type: "text",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: "",
|
||||||
|
oldClrType: typeof(string),
|
||||||
|
oldType: "text",
|
||||||
|
oldNullable: true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+286
-3
@@ -17,7 +17,7 @@ namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
|
|||||||
{
|
{
|
||||||
#pragma warning disable 612, 618
|
#pragma warning disable 612, 618
|
||||||
modelBuilder
|
modelBuilder
|
||||||
.HasAnnotation("ProductVersion", "10.0.8")
|
.HasAnnotation("ProductVersion", "10.0.9")
|
||||||
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||||
|
|
||||||
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||||
@@ -309,7 +309,6 @@ namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
|
|||||||
.HasDefaultValue(true);
|
.HasDefaultValue(true);
|
||||||
|
|
||||||
b.Property<string>("Phone")
|
b.Property<string>("Phone")
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
.HasColumnType("text");
|
||||||
|
|
||||||
b.Property<DateTime?>("UpdatedAt")
|
b.Property<DateTime?>("UpdatedAt")
|
||||||
@@ -321,7 +320,6 @@ namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
|
|||||||
.HasColumnType("text");
|
.HasColumnType("text");
|
||||||
|
|
||||||
b.Property<string>("Website")
|
b.Property<string>("Website")
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
.HasColumnType("text");
|
||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
@@ -536,6 +534,178 @@ namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
|
|||||||
b.ToTable("BookPages", (string)null);
|
b.ToTable("BookPages", (string)null);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Payments.Entities.Payment", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
|
|
||||||
|
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<long>("OrderId")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.Property<string>("Reference")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<int>("Status")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<DateTime?>("UpdatedAt")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("OrderId");
|
||||||
|
|
||||||
|
b.ToTable("Payments", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Payments.Entities.PaymentGateway", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreatedAt")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("timestamp with time zone")
|
||||||
|
.HasDefaultValueSql("now()");
|
||||||
|
|
||||||
|
b.Property<bool>("Enabled")
|
||||||
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
|
b.Property<bool>("IsSandbox")
|
||||||
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
|
b.Property<string>("MerchantId")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("MerchantKey")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<DateTime?>("UpdatedAt")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.Property<string>("Website")
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("Gateways", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Payments.Entities.PaymentGatewayLedger", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
|
|
||||||
|
b.Property<decimal>("AmountFee")
|
||||||
|
.HasPrecision(18, 2)
|
||||||
|
.HasColumnType("numeric(18,2)");
|
||||||
|
|
||||||
|
b.Property<decimal>("AmountGross")
|
||||||
|
.HasPrecision(18, 2)
|
||||||
|
.HasColumnType("numeric(18,2)");
|
||||||
|
|
||||||
|
b.Property<decimal>("AmountNet")
|
||||||
|
.HasPrecision(18, 2)
|
||||||
|
.HasColumnType("numeric(18,2)");
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreatedAt")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("timestamp with time zone")
|
||||||
|
.HasDefaultValueSql("now()");
|
||||||
|
|
||||||
|
b.Property<string>("CustomerEmail")
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("MerchantPaymentId")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<long>("OrderId")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.Property<string>("PayfastPaymentId")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<long>("PaymentId")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.Property<string>("PaymentStatus")
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("OrderId");
|
||||||
|
|
||||||
|
b.HasIndex("PaymentId");
|
||||||
|
|
||||||
|
b.ToTable("GatewayLedger", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Payments.Entities.PaymentLedger", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreatedAt")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("timestamp with time zone")
|
||||||
|
.HasDefaultValueSql("now()");
|
||||||
|
|
||||||
|
b.Property<long>("CustomerId")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.Property<string>("MerchantPaymentId")
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<long>("OrderId")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.Property<long>("PaymentId")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.Property<int>("Status")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("CustomerId");
|
||||||
|
|
||||||
|
b.HasIndex("OrderId");
|
||||||
|
|
||||||
|
b.HasIndex("PaymentId");
|
||||||
|
|
||||||
|
b.ToTable("Ledger", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Payments.Entities.Refund", b =>
|
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Payments.Entities.Refund", b =>
|
||||||
{
|
{
|
||||||
b.Property<long>("Id")
|
b.Property<long>("Id")
|
||||||
@@ -653,6 +823,43 @@ namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
|
|||||||
b.ToTable("ProductCategories", (string)null);
|
b.ToTable("ProductCategories", (string)null);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Products.Entities.ProductInventory", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreatedAt")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("timestamp with time zone")
|
||||||
|
.HasDefaultValueSql("now()");
|
||||||
|
|
||||||
|
b.Property<long>("ProductId")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.Property<long>("ProductPriceId")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.Property<int>("Status")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<int>("TotalAllocated")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<int>("TotalReserved")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("ProductId");
|
||||||
|
|
||||||
|
b.HasIndex("ProductPriceId");
|
||||||
|
|
||||||
|
b.ToTable("Inventories", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Products.Entities.ProductPrice", b =>
|
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Products.Entities.ProductPrice", b =>
|
||||||
{
|
{
|
||||||
b.Property<long>("Id")
|
b.Property<long>("Id")
|
||||||
@@ -891,6 +1098,63 @@ namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
|
|||||||
b.Navigation("References");
|
b.Navigation("References");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Payments.Entities.Payment", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("LiteCharms.Features.MidrandBooks.Orders.Entities.Order", "Order")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("OrderId")
|
||||||
|
.OnDelete(DeleteBehavior.Restrict)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("Order");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Payments.Entities.PaymentGatewayLedger", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("LiteCharms.Features.MidrandBooks.Orders.Entities.Order", "Order")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("OrderId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("LiteCharms.Features.MidrandBooks.Payments.Entities.Payment", "Payment")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("PaymentId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("Order");
|
||||||
|
|
||||||
|
b.Navigation("Payment");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Payments.Entities.PaymentLedger", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("LiteCharms.Features.MidrandBooks.Customers.Entities.Customer", "Customer")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("CustomerId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("LiteCharms.Features.MidrandBooks.Orders.Entities.Order", "Order")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("OrderId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("LiteCharms.Features.MidrandBooks.Payments.Entities.Payment", "Payment")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("PaymentId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("Customer");
|
||||||
|
|
||||||
|
b.Navigation("Order");
|
||||||
|
|
||||||
|
b.Navigation("Payment");
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Payments.Entities.Refund", b =>
|
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Payments.Entities.Refund", b =>
|
||||||
{
|
{
|
||||||
b.HasOne("LiteCharms.Features.MidrandBooks.Orders.Entities.Order", "Order")
|
b.HasOne("LiteCharms.Features.MidrandBooks.Orders.Entities.Order", "Order")
|
||||||
@@ -950,6 +1214,25 @@ namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
|
|||||||
b.Navigation("Product");
|
b.Navigation("Product");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Products.Entities.ProductInventory", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("LiteCharms.Features.MidrandBooks.Products.Entities.Product", "Product")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("ProductId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("LiteCharms.Features.MidrandBooks.Products.Entities.ProductPrice", "Price")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("ProductPriceId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("Price");
|
||||||
|
|
||||||
|
b.Navigation("Product");
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Products.Entities.ProductPrice", b =>
|
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Products.Entities.ProductPrice", b =>
|
||||||
{
|
{
|
||||||
b.HasOne("LiteCharms.Features.MidrandBooks.Products.Entities.Product", "Product")
|
b.HasOne("LiteCharms.Features.MidrandBooks.Products.Entities.Product", "Product")
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
namespace LiteCharms.Features.MidrandBooks.Products.Entities;
|
||||||
|
|
||||||
|
[EntityTypeConfiguration<ProductInventoryConfiguration, ProductInventory>]
|
||||||
|
public class ProductInventory : Models.ProductInventory
|
||||||
|
{
|
||||||
|
public virtual Product? Product { get; set; }
|
||||||
|
|
||||||
|
public virtual ProductPrice? Price { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
namespace LiteCharms.Features.MidrandBooks.Products.Entities;
|
||||||
|
|
||||||
|
public sealed class ProductInventoryConfiguration : IEntityTypeConfiguration<ProductInventory>
|
||||||
|
{
|
||||||
|
public void Configure(EntityTypeBuilder<ProductInventory> builder)
|
||||||
|
{
|
||||||
|
builder.ToTable("Inventories");
|
||||||
|
|
||||||
|
builder.HasKey(f => f.Id);
|
||||||
|
builder.Property(f => f.CreatedAt).IsRequired().ValueGeneratedOnAdd().HasDefaultValueSql("now()");
|
||||||
|
builder.Property(f => f.Status).IsRequired();
|
||||||
|
builder.Property(f => f.TotalAllocated).IsRequired();
|
||||||
|
builder.Property(f => f.TotalReserved).IsRequired();
|
||||||
|
builder.Property(f => f.ProductId).IsRequired();
|
||||||
|
builder.Property(f => f.ProductPriceId).IsRequired();
|
||||||
|
|
||||||
|
builder.HasOne(f => f.Product)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey(f => f.ProductId)
|
||||||
|
.OnDelete(DeleteBehavior.Cascade);
|
||||||
|
|
||||||
|
builder.HasOne(f => f.Price)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey(f => f.ProductPriceId)
|
||||||
|
.OnDelete(DeleteBehavior.Cascade);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
namespace LiteCharms.Features.MidrandBooks.Products.Models;
|
||||||
|
|
||||||
|
public class ProductInventory
|
||||||
|
{
|
||||||
|
public long Id { get; set; }
|
||||||
|
|
||||||
|
public DateTime CreatedAt { get; set; }
|
||||||
|
|
||||||
|
public InventoryStatuses Status { get; set; }
|
||||||
|
|
||||||
|
public long ProductId { get; set; }
|
||||||
|
|
||||||
|
public long ProductPriceId { get; set; }
|
||||||
|
|
||||||
|
public int TotalAllocated { get; set; }
|
||||||
|
|
||||||
|
public int TotalReserved { get; set; }
|
||||||
|
}
|
||||||
@@ -2,6 +2,24 @@
|
|||||||
|
|
||||||
namespace LiteCharms.Features.MidrandBooks.Products.Models;
|
namespace LiteCharms.Features.MidrandBooks.Products.Models;
|
||||||
|
|
||||||
|
public sealed record ReserveStock
|
||||||
|
{
|
||||||
|
public required long ProductId { get; set; }
|
||||||
|
|
||||||
|
public required long ProductPriceId { get; set; }
|
||||||
|
|
||||||
|
public int Reservation { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed record AllocateStock
|
||||||
|
{
|
||||||
|
public required long ProductId { get; set; }
|
||||||
|
|
||||||
|
public required long ProductPriceId { get; set; }
|
||||||
|
|
||||||
|
public int Allocation { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
public sealed record CreateProduct
|
public sealed record CreateProduct
|
||||||
{
|
{
|
||||||
public required ProductTypes Type { get; set; }
|
public required ProductTypes Type { get; set; }
|
||||||
|
|||||||
@@ -1,14 +1,132 @@
|
|||||||
using LiteCharms.Features.MidrandBooks.Abstractions;
|
using LiteCharms.Features.Abstractions;
|
||||||
using LiteCharms.Features.MidrandBooks.Categories.Models;
|
using LiteCharms.Features.MidrandBooks.Categories.Models;
|
||||||
using LiteCharms.Features.MidrandBooks.Extensions;
|
using LiteCharms.Features.MidrandBooks.Extensions;
|
||||||
using LiteCharms.Features.MidrandBooks.Postgres;
|
using LiteCharms.Features.MidrandBooks.Postgres;
|
||||||
using LiteCharms.Features.MidrandBooks.Products.Models;
|
using LiteCharms.Features.MidrandBooks.Products.Models;
|
||||||
using LiteCharms.Features.Models;
|
using LiteCharms.Features.Models;
|
||||||
|
using Org.BouncyCastle.Asn1.Ocsp;
|
||||||
|
|
||||||
namespace LiteCharms.Features.MidrandBooks.Products;
|
namespace LiteCharms.Features.MidrandBooks.Products;
|
||||||
|
|
||||||
public sealed class ProductService(IDbContextFactory<MidrandBooksDbContext> contextFactory) : IService
|
public sealed class ProductService(IDbContextFactory<MidrandBooksDbContext> contextFactory) : IService
|
||||||
{
|
{
|
||||||
|
public async ValueTask<Result<ProductInventory>> CheckProductStockAvailabilityAsync(long productId, long productPriceId, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var inventory = await context.Inventories
|
||||||
|
.AsNoTracking()
|
||||||
|
.Where(i => i.ProductPriceId == productPriceId && i.ProductId == productId)
|
||||||
|
.OrderByDescending(o => o.Id)
|
||||||
|
.FirstOrDefaultAsync(cancellationToken);
|
||||||
|
|
||||||
|
return inventory is not null
|
||||||
|
? Result.Ok(inventory.ToModel())
|
||||||
|
: Result.Fail<ProductInventory>("Product sold out");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail<ProductInventory>(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<long>> ReserveProductInventoryAsync(ReserveStock request, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var oldInventory = await context.Inventories
|
||||||
|
.AsNoTracking()
|
||||||
|
.Where(i => i.ProductPriceId == request.ProductPriceId && i.ProductId == request.ProductId)
|
||||||
|
.OrderByDescending(o => o.Id)
|
||||||
|
.FirstOrDefaultAsync(cancellationToken);
|
||||||
|
|
||||||
|
var newAllocation = 0;
|
||||||
|
var newReservation = 0;
|
||||||
|
|
||||||
|
if (oldInventory is not null)
|
||||||
|
{
|
||||||
|
newAllocation = oldInventory.TotalAllocated;
|
||||||
|
newReservation = oldInventory.TotalReserved + request.Reservation;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
newAllocation = 0;
|
||||||
|
newReservation = request.Reservation;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (newAllocation - newReservation < 0)
|
||||||
|
return Result.Fail<long>("Allocation failure: The requested book quantity exceeds current physical inventory availability.");
|
||||||
|
|
||||||
|
var inventory = context.Inventories.Add(new Entities.ProductInventory
|
||||||
|
{
|
||||||
|
CreatedAt = DateTime.UtcNow,
|
||||||
|
ProductId = request.ProductId,
|
||||||
|
ProductPriceId = request.ProductPriceId,
|
||||||
|
Status = InventoryStatuses.Reserved,
|
||||||
|
TotalAllocated = newAllocation,
|
||||||
|
TotalReserved = newReservation,
|
||||||
|
});
|
||||||
|
|
||||||
|
return await context.SaveChangesAsync(cancellationToken) > 0
|
||||||
|
? Result.Ok(inventory.Entity.Id)
|
||||||
|
: Result.Fail<long>("Failed to create inventory entry");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail<long>(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<long>> AllocateProductInventoryAsync(AllocateStock request, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var oldInventory = await context.Inventories
|
||||||
|
.AsNoTracking()
|
||||||
|
.Where(i => i.ProductPriceId == request.ProductPriceId && i.ProductId == request.ProductId)
|
||||||
|
.OrderByDescending(o => o.Id)
|
||||||
|
.FirstOrDefaultAsync(cancellationToken);
|
||||||
|
|
||||||
|
var newAllocation = 0;
|
||||||
|
var newReservation = 0;
|
||||||
|
|
||||||
|
if (oldInventory is not null)
|
||||||
|
{
|
||||||
|
newAllocation = oldInventory.TotalAllocated + request.Allocation;
|
||||||
|
newReservation = oldInventory.TotalReserved;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
newAllocation = request.Allocation;
|
||||||
|
newReservation = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
var inventory = context.Inventories.Add(new Entities.ProductInventory
|
||||||
|
{
|
||||||
|
CreatedAt = DateTime.UtcNow,
|
||||||
|
ProductId = request.ProductId,
|
||||||
|
ProductPriceId = request.ProductPriceId,
|
||||||
|
Status = InventoryStatuses.Adjustment,
|
||||||
|
TotalAllocated = newAllocation,
|
||||||
|
TotalReserved = newReservation,
|
||||||
|
});
|
||||||
|
|
||||||
|
return await context.SaveChangesAsync(cancellationToken) > 0
|
||||||
|
? Result.Ok(inventory.Entity.Id)
|
||||||
|
: Result.Fail<long>("Failed to create inventory entry");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail<long>(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public async ValueTask<Result> AddProductCategoryAsync(long productId, long categoryId, CancellationToken cancellationToken = default)
|
public async ValueTask<Result> AddProductCategoryAsync(long productId, long categoryId, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
|
||||||
<PackageReference Include="xunit" Version="2.9.3" />
|
<PackageReference Include="xunit" Version="2.9.3" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
|
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
using LiteCharms.Features.Extensions;
|
using LiteCharms.Features.Hasher;
|
||||||
using LiteCharms.Features.Models;
|
using LiteCharms.Features.Models;
|
||||||
using LiteCharms.Features.TechShop.Extensions;
|
using LiteCharms.Features.TechShop.Extensions;
|
||||||
using LiteCharms.Features.TechShop.Leads.Models;
|
using LiteCharms.Features.TechShop.Leads.Models;
|
||||||
using LiteCharms.Features.TechShop.Postgres;
|
using LiteCharms.Features.TechShop.Postgres;
|
||||||
using static LiteCharms.Features.Extensions.Hash;
|
|
||||||
|
|
||||||
namespace LiteCharms.Features.TechShop.Leads;
|
namespace LiteCharms.Features.TechShop.Leads;
|
||||||
|
|
||||||
@@ -29,7 +28,7 @@ public class LeadService(IDbContextFactory<ShopDbContext> contextFactory)
|
|||||||
FeedItemId = request.FeedItemId,
|
FeedItemId = request.FeedItemId,
|
||||||
Status = LeadStatus.New,
|
Status = LeadStatus.New,
|
||||||
TargetId = request.TargetId,
|
TargetId = request.TargetId,
|
||||||
AttributionHash = StringToSha256Hash.Invoke($"{request.ClickId}{request.AppClickId}{request.WebClickId}")
|
AttributionHash = HashService.StringToSha256Hash($"{request.ClickId}{request.AppClickId}{request.WebClickId}")
|
||||||
});
|
});
|
||||||
|
|
||||||
return await context.SaveChangesAsync(cancellationToken) > 0
|
return await context.SaveChangesAsync(cancellationToken) > 0
|
||||||
|
|||||||
@@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
<!-- Quartz Scheduler-->
|
<!-- Quartz Scheduler-->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="OpenTelemetry" Version="1.15.3" />
|
<PackageReference Include="OpenTelemetry" Version="1.16.0" />
|
||||||
<PackageReference Include="Quartz" Version="3.18.1" />
|
<PackageReference Include="Quartz" Version="3.18.1" />
|
||||||
<PackageReference Include="Quartz.Plugins" Version="3.18.1" />
|
<PackageReference Include="Quartz.Plugins" Version="3.18.1" />
|
||||||
<PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.18.1" />
|
<PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.18.1" />
|
||||||
@@ -50,11 +50,11 @@
|
|||||||
|
|
||||||
<!-- Configuration -->
|
<!-- Configuration -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.9" />
|
||||||
|
|
||||||
<!-- Global Usings -->
|
<!-- Global Usings -->
|
||||||
<Using Include="Microsoft.Extensions.Configuration" />
|
<Using Include="Microsoft.Extensions.Configuration" />
|
||||||
@@ -67,9 +67,9 @@
|
|||||||
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" 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.Data" Version="9.0.0" />
|
||||||
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" 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.EntityFrameworkCore.InMemory" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.9" />
|
||||||
|
|
||||||
<!-- Global Usings -->
|
<!-- Global Usings -->
|
||||||
<Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
|
<Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
|
||||||
@@ -78,12 +78,12 @@
|
|||||||
|
|
||||||
<!-- Open Telemetry -->
|
<!-- Open Telemetry -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
|
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.16.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
|
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.16.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
|
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
|
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
|
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
|
||||||
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
|
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.16.0" />
|
||||||
|
|
||||||
<!-- Global Usings -->
|
<!-- Global Usings -->
|
||||||
<Using Include="OpenTelemetry.Resources" />
|
<Using Include="OpenTelemetry.Resources" />
|
||||||
@@ -95,17 +95,17 @@
|
|||||||
|
|
||||||
<!-- Database -->
|
<!-- Database -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.8" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.9" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.9">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
|
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.2" />
|
||||||
|
|
||||||
<!-- Global Usings -->
|
<!-- Global Usings -->
|
||||||
<Using Include="Npgsql" />
|
<Using Include="Npgsql" />
|
||||||
@@ -116,8 +116,8 @@
|
|||||||
|
|
||||||
<!-- Email -->
|
<!-- Email -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="MailKit" Version="4.16.0" />
|
<PackageReference Include="MailKit" Version="4.17.0" />
|
||||||
<PackageReference Include="MimeKit" Version="4.16.0" />
|
<PackageReference Include="MimeKit" Version="4.17.0" />
|
||||||
|
|
||||||
<!-- Global Usings-->
|
<!-- Global Usings-->
|
||||||
<Using Include="MimeKit" />
|
<Using Include="MimeKit" />
|
||||||
@@ -136,8 +136,8 @@
|
|||||||
|
|
||||||
<!-- Amazon S3 SDK -->
|
<!-- Amazon S3 SDK -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.1" />
|
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.7" />
|
||||||
<PackageReference Include="AWSSDK.S3" Version="4.0.23.4" />
|
<PackageReference Include="AWSSDK.S3" Version="4.0.24.4" />
|
||||||
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
|
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
|
||||||
|
|
||||||
<!-- global Usings -->
|
<!-- global Usings -->
|
||||||
|
|||||||
+7
-4
@@ -1,8 +1,7 @@
|
|||||||
using LiteCharms.Features.Extensions;
|
using LiteCharms.Features.Extensions;
|
||||||
using LiteCharms.Features.MidrandBooks.Abstractions;
|
|
||||||
using LiteCharms.Features.MidrandBooks.Extensions;
|
using LiteCharms.Features.MidrandBooks.Extensions;
|
||||||
|
|
||||||
namespace LiteCharms.Features.MidrandBooks.Tests.Common;
|
namespace LiteCharms.Features.Tests.Common;
|
||||||
|
|
||||||
public class Fixture : IDisposable
|
public class Fixture : IDisposable
|
||||||
{
|
{
|
||||||
@@ -26,15 +25,19 @@ public class Fixture : IDisposable
|
|||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
Services = new ServiceCollection()
|
Services = new ServiceCollection()
|
||||||
.AddMediator()
|
|
||||||
.AddLogging()
|
.AddLogging()
|
||||||
|
.AddMediator()
|
||||||
.AddEmailServiceBus()
|
.AddEmailServiceBus()
|
||||||
.AddGarageS3(Configuration)
|
.AddGarageS3(Configuration)
|
||||||
.AddMidrandShopDatabase(Configuration)
|
.AddMidrandShopDatabase(Configuration)
|
||||||
.AddEmailServices(Configuration)
|
.AddEmailServices(Configuration)
|
||||||
.AddSingleton(Configuration)
|
.AddSingleton(Configuration)
|
||||||
.AddShopServices()
|
.AddShopServices()
|
||||||
.BuildServiceProvider();
|
.AddHashServices(Configuration)
|
||||||
|
.AddLiteCharmsApiSecurity(Configuration)
|
||||||
|
.AddSecurityApiSdk(Configuration)
|
||||||
|
.AddPayfastServices(Configuration)
|
||||||
|
.BuildServiceProvider(); ;
|
||||||
|
|
||||||
Mediator = Services.GetRequiredService<IMediator>();
|
Mediator = Services.GetRequiredService<IMediator>();
|
||||||
}
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
namespace LiteCharms.Features.MidrandBooks.Tests.Common;
|
namespace LiteCharms.Features.Tests.Common;
|
||||||
|
|
||||||
public class IntegrationFactAttribute : FactAttribute
|
public class IntegrationFactAttribute : FactAttribute
|
||||||
{
|
{
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<UserSecretsId>0521f45a-eba0-457f-bb5e-c3680f65d8b1</UserSecretsId>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<!-- xUnit -->
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="coverlet.collector" Version="10.0.1">
|
||||||
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
|
||||||
|
<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>
|
||||||
|
|
||||||
|
<Using Include="Xunit.Abstractions" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<!-- Mediator -->
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Mediator.Abstractions" Version="3.0.2" />
|
||||||
|
<PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
|
||||||
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
</PackageReference>
|
||||||
|
|
||||||
|
<Using Include="Mediator" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<!-- Microsoft -->
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.9" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.9" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="10.0.9" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.9" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.9" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.9" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.9" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.9" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.9" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.9" />
|
||||||
|
|
||||||
|
<Using Include="Microsoft.Extensions.DependencyInjection" />
|
||||||
|
<Using Include="Microsoft.Extensions.Configuration" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<!-- Shared Usings -->
|
||||||
|
<ItemGroup>
|
||||||
|
<Using Include="System.Net" />
|
||||||
|
<Using Include="System.Text.Json" />
|
||||||
|
<Using Include="System.Diagnostics" />
|
||||||
|
<Using Include="System.Reflection" />
|
||||||
|
<Using Include="Xunit" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\LiteCharms.Features.MidrandBooks\LiteCharms.Features.MidrandBooks.csproj" />
|
||||||
|
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<None Update="appsettings.json">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
+22
-7
@@ -1,16 +1,32 @@
|
|||||||
{
|
{
|
||||||
|
"PayfastSettings": {
|
||||||
|
"CheckoutUrl": "https://sandbox.payfast.co.za/eng/process",
|
||||||
|
"ValidHosts": [
|
||||||
|
"www.payfast.co.za",
|
||||||
|
"sandbox.payfast.co.za",
|
||||||
|
"ips.payfast.co.za",
|
||||||
|
"api.payfast.co.za",
|
||||||
|
"payment.payfast.io"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"LiteCharmsSettings": {
|
||||||
|
"Authority": "https://sts.security.khongisa.co.za",
|
||||||
|
"Audience": "midrandbooks-api"
|
||||||
|
},
|
||||||
|
"LiteCharmsClientSettings": {
|
||||||
|
"Authority": "https://sts.security.khongisa.co.za",
|
||||||
|
"GrantType": "client_credentials",
|
||||||
|
"Scope": "midrandbooks-api"
|
||||||
|
},
|
||||||
|
"HasherSettings": {
|
||||||
|
"MinHashLength": 11
|
||||||
|
},
|
||||||
"BookshopS3Settings": {
|
"BookshopS3Settings": {
|
||||||
"ServiceUrl": "http://192.168.1.177:30900",
|
"ServiceUrl": "http://192.168.1.177:30900",
|
||||||
"Region": "garage",
|
"Region": "garage",
|
||||||
"BucketName": "bookshop",
|
"BucketName": "bookshop",
|
||||||
"CdnBaseUrl": "https://bookshop.cdn.khongisa.co.za"
|
"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": {
|
"Email": {
|
||||||
"Credentials": {
|
"Credentials": {
|
||||||
"Username": "shop@litecharms.co.za"
|
"Username": "shop@litecharms.co.za"
|
||||||
@@ -20,7 +36,6 @@
|
|||||||
"UseSsl": true
|
"UseSsl": true
|
||||||
},
|
},
|
||||||
"Monitoring": {
|
"Monitoring": {
|
||||||
"ApiKey": "",
|
|
||||||
"Address": "http://aspire-dashboard-service.aspire.svc.cluster.local:18889",
|
"Address": "http://aspire-dashboard-service.aspire.svc.cluster.local:18889",
|
||||||
"ServiceName": "LiteCharms.LeadGenerator"
|
"ServiceName": "LiteCharms.LeadGenerator"
|
||||||
},
|
},
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
using LiteCharms.Features.Extensions;
|
|
||||||
|
|
||||||
namespace LiteCharms.Features.Tests;
|
|
||||||
|
|
||||||
public class Fixture : IDisposable
|
|
||||||
{
|
|
||||||
public IConfiguration Configuration { get; set; }
|
|
||||||
|
|
||||||
public IServiceProvider Services { get; set; }
|
|
||||||
|
|
||||||
public IMediator Mediator { get; set; }
|
|
||||||
|
|
||||||
public Fixture()
|
|
||||||
{
|
|
||||||
Configuration = new ConfigurationBuilder()
|
|
||||||
.SetBasePath(Directory.GetCurrentDirectory())
|
|
||||||
.AddUserSecrets<Fixture>()
|
|
||||||
.AddJsonFile(Path.Combine(Directory.GetCurrentDirectory(), "appsettings.json"), optional: true, reloadOnChange: true)
|
|
||||||
.AddEnvironmentVariables()
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
Services = new ServiceCollection()
|
|
||||||
.AddMediator()
|
|
||||||
.AddLogging()
|
|
||||||
.AddEmailServiceBus()
|
|
||||||
.AddGarageS3(Configuration)
|
|
||||||
.AddEmailServices(Configuration)
|
|
||||||
.AddSingleton(Configuration)
|
|
||||||
.BuildServiceProvider();
|
|
||||||
|
|
||||||
Mediator = Services.GetRequiredService<IMediator>();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose() { }
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,131 @@
|
|||||||
|
using LiteCharms.Features.Hasher;
|
||||||
|
using LiteCharms.Features.Tests.Common;
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.Tests;
|
||||||
|
|
||||||
|
public class HashServiceFeatureTests(Fixture fixture) : IClassFixture<Fixture>
|
||||||
|
{
|
||||||
|
private readonly HashService hashService = fixture.Services.GetRequiredService<HashService>();
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void StringToSha256Hash_Should_GenerateHash()
|
||||||
|
{
|
||||||
|
var input = "We are the best";
|
||||||
|
var expectedHash = "96E17275B53F6BEB7A0D1C4F789F226D3C71CBE398585F25B3028F2B432E78AB";
|
||||||
|
|
||||||
|
var result = HashService.StringToSha256Hash(input);
|
||||||
|
|
||||||
|
Assert.NotNull(result);
|
||||||
|
Assert.True(HashService.IsSha256Hash(result));
|
||||||
|
Assert.Equal(expectedHash, result);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void StreamToSha256Hash_Should_GenerateHash()
|
||||||
|
{
|
||||||
|
var input = "We are successful";
|
||||||
|
using var stream = new MemoryStream(Encoding.UTF8.GetBytes(input));
|
||||||
|
var expectedHash = "C27872EE494B09D72203C98FC858268F3CD3492D62AA7B766A873520C2C73AFB";
|
||||||
|
|
||||||
|
var result = HashService.StreamToSha256Hash(stream);
|
||||||
|
|
||||||
|
Assert.NotNull(result);
|
||||||
|
Assert.True(HashService.IsSha256Hash(result));
|
||||||
|
Assert.Equal(expectedHash, result);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void BytesToSha256Hash_Should_GenerateHash()
|
||||||
|
{
|
||||||
|
var inputBytes = Encoding.UTF8.GetBytes("We are wealthy");
|
||||||
|
var expectedHash = "3876BF98F6E4A8E42B22C40415687D6FF13F0E887F3F508B71852298FC665737";
|
||||||
|
|
||||||
|
var result = HashService.BytesToSha256Hash(inputBytes);
|
||||||
|
|
||||||
|
Assert.NotNull(result);
|
||||||
|
Assert.True(HashService.IsSha256Hash(result));
|
||||||
|
Assert.Equal(expectedHash, result);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void ToMd5Hash_Should_GenerateHash()
|
||||||
|
{
|
||||||
|
var input = "We manifest our desired destiny";
|
||||||
|
var expectedMd5Lowercase = "6c7816869bcebe4634f7afe9c66dfa08";
|
||||||
|
|
||||||
|
var result = HashService.ToMd5Hash(input);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.True(HashService.IsMd5Hash(result.Value));
|
||||||
|
Assert.Equal(expectedMd5Lowercase, result.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void HashEncodeHex_Should_GenerateHash()
|
||||||
|
{
|
||||||
|
var validHexInput = "DEADBEEF42";
|
||||||
|
|
||||||
|
var result = hashService.HashEncodeHex(validHexInput);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.False(string.IsNullOrWhiteSpace(result.Value));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void HashEncodeIntId_Should_GenerateHash()
|
||||||
|
{
|
||||||
|
int targetId = 42;
|
||||||
|
|
||||||
|
var result = hashService.HashEncodeIntId(targetId);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.True(result.Value.Length >= 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void HashEncodeLongId_Should_GenerateHash()
|
||||||
|
{
|
||||||
|
long targetId = 9904185012L;
|
||||||
|
|
||||||
|
var result = hashService.HashEncodeLongId(targetId);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.True(result.Value.Length >= 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void DecodeIntIdHash_Should_GenerateHash()
|
||||||
|
{
|
||||||
|
int originalId = 88041;
|
||||||
|
var hashedString = hashService.HashEncodeIntId(originalId).Value;
|
||||||
|
|
||||||
|
var result = hashService.DecodeIntIdHash(hashedString);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.Equal(originalId, result.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void DecodeLongIdHash_Should_GenerateHash()
|
||||||
|
{
|
||||||
|
long originalId = 9081230491823L;
|
||||||
|
var hashedString = hashService.HashEncodeLongId(originalId).Value;
|
||||||
|
|
||||||
|
var result = hashService.DecodeLongIdHash(hashedString);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.Equal(originalId, result.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void DecodeHexHash_Should_GenerateHash()
|
||||||
|
{
|
||||||
|
var originalHex = "ABCDEF12345";
|
||||||
|
var hashedString = hashService.HashEncodeHex(originalHex).Value;
|
||||||
|
|
||||||
|
var result = hashService.DecodeHexHash(hashedString);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.Equal(originalHex, result.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
|
||||||
<PackageReference Include="xunit" Version="2.9.3" />
|
<PackageReference Include="xunit" Version="2.9.3" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
|
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
@@ -27,13 +27,17 @@
|
|||||||
|
|
||||||
<!-- Global Usings -->
|
<!-- Global Usings -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Using Include="System.Net" />
|
||||||
|
<Using Include="System.Text" />
|
||||||
<Using Include="Mediator" />
|
<Using Include="Mediator" />
|
||||||
<Using Include="Xunit.Abstractions" />
|
<Using Include="Xunit.Abstractions" />
|
||||||
|
<Using Include="Microsoft.Extensions.Options" />
|
||||||
<Using Include="Microsoft.Extensions.DependencyInjection" />
|
<Using Include="Microsoft.Extensions.DependencyInjection" />
|
||||||
<Using Include="Microsoft.Extensions.Configuration" />
|
<Using Include="Microsoft.Extensions.Configuration" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\LiteCharms.Features.Tests.Common\LiteCharms.Features.Tests.Common.csproj" />
|
||||||
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
|
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
@@ -41,10 +45,4 @@
|
|||||||
<Using Include="Xunit" />
|
<Using Include="Xunit" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<None Update="appsettings.json">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
using LiteCharms.Features.Api;
|
||||||
|
using LiteCharms.Features.Tests.Common;
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.Tests;
|
||||||
|
|
||||||
|
public sealed class LiteCharmsApiFeatureTests(Fixture fixture) : IClassFixture<Fixture>
|
||||||
|
{
|
||||||
|
private readonly TokenService tokenService = fixture.Services.GetRequiredService<TokenService>();
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public async Task TokenService_GenerateTokenAsync_ShouldReturn_TokenInResult()
|
||||||
|
{
|
||||||
|
var result = await tokenService.GenerateAsync(fixture.CancellationToken);
|
||||||
|
|
||||||
|
Assert.True(result.IsSuccess);
|
||||||
|
Assert.NotNull(result.Value);
|
||||||
|
Assert.NotEmpty(result.Value.AccessToken!);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
using LiteCharms.Features.Api.Configuration;
|
||||||
|
using LiteCharms.Features.Tests.Common;
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.Tests;
|
||||||
|
|
||||||
|
public sealed class PayfastFeatureTests(Fixture fixture) : IClassFixture<Fixture>
|
||||||
|
{
|
||||||
|
private readonly PayfastSettings payfastSettings = fixture.Services.GetRequiredService<IOptions<PayfastSettings>>().Value;
|
||||||
|
|
||||||
|
[IntegrationFact]
|
||||||
|
public void PayfastSettings_ShouldFail_IfNotLoaded()
|
||||||
|
{
|
||||||
|
Assert.NotEmpty(payfastSettings.CheckoutUrl!);
|
||||||
|
Assert.NotEmpty(payfastSettings.MerchantId!);
|
||||||
|
Assert.NotEmpty(payfastSettings.MerchantKey!);
|
||||||
|
Assert.NotEmpty(payfastSettings.Passphrase!);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using LiteCharms.Features.S3.Abstractions;
|
using LiteCharms.Features.S3.Abstractions;
|
||||||
|
using LiteCharms.Features.Tests.Common;
|
||||||
|
|
||||||
namespace LiteCharms.Features.Tests;
|
namespace LiteCharms.Features.Tests;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
### Authentik Token Request (Service Account Explicit)
|
||||||
|
POST {{authority}}/connect/token
|
||||||
|
Content-Type: application/x-www-form-urlencoded
|
||||||
|
Accept-Encoding: identity
|
||||||
|
|
||||||
|
grant_type={{grantType}}&client_id={{clientId}}&client_secret={{clientSecret}}&scope={{scope}}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"uat": {
|
||||||
|
"authority": "https://sts.security.khongisa.co.za",
|
||||||
|
"grantType": "client_credentials",
|
||||||
|
"clientId": "midrandbooks-api-scaler-uat",
|
||||||
|
"clientSecret": "secret_0a8dc1f99061590a52b1272db3a1871d2761c79fbd058b2a968911029e4b208a",
|
||||||
|
"scope": "midrandbooks-api"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
## Payfast Payment Confirmation
|
||||||
|
# This endpoint is used by Payfast to confirm the payment status of a transaction.
|
||||||
|
# It receives a POST request with the payment details and updates the order status accordingly.
|
||||||
|
|
||||||
|
POST {{baseUrl}}/v1/payments/payfast/confirm
|
||||||
|
Content-Type: application/x-www-form-urlencoded
|
||||||
|
|
||||||
|
amount={{amount}}&item_name={{item_name}}&m_payment_id={{paymentId}}&signature={{signature}}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"payfast-local": {
|
||||||
|
"baseUrl": "https://localhost:7196",
|
||||||
|
"paymentId": "jdPB2zaKM3Z",
|
||||||
|
"signature": "6aeff59bb74f2448ff2c3d81b2ec95de",
|
||||||
|
"item_name": "System Architecture Book",
|
||||||
|
"amount": "350.00"
|
||||||
|
},
|
||||||
|
"payfast-uat": {
|
||||||
|
"baseUrl": "https://api.uat.midrandbooks.co.za",
|
||||||
|
"paymentId": "jdPB2zaKM3Z",
|
||||||
|
"signature": "6aeff59bb74f2448ff2c3d81b2ec95de",
|
||||||
|
"item_name": "System Architecture Book",
|
||||||
|
"amount": "350.00"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
namespace LiteCharms.Features.Abstractions;
|
||||||
|
|
||||||
|
public interface IEndpoint
|
||||||
|
{
|
||||||
|
void Map(IEndpointRouteBuilder builder);
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
namespace LiteCharms.Features.Abstractions;
|
||||||
|
|
||||||
|
public interface IFeatures;
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
namespace LiteCharms.Features.Abstractions;
|
||||||
|
|
||||||
|
public interface IJobOrchestrator
|
||||||
|
{
|
||||||
|
ValueTask SendAsync<TNotification>(TNotification notification, CancellationToken cancellationToken = default)
|
||||||
|
where TNotification : IEvent;
|
||||||
|
|
||||||
|
ValueTask ScheduleAsync<TNotification>(TNotification notification, string cronExpression, CancellationToken cancellationToken = default)
|
||||||
|
where TNotification : IEvent;
|
||||||
|
|
||||||
|
ValueTask<bool> InterruptAsync(string eventName, string? correlationId = null, CancellationToken cancellationToken = default);
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
namespace LiteCharms.Features.Abstractions;
|
||||||
|
|
||||||
|
public interface IService;
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
namespace LiteCharms.Features.Api;
|
||||||
|
|
||||||
|
[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
|
||||||
|
public sealed class ApiVersionTargetAttribute(int majorVersion) : Attribute
|
||||||
|
{
|
||||||
|
public int MajorVersion { get; } = majorVersion;
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
namespace LiteCharms.Features.Api.Configuration;
|
||||||
|
|
||||||
|
public sealed class LiteCharmsClientSettings
|
||||||
|
{
|
||||||
|
public string? Authority { get; set; }
|
||||||
|
|
||||||
|
public string? GrantType { get; set; }
|
||||||
|
|
||||||
|
public string? ClientId { get; set; }
|
||||||
|
|
||||||
|
public string? ClientSecret { get; set; }
|
||||||
|
|
||||||
|
public string? Scope { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
namespace LiteCharms.Features.Api.Configuration;
|
||||||
|
|
||||||
|
public sealed class LiteCharmsSettings
|
||||||
|
{
|
||||||
|
public string? Authority { get; set; }
|
||||||
|
|
||||||
|
public string? ClientId { get; set; }
|
||||||
|
|
||||||
|
public string? ClientSecret { get; set; }
|
||||||
|
|
||||||
|
public string? Audience { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
namespace LiteCharms.Features.Api.Configuration;
|
||||||
|
|
||||||
|
public sealed class PayfastSettings
|
||||||
|
{
|
||||||
|
public string? CheckoutUrl { get; set; }
|
||||||
|
|
||||||
|
public string? Passphrase { get; set; }
|
||||||
|
|
||||||
|
public string? MerchantId { get; set; }
|
||||||
|
|
||||||
|
public string? MerchantKey { get; set; }
|
||||||
|
|
||||||
|
public string[]? ValidHosts { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
namespace LiteCharms.Features.Api.Models;
|
||||||
|
|
||||||
|
public sealed class TokenErrorResponse
|
||||||
|
{
|
||||||
|
[JsonPropertyName("error")]
|
||||||
|
public string? Error { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("error_description")]
|
||||||
|
public string? ErrorDescription { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("error_uri")]
|
||||||
|
public string? ErrorUri { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
namespace LiteCharms.Features.Api.Models;
|
||||||
|
|
||||||
|
public sealed class TokenRequest
|
||||||
|
{
|
||||||
|
[JsonPropertyName("grant_type")]
|
||||||
|
[AliasAs("grant_type")]
|
||||||
|
public string? GrantType { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("client_id")]
|
||||||
|
[AliasAs("client_id")]
|
||||||
|
public string? ClientId { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("client_secret")]
|
||||||
|
[AliasAs("client_secret")]
|
||||||
|
public string? ClientSecret { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("scope")]
|
||||||
|
[AliasAs("scope")]
|
||||||
|
public string? Scope { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
namespace LiteCharms.Features.Api.Models;
|
||||||
|
|
||||||
|
public sealed class TokenResponse
|
||||||
|
{
|
||||||
|
[JsonPropertyName("access_token")]
|
||||||
|
public string? AccessToken { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("expires_in")]
|
||||||
|
public int ExpiresIn { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("token_type")]
|
||||||
|
public string? TokenType { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("scope")]
|
||||||
|
public string? Scope { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
namespace LiteCharms.Features.Api;
|
||||||
|
|
||||||
|
public sealed class OpenApiBearerSecuritySchemeTransformer : IOpenApiDocumentTransformer
|
||||||
|
{
|
||||||
|
public async Task TransformAsync(OpenApiDocument document, OpenApiDocumentTransformerContext context, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var bearerScheme = new OpenApiSecurityScheme
|
||||||
|
{
|
||||||
|
Type = SecuritySchemeType.Http,
|
||||||
|
Scheme = "bearer",
|
||||||
|
Description = "JWT Authorization header using the Bearer scheme",
|
||||||
|
};
|
||||||
|
|
||||||
|
document.AddComponent("Bearer", bearerScheme);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
using LiteCharms.Features.Api.Models;
|
||||||
|
|
||||||
|
namespace LiteCharms.Features.Api.Sdk;
|
||||||
|
|
||||||
|
public interface IConnectApi
|
||||||
|
{
|
||||||
|
[Post("/connect/token")]
|
||||||
|
ValueTask<HttpResponseMessage> GetToken([Body(BodySerializationMethod.UrlEncoded)] TokenRequest request,
|
||||||
|
CancellationToken cancellationToken = default);
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user