fix: increase Docker daemon startup timeout to 3 minutes

- Auto-detect and pack *Protobuf*.csproj files
- Push to Nexus with --skip-duplicate
- Build job now depends on publish-packages

.gitea/workflows/kub-deploy.yml

@@ -6,86 +6,84 @@ on:
       - kub-stage
 
 env:
-  REGISTRY: gitea-svc:3000
+  REGISTRY: 194.5.195.53:30080
   IMAGE_NAME: admin/frontoffice-bff
+  K8S_SERVER: 194.5.195.53
 
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
     container:
-      image: docker:latest
+      image: 194.5.195.53:32082/docker-sshpass:latest
       options: --privileged
-      env:
-        HTTP_PROXY: http://proxyuser:87zH26nbqT2@46.249.98.211:3128
-        HTTPS_PROXY: http://proxyuser:87zH26nbqT2@46.249.98.211:3128
-        NO_PROXY: localhost,127.0.0.1,gitea-svc,194.5.195.53,10.0.0.0/8
     steps:
-      - name: Install dependencies
-        run: |
-          apk add --no-cache git curl
-          
-          # Install kubectl
-          curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
-          chmod +x kubectl
-          mv kubectl /usr/local/bin/
-
-      - name: Start Docker daemon with insecure registry
+      - name: Start Docker daemon
         run: |
           mkdir -p /etc/docker
           cat > /etc/docker/daemon.json << 'DAEMON'
           {
-            "insecure-registries": ["git.foursat.afrino.co", "gitea-svc:3000"]
+            "insecure-registries": ["194.5.195.53:30080", "194.5.195.53:32500", "194.5.195.53:32082"]
           }
           DAEMON
-          mkdir -p ~/.docker
-          cat > ~/.docker/config.json << 'CONF'
-          {
-            "proxies": {
-              "default": {
-                "httpProxy": "http://proxyuser:87zH26nbqT2@46.249.98.211:3128",
-                "httpsProxy": "http://proxyuser:87zH26nbqT2@46.249.98.211:3128",
-                "noProxy": "localhost,127.0.0.1,gitea-svc,194.5.195.53,10.0.0.0/8"
-              }
-            }
-          }
-          CONF
+          echo "🚀 Starting Docker daemon..."
           dockerd &
-          for i in $(seq 1 30); do
-            docker info >/dev/null 2>&1 && break || sleep 2
+          
+          # Wait up to 3 minutes for Docker to be ready
+          for i in $(seq 1 90); do 
+            if docker info >/dev/null 2>&1; then
+              echo "✅ Docker daemon is ready (attempt $i)"
+              docker version
+              break
+            else
+              echo "⏳ Waiting for Docker daemon... (attempt $i/90)"
+              sleep 2
+            fi
           done
-          docker info
+          
+          # Final check
+          if ! docker info >/dev/null 2>&1; then
+            echo "❌ Docker daemon failed to start after 3 minutes"
+            exit 1
+          fi
 
       - name: Checkout code
         run: |
           git clone --depth 1 --branch kub-stage http://gitea-svc:3000/admin/FrontOffice.BFF.git .
-          git log -1 --format="%H %s"
+
+      - name: Publish Protobuf packages
+        run: |
+          echo "📦 Publishing Protobuf packages..."
+          docker run --rm -v $(pwd):/src -w /src \
+            194.5.195.53:32082/dotnet/sdk:9.0 sh -c '
+              for proj in $(find . -name "*Protobuf*.csproj" -type f); do
+                echo "📦 $proj"
+                dotnet restore "$proj"
+                dotnet build "$proj" -c Release --no-restore
+                dotnet pack "$proj" -c Release --no-build -o "$(dirname $proj)/nupkg"
+                for nupkg in $(dirname $proj)/nupkg/*.nupkg; do
+                  [ -f "$nupkg" ] && dotnet nuget push "$nupkg" \
+                    --source "http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json" \
+                    --api-key "admin:87zH26nbqT" \
+                    --skip-duplicate --allow-insecure-connections || true
+                done
+              done
+            '
+          echo "✅ Protobuf packages done!"
 
       - name: Build Docker Image
         run: |
-          cd src
-          docker build -f FrontOffice.BFF.WebApi/Dockerfile \
-                       -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \
-                       -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest \
-                       --build-arg HTTP_PROXY=http://proxyuser:87zH26nbqT2@46.249.98.211:3128 \
-                       --build-arg HTTPS_PROXY=http://proxyuser:87zH26nbqT2@46.249.98.211:3128 \
-                       .
-
+          docker build -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest -f src/FrontOffice.BFF.WebApi/Dockerfile .
 
       - name: Push to Registry
         run: |
           echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u admin --password-stdin
-          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
           docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
 
       - name: Deploy to Kubernetes
         run: |
-          # Setup kubeconfig
-          mkdir -p ~/.kube
-          echo "${{ secrets.KUBECONFIG }}"  | base64 -d > ~/.kube/config
-          
-          # Restart deployment to pull new image
-          kubectl rollout restart deployment/frontoffice-bff || echo "Deployment doesn't exist yet"
-          
-          # Wait for rollout to complete
-          kubectl rollout status deployment/frontoffice-bff --timeout=5m || echo "Deployment rollout pending"
-    
+          export SSHPASS="${{ secrets.SERVER_PASSWORD }}"
+          sshpass -e ssh -o StrictHostKeyChecking=no root@${{ env.K8S_SERVER }} "
+            kubectl rollout restart deployment/frontoffice-bff
+            kubectl rollout status deployment/frontoffice-bff --timeout=180s
+          "
+          echo "✅ Deployed!"

.gitea/workflows/prod-deploy.yml

@@ -7,7 +7,7 @@ on:
 
 env:
   REGISTRY: gitea-svc:3000
-  EXTERNAL_REGISTRY: git.foursat.afrino.co
+  EXTERNAL_REGISTRY: 194.5.195.53:30080
   IMAGE_NAME: admin/frontoffice-bff
 
 jobs:
@@ -24,7 +24,9 @@ jobs:
       - name: Install dependencies
         run: |
           apk add --no-cache git curl
-          curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
+          # Install kubectl with fixed version
+          KUBECTL_VERSION="v1.31.0"
+          curl -LO "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl"
           chmod +x kubectl
           mv kubectl /usr/local/bin/
 
@@ -33,7 +35,7 @@ jobs:
           mkdir -p /etc/docker
           cat > /etc/docker/daemon.json << 'DAEMON'
           {
-            "insecure-registries": ["git.foursat.afrino.co", "gitea-svc:3000"]
+            "insecure-registries": ["194.5.195.53:30080", "194.5.195.53:32082", "gitea-svc:3000"]
           }
           DAEMON
           mkdir -p ~/.docker

src/FrontOffice.BFF.Application/CommissionCQ/Queries/GetMyCommissionPayouts/GetMyCommissionPayoutsQueryHandler.cs

@@ -44,8 +44,7 @@ public class GetMyCommissionPayoutsQueryHandler : IRequestHandler<GetMyCommissio
             BalancesEarned = (int)p.BalancesEarned,
             TotalAmount = p.TotalAmount,
             AmountFormatted = FormatCurrency(p.TotalAmount),
-            Status = MapStatus(p.Status),
-            StatusBadgeColor = GetStatusColor(p.Status),
+            Status = p.Status,
             CalculatedDate = p.Created?.ToDateTime() ?? DateTime.UtcNow,
             DatePersian = FormatPersianDate(p.Created?.ToDateTime())
         }).ToList();
@@ -59,30 +58,6 @@ public class GetMyCommissionPayoutsQueryHandler : IRequestHandler<GetMyCommissio
         };
     }
 
-    private static string MapStatus(int status)
-    {
-        return status switch
-        {
-            0 => "Pending",
-            1 => "Calculated",
-            2 => "Paid",
-            3 => "Withdrawn",
-            _ => "Unknown"
-        };
-    }
-
-    private static string GetStatusColor(int status)
-    {
-        return status switch
-        {
-            0 => "warning",
-            1 => "info",
-            2 => "success",
-            3 => "success",
-            _ => "default"
-        };
-    }
-
     private static string FormatCurrency(long amount)
     {
         return $"{amount:N0} تومان";

src/FrontOffice.BFF.Application/CommissionCQ/Queries/GetMyCommissionPayouts/GetMyCommissionPayoutsResponseDto.cs

@@ -41,14 +41,9 @@ public class CommissionPayoutDto
     public string AmountFormatted { get; set; } = string.Empty;
 
     /// <summary>
-    /// وضعیت (Pending/Calculated/Paid/Withdrawn)
+    /// وضعیت (0=Pending=1,Paid=2,WithdrawRequested=3,Withdrawn=4,PaymentFailed= 5,Cancelled)
     /// </summary>
-    public string Status { get; set; } = string.Empty;
-
-    /// <summary>
-    /// رنگ Badge
-    /// </summary>
-    public string StatusBadgeColor { get; set; } = string.Empty;
+    public int Status { get; set; }
 
     /// <summary>
     /// تاریخ محاسبه

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.Application/Common/Interfaces/IApplicationContractContext.cs

@@ -10,6 +10,7 @@ using CMSMicroservice.Protobuf.Protos.UserAddress;
 using CMSMicroservice.Protobuf.Protos.UserCarts;
 using CMSMicroservice.Protobuf.Protos.Commission;
 using CMSMicroservice.Protobuf.Protos.Configuration;
+using CMSMicroservice.Protobuf.Protos.AppVersion;
 using CMSMicroservice.Protobuf.Protos.UserContract;
 using CMSMicroservice.Protobuf.Protos.UserOrder;
 using CMSMicroservice.Protobuf.Protos.UserWallet;
@@ -63,6 +64,9 @@ public interface IApplicationContractContext
     
     // Geography System (GMS)
     CityContract.CityContractClient Cities { get; }
+    
+    // App Version System
+    AppVersionContract.AppVersionContractClient AppVersion { get; }
     #endregion
 
     #region PYMS

src/FrontOffice.BFF.Application/ConfigurationCQ/Queries/GetAppVersion/GetAppVersionQuery.cs

@@ -0,0 +1,8 @@
+using FrontOffice.BFF.Configuration.Protobuf.Protos.AppVersion;
+
+namespace FrontOffice.BFF.Application.ConfigurationCQ.Queries.GetAppVersion;
+
+/// <summary>
+/// دریافت نسخه اپلیکیشن برای بررسی نیاز به پاک کردن کش
+/// </summary>
+public record GetAppVersionQuery(string AppName, string? CurrentClientVersion) : IRequest<GetAppVersionResponseDto>;

src/FrontOffice.BFF.Application/ConfigurationCQ/Queries/GetAppVersion/GetAppVersionQueryHandler.cs

@@ -0,0 +1,44 @@
+using CMSMicroservice.Protobuf.Protos.AppVersion;
+
+namespace FrontOffice.BFF.Application.ConfigurationCQ.Queries.GetAppVersion;
+
+/// <summary>
+/// هندلر دریافت نسخه اپلیکیشن از CMS
+/// </summary>
+public class GetAppVersionQueryHandler : IRequestHandler<GetAppVersionQuery, GetAppVersionResponseDto>
+{
+    private readonly IApplicationContractContext _context;
+
+    public GetAppVersionQueryHandler(IApplicationContractContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<GetAppVersionResponseDto> Handle(GetAppVersionQuery request, CancellationToken cancellationToken)
+    {
+        var cmsRequest = new GetAppVersionRequest
+        {
+            AppName = request.AppName
+        };
+        
+        if (!string.IsNullOrEmpty(request.CurrentClientVersion))
+        {
+            cmsRequest.CurrentClientVersion = request.CurrentClientVersion;
+        }
+
+        var response = await _context.AppVersion.GetAppVersionAsync(cmsRequest, cancellationToken: cancellationToken);
+
+        return new GetAppVersionResponseDto
+        {
+            Found = response.Found,
+            AppName = response.AppName,
+            CurrentVersion = response.CurrentVersion,
+            MinRequiredVersion = response.MinRequiredVersion,
+            RequiresFullCacheClear = response.RequiresFullCacheClear,
+            RequiresUpdate = response.RequiresUpdate,
+            UpdateMessage = response.UpdateMessage,
+            ReleaseNotes = response.ReleaseNotes,
+            LastUpdated = response.LastUpdated?.ToDateTime()
+        };
+    }
+}

src/FrontOffice.BFF.Application/ConfigurationCQ/Queries/GetAppVersion/GetAppVersionResponseDto.cs

@@ -0,0 +1,17 @@
+namespace FrontOffice.BFF.Application.ConfigurationCQ.Queries.GetAppVersion;
+
+/// <summary>
+/// DTO پاسخ نسخه اپلیکیشن
+/// </summary>
+public class GetAppVersionResponseDto
+{
+    public bool Found { get; set; }
+    public string AppName { get; set; } = string.Empty;
+    public string CurrentVersion { get; set; } = string.Empty;
+    public string MinRequiredVersion { get; set; } = string.Empty;
+    public bool RequiresFullCacheClear { get; set; }
+    public bool RequiresUpdate { get; set; }
+    public string? UpdateMessage { get; set; }
+    public string? ReleaseNotes { get; set; }
+    public DateTime? LastUpdated { get; set; }
+}

src/FrontOffice.BFF.Application/FrontOffice.BFF.Application.csproj

@@ -15,6 +15,7 @@
     <ProjectReference Include="..\FrontOffice.BFF.Domain\FrontOffice.BFF.Domain.csproj" />
     <ProjectReference Include="..\Protobufs\FrontOffice.BFF.UserOrder.Protobuf\FrontOffice.BFF.UserOrder.Protobuf.csproj" />
     <ProjectReference Include="..\Protobufs\FrontOffice.BFF.Category.Protobuf\FrontOffice.BFF.Category.Protobuf.csproj" />
+    <ProjectReference Include="..\Protobufs\FrontOffice.BFF.Configuration.Protobuf\FrontOffice.BFF.Configuration.Protobuf.csproj" />
     <!-- CMS Protobuf for Commission, ClubMembership, NetworkMembership, Configuration -->
   </ItemGroup>
 

src/FrontOffice.BFF.Application/NetworkMembershipCQ/Queries/GetMyNetworkTree/GetMyNetworkTreeQueryHandler.cs

@@ -85,6 +85,7 @@ public class GetMyNetworkTreeQueryHandler : IRequestHandler<GetMyNetworkTreeQuer
             JoinedAt = cmsNode.JoinedAt?.ToDateTime(),
             IsClubActive = cmsNode.IsClubActive,
             ActivationWeekDefinitionId = cmsNode.ActivationWeekDefinitionId,
+            ReferralCode =  cmsNode.ReferralCode,
             LeftChild = leftChild != null ? BuildNodeRecursive(leftChild, allNodes, nodeDict, level + 1) : null,
             RightChild = rightChild != null ? BuildNodeRecursive(rightChild, allNodes, nodeDict, level + 1) : null
         };

src/FrontOffice.BFF.Application/NetworkMembershipCQ/Queries/GetMyNetworkTree/GetMyNetworkTreeResponseDto.cs

@@ -84,4 +84,9 @@ public class NetworkNodeDto
     /// شماره هفته فعال‌سازی
     /// </summary>
     public long? ActivationWeekDefinitionId { get; set; }
+    
+    /// <summary>
+    /// کد معرف کاربر
+    /// </summary>
+    public string? ReferralCode { get; set; }
 }

src/FrontOffice.BFF.Application/NetworkMembershipCQ/Queries/GetSubordinateTree/GetSubordinateTreeQueryHandler.cs

@@ -92,6 +92,7 @@ public class GetSubordinateTreeQueryHandler : IRequestHandler<GetSubordinateTree
             IsActive = cmsNode.IsActive,
             JoinedAt = cmsNode.JoinedAt?.ToDateTime(),
             IsClubActive = cmsNode.IsClubActive,
+            ReferralCode = cmsNode.ReferralCode,
             ActivationWeekDefinitionId = cmsNode.ActivationWeekDefinitionId,
             LeftChild = leftChild != null ? BuildNodeRecursive(leftChild, allNodes, nodeDict, level + 1) : null,
             RightChild = rightChild != null ? BuildNodeRecursive(rightChild, allNodes, nodeDict, level + 1) : null

src/FrontOffice.BFF.Application/NetworkMembershipCQ/Queries/GetSubordinateTree/GetSubordinateTreeResponseDto.cs

@@ -31,4 +31,5 @@ public class GetSubordinateTreeResponseDto
     /// شناسه parent برای بازگشت به عقب
     /// </summary>
     public long? ParentUserId { 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.156" /> 
+     <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.Infrastructure/Services/ApplicationContractContext.cs

@@ -10,6 +10,7 @@ using CMSMicroservice.Protobuf.Protos.UserAddress;
 using CMSMicroservice.Protobuf.Protos.UserCarts;
 using CMSMicroservice.Protobuf.Protos.Commission;
 using CMSMicroservice.Protobuf.Protos.Configuration;
+using CMSMicroservice.Protobuf.Protos.AppVersion;
 using CMSMicroservice.Protobuf.Protos.UserContract;
 using CMSMicroservice.Protobuf.Protos.UserOrder;
 using CMSMicroservice.Protobuf.Protos.UserWallet;
@@ -90,6 +91,9 @@ public class ApplicationContractContext : IApplicationContractContext
     
     // Geography System (GMS)
     public CityContract.CityContractClient Cities => GetService<CityContract.CityContractClient>();
+    
+    // App Version System
+    public AppVersionContract.AppVersionContractClient AppVersion => GetService<AppVersionContract.AppVersionContractClient>();
     #endregion
 
     #region PYMS

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

@@ -18,10 +18,13 @@ public class CommissionProfile : IRegister
             .Map(dest => dest.Status, src => src.Status);
 
         config.NewConfig<ProtoDto.GetMyWeeklyBalancesRequest, GetMyWeeklyBalancesQuery>()
-            .Map(dest => dest.PageNumber, src => src.PageNumber)
-            .Map(dest => dest.PageSize, src => src.PageSize)
-            .Map(dest => dest.WeekDefinitionId, src => src.WeekDefinitionId != null ? (long?)src.WeekDefinitionId.Value : null)
-            .Map(dest => dest.OnlyActive, src => src.OnlyActive);
+            .MapWith(src => new GetMyWeeklyBalancesQuery
+            {
+                PageNumber = src.PageNumber,
+                PageSize = src.PageSize,
+                WeekDefinitionId = src.WeekDefinitionId != null ? src.WeekDefinitionId.Value : null,
+                OnlyActive = src.OnlyActive
+            });
 
         // Response mappings
         config.NewConfig<GetMyCommissionPayoutsResponseDto, ProtoDto.GetMyCommissionPayoutsResponse>()
@@ -36,7 +39,6 @@ public class CommissionProfile : IRegister
             .Map(dest => dest.TotalAmount, src => src.TotalAmount)
             .Map(dest => dest.AmountFormatted, src => src.AmountFormatted)
             .Map(dest => dest.Status, src => src.Status)
-            .Map(dest => dest.StatusBadgeColor, src => src.StatusBadgeColor)
             .Map(dest => dest.CalculatedDate, src => Timestamp.FromDateTime(DateTime.SpecifyKind(src.CalculatedDate, DateTimeKind.Utc)))
             .Map(dest => dest.DatePersian, src => src.DatePersian);
 
@@ -53,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/FrontOffice.BFF.WebApi/Common/Mappings/NetworkMembershipProfile.cs

@@ -40,6 +40,7 @@ public class NetworkMembershipProfile : IRegister
             .Map(dest => dest.LeftChild, src => src.LeftChild)
             .Map(dest => dest.RightChild, src => src.RightChild)
             .Map(dest => dest.Level, src => src.Level)
+            .Map(dest => dest.ReferralCode, src => src.ReferralCode)
             .Map(dest => dest.HasChildren, src => src.HasChildren)
             .Map(dest => dest.IsActive, src => src.IsActive)
             .Map(dest => dest.JoinedAt, src => src.JoinedAt.HasValue ? Timestamp.FromDateTime(DateTime.SpecifyKind(src.JoinedAt.Value, DateTimeKind.Utc)) : null)

src/FrontOffice.BFF.WebApi/Dockerfile

@@ -1,10 +1,10 @@
-FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
+FROM 194.5.195.53:32082/dotnet/aspnet:9.0 AS base
 USER $APP_UID
-WORKDIR /app
+WORKDATA /app
 EXPOSE 8080
 EXPOSE 8081
 
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
+FROM 194.5.195.53:32082/dotnet/sdk:9.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ["FrontOffice.BFF.WebApi/NuGet.config", "NuGet.config"]

src/FrontOffice.BFF.WebApi/NuGet.config

@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-    <add key="FourSat" value="https://git.afrino.co/api/packages/FourSat/nuget/index.json" />
-    <add key="Afrino" value="https://git.afrino.co/api/packages/Afrino/nuget/index.json" />
+    <clear />
+    <!-- Nexus (hosts FourSat packages + proxies nuget.org) -->
+    <add key="Nexus" value="http://194.5.195.53:32081/repository/nuget-all/index.json" allowInsecureConnections="true" />
   </packageSources>
   <packageSourceCredentials>
-    <FourSat>
-      <add key="Username" value="masoud" />
+    <Nexus>
+      <add key="Username" value="admin" />
       <add key="ClearTextPassword" value="87zH26nbqT" />
-    </FourSat>
-    <Afrino>
-      <add key="Username" value="systemuser" />
-      <add key="ClearTextPassword" value="sZSA7PTiv3pUSQZ" />
-    </Afrino>
+    </Nexus>
   </packageSourceCredentials>
 </configuration>

src/FrontOffice.BFF.WebApi/Services/AppVersionGrpcService.cs

@@ -0,0 +1,26 @@
+using FrontOffice.BFF.WebApi.Common.Services;
+using FrontOffice.BFF.Application.ConfigurationCQ.Queries.GetAppVersion;
+using FrontOffice.BFF.Configuration.Protobuf.Protos.AppVersion;
+
+namespace FrontOffice.BFF.WebApi.Services;
+
+/// <summary>
+/// سرویس نسخه اپلیکیشن - برای بررسی نیاز به پاک کردن کش
+/// </summary>
+public class AppVersionGrpcService : AppVersionContract.AppVersionContractBase
+{
+    private readonly IDispatchRequestToCQRS _dispatchRequestToCQRS;
+
+    public AppVersionGrpcService(IDispatchRequestToCQRS dispatchRequestToCQRS)
+    {
+        _dispatchRequestToCQRS = dispatchRequestToCQRS;
+    }
+
+    /// <summary>
+    /// دریافت نسخه اپلیکیشن
+    /// </summary>
+    public override async Task<GetAppVersionResponse> GetAppVersion(GetAppVersionRequest request, ServerCallContext context)
+    {
+        return await _dispatchRequestToCQRS.Handle<GetAppVersionRequest, GetAppVersionQuery, GetAppVersionResponse>(request, context);
+    }
+}

src/FrontOffice.BFF.WebApi/Services/UserWalletService.cs

@@ -30,7 +30,7 @@ public class UserWalletService : UserWalletContract.UserWalletContractBase
     }
     public override async Task<Empty> WithdrawBalance(WithdrawBalanceRequest request, ServerCallContext context)
     {
-        return await _dispatchRequestToCQRS.Handle<WithdrawBalanceRequest, WithdrawBalanceCommand, Empty>(request, context);
+        return await _dispatchRequestToCQRS.Handle<WithdrawBalanceRequest, WithdrawBalanceCommand>(request, context);
     }
     public override async Task<GetUserWithdrawalsResponse> GetUserWithdrawals(GetUserWithdrawalsRequest request, ServerCallContext context)
     {

src/FrontOffice.BFF.WebApi/appsettings.Staging.json

@@ -10,11 +10,18 @@
     }
   },
   "GrpcChannelOptions": {
-    "CMSMSAddress": "https://cms.kbs1.ir",
-    "PYMSMSAddress": "https://ipg.afrino.co"
+    "CMSMSAddress": "http://cms-svc",
+    "PYMSMSAddress": "https://ipg.afrino.co" 
+  },
+  "CmsSignalR": {
+    "HubPath": "/hubs/token-notification"
   },
   "Authentication": {
     "Authority": "https://ids.domain.com/",
     "Audience": "domain_api"
+  },
+  "Seq": {
+    "ServerUrl": "http://seq-svc:5341",
+    "ApiKey": ""
   }
 }

src/FrontOffice.BFF.WebApi/appsettings.json

@@ -10,8 +10,8 @@
     }
   },
   "GrpcChannelOptions": {
-    "CMSMSAddress": "http://cms-svc",
-    "PYMSMSAddress": "https://ipg.afrino.co" 
+    "CMSMSAddress": "https://cms.se.kbs1.ir",
+    "PYMSMSAddress": "https://ipg.afrino.co"
   },
   "CmsSignalR": {
     "HubPath": "/hubs/token-notification"

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

@@ -27,7 +27,7 @@
         <PropertyGroup>
             <NugetPackagePath>$(PackageOutputPath)$(PackageId).$(Version).nupkg</NugetPackagePath>
             <PushCommand>
-                dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate
+                dotnet nuget push **/*.nupkg --source http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json --api-key admin:87zH26nbqT --skip-duplicate
             </PushCommand>
         </PropertyGroup>
 

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

@@ -27,7 +27,7 @@
     <PropertyGroup>
       <NugetPackagePath>$(PackageOutputPath)$(PackageId).$(Version).nupkg</NugetPackagePath>
       <PushCommand>
-        dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate
+        dotnet nuget push **/*.nupkg --source http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json --api-key admin:87zH26nbqT --skip-duplicate
       </PushCommand>
     </PropertyGroup>
     <Exec Command="$(PushCommand)" />

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

@@ -26,7 +26,7 @@
         <PropertyGroup>
             <NugetPackagePath>$(PackageOutputPath)$(PackageId).$(Version).nupkg</NugetPackagePath>
             <PushCommand>
-                dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate
+                dotnet nuget push **/*.nupkg --source http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json --api-key admin:87zH26nbqT --skip-duplicate
             </PushCommand>
         </PropertyGroup>
 

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.3</Version>
+    <Version>0.0.6</Version>
     <PackageId>Foursat.FrontOffice.BFF.Commission.Protobuf</PackageId>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <DebugSymbols>False</DebugSymbols>
@@ -26,7 +26,7 @@
         <PropertyGroup>
             <NugetPackagePath>$(PackageOutputPath)$(PackageId).$(Version).nupkg</NugetPackagePath>
             <PushCommand>
-                dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate
+                dotnet nuget push **/*.nupkg --source http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json --api-key admin:87zH26nbqT --skip-duplicate
             </PushCommand>
         </PropertyGroup>
 

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

@@ -63,10 +63,9 @@ message CommissionPayoutModel
     int32 balances_earned = 4;
     int64 total_amount = 5;
     string amount_formatted = 6;
-    string status = 7;
-    string status_badge_color = 8;
-    google.protobuf.Timestamp calculated_date = 9;
-    string date_persian = 10;
+    int32 status = 7;  // 0=Pending, 1=Paid, 2=WithdrawRequested, 3=Withdrawn, 4=PaymentFailed, 5=Cancelled
+    google.protobuf.Timestamp calculated_date = 8;
+    string date_persian = 9;
 }
 
 // ============ GetMyWeeklyBalances ============
@@ -92,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 ============

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

@@ -30,7 +30,7 @@
         <PropertyGroup>
             <NugetPackagePath>$(PackageOutputPath)$(PackageId).$(Version).nupkg</NugetPackagePath>
             <PushCommand>
-                dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate
+                dotnet nuget push **/*.nupkg --source http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json --api-key admin:87zH26nbqT --skip-duplicate
             </PushCommand>
         </PropertyGroup>
 

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

@@ -26,7 +26,7 @@
         <PropertyGroup>
             <NugetPackagePath>$(PackageOutputPath)$(PackageId).$(Version).nupkg</NugetPackagePath>
             <PushCommand>
-                dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate
+                dotnet nuget push **/*.nupkg --source http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json --api-key admin:87zH26nbqT --skip-duplicate
             </PushCommand>
         </PropertyGroup>
 

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

@@ -3,7 +3,7 @@
     <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>0.0.4</Version>
+    <Version>0.0.5</Version>
     <PackageId>Foursat.FrontOffice.BFF.NetworkMembership.Protobuf</PackageId>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <DebugSymbols>False</DebugSymbols>
@@ -26,7 +26,7 @@
         <PropertyGroup>
             <NugetPackagePath>$(PackageOutputPath)$(PackageId).$(Version).nupkg</NugetPackagePath>
             <PushCommand>
-                dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate
+                dotnet nuget push **/*.nupkg --source http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json --api-key admin:87zH26nbqT --skip-duplicate
             </PushCommand>
         </PropertyGroup>
 

src/Protobufs/FrontOffice.BFF.NetworkMembership.Protobuf/Protos/networkmembership.proto

@@ -76,6 +76,7 @@ message NetworkNodeModel
     google.protobuf.Timestamp joined_at = 11;
     bool is_club_active = 12;
     google.protobuf.Int64Value activation_week_definition_id = 13;
+    google.protobuf.StringValue referral_code = 14;
 }
 
 // ============ GetMyNetworkStatistics ============

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

@@ -30,7 +30,7 @@
         <PropertyGroup>
             <NugetPackagePath>$(PackageOutputPath)$(PackageId).$(Version).nupkg</NugetPackagePath>
             <PushCommand>
-                dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate
+                dotnet nuget push **/*.nupkg --source http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json --api-key admin:87zH26nbqT --skip-duplicate
             </PushCommand>
         </PropertyGroup>
 

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

@@ -27,7 +27,7 @@
         <PropertyGroup>
             <NugetPackagePath>$(PackageOutputPath)$(PackageId).$(Version).nupkg</NugetPackagePath>
             <PushCommand>
-                dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate
+                dotnet nuget push **/*.nupkg --source http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json --api-key admin:87zH26nbqT --skip-duplicate
             </PushCommand>
         </PropertyGroup>
 

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

@@ -27,7 +27,7 @@
         <PropertyGroup>
             <NugetPackagePath>$(PackageOutputPath)$(PackageId).$(Version).nupkg</NugetPackagePath>
             <PushCommand>
-                dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate
+                dotnet nuget push **/*.nupkg --source http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json --api-key admin:87zH26nbqT --skip-duplicate
             </PushCommand>
         </PropertyGroup>
 

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

@@ -30,7 +30,7 @@
         <PropertyGroup>
             <NugetPackagePath>$(PackageOutputPath)$(PackageId).$(Version).nupkg</NugetPackagePath>
             <PushCommand>
-                dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate
+                dotnet nuget push **/*.nupkg --source http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json --api-key admin:87zH26nbqT --skip-duplicate
             </PushCommand>
         </PropertyGroup>
 

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

@@ -30,7 +30,7 @@
         <PropertyGroup>
             <NugetPackagePath>$(PackageOutputPath)$(PackageId).$(Version).nupkg</NugetPackagePath>
             <PushCommand>
-                dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate
+                dotnet nuget push **/*.nupkg --source http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json --api-key admin:87zH26nbqT --skip-duplicate
             </PushCommand>
         </PropertyGroup>
 

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

@@ -30,7 +30,7 @@
         <PropertyGroup>
             <NugetPackagePath>$(PackageOutputPath)$(PackageId).$(Version).nupkg</NugetPackagePath>
             <PushCommand>
-                dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate
+                dotnet nuget push **/*.nupkg --source http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json --api-key admin:87zH26nbqT --skip-duplicate
             </PushCommand>
         </PropertyGroup>
 

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

@@ -30,7 +30,7 @@
         <PropertyGroup>
             <NugetPackagePath>$(PackageOutputPath)$(PackageId).$(Version).nupkg</NugetPackagePath>
             <PushCommand>
-                dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate
+                dotnet nuget push **/*.nupkg --source http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json --api-key admin:87zH26nbqT --skip-duplicate
             </PushCommand>
         </PropertyGroup>
 

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

@@ -27,7 +27,7 @@
         <PropertyGroup>
             <NugetPackagePath>$(PackageOutputPath)$(PackageId).$(Version).nupkg</NugetPackagePath>
             <PushCommand>
-                dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate
+                dotnet nuget push **/*.nupkg --source http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json --api-key admin:87zH26nbqT --skip-duplicate
             </PushCommand>
         </PropertyGroup>