Compare commits
56
Commits
5ab2d29aac
..
1.61.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b369dad452 | ||
|
|
c938bfec09 | ||
|
|
adc14038db | ||
|
|
61cb6c2228 | ||
|
|
e7a798b5e9 | ||
|
|
41b6b71b31 | ||
|
|
ee6beef603 | ||
|
|
1c3f3eaf0d | ||
|
|
2e77666d9e | ||
|
|
1977b6b301 | ||
|
|
0ab14d8b63 | ||
|
|
466458e230 | ||
|
|
141d32f591 | ||
|
|
d9e7f225ae | ||
|
|
6ae63e2ad1 | ||
|
|
f5efdde37c | ||
|
|
1592d5dc8f | ||
|
|
50a8a59d92 | ||
|
|
b70d9559b0 | ||
|
|
81d5e8f07c | ||
|
|
20a53942b5 | ||
|
|
9edb2aa4aa | ||
|
|
6ed023f2cf | ||
|
|
2c9f5a846c | ||
|
|
41f7c05be3 | ||
|
|
1a03355e84 | ||
|
|
7743c3178e | ||
|
|
ab3d8e6e9a | ||
|
|
db4c348288 | ||
|
|
6683234642 | ||
|
|
6ddbb9479a | ||
|
|
6c7349a0f8 | ||
|
|
e97fd6cd3f | ||
|
|
184c7c252a | ||
|
|
bfe8c458d6 | ||
|
|
e6e0475db1 | ||
|
|
5090c60797 | ||
|
|
9432252e15 | ||
|
|
47111a1a3a | ||
|
|
6eb3d50375 | ||
|
|
4deb732804 | ||
|
|
20d9387d0b | ||
|
|
9f6d0ccaa0 | ||
|
|
1acbc4d213 | ||
|
|
8c99668fac | ||
|
|
ad44f46204 | ||
|
|
49d999c1e3 | ||
|
|
9ed4777a18 | ||
|
|
0cf44f68cc | ||
|
|
41ed5a4288 | ||
|
|
bbcba5e06c | ||
|
|
502cc326dd | ||
|
|
4675d4c5fc | ||
|
|
f80bb2fff9 | ||
|
|
6767906b0d | ||
|
|
a344af4498 |
-86
@@ -1,86 +0,0 @@
|
|||||||
using LiteCharms.Features.Hasher;
|
|
||||||
using LiteCharms.Features.MidrandBooks.Orders;
|
|
||||||
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
await using var scope = services.CreateAsyncScope();
|
|
||||||
|
|
||||||
PaymentService paymentService = scope.ServiceProvider.GetRequiredService<PaymentService>();
|
|
||||||
OrderService orderService = scope.ServiceProvider.GetRequiredService<OrderService>();
|
|
||||||
HashService hashService = scope.ServiceProvider.GetRequiredService<HashService>();
|
|
||||||
|
|
||||||
var hashResult = hashService.DecodeLongIdHash(notification.Payload?.MPaymentId!);
|
|
||||||
if (hashResult.IsFailed)
|
|
||||||
{
|
|
||||||
logger.LogError("Failed to decode payment ID hash: {Hash}. Errors: {Errors}", notification.Payload?.MPaymentId, string.Join(", ", hashResult.Errors.Select(e => e.Message)));
|
|
||||||
throw new Exception($"Failed to decode payment ID hash: {notification.Payload?.MPaymentId}.");
|
|
||||||
}
|
|
||||||
|
|
||||||
var orderResult = await orderService.GetOrderAsync(hashResult.Value, cancellationToken);
|
|
||||||
if (orderResult.IsFailed)
|
|
||||||
{
|
|
||||||
logger.LogError("Failed to retrieve order for payment ID: {PaymentId}. Errors: {Errors}", notification.Payload?.MPaymentId, string.Join(", ", orderResult.Errors.Select(e => e.Message)));
|
|
||||||
throw new Exception($"Failed to retrieve order for payment ID: {notification.Payload?.MPaymentId}.");
|
|
||||||
}
|
|
||||||
|
|
||||||
var paymentResult = await paymentService.GetOrderPaymentAsync(orderResult.Value.CustomerId, cancellationToken);
|
|
||||||
if (paymentResult.IsFailed)
|
|
||||||
{
|
|
||||||
logger.LogError("Failed to retrieve payment for order ID: {OrderId}. Errors: {Errors}", orderResult.Value.Id, string.Join(", ", paymentResult.Errors.Select(e => e.Message)));
|
|
||||||
throw new Exception($"Failed to retrieve payment for order ID: {orderResult.Value.Id}.");
|
|
||||||
}
|
|
||||||
|
|
||||||
var isAlreadyProcessed = await paymentService.HasLedgerEntryAsync(orderResult.Value.Id, paymentResult.Value.Id, 1, cancellationToken);
|
|
||||||
|
|
||||||
if (isAlreadyProcessed.IsFailed)
|
|
||||||
{
|
|
||||||
logger.LogError("Failed to check existing ledger entry for order ID: {OrderId} and payment ID: {PaymentId}. Errors: {Errors}", orderResult.Value.Id, paymentResult.Value.Id, string.Join(", ", isAlreadyProcessed.Errors.Select(e => e.Message)));
|
|
||||||
throw new Exception($"Failed to check existing ledger entry for order ID: {orderResult.Value.Id} and payment ID: {paymentResult.Value.Id}.");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isAlreadyProcessed.Value)
|
|
||||||
{
|
|
||||||
logger.LogInformation("Payment confirmation for payment ID: {PaymentId} has already been processed. Skipping.", notification.Payload?.MPaymentId);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var ledgerResult = await paymentService.WriteLedgerEntryAsync(new Models.CreateLedgerEntry
|
|
||||||
{
|
|
||||||
CustomerId = orderResult.Value.CustomerId,
|
|
||||||
OrderId = orderResult.Value.Id,
|
|
||||||
PaymentId = paymentResult.Value.Id,
|
|
||||||
Status = LedgerStatuses.Received,
|
|
||||||
PaymentGatewayId = 1,
|
|
||||||
PaymentGatewayReference = notification.CorrelationId,
|
|
||||||
}, cancellationToken);
|
|
||||||
|
|
||||||
if (ledgerResult.IsFailed)
|
|
||||||
{
|
|
||||||
logger.LogError("Failed to write ledger entry for payment ID: {PaymentId}. Errors: {Errors}", notification.Payload?.MPaymentId, string.Join(", ", ledgerResult.Errors.Select(e => e.Message)));
|
|
||||||
throw new Exception($"Failed to write ledger entry for payment ID: {notification.Payload?.MPaymentId}.");
|
|
||||||
}
|
|
||||||
|
|
||||||
var paymentCompletedResult = await paymentService.CompletePaymentAsync(paymentResult.Value.Id, PaymentStatuses.Paid, cancellationToken);
|
|
||||||
if (paymentCompletedResult.IsFailed)
|
|
||||||
{
|
|
||||||
logger.LogError("Failed to complete payment for order ID: {OrderId}. Errors: {Errors}", orderResult.Value.Id, string.Join(", ", paymentCompletedResult.Errors.Select(e => e.Message)));
|
|
||||||
throw new Exception($"Failed to complete payment for order ID: {orderResult.Value.Id}.");
|
|
||||||
}
|
|
||||||
|
|
||||||
var orderCompletedResult = await orderService.UpdateOrderStatusAsync(orderResult.Value.Id, OrderStatus.Completed, cancellationToken);
|
|
||||||
if (orderCompletedResult.IsFailed)
|
|
||||||
{
|
|
||||||
logger.LogError("Failed to update order status to Completed for order ID: {OrderId}. Errors: {Errors}", orderResult.Value.Id, string.Join(", ", orderCompletedResult.Errors.Select(e => e.Message)));
|
|
||||||
throw new Exception($"Failed to update order status to Completed for order ID: {orderResult.Value.Id}.");
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.LogInformation("Received Payfast payment confirmation for payment ID: {PaymentId}", notification.Payload?.MPaymentId);
|
|
||||||
|
|
||||||
// TODO: Publish MediatR notifications or queue downstream Quartz jobs (Discord, Shipping, Customer Email, Royalties)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-22
@@ -1,22 +0,0 @@
|
|||||||
using LiteCharms.Features.Abstractions;
|
|
||||||
using LiteCharms.Features.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 PayfastPaymentConfirmationReceivedEvent() { }
|
|
||||||
|
|
||||||
private PayfastPaymentConfirmationReceivedEvent(PayfastWebhookPayload? payload, string paymentId)
|
|
||||||
{
|
|
||||||
Payload = payload;
|
|
||||||
CorrelationId = paymentId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static PayfastPaymentConfirmationReceivedEvent Create(PayfastWebhookPayload? payload, string paymentId) =>
|
|
||||||
new(payload, paymentId);
|
|
||||||
}
|
|
||||||
@@ -7,27 +7,6 @@ namespace LiteCharms.Features.MidrandBooks.Payments;
|
|||||||
|
|
||||||
public sealed class PaymentService(IDbContextFactory<MidrandBooksDbContext> contextFactory) : 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)
|
public async ValueTask<Result<Refund>> GetRefundAsync(long refundId, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -116,25 +95,6 @@ public sealed class PaymentService(IDbContextFactory<MidrandBooksDbContext> cont
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async ValueTask<Result<bool>> HasLedgerEntryAsync(long orderId, long paymentId, long gatewayId, 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.PaymentGatewayId == gatewayId, 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)
|
public async ValueTask<Result> WriteLedgerEntryAsync(CreateLedgerEntry request, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|||||||
Reference in New Issue
Block a user