From db20d95b43737a9692e737d780280f195175b6e1 Mon Sep 17 00:00:00 2001 From: masoodafar-web Date: Mon, 22 Jun 2026 22:36:33 +0330 Subject: [PATCH] refactor(mappings): update filter mappings for club membership and payment transaction profiles - 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. --- .../Common/Mappings/ClubMembershipCycleHistoryProfile.cs | 6 ++++-- .../Common/Mappings/ClubMembershipCycleProfile.cs | 6 ++++-- .../Common/Mappings/ClubMembershipProfile.cs | 3 ++- .../Common/Mappings/PaymentTransactionProfile.cs | 6 ++++-- .../Common/Mappings/UserPackagePurchaseProfile.cs | 6 ++++-- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/CMSMicroservice.WebApi/Common/Mappings/ClubMembershipCycleHistoryProfile.cs b/src/CMSMicroservice.WebApi/Common/Mappings/ClubMembershipCycleHistoryProfile.cs index eec483a..7a0433a 100644 --- a/src/CMSMicroservice.WebApi/Common/Mappings/ClubMembershipCycleHistoryProfile.cs +++ b/src/CMSMicroservice.WebApi/Common/Mappings/ClubMembershipCycleHistoryProfile.cs @@ -2,6 +2,8 @@ using CMSMicroservice.Application.ClubMembershipCycleHistoryCQ.Queries.GetAllClu using CMSMicroservice.Protobuf.Protos.ClubMembershipCycleHistory; using Google.Protobuf.WellKnownTypes; using Mapster; +using AppFilter = CMSMicroservice.Application.ClubMembershipCycleHistoryCQ.Queries.GetAllClubMembershipCycleHistoryByFilter.GetAllClubMembershipCycleHistoryByFilterFilter; +using ProtoFilter = CMSMicroservice.Protobuf.Protos.ClubMembershipCycleHistory.GetAllClubMembershipCycleHistoryByFilterFilter; 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; - return new GetAllClubMembershipCycleHistoryByFilterFilter + return new AppFilter { UserId = src.HasUserId ? src.UserId : null, ClubMembershipCycleId = src.HasClubMembershipCycleId ? src.ClubMembershipCycleId : null, diff --git a/src/CMSMicroservice.WebApi/Common/Mappings/ClubMembershipCycleProfile.cs b/src/CMSMicroservice.WebApi/Common/Mappings/ClubMembershipCycleProfile.cs index 10f961d..c866541 100644 --- a/src/CMSMicroservice.WebApi/Common/Mappings/ClubMembershipCycleProfile.cs +++ b/src/CMSMicroservice.WebApi/Common/Mappings/ClubMembershipCycleProfile.cs @@ -3,6 +3,8 @@ using CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetClubMembershi using CMSMicroservice.Protobuf.Protos.ClubMembershipCycle; using Google.Protobuf.WellKnownTypes; using Mapster; +using AppFilter = CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetAllClubMembershipCycleByFilter.GetAllClubMembershipCycleByFilterFilter; +using ProtoFilter = CMSMicroservice.Protobuf.Protos.ClubMembershipCycle.GetAllClubMembershipCycleByFilterFilter; 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; - return new GetAllClubMembershipCycleByFilterFilter + return new AppFilter { UserId = src.HasUserId ? src.UserId : null, IsCurrentCycle = src.HasIsCurrentCycle ? src.IsCurrentCycle : null, diff --git a/src/CMSMicroservice.WebApi/Common/Mappings/ClubMembershipProfile.cs b/src/CMSMicroservice.WebApi/Common/Mappings/ClubMembershipProfile.cs index e131f82..f7ba6d5 100644 --- a/src/CMSMicroservice.WebApi/Common/Mappings/ClubMembershipProfile.cs +++ b/src/CMSMicroservice.WebApi/Common/Mappings/ClubMembershipProfile.cs @@ -2,6 +2,7 @@ using CMSMicroservice.Application.ClubMembershipCQ.Queries.GetAllClubMemberships using CMSMicroservice.Application.ClubMembershipCQ.Queries.GetClubMembership; using CMSMicroservice.Application.ClubMembershipCQ.Queries.GetClubMembershipHistory; using CMSMicroservice.Application.ClubMembershipCQ.Queries.GetClubStatistics; +using AppHistoryFilter = CMSMicroservice.Application.ClubMembershipCQ.Queries.GetClubMembershipHistory.GetClubMembershipHistoryFilter; using CMSMicroservice.Protobuf.Protos.ClubMembership; using Google.Protobuf.WellKnownTypes; using Mapster; @@ -126,7 +127,7 @@ public class ClubMembershipProfile : IRegister } : 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, ClubMembershipId = src.Filter.HasClubMembershipId ? src.Filter.ClubMembershipId : null, diff --git a/src/CMSMicroservice.WebApi/Common/Mappings/PaymentTransactionProfile.cs b/src/CMSMicroservice.WebApi/Common/Mappings/PaymentTransactionProfile.cs index 1a4cf8d..c7dffd7 100644 --- a/src/CMSMicroservice.WebApi/Common/Mappings/PaymentTransactionProfile.cs +++ b/src/CMSMicroservice.WebApi/Common/Mappings/PaymentTransactionProfile.cs @@ -3,6 +3,8 @@ using CMSMicroservice.Application.PaymentTransactionCQ.Queries.GetPaymentTransac using CMSMicroservice.Protobuf.Protos.PaymentTransaction; using Google.Protobuf.WellKnownTypes; using Mapster; +using AppFilter = CMSMicroservice.Application.PaymentTransactionCQ.Queries.GetAllPaymentTransactionByFilter.GetAllPaymentTransactionByFilterFilter; +using ProtoFilter = CMSMicroservice.Protobuf.Protos.PaymentTransaction.GetAllPaymentTransactionByFilterFilter; namespace CMSMicroservice.WebApi.Common.Mappings; @@ -47,10 +49,10 @@ public class PaymentTransactionProfile : IRegister Models = { src.Models?.Select(MapModel) ?? [] } }; - private static GetAllPaymentTransactionByFilterFilter? MapFilter(GetAllPaymentTransactionByFilterFilter? src) + private static AppFilter? MapFilter(ProtoFilter? src) { if (src == null) return null; - return new GetAllPaymentTransactionByFilterFilter + return new AppFilter { UserId = src.HasUserId ? src.UserId : null, Mobile = src.HasMobile ? src.Mobile : null, diff --git a/src/CMSMicroservice.WebApi/Common/Mappings/UserPackagePurchaseProfile.cs b/src/CMSMicroservice.WebApi/Common/Mappings/UserPackagePurchaseProfile.cs index 33202a3..87543be 100644 --- a/src/CMSMicroservice.WebApi/Common/Mappings/UserPackagePurchaseProfile.cs +++ b/src/CMSMicroservice.WebApi/Common/Mappings/UserPackagePurchaseProfile.cs @@ -3,6 +3,8 @@ using CMSMicroservice.Application.UserPackagePurchaseCQ.Queries.GetUserPackagePu using CMSMicroservice.Protobuf.Protos.UserPackagePurchase; using Google.Protobuf.WellKnownTypes; using Mapster; +using AppFilter = CMSMicroservice.Application.UserPackagePurchaseCQ.Queries.GetAllUserPackagePurchaseByFilter.GetAllUserPackagePurchaseByFilterFilter; +using ProtoFilter = CMSMicroservice.Protobuf.Protos.UserPackagePurchase.GetAllUserPackagePurchaseByFilterFilter; 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; - return new GetAllUserPackagePurchaseByFilterFilter + return new AppFilter { UserId = src.HasUserId ? src.UserId : null, PackageId = src.HasPackageId ? src.PackageId : null,