Merge pull request 'Refactored usaged of merchant payment id usage' (#117 ) from payments into master

Reviewed-on: #117
Refactored usaged of merchant payment id usage
2026-06-13 21:21:21 +02:00 · 2026-06-13 21:20:30 +02:00 · 2026-06-13 18:04:17 +02:00 · 2026-06-13 18:03:40 +02:00 · 2026-06-13 17:01:36 +02:00 · 2026-06-13 17:00:08 +02:00
5 changed files with 13 additions and 13 deletions
@@ -11,7 +11,7 @@
  <!-- Quartz Scheduler-->
  <ItemGroup>
    <PackageReference Include="Bogus" Version="35.6.5" />
-    <PackageReference Include="Meziantou.Analyzer" Version="3.0.102">
+    <PackageReference Include="Meziantou.Analyzer" Version="3.0.103">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
@@ -116,8 +116,8 @@

  <!-- Amazon S3 SDK -->
  <ItemGroup>
-    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.6" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.24.3" />
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.7" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.24.4" />
    <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />

    <!-- global Usings -->
@@ -66,7 +66,7 @@ public sealed class PayfastPaymentConfirmationReceivedEventHandler(IServiceProvi
            {
                OrderId = orderResult.Value.Id,
                PaymentId = paymentResult.Value.Id,
-                PaymentGatewayReference = payload.PaymentId!,
+                PaymentGatewayReference = payload.MerchantPaymentId!,
                Status = LedgerStatuses.Completed,
                CustomerId = orderResult.Value.CustomerId,
            }, cancellationToken);
@@ -91,7 +91,7 @@ public sealed class PayfastPaymentConfirmationReceivedEventHandler(IServiceProvi
            {
                OrderId = orderResult.Value.Id,
                PaymentId = paymentResult.Value.Id,
-                PaymentGatewayReference = payload.PaymentId!,
+                PaymentGatewayReference = payload.MerchantPaymentId!,
                Status = ledgerStatus,
                CustomerId = orderResult.Value.CustomerId,
            }, cancellationToken);
@@ -123,8 +123,7 @@ public sealed class PaymentService(IDbContextFactory<MidrandBooksDbContext> cont
            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);

            var exists = await context.Ledger.AnyAsync(l =>
-                l.OrderId == orderId &&
-                l.PaymentId == paymentId, cancellationToken);
+                l.OrderId == orderId && l.PaymentId == paymentId && l.Status == LedgerStatuses.Completed, cancellationToken);

            return Result.Ok(exists);
        }
@@ -162,7 +161,8 @@ public sealed class PaymentService(IDbContextFactory<MidrandBooksDbContext> cont
                CustomerId = request.CustomerId,
                OrderId = request.OrderId,
                PaymentId = request.PaymentId,
-                Status = request.Status,
+                MerchantPaymentId = request.PaymentGatewayReference,
+                Status = request.Status,                
            });

            return await context.SaveChangesAsync(cancellationToken) > 0
@@ -136,8 +136,8 @@

  <!-- Amazon S3 SDK -->
  <ItemGroup>
-    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.6" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.24.3" />
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.7" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.24.4" />
    <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />

    <!-- global Usings -->
@@ -79,7 +79,7 @@
  <!-- Quartz Scheduler-->
  <ItemGroup>    
    <PackageReference Include="Hashids.net" Version="1.7.0" />    
-    <PackageReference Include="Meziantou.Analyzer" Version="3.0.102">
+    <PackageReference Include="Meziantou.Analyzer" Version="3.0.103">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>    
@@ -183,8 +183,8 @@
  
  <!-- Amazon S3 SDK -->
  <ItemGroup>
-    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.6" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.24.3" />
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.7" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.24.4" />
    
    <!-- global Usings -->
    <Using Include="Amazon.S3" />
Author	SHA1	Message	Date
khwezi	b09af460f1	Merge pull request 'Refactored usaged of merchant payment id usage' (#117 ) from payments into master Reviewed-on: #117	2026-06-13 21:21:21 +02:00
Khwezi Mngoma	7c5b5f1728	Refactored usaged of merchant payment id usage continuous-integration/drone/pr Build is passing Details	2026-06-13 21:20:30 +02:00
khwezi	50db61b3ee	Merge pull request 'Refactored idempotency check to observe completed status' (#116 ) from payments into master Reviewed-on: #116	2026-06-13 18:04:17 +02:00
Khwezi Mngoma	94b0084d75	Refactored idempotency check to observe completed status continuous-integration/drone/pr Build is passing Details	2026-06-13 18:03:40 +02:00
khwezi	f5ad8e2d50	Merge pull request 'Ensured the merchant payment id makes it to the ledger' (#115 ) from payments into master Reviewed-on: #115	2026-06-13 17:01:36 +02:00
Khwezi Mngoma	8e2942487d	Ensured the merchant payment id makes it to the ledger continuous-integration/drone/pr Build is passing Details	2026-06-13 17:00:08 +02:00
khwezi	fa79a58004	Merge pull request 'Fixed package mismatches' (#114 ) from payments into master Reviewed-on: #114	2026-06-13 16:33:05 +02:00
Khwezi Mngoma	9997d4f0ed	Fixed package mismatches continuous-integration/drone/pr Build is passing Details	2026-06-13 16:32:39 +02:00