feat(club-membership): enhance club membership history queries and responses
Build and Deploy to Kubernetes / build-and-deploy (push) Failing after 17m54s

- Added filtering capabilities to GetClubMembershipHistoryQuery, allowing optional filters for UserId, ClubMembershipId, Action, and date range.
- Updated GetClubMembershipHistoryQueryHandler to utilize the new filter structure.
- Enhanced GetAllClubMembershipsQueryHandler to include LastPackage details in the response.
- Introduced new properties in GetAllClubMembershipsResponseModel for PackageId and PackageName.
- Updated Protobuf definitions to reflect changes in club membership history queries and responses.
- Refactored mapping configurations to accommodate new DTOs and filters.
This commit is contained in:
masoodafar-web
2026-06-22 22:19:44 +03:30
parent 6395f63ab5
commit f8794bbb63
41 changed files with 1590 additions and 74 deletions
@@ -0,0 +1,46 @@
using CMSMicroservice.Domain.Entities.Club;
namespace CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetAllClubMembershipCycleByFilter;
public static class ClubMembershipCycleFilterExtensions
{
public static IQueryable<ClubMembershipCycle> ApplyClubMembershipCycleFilter(
this IQueryable<ClubMembershipCycle> query,
GetAllClubMembershipCycleByFilterFilter? filter)
{
if (filter == null) return query;
if (filter.UserId.HasValue)
query = query.Where(x => x.UserId == filter.UserId.Value);
if (filter.IsCurrentCycle.HasValue)
query = query.Where(x => x.IsCurrentCycle == filter.IsCurrentCycle.Value);
if (filter.PackageId.HasValue)
query = query.Where(x => x.PackageId == filter.PackageId.Value);
if (filter.CycleNumber.HasValue)
query = query.Where(x => x.CycleNumber == filter.CycleNumber.Value);
if (filter.PurchaseMethod.HasValue)
query = query.Where(x => x.PurchaseMethod == filter.PurchaseMethod.Value);
if (filter.MagicState.HasValue)
{
query = filter.MagicState.Value switch
{
1 => query.Where(x => x.MagicStartedAt != null && x.MagicCompletedAt == null),
2 => query.Where(x => x.MagicCompletedAt != null),
_ => query.Where(x => x.MagicStartedAt == null && x.MagicCompletedAt == null)
};
}
if (filter.PackagePurchasedFrom.HasValue)
query = query.Where(x => x.PackagePurchasedAt >= filter.PackagePurchasedFrom.Value);
if (filter.PackagePurchasedTo.HasValue)
query = query.Where(x => x.PackagePurchasedAt <= filter.PackagePurchasedTo.Value);
return query;
}
}
@@ -0,0 +1,47 @@
using CMSMicroservice.Domain.Enums;
namespace CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetAllClubMembershipCycleByFilter;
public record GetAllClubMembershipCycleByFilterQuery : IRequest<GetAllClubMembershipCycleByFilterResponseDto>
{
public PaginationState? PaginationState { get; init; }
public string? SortBy { get; init; }
public GetAllClubMembershipCycleByFilterFilter? Filter { get; init; }
}
public class GetAllClubMembershipCycleByFilterFilter
{
public long? UserId { get; set; }
public bool? IsCurrentCycle { get; set; }
public long? PackageId { get; set; }
public int? CycleNumber { get; set; }
public PackagePurchaseMethod? PurchaseMethod { get; set; }
/// <summary>0=none, 1=active magic, 2=completed magic</summary>
public int? MagicState { get; set; }
public DateTime? PackagePurchasedFrom { get; set; }
public DateTime? PackagePurchasedTo { get; set; }
}
public class GetAllClubMembershipCycleByFilterResponseDto
{
public MetaData MetaData { get; set; }
public List<GetAllClubMembershipCycleByFilterResponseModel>? Models { get; set; }
}
public class GetAllClubMembershipCycleByFilterResponseModel
{
public long Id { get; set; }
public long UserId { get; set; }
public string UserName { get; set; } = string.Empty;
public long ClubMembershipId { get; set; }
public int CycleNumber { get; set; }
public long PackageId { get; set; }
public string PackageName { get; set; } = string.Empty;
public long PackageAmount { get; set; }
public PackagePurchaseMethod PurchaseMethod { get; set; }
public DateTime PackagePurchasedAt { get; set; }
public DateTime? MagicStartedAt { get; set; }
public DateTime? MagicCompletedAt { get; set; }
public bool IsCurrentCycle { get; set; }
public DateTimeOffset Created { get; set; }
}
@@ -0,0 +1,49 @@
namespace CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetAllClubMembershipCycleByFilter;
public class GetAllClubMembershipCycleByFilterQueryHandler
: IRequestHandler<GetAllClubMembershipCycleByFilterQuery, GetAllClubMembershipCycleByFilterResponseDto>
{
private readonly IApplicationDbContext _context;
public GetAllClubMembershipCycleByFilterQueryHandler(IApplicationDbContext context)
{
_context = context;
}
public async Task<GetAllClubMembershipCycleByFilterResponseDto> Handle(
GetAllClubMembershipCycleByFilterQuery request,
CancellationToken cancellationToken)
{
var query = _context.ClubMembershipCycles
.Include(x => x.User)
.Include(x => x.Package)
.AsNoTracking()
.ApplyClubMembershipCycleFilter(request.Filter)
.ApplyOrder(sortBy: request.SortBy ?? "-PackagePurchasedAt");
return new GetAllClubMembershipCycleByFilterResponseDto
{
MetaData = await query.GetMetaData(request.PaginationState, cancellationToken),
Models = await query
.PaginatedListAsync(paginationState: request.PaginationState)
.Select(x => new GetAllClubMembershipCycleByFilterResponseModel
{
Id = x.Id,
UserId = x.UserId,
UserName = x.User != null ? $"{x.User.FirstName} {x.User.LastName}" : string.Empty,
ClubMembershipId = x.ClubMembershipId,
CycleNumber = x.CycleNumber,
PackageId = x.PackageId,
PackageName = x.Package != null ? x.Package.Title : string.Empty,
PackageAmount = x.PackageAmount,
PurchaseMethod = x.PurchaseMethod,
PackagePurchasedAt = x.PackagePurchasedAt,
MagicStartedAt = x.MagicStartedAt,
MagicCompletedAt = x.MagicCompletedAt,
IsCurrentCycle = x.IsCurrentCycle,
Created = x.Created
})
.ToListAsync(cancellationToken)
};
}
}
@@ -0,0 +1,13 @@
namespace CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetClubMembershipCycleSummary;
public record GetClubMembershipCycleSummaryQuery : IRequest<GetClubMembershipCycleSummaryResponseDto>
{
public GetAllClubMembershipCycleByFilter.GetAllClubMembershipCycleByFilterFilter? Filter { get; init; }
}
public class GetClubMembershipCycleSummaryResponseDto
{
public long TotalCount { get; set; }
public long CurrentCycleCount { get; set; }
public long MagicActiveCount { get; set; }
}
@@ -0,0 +1,36 @@
using CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetAllClubMembershipCycleByFilter;
namespace CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetClubMembershipCycleSummary;
public class GetClubMembershipCycleSummaryQueryHandler
: IRequestHandler<GetClubMembershipCycleSummaryQuery, GetClubMembershipCycleSummaryResponseDto>
{
private readonly IApplicationDbContext _context;
public GetClubMembershipCycleSummaryQueryHandler(IApplicationDbContext context)
{
_context = context;
}
public async Task<GetClubMembershipCycleSummaryResponseDto> Handle(
GetClubMembershipCycleSummaryQuery request,
CancellationToken cancellationToken)
{
var query = _context.ClubMembershipCycles
.AsNoTracking()
.ApplyClubMembershipCycleFilter(request.Filter);
var totalCount = await query.LongCountAsync(cancellationToken);
var currentCycleCount = await query.LongCountAsync(x => x.IsCurrentCycle, cancellationToken);
var magicActiveCount = await query.LongCountAsync(
x => x.MagicStartedAt != null && x.MagicCompletedAt == null,
cancellationToken);
return new GetClubMembershipCycleSummaryResponseDto
{
TotalCount = totalCount,
CurrentCycleCount = currentCycleCount,
MagicActiveCount = magicActiveCount
};
}
}