diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesResponseDto.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesResponseDto.cs index bea4911..9002696 100644 --- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesResponseDto.cs +++ b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesResponseDto.cs @@ -10,10 +10,15 @@ public record UserWeeklyBalanceDto { public long Id { get; init; } public long UserId { get; init; } + public string UserFullName { get; init; } = string.Empty; public long WeekDefinitionId { get; init; } public string WeekDisplayName { get; init; } = string.Empty; - public int LeftLegBalances { get; init; } - public int RightLegBalances { get; init; } + public int LeftLegNewMembers { get; init; } + public int LeftLegCarryover { get; init; } + public int LeftLegTotal { get; init; } + public int RightLegNewMembers { get; init; } + public int RightLegCarryover { get; init; } + public int RightLegTotal { get; init; } public int TotalBalances { get; init; } public long WeeklyPoolContribution { get; init; } public DateTime? CalculatedAt { get; init; } diff --git a/src/BackOffice.BFF.Application/Common/Mappings/CommissionProfile.cs b/src/BackOffice.BFF.Application/Common/Mappings/CommissionProfile.cs index a9c9c49..aea9a94 100644 --- a/src/BackOffice.BFF.Application/Common/Mappings/CommissionProfile.cs +++ b/src/BackOffice.BFF.Application/Common/Mappings/CommissionProfile.cs @@ -1,6 +1,9 @@ using BackOffice.BFF.Application.CommissionCQ.Queries.GetWeeklyPool; using BackOffice.BFF.Application.CommissionCQ.Queries.GetAllWeeklyPools; +using BackOffice.BFF.Application.CommissionCQ.Queries.GetUserWeeklyBalances; using CMSMicroservice.Protobuf.Protos.Commission; +using WeeklyPoolsMetaDataDto = BackOffice.BFF.Application.CommissionCQ.Queries.GetAllWeeklyPools.MetaDataDto; +using UserBalancesMetaDataDto = BackOffice.BFF.Application.CommissionCQ.Queries.GetUserWeeklyBalances.MetaDataDto; namespace BackOffice.BFF.Application.Common.Mappings; @@ -22,7 +25,7 @@ public class CommissionProfile : IRegister config.NewConfig() .MapWith(src => new GetAllWeeklyPoolsResponseDto { - MetaData = new MetaDataDto + MetaData = new WeeklyPoolsMetaDataDto { TotalCount = (int)src.MetaData.TotalCount, PageSize = (int)src.MetaData.PageSize, @@ -42,5 +45,37 @@ public class CommissionProfile : IRegister Created = m.Created.ToDateTime() }).ToList() }); + + // CMS GetUserWeeklyBalancesResponse -> GetUserWeeklyBalancesResponseDto + config.NewConfig() + .MapWith(src => new GetUserWeeklyBalancesResponseDto + { + MetaData = new UserBalancesMetaDataDto + { + TotalCount = (int)src.MetaData.TotalCount, + PageSize = (int)src.MetaData.PageSize, + CurrentPage = (int)src.MetaData.CurrentPage, + TotalPages = (int)src.MetaData.TotalPage + }, + Models = src.Models.Select(m => new UserWeeklyBalanceDto + { + Id = m.Id, + UserId = m.UserId, + UserFullName = m.UserFullName ?? string.Empty, + WeekDefinitionId = m.WeekDefinitionId, + WeekDisplayName = m.WeekDisplayName ?? string.Empty, + LeftLegNewMembers = m.LeftLegNewMembers, + LeftLegCarryover = m.LeftLegCarryover, + LeftLegTotal = m.LeftLegTotal, + RightLegNewMembers = m.RightLegNewMembers, + RightLegCarryover = m.RightLegCarryover, + RightLegTotal = m.RightLegTotal, + TotalBalances = m.TotalBalances, + WeeklyPoolContribution = m.WeeklyPoolContribution, + CalculatedAt = m.CalculatedAt != null ? m.CalculatedAt.ToDateTime() : null, + IsExpired = m.IsExpired, + Created = m.Created.ToDateTime() + }).ToList() + }); } } diff --git a/src/BackOffice.BFF.WebApi/Common/Mappings/CommissionProfile.cs b/src/BackOffice.BFF.WebApi/Common/Mappings/CommissionProfile.cs index d261d8b..0b95e4c 100644 --- a/src/BackOffice.BFF.WebApi/Common/Mappings/CommissionProfile.cs +++ b/src/BackOffice.BFF.WebApi/Common/Mappings/CommissionProfile.cs @@ -121,10 +121,15 @@ public class CommissionProfile : IRegister { Id = m.Id, UserId = m.UserId, + UserFullName = m.UserFullName ?? string.Empty, WeekDefinitionId = m.WeekDefinitionId, WeekDisplayName = m.WeekDisplayName ?? string.Empty, - LeftLegBalances = m.LeftLegBalances, - RightLegBalances = m.RightLegBalances, + LeftLegNewMembers = m.LeftLegNewMembers, + LeftLegCarryover = m.LeftLegCarryover, + LeftLegTotal = m.LeftLegTotal, + RightLegNewMembers = m.RightLegNewMembers, + RightLegCarryover = m.RightLegCarryover, + RightLegTotal = m.RightLegTotal, TotalBalances = m.TotalBalances, WeeklyPoolContribution = m.WeeklyPoolContribution, CalculatedAt = m.CalculatedAt.HasValue 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 79c3495..cdacf84 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.14 + 0.0.15 FourSat FourSat BackOffice.BFF.Commission.Protobuf