Merge branch 'kub-stage' into production

src/FrontOffice.BFF.Application/CommissionCQ/Queries/GetMyWeeklyBalances/GetMyWeeklyBalancesQueryHandler.cs

@@ -35,17 +35,23 @@ public class GetMyWeeklyBalancesQueryHandler : IRequestHandler<GetMyWeeklyBalanc
         var response = await _context.Commission.GetUserWeeklyBalancesAsync(cmsRequest, cancellationToken: cancellationToken);
 
         // Map list of UserWeeklyBalanceModel to DTO
+        // Note: CMS proto uses LeftLegTotal/RightLegTotal (sum of NewMembers + Carryover)
         var balances = response.Models.Select(b => new WeeklyBalanceItemDto
         {
             Id = b.Id,
             WeekDefinitionId = b.WeekDefinitionId,
             WeekLabel = b.WeekDisplayName,
-            LeftLegBalances = b.LeftLegBalances,
-            RightLegBalances = b.RightLegBalances,
+            LeftLegBalances = b.LeftLegTotal,      // Changed from LeftLegBalances
+            RightLegBalances = b.RightLegTotal,    // Changed from RightLegBalances
             TotalBalances = b.TotalBalances,
             WeeklyPoolContribution = b.WeeklyPoolContribution,
             CalculatedAt = b.CalculatedAt?.ToDateTime(),
-            IsExpired = b.IsExpired
+            IsExpired = b.IsExpired,
+            // New fields for carryover info
+            LeftLegCarryover = b.LeftLegCarryover,
+            RightLegCarryover = b.RightLegCarryover,
+            LeftLegNewMembers = b.LeftLegNewMembers,
+            RightLegNewMembers = b.RightLegNewMembers
         }).ToList();
 
         // Calculate summary

src/FrontOffice.BFF.Application/CommissionCQ/Queries/GetMyWeeklyBalances/GetMyWeeklyBalancesResponseDto.cs

@@ -89,4 +89,24 @@ public class WeeklyBalanceItemDto
     /// تاریخ شمسی
     /// </summary>
     public string DatePersian { get; set; } = string.Empty;
+
+    /// <summary>
+    /// انتقالی پای چپ از هفته قبل
+    /// </summary>
+    public int LeftLegCarryover { get; set; }
+
+    /// <summary>
+    /// انتقالی پای راست از هفته قبل
+    /// </summary>
+    public int RightLegCarryover { get; set; }
+
+    /// <summary>
+    /// اعضای جدید پای چپ این هفته
+    /// </summary>
+    public int LeftLegNewMembers { get; set; }
+
+    /// <summary>
+    /// اعضای جدید پای راست این هفته
+    /// </summary>
+    public int RightLegNewMembers { get; set; }
 }

src/FrontOffice.BFF.Domain/FrontOffice.BFF.Domain.csproj

@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Afrino.PYMSMicroservice.Protobuf" Version="0.0.11" />
-     <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.159" /> 
+     <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.162" /> 
     <PackageReference Include="Google.Protobuf" Version="3.33.0" />
 		<PackageReference Include="Grpc.Net.ClientFactory" Version="2.54.0" />
 		<PackageReference Include="Grpc.Tools" Version="2.76.0">

src/FrontOffice.BFF.WebApi/Common/Mappings/CommissionProfile.cs

@@ -22,7 +22,7 @@ public class CommissionProfile : IRegister
             {
                 PageNumber = src.PageNumber,
                 PageSize = src.PageSize,
-                WeekDefinitionId = src.WeekDefinitionId,
+                WeekDefinitionId = src.WeekDefinitionId != null ? src.WeekDefinitionId.Value : null,
                 OnlyActive = src.OnlyActive
             });
 
@@ -55,6 +55,10 @@ public class CommissionProfile : IRegister
             .Map(dest => dest.WeekDisplayName, src => src.WeekLabel)
             .Map(dest => dest.LeftLegBalances, src => src.LeftLegBalances)
             .Map(dest => dest.RightLegBalances, src => src.RightLegBalances)
+            .Map(dest => dest.LeftLegCarryover, src => src.LeftLegCarryover)
+            .Map(dest => dest.RightLegCarryover, src => src.RightLegCarryover)
+            .Map(dest => dest.LeftLegNewMembers, src => src.LeftLegNewMembers)
+            .Map(dest => dest.RightLegNewMembers, src => src.RightLegNewMembers)
             .Map(dest => dest.TotalBalances, src => src.TotalBalances)
             .Map(dest => dest.WeeklyPoolContribution, src => src.WeeklyPoolContribution)
             .Map(dest => dest.IsExpired, src => src.IsExpired)

src/Protobufs/FrontOffice.BFF.Commission.Protobuf/FrontOffice.BFF.Commission.Protobuf.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>0.0.4</Version>
+    <Version>0.0.6</Version>
     <PackageId>Foursat.FrontOffice.BFF.Commission.Protobuf</PackageId>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <DebugSymbols>False</DebugSymbols>

src/Protobufs/FrontOffice.BFF.Commission.Protobuf/Protos/commission.proto

@@ -91,13 +91,17 @@ message WeeklyBalanceModel
     int64 id = 1;
     int64 week_definition_id = 2;
     string week_display_name = 3;
-    int32 left_leg_balances = 4;
-    int32 right_leg_balances = 5;
-    int32 total_balances = 6;
+    int32 left_leg_balances = 4;      // مجموع پای چپ (NewMembers + Carryover)
+    int32 right_leg_balances = 5;     // مجموع پای راست (NewMembers + Carryover)
+    int32 total_balances = 6;         // تعداد تعادل = MIN(چپ, راست)
     int64 weekly_pool_contribution = 7;
     bool is_expired = 8;
     google.protobuf.Timestamp calculated_at = 9;
     string date_persian = 10;
+    int32 left_leg_carryover = 11;    // انتقالی پای چپ از هفته قبل
+    int32 right_leg_carryover = 12;   // انتقالی پای راست از هفته قبل
+    int32 left_leg_new_members = 13;  // اعضای جدید پای چپ این هفته
+    int32 right_leg_new_members = 14; // اعضای جدید پای راست این هفته
 }
 
 // ============ GetWeekDefinitions ============