chore: Update production workflow to use Nexus registry (no proxy needed)

- Changed Dockerfile base images to use 194.5.195.53:32082 (Nexus)
- Updated workflow to use docker-sshpass image from Nexus
- Removed HTTP_PROXY/HTTPS_PROXY dependencies
- Changed deploy method to SSH instead of kubeconfig
- Registry: 194.5.195.53:30080 (Gitea internal)
- K8S Server: 45.149.79.127 (Production)

.gitea/workflows/prod-deploy.yml

@@ -6,55 +6,47 @@ on:
       - production
 
 env:
-  REGISTRY: gitea-svc:3000
+  REGISTRY: 194.5.195.53:30080
-  EXTERNAL_REGISTRY: git.foursat.afrino.co
   IMAGE_NAME: admin/frontoffice-bff
+  K8S_SERVER: 45.149.79.127
 
 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,45.149.79.127,194.5.195.53,10.0.0.0/8
     steps:
-      - 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"
-          chmod +x kubectl
-          mv kubectl /usr/local/bin/
-
       - 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:32082"]
           }
           DAEMON
-          mkdir -p ~/.docker
+          echo "🚀 Starting Docker daemon..."
-          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
           dockerd &
-          for i in $(seq 1 30); do docker info >/dev/null 2>&1 && break || sleep 2; done
+          
-    
+          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
+          
+          if ! docker info >/dev/null 2>&1; then
+            echo "❌ Docker daemon failed to start"
+            exit 1
+          fi
+
       - name: Checkout code
         run: |
           git clone --depth 1 --branch production http://gitea-svc:3000/admin/FrontOffice.BFF.git .
-          git log -1 --format="%H %s"
 
       - name: Build Docker Image
         run: |
@@ -62,22 +54,15 @@ jobs:
           docker build -f FrontOffice.BFF.WebApi/Dockerfile \
                        -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \
                        -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod \
-                       -t ${{ env.EXTERNAL_REGISTRY }}/${{ env.IMAGE_NAME }}:prod \
-                       --build-arg HTTP_PROXY=http://proxyuser:87zH26nbqT2@46.249.98.211:3128 \
-                       --build-arg HTTPS_PROXY=http://proxyuser:87zH26nbqT2@46.249.98.211:3128 \
                        .
 
       - name: Push to Registry
         run: |
-          echo "87zH26nbqT" | docker login ${{ env.REGISTRY }} -u admin --password-stdin
+          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 }}:prod
-          echo "87zH26nbqT" | docker login ${{ env.EXTERNAL_REGISTRY }} -u admin --password-stdin
+
-          docker push ${{ env.EXTERNAL_REGISTRY }}/${{ env.IMAGE_NAME }}:prod
-          
       - name: Deploy to Production
         run: |
-          mkdir -p ~/.kube
+          sshpass -p "${{ secrets.K8S_SSH_PASSWORD }}" ssh -o StrictHostKeyChecking=no root@${{ env.K8S_SERVER }} \
-          echo "${{ secrets.KUBECONFIG_PROD }}" | base64 -d > ~/.kube/config
+            "kubectl rollout restart deployment/frontoffice-bff && kubectl rollout status deployment/frontoffice-bff --timeout=5m" || echo "Deployment pending"
-          kubectl rollout restart deployment/frontoffice-bff || echo "Deployment not found"
-          kubectl rollout status deployment/frontoffice-bff --timeout=5m || echo "Rollout pending"

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,
+            LeftLegBalances = b.LeftLegTotal,      // Changed from LeftLegBalances
-            RightLegBalances = b.RightLegBalances,
+            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/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
 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/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 left_leg_balances = 4;      // مجموع پای چپ (NewMembers + Carryover)
-    int32 right_leg_balances = 5;
+    int32 right_leg_balances = 5;     // مجموع پای راست (NewMembers + Carryover)
-    int32 total_balances = 6;
+    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 ============