refactor(mappings): update filter mappings for club membership and payment transaction profiles
Build and Deploy to Kubernetes / build-and-deploy (push) Has been cancelled

- Renamed filter types in ClubMembershipCycleHistoryProfile, ClubMembershipCycleProfile, PaymentTransactionProfile, UserPackagePurchaseProfile to improve clarity and consistency.
- Adjusted mapping methods to utilize new filter type aliases for better readability and maintainability.
- Ensured all relevant profiles are aligned with the updated filter structures.
This commit is contained in:
masoodafar-web
2026-06-22 22:36:33 +03:30
parent f8794bbb63
commit db20d95b43
5 changed files with 18 additions and 9 deletions
@@ -2,6 +2,8 @@ using CMSMicroservice.Application.ClubMembershipCycleHistoryCQ.Queries.GetAllClu
using CMSMicroservice.Protobuf.Protos.ClubMembershipCycleHistory; using CMSMicroservice.Protobuf.Protos.ClubMembershipCycleHistory;
using Google.Protobuf.WellKnownTypes; using Google.Protobuf.WellKnownTypes;
using Mapster; using Mapster;
using AppFilter = CMSMicroservice.Application.ClubMembershipCycleHistoryCQ.Queries.GetAllClubMembershipCycleHistoryByFilter.GetAllClubMembershipCycleHistoryByFilterFilter;
using ProtoFilter = CMSMicroservice.Protobuf.Protos.ClubMembershipCycleHistory.GetAllClubMembershipCycleHistoryByFilterFilter;
namespace CMSMicroservice.WebApi.Common.Mappings; namespace CMSMicroservice.WebApi.Common.Mappings;
@@ -25,10 +27,10 @@ public class ClubMembershipCycleHistoryProfile : IRegister
}); });
} }
private static GetAllClubMembershipCycleHistoryByFilterFilter? MapFilter(GetAllClubMembershipCycleHistoryByFilterFilter? src) private static AppFilter? MapFilter(ProtoFilter? src)
{ {
if (src == null) return null; if (src == null) return null;
return new GetAllClubMembershipCycleHistoryByFilterFilter return new AppFilter
{ {
UserId = src.HasUserId ? src.UserId : null, UserId = src.HasUserId ? src.UserId : null,
ClubMembershipCycleId = src.HasClubMembershipCycleId ? src.ClubMembershipCycleId : null, ClubMembershipCycleId = src.HasClubMembershipCycleId ? src.ClubMembershipCycleId : null,
@@ -3,6 +3,8 @@ using CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetClubMembershi
using CMSMicroservice.Protobuf.Protos.ClubMembershipCycle; using CMSMicroservice.Protobuf.Protos.ClubMembershipCycle;
using Google.Protobuf.WellKnownTypes; using Google.Protobuf.WellKnownTypes;
using Mapster; using Mapster;
using AppFilter = CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetAllClubMembershipCycleByFilter.GetAllClubMembershipCycleByFilterFilter;
using ProtoFilter = CMSMicroservice.Protobuf.Protos.ClubMembershipCycle.GetAllClubMembershipCycleByFilterFilter;
namespace CMSMicroservice.WebApi.Common.Mappings; namespace CMSMicroservice.WebApi.Common.Mappings;
@@ -37,10 +39,10 @@ public class ClubMembershipCycleProfile : IRegister
}); });
} }
private static GetAllClubMembershipCycleByFilterFilter? MapFilter(GetAllClubMembershipCycleByFilterFilter? src) private static AppFilter? MapFilter(ProtoFilter? src)
{ {
if (src == null) return null; if (src == null) return null;
return new GetAllClubMembershipCycleByFilterFilter return new AppFilter
{ {
UserId = src.HasUserId ? src.UserId : null, UserId = src.HasUserId ? src.UserId : null,
IsCurrentCycle = src.HasIsCurrentCycle ? src.IsCurrentCycle : null, IsCurrentCycle = src.HasIsCurrentCycle ? src.IsCurrentCycle : null,
@@ -2,6 +2,7 @@ using CMSMicroservice.Application.ClubMembershipCQ.Queries.GetAllClubMemberships
using CMSMicroservice.Application.ClubMembershipCQ.Queries.GetClubMembership; using CMSMicroservice.Application.ClubMembershipCQ.Queries.GetClubMembership;
using CMSMicroservice.Application.ClubMembershipCQ.Queries.GetClubMembershipHistory; using CMSMicroservice.Application.ClubMembershipCQ.Queries.GetClubMembershipHistory;
using CMSMicroservice.Application.ClubMembershipCQ.Queries.GetClubStatistics; using CMSMicroservice.Application.ClubMembershipCQ.Queries.GetClubStatistics;
using AppHistoryFilter = CMSMicroservice.Application.ClubMembershipCQ.Queries.GetClubMembershipHistory.GetClubMembershipHistoryFilter;
using CMSMicroservice.Protobuf.Protos.ClubMembership; using CMSMicroservice.Protobuf.Protos.ClubMembership;
using Google.Protobuf.WellKnownTypes; using Google.Protobuf.WellKnownTypes;
using Mapster; using Mapster;
@@ -126,7 +127,7 @@ public class ClubMembershipProfile : IRegister
} }
: null, : null,
SortBy = src.HasSortBy ? src.SortBy : null, SortBy = src.HasSortBy ? src.SortBy : null,
Filter = src.Filter != null ? new GetClubMembershipHistoryFilter Filter = src.Filter != null ? new AppHistoryFilter
{ {
UserId = src.Filter.HasUserId ? src.Filter.UserId : null, UserId = src.Filter.HasUserId ? src.Filter.UserId : null,
ClubMembershipId = src.Filter.HasClubMembershipId ? src.Filter.ClubMembershipId : null, ClubMembershipId = src.Filter.HasClubMembershipId ? src.Filter.ClubMembershipId : null,
@@ -3,6 +3,8 @@ using CMSMicroservice.Application.PaymentTransactionCQ.Queries.GetPaymentTransac
using CMSMicroservice.Protobuf.Protos.PaymentTransaction; using CMSMicroservice.Protobuf.Protos.PaymentTransaction;
using Google.Protobuf.WellKnownTypes; using Google.Protobuf.WellKnownTypes;
using Mapster; using Mapster;
using AppFilter = CMSMicroservice.Application.PaymentTransactionCQ.Queries.GetAllPaymentTransactionByFilter.GetAllPaymentTransactionByFilterFilter;
using ProtoFilter = CMSMicroservice.Protobuf.Protos.PaymentTransaction.GetAllPaymentTransactionByFilterFilter;
namespace CMSMicroservice.WebApi.Common.Mappings; namespace CMSMicroservice.WebApi.Common.Mappings;
@@ -47,10 +49,10 @@ public class PaymentTransactionProfile : IRegister
Models = { src.Models?.Select(MapModel) ?? [] } Models = { src.Models?.Select(MapModel) ?? [] }
}; };
private static GetAllPaymentTransactionByFilterFilter? MapFilter(GetAllPaymentTransactionByFilterFilter? src) private static AppFilter? MapFilter(ProtoFilter? src)
{ {
if (src == null) return null; if (src == null) return null;
return new GetAllPaymentTransactionByFilterFilter return new AppFilter
{ {
UserId = src.HasUserId ? src.UserId : null, UserId = src.HasUserId ? src.UserId : null,
Mobile = src.HasMobile ? src.Mobile : null, Mobile = src.HasMobile ? src.Mobile : null,
@@ -3,6 +3,8 @@ using CMSMicroservice.Application.UserPackagePurchaseCQ.Queries.GetUserPackagePu
using CMSMicroservice.Protobuf.Protos.UserPackagePurchase; using CMSMicroservice.Protobuf.Protos.UserPackagePurchase;
using Google.Protobuf.WellKnownTypes; using Google.Protobuf.WellKnownTypes;
using Mapster; using Mapster;
using AppFilter = CMSMicroservice.Application.UserPackagePurchaseCQ.Queries.GetAllUserPackagePurchaseByFilter.GetAllUserPackagePurchaseByFilterFilter;
using ProtoFilter = CMSMicroservice.Protobuf.Protos.UserPackagePurchase.GetAllUserPackagePurchaseByFilterFilter;
namespace CMSMicroservice.WebApi.Common.Mappings; namespace CMSMicroservice.WebApi.Common.Mappings;
@@ -50,10 +52,10 @@ public class UserPackagePurchaseProfile : IRegister
}); });
} }
private static GetAllUserPackagePurchaseByFilterFilter? MapFilter(GetAllUserPackagePurchaseByFilterFilter? src) private static AppFilter? MapFilter(ProtoFilter? src)
{ {
if (src == null) return null; if (src == null) return null;
return new GetAllUserPackagePurchaseByFilterFilter return new AppFilter
{ {
UserId = src.HasUserId ? src.UserId : null, UserId = src.HasUserId ? src.UserId : null,
PackageId = src.HasPackageId ? src.PackageId : null, PackageId = src.HasPackageId ? src.PackageId : null,