refactor: Remove ICurrentUserService dependency from query handlers and update user ID handling logic
Build and Deploy to Kubernetes / build-and-deploy (push) Failing after 8s

This commit is contained in:
masoodafar-web
2026-02-10 23:01:49 +03:30
parent b42d9e141d
commit d1ca72300d
13 changed files with 77 additions and 95 deletions
@@ -8,29 +8,22 @@ namespace CMSMicroservice.Application.UserOrderCQ.Queries.GetCustomerOrders;
public class GetCustomerOrdersQueryHandler : IRequestHandler<GetCustomerOrdersQuery, GetCustomerOrdersResponseDto>
{
private readonly IApplicationDbContext _context;
private readonly ICurrentUserService _currentUser;
public GetCustomerOrdersQueryHandler(
IApplicationDbContext context,
ICurrentUserService currentUser)
IApplicationDbContext context)
{
_context = context;
_currentUser = currentUser;
}
public async Task<GetCustomerOrdersResponseDto> Handle(GetCustomerOrdersQuery request, CancellationToken cancellationToken)
{
// Resolve UserId from JWT if not specified
var userId = request.UserId == 0
? (long.TryParse(_currentUser.UserId, out var currentUserId) ? currentUserId : 0)
: request.UserId;
if (userId == 0)
throw new UnauthorizedAccessException("User ID not found");
// UserId > 0 → filter by that user
// UserId == 0 → show ALL users (admin mode)
var userId = request.UserId;
var query = _context.UserOrders
.AsNoTracking()
.Where(x => x.UserId == userId)
.Where(x => userId == 0 || x.UserId == userId)
.Include(x => x.Package)
.Include(x => x.Transaction)
.Include(x => x.UserAddress)