From 91805bc9ad03307d57f6f8f511e4e5e90b964db1 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Mon, 26 May 2025 12:36:48 +0300 Subject: [PATCH] fix: pass cancellationToken to library methods that accept them --- .../Services/LiqPayPaymentService.cs | 4 +-- .../GetPaymentLinkCommandHandler.cs | 4 +-- .../ProcessCallbackCommandHandler.cs | 4 +-- .../Services/LiqPayPaymentService.cs | 10 +++---- .../InMemory/InMemoryUnitOfWork.cs | 2 +- .../Repositories/InMemoryBaseRepository.cs | 24 ++++++++------- .../PostgreSql/PostgreSqlUnitOfWork.cs | 2 +- .../Repositories/PostgreSqlBaseRepository.cs | 30 ++++++++++--------- 8 files changed, 43 insertions(+), 37 deletions(-) diff --git a/src/Application/Common/Interfaces/Services/LiqPayPaymentService.cs b/src/Application/Common/Interfaces/Services/LiqPayPaymentService.cs index 4a0551f..768a1c3 100644 --- a/src/Application/Common/Interfaces/Services/LiqPayPaymentService.cs +++ b/src/Application/Common/Interfaces/Services/LiqPayPaymentService.cs @@ -4,10 +4,10 @@ namespace cuqmbr.TravelGuide.Application.Common.Interfaces.Services; public interface LiqPayPaymentService { - Task GetPaymentLinkAsync( + string GetPaymentLink( decimal amount, Currency currency, string orderId, TimeSpan validity, string description, string resultPath, string callbackPath); - Task IsValidSignatureAsync(string postData, string postSignature); + bool IsValidSignature(string postData, string postSignature); } diff --git a/src/Application/Payments/LiqPay/TicketGroups/Commands/GetPaymentLink/GetPaymentLinkCommandHandler.cs b/src/Application/Payments/LiqPay/TicketGroups/Commands/GetPaymentLink/GetPaymentLinkCommandHandler.cs index 28c9328..94fcde6 100644 --- a/src/Application/Payments/LiqPay/TicketGroups/Commands/GetPaymentLink/GetPaymentLinkCommandHandler.cs +++ b/src/Application/Payments/LiqPay/TicketGroups/Commands/GetPaymentLink/GetPaymentLinkCommandHandler.cs @@ -462,8 +462,8 @@ public class GetPaymentLinkCommandHandler : var resultPath = request.ResultPath; var callbackPath = "/payments/liqPay/ticket/callback"; - var paymentLink = await _liqPayPaymentService - .GetPaymentLinkAsync( + var paymentLink = _liqPayPaymentService + .GetPaymentLink( amount, Currency.UAH, guid.ToString(), validity, _localizer["PaymentProcessing.TicketPaymentDescription"], resultPath, callbackPath); diff --git a/src/Application/Payments/LiqPay/TicketGroups/Commands/ProcessCallback/ProcessCallbackCommandHandler.cs b/src/Application/Payments/LiqPay/TicketGroups/Commands/ProcessCallback/ProcessCallbackCommandHandler.cs index 099fc63..1f3d54b 100644 --- a/src/Application/Payments/LiqPay/TicketGroups/Commands/ProcessCallback/ProcessCallbackCommandHandler.cs +++ b/src/Application/Payments/LiqPay/TicketGroups/Commands/ProcessCallback/ProcessCallbackCommandHandler.cs @@ -27,8 +27,8 @@ public class ProcessCallbackCommandHandler : ProcessCallbackCommand request, CancellationToken cancellationToken) { - var isSignatureValid = await _liqPayPaymentService - .IsValidSignatureAsync(request.Data, request.Signature); + var isSignatureValid = _liqPayPaymentService + .IsValidSignature(request.Data, request.Signature); if (!isSignatureValid) { diff --git a/src/Infrastructure/Services/LiqPayPaymentService.cs b/src/Infrastructure/Services/LiqPayPaymentService.cs index 452305f..70fc88b 100644 --- a/src/Infrastructure/Services/LiqPayPaymentService.cs +++ b/src/Infrastructure/Services/LiqPayPaymentService.cs @@ -27,7 +27,7 @@ public sealed class LiqPayPaymentService : configurationOptions.Value.PaymentProcessing.ResultAddressBase; } - public Task GetPaymentLinkAsync( + public string GetPaymentLink( decimal amount, Currency currency, string orderId, TimeSpan validity, string description, string resultPath, string callbackPath) @@ -60,12 +60,12 @@ public sealed class LiqPayPaymentService : _configuration.PrivateKey))); - return Task.FromResult( + return "https://www.liqpay.ua/api/3/checkout" + - $"?data={data}&signature={signature}"); + $"?data={data}&signature={signature}"; } - public Task IsValidSignatureAsync(string postData, string postSignature) + public bool IsValidSignature(string postData, string postSignature) { var signature = Convert.ToBase64String(SHA1.HashData( Encoding.UTF8.GetBytes( @@ -73,6 +73,6 @@ public sealed class LiqPayPaymentService : postData + _configuration.PrivateKey))); - return Task.FromResult(postSignature.Equals(signature)); + return postSignature.Equals(signature); } } diff --git a/src/Persistence/InMemory/InMemoryUnitOfWork.cs b/src/Persistence/InMemory/InMemoryUnitOfWork.cs index 4b257ff..78c3f1a 100644 --- a/src/Persistence/InMemory/InMemoryUnitOfWork.cs +++ b/src/Persistence/InMemory/InMemoryUnitOfWork.cs @@ -73,7 +73,7 @@ public sealed class InMemoryUnitOfWork : UnitOfWork public async Task SaveAsync(CancellationToken cancellationToken) { - return await _dbContext.SaveChangesAsync(); + return await _dbContext.SaveChangesAsync(cancellationToken); } public void Dispose() diff --git a/src/Persistence/InMemory/Repositories/InMemoryBaseRepository.cs b/src/Persistence/InMemory/Repositories/InMemoryBaseRepository.cs index cb32f90..8e628a8 100644 --- a/src/Persistence/InMemory/Repositories/InMemoryBaseRepository.cs +++ b/src/Persistence/InMemory/Repositories/InMemoryBaseRepository.cs @@ -28,7 +28,7 @@ public abstract class InMemoryBaseRepository : BaseRepository Expression> predicate, CancellationToken cancellationToken) { - return await _dbSet.SingleOrDefaultAsync(predicate); + return await _dbSet.SingleOrDefaultAsync(predicate, cancellationToken); } public async Task GetOneAsync( @@ -39,19 +39,19 @@ public abstract class InMemoryBaseRepository : BaseRepository return await _dbSet .Include(includeSelector) - .SingleOrDefaultAsync(predicate); + .SingleOrDefaultAsync(predicate, cancellationToken); } public async Task> GetPageAsync( int pageNumber, int pageSize, CancellationToken cancellationToken) { - var count = await _dbSet.CountAsync(); + var count = await _dbSet.CountAsync(cancellationToken); var entities = await _dbSet .Skip((pageNumber - 1) * pageSize).Take(pageSize) - .ToListAsync(); + .ToListAsync(cancellationToken); return new PaginatedList( entities, count, @@ -63,13 +63,13 @@ public abstract class InMemoryBaseRepository : BaseRepository int pageNumber, int pageSize, CancellationToken cancellationToken) { - var count = await _dbSet.CountAsync(); + var count = await _dbSet.CountAsync(cancellationToken); var entities = await _dbSet .Skip((pageNumber - 1) * pageSize).Take(pageSize) .Include(includeSelector) - .ToListAsync(); + .ToListAsync(cancellationToken); return new PaginatedList( entities, count, @@ -81,13 +81,15 @@ public abstract class InMemoryBaseRepository : BaseRepository int pageNumber, int pageSize, CancellationToken cancellationToken) { - var count = await _dbSet.Where(predicate).CountAsync(); + var count = await _dbSet + .Where(predicate) + .CountAsync(cancellationToken); var entities = await _dbSet .Where(predicate) .Skip((pageNumber - 1) * pageSize).Take(pageSize) - .ToListAsync(); + .ToListAsync(cancellationToken); return new PaginatedList( entities, count, @@ -100,14 +102,16 @@ public abstract class InMemoryBaseRepository : BaseRepository int pageNumber, int pageSize, CancellationToken cancellationToken) { - var count = await _dbSet.Where(predicate).CountAsync(); + var count = await _dbSet + .Where(predicate) + .CountAsync(cancellationToken); var entities = await _dbSet .Where(predicate) .Skip((pageNumber - 1) * pageSize).Take(pageSize) .Include(includeSelector) - .ToListAsync(); + .ToListAsync(cancellationToken); return new PaginatedList( entities, count, diff --git a/src/Persistence/PostgreSql/PostgreSqlUnitOfWork.cs b/src/Persistence/PostgreSql/PostgreSqlUnitOfWork.cs index 9b324a2..6898026 100644 --- a/src/Persistence/PostgreSql/PostgreSqlUnitOfWork.cs +++ b/src/Persistence/PostgreSql/PostgreSqlUnitOfWork.cs @@ -73,7 +73,7 @@ public sealed class PostgreSqlUnitOfWork : UnitOfWork public async Task SaveAsync(CancellationToken cancellationToken) { - return await _dbContext.SaveChangesAsync(); + return await _dbContext.SaveChangesAsync(cancellationToken); } public void Dispose() diff --git a/src/Persistence/PostgreSql/Repositories/PostgreSqlBaseRepository.cs b/src/Persistence/PostgreSql/Repositories/PostgreSqlBaseRepository.cs index a5c1dae..cc3930a 100644 --- a/src/Persistence/PostgreSql/Repositories/PostgreSqlBaseRepository.cs +++ b/src/Persistence/PostgreSql/Repositories/PostgreSqlBaseRepository.cs @@ -28,7 +28,7 @@ public abstract class PostgreSqlBaseRepository : BaseRepository> predicate, CancellationToken cancellationToken) { - return await _dbSet.SingleOrDefaultAsync(predicate); + return await _dbSet.SingleOrDefaultAsync(predicate, cancellationToken); } public async Task GetOneAsync( @@ -36,22 +36,21 @@ public abstract class PostgreSqlBaseRepository : BaseRepository> includeSelector, CancellationToken cancellationToken) { - return - await _dbSet - .Include(includeSelector) - .SingleOrDefaultAsync(predicate); + return await _dbSet + .Include(includeSelector) + .SingleOrDefaultAsync(predicate, cancellationToken); } public async Task> GetPageAsync( int pageNumber, int pageSize, CancellationToken cancellationToken) { - var count = await _dbSet.CountAsync(); + var count = await _dbSet.CountAsync(cancellationToken); var entities = await _dbSet .Skip((pageNumber - 1) * pageSize).Take(pageSize) - .ToListAsync(); + .ToListAsync(cancellationToken); return new PaginatedList( entities, count, @@ -63,13 +62,13 @@ public abstract class PostgreSqlBaseRepository : BaseRepository( entities, count, @@ -81,13 +80,15 @@ public abstract class PostgreSqlBaseRepository : BaseRepository( entities, count, @@ -100,14 +101,16 @@ public abstract class PostgreSqlBaseRepository : BaseRepository( entities, count, @@ -129,5 +132,4 @@ public abstract class PostgreSqlBaseRepository : BaseRepository