Merge branch 'kub-stage' into production

src/CMSMicroservice.Application/CommissionCQ/Queries/GetAllWeeklyPools/GetAllWeeklyPoolsQueryHandler.cs

@@ -49,7 +49,7 @@ public class GetAllWeeklyPoolsQueryHandler : IRequestHandler<GetAllWeeklyPoolsQu
             {
                 Id = x.Id,
                 WeekDefinitionId = x.WeekDefinitionId,
-                WeekDisplayName = x.WeekDefinition.PersianWeekNumber,
+                WeekDisplayName = x.WeekDefinition.DisplayName,
                 TotalPoolAmount = x.TotalPoolAmount,
                 TotalBalances = x.TotalBalances,
                 ValuePerBalance = x.ValuePerBalance,

src/CMSMicroservice.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesQueryHandler.cs

@@ -17,6 +17,7 @@ public class GetUserWeeklyBalancesQueryHandler : IRequestHandler<GetUserWeeklyBa
     {
         var query = _context.NetworkWeeklyBalances
             .Include(x => x.WeekDefinition)
+            .Include(x => x.User)
             .AsNoTracking()
             .AsQueryable();
 
@@ -49,10 +50,15 @@ public class GetUserWeeklyBalancesQueryHandler : IRequestHandler<GetUserWeeklyBa
             {
                 Id = x.Id,
                 UserId = x.UserId,
+                UserFullName = x.User != null ? $"{x.User.FirstName} {x.User.LastName}".Trim() : "",
                 WeekDefinitionId = x.WeekDefinitionId,
                 WeekDisplayName = x.WeekDefinition != null ? x.WeekDefinition.DisplayName : "",
-                LeftLegBalances = x.LeftLegBalances,
-                RightLegBalances = x.RightLegBalances,
+                LeftLegNewMembers = x.LeftLegNewMembers,
+                LeftLegCarryover = x.LeftLegCarryover,
+                LeftLegTotal = x.LeftLegTotal,
+                RightLegNewMembers = x.RightLegNewMembers,
+                RightLegCarryover = x.RightLegCarryover,
+                RightLegTotal = x.RightLegTotal,
                 TotalBalances = x.TotalBalances,
                 WeeklyPoolContribution = x.WeeklyPoolContribution,
                 CalculatedAt = x.CalculatedAt,

src/CMSMicroservice.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesResponseDto.cs

@@ -10,11 +10,20 @@ public class GetUserWeeklyBalancesResponseModel
 {
     public long Id { get; set; }
     public long UserId { get; set; }
+    public string UserFullName { get; set; } = string.Empty;
     public long WeekDefinitionId { get; set; }
-
     public string WeekDisplayName { get; set; } = string.Empty;
-    public int LeftLegBalances { get; set; }
-    public int RightLegBalances { get; set; }
+    
+    // چپ
+    public int LeftLegNewMembers { get; set; }
+    public int LeftLegCarryover { get; set; }
+    public int LeftLegTotal { get; set; }
+    
+    // راست  
+    public int RightLegNewMembers { get; set; }
+    public int RightLegCarryover { get; set; }
+    public int RightLegTotal { get; set; }
+    
     public int TotalBalances { get; set; }
     public long WeeklyPoolContribution { get; set; }
     public DateTime? CalculatedAt { get; set; }

src/CMSMicroservice.Application/CommissionCQ/Queries/GetWeekDefinitions/GetWeekDefinitionsQueryHandler.cs

@@ -107,6 +107,7 @@ public class GetWeekDefinitionsQueryHandler : IRequestHandler<GetWeekDefinitions
         // تبدیل به DTO
         var weekDtos = weeksList.Select(w => new WeekDefinitionItemDto
         {
+            Id = w.Id,
             WeekOrder = w.WeekOrder,
             DisplayName = w.DisplayName,
             GregorianWeekNumber = w.GregorianWeekNumber,

src/CMSMicroservice.Application/CommissionCQ/Queries/GetWeekDefinitions/GetWeekDefinitionsResponseDto.cs

@@ -17,6 +17,9 @@ public class GetWeekDefinitionsResponseDto
 /// </summary>
 public class WeekDefinitionItemDto
 {
+    //شناسه هفته
+    public long Id { get; set; }
+    
     //شماره ترتیب هفته (1, 2, 3, ...)
     public int WeekOrder { get; set; }
     

src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>0.0.161</Version>
+    <Version>0.0.162</Version>
     <DebugType>None</DebugType>
     <DebugSymbols>False</DebugSymbols>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>

src/CMSMicroservice.Protobuf/Protos/commission.proto

@@ -316,15 +316,20 @@ message UserWeeklyBalanceModel
 {
     int64 id = 1;
     int64 user_id = 2;
-    int64 week_definition_id = 3;
-    string week_display_name = 4;
-    int32 left_leg_balances = 5;
-    int32 right_leg_balances = 6;
-    int32 total_balances = 7;
-    int64 weekly_pool_contribution = 8;
-    google.protobuf.Timestamp calculated_at = 9;
-    bool is_expired = 10;
-    google.protobuf.Timestamp created = 11;
+    string user_full_name = 3; // نام کامل کاربر
+    int64 week_definition_id = 4;
+    string week_display_name = 5;
+    int32 left_leg_new_members = 6; // اعضای جدید چپ این هفته
+    int32 left_leg_carryover = 7; // باقیمانده چپ از هفته قبل
+    int32 left_leg_total = 8; // مجموع چپ (NewMembers + Carryover)
+    int32 right_leg_new_members = 9; // اعضای جدید راست این هفته
+    int32 right_leg_carryover = 10; // باقیمانده راست از هفته قبل
+    int32 right_leg_total = 11; // مجموع راست (NewMembers + Carryover)
+    int32 total_balances = 12; // تعداد تعادل = MIN(چپ, راست)
+    int64 weekly_pool_contribution = 13;
+    google.protobuf.Timestamp calculated_at = 14;
+    bool is_expired = 15;
+    google.protobuf.Timestamp created = 16;
 }
 
 // GetAllWeeklyPools Query

src/CMSMicroservice.WebApi/Common/Mappings/CommissionProfile.cs

@@ -92,6 +92,7 @@ public class CommissionProfile : IRegister
 
         // WeekDefinitionItem Mapping
         config.NewConfig<WeekDefinitionItemDto, WeekDefinitionItem>()
+            .Map(dest => dest.Id, src => src.Id)
             .Map(dest => dest.WeekOrder, src => src.WeekOrder)
             .Map(dest => dest.DisplayName, src => src.DisplayName)
             .Map(dest => dest.GregorianWeekNumber, src => src.GregorianWeekNumber)
@@ -107,10 +108,15 @@ public class CommissionProfile : IRegister
         config.NewConfig<GetUserWeeklyBalancesResponseModel, UserWeeklyBalanceModel>()
             .Map(dest => dest.Id, src => src.Id)
             .Map(dest => dest.UserId, src => src.UserId)
+            .Map(dest => dest.UserFullName, src => src.UserFullName)
             .Map(dest => dest.WeekDefinitionId, src => src.WeekDefinitionId)
             .Map(dest => dest.WeekDisplayName, src => src.WeekDisplayName)
-            .Map(dest => dest.LeftLegBalances, src => src.LeftLegBalances)
-            .Map(dest => dest.RightLegBalances, src => src.RightLegBalances)
+            .Map(dest => dest.LeftLegNewMembers, src => src.LeftLegNewMembers)
+            .Map(dest => dest.LeftLegCarryover, src => src.LeftLegCarryover)
+            .Map(dest => dest.LeftLegTotal, src => src.LeftLegTotal)
+            .Map(dest => dest.RightLegNewMembers, src => src.RightLegNewMembers)
+            .Map(dest => dest.RightLegCarryover, src => src.RightLegCarryover)
+            .Map(dest => dest.RightLegTotal, src => src.RightLegTotal)
             .Map(dest => dest.TotalBalances, src => src.TotalBalances)
             .Map(dest => dest.WeeklyPoolContribution, src => src.WeeklyPoolContribution)
             .Map(dest => dest.CalculatedAt, src => src.CalculatedAt.HasValue