diff --git a/src/BackOffice.BFF.Application/ClubMembershipCQ/Commands/ActivateClub/ActivateClubCommandHandler.cs b/src/BackOffice.BFF.Application/ClubMembershipCQ/Commands/ActivateClub/ActivateClubCommandHandler.cs index e854445..e49ae1a 100644 --- a/src/BackOffice.BFF.Application/ClubMembershipCQ/Commands/ActivateClub/ActivateClubCommandHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/ClubMembershipCQ/Queries/GetAllClubMembers/GetAllClubMembersQueryHandler.cs b/src/BackOffice.BFF.Application/ClubMembershipCQ/Queries/GetAllClubMembers/GetAllClubMembersQueryHandler.cs index 306e15d..64bb8f9 100644 --- a/src/BackOffice.BFF.Application/ClubMembershipCQ/Queries/GetAllClubMembers/GetAllClubMembersQueryHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/ClubMembershipCQ/Queries/GetClubStatistics/GetClubStatisticsQueryHandler.cs b/src/BackOffice.BFF.Application/ClubMembershipCQ/Queries/GetClubStatistics/GetClubStatisticsQueryHandler.cs index 8a43439..1da63ca 100644 --- a/src/BackOffice.BFF.Application/ClubMembershipCQ/Queries/GetClubStatistics/GetClubStatisticsQueryHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Commands/ApproveWithdrawal/ApproveWithdrawalCommandHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Commands/ApproveWithdrawal/ApproveWithdrawalCommandHandler.cs index 7dc0765..6c558e9 100644 --- a/src/BackOffice.BFF.Application/CommissionCQ/Commands/ApproveWithdrawal/ApproveWithdrawalCommandHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Commands/ProcessWithdrawal/ProcessWithdrawalCommandHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Commands/ProcessWithdrawal/ProcessWithdrawalCommandHandler.cs index b2331b2..c21f4cd 100644 --- a/src/BackOffice.BFF.Application/CommissionCQ/Commands/ProcessWithdrawal/ProcessWithdrawalCommandHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Commands/RejectWithdrawal/RejectWithdrawalCommandHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Commands/RejectWithdrawal/RejectWithdrawalCommandHandler.cs index fd3d042..cb39d77 100644 --- a/src/BackOffice.BFF.Application/CommissionCQ/Commands/RejectWithdrawal/RejectWithdrawalCommandHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Commands/TriggerWeeklyCalculation/TriggerWeeklyCalculationCommandHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Commands/TriggerWeeklyCalculation/TriggerWeeklyCalculationCommandHandler.cs index 898727a..e2c04f9 100644 --- a/src/BackOffice.BFF.Application/CommissionCQ/Commands/TriggerWeeklyCalculation/TriggerWeeklyCalculationCommandHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAllWeeklyPools/GetAllWeeklyPoolsQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAllWeeklyPools/GetAllWeeklyPoolsQueryHandler.cs index 3fc0065..d4b2f95 100644 --- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAllWeeklyPools/GetAllWeeklyPoolsQueryHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQuery.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQuery.cs new file mode 100644 index 0000000..d04d00b --- /dev/null +++ b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQuery.cs @@ -0,0 +1,7 @@ +namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetAvailableWeeks; + +public class GetAvailableWeeksQuery : IRequest +{ + public int FutureWeeksCount { get; init; } = 4; + public int PastWeeksCount { get; init; } = 12; +} diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs new file mode 100644 index 0000000..63c5e23 --- /dev/null +++ b/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 +{ + private readonly IApplicationContractContext _context; + + public GetAvailableWeeksQueryHandler(IApplicationContractContext context) + { + _context = context; + } + + public async Task 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 + }; + } +} diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksResponseDto.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksResponseDto.cs new file mode 100644 index 0000000..2b5d0a2 --- /dev/null +++ b/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 CalculatedWeeks { get; init; } + public required List PendingWeeks { get; init; } + public required List 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; } +} diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserPayouts/GetUserPayoutsQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserPayouts/GetUserPayoutsQueryHandler.cs index f6d37b2..7cf294f 100644 --- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserPayouts/GetUserPayoutsQueryHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesQueryHandler.cs index 88b465d..d2e3786 100644 --- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesQueryHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWeeklyPool/GetWeeklyPoolQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWeeklyPool/GetWeeklyPoolQueryHandler.cs index 12097af..03a65f1 100644 --- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWeeklyPool/GetWeeklyPoolQueryHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWeeklyPool/GetWeeklyPoolResponseDto.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWeeklyPool/GetWeeklyPoolResponseDto.cs index be6e83d..4728431 100644 --- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWeeklyPool/GetWeeklyPoolResponseDto.cs +++ b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWeeklyPool/GetWeeklyPoolResponseDto.cs @@ -2,58 +2,12 @@ namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetWeeklyPool; public class GetWeeklyPoolResponseDto { - /// - /// شناسه Pool - /// public long Id { get; set; } - - /// - /// شماره هفته (فرمت: YYYY-Www) - /// public string WeekNumber { get; set; } = string.Empty; - - /// - /// مجموع کل Pool (تومان) - /// - public decimal TotalPoolValue { get; set; } - - /// - /// مجموع مشارکت‌های اولیه (InitialContribution) - /// - public decimal TotalContributions { get; set; } - - /// - /// مجموع Payout های پرداخت شده - /// - public decimal TotalPayouts { get; set; } - - /// - /// باقیمانده Pool - /// - public decimal LeftBalance { get; set; } - - /// - /// تعداد اعضای فعال در این هفته - /// - public int ActiveMembersCount { get; set; } - - /// - /// آیا محاسبه شده است؟ - /// + public long TotalPoolAmount { get; set; } + public long TotalBalances { get; set; } + public decimal ValuePerBalance { get; set; } public bool IsCalculated { get; set; } - - /// - /// تاریخ محاسبه - /// public DateTime? CalculatedAt { get; set; } - - /// - /// تاریخ ایجاد - /// - public DateTime CreatedAt { get; set; } - - /// - /// تاریخ آخرین ویرایش - /// - public DateTime? ModifiedAt { get; set; } + public DateTimeOffset Created { get; set; } } diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalReports/GetWithdrawalReportsQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalReports/GetWithdrawalReportsQueryHandler.cs index 57cc1c5..c2554d0 100644 --- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalReports/GetWithdrawalReportsQueryHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalRequests/GetWithdrawalRequestsQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalRequests/GetWithdrawalRequestsQueryHandler.cs index a58d9a1..ce808fb 100644 --- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalRequests/GetWithdrawalRequestsQueryHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerExecutionLogs/GetWorkerExecutionLogsQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerExecutionLogs/GetWorkerExecutionLogsQueryHandler.cs index e260939..0ea72ff 100644 --- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerExecutionLogs/GetWorkerExecutionLogsQueryHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerStatus/GetWorkerStatusQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerStatus/GetWorkerStatusQueryHandler.cs index f5a993d..731c5cb 100644 --- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerStatus/GetWorkerStatusQueryHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/Common/Interfaces/IApplicationContractContext.cs b/src/BackOffice.BFF.Application/Common/Interfaces/IApplicationContractContext.cs index a28a3d4..dbccf13 100644 --- a/src/BackOffice.BFF.Application/Common/Interfaces/IApplicationContractContext.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/Common/Mappings/CommissionProfile.cs b/src/BackOffice.BFF.Application/Common/Mappings/CommissionProfile.cs new file mode 100644 index 0000000..eed0f9c --- /dev/null +++ b/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()) + ; + } +} diff --git a/src/BackOffice.BFF.Application/Common/Mappings/GeneralMapping.cs b/src/BackOffice.BFF.Application/Common/Mappings/GeneralMapping.cs index 1dca711..23dc59c 100644 --- a/src/BackOffice.BFF.Application/Common/Mappings/GeneralMapping.cs +++ b/src/BackOffice.BFF.Application/Common/Mappings/GeneralMapping.cs @@ -51,6 +51,9 @@ public class GeneralMapping : IRegister config.NewConfig() .MapWith(src => src.HasValue ? Duration.FromTimeSpan(src.Value) : null); + config.NewConfig() + .MapWith(src => src.HasValue ? src.Value.DateTime : (DateTime?)null); + config.Default .UseDestinationValue(member => member.SetterModifier == AccessModifier.None && member.Type.IsGenericType && diff --git a/src/BackOffice.BFF.Application/ConfigurationCQ/Commands/CreateOrUpdateConfiguration/CreateOrUpdateConfigurationCommandHandler.cs b/src/BackOffice.BFF.Application/ConfigurationCQ/Commands/CreateOrUpdateConfiguration/CreateOrUpdateConfigurationCommandHandler.cs index d138799..1d7c921 100644 --- a/src/BackOffice.BFF.Application/ConfigurationCQ/Commands/CreateOrUpdateConfiguration/CreateOrUpdateConfigurationCommandHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/ConfigurationCQ/Commands/DeactivateConfiguration/DeactivateConfigurationCommandHandler.cs b/src/BackOffice.BFF.Application/ConfigurationCQ/Commands/DeactivateConfiguration/DeactivateConfigurationCommandHandler.cs index 7d96d42..afd2cb9 100644 --- a/src/BackOffice.BFF.Application/ConfigurationCQ/Commands/DeactivateConfiguration/DeactivateConfigurationCommandHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/ConfigurationCQ/Commands/SetDefaultVatPercentage/SetDefaultVatPercentageCommandHandler.cs b/src/BackOffice.BFF.Application/ConfigurationCQ/Commands/SetDefaultVatPercentage/SetDefaultVatPercentageCommandHandler.cs index 32eb26d..863c09b 100644 --- a/src/BackOffice.BFF.Application/ConfigurationCQ/Commands/SetDefaultVatPercentage/SetDefaultVatPercentageCommandHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/ConfigurationCQ/Commands/SetDefaultVatPercentage/SetDefaultVatPercentageCommandValidator.cs b/src/BackOffice.BFF.Application/ConfigurationCQ/Commands/SetDefaultVatPercentage/SetDefaultVatPercentageCommandValidator.cs index 8c7c462..a590067 100644 --- a/src/BackOffice.BFF.Application/ConfigurationCQ/Commands/SetDefaultVatPercentage/SetDefaultVatPercentageCommandValidator.cs +++ b/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 diff --git a/src/BackOffice.BFF.Application/ConfigurationCQ/Queries/GetAllConfigurations/GetAllConfigurationsQueryHandler.cs b/src/BackOffice.BFF.Application/ConfigurationCQ/Queries/GetAllConfigurations/GetAllConfigurationsQueryHandler.cs index 33464fa..420b43a 100644 --- a/src/BackOffice.BFF.Application/ConfigurationCQ/Queries/GetAllConfigurations/GetAllConfigurationsQueryHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/ConfigurationCQ/Queries/GetCurrentVatPercentage/GetCurrentVatPercentageQueryHandler.cs b/src/BackOffice.BFF.Application/ConfigurationCQ/Queries/GetCurrentVatPercentage/GetCurrentVatPercentageQueryHandler.cs index f9f5d1b..365a4eb 100644 --- a/src/BackOffice.BFF.Application/ConfigurationCQ/Queries/GetCurrentVatPercentage/GetCurrentVatPercentageQueryHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/DiscountOrderCQ/Commands/CompleteOrderPayment/CompleteOrderPaymentCommandHandler.cs b/src/BackOffice.BFF.Application/DiscountOrderCQ/Commands/CompleteOrderPayment/CompleteOrderPaymentCommandHandler.cs index 38b774c..f87b2de 100644 --- a/src/BackOffice.BFF.Application/DiscountOrderCQ/Commands/CompleteOrderPayment/CompleteOrderPaymentCommandHandler.cs +++ b/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 Handle(CompleteOrderPaymentCommand request, CancellationToken cancellationToken) { - var grpcRequest = TypeAdapter.Adapt(request, request.GetType(), typeof(CompleteOrderPaymentRequest)) as CompleteOrderPaymentRequest; + var grpcRequest = request.Adapt(); var response = await _context.DiscountOrders.CompleteOrderPaymentAsync(grpcRequest, cancellationToken: cancellationToken); - return TypeAdapter.Adapt(response, response.GetType(), typeof(CompleteOrderPaymentResponseDto)) as CompleteOrderPaymentResponseDto; + return response.Adapt(); } } diff --git a/src/BackOffice.BFF.Application/DiscountOrderCQ/Commands/PlaceOrder/PlaceOrderCommandHandler.cs b/src/BackOffice.BFF.Application/DiscountOrderCQ/Commands/PlaceOrder/PlaceOrderCommandHandler.cs index 7a07bba..f7336dd 100644 --- a/src/BackOffice.BFF.Application/DiscountOrderCQ/Commands/PlaceOrder/PlaceOrderCommandHandler.cs +++ b/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 Handle(PlaceOrderCommand request, CancellationToken cancellationToken) { - var grpcRequest = TypeAdapter.Adapt(request, request.GetType(), typeof(PlaceOrderRequest)) as PlaceOrderRequest; + var grpcRequest = request.Adapt(); var response = await _context.DiscountOrders.PlaceOrderAsync(grpcRequest, cancellationToken: cancellationToken); - return TypeAdapter.Adapt(response, response.GetType(), typeof(PlaceOrderResponseDto)) as PlaceOrderResponseDto; + return response.Adapt(); } } diff --git a/src/BackOffice.BFF.Application/DiscountOrderCQ/Commands/UpdateOrderStatus/UpdateOrderStatusCommandHandler.cs b/src/BackOffice.BFF.Application/DiscountOrderCQ/Commands/UpdateOrderStatus/UpdateOrderStatusCommandHandler.cs index a871eab..ad29c3e 100644 --- a/src/BackOffice.BFF.Application/DiscountOrderCQ/Commands/UpdateOrderStatus/UpdateOrderStatusCommandHandler.cs +++ b/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 Handle(UpdateOrderStatusCommand request, CancellationToken cancellationToken) { - var grpcRequest = TypeAdapter.Adapt(request, request.GetType(), typeof(UpdateOrderStatusRequest)) as UpdateOrderStatusRequest; + var grpcRequest = request.Adapt(); var response = await _context.DiscountOrders.UpdateOrderStatusAsync(grpcRequest, cancellationToken: cancellationToken); - return TypeAdapter.Adapt(response, response.GetType(), typeof(UpdateOrderStatusResponseDto)) as UpdateOrderStatusResponseDto; + return response.Adapt(); } } diff --git a/src/BackOffice.BFF.Application/DiscountOrderCQ/Queries/GetOrderById/GetOrderByIdQueryHandler.cs b/src/BackOffice.BFF.Application/DiscountOrderCQ/Queries/GetOrderById/GetOrderByIdQueryHandler.cs index c361f8a..8c905d7 100644 --- a/src/BackOffice.BFF.Application/DiscountOrderCQ/Queries/GetOrderById/GetOrderByIdQueryHandler.cs +++ b/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(); } } diff --git a/src/BackOffice.BFF.Application/DiscountOrderCQ/Queries/GetUserOrders/GetUserOrdersQueryHandler.cs b/src/BackOffice.BFF.Application/DiscountOrderCQ/Queries/GetUserOrders/GetUserOrdersQueryHandler.cs index 976fb4f..74f42b0 100644 --- a/src/BackOffice.BFF.Application/DiscountOrderCQ/Queries/GetUserOrders/GetUserOrdersQueryHandler.cs +++ b/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(); } } diff --git a/src/BackOffice.BFF.Application/DiscountOrderCQ/Queries/GetUserOrders/GetUserOrdersResponseDto.cs b/src/BackOffice.BFF.Application/DiscountOrderCQ/Queries/GetUserOrders/GetUserOrdersResponseDto.cs index f7af583..18ddc0d 100644 --- a/src/BackOffice.BFF.Application/DiscountOrderCQ/Queries/GetUserOrders/GetUserOrdersResponseDto.cs +++ b/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 diff --git a/src/BackOffice.BFF.Application/HealthCQ/Queries/GetSystemHealth/GetSystemHealthQueryHandler.cs b/src/BackOffice.BFF.Application/HealthCQ/Queries/GetSystemHealth/GetSystemHealthQueryHandler.cs index 7cd656f..c5119c6 100644 --- a/src/BackOffice.BFF.Application/HealthCQ/Queries/GetSystemHealth/GetSystemHealthQueryHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/ApproveManualPayment/ApproveManualPaymentCommand.cs b/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/ApproveManualPayment/ApproveManualPaymentCommand.cs index 60649ce..c3274bc 100644 --- a/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/ApproveManualPayment/ApproveManualPaymentCommand.cs +++ b/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 diff --git a/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/ApproveManualPayment/ApproveManualPaymentCommandHandler.cs b/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/ApproveManualPayment/ApproveManualPaymentCommandHandler.cs index 17edb8c..e3a3c16 100644 --- a/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/ApproveManualPayment/ApproveManualPaymentCommandHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/ApproveManualPayment/ApproveManualPaymentCommandValidator.cs b/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/ApproveManualPayment/ApproveManualPaymentCommandValidator.cs index 4934e89..e2d45ce 100644 --- a/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/ApproveManualPayment/ApproveManualPaymentCommandValidator.cs +++ b/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 diff --git a/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/CreateManualPayment/CreateManualPaymentCommand.cs b/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/CreateManualPayment/CreateManualPaymentCommand.cs index 9258039..db853eb 100644 --- a/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/CreateManualPayment/CreateManualPaymentCommand.cs +++ b/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 diff --git a/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/CreateManualPayment/CreateManualPaymentCommandHandler.cs b/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/CreateManualPayment/CreateManualPaymentCommandHandler.cs index c842ab0..5ee10d4 100644 --- a/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/CreateManualPayment/CreateManualPaymentCommandHandler.cs +++ b/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 diff --git a/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/RejectManualPayment/RejectManualPaymentCommand.cs b/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/RejectManualPayment/RejectManualPaymentCommand.cs index d50c455..0318d3c 100644 --- a/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/RejectManualPayment/RejectManualPaymentCommand.cs +++ b/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 diff --git a/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/RejectManualPayment/RejectManualPaymentCommandHandler.cs b/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/RejectManualPayment/RejectManualPaymentCommandHandler.cs index 8fd4fed..91466dc 100644 --- a/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/RejectManualPayment/RejectManualPaymentCommandHandler.cs +++ b/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; diff --git a/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/RejectManualPayment/RejectManualPaymentCommandValidator.cs b/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/RejectManualPayment/RejectManualPaymentCommandValidator.cs index 49bb1bf..49d8e3a 100644 --- a/src/BackOffice.BFF.Application/ManualPaymentCQ/Commands/RejectManualPayment/RejectManualPaymentCommandValidator.cs +++ b/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 diff --git a/src/BackOffice.BFF.Application/ManualPaymentCQ/Queries/GetManualPayments/GetManualPaymentsQuery.cs b/src/BackOffice.BFF.Application/ManualPaymentCQ/Queries/GetManualPayments/GetManualPaymentsQuery.cs index 623a736..3313d4b 100644 --- a/src/BackOffice.BFF.Application/ManualPaymentCQ/Queries/GetManualPayments/GetManualPaymentsQuery.cs +++ b/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 diff --git a/src/BackOffice.BFF.Application/ManualPaymentCQ/Queries/GetManualPayments/GetManualPaymentsQueryHandler.cs b/src/BackOffice.BFF.Application/ManualPaymentCQ/Queries/GetManualPayments/GetManualPaymentsQueryHandler.cs index 4ec0f80..ee22a56 100644 --- a/src/BackOffice.BFF.Application/ManualPaymentCQ/Queries/GetManualPayments/GetManualPaymentsQueryHandler.cs +++ b/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 public string? AvatarPath { get; set; } //شناسه والد public long? ParentId { get; set; } + public string? SearchText { get; set; } } diff --git a/src/BackOffice.BFF.Domain/BackOffice.BFF.Domain.csproj b/src/BackOffice.BFF.Domain/BackOffice.BFF.Domain.csproj index c1131f2..92b9b02 100644 --- a/src/BackOffice.BFF.Domain/BackOffice.BFF.Domain.csproj +++ b/src/BackOffice.BFF.Domain/BackOffice.BFF.Domain.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/BackOffice.BFF.Infrastructure/ConfigureGrpcServices.cs b/src/BackOffice.BFF.Infrastructure/ConfigureGrpcServices.cs index 74b2f7b..b1eac0e 100644 --- a/src/BackOffice.BFF.Infrastructure/ConfigureGrpcServices.cs +++ b/src/BackOffice.BFF.Infrastructure/ConfigureGrpcServices.cs @@ -1,4 +1,3 @@ -using System.Diagnostics; using System.Reflection; using BackOffice.BFF.Application.Common.Interfaces; using Grpc.Core; @@ -18,10 +17,10 @@ public static class ConfigureGrpcServices .Where(x => x.FullName != null && (x.FullName.Contains("Microservice.Protobuf") || - x.FullName.Contains("BFF.Commission.Protobuf") || - x.FullName.Contains("BFF.NetworkMembership.Protobuf") || - x.FullName.Contains("BFF.ClubMembership.Protobuf") || - x.FullName.Contains("BFF.Configuration.Protobuf")) && + x.FullName.Contains("BackOffice.BFF.Commission.Protobuf") || + x.FullName.Contains("BackOffice.BFF.NetworkMembership.Protobuf") || + x.FullName.Contains("BackOffice.BFF.ClubMembership.Protobuf") || + x.FullName.Contains("BackOffice.BFF.Configuration.Protobuf")) && x.GetTypes().Any(type => type.BaseType != null && type.BaseType.Name == "ClientBase`1" && type.BaseType.Namespace == "Grpc.Core") ) .SelectMany(x => x @@ -51,10 +50,10 @@ public static class ConfigureGrpcServices foreach (var grpcClient in grpcClients.Where(t => t.AssemblyQualifiedName != null && (t.AssemblyQualifiedName.StartsWith($"{msName}Microservice") || - t.AssemblyQualifiedName.StartsWith("BackOffice.BFF.Commission") || - t.AssemblyQualifiedName.StartsWith("BackOffice.BFF.NetworkMembership") || - t.AssemblyQualifiedName.StartsWith("BackOffice.BFF.ClubMembership") || - t.AssemblyQualifiedName.StartsWith("BackOffice.BFF.Configuration")) + t.AssemblyQualifiedName.StartsWith("Foursat.BackOffice.BFF.Commission") || + t.AssemblyQualifiedName.StartsWith("Foursat.BackOffice.BFF.NetworkMembership") || + t.AssemblyQualifiedName.StartsWith("Foursat.BackOffice.BFF.ClubMembership") || + t.AssemblyQualifiedName.StartsWith("Foursat.BackOffice.BFF.Configuration")) ) .ToList()) { diff --git a/src/BackOffice.BFF.Infrastructure/Services/AfrinoIdpService.cs b/src/BackOffice.BFF.Infrastructure/Services/AfrinoIdpService.cs index c5c010e..056b9f1 100644 --- a/src/BackOffice.BFF.Infrastructure/Services/AfrinoIdpService.cs +++ b/src/BackOffice.BFF.Infrastructure/Services/AfrinoIdpService.cs @@ -1,12 +1,7 @@ using BackOffice.BFF.Application.Common.Interfaces; using Microsoft.Extensions.Logging; -using System; -using System.Collections.Generic; -using System.Linq; using System.Net.Http; using System.Net.Http.Json; -using System.Text; -using System.Threading.Tasks; namespace BackOffice.BFF.Infrastructure.Services; public class AfrinoIdpService : IAfrinoIdpService diff --git a/src/BackOffice.BFF.Infrastructure/Services/ApplicationContractContext.cs b/src/BackOffice.BFF.Infrastructure/Services/ApplicationContractContext.cs index f21af4d..4aaf429 100644 --- a/src/BackOffice.BFF.Infrastructure/Services/ApplicationContractContext.cs +++ b/src/BackOffice.BFF.Infrastructure/Services/ApplicationContractContext.cs @@ -15,17 +15,18 @@ 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 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; // BFF Protobuf contracts -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 Microsoft.Extensions.DependencyInjection; diff --git a/src/BackOffice.BFF.Infrastructure/Services/PermissionService.cs b/src/BackOffice.BFF.Infrastructure/Services/PermissionService.cs index a9f11b7..f4495c7 100644 --- a/src/BackOffice.BFF.Infrastructure/Services/PermissionService.cs +++ b/src/BackOffice.BFF.Infrastructure/Services/PermissionService.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; using System.Security.Claims; using System.Threading; -using System.Threading.Tasks; using BackOffice.BFF.Application.Common.Interfaces; using BackOffice.BFF.Application.Common.Models; using Microsoft.AspNetCore.Http; diff --git a/src/BackOffice.BFF.WebApi/Common/Authorization/PermissionInterceptor.cs b/src/BackOffice.BFF.WebApi/Common/Authorization/PermissionInterceptor.cs index 4f1902f..7a93d9c 100644 --- a/src/BackOffice.BFF.WebApi/Common/Authorization/PermissionInterceptor.cs +++ b/src/BackOffice.BFF.WebApi/Common/Authorization/PermissionInterceptor.cs @@ -1,10 +1,5 @@ -using System; -using System.Threading.Tasks; using BackOffice.BFF.Application.Common.Interfaces; -using Grpc.AspNetCore.Server; -using Grpc.Core; using Grpc.Core.Interceptors; -using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; namespace BackOffice.BFF.WebApi.Common.Authorization; diff --git a/src/BackOffice.BFF.WebApi/Common/Mappings/CategoryProfile.cs b/src/BackOffice.BFF.WebApi/Common/Mappings/CategoryProfile.cs index 112c83f..4386883 100644 --- a/src/BackOffice.BFF.WebApi/Common/Mappings/CategoryProfile.cs +++ b/src/BackOffice.BFF.WebApi/Common/Mappings/CategoryProfile.cs @@ -1,8 +1,6 @@ -using BackOffice.BFF.Application.CategoryCQ.Queries.GetAllCategoryByFilter; using BackOffice.BFF.Application.CategoryCQ.Queries.GetCategory; using BackOffice.BFF.Application.CategoryCQ.Commands.CreateNewCategory; using BackOffice.BFF.Category.Protobuf.Protos.Category; -using BackOffice.BFF.Protobuf.Common; namespace BackOffice.BFF.WebApi.Common.Mappings; diff --git a/src/BackOffice.BFF.WebApi/Common/Mappings/ClubMembershipProfile.cs b/src/BackOffice.BFF.WebApi/Common/Mappings/ClubMembershipProfile.cs index ef03ac4..6f025b8 100644 --- a/src/BackOffice.BFF.WebApi/Common/Mappings/ClubMembershipProfile.cs +++ b/src/BackOffice.BFF.WebApi/Common/Mappings/ClubMembershipProfile.cs @@ -1,7 +1,3 @@ -using BackOffice.BFF.Application.ClubMembershipCQ.Queries.GetAllClubMembers; -using Foursat.BackOffice.BFF.ClubMembership.Protos; -using Google.Protobuf.WellKnownTypes; - namespace BackOffice.BFF.WebApi.Common.Mappings; public class ClubMembershipProfile : IRegister diff --git a/src/BackOffice.BFF.WebApi/Common/Mappings/CommissionProfile.cs b/src/BackOffice.BFF.WebApi/Common/Mappings/CommissionProfile.cs index 2dedb71..0c5f7de 100644 --- a/src/BackOffice.BFF.WebApi/Common/Mappings/CommissionProfile.cs +++ b/src/BackOffice.BFF.WebApi/Common/Mappings/CommissionProfile.cs @@ -1,12 +1,8 @@ using BackOffice.BFF.Application.CommissionCQ.Queries.GetWeeklyPool; -using BackOffice.BFF.Application.CommissionCQ.Queries.GetUserPayouts; using BackOffice.BFF.Application.CommissionCQ.Queries.GetAllWeeklyPools; using BackOffice.BFF.Application.CommissionCQ.Queries.GetUserWeeklyBalances; -using BackOffice.BFF.Application.CommissionCQ.Queries.GetWithdrawalRequests; -using BackOffice.BFF.Application.CommissionCQ.Queries.GetWithdrawalReports; +using BackOffice.BFF.Application.CommissionCQ.Queries.GetAvailableWeeks; using Foursat.BackOffice.BFF.Commission.Protos; -using Google.Protobuf.WellKnownTypes; -using BackOffice.BFF.Protobuf.Common; namespace BackOffice.BFF.WebApi.Common.Mappings; @@ -20,16 +16,15 @@ public class CommissionProfile : IRegister { Id = src.Id, WeekNumber = src.WeekNumber ?? string.Empty, - // TotalPoolValue = src.TotalPoolValue, - // TotalContributions = src.TotalContributions, - // TotalPayouts = src.TotalPayouts, - // LeftBalance = src.LeftBalance, - // ActiveMembersCount = src.ActiveMembersCount, + TotalBalances = (int)src.TotalBalances, + TotalPoolAmount = src.TotalPoolAmount, + IsCalculated = src.IsCalculated, CalculatedAt = src.CalculatedAt.HasValue ? Timestamp.FromDateTime(DateTime.SpecifyKind(src.CalculatedAt.Value, DateTimeKind.Utc)) : null, - Created = Timestamp.FromDateTime(DateTime.SpecifyKind(src.CreatedAt, DateTimeKind.Utc)) + Created = Timestamp.FromDateTime(DateTime.SpecifyKind(src.Created.DateTime, DateTimeKind.Utc)), + ValuePerBalance = (long)src.ValuePerBalance }); // GetUserPayoutsResponseDto -> GetUserCommissionPayoutsResponse @@ -168,5 +163,33 @@ public class CommissionProfile : IRegister // : null // }) } // }); + + // GetAvailableWeeksResponseDto -> GetAvailableWeeksResponse + config.NewConfig() + .MapWith(src => new GetAvailableWeeksResponse + { + CurrentWeek = MapWeekInfo(src.CurrentWeek), + CalculatedWeeks = { src.CalculatedWeeks.Select(MapWeekInfo) }, + PendingWeeks = { src.PendingWeeks.Select(MapWeekInfo) }, + FutureWeeks = { src.FutureWeeks.Select(MapWeekInfo) } + }); + } + + private static WeekInfo MapWeekInfo(WeekInfoDto dto) + { + return new WeekInfo + { + WeekNumber = dto.WeekNumber, + StartDate = Timestamp.FromDateTime(dto.StartDate.ToUniversalTime()), + EndDate = Timestamp.FromDateTime(dto.EndDate.ToUniversalTime()), + IsCalculated = dto.IsCalculated, + CalculatedAt = dto.CalculatedAt.HasValue + ? Timestamp.FromDateTime(dto.CalculatedAt.Value.ToUniversalTime()) + : null, + LastExecutionStatus = dto.LastExecutionStatus ?? string.Empty, + TotalPoolAmount = dto.TotalPoolAmount ?? 0, + EligibleUsersCount = dto.EligibleUsersCount ?? 0, + DisplayText = dto.DisplayText + }; } } diff --git a/src/BackOffice.BFF.WebApi/Common/Mappings/ConfigurationProfile.cs b/src/BackOffice.BFF.WebApi/Common/Mappings/ConfigurationProfile.cs index 23b22ec..ce88c22 100644 --- a/src/BackOffice.BFF.WebApi/Common/Mappings/ConfigurationProfile.cs +++ b/src/BackOffice.BFF.WebApi/Common/Mappings/ConfigurationProfile.cs @@ -1,7 +1,5 @@ using BackOffice.BFF.Application.ConfigurationCQ.Queries.GetAllConfigurations; using Foursat.BackOffice.BFF.Configuration.Protos; -using Google.Protobuf.WellKnownTypes; -using BackOffice.BFF.Protobuf.Common; namespace BackOffice.BFF.WebApi.Common.Mappings; diff --git a/src/BackOffice.BFF.WebApi/Common/Mappings/DiscountOrderProfile.cs b/src/BackOffice.BFF.WebApi/Common/Mappings/DiscountOrderProfile.cs index d2affbb..44b41ac 100644 --- a/src/BackOffice.BFF.WebApi/Common/Mappings/DiscountOrderProfile.cs +++ b/src/BackOffice.BFF.WebApi/Common/Mappings/DiscountOrderProfile.cs @@ -1,11 +1,9 @@ -using Mapster; using BackOffice.BFF.Application.DiscountOrderCQ.Commands.PlaceOrder; using BackOffice.BFF.Application.DiscountOrderCQ.Commands.CompleteOrderPayment; using BackOffice.BFF.Application.DiscountOrderCQ.Commands.UpdateOrderStatus; using BackOffice.BFF.Application.DiscountOrderCQ.Queries.GetOrderById; using BackOffice.BFF.Application.DiscountOrderCQ.Queries.GetUserOrders; using BackOffice.BFF.DiscountOrder.Protobuf.Protos.DiscountOrder; -using Google.Protobuf.WellKnownTypes; namespace BackOffice.BFF.WebApi.Common.Mappings; diff --git a/src/BackOffice.BFF.WebApi/Common/Mappings/ManualPaymentProfile.cs b/src/BackOffice.BFF.WebApi/Common/Mappings/ManualPaymentProfile.cs index 17219eb..d504a17 100644 --- a/src/BackOffice.BFF.WebApi/Common/Mappings/ManualPaymentProfile.cs +++ b/src/BackOffice.BFF.WebApi/Common/Mappings/ManualPaymentProfile.cs @@ -1,9 +1,3 @@ -using BackOffice.BFF.Application.ManualPaymentCQ.Queries.GetManualPayments; -using BackOffice.BFF.Application.ManualPaymentCQ.Commands.CreateManualPayment; -using BackOffice.BFF.ManualPayment.Protobuf; -using Google.Protobuf.WellKnownTypes; -using BackOffice.BFF.Protobuf.Common; - namespace BackOffice.BFF.WebApi.Common.Mappings; public class ManualPaymentProfile : IRegister diff --git a/src/BackOffice.BFF.WebApi/Common/Mappings/NetworkMembershipProfile.cs b/src/BackOffice.BFF.WebApi/Common/Mappings/NetworkMembershipProfile.cs index d24daf5..78b1f4d 100644 --- a/src/BackOffice.BFF.WebApi/Common/Mappings/NetworkMembershipProfile.cs +++ b/src/BackOffice.BFF.WebApi/Common/Mappings/NetworkMembershipProfile.cs @@ -2,8 +2,6 @@ using BackOffice.BFF.Application.NetworkMembershipCQ.Queries.GetNetworkTree; using BackOffice.BFF.Application.NetworkMembershipCQ.Queries.GetUserNetworkInfo; using BackOffice.BFF.Application.NetworkMembershipCQ.Queries.GetNetworkHistory; using Foursat.BackOffice.BFF.NetworkMembership.Protos; -using BackOffice.BFF.Protobuf.Common; -using Google.Protobuf.WellKnownTypes; namespace BackOffice.BFF.WebApi.Common.Mappings; diff --git a/src/BackOffice.BFF.WebApi/Common/Mappings/PublicMessageProfile.cs b/src/BackOffice.BFF.WebApi/Common/Mappings/PublicMessageProfile.cs index 25c1309..692485e 100644 --- a/src/BackOffice.BFF.WebApi/Common/Mappings/PublicMessageProfile.cs +++ b/src/BackOffice.BFF.WebApi/Common/Mappings/PublicMessageProfile.cs @@ -1,11 +1,5 @@ -using Foursat.BackOffice.BFF.PublicMessage.Protobuf; - namespace BackOffice.BFF.WebApi.Common.Mappings; -using BackOffice.BFF.Application.PublicMessageCQ.Queries.GetAllMessages; -using BackOffice.BFF.Application.PublicMessageCQ.Queries.GetActiveMessages; -using Google.Protobuf.WellKnownTypes; - public class PublicMessageProfile : IRegister { void IRegister.Register(TypeAdapterConfig config) diff --git a/src/BackOffice.BFF.WebApi/Common/Mappings/UserOrderProfile.cs b/src/BackOffice.BFF.WebApi/Common/Mappings/UserOrderProfile.cs index 8569039..dc1a6bb 100644 --- a/src/BackOffice.BFF.WebApi/Common/Mappings/UserOrderProfile.cs +++ b/src/BackOffice.BFF.WebApi/Common/Mappings/UserOrderProfile.cs @@ -1,13 +1,5 @@ namespace BackOffice.BFF.WebApi.Common.Mappings; -using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder; -using BackOffice.BFF.Application.UserOrderCQ.Commands.UpdateOrderStatus; -using BackOffice.BFF.Application.UserOrderCQ.Commands.ApplyDiscountToOrder; -using BackOffice.BFF.Application.UserOrderCQ.Commands.CancelOrder; -using BackOffice.BFF.Application.UserOrderCQ.Queries.GetOrdersByDateRange; -using BackOffice.BFF.Application.UserOrderCQ.Queries.CalculateOrderPV; -using Google.Protobuf.WellKnownTypes; - public class UserOrderProfile : IRegister { void IRegister.Register(TypeAdapterConfig config) diff --git a/src/BackOffice.BFF.WebApi/Common/Services/CurrentUserService.cs b/src/BackOffice.BFF.WebApi/Common/Services/CurrentUserService.cs index 0d0682e..3d5a98d 100644 --- a/src/BackOffice.BFF.WebApi/Common/Services/CurrentUserService.cs +++ b/src/BackOffice.BFF.WebApi/Common/Services/CurrentUserService.cs @@ -1,6 +1,5 @@ using System.Security.Claims; using BackOffice.BFF.Application.Common.Interfaces; -using Microsoft.AspNetCore.Http; namespace BackOffice.BFF.WebApi.Common.Services; diff --git a/src/BackOffice.BFF.WebApi/Program.cs b/src/BackOffice.BFF.WebApi/Program.cs index 9e0ba33..479a468 100644 --- a/src/BackOffice.BFF.WebApi/Program.cs +++ b/src/BackOffice.BFF.WebApi/Program.cs @@ -6,7 +6,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Serilog; using Serilog.Core; using Microsoft.OpenApi.Models; -using BackOffice.BFF.WebApi.Common.Authorization; var builder = WebApplication.CreateBuilder(args); if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) diff --git a/src/BackOffice.BFF.WebApi/Services/ClubMembershipService.cs b/src/BackOffice.BFF.WebApi/Services/ClubMembershipService.cs index b9a66d6..178339e 100644 --- a/src/BackOffice.BFF.WebApi/Services/ClubMembershipService.cs +++ b/src/BackOffice.BFF.WebApi/Services/ClubMembershipService.cs @@ -2,7 +2,6 @@ using BackOffice.BFF.WebApi.Common.Services; using BackOffice.BFF.Application.ClubMembershipCQ.Commands.ActivateClub; using BackOffice.BFF.Application.ClubMembershipCQ.Queries.GetAllClubMembers; using Foursat.BackOffice.BFF.ClubMembership.Protos; -using Google.Protobuf.WellKnownTypes; namespace BackOffice.BFF.WebApi.Services; diff --git a/src/BackOffice.BFF.WebApi/Services/CommissionService.cs b/src/BackOffice.BFF.WebApi/Services/CommissionService.cs index 7cbafb2..d688a15 100644 --- a/src/BackOffice.BFF.WebApi/Services/CommissionService.cs +++ b/src/BackOffice.BFF.WebApi/Services/CommissionService.cs @@ -5,11 +5,12 @@ using BackOffice.BFF.Application.CommissionCQ.Queries.GetAllWeeklyPools; using BackOffice.BFF.Application.CommissionCQ.Queries.GetUserWeeklyBalances; using BackOffice.BFF.Application.CommissionCQ.Queries.GetWithdrawalRequests; using BackOffice.BFF.Application.CommissionCQ.Queries.GetWithdrawalReports; +using BackOffice.BFF.Application.CommissionCQ.Queries.GetAvailableWeeks; using BackOffice.BFF.Application.CommissionCQ.Commands.ApproveWithdrawal; using BackOffice.BFF.Application.CommissionCQ.Commands.RejectWithdrawal; using BackOffice.BFF.Application.CommissionCQ.Commands.ProcessWithdrawal; +using BackOffice.BFF.Application.CommissionCQ.Commands.TriggerWeeklyCalculation; using Foursat.BackOffice.BFF.Commission.Protos; -using Google.Protobuf.WellKnownTypes; namespace BackOffice.BFF.WebApi.Services; @@ -31,6 +32,13 @@ public class CommissionService : CommissionContract.CommissionContractBase context); } + public override async Task TriggerWeeklyCalculation(TriggerWeeklyCalculationRequest request, ServerCallContext context) + { + return await _dispatchRequestToCQRS.Handle( + request, + context); + } + public override async Task GetUserCommissionPayouts( GetUserCommissionPayoutsRequest request, ServerCallContext context) @@ -105,4 +113,13 @@ public class CommissionService : CommissionContract.CommissionContractBase request, context); } + + public override async Task GetAvailableWeeks( + GetAvailableWeeksRequest request, + ServerCallContext context) + { + return await _dispatchRequestToCQRS.Handle( + request, + context); + } } diff --git a/src/BackOffice.BFF.WebApi/Services/ConfigurationService.cs b/src/BackOffice.BFF.WebApi/Services/ConfigurationService.cs index 8a294cd..303829b 100644 --- a/src/BackOffice.BFF.WebApi/Services/ConfigurationService.cs +++ b/src/BackOffice.BFF.WebApi/Services/ConfigurationService.cs @@ -3,8 +3,6 @@ using BackOffice.BFF.Application.ConfigurationCQ.Commands.CreateOrUpdateConfigur using BackOffice.BFF.Application.ConfigurationCQ.Commands.DeactivateConfiguration; using BackOffice.BFF.Application.ConfigurationCQ.Queries.GetAllConfigurations; using Foursat.BackOffice.BFF.Configuration.Protos; -using Grpc.Core; -using Google.Protobuf.WellKnownTypes; namespace BackOffice.BFF.WebApi.Services; diff --git a/src/BackOffice.BFF.WebApi/Services/HealthService.cs b/src/BackOffice.BFF.WebApi/Services/HealthService.cs index e4ebeac..fceaaf1 100644 --- a/src/BackOffice.BFF.WebApi/Services/HealthService.cs +++ b/src/BackOffice.BFF.WebApi/Services/HealthService.cs @@ -1,7 +1,6 @@ using BackOffice.BFF.Application.HealthCQ.Queries.GetSystemHealth; using BackOffice.BFF.WebApi.Common.Services; using Foursat.BackOffice.BFF.Health.Protobuf; -using Grpc.Core; namespace BackOffice.BFF.WebApi.Services; diff --git a/src/BackOffice.BFF.WebApi/Services/ManualPaymentService.cs b/src/BackOffice.BFF.WebApi/Services/ManualPaymentService.cs index f0db5aa..80f6cc4 100644 --- a/src/BackOffice.BFF.WebApi/Services/ManualPaymentService.cs +++ b/src/BackOffice.BFF.WebApi/Services/ManualPaymentService.cs @@ -4,9 +4,6 @@ using BackOffice.BFF.Application.ManualPaymentCQ.Commands.CreateManualPayment; using BackOffice.BFF.Application.ManualPaymentCQ.Commands.ApproveManualPayment; using BackOffice.BFF.Application.ManualPaymentCQ.Commands.RejectManualPayment; using BackOffice.BFF.Application.ManualPaymentCQ.Queries.GetManualPayments; -using Google.Protobuf.WellKnownTypes; -using Mapster; -using MediatR; namespace BackOffice.BFF.WebApi.Services; diff --git a/src/BackOffice.BFF.WebApi/Services/PublicMessageService.cs b/src/BackOffice.BFF.WebApi/Services/PublicMessageService.cs index 5cb5e8a..ac7407b 100644 --- a/src/BackOffice.BFF.WebApi/Services/PublicMessageService.cs +++ b/src/BackOffice.BFF.WebApi/Services/PublicMessageService.cs @@ -1,6 +1,5 @@ using CMSMicroservice.Protobuf.Protos; using BackOffice.BFF.WebApi.Common.Services; -using Google.Protobuf.WellKnownTypes; using BackOffice.BFF.Application.PublicMessageCQ.Queries.GetAllMessages; using BackOffice.BFF.Application.PublicMessageCQ.Queries.GetActiveMessages; diff --git a/src/BackOffice.BFF.WebApi/appsettings.json b/src/BackOffice.BFF.WebApi/appsettings.json index b598d11..c821b3d 100644 --- a/src/BackOffice.BFF.WebApi/appsettings.json +++ b/src/BackOffice.BFF.WebApi/appsettings.json @@ -11,8 +11,9 @@ }, "GrpcChannelOptions": { "FMSMSAddress": "https://dl.afrino.co", - "CMSMSAddress": "http://cms-svc:80" -// "CMSMSAddress": "https://cms.foursat.afrino.co" +// "CMSMSAddress": "http://cms-svc:80" + "CMSMSAddress": "https://cms.foursat.afrino.co" +// "CMSMSAddress": "https://localhost:32846" }, "Authentication": { "Authority": "https://ids.domain.com/", diff --git a/src/Protobufs/BackOffice.BFF.Commission.Protobuf/BackOffice.BFF.Commission.Protobuf.csproj b/src/Protobufs/BackOffice.BFF.Commission.Protobuf/BackOffice.BFF.Commission.Protobuf.csproj index 380f5c3..78059ea 100644 --- a/src/Protobufs/BackOffice.BFF.Commission.Protobuf/BackOffice.BFF.Commission.Protobuf.csproj +++ b/src/Protobufs/BackOffice.BFF.Commission.Protobuf/BackOffice.BFF.Commission.Protobuf.csproj @@ -6,7 +6,7 @@ enable true Foursat.BackOffice.BFF.Commission.Protobuf - 0.0.6 + 0.0.7 FourSat FourSat BackOffice.BFF.Commission.Protobuf diff --git a/src/Protobufs/BackOffice.BFF.Commission.Protobuf/Protos/commission.proto b/src/Protobufs/BackOffice.BFF.Commission.Protobuf/Protos/commission.proto index 0bae518..feb7293 100644 --- a/src/Protobufs/BackOffice.BFF.Commission.Protobuf/Protos/commission.proto +++ b/src/Protobufs/BackOffice.BFF.Commission.Protobuf/Protos/commission.proto @@ -105,6 +105,11 @@ service CommissionContract get: "/GetWorkerExecutionLogs" }; }; + rpc GetAvailableWeeks(GetAvailableWeeksRequest) returns (GetAvailableWeeksResponse){ + option (google.api.http) = { + get: "/GetAvailableWeeks" + }; + }; rpc GetWithdrawalReports(GetWithdrawalReportsRequest) returns (GetWithdrawalReportsResponse){ option (google.api.http) = { get: "/GetWithdrawalReports" @@ -457,3 +462,32 @@ message WithdrawalSummary int32 unique_users = 7; float success_rate = 8; // Percentage (0-100) } + +// ============ GetAvailableWeeks ============ + +message GetAvailableWeeksRequest +{ + int32 future_weeks_count = 1; // تعداد هفته‌های آینده (پیش‌فرض: 4) + int32 past_weeks_count = 2; // تعداد هفته‌های گذشته (پیش‌فرض: 12) +} + +message GetAvailableWeeksResponse +{ + WeekInfo current_week = 1; + repeated WeekInfo calculated_weeks = 2; + repeated WeekInfo pending_weeks = 3; + repeated WeekInfo future_weeks = 4; +} + +message WeekInfo +{ + string week_number = 1; // YYYY-Www format + google.protobuf.Timestamp start_date = 2; + google.protobuf.Timestamp end_date = 3; + bool is_calculated = 4; + google.protobuf.Timestamp calculated_at = 5; + string last_execution_status = 6; + int64 total_pool_amount = 7; + int32 eligible_users_count = 8; + string display_text = 9; // نمایش فارسی برای UI +} diff --git a/src/Protobufs/BackOffice.BFF.User.Protobuf/BackOffice.BFF.User.Protobuf.csproj b/src/Protobufs/BackOffice.BFF.User.Protobuf/BackOffice.BFF.User.Protobuf.csproj index 6724c3e..ea0064b 100644 --- a/src/Protobufs/BackOffice.BFF.User.Protobuf/BackOffice.BFF.User.Protobuf.csproj +++ b/src/Protobufs/BackOffice.BFF.User.Protobuf/BackOffice.BFF.User.Protobuf.csproj @@ -4,7 +4,7 @@ net9.0 enable enable - 0.0.112 + 0.0.113 None False False diff --git a/src/Protobufs/BackOffice.BFF.User.Protobuf/Protos/user.proto b/src/Protobufs/BackOffice.BFF.User.Protobuf/Protos/user.proto index f1f3c79..41d68b4 100644 --- a/src/Protobufs/BackOffice.BFF.User.Protobuf/Protos/user.proto +++ b/src/Protobufs/BackOffice.BFF.User.Protobuf/Protos/user.proto @@ -99,6 +99,8 @@ message GetAllUserByFilterFilter google.protobuf.StringValue national_code = 5; google.protobuf.StringValue avatar_path = 6; google.protobuf.Int64Value parent_id = 7; + google.protobuf.StringValue search_text = 8; + } message GetAllUserByFilterResponse {