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
-  EXTERNAL_REGISTRY: git.foursat.afrino.co
+  REGISTRY: 194.5.195.53:30080
   IMAGE_NAME: admin/backoffice-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
-          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; 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/BackOffice.BFF.git .
-          git log -1 --format="%H %s"
 
       - name: Build Docker Image
         run: |
@@ -62,22 +54,15 @@ jobs:
           docker build -f BackOffice.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
-          echo "${{ secrets.KUBECONFIG_PROD }}" | base64 -d > ~/.kube/config
-          kubectl rollout restart deployment/backoffice-bff || echo "Deployment not found"
-          kubectl rollout status deployment/backoffice-bff --timeout=5m || echo "Rollout pending"
+          sshpass -p "${{ secrets.K8S_SSH_PASSWORD }}" ssh -o StrictHostKeyChecking=no root@${{ env.K8S_SERVER }} \
+            "kubectl rollout restart deployment/backoffice-bff && kubectl rollout status deployment/backoffice-bff --timeout=5m" || echo "Deployment pending"

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; }

src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalRequests/GetWithdrawalRequestsQueryHandler.cs

@@ -37,6 +37,35 @@ public class GetWithdrawalRequestsQueryHandler : IRequestHandler<GetWithdrawalRe
         }
 
         var response = await _context.Commissions.GetWithdrawalRequestsAsync(grpcRequest, cancellationToken: cancellationToken);
-        return response.Adapt<GetWithdrawalRequestsResponseDto>();
+        
+        return new GetWithdrawalRequestsResponseDto
+        {
+            MetaData = new MetaDataDto
+            {
+                TotalCount = (int)(response.MetaData?.TotalCount ?? 0),
+                PageSize = (int)(response.MetaData?.PageSize ?? request.PageSize),
+                CurrentPage = (int)(response.MetaData?.CurrentPage ?? request.PageIndex),
+                TotalPages = (int)(response.MetaData?.TotalPage ?? 0)
+            },
+            Models = response.Models.Select(m => new WithdrawalRequestDto
+            {
+                Id = m.Id,
+                UserId = m.UserId,
+                UserName = m.UserName,
+                WeekDefinitionId = m.WeekDefinitionId,
+                Amount = m.Amount,
+                Status = m.Status,
+                WithdrawalMethod = m.WithdrawalMethod,
+                IbanNumber = m.IbanNumber,
+                RequestedAt = m.RequestedAt?.ToDateTime() ?? DateTime.MinValue,
+                ProcessedAt = m.ProcessedAt?.ToDateTime(),
+                ProcessedBy = m.ProcessedBy,
+                Reason = m.Reason,
+                Created = m.Created?.ToDateTime() ?? DateTime.MinValue,
+                BankReferenceId = m.BankReferenceId,
+                BankTrackingCode = m.BankTrackingCode,
+                PaymentFailureReason = m.PaymentFailureReason
+            }).ToList()
+        };
     }
 }

src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalRequests/GetWithdrawalRequestsResponseDto.cs

@@ -11,18 +11,19 @@ public record WithdrawalRequestDto
     public long Id { get; init; }
     public long UserId { get; init; }
     public string UserName { get; init; } = string.Empty;
-    public string PhoneNumber { get; init; } = string.Empty;
+    public long WeekDefinitionId { get; init; }
     public long Amount { get; init; }
     public int Status { get; init; }
-    public string Method { get; init; } = "Bank";
-    public string? BankAccount { get; init; }
-    public string? BankName { get; init; }
+    public int WithdrawalMethod { get; init; }
+    public string? IbanNumber { get; init; }
+    public DateTime RequestedAt { get; init; }
+    public DateTime? ProcessedAt { get; init; }
+    public string? ProcessedBy { get; init; }
+    public string? Reason { get; init; }
+    public DateTime Created { get; init; }
     public string? BankReferenceId { get; init; }
     public string? BankTrackingCode { get; init; }
     public string? PaymentFailureReason { get; init; }
-    public DateTime RequestDate { get; init; }
-    public DateTime? ProcessedDate { get; init; }
-    public string? AdminNote { get; init; }
 }
 
 public record MetaDataDto

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<GetAllWeeklyPoolsResponse, GetAllWeeklyPoolsResponseDto>()
             .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<GetUserWeeklyBalancesResponse, GetUserWeeklyBalancesResponseDto>()
+            .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()
+            });
     }
 }

src/BackOffice.BFF.Domain/BackOffice.BFF.Domain.csproj

@@ -7,7 +7,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Afrino.FMSMicroservice.Protobuf" Version="0.0.122" />
-		<PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.161" />
+		<PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.162" />
         
 		<PackageReference Include="Google.Protobuf" Version="3.23.3" />
 		<PackageReference Include="Grpc.Net.ClientFactory" Version="2.54.0" />

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

@@ -3,6 +3,7 @@ using BackOffice.BFF.Application.CommissionCQ.Queries.GetAllWeeklyPools;
 using BackOffice.BFF.Application.CommissionCQ.Queries.GetUserWeeklyBalances;
 using BackOffice.BFF.Application.CommissionCQ.Queries.GetAvailableWeeks;
 using BackOffice.BFF.Application.CommissionCQ.Queries.GetUserPayouts;
+using BackOffice.BFF.Application.CommissionCQ.Queries.GetWithdrawalRequests;
 using BackOffice.BFF.Application.CommissionCQ.Commands.ProcessWithdrawal;
 using Foursat.BackOffice.BFF.Commission.Protos;
 using System.Collections.Generic;
@@ -120,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 
@@ -135,33 +141,38 @@ public class CommissionProfile : IRegister
             });
 
         // GetWithdrawalRequestsResponseDto -> GetWithdrawalRequestsResponse
-        // config.NewConfig<GetWithdrawalRequestsResponseDto, GetWithdrawalRequestsResponse>()
-        //     .MapWith(src => new GetWithdrawalRequestsResponse
-        //     {
-        //         MetaData = new BackOffice.BFF.Protobuf.Common.MetaData
-        //         {
-        //             CurrentPage = src.MetaData.CurrentPage,
-        //             PageSize = src.MetaData.PageSize,
-        //             TotalCount = src.MetaData.TotalCount,
-        //             TotalPage = src.MetaData.TotalPages
-        //         },
-        //         Models = { src.Models.Select(m => new WithdrawalRequestModel
-        //         {
-        //             Id = m.Id,
-        //             UserId = m.UserId,
-        //             UserName = m.UserName ?? string.Empty,
-        //             Amount = m.Amount,
-        //             Status = m.Status,
-        //             StatusDisplay = m.StatusDisplay ?? string.Empty,
-        //             RequestedAt = Timestamp.FromDateTime(DateTime.SpecifyKind(m.RequestedAt, DateTimeKind.Utc)),
-        //             ProcessedAt = m.ProcessedAt.HasValue 
-        //                 ? Timestamp.FromDateTime(DateTime.SpecifyKind(m.ProcessedAt.Value, DateTimeKind.Utc)) 
-        //                 : null,
-        //             ProcessedBy = m.ProcessedBy,
-        //             ProcessedByName = m.ProcessedByName ?? string.Empty,
-        //             RejectionReason = m.RejectionReason ?? string.Empty
-        //         }) }
-        //     });
+        config.NewConfig<GetWithdrawalRequestsResponseDto, GetWithdrawalRequestsResponse>()
+            .MapWith(src => new GetWithdrawalRequestsResponse
+            {
+                MetaData = new BackOffice.BFF.Protobuf.Common.MetaData
+                {
+                    CurrentPage = src.MetaData.CurrentPage,
+                    PageSize = src.MetaData.PageSize,
+                    TotalCount = src.MetaData.TotalCount,
+                    TotalPage = src.MetaData.TotalPages
+                },
+                Models = { src.Models.Select(m => new WithdrawalRequestModel
+                {
+                    Id = m.Id,
+                    UserId = m.UserId,
+                    UserName = m.UserName ?? string.Empty,
+                    WeekDefinitionId = m.WeekDefinitionId,
+                    Amount = m.Amount,
+                    Status = m.Status,
+                    WithdrawalMethod = m.WithdrawalMethod,
+                    IbanNumber = m.IbanNumber ?? string.Empty,
+                    RequestedAt = Timestamp.FromDateTime(DateTime.SpecifyKind(m.RequestedAt, DateTimeKind.Utc)),
+                    ProcessedAt = m.ProcessedAt.HasValue 
+                        ? Timestamp.FromDateTime(DateTime.SpecifyKind(m.ProcessedAt.Value, DateTimeKind.Utc)) 
+                        : null,
+                    ProcessedBy = m.ProcessedBy ?? string.Empty,
+                    Reason = m.Reason ?? string.Empty,
+                    Created = Timestamp.FromDateTime(DateTime.SpecifyKind(m.Created, DateTimeKind.Utc)),
+                    BankReferenceId = m.BankReferenceId ?? string.Empty,
+                    BankTrackingCode = m.BankTrackingCode ?? string.Empty,
+                    PaymentFailureReason = m.PaymentFailureReason ?? string.Empty
+                }) }
+            });
 
         // GetWithdrawalReportsResponseDto -> GetWithdrawalReportsResponse
         // config.NewConfig<GetWithdrawalReportsResponseDto, GetWithdrawalReportsResponse>()

src/BackOffice.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 ["BackOffice.BFF.WebApi/NuGet.config", "NuGet.config"]

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

@@ -6,7 +6,7 @@
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>
         <PackageId>Foursat.BackOffice.BFF.Commission.Protobuf</PackageId>
-        <Version>0.0.13</Version>
+        <Version>0.0.15</Version>
         <Authors>FourSat</Authors>
         <Company>FourSat</Company>
         <Product>BackOffice.BFF.Commission.Protobuf</Product>

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

@@ -279,15 +279,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