feat: add GetAvailableWeeks query and update protobuf imports

src/BackOffice.BFF.Application/ClubMembershipCQ/Commands/ActivateClub/ActivateClubCommandHandler.cs

@@ -1,5 +1,6 @@
 
-using Foursat.BackOffice.BFF.ClubMembership.Protos;
+
+using CMSMicroservice.Protobuf.Protos.ClubMembership;
 
 namespace BackOffice.BFF.Application.ClubMembershipCQ.Commands.ActivateClub;
 

src/BackOffice.BFF.Application/ClubMembershipCQ/Queries/GetAllClubMembers/GetAllClubMembersQueryHandler.cs

@@ -1,6 +1,6 @@
 
-using Foursat.BackOffice.BFF.ClubMembership.Protos;
-using Foursat.BackOffice.BFF.ClubMembership.Protos;
+
+using CMSMicroservice.Protobuf.Protos.ClubMembership;
 
 namespace BackOffice.BFF.Application.ClubMembershipCQ.Queries.GetAllClubMembers;
 

src/BackOffice.BFF.Application/ClubMembershipCQ/Queries/GetClubStatistics/GetClubStatisticsQueryHandler.cs

@@ -1,5 +1,6 @@
 
-using Foursat.BackOffice.BFF.ClubMembership.Protos;
+
+using CMSMicroservice.Protobuf.Protos.ClubMembership;
 
 namespace BackOffice.BFF.Application.ClubMembershipCQ.Queries.GetClubStatistics;
 

src/BackOffice.BFF.Application/CommissionCQ/Commands/ApproveWithdrawal/ApproveWithdrawalCommandHandler.cs

@@ -1,5 +1,6 @@
 
-using Foursat.BackOffice.BFF.Commission.Protos;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Commands.ApproveWithdrawal;
 

src/BackOffice.BFF.Application/CommissionCQ/Commands/ProcessWithdrawal/ProcessWithdrawalCommandHandler.cs

@@ -1,5 +1,4 @@
-using Foursat.BackOffice.BFF.Commission.Protos;
-using Google.Protobuf.WellKnownTypes;
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Commands.ProcessWithdrawal;
 

src/BackOffice.BFF.Application/CommissionCQ/Commands/RejectWithdrawal/RejectWithdrawalCommandHandler.cs

@@ -1,5 +1,6 @@
 
-using Foursat.BackOffice.BFF.Commission.Protos;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Commands.RejectWithdrawal;
 

src/BackOffice.BFF.Application/CommissionCQ/Commands/TriggerWeeklyCalculation/TriggerWeeklyCalculationCommandHandler.cs

@@ -1,5 +1,6 @@
 
-using Foursat.BackOffice.BFF.Commission.Protos;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Commands.TriggerWeeklyCalculation;
 

src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAllWeeklyPools/GetAllWeeklyPoolsQueryHandler.cs

@@ -1,5 +1,7 @@
 
-using Foursat.BackOffice.BFF.Commission.Protos;
+
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetAllWeeklyPools;
 

src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQuery.cs

@@ -0,0 +1,7 @@
+namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetAvailableWeeks;
+
+public class GetAvailableWeeksQuery : IRequest<GetAvailableWeeksResponseDto>
+{
+    public int FutureWeeksCount { get; init; } = 4;
+    public int PastWeeksCount { get; init; } = 12;
+}

src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs

@@ -0,0 +1,53 @@
+
+using CMSMicroservice.Protobuf.Protos.Commission;
+
+namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetAvailableWeeks;
+
+public class GetAvailableWeeksQueryHandler : IRequestHandler<GetAvailableWeeksQuery, GetAvailableWeeksResponseDto>
+{
+    private readonly IApplicationContractContext _context;
+
+    public GetAvailableWeeksQueryHandler(IApplicationContractContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<GetAvailableWeeksResponseDto> Handle(
+        GetAvailableWeeksQuery request,
+        CancellationToken cancellationToken)
+    {
+        // Call CMS microservice through BFF proto
+        var cmsRequest = new GetAvailableWeeksRequest
+        {
+            FutureWeeksCount = request.FutureWeeksCount,
+            PastWeeksCount = request.PastWeeksCount
+        };
+
+        var response = await _context.Commissions.GetAvailableWeeksAsync(cmsRequest, cancellationToken: cancellationToken);
+
+        // Map to DTO
+        return new GetAvailableWeeksResponseDto
+        {
+            CurrentWeek = MapToDto(response.CurrentWeek),
+            CalculatedWeeks = response.CalculatedWeeks.Select(MapToDto).ToList(),
+            PendingWeeks = response.PendingWeeks.Select(MapToDto).ToList(),
+            FutureWeeks = response.FutureWeeks.Select(MapToDto).ToList()
+        };
+    }
+
+    private static WeekInfoDto MapToDto(WeekInfo weekInfo)
+    {
+        return new WeekInfoDto
+        {
+            WeekNumber = weekInfo.WeekNumber,
+            StartDate = weekInfo.StartDate?.ToDateTime() ?? DateTime.MinValue,
+            EndDate = weekInfo.EndDate?.ToDateTime() ?? DateTime.MinValue,
+            IsCalculated = weekInfo.IsCalculated,
+            CalculatedAt = weekInfo.CalculatedAt?.ToDateTime(),
+            LastExecutionStatus = weekInfo.LastExecutionStatus,
+            TotalPoolAmount = weekInfo.TotalPoolAmount != 0 ? weekInfo.TotalPoolAmount : null,
+            EligibleUsersCount = weekInfo.EligibleUsersCount != 0 ? weekInfo.EligibleUsersCount : null,
+            DisplayText = weekInfo.DisplayText
+        };
+    }
+}

src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksResponseDto.cs

@@ -0,0 +1,22 @@
+namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetAvailableWeeks;
+
+public class GetAvailableWeeksResponseDto
+{
+    public required WeekInfoDto CurrentWeek { get; init; }
+    public required List<WeekInfoDto> CalculatedWeeks { get; init; }
+    public required List<WeekInfoDto> PendingWeeks { get; init; }
+    public required List<WeekInfoDto> FutureWeeks { get; init; }
+}
+
+public class WeekInfoDto
+{
+    public required string WeekNumber { get; init; }
+    public required DateTime StartDate { get; init; }
+    public required DateTime EndDate { get; init; }
+    public bool IsCalculated { get; init; }
+    public DateTime? CalculatedAt { get; init; }
+    public string? LastExecutionStatus { get; init; }
+    public long? TotalPoolAmount { get; init; }
+    public int? EligibleUsersCount { get; init; }
+    public required string DisplayText { get; init; }
+}

src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserPayouts/GetUserPayoutsQueryHandler.cs

@@ -1,5 +1,6 @@
 
-using Foursat.BackOffice.BFF.Commission.Protos;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetUserPayouts;
 

src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesQueryHandler.cs

@@ -1,5 +1,6 @@
 
-using Foursat.BackOffice.BFF.Commission.Protos;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetUserWeeklyBalances;
 

src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWeeklyPool/GetWeeklyPoolQueryHandler.cs

@@ -1,5 +1,6 @@
 
-using Foursat.BackOffice.BFF.Commission.Protos;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetWeeklyPool;
 

src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWeeklyPool/GetWeeklyPoolResponseDto.cs

@@ -2,58 +2,12 @@ namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetWeeklyPool;
 
 public class GetWeeklyPoolResponseDto
 {
-    /// <summary>
-    /// شناسه Pool
-    /// </summary>
     public long Id { get; set; }
-
-    /// <summary>
-    /// شماره هفته (فرمت: YYYY-Www)
-    /// </summary>
     public string WeekNumber { get; set; } = string.Empty;
-
-    /// <summary>
-    /// مجموع کل Pool (تومان)
-    /// </summary>
-    public decimal TotalPoolValue { get; set; }
-
-    /// <summary>
-    /// مجموع مشارکت‌های اولیه (InitialContribution)
-    /// </summary>
-    public decimal TotalContributions { get; set; }
-
-    /// <summary>
-    /// مجموع Payout های پرداخت شده
-    /// </summary>
-    public decimal TotalPayouts { get; set; }
-
-    /// <summary>
-    /// باقیمانده Pool
-    /// </summary>
-    public decimal LeftBalance { get; set; }
-
-    /// <summary>
-    /// تعداد اعضای فعال در این هفته
-    /// </summary>
-    public int ActiveMembersCount { get; set; }
-
-    /// <summary>
-    /// آیا محاسبه شده است؟
-    /// </summary>
+    public long TotalPoolAmount { get; set; }
+    public long TotalBalances { get; set; }
+    public decimal ValuePerBalance { get; set; }
     public bool IsCalculated { get; set; }
-
-    /// <summary>
-    /// تاریخ محاسبه
-    /// </summary>
     public DateTime? CalculatedAt { get; set; }
-
-    /// <summary>
-    /// تاریخ ایجاد
-    /// </summary>
-    public DateTime CreatedAt { get; set; }
-
-    /// <summary>
-    /// تاریخ آخرین ویرایش
-    /// </summary>
-    public DateTime? ModifiedAt { get; set; }
+    public DateTimeOffset Created { get; set; }
 }

src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalReports/GetWithdrawalReportsQueryHandler.cs

@@ -1,5 +1,6 @@
 
-using Foursat.BackOffice.BFF.Commission.Protos;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetWithdrawalReports;
 

src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalRequests/GetWithdrawalRequestsQueryHandler.cs

@@ -1,5 +1,6 @@
 
-using Foursat.BackOffice.BFF.Commission.Protos;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetWithdrawalRequests;
 

src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerExecutionLogs/GetWorkerExecutionLogsQueryHandler.cs

@@ -1,5 +1,6 @@
 
-using Foursat.BackOffice.BFF.Commission.Protos;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetWorkerExecutionLogs;
 

src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerStatus/GetWorkerStatusQueryHandler.cs

@@ -1,5 +1,6 @@
 
-using Foursat.BackOffice.BFF.Commission.Protos;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetWorkerStatus;
 

src/BackOffice.BFF.Application/Common/Interfaces/IApplicationContractContext.cs

@@ -13,15 +13,16 @@ using FMSMicroservice.Protobuf.Protos.FileInfo;
 using CMSMicroservice.Protobuf.Protos.DiscountProduct;
 using CMSMicroservice.Protobuf.Protos.DiscountCategory;
 using CMSMicroservice.Protobuf.Protos.DiscountShoppingCart;
-using BackOffice.BFF.DiscountOrder.Protobuf.Protos.DiscountOrder;
 using CMSMicroservice.Protobuf.Protos.Tag;
 using CMSMicroservice.Protobuf.Protos.ProductTag;
 using CMSMicroservice.Protobuf.Protos;
-using Foursat.BackOffice.BFF.ClubMembership.Protos;
-using Foursat.BackOffice.BFF.Commission.Protos;
-using Foursat.BackOffice.BFF.Configuration.Protos;
-using Foursat.BackOffice.BFF.NetworkMembership.Protos;
-using BackOffice.BFF.ManualPayment.Protobuf;
+
+using CMSMicroservice.Protobuf.Protos.ClubMembership;
+using CMSMicroservice.Protobuf.Protos.Commission;
+using CMSMicroservice.Protobuf.Protos.Configuration;
+using CMSMicroservice.Protobuf.Protos.DiscountOrder;
+using CMSMicroservice.Protobuf.Protos.ManualPayment;
+using CMSMicroservice.Protobuf.Protos.NetworkMembership;
 
 namespace BackOffice.BFF.Application.Common.Interfaces;
 

src/BackOffice.BFF.Application/Common/Mappings/CommissionProfile.cs

@@ -0,0 +1,21 @@
+using BackOffice.BFF.Application.CommissionCQ.Queries.GetWeeklyPool;
+using CMSMicroservice.Protobuf.Protos.Commission;
+
+namespace BackOffice.BFF.Application.Common.Mappings;
+
+public class CommissionProfile : IRegister
+{
+    void IRegister.Register(TypeAdapterConfig config)
+    {
+        config.NewConfig< GetWeeklyCommissionPoolResponse,GetWeeklyPoolResponseDto>()
+            .Map(dest => dest.Id, src => src.Id)
+            .Map(dest => dest.CalculatedAt, src => src.CalculatedAt)
+            .Map(dest => dest.IsCalculated, src => src.IsCalculated)
+            .Map(dest => dest.WeekNumber, src => src.WeekNumber)
+            .Map(dest => dest.TotalPoolAmount, src => src.TotalPoolAmount)
+            .Map(dest => dest.ValuePerBalance, src => src.ValuePerBalance)
+            .Map(dest => dest.TotalBalances, src => src.TotalBalances)
+            .Map(dest => dest.Created, src => src.Created.ToDateTimeOffset())
+            ;
+    }
+}

src/BackOffice.BFF.Application/Common/Mappings/GeneralMapping.cs

@@ -51,6 +51,9 @@ public class GeneralMapping : IRegister
         config.NewConfig<TimeSpan?, Duration>()
             .MapWith(src => src.HasValue ? Duration.FromTimeSpan(src.Value) : null);
 
+        config.NewConfig<DateTimeOffset?, DateTime?>()
+            .MapWith(src => src.HasValue ? src.Value.DateTime : (DateTime?)null);
+        
         config.Default
             .UseDestinationValue(member => member.SetterModifier == AccessModifier.None &&
                                            member.Type.IsGenericType &&

src/BackOffice.BFF.Application/ConfigurationCQ/Commands/CreateOrUpdateConfiguration/CreateOrUpdateConfigurationCommandHandler.cs

@@ -1,5 +1,6 @@
-using Foursat.BackOffice.BFF.Configuration.Protos;
-using Google.Protobuf.WellKnownTypes;
+
+
+using CMSMicroservice.Protobuf.Protos.Configuration;
 
 namespace BackOffice.BFF.Application.ConfigurationCQ.Commands.CreateOrUpdateConfiguration;
 

src/BackOffice.BFF.Application/ConfigurationCQ/Commands/DeactivateConfiguration/DeactivateConfigurationCommandHandler.cs

@@ -1,4 +1,5 @@
-using Foursat.BackOffice.BFF.Configuration.Protos;
+
+using CMSMicroservice.Protobuf.Protos.Configuration;
 
 namespace BackOffice.BFF.Application.ConfigurationCQ.Commands.DeactivateConfiguration;
 

src/BackOffice.BFF.Application/ConfigurationCQ/Commands/SetDefaultVatPercentage/SetDefaultVatPercentageCommandHandler.cs

@@ -1,7 +1,5 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-using Foursat.BackOffice.BFF.Configuration.Protos;
-using Google.Protobuf.WellKnownTypes;
-using MediatR;
+
+using CMSMicroservice.Protobuf.Protos.Configuration;
 using Microsoft.Extensions.Logging;
 
 namespace BackOffice.BFF.Application.ConfigurationCQ.Commands.SetDefaultVatPercentage;

src/BackOffice.BFF.Application/ConfigurationCQ/Commands/SetDefaultVatPercentage/SetDefaultVatPercentageCommandValidator.cs

@@ -1,5 +1,3 @@
-using FluentValidation;
-
 namespace BackOffice.BFF.Application.ConfigurationCQ.Commands.SetDefaultVatPercentage;
 
 public class SetDefaultVatPercentageCommandValidator : AbstractValidator<SetDefaultVatPercentageCommand>

src/BackOffice.BFF.Application/ConfigurationCQ/Queries/GetAllConfigurations/GetAllConfigurationsQueryHandler.cs

@@ -1,4 +1,5 @@
-using Foursat.BackOffice.BFF.Configuration.Protos;
+
+using CMSMicroservice.Protobuf.Protos.Configuration;
 
 namespace BackOffice.BFF.Application.ConfigurationCQ.Queries.GetAllConfigurations;
 

src/BackOffice.BFF.Application/ConfigurationCQ/Queries/GetCurrentVatPercentage/GetCurrentVatPercentageQueryHandler.cs

@@ -1,6 +1,4 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-using Foursat.BackOffice.BFF.Configuration.Protos;
-using MediatR;
+using CMSMicroservice.Protobuf.Protos.Configuration;
 using Microsoft.Extensions.Logging;
 
 namespace BackOffice.BFF.Application.ConfigurationCQ.Queries.GetCurrentVatPercentage;

src/BackOffice.BFF.Application/DiscountOrderCQ/Commands/CompleteOrderPayment/CompleteOrderPaymentCommandHandler.cs

@@ -1,5 +1,5 @@
-using BackOffice.BFF.DiscountOrder.Protobuf.Protos.DiscountOrder;
-using Mapster;
+
+using CMSMicroservice.Protobuf.Protos.DiscountOrder;
 
 namespace BackOffice.BFF.Application.DiscountOrderCQ.Commands.CompleteOrderPayment;
 
@@ -14,10 +14,10 @@ public class CompleteOrderPaymentCommandHandler : IRequestHandler<CompleteOrderP
 
     public async Task<CompleteOrderPaymentResponseDto> Handle(CompleteOrderPaymentCommand request, CancellationToken cancellationToken)
     {
-        var grpcRequest = TypeAdapter.Adapt(request, request.GetType(), typeof(CompleteOrderPaymentRequest)) as CompleteOrderPaymentRequest;
+        var grpcRequest = request.Adapt<CompleteOrderPaymentRequest>();
 
         var response = await _context.DiscountOrders.CompleteOrderPaymentAsync(grpcRequest, cancellationToken: cancellationToken);
 
-        return TypeAdapter.Adapt(response, response.GetType(), typeof(CompleteOrderPaymentResponseDto)) as CompleteOrderPaymentResponseDto;
+        return response.Adapt<CompleteOrderPaymentResponseDto>();
     }
 }

src/BackOffice.BFF.Application/DiscountOrderCQ/Commands/PlaceOrder/PlaceOrderCommandHandler.cs

@@ -1,5 +1,5 @@
-using BackOffice.BFF.DiscountOrder.Protobuf.Protos.DiscountOrder;
-using Mapster;
+
+using CMSMicroservice.Protobuf.Protos.DiscountOrder;
 
 namespace BackOffice.BFF.Application.DiscountOrderCQ.Commands.PlaceOrder;
 
@@ -14,10 +14,10 @@ public class PlaceOrderCommandHandler : IRequestHandler<PlaceOrderCommand, Place
 
     public async Task<PlaceOrderResponseDto> Handle(PlaceOrderCommand request, CancellationToken cancellationToken)
     {
-        var grpcRequest = TypeAdapter.Adapt(request, request.GetType(), typeof(PlaceOrderRequest)) as PlaceOrderRequest;
+        var grpcRequest = request.Adapt<PlaceOrderRequest>();
 
         var response = await _context.DiscountOrders.PlaceOrderAsync(grpcRequest, cancellationToken: cancellationToken);
 
-        return TypeAdapter.Adapt(response, response.GetType(), typeof(PlaceOrderResponseDto)) as PlaceOrderResponseDto;
+        return response.Adapt<PlaceOrderResponseDto>();
     }
 }

src/BackOffice.BFF.Application/DiscountOrderCQ/Commands/UpdateOrderStatus/UpdateOrderStatusCommandHandler.cs

@@ -1,5 +1,5 @@
-using BackOffice.BFF.DiscountOrder.Protobuf.Protos.DiscountOrder;
-using Mapster;
+
+using CMSMicroservice.Protobuf.Protos.DiscountOrder;
 
 namespace BackOffice.BFF.Application.DiscountOrderCQ.Commands.UpdateOrderStatus;
 
@@ -14,10 +14,10 @@ public class UpdateOrderStatusCommandHandler : IRequestHandler<UpdateOrderStatus
 
     public async Task<UpdateOrderStatusResponseDto> Handle(UpdateOrderStatusCommand request, CancellationToken cancellationToken)
     {
-        var grpcRequest = TypeAdapter.Adapt(request, request.GetType(), typeof(UpdateOrderStatusRequest)) as UpdateOrderStatusRequest;
+        var grpcRequest = request.Adapt<UpdateOrderStatusRequest>();
 
         var response = await _context.DiscountOrders.UpdateOrderStatusAsync(grpcRequest, cancellationToken: cancellationToken);
 
-        return TypeAdapter.Adapt(response, response.GetType(), typeof(UpdateOrderStatusResponseDto)) as UpdateOrderStatusResponseDto;
+        return response.Adapt<UpdateOrderStatusResponseDto>();
     }
 }

src/BackOffice.BFF.Application/DiscountOrderCQ/Queries/GetOrderById/GetOrderByIdQueryHandler.cs

@@ -1,5 +1,5 @@
-using BackOffice.BFF.DiscountOrder.Protobuf.Protos.DiscountOrder;
-using Mapster;
+
+using CMSMicroservice.Protobuf.Protos.DiscountOrder;
 
 namespace BackOffice.BFF.Application.DiscountOrderCQ.Queries.GetOrderById;
 
@@ -22,6 +22,6 @@ public class GetOrderByIdQueryHandler : IRequestHandler<GetOrderByIdQuery, GetOr
 
         var response = await _context.DiscountOrders.GetOrderByIdAsync(grpcRequest, cancellationToken: cancellationToken);
 
-        return TypeAdapter.Adapt(response, response.GetType(), typeof(GetOrderByIdResponseDto)) as GetOrderByIdResponseDto;
+        return response.Adapt<GetOrderByIdResponseDto>();
     }
 }

src/BackOffice.BFF.Application/DiscountOrderCQ/Queries/GetUserOrders/GetUserOrdersQueryHandler.cs

@@ -1,5 +1,5 @@
-using BackOffice.BFF.DiscountOrder.Protobuf.Protos.DiscountOrder;
-using Mapster;
+
+using CMSMicroservice.Protobuf.Protos.DiscountOrder;
 
 namespace BackOffice.BFF.Application.DiscountOrderCQ.Queries.GetUserOrders;
 
@@ -26,6 +26,6 @@ public class GetUserOrdersQueryHandler : IRequestHandler<GetUserOrdersQuery, Get
 
         var response = await _context.DiscountOrders.GetUserOrdersAsync(grpcRequest, cancellationToken: cancellationToken);
 
-        return TypeAdapter.Adapt(response, response.GetType(), typeof(GetUserOrdersResponseDto)) as GetUserOrdersResponseDto;
+        return response.Adapt<GetUserOrdersResponseDto>();
     }
 }

src/BackOffice.BFF.Application/DiscountOrderCQ/Queries/GetUserOrders/GetUserOrdersResponseDto.cs

@@ -1,5 +1,3 @@
-using BackOffice.BFF.Application.Common.Models;
-
 namespace BackOffice.BFF.Application.DiscountOrderCQ.Queries.GetUserOrders;
 
 public class GetUserOrdersResponseDto

src/BackOffice.BFF.Application/HealthCQ/Queries/GetSystemHealth/GetSystemHealthQueryHandler.cs

@@ -1,7 +1,9 @@
-using Foursat.BackOffice.BFF.ClubMembership.Protos;
-using Foursat.BackOffice.BFF.Commission.Protos;
-using Foursat.BackOffice.BFF.Configuration.Protos;
-using Foursat.BackOffice.BFF.NetworkMembership.Protos;
+
+
+using CMSMicroservice.Protobuf.Protos.ClubMembership;
+using CMSMicroservice.Protobuf.Protos.Commission;
+using CMSMicroservice.Protobuf.Protos.Configuration;
+using CMSMicroservice.Protobuf.Protos.NetworkMembership;
 using Foursat.BackOffice.BFF.Health.Protobuf;
 
 namespace BackOffice.BFF.Application.HealthCQ.Queries.GetSystemHealth;

src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/ApproveManualPayment/ApproveManualPaymentCommand.cs

@@ -1,5 +1,3 @@
-using MediatR;
-
 namespace BackOffice.BFF.Application.ManualPaymentCQ.Commands.ApproveManualPayment;
 
 public class ApproveManualPaymentCommand : IRequest<bool>

src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/ApproveManualPayment/ApproveManualPaymentCommandHandler.cs

@@ -1,7 +1,4 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-using BackOffice.BFF.ManualPayment.Protobuf;
-using Google.Protobuf.WellKnownTypes;
-using MediatR;
+using CMSMicroservice.Protobuf.Protos.ManualPayment;
 using Microsoft.Extensions.Logging;
 
 namespace BackOffice.BFF.Application.ManualPaymentCQ.Commands.ApproveManualPayment;

src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/ApproveManualPayment/ApproveManualPaymentCommandValidator.cs

@@ -1,5 +1,3 @@
-using FluentValidation;
-
 namespace BackOffice.BFF.Application.ManualPaymentCQ.Commands.ApproveManualPayment;
 
 public class ApproveManualPaymentCommandValidator : AbstractValidator<ApproveManualPaymentCommand>

src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/CreateManualPayment/CreateManualPaymentCommand.cs

@@ -1,5 +1,3 @@
-using MediatR;
-
 namespace BackOffice.BFF.Application.ManualPaymentCQ.Commands.CreateManualPayment;
 
 public class CreateManualPaymentCommand : IRequest<CreateManualPaymentResponseDto>

src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/CreateManualPayment/CreateManualPaymentCommandHandler.cs

@@ -1,7 +1,4 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-using BackOffice.BFF.ManualPayment.Protobuf;
-using Google.Protobuf.WellKnownTypes;
-using MediatR;
+using CMSMicroservice.Protobuf.Protos.ManualPayment;
 using Microsoft.Extensions.Logging;
 
 namespace BackOffice.BFF.Application.ManualPaymentCQ.Commands.CreateManualPayment;
@@ -31,7 +28,7 @@ public class CreateManualPaymentCommandHandler : IRequestHandler<CreateManualPay
         {
             UserId = request.UserId,
             Amount = request.Amount,
-            Type = request.Type,
+            Type = (ManualPaymentType)request.Type,
             Description = request.Description
         };
 

src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/CreateManualPayment/CreateManualPaymentCommandValidator.cs

@@ -1,5 +1,3 @@
-using FluentValidation;
-
 namespace BackOffice.BFF.Application.ManualPaymentCQ.Commands.CreateManualPayment;
 
 public class CreateManualPaymentCommandValidator : AbstractValidator<CreateManualPaymentCommand>

src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/RejectManualPayment/RejectManualPaymentCommand.cs

@@ -1,5 +1,3 @@
-using MediatR;
-
 namespace BackOffice.BFF.Application.ManualPaymentCQ.Commands.RejectManualPayment;
 
 public class RejectManualPaymentCommand : IRequest<bool>

src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/RejectManualPayment/RejectManualPaymentCommandHandler.cs

@@ -1,6 +1,4 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-using BackOffice.BFF.ManualPayment.Protobuf;
-using MediatR;
+using CMSMicroservice.Protobuf.Protos.ManualPayment;
 using Microsoft.Extensions.Logging;
 
 namespace BackOffice.BFF.Application.ManualPaymentCQ.Commands.RejectManualPayment;

src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/RejectManualPayment/RejectManualPaymentCommandValidator.cs

@@ -1,5 +1,3 @@
-using FluentValidation;
-
 namespace BackOffice.BFF.Application.ManualPaymentCQ.Commands.RejectManualPayment;
 
 public class RejectManualPaymentCommandValidator : AbstractValidator<RejectManualPaymentCommand>

src/BackOffice.BFF.Application/ManualPaymentCQ/Queries/GetManualPayments/GetManualPaymentsQuery.cs

@@ -1,5 +1,3 @@
-using MediatR;
-
 namespace BackOffice.BFF.Application.ManualPaymentCQ.Queries.GetManualPayments;
 
 public class GetManualPaymentsQuery : IRequest<GetManualPaymentsResponseDto>

src/BackOffice.BFF.Application/ManualPaymentCQ/Queries/GetManualPayments/GetManualPaymentsQueryHandler.cs

@@ -1,8 +1,5 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-using BackOffice.BFF.Application.Common.Models;
 using BackOffice.BFF.ManualPayment.Protobuf;
-using Google.Protobuf.WellKnownTypes;
-using MediatR;
+using CMSMicroservice.Protobuf.Protos.ManualPayment;
 using Microsoft.Extensions.Logging;
 
 namespace BackOffice.BFF.Application.ManualPaymentCQ.Queries.GetManualPayments;
@@ -29,7 +26,7 @@ public class GetManualPaymentsQueryHandler : IRequestHandler<GetManualPaymentsQu
             request.Status,
             request.Type);
 
-        var grpcRequest = new GetManualPaymentsRequest
+        var grpcRequest = new  GetAllManualPaymentsRequest
         {
             PageNumber = request.PageNumber,
             PageSize = request.PageSize,
@@ -38,7 +35,7 @@ public class GetManualPaymentsQueryHandler : IRequestHandler<GetManualPaymentsQu
             Type = request.Type
         };
 
-        var response = await _context.ManualPayments.GetManualPaymentsAsync(grpcRequest, cancellationToken: cancellationToken);
+        var response = await _context.ManualPayments.GetAllManualPaymentsAsync(grpcRequest, cancellationToken: cancellationToken);
 
         var meta = response.MetaData;
 
@@ -50,11 +47,11 @@ public class GetManualPaymentsQueryHandler : IRequestHandler<GetManualPaymentsQu
                 UserFullName = m.UserFullName,
                 UserMobile = m.UserMobile,
                 Amount = m.Amount,
-                Type = m.Type,
+                Type = m.Type.GetHashCode(),
                 TypeDisplay = m.TypeDisplay,
                 Description = m.Description,
                 ReferenceNumber = m.ReferenceNumber,
-                Status = m.Status,
+                Status = m.Status.GetHashCode(),
                 StatusDisplay = m.StatusDisplay,
                 RequestedBy = m.RequestedBy,
                 RequestedByName = m.RequestedByName,

src/BackOffice.BFF.Application/ManualPaymentCQ/Queries/GetManualPayments/GetManualPaymentsResponseDto.cs

@@ -1,5 +1,3 @@
-using BackOffice.BFF.Application.Common.Models;
-
 namespace BackOffice.BFF.Application.ManualPaymentCQ.Queries.GetManualPayments;
 
 public class GetManualPaymentsResponseDto

src/BackOffice.BFF.Application/NetworkMembershipCQ/Queries/GetNetworkHistory/GetNetworkHistoryQueryHandler.cs

@@ -1,5 +1,6 @@
 
-using Foursat.BackOffice.BFF.NetworkMembership.Protos;
+
+using CMSMicroservice.Protobuf.Protos.NetworkMembership;
 
 namespace BackOffice.BFF.Application.NetworkMembershipCQ.Queries.GetNetworkHistory;
 

src/BackOffice.BFF.Application/NetworkMembershipCQ/Queries/GetNetworkStatistics/GetNetworkStatisticsQueryHandler.cs

@@ -1,5 +1,6 @@
 
-using Foursat.BackOffice.BFF.NetworkMembership.Protos;
+
+using CMSMicroservice.Protobuf.Protos.NetworkMembership;
 
 namespace BackOffice.BFF.Application.NetworkMembershipCQ.Queries.GetNetworkStatistics;
 

src/BackOffice.BFF.Application/NetworkMembershipCQ/Queries/GetNetworkTree/GetNetworkTreeQueryHandler.cs

@@ -1,5 +1,6 @@
 
-using Foursat.BackOffice.BFF.NetworkMembership.Protos;
+
+using CMSMicroservice.Protobuf.Protos.NetworkMembership;
 
 namespace BackOffice.BFF.Application.NetworkMembershipCQ.Queries.GetNetworkTree;
 

src/BackOffice.BFF.Application/NetworkMembershipCQ/Queries/GetUserNetworkInfo/GetUserNetworkInfoQueryHandler.cs

@@ -1,5 +1,6 @@
 
-using Foursat.BackOffice.BFF.NetworkMembership.Protos;
+
+using CMSMicroservice.Protobuf.Protos.NetworkMembership;
 
 namespace BackOffice.BFF.Application.NetworkMembershipCQ.Queries.GetUserNetworkInfo;
 

src/BackOffice.BFF.Application/UserCQ/Queries/GetAllUserByFilter/GetAllUserByFilterQuery.cs

@@ -24,4 +24,5 @@ public record GetAllUserByFilterQuery : IRequest<GetAllUserByFilterResponseDto>
     public string? AvatarPath { get; set; }
     //شناسه والد 
     public long? ParentId { get; set; }
+    public string? SearchText { get; set; }
 }