4d6d77531d
Build and Deploy to Kubernetes / build-and-deploy (push) Successful in 15m3s
- SP sp_CalculateWeeklyBalances: added @PackageId, @InputMaxBalancesPerLeg, @InputMaxNetworkLevel params; filters by PackageId - SP sp_CalculateWeeklyCommissionPool: added @PackageId param; all queries filter by PackageId/WeeklyPoolId for isolation - ICommissionCalculationStrategy: added optional PackageId param to both methods - StoredProcedureCommissionCalculationStrategy: loops per-package for both Balance and Pool methods; filters by packageId if provided - OrmCommissionCalculationStrategy: signature updated to match interface - TriggerWeeklyCalculationCommand: added PackageId optional field - TriggerWeeklyCalculationCommandHandler: passes PackageId to strategy - GetWeeklyCommissionPoolQuery: added optional PackageId filter - GetWeeklyCommissionPoolQueryHandler: filters pool by PackageId if provided - GetAllWeeklyPoolsQuery/Handler/DTO: added PackageId filter + PackageTitle in response - Proto commission.proto: added package_id to TriggerWeeklyCalculationRequest, GetWeeklyCommissionPoolRequest, WeeklyCommissionPoolModel, GetWeeklyCommissionPoolResponse, GetAllWeeklyPoolsRequest - CommissionProfile: added explicit mappings for TriggerWeeklyCalculation, GetWeeklyCommissionPool, GetAllWeeklyPools Fixes: SP picks wrong pool when multiple packages per week Fixes: SP ignores PackageId on ForceRecalculate (now uses WeeklyPoolId) Fixes: Zero-balance pools not fully recorded (now sets TotalBalances=0, ValuePerBalance=0)
47 lines
1.8 KiB
C#
47 lines
1.8 KiB
C#
namespace CMSMicroservice.Application.CommissionCQ.Queries.GetWeeklyCommissionPool;
|
|
|
|
public class GetWeeklyCommissionPoolQueryHandler : IRequestHandler<GetWeeklyCommissionPoolQuery, WeeklyCommissionPoolDto?>
|
|
{
|
|
private readonly IApplicationDbContext _context;
|
|
private readonly IWeekDefinitionRepository _weekDefinitionRepository;
|
|
|
|
public GetWeeklyCommissionPoolQueryHandler(
|
|
IApplicationDbContext context,
|
|
IWeekDefinitionRepository weekDefinitionRepository)
|
|
{
|
|
_context = context;
|
|
_weekDefinitionRepository = weekDefinitionRepository;
|
|
}
|
|
|
|
public async Task<WeeklyCommissionPoolDto?> Handle(GetWeeklyCommissionPoolQuery request, CancellationToken cancellationToken)
|
|
{
|
|
var query = _context.WeeklyCommissionPools
|
|
.Include(x => x.WeekDefinition)
|
|
.Include(x => x.Package)
|
|
.AsNoTracking()
|
|
.Where(x => x.WeekDefinitionId == request.WeekDefinitionId);
|
|
|
|
if (request.PackageId.HasValue)
|
|
query = query.Where(x => x.PackageId == request.PackageId.Value);
|
|
|
|
var pool = await query
|
|
.Select(x => new WeeklyCommissionPoolDto
|
|
{
|
|
Id = x.Id,
|
|
WeekDefinitionId = x.WeekDefinitionId,
|
|
WeekDisplayName = x.WeekDefinition.DisplayName,
|
|
TotalPoolAmount = x.TotalPoolAmount,
|
|
TotalBalances = x.TotalBalances,
|
|
ValuePerBalance = x.ValuePerBalance,
|
|
IsCalculated = x.IsCalculated,
|
|
CalculatedAt = x.CalculatedAt,
|
|
Created = x.Created,
|
|
PackageId = x.PackageId,
|
|
PackageTitle = x.Package != null ? x.Package.Title : string.Empty
|
|
})
|
|
.FirstOrDefaultAsync(cancellationToken);
|
|
|
|
return pool ?? new WeeklyCommissionPoolDto();
|
|
}
|
|
}
|