From 7e36fb7dd267b9f553676569a825c003d6f07fb3 Mon Sep 17 00:00:00 2001 From: alex289 Date: Mon, 23 Oct 2023 12:40:53 +0200 Subject: [PATCH] chore: miscellaneous improvements --- .../Queries/Tenants/GetAll/GetAllTenantsQueryHandler.cs | 2 +- .../Queries/Tenants/GetTenantById/GetTenantByIdQueryHandler.cs | 3 +-- .../Commands/Users/LoginUser/LoginUserCommandHandler.cs | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CleanArchitecture.Application/Queries/Tenants/GetAll/GetAllTenantsQueryHandler.cs b/CleanArchitecture.Application/Queries/Tenants/GetAll/GetAllTenantsQueryHandler.cs index afa3d0a..9f46f18 100644 --- a/CleanArchitecture.Application/Queries/Tenants/GetAll/GetAllTenantsQueryHandler.cs +++ b/CleanArchitecture.Application/Queries/Tenants/GetAll/GetAllTenantsQueryHandler.cs @@ -33,7 +33,7 @@ public sealed class GetAllTenantsQueryHandler : var tenantsQuery = _tenantRepository .GetAllNoTracking() .IgnoreQueryFilters() - .Include(x => x.Users) + .Include(x => x.Users.Where(y => request.IncludeDeleted || !y.Deleted)) .Where(x => request.IncludeDeleted || !x.Deleted); if (!string.IsNullOrWhiteSpace(request.SearchTerm)) diff --git a/CleanArchitecture.Application/Queries/Tenants/GetTenantById/GetTenantByIdQueryHandler.cs b/CleanArchitecture.Application/Queries/Tenants/GetTenantById/GetTenantByIdQueryHandler.cs index 4473ae0..ddc25bf 100644 --- a/CleanArchitecture.Application/Queries/Tenants/GetTenantById/GetTenantByIdQueryHandler.cs +++ b/CleanArchitecture.Application/Queries/Tenants/GetTenantById/GetTenantByIdQueryHandler.cs @@ -23,8 +23,7 @@ public sealed class GetTenantByIdQueryHandler : public async Task Handle(GetTenantByIdQuery request, CancellationToken cancellationToken) { - var tenant = await _tenantRepository - .GetByIdAsync(request.TenantId); + var tenant = await _tenantRepository.GetByIdAsync(request.TenantId); if (tenant is null) { diff --git a/CleanArchitecture.Domain/Commands/Users/LoginUser/LoginUserCommandHandler.cs b/CleanArchitecture.Domain/Commands/Users/LoginUser/LoginUserCommandHandler.cs index 2a72fae..118a211 100644 --- a/CleanArchitecture.Domain/Commands/Users/LoginUser/LoginUserCommandHandler.cs +++ b/CleanArchitecture.Domain/Commands/Users/LoginUser/LoginUserCommandHandler.cs @@ -20,7 +20,7 @@ namespace CleanArchitecture.Domain.Commands.Users.LoginUser; public sealed class LoginUserCommandHandler : CommandHandlerBase, IRequestHandler { - private const double _expiryDurationMinutes = 30; + private const double _expiryDurationMinutes = 60; private readonly TokenSettings _tokenSettings; private readonly IUserRepository _userRepository;