Merge branch 'kub-stage' into production

Deploy DiscountOrderService build fix.

.gitea/workflows/cms-stage.yml

@@ -1,46 +0,0 @@
-
-name: Push nuget and docker image Actions Workflow
-
-on:
-  push:
-    branches:        
-      - stage_new
-jobs:
-  Deploy:
-    runs-on: windows
-    steps:
-      - name: Checkout
-        uses: https://git.afrino.co/actions/checkout@v3
-      - name: Setup dotnet
-        uses: https://git.afrino.co/actions/setup-dotnet@v3
-        with:
-          dotnet-version: 7.0.x
-      
-      - name: Remove Package Source
-        run: dotnet nuget remove source FourSat
-        continue-on-error: true
-      - name: Add Package Source
-        run: dotnet nuget add source --name FourSat --username systemuser --password sZSA7PTiv3pUSQZ https://git.afrino.co/api/packages/FourSat/nuget/index.json --store-password-in-clear-text
-
-      - name: Install dependencies
-        run: dotnet restore ".\src\CMSMicroservice.WebApi\CMSMicroservice.WebApi.csproj"
-      - name: Build
-        run: dotnet build ".\src\CMSMicroservice.WebApi\CMSMicroservice.WebApi.csproj" --configuration Release --no-restore
-      - name: Test
-        run: dotnet test ".\src\CMSMicroservice.WebApi\CMSMicroservice.WebApi.csproj" --no-restore --verbosity normal
-      - name: Recycle Apppool
-        run: |
-          & "C:\Windows\System32\inetsrv\appcmd.exe" recycle apppool /apppool.name:cms.kbs1.ir
-        shell: powershell
-      - name: Stop Website
-        run: |
-          & "C:\Windows\System32\inetsrv\appcmd.exe" stop site /site.name:cms.kbs1.ir
-        shell: powershell
-      - name: Publish
-        run: dotnet publish ".\src\CMSMicroservice.WebApi\CMSMicroservice.WebApi.csproj" -c Release -o publish
-      - name: Copy Publish To IIS Directory
-        run: Get-ChildItem -Path "publish\*" | Copy-Item -Destination "E:\kbs1.ir\cms.kbs1.ir\" -Recurse -Force
-      - name: Start Website
-        run: |
-          & "C:\Windows\System32\inetsrv\appcmd.exe" start site /site.name:cms.kbs1.ir
-        shell: powershell

.gitea/workflows/kub-deploy.yml

@@ -6,15 +6,15 @@ on:
       - kub-stage
 
 env:
-  REGISTRY: 185.252.31.44:30080
+  REGISTRY: 194.5.195.53:30080
   IMAGE_NAME: admin/cms
-  K8S_SERVER: 185.252.31.44
+  K8S_SERVER: 194.5.195.53
 
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
     container:
-      image: 185.252.31.44:32082/docker-sshpass:latest
+      image: 194.5.195.53:32082/docker-sshpass:latest
       options: --privileged
     steps:
       - name: Start Docker daemon
@@ -22,7 +22,7 @@ jobs:
           mkdir -p /etc/docker
           cat > /etc/docker/daemon.json << 'DAEMON'
           {
-            "insecure-registries": ["185.252.31.44:30080", "185.252.31.44:32500", "185.252.31.44:32082"]
+            "insecure-registries": ["194.5.195.53:30080", "194.5.195.53:32500", "194.5.195.53:32082"]
           }
           DAEMON
           echo "🚀 Starting Docker daemon..."
@@ -52,14 +52,14 @@ jobs:
 
       - name: Login to Docker registries
         run: |
-          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login 185.252.31.44:32082 -u admin --password-stdin
+          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login 194.5.195.53:32082 -u admin --password-stdin
           echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u admin --password-stdin
 
       - name: Publish Protobuf packages
         run: |
           echo "📦 Publishing Protobuf packages..."
           docker run --rm --network host -e CI=true -v $(pwd):/src -w /src \
-            185.252.31.44:32082/dotnet/sdk:9.0 sh -c '
+            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" --configfile src/NuGet.config
@@ -93,11 +93,11 @@ jobs:
           
           # Apply config (Secret) first, then deployment
           sshpass -e ssh -o StrictHostKeyChecking=no root@${{ env.K8S_SERVER }} "
-            kubectl apply -n kbs-stage -f /tmp/cms-config.yaml &&
-            kubectl apply -n kbs-stage -f /tmp/cms-deployment.yaml &&
+            kubectl apply -f /tmp/cms-config.yaml &&
+            kubectl apply -f /tmp/cms-deployment.yaml &&
             crictl rmi ${REGISTRY}/${IMAGE_NAME}:latest 2>/dev/null || true &&
-            kubectl -n kbs-stage rollout restart deployment/cms &&
-            kubectl -n kbs-stage rollout status deployment/cms --timeout=180s &&
+            kubectl rollout restart deployment/cms &&
+            kubectl rollout status deployment/cms --timeout=180s &&
             rm -f /tmp/cms-config.yaml /tmp/cms-deployment.yaml
           "
           echo "✅ Deployed!"

.gitea/workflows/prod-deploy.yml

@@ -6,7 +6,7 @@ on:
       - production
 
 env:
-  REGISTRY: 185.252.31.44:30080
+  REGISTRY: 194.5.195.53:30080
   IMAGE_NAME: admin/cms
   K8S_SERVER: 45.149.79.127
 
@@ -14,7 +14,7 @@ jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
     container:
-      image: 185.252.31.44:32082/docker-sshpass:latest
+      image: 194.5.195.53:32082/docker-sshpass:latest
       options: --privileged
     steps:
       - name: Start Docker daemon
@@ -22,7 +22,7 @@ jobs:
           mkdir -p /etc/docker
           cat > /etc/docker/daemon.json << 'DAEMON'
           {
-            "insecure-registries": ["185.252.31.44:30080", "185.252.31.44:32500", "185.252.31.44:32082"]
+            "insecure-registries": ["194.5.195.53:30080", "194.5.195.53:32500", "194.5.195.53:32082"]
           }
           DAEMON
           echo "🚀 Starting Docker daemon..."
@@ -40,7 +40,7 @@ jobs:
           done
           
           if ! docker info >/dev/null 2>&1; then
-            echo "❌ Docker daemon failed to start after 3 minutes"
+            echo "❌ Docker daemon failed to start"
             exit 1
           fi
 
@@ -50,14 +50,14 @@ jobs:
 
       - name: Login to Docker registries
         run: |
-          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login 185.252.31.44:32082 -u admin --password-stdin
+          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login 194.5.195.53:32082 -u admin --password-stdin
           echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u admin --password-stdin
 
       - name: Publish Protobuf packages
         run: |
           echo "📦 Publishing Protobuf packages..."
           docker run --rm --network host -v $(pwd):/src -w /src \
-            185.252.31.44:32082/dotnet/sdk:9.0 sh -c '
+            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" --configfile src/NuGet.config
@@ -65,7 +65,7 @@ jobs:
                 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://185.252.31.44:32081/repository/foursat-nuget-hosted/index.json" \
+                    --source "http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json" \
                     --api-key "admin:87zH26nbqT" \
                     --skip-duplicate --allow-insecure-connections || true
                 done
@@ -75,8 +75,10 @@ jobs:
 
       - name: Build Docker Image
         run: |
-          DOCKER_BUILDKIT=0 docker build --network host -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \
-                       -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod .
+          DOCKER_BUILDKIT=0 docker build --network host \
+            -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \
+            -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod \
+            .
 
       - name: Push to Registry
         run: |

Dockerfile

@@ -1,4 +1,4 @@
-FROM 185.252.31.44:32082/dotnet/sdk:9.0 AS build
+FROM 194.5.195.53:32082/dotnet/sdk:9.0 AS build
 WORKDIR /src
 
 # Copy NuGet config first
@@ -11,7 +11,7 @@ COPY src/ ./
 RUN dotnet restore "CMSMicroservice.WebApi/CMSMicroservice.WebApi.csproj" --configfile NuGet.config
 RUN dotnet publish "CMSMicroservice.WebApi/CMSMicroservice.WebApi.csproj" -c Release -o /app/publish --no-restore
 
-FROM 185.252.31.44:32082/dotnet/aspnet:9.0 AS runtime
+FROM 194.5.195.53:32082/dotnet/aspnet:9.0 AS runtime
 WORKDIR /app
 COPY --from=build /app/publish .
 ENV ASPNETCORE_URLS=http://+:8080

README.md

@@ -1,4 +1,4 @@
 # CMS Microservice
 
-Documentation moved to [totalDoc/INDEX.md](../totalDoc/INDEX.md). 
-      
+Documentation moved to [totalDoc/INDEX.md](../totalDoc/INDEX.md).
+    

k8s/production/cms-config.yaml

@@ -24,24 +24,6 @@ stringData:
         "MerchantId": "4225d555-5fa9-4df0-9b61-1ce152cbbba8",
         "UseSandbox": false
       },
-      "TwentyCard": {
-        "BaseUrl": "https://gateway.20card.ir/ipg",
-        "TerminalId": "165674",
-        "TerminalUsername": "ea5y1biehi",
-        "TerminalPassword": "SaLamAT@1404!",
-        "CreditPortalUrl": "https://userpanel.20card.ir/",
-        "DefaultEmail": "info@kbs2.ir",
-        "Packages": {
-          "4": {
-            "GatewayAmountToman": 11200000,
-            "WalletCreditToman": 12656000
-          },
-          "1": {
-            "GatewayAmountToman": 11200000,
-            "WalletCreditToman": 12656000
-          }
-        }
-      },
       "CmsBaseUrl": "https://cms.kbs2.ir",
       "FrontOfficeBaseUrl": "https://kbs2.ir",
       "JwtSecurityKey": "TvlZVx5TJaHs8e9HgUdGzhGP2CIidoI444nAj+8+g7c=",

k8s/production/cms-deployment.yaml

@@ -35,7 +35,7 @@ spec:
     spec:
       containers:
       - name: cms
-        image: 185.252.31.44:30080/admin/cms:prod
+        image: 194.5.195.53:30080/admin/cms:prod
         imagePullPolicy: Always
         ports:
         - containerPort: 8080

k8s/staging/cms-config.yaml

@@ -11,7 +11,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: cms-appsettings
-  namespace: kbs-stage
+  namespace: default
   labels:
     app: cms
     environment: staging
@@ -24,25 +24,6 @@ stringData:
         "MerchantId": "4225d555-5fa9-4df0-9b61-1ce152cbbba8",
         "UseSandbox": true
       },
-      "TwentyCard": {
-        "BaseUrl": "https://gateway.20card.ir/ipg",
-        "TerminalId": "165674",
-        "TerminalUsername": "ea5y1biehi",
-        "TerminalPassword": "SaLamAT@1404!",
-        "CreditPortalUrl": "https://userpanel.20card.ir/",
-        "CallbackBaseUrl": "https://kbs2.ir",
-        "DefaultEmail": "info@kbs2.ir",
-        "Packages": {
-          "4": {
-            "GatewayAmountToman": 11200000,
-            "WalletCreditToman": 12656000
-          },
-          "1": {
-            "GatewayAmountToman": 11200000,
-            "WalletCreditToman": 12656000
-          }
-        }
-      },
       "CmsBaseUrl": "https://cms.se.kbs1.ir",
       "FrontOfficeBaseUrl": "https://frontoffice.se.kbs1.ir",
       "FMS": {
@@ -53,7 +34,7 @@ stringData:
       "JwtAudience": "https://localhost",
       "JwtExpiryInDays": 5,
       "ConnectionStrings": {
-        "DefaultConnection": "Data Source=mssql-svc.platform.svc.cluster.local,1433; Initial Catalog=Foursat;User ID=sa;Password=87zH26nbqT;Connection Timeout=300000;MultipleActiveResultSets=True;Encrypt=False",
+        "DefaultConnection": "Data Source=194.5.195.53,31433; Initial Catalog=Foursat;User ID=sa;Password=87zH26nbqT;Connection Timeout=300000;MultipleActiveResultSets=True;Encrypt=False",
         "providerName": "System.Data.SqlClient"
       },
       "Otp": {

k8s/staging/cms-deployment.yaml

@@ -4,14 +4,12 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: cms-uploads-pvc
-  namespace: kbs-stage
+  namespace: default
   labels:
     app: cms
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: migrated-local
-  volumeName: pv-cms-uploads-migrated
   resources:
     requests:
       storage: 20Gi
@@ -22,7 +20,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: cms
-  namespace: kbs-stage
+  namespace: default
   labels:
     app: cms
 spec:
@@ -35,12 +33,10 @@ spec:
       labels:
         app: cms
     spec:
-      imagePullSecrets:
-      - name: gitea-registry-secret
       containers:
       - name: cms
-        image: 185.252.31.44:30080/admin/cms:latest
-        imagePullPolicy: IfNotPresent
+        image: 194.5.195.53:30080/admin/cms:latest
+        imagePullPolicy: Always
         ports:
         - containerPort: 8080
           name: http
@@ -93,7 +89,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: cms-svc
-  namespace: kbs-stage
+  namespace: default
 spec:
   selector:
     app: cms
@@ -111,7 +107,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: cms-ingress
-  namespace: kbs-stage
+  namespace: default
   annotations:
     kubernetes.io/ingress.class: "nginx"
     cert-manager.io/cluster-issuer: "letsencrypt-prod"
@@ -119,7 +115,6 @@ metadata:
     nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
     nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
 spec:
-  ingressClassName: nginx
   tls:
   - hosts:
     - cms.se.kbs1.ir

scripts/usp_CleanupTestUser.sql

@@ -1,340 +0,0 @@
-/*
-  Cleanup all side-effects of a test FrontOffice user (register + package + club + wallet + invitations).
-
-  Usage:
-    EXEC dbo.usp_CleanupTestUser @Mobile = N'09037437157', @DryRun = 1;
-    EXEC dbo.usp_CleanupTestUser @Mobile = N'09037437157';
-    EXEC dbo.usp_CleanupTestUser @Mobile = N'09...', @ReparentChildren = 1;
-    EXEC dbo.usp_CleanupTestUser @Mobile = N'09...', @ReversePool = 1, @AbortIfPoolCalculated = 1;
-
-  Pool reverse: for each ClubMembershipCycle, subtract Packages.ActivationFee
-  (fallback: ClubMembership.InitialContribution) from CMS.WeeklyCommissionPools
-  for matching WeekDefinition × PackageId.
-
-  Does NOT delete pool rows (shared). Does NOT claw back commission already paid to OTHER users.
-  Does NOT touch: Packages master, Contracts master, WeekDefinitions, Roles, catalogs.
-*/
-CREATE OR ALTER PROCEDURE dbo.usp_CleanupTestUser
-    @UserId                 BIGINT        = NULL,
-    @Mobile                 NVARCHAR(20)  = NULL,
-    @HardDeleteUser         BIT           = 1,
-    @ReparentChildren       BIT           = 0,
-    @ReversePool            BIT           = 1,
-    @AbortIfPoolCalculated  BIT           = 0,
-    @DryRun                 BIT           = 0
-AS
-BEGIN
-    SET NOCOUNT ON;
-    SET XACT_ABORT ON;
-    SET QUOTED_IDENTIFIER ON;
-    SET ANSI_NULLS ON;
-
-    IF @UserId IS NULL AND (@Mobile IS NULL OR LTRIM(RTRIM(@Mobile)) = N'')
-    BEGIN
-        RAISERROR(N'Provide @UserId and/or @Mobile.', 16, 1);
-        RETURN;
-    END;
-
-    DECLARE @MobileNorm NVARCHAR(20) = NULL;
-    IF @Mobile IS NOT NULL
-    BEGIN
-        SET @MobileNorm = LTRIM(RTRIM(@Mobile));
-        IF LEFT(@MobileNorm, 3) = N'+98' SET @MobileNorm = N'0' + SUBSTRING(@MobileNorm, 4, 20);
-        IF LEFT(@MobileNorm, 2) = N'98' AND LEN(@MobileNorm) = 12 SET @MobileNorm = N'0' + SUBSTRING(@MobileNorm, 3, 20);
-        IF LEFT(@MobileNorm, 1) = N'9' AND LEN(@MobileNorm) = 10 SET @MobileNorm = N'0' + @MobileNorm;
-    END;
-
-    IF @UserId IS NULL
-    BEGIN
-        SELECT TOP (1) @UserId = Id
-        FROM CMS.Users
-        WHERE Mobile = @MobileNorm
-           OR Mobile = @Mobile
-           OR REPLACE(Mobile, N'+98', N'0') = @MobileNorm
-        ORDER BY IsDeleted ASC, Id DESC;
-    END;
-
-    IF @UserId IS NULL
-    BEGIN
-        RAISERROR(N'User not found for given @UserId/@Mobile.', 16, 1);
-        RETURN;
-    END;
-
-    DECLARE @UserMobile NVARCHAR(20);
-    SELECT @UserMobile = Mobile FROM CMS.Users WHERE Id = @UserId;
-    IF @UserMobile IS NULL
-    BEGIN
-        RAISERROR(N'UserId %I64d not found.', 16, 1, @UserId);
-        RETURN;
-    END;
-
-    DECLARE @ChildCount INT =
-        (SELECT COUNT(*) FROM CMS.Users WHERE NetworkParentId = @UserId AND IsDeleted = 0);
-
-    IF @ChildCount > 0 AND @ReparentChildren = 0 AND @HardDeleteUser = 1
-    BEGIN
-        RAISERROR(N'User has %d active network children. Pass @ReparentChildren=1 or soft-delete only.', 16, 1, @ChildCount);
-        RETURN;
-    END;
-
-    PRINT N'=== usp_CleanupTestUser ===';
-    PRINT N'UserId=' + CAST(@UserId AS NVARCHAR(20)) + N' Mobile=' + ISNULL(@UserMobile, N'?')
-        + N' DryRun=' + CAST(@DryRun AS NVARCHAR(1))
-        + N' ReversePool=' + CAST(@ReversePool AS NVARCHAR(1));
-
-    DECLARE @Wallets TABLE (WalletId BIGINT PRIMARY KEY);
-    INSERT INTO @Wallets (WalletId)
-    SELECT Id FROM CMS.UserWallets WHERE UserId = @UserId;
-
-    DECLARE @Tx TABLE (TransactionId BIGINT PRIMARY KEY);
-    INSERT INTO @Tx (TransactionId)
-    SELECT DISTINCT x.TransactionId
-    FROM (
-        SELECT TransactionId FROM CMS.UserPackagePurchases WHERE UserId = @UserId AND TransactionId IS NOT NULL
-        UNION
-        SELECT TransactionId FROM CMS.PaymentTransactions WHERE UserId = @UserId AND TransactionId IS NOT NULL
-        UNION
-        SELECT TransactionId FROM CMS.UserOrders WHERE UserId = @UserId AND TransactionId IS NOT NULL
-        UNION
-        SELECT TransactionId FROM CMS.ManualPayments WHERE UserId = @UserId AND TransactionId IS NOT NULL
-        UNION
-        SELECT TransactionId FROM CMS.DayaLoanContracts WHERE UserId = @UserId AND TransactionId IS NOT NULL
-        UNION
-        SELECT TransactionId FROM CMS.DiscountOrders WHERE UserId = @UserId AND TransactionId IS NOT NULL
-        UNION
-        SELECT h.RefrenceId
-        FROM CMS.UserWalletHistories h
-        INNER JOIN @Wallets w ON w.WalletId = h.WalletId
-        WHERE h.RefrenceId IS NOT NULL
-    ) x
-    WHERE x.TransactionId IS NOT NULL;
-
-    DECLARE @Orders TABLE (OrderId BIGINT PRIMARY KEY);
-    INSERT INTO @Orders (OrderId)
-    SELECT Id FROM CMS.UserOrders WHERE UserId = @UserId;
-
-    DECLARE @DiscountOrders TABLE (DiscountOrderId BIGINT PRIMARY KEY);
-    INSERT INTO @DiscountOrders (DiscountOrderId)
-    SELECT Id FROM CMS.DiscountOrders WHERE UserId = @UserId;
-
-    DECLARE @ClubMemberships TABLE (ClubMembershipId BIGINT PRIMARY KEY);
-    INSERT INTO @ClubMemberships (ClubMembershipId)
-    SELECT Id FROM CMS.ClubMemberships WHERE UserId = @UserId;
-
-    DECLARE @Cycles TABLE (CycleId BIGINT PRIMARY KEY);
-    INSERT INTO @Cycles (CycleId)
-    SELECT Id FROM CMS.ClubMembershipCycles WHERE UserId = @UserId
-    UNION
-    SELECT Id FROM CMS.ClubMembershipCycles WHERE ClubMembershipId IN (SELECT ClubMembershipId FROM @ClubMemberships);
-
-    DECLARE @Payouts TABLE (PayoutId BIGINT PRIMARY KEY);
-    INSERT INTO @Payouts (PayoutId)
-    SELECT Id FROM CMS.UserCommissionPayouts WHERE UserId = @UserId;
-
-    DECLARE @PoolReversals TABLE (
-        CycleId BIGINT,
-        PackageId BIGINT,
-        WeekDefinitionId BIGINT NULL,
-        PoolId BIGINT NULL,
-        Fee BIGINT,
-        PoolAmountBefore BIGINT NULL,
-        IsCalculated BIT NULL,
-        Note NVARCHAR(200)
-    );
-
-    INSERT INTO @PoolReversals (CycleId, PackageId, WeekDefinitionId, PoolId, Fee, PoolAmountBefore, IsCalculated, Note)
-    SELECT
-        c.Id,
-        c.PackageId,
-        wd.Id,
-        wp.Id,
-        ISNULL(NULLIF(cm.InitialContribution, 0), ISNULL(p.ActivationFee, 0)),
-        wp.TotalPoolAmount,
-        wp.IsCalculated,
-        CASE
-            WHEN wd.Id IS NULL THEN N'NO_WEEK_MATCH'
-            WHEN wp.Id IS NULL THEN N'NO_POOL_ROW'
-            WHEN wp.IsCalculated = 1 THEN N'POOL_ALREADY_CALCULATED'
-            ELSE N'OK'
-        END
-    FROM CMS.ClubMembershipCycles c
-    LEFT JOIN CMS.ClubMemberships cm ON cm.Id = c.ClubMembershipId
-    LEFT JOIN CMS.Packages p ON p.Id = c.PackageId
-    LEFT JOIN CMS.WeekDefinitions wd
-        ON CAST(c.PackagePurchasedAt AS DATE) >= CAST(wd.StartDate AS DATE)
-       AND CAST(c.PackagePurchasedAt AS DATE) <= CAST(wd.EndDate AS DATE)
-       AND wd.IsDeleted = 0
-    LEFT JOIN CMS.WeeklyCommissionPools wp
-        ON wp.WeekDefinitionId = wd.Id
-       AND wp.PackageId = c.PackageId
-       AND wp.IsDeleted = 0
-    WHERE c.Id IN (SELECT CycleId FROM @Cycles);
-
-    SELECT N'Users' AS Entity, COUNT(*) AS Cnt FROM CMS.Users WHERE Id = @UserId
-    UNION ALL SELECT N'OtpTokens', COUNT(*) FROM CMS.OtpTokens WHERE Mobile IN (@UserMobile, @MobileNorm, @Mobile)
-    UNION ALL SELECT N'UserInvitations', COUNT(*) FROM CMS.UserInvitations WHERE InviterUserId = @UserId OR InviteeUserId = @UserId
-    UNION ALL SELECT N'ClubMemberships', COUNT(*) FROM @ClubMemberships
-    UNION ALL SELECT N'ClubMembershipCycles', COUNT(*) FROM @Cycles
-    UNION ALL SELECT N'UserPackagePurchases', COUNT(*) FROM CMS.UserPackagePurchases WHERE UserId = @UserId
-    UNION ALL SELECT N'PaymentTransactions', COUNT(*) FROM CMS.PaymentTransactions WHERE UserId = @UserId OR Mobile = @UserMobile
-    UNION ALL SELECT N'UserWallets', COUNT(*) FROM @Wallets
-    UNION ALL SELECT N'UserWalletHistories', COUNT(*) FROM CMS.UserWalletHistories WHERE WalletId IN (SELECT WalletId FROM @Wallets)
-    UNION ALL SELECT N'Transactions(collected)', COUNT(*) FROM @Tx
-    UNION ALL SELECT N'NetworkChildren', @ChildCount
-    UNION ALL SELECT N'UserOrders', COUNT(*) FROM @Orders
-    UNION ALL SELECT N'DiscountOrders', COUNT(*) FROM @DiscountOrders
-    UNION ALL SELECT N'UserCommissionPayouts', COUNT(*) FROM @Payouts
-    UNION ALL SELECT N'PoolReversals(planned)', COUNT(*) FROM @PoolReversals WHERE Fee > 0;
-
-    SELECT N'--- Pool reverse plan ---' AS Info;
-    SELECT * FROM @PoolReversals;
-
-    IF @ReversePool = 1 AND @AbortIfPoolCalculated = 1
-       AND EXISTS (SELECT 1 FROM @PoolReversals WHERE IsCalculated = 1 AND Fee > 0)
-    BEGIN
-        RAISERROR(N'One or more target weekly pools are already calculated. Aborting (@AbortIfPoolCalculated=1).', 16, 1);
-        RETURN;
-    END;
-
-    IF @DryRun = 1
-    BEGIN
-        PRINT N'DryRun=1 — no changes committed.';
-        RETURN;
-    END;
-
-    BEGIN TRANSACTION;
-
-    BEGIN TRY
-        /* ---- Reverse weekly pool charges FIRST (needs cycle + package data) ---- */
-        IF @ReversePool = 1
-        BEGIN
-            UPDATE wp
-            SET wp.TotalPoolAmount = CASE
-                    WHEN wp.TotalPoolAmount >= r.Fee THEN wp.TotalPoolAmount - r.Fee
-                    ELSE 0
-                END,
-                wp.LastModified = SYSUTCDATETIME()
-            FROM CMS.WeeklyCommissionPools wp
-            INNER JOIN (
-                SELECT PoolId, SUM(Fee) AS Fee
-                FROM @PoolReversals
-                WHERE PoolId IS NOT NULL AND Fee > 0
-                GROUP BY PoolId
-            ) r ON r.PoolId = wp.Id;
-
-            PRINT N'Pool reverse applied for ' + CAST(@@ROWCOUNT AS NVARCHAR(20)) + N' pool row(s).';
-        END;
-
-        /* ---- Club ---- */
-        DELETE h FROM CMS.ClubMembershipCycleHistories h
-        WHERE h.UserId = @UserId OR h.ClubMembershipCycleId IN (SELECT CycleId FROM @Cycles);
-
-        DELETE FROM CMS.ClubMembershipCycles
-        WHERE Id IN (SELECT CycleId FROM @Cycles) OR UserId = @UserId;
-
-        DELETE FROM CMS.ClubMembershipHistories WHERE UserId = @UserId
-           OR ClubMembershipId IN (SELECT ClubMembershipId FROM @ClubMemberships);
-
-        DELETE FROM CMS.UserClubFeatures WHERE UserId = @UserId
-           OR ClubMembershipId IN (SELECT ClubMembershipId FROM @ClubMemberships);
-
-        DELETE FROM CMS.ClubMemberships WHERE UserId = @UserId;
-
-        /* ---- Commission payouts of THIS user only ---- */
-        DELETE h FROM CMS.CommissionPayoutHistories h
-        WHERE h.UserId = @UserId OR h.UserCommissionPayoutId IN (SELECT PayoutId FROM @Payouts);
-
-        DELETE FROM CMS.UserCommissionPayouts WHERE UserId = @UserId;
-
-        /* ---- Network ---- */
-        DELETE FROM CMS.NetworkWeeklyBalances WHERE UserId = @UserId;
-        DELETE FROM CMS.NetworkMembershipHistories
-        WHERE UserId = @UserId OR OldParentId = @UserId OR NewParentId = @UserId;
-
-        IF @ChildCount > 0 AND @ReparentChildren = 1
-            UPDATE CMS.Users SET NetworkParentId = NULL, LastModified = SYSUTCDATETIME()
-            WHERE NetworkParentId = @UserId;
-
-        /* ---- Invitations ---- */
-        DELETE FROM CMS.UserInvitations
-        WHERE InviterUserId = @UserId OR InviteeUserId = @UserId;
-
-        /* ---- Package / payment ---- */
-        DELETE FROM CMS.UserPackagePurchases WHERE UserId = @UserId;
-        DELETE FROM CMS.PaymentTransactions
-        WHERE UserId = @UserId OR Mobile = @UserMobile OR Mobile = @MobileNorm;
-
-        /* ---- Manual / Daya ---- */
-        DELETE FROM CMS.ManualPayments WHERE UserId = @UserId;
-        DELETE FROM CMS.DayaLoanContracts WHERE UserId = @UserId;
-
-        /* ---- Discount shop ---- */
-        DELETE d FROM CMS.DiscountOrderDetails d
-        WHERE d.DiscountOrderId IN (SELECT DiscountOrderId FROM @DiscountOrders);
-        DELETE FROM CMS.DiscountOrders WHERE UserId = @UserId;
-        DELETE FROM CMS.DiscountShoppingCarts WHERE UserId = @UserId;
-
-        /* ---- Stock ---- */
-        DELETE FROM CMS.StockMovements
-        WHERE PerformedByUserId = @UserId
-           OR OrderId IN (SELECT OrderId FROM @Orders)
-           OR DiscountOrderId IN (SELECT DiscountOrderId FROM @DiscountOrders);
-
-        /* ---- Orders ---- */
-        DELETE FROM CMS.FactorDetails WHERE OrderId IN (SELECT OrderId FROM @Orders);
-        DELETE FROM CMS.OrderVATs WHERE OrderId IN (SELECT OrderId FROM @Orders);
-        DELETE FROM CMS.UserOrders WHERE UserId = @UserId;
-
-        /* ---- Wallet ---- */
-        DELETE FROM CMS.UserWalletHistories WHERE WalletId IN (SELECT WalletId FROM @Wallets);
-        DELETE FROM CMS.UserWallets WHERE UserId = @UserId;
-
-        /* ---- Cart / address / roles / contracts ---- */
-        DELETE FROM CMS.UserCarts WHERE UserId = @UserId;
-        DELETE FROM CMS.UserAddresses WHERE UserId = @UserId;
-        DELETE FROM CMS.UserRoles WHERE UserId = @UserId;
-        DELETE FROM CMS.UserContracts WHERE UserId = @UserId;
-
-        /* ---- Content authored by test user ---- */
-        UPDATE CMS.BlogPosts SET IsDeleted = 1, LastModified = SYSUTCDATETIME()
-        WHERE AuthorUserId = @UserId AND IsDeleted = 0;
-
-        UPDATE CMS.PublicMessages SET IsDeleted = 1, LastModified = SYSUTCDATETIME()
-        WHERE CreatedByUserId = @UserId AND IsDeleted = 0;
-
-        /* ---- Transactions ---- */
-        DELETE t
-        FROM CMS.Transactions t
-        WHERE t.Id IN (SELECT TransactionId FROM @Tx)
-          AND NOT EXISTS (SELECT 1 FROM CMS.UserPackagePurchases p WHERE p.TransactionId = t.Id)
-          AND NOT EXISTS (SELECT 1 FROM CMS.PaymentTransactions p WHERE p.TransactionId = t.Id)
-          AND NOT EXISTS (SELECT 1 FROM CMS.UserOrders o WHERE o.TransactionId = t.Id)
-          AND NOT EXISTS (SELECT 1 FROM CMS.ManualPayments m WHERE m.TransactionId = t.Id)
-          AND NOT EXISTS (SELECT 1 FROM CMS.DayaLoanContracts d WHERE d.TransactionId = t.Id)
-          AND NOT EXISTS (SELECT 1 FROM CMS.DiscountOrders d WHERE d.TransactionId = t.Id);
-
-        /* ---- OTP ---- */
-        DELETE FROM CMS.OtpTokens
-        WHERE Mobile IN (@UserMobile, @MobileNorm, ISNULL(@Mobile, N''));
-
-        /* ---- User ---- */
-        IF @HardDeleteUser = 1
-            DELETE FROM CMS.Users WHERE Id = @UserId;
-        ELSE
-            UPDATE CMS.Users
-            SET IsDeleted = 1, LastModified = SYSUTCDATETIME()
-            WHERE Id = @UserId;
-
-        COMMIT TRANSACTION;
-
-        PRINT N'Cleanup completed successfully.';
-        SELECT N'DONE' AS Status, @UserId AS UserId, @UserMobile AS Mobile,
-               @HardDeleteUser AS HardDeleted, @ReversePool AS PoolReversed;
-    END TRY
-    BEGIN CATCH
-        IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION;
-        DECLARE @Err NVARCHAR(4000) = ERROR_MESSAGE();
-        RAISERROR(N'Cleanup failed: %s', 16, 1, @Err);
-    END CATCH
-END;
-GO

src/CMSMicroservice.Application/CMSMicroservice.Application.csproj

@@ -15,7 +15,6 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.11" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.11" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.11" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.11" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.4.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.10" />
       <PackageReference Include="DateTimeConverterCL" Version="1.0.0" />

src/CMSMicroservice.Application/Common/Interfaces/IApplicationDbContext.cs

@@ -21,7 +21,6 @@ public interface IApplicationDbContext
     DbSet<Product> Products { get; }
     DbSet<ProductImage> ProductImages { get; }
     DbSet<User> Users { get; }
-    DbSet<UserInvitation> UserInvitations { get; }
     DbSet<OtpToken> OtpTokens { get; }
     DbSet<Contract> Contracts { get; }
     DbSet<UserContract> UserContracts { get; }

src/CMSMicroservice.Application/Common/Interfaces/IPaymentGatewayResolver.cs

@@ -1,9 +0,0 @@
-namespace CMSMicroservice.Application.Common.Interfaces;
-
-/// <summary>
-/// Resolve payment gateway by provider key (zarinpal, 20card, …).
-/// </summary>
-public interface IPaymentGatewayResolver
-{
-    IPaymentGatewayService Get(string? provider);
-}

src/CMSMicroservice.Application/Common/Interfaces/IPaymentGatewayService.cs

@@ -98,26 +98,6 @@ public class PaymentRequest
     /// URL بازگشت بعد از پرداخت
     /// </summary>
     public string CallbackUrl { get; set; } = string.Empty;
-
-    /// <summary>
-    /// نام پرداخت‌کننده (برای درگاه‌هایی مثل ۲۰کارت)
-    /// </summary>
-    public string Name { get; set; } = string.Empty;
-
-    /// <summary>
-    /// شماره فاکتور / سفارش
-    /// </summary>
-    public string Invoice { get; set; } = string.Empty;
-
-    /// <summary>
-    /// ایمیل (اختیاری — برای ۲۰کارت)
-    /// </summary>
-    public string? Email { get; set; }
-
-    /// <summary>
-    /// کد ملی (اختیاری — برای ۲۰کارت)
-    /// </summary>
-    public string? NationalId { get; set; }
 }
 
 /// <summary>

src/CMSMicroservice.Application/PackageCQ/Commands/VerifyUserPackagePurchasePayment/VerifyUserPackagePurchasePaymentCommandHandler.cs

@@ -8,7 +8,6 @@ using CMSMicroservice.Domain.Entities.Payment;
 using CMSMicroservice.Domain.Enums;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
 namespace CMSMicroservice.Application.PackageCQ.Commands.VerifyUserPackagePurchasePayment;
@@ -17,23 +16,20 @@ public class VerifyUserPackagePurchasePaymentCommandHandler
     : IRequestHandler<VerifyUserPackagePurchasePaymentCommand, VerifyUserPackagePurchasePaymentResult>
 {
     private readonly IApplicationDbContext _context;
-    private readonly IPaymentGatewayResolver _paymentGatewayResolver;
-    private readonly IConfiguration _configuration;
+    private readonly IPaymentGatewayService _paymentGateway;
     private readonly ISender _sender;
     private readonly IUserPaymentLock _paymentLock;
     private readonly ILogger<VerifyUserPackagePurchasePaymentCommandHandler> _logger;
 
     public VerifyUserPackagePurchasePaymentCommandHandler(
         IApplicationDbContext context,
-        IPaymentGatewayResolver paymentGatewayResolver,
-        IConfiguration configuration,
+        IPaymentGatewayService paymentGateway,
         ISender sender,
         IUserPaymentLock paymentLock,
         ILogger<VerifyUserPackagePurchasePaymentCommandHandler> logger)
     {
         _context = context;
-        _paymentGatewayResolver = paymentGatewayResolver;
-        _configuration = configuration;
+        _paymentGateway = paymentGateway;
         _sender = sender;
         _paymentLock = paymentLock;
         _logger = logger;
@@ -109,8 +105,7 @@ public class VerifyUserPackagePurchasePaymentCommandHandler
         }
 
         var amountInToman = paymentTx?.Amount ?? purchase.Amount;
-        var gateway = _paymentGatewayResolver.Get(paymentTx?.GatewayProvider);
-        var verifyResult = await gateway.VerifyPaymentAsync(
+        var verifyResult = await _paymentGateway.VerifyPaymentAsync(
             request.Authority, request.Status, (decimal)amountInToman, ct);
 
         if (!verifyResult.IsSuccess)
@@ -198,30 +193,17 @@ public class VerifyUserPackagePurchasePaymentCommandHandler
                 await _context.SaveChangesAsync(ct);
             }
 
-            var packagePrice = purchase.Package?.Price
+            var discountMultiplier = purchase.Package?.DiscountMultiplier
                 ?? throw new InvalidOperationException("پکیج سفارش یافت نشد");
-            var discountMultiplier = purchase.Package.DiscountMultiplier;
-            var discountAmount = (long)(packagePrice * (double)discountMultiplier);
-
-            var isTwentyCard = string.Equals(
-                paymentTx?.GatewayProvider, "20card", StringComparison.OrdinalIgnoreCase);
-            long balanceCredit = purchase.Amount;
-            if (isTwentyCard)
-            {
-                balanceCredit = _configuration.GetValue<long?>(
-                    $"TwentyCard:Packages:{purchase.PackageId}:WalletCreditToman") ?? 0;
-                if (balanceCredit <= 0)
-                    throw new InvalidOperationException("WalletCredit ۲۰کارت برای این پکیج پیکربندی نشده است");
-            }
-
-            wallet.Balance += balanceCredit;
+            var discountAmount = (long)(purchase.Amount * (double)discountMultiplier);
+            wallet.Balance += purchase.Amount;
             wallet.DiscountBalance += discountAmount;
 
             _context.UserWalletHistories.Add(new UserWalletHistory
             {
                 WalletId = wallet.Id,
                 CurrentBalance = wallet.Balance,
-                ChangeValue = balanceCredit,
+                ChangeValue = purchase.Amount,
                 CurrentNetworkBalance = wallet.NetworkBalance,
                 ChangeNerworkValue = 0,
                 CurrentDiscountBalance = wallet.DiscountBalance,

src/CMSMicroservice.Application/PaymentTransactionCQ/Queries/GetAllPaymentTransactionByFilter/GetAllPaymentTransactionByFilterQuery.cs

@@ -43,5 +43,4 @@ public class GetAllPaymentTransactionByFilterResponseModel
     public long? TransactionId { get; set; }
     public string? Description { get; set; }
     public DateTimeOffset Created { get; set; }
-    public string? UserFullName { get; set; }
 }

src/CMSMicroservice.Application/PaymentTransactionCQ/Queries/GetAllPaymentTransactionByFilter/GetAllPaymentTransactionByFilterQueryHandler.cs

@@ -19,43 +19,30 @@ public class GetAllPaymentTransactionByFilterQueryHandler
             .ApplyPaymentTransactionFilter(request.Filter)
             .ApplyOrder(sortBy: request.SortBy ?? "-Created");
 
-        var models = await (
-            from x in query.PaginatedListAsync(paginationState: request.PaginationState)
-            join u in _context.Users.AsNoTracking() on x.UserId equals u.Id into ug
-            from u in ug.DefaultIfEmpty()
-            select new GetAllPaymentTransactionByFilterResponseModel
-            {
-                Id = x.Id,
-                UserId = x.UserId,
-                Mobile = x.Mobile,
-                GatewayProvider = x.GatewayProvider,
-                Amount = x.Amount,
-                Authority = x.Authority,
-                PaymentStatus = x.PaymentStatus,
-                VerificationStatusCode = x.VerificationStatusCode,
-                VerificationStatusMessage = x.VerificationStatusMessage,
-                RefId = x.RefId,
-                CardPan = x.CardPan,
-                OrderId = x.OrderId,
-                TransactionId = x.TransactionId,
-                Description = x.Description,
-                Created = x.Created,
-                UserFullName = u != null
-                    ? ((u.FirstName ?? "") + " " + (u.LastName ?? "")).Trim()
-                    : null
-            })
-            .ToListAsync(cancellationToken);
-
-        foreach (var model in models)
-        {
-            if (string.IsNullOrWhiteSpace(model.UserFullName))
-                model.UserFullName = "—";
-        }
-
         return new GetAllPaymentTransactionByFilterResponseDto
         {
             MetaData = await query.GetMetaData(request.PaginationState, cancellationToken),
-            Models = models
+            Models = await query
+                .PaginatedListAsync(paginationState: request.PaginationState)
+                .Select(x => new GetAllPaymentTransactionByFilterResponseModel
+                {
+                    Id = x.Id,
+                    UserId = x.UserId,
+                    Mobile = x.Mobile,
+                    GatewayProvider = x.GatewayProvider,
+                    Amount = x.Amount,
+                    Authority = x.Authority,
+                    PaymentStatus = x.PaymentStatus,
+                    VerificationStatusCode = x.VerificationStatusCode,
+                    VerificationStatusMessage = x.VerificationStatusMessage,
+                    RefId = x.RefId,
+                    CardPan = x.CardPan,
+                    OrderId = x.OrderId,
+                    TransactionId = x.TransactionId,
+                    Description = x.Description,
+                    Created = x.Created
+                })
+                .ToListAsync(cancellationToken)
         };
     }
 }

src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterQueryHandler.cs

@@ -1,5 +1,3 @@
-using CMSMicroservice.Application.Common;
-
 namespace CMSMicroservice.Application.TransactionsCQ.Queries.GetAllTransactionsByFilter;
 
 public class GetAllTransactionsByFilterQueryHandler : IRequestHandler<GetAllTransactionsByFilterQuery, GetAllTransactionsByFilterResponseDto>
@@ -18,106 +16,23 @@ public class GetAllTransactionsByFilterQueryHandler : IRequestHandler<GetAllTran
             .ApplyTransactionFilter(request.Filter)
             .ApplyOrder(sortBy: request.SortBy ?? "-Created");
 
-        var models = await query
-            .PaginatedListAsync(paginationState: request.PaginationState)
-            .Select(x => new GetAllTransactionsByFilterResponseModel
-            {
-                Id = x.Id,
-                Amount = x.Amount,
-                Description = x.Description,
-                PaymentStatus = x.PaymentStatus,
-                PaymentDate = x.PaymentDate,
-                RefId = x.RefId,
-                Type = x.Type,
-                Created = x.Created
-            })
-            .ToListAsync(cancellationToken);
-
-        await PopulateUserInfoAsync(models, cancellationToken);
-
         return new GetAllTransactionsByFilterResponseDto
         {
             MetaData = await query.GetMetaData(request.PaginationState, cancellationToken),
-            Models = models
+            Models = await query
+                .PaginatedListAsync(paginationState: request.PaginationState)
+                .Select(x => new GetAllTransactionsByFilterResponseModel
+                {
+                    Id = x.Id,
+                    Amount = x.Amount,
+                    Description = x.Description,
+                    PaymentStatus = x.PaymentStatus,
+                    PaymentDate = x.PaymentDate,
+                    RefId = x.RefId,
+                    Type = x.Type,
+                    Created = x.Created
+                })
+                .ToListAsync(cancellationToken)
         };
     }
-
-    private async Task PopulateUserInfoAsync(
-        List<GetAllTransactionsByFilterResponseModel> models,
-        CancellationToken cancellationToken)
-    {
-        if (models.Count == 0)
-            return;
-
-        var txIds = models.Select(m => m.Id).ToList();
-        var userByTx = new Dictionary<long, long>();
-
-        void Merge(IEnumerable<(long TxId, long UserId)> rows)
-        {
-            foreach (var (txId, userId) in rows)
-            {
-                if (!userByTx.ContainsKey(txId))
-                    userByTx[txId] = userId;
-            }
-        }
-
-        // Priority: PaymentTransactions → UserPackagePurchases → UserOrders → ManualPayments
-        var fromPt = await _context.PaymentTransactions.AsNoTracking()
-            .Where(x => x.TransactionId != null && txIds.Contains(x.TransactionId.Value) && x.UserId != null)
-            .Select(x => new { TxId = x.TransactionId!.Value, UserId = x.UserId!.Value })
-            .ToListAsync(cancellationToken);
-        Merge(fromPt.Select(x => (x.TxId, x.UserId)));
-
-        var fromUpp = await _context.UserPackagePurchases.AsNoTracking()
-            .Where(x => x.TransactionId != null && txIds.Contains(x.TransactionId.Value))
-            .Select(x => new { TxId = x.TransactionId!.Value, UserId = x.UserId })
-            .ToListAsync(cancellationToken);
-        Merge(fromUpp.Select(x => (x.TxId, x.UserId)));
-
-        var fromOrders = await _context.UserOrders.AsNoTracking()
-            .Where(x => x.TransactionId != null && txIds.Contains(x.TransactionId.Value))
-            .Select(x => new { TxId = x.TransactionId!.Value, UserId = x.UserId })
-            .ToListAsync(cancellationToken);
-        Merge(fromOrders.Select(x => (x.TxId, x.UserId)));
-
-        var fromManual = await _context.ManualPayments.AsNoTracking()
-            .Where(x => x.TransactionId != null && txIds.Contains(x.TransactionId.Value))
-            .Select(x => new { TxId = x.TransactionId!.Value, UserId = x.UserId })
-            .ToListAsync(cancellationToken);
-        Merge(fromManual.Select(x => (x.TxId, x.UserId)));
-
-        if (userByTx.Count == 0)
-        {
-            foreach (var model in models)
-                model.UserFullName = "—";
-            return;
-        }
-
-        var userIds = userByTx.Values.Distinct().ToList();
-        var users = await _context.Users.AsNoTracking()
-            .Where(u => userIds.Contains(u.Id))
-            .Select(u => new { u.Id, u.FirstName, u.LastName, u.Mobile })
-            .ToDictionaryAsync(u => u.Id, cancellationToken);
-
-        foreach (var model in models)
-        {
-            if (!userByTx.TryGetValue(model.Id, out var userId))
-            {
-                model.UserFullName = "—";
-                continue;
-            }
-
-            model.UserId = userId;
-            if (users.TryGetValue(userId, out var user))
-            {
-                model.Mobile = user.Mobile;
-                var name = UserDisplayName.From(user.FirstName, user.LastName, user.Mobile, user.Id);
-                model.UserFullName = string.IsNullOrWhiteSpace(name) ? "—" : name;
-            }
-            else
-            {
-                model.UserFullName = "—";
-            }
-        }
-    }
 }

src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterResponseDto.cs

@@ -25,7 +25,4 @@ public class GetAllTransactionsByFilterResponseDto
     // 
     public TransactionType Type { get; set; }
     public DateTime Created { get; set; }
-    public long? UserId { get; set; }
-    public string? UserFullName { get; set; }
-    public string? Mobile { get; set; }
 }

src/CMSMicroservice.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommand.cs

@@ -9,7 +9,5 @@ public record VerifyOtpTokenCommand : IRequest<VerifyOtpTokenResponseDto>
     public string Code { get; init; }
     //کد معرف والد 
     public string? ParentReferralCode { get; init; }
-    //شماره موبایل دعوت‌کننده (اختیاری)
-    public string? InviterMobile { get; init; }
 
 }

src/CMSMicroservice.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandHandler.cs

@@ -118,34 +118,6 @@ public class VerifyOtpTokenCommandHandler : IRequestHandler<VerifyOtpTokenComman
             else
                 return new VerifyOtpTokenResponseDto { Success = false, Message = "ظرفیت معرف تکمیل است!!" };
 
-            // ── دعوت‌کننده (اختیاری؛ اعتبارسنجی سخت قبل از ایجاد کاربر) ──
-            User? inviter = null;
-            if (!string.IsNullOrWhiteSpace(request.InviterMobile))
-            {
-                var inviterMobile = request.InviterMobile.NormalizeIranMobile();
-                if (inviterMobile == mobile)
-                {
-                    return new VerifyOtpTokenResponseDto
-                    {
-                        Success = false,
-                        Message = "شماره موبایل دعوت‌کننده نمی‌تواند با شماره خودتان یکسان باشد."
-                    };
-                }
-
-                inviter = await _context.Users
-                    .AsNoTracking()
-                    .FirstOrDefaultAsync(u => u.Mobile == inviterMobile, cancellationToken);
-
-                if (inviter == null)
-                {
-                    return new VerifyOtpTokenResponseDto
-                    {
-                        Success = false,
-                        Message = "دعوت‌کننده با این شماره موبایل یافت نشد."
-                    };
-                }
-            }
-
             // ایجاد کاربر جدید
             user = new User
             {
@@ -162,15 +134,6 @@ public class VerifyOtpTokenCommandHandler : IRequestHandler<VerifyOtpTokenComman
             user.AddDomainEvent(new CreateNewUserEvent(user));
             await _context.SaveChangesAsync(cancellationToken);
 
-            if (inviter != null)
-            {
-                await _context.UserInvitations.AddAsync(new UserInvitation
-                {
-                    InviterUserId = inviter.Id,
-                    InviteeUserId = user.Id
-                }, cancellationToken);
-            }
-
             // ایجاد نقش کاربری
             var userRole = new UserRole { UserId = user.Id, RoleId = 1 };
             await _context.UserRoles.AddAsync(userRole, cancellationToken);

src/CMSMicroservice.Application/UserCQ/Queries/GetInvitationsByFilter/GetInvitationsByFilterQuery.cs

@@ -1,46 +0,0 @@
-using CMSMicroservice.Application.Common.Models;
-using MediatR;
-
-namespace CMSMicroservice.Application.UserCQ.Queries.GetInvitationsByFilter;
-
-public class GetInvitationsByFilterQuery : IRequest<GetInvitationsByFilterResult>
-{
-    public PaginationState? PaginationState { get; set; }
-    public string? SortBy { get; set; }
-    public GetInvitationsByFilterFilterDto? Filter { get; set; }
-}
-
-public class GetInvitationsByFilterFilterDto
-{
-    public string? InviterMobile { get; set; }
-    public string? InviterFirstName { get; set; }
-    public string? InviterLastName { get; set; }
-    public string? InviteeMobile { get; set; }
-    public string? InviteeFirstName { get; set; }
-    public string? InviteeLastName { get; set; }
-    public bool? InviteeClubActive { get; set; }
-    public DateTime? CreatedFrom { get; set; }
-    public DateTime? CreatedTo { get; set; }
-}
-
-public class GetInvitationsByFilterResult
-{
-    public MetaData MetaData { get; set; } = new();
-    public List<InvitationReportDto> Models { get; set; } = new();
-}
-
-public class InvitationReportDto
-{
-    public long Id { get; set; }
-    public long InviterUserId { get; set; }
-    public string? InviterFirstName { get; set; }
-    public string? InviterLastName { get; set; }
-    public string InviterMobile { get; set; } = string.Empty;
-    public long InviteeUserId { get; set; }
-    public string? InviteeFirstName { get; set; }
-    public string? InviteeLastName { get; set; }
-    public string InviteeMobile { get; set; } = string.Empty;
-    public DateTime InviteeRegisteredAt { get; set; }
-    public bool InviteeClubActive { get; set; }
-    public DateTime InvitedAt { get; set; }
-}

src/CMSMicroservice.Application/UserCQ/Queries/GetInvitationsByFilter/GetInvitationsByFilterQueryHandler.cs

@@ -1,96 +0,0 @@
-using CMSMicroservice.Application.Common.Interfaces;
-using CMSMicroservice.Application.Common.Models;
-using MediatR;
-using Microsoft.EntityFrameworkCore;
-
-namespace CMSMicroservice.Application.UserCQ.Queries.GetInvitationsByFilter;
-
-public class GetInvitationsByFilterQueryHandler
-    : IRequestHandler<GetInvitationsByFilterQuery, GetInvitationsByFilterResult>
-{
-    private readonly IApplicationDbContext _context;
-
-    public GetInvitationsByFilterQueryHandler(IApplicationDbContext context)
-    {
-        _context = context;
-    }
-
-    public async Task<GetInvitationsByFilterResult> Handle(
-        GetInvitationsByFilterQuery request,
-        CancellationToken cancellationToken)
-    {
-        var filter = request.Filter ?? new GetInvitationsByFilterFilterDto();
-
-        var query = _context.UserInvitations
-            .AsNoTracking()
-            .Select(x => new InvitationReportDto
-            {
-                Id = x.Id,
-                InviterUserId = x.InviterUserId,
-                InviterFirstName = x.Inviter.FirstName,
-                InviterLastName = x.Inviter.LastName,
-                InviterMobile = x.Inviter.Mobile,
-                InviteeUserId = x.InviteeUserId,
-                InviteeFirstName = x.Invitee.FirstName,
-                InviteeLastName = x.Invitee.LastName,
-                InviteeMobile = x.Invitee.Mobile,
-                InviteeRegisteredAt = x.Invitee.Created,
-                InviteeClubActive = x.Invitee.ClubMembership != null && x.Invitee.ClubMembership.IsActive,
-                InvitedAt = x.Created
-            });
-
-        if (!string.IsNullOrWhiteSpace(filter.InviterMobile))
-            query = query.Where(x => x.InviterMobile.Contains(filter.InviterMobile));
-        if (!string.IsNullOrWhiteSpace(filter.InviterFirstName))
-            query = query.Where(x => x.InviterFirstName != null && x.InviterFirstName.Contains(filter.InviterFirstName));
-        if (!string.IsNullOrWhiteSpace(filter.InviterLastName))
-            query = query.Where(x => x.InviterLastName != null && x.InviterLastName.Contains(filter.InviterLastName));
-        if (!string.IsNullOrWhiteSpace(filter.InviteeMobile))
-            query = query.Where(x => x.InviteeMobile.Contains(filter.InviteeMobile));
-        if (!string.IsNullOrWhiteSpace(filter.InviteeFirstName))
-            query = query.Where(x => x.InviteeFirstName != null && x.InviteeFirstName.Contains(filter.InviteeFirstName));
-        if (!string.IsNullOrWhiteSpace(filter.InviteeLastName))
-            query = query.Where(x => x.InviteeLastName != null && x.InviteeLastName.Contains(filter.InviteeLastName));
-        if (filter.InviteeClubActive.HasValue)
-            query = query.Where(x => x.InviteeClubActive == filter.InviteeClubActive.Value);
-        if (filter.CreatedFrom.HasValue)
-            query = query.Where(x => x.InvitedAt >= filter.CreatedFrom.Value);
-        if (filter.CreatedTo.HasValue)
-            query = query.Where(x => x.InvitedAt <= filter.CreatedTo.Value);
-
-        // پیش‌فرض: جدیدترین
-        query = (request.SortBy?.Trim().ToLowerInvariant()) switch
-        {
-            "oldest" or "created_asc" => query.OrderBy(x => x.InvitedAt),
-            _ => query.OrderByDescending(x => x.InvitedAt)
-        };
-
-        var paginationState = request.PaginationState ?? new PaginationState { PageNumber = 1, PageSize = 20 };
-        if (paginationState.PageNumber < 1) paginationState.PageNumber = 1;
-        if (paginationState.PageSize < 1) paginationState.PageSize = 20;
-
-        var totalCount = await query.CountAsync(cancellationToken);
-        var models = await query
-            .Skip((paginationState.PageNumber - 1) * paginationState.PageSize)
-            .Take(paginationState.PageSize)
-            .ToListAsync(cancellationToken);
-
-        var totalPage = totalCount == 0
-            ? 0
-            : (int)Math.Ceiling((double)totalCount / paginationState.PageSize);
-
-        return new GetInvitationsByFilterResult
-        {
-            MetaData = new MetaData
-            {
-                TotalCount = totalCount,
-                CurrentPage = paginationState.PageNumber,
-                PageSize = paginationState.PageSize,
-                TotalPage = totalPage,
-                HasPrevious = paginationState.PageNumber > 1,
-                HasNext = paginationState.PageNumber < totalPage
-            },
-            Models = models
-        };
-    }
-}

src/CMSMicroservice.Application/UserCQ/Queries/GetMyInvitees/GetMyInviteesQuery.cs

@@ -1,36 +0,0 @@
-using CMSMicroservice.Application.Common.Models;
-using MediatR;
-
-namespace CMSMicroservice.Application.UserCQ.Queries.GetMyInvitees;
-
-public class GetMyInviteesQuery : IRequest<GetMyInviteesResult>
-{
-    public long UserId { get; set; }
-    public PaginationState? PaginationState { get; set; }
-    /// <summary>ALL | ACTIVE | INACTIVE — ClubMembership.IsActive</summary>
-    public string? ClubStatusFilter { get; set; }
-}
-
-public class GetMyInviteesResult
-{
-    public MetaData MetaData { get; set; } = new();
-    public List<InviteeDto> Invitees { get; set; } = new();
-    public InviteeStatsDto Stats { get; set; } = new();
-}
-
-public class InviteeDto
-{
-    public long UserId { get; set; }
-    public string? FirstName { get; set; }
-    public string? LastName { get; set; }
-    public string Mobile { get; set; } = string.Empty;
-    public DateTime RegisteredAt { get; set; }
-    public bool IsClubActive { get; set; }
-}
-
-public class InviteeStatsDto
-{
-    public int TotalInvitees { get; set; }
-    public int ClubActiveCount { get; set; }
-    public int ClubInactiveCount { get; set; }
-}

src/CMSMicroservice.Application/UserCQ/Queries/GetMyInvitees/GetMyInviteesQueryHandler.cs

@@ -1,98 +0,0 @@
-using CMSMicroservice.Application.Common.Interfaces;
-using CMSMicroservice.Application.Common.Models;
-using MediatR;
-using Microsoft.EntityFrameworkCore;
-
-namespace CMSMicroservice.Application.UserCQ.Queries.GetMyInvitees;
-
-public class GetMyInviteesQueryHandler : IRequestHandler<GetMyInviteesQuery, GetMyInviteesResult>
-{
-    private readonly IApplicationDbContext _context;
-    private readonly ICurrentUserService _currentUser;
-
-    public GetMyInviteesQueryHandler(IApplicationDbContext context, ICurrentUserService currentUser)
-    {
-        _context = context;
-        _currentUser = currentUser;
-    }
-
-    public async Task<GetMyInviteesResult> Handle(GetMyInviteesQuery request, CancellationToken cancellationToken)
-    {
-        var userId = request.UserId == 0
-            ? (long.TryParse(_currentUser.UserId, out var id) ? id : 0)
-            : request.UserId;
-
-        if (userId == 0)
-            throw new UnauthorizedAccessException("User ID not found in JWT token");
-
-        var baseQuery = _context.UserInvitations
-            .AsNoTracking()
-            .Where(x => x.InviterUserId == userId)
-            .Select(x => new
-            {
-                x.InviteeUserId,
-                InviteeFirstName = x.Invitee.FirstName,
-                InviteeLastName = x.Invitee.LastName,
-                InviteeMobile = x.Invitee.Mobile,
-                RegisteredAt = x.Invitee.Created,
-                IsClubActive = x.Invitee.ClubMembership != null && x.Invitee.ClubMembership.IsActive,
-                InvitedAt = x.Created
-            });
-
-        var all = await baseQuery.ToListAsync(cancellationToken);
-        var total = all.Count;
-        var clubActive = all.Count(x => x.IsClubActive);
-        var clubInactive = total - clubActive;
-
-        var filtered = all.AsEnumerable();
-        var status = request.ClubStatusFilter?.Trim().ToUpperInvariant();
-        if (status == "ACTIVE")
-            filtered = filtered.Where(x => x.IsClubActive);
-        else if (status == "INACTIVE")
-            filtered = filtered.Where(x => !x.IsClubActive);
-
-        var ordered = filtered.OrderByDescending(x => x.InvitedAt).ToList();
-
-        var paginationState = request.PaginationState ?? new PaginationState { PageNumber = 1, PageSize = 10 };
-        if (paginationState.PageNumber < 1) paginationState.PageNumber = 1;
-        if (paginationState.PageSize < 1) paginationState.PageSize = 10;
-
-        var totalCount = ordered.Count;
-        var pageItems = ordered
-            .Skip((paginationState.PageNumber - 1) * paginationState.PageSize)
-            .Take(paginationState.PageSize)
-            .ToList();
-
-        var totalPage = totalCount == 0
-            ? 0
-            : (int)Math.Ceiling((double)totalCount / paginationState.PageSize);
-
-        return new GetMyInviteesResult
-        {
-            MetaData = new MetaData
-            {
-                TotalCount = totalCount,
-                CurrentPage = paginationState.PageNumber,
-                PageSize = paginationState.PageSize,
-                TotalPage = totalPage,
-                HasPrevious = paginationState.PageNumber > 1,
-                HasNext = paginationState.PageNumber < totalPage
-            },
-            Stats = new InviteeStatsDto
-            {
-                TotalInvitees = total,
-                ClubActiveCount = clubActive,
-                ClubInactiveCount = clubInactive
-            },
-            Invitees = pageItems.Select(x => new InviteeDto
-            {
-                UserId = x.InviteeUserId,
-                FirstName = x.InviteeFirstName,
-                LastName = x.InviteeLastName,
-                Mobile = x.InviteeMobile,
-                RegisteredAt = x.RegisteredAt,
-                IsClubActive = x.IsClubActive
-            }).ToList()
-        };
-    }
-}

src/CMSMicroservice.Domain/Entities/UserInvitation.cs

@@ -1,18 +0,0 @@
-namespace CMSMicroservice.Domain.Entities;
-
-/// <summary>
-/// رابطه دعوت‌کننده ↔ دعوت‌شونده (جدا از معرف شبکه / NetworkParent).
-/// کد دعوت = شماره موبایل دعوت‌کننده.
-/// </summary>
-public class UserInvitation : BaseAuditableEntity
-{
-    /// <summary>کاربری که دعوت کرده</summary>
-    public long InviterUserId { get; set; }
-
-    public virtual User Inviter { get; set; } = null!;
-
-    /// <summary>کاربری که دعوت شده (حداکثر یک دعوت‌کننده)</summary>
-    public long InviteeUserId { get; set; }
-
-    public virtual User Invitee { get; set; } = null!;
-}

src/CMSMicroservice.Infrastructure/ConfigureServices.cs

@@ -77,33 +77,27 @@ public static class ConfigureServices
                 });
         }
         
-        // Payment Gateway — default provider + multi-gateway resolver (ZarinPal + TwentyCard coexist)
+        // Payment Gateway Service - Multi-Provider Architecture
+        // پشتیبانی از درگاه‌های مختلف: ZarinPal, Daya, Mock
         var paymentProvider = configuration.GetValue<string>("PaymentProvider", "Mock")?.ToLowerInvariant();
-
-        services.AddHttpClient<ZarinPalPaymentService>()
-            .SetHandlerLifetime(TimeSpan.FromMinutes(5));
-        services.AddHttpClient<TwentyCardPaymentService>()
-            .SetHandlerLifetime(TimeSpan.FromMinutes(5));
-
+        
         switch (paymentProvider)
         {
             case "zarinpal":
-                services.AddScoped<IPaymentGatewayService>(sp => sp.GetRequiredService<ZarinPalPaymentService>());
-                break;
-
-            case "daya":
-                services.AddHttpClient<DayaPaymentService>()
+                services.AddHttpClient<IPaymentGatewayService, ZarinPalPaymentService>()
                     .SetHandlerLifetime(TimeSpan.FromMinutes(5));
-                services.AddScoped<IPaymentGatewayService>(sp => sp.GetRequiredService<DayaPaymentService>());
                 break;
-
+            
+            case "daya":
+                services.AddHttpClient<IPaymentGatewayService, DayaPaymentService>()
+                    .SetHandlerLifetime(TimeSpan.FromMinutes(5));
+                break;
+            
             case "mock":
             default:
                 services.AddScoped<IPaymentGatewayService, MockPaymentGatewayService>();
                 break;
         }
-
-        services.AddScoped<IPaymentGatewayResolver, PaymentGatewayResolver>();
         
         services.AddScoped<IApplicationDbContext>(p => p.GetRequiredService<ApplicationDbContext>());
         

src/CMSMicroservice.Infrastructure/Persistence/ApplicationDbContext.cs

@@ -86,7 +86,6 @@ public class ApplicationDbContext :  DbContext, IApplicationDbContext
     public DbSet<Product> Products => Set<Product>();
     public DbSet<ProductImage> ProductImages => Set<ProductImage>();
     public DbSet<User> Users => Set<User>();
-    public DbSet<UserInvitation> UserInvitations => Set<UserInvitation>();
     public DbSet<OtpToken> OtpTokens => Set<OtpToken>();
     public DbSet<Contract> Contracts => Set<Contract>();
     public DbSet<UserContract> UserContracts => Set<UserContract>();

src/CMSMicroservice.Infrastructure/Persistence/Configurations/UserConfiguration.cs

@@ -13,7 +13,7 @@ public class UserConfiguration : IEntityTypeConfiguration<User>
         builder.Property(entity => entity.Id).UseIdentityColumn();
         builder.Property(entity => entity.FirstName).IsRequired(false);
         builder.Property(entity => entity.LastName).IsRequired(false);
-        builder.Property(entity => entity.Mobile).IsRequired(true).HasMaxLength(20);
+        builder.Property(entity => entity.Mobile).IsRequired(true);
         builder.Property(entity => entity.NationalCode).IsRequired(false);
         builder.Property(entity => entity.AvatarPath).IsRequired(false);
         builder.Property(entity => entity.ReferralCode).IsRequired(true);
@@ -48,10 +48,5 @@ public class UserConfiguration : IEntityTypeConfiguration<User>
         builder.HasIndex(e => e.LegPosition)
             .HasDatabaseName("IX_User_LegPosition");
 
-        // موبایل یکتا برای کاربران فعال (lookup دعوت‌کننده)
-        builder.HasIndex(e => e.Mobile)
-            .IsUnique()
-            .HasFilter("[IsDeleted] = 0")
-            .HasDatabaseName("IX_User_Mobile_Active");
     }
 }

src/CMSMicroservice.Infrastructure/Persistence/Configurations/UserInvitationConfiguration.cs

@@ -1,38 +0,0 @@
-using CMSMicroservice.Domain.Entities;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-
-namespace CMSMicroservice.Infrastructure.Persistence.Configurations;
-
-public class UserInvitationConfiguration : IEntityTypeConfiguration<UserInvitation>
-{
-    public void Configure(EntityTypeBuilder<UserInvitation> builder)
-    {
-        builder.ToTable("UserInvitations");
-        builder.HasQueryFilter(p => !p.IsDeleted);
-        builder.Ignore(entity => entity.DomainEvents);
-
-        builder.HasKey(entity => entity.Id);
-        builder.Property(entity => entity.Id).UseIdentityColumn();
-
-        builder.Property(entity => entity.InviterUserId).IsRequired();
-        builder.Property(entity => entity.InviteeUserId).IsRequired();
-
-        builder.HasOne(entity => entity.Inviter)
-            .WithMany()
-            .HasForeignKey(entity => entity.InviterUserId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        builder.HasOne(entity => entity.Invitee)
-            .WithMany()
-            .HasForeignKey(entity => entity.InviteeUserId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        builder.HasIndex(e => e.InviteeUserId)
-            .IsUnique()
-            .HasDatabaseName("IX_UserInvitations_InviteeUserId");
-
-        builder.HasIndex(e => new { e.InviterUserId, e.Created })
-            .HasDatabaseName("IX_UserInvitations_InviterUserId_Created");
-    }
-}

src/CMSMicroservice.Infrastructure/Persistence/Migrations/20260222155925_u21.Designer.cs

@@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace CMSMicroservice.Infrastructure.Persistence.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20260222160755_u21")]
+    [Migration("20260222155925_u21")]
     partial class u21
     {
         /// <inheritdoc />

src/CMSMicroservice.Infrastructure/Persistence/Migrations/20260920194955_AddUserInvitations.cs

@@ -1,103 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CMSMicroservice.Infrastructure.Persistence.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddUserInvitations : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<string>(
-                name: "Mobile",
-                schema: "CMS",
-                table: "Users",
-                type: "nvarchar(20)",
-                maxLength: 20,
-                nullable: false,
-                oldClrType: typeof(string),
-                oldType: "nvarchar(max)");
-
-            migrationBuilder.CreateTable(
-                name: "UserInvitations",
-                schema: "CMS",
-                columns: table => new
-                {
-                    Id = table.Column<long>(type: "bigint", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    InviterUserId = table.Column<long>(type: "bigint", nullable: false),
-                    InviteeUserId = table.Column<long>(type: "bigint", nullable: false),
-                    Created = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    CreatedBy = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    LastModified = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    LastModifiedBy = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    IsDeleted = table.Column<bool>(type: "bit", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_UserInvitations", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_UserInvitations_Users_InviteeUserId",
-                        column: x => x.InviteeUserId,
-                        principalSchema: "CMS",
-                        principalTable: "Users",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_UserInvitations_Users_InviterUserId",
-                        column: x => x.InviterUserId,
-                        principalSchema: "CMS",
-                        principalTable: "Users",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_User_Mobile_Active",
-                schema: "CMS",
-                table: "Users",
-                column: "Mobile",
-                unique: true,
-                filter: "[IsDeleted] = 0");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UserInvitations_InviteeUserId",
-                schema: "CMS",
-                table: "UserInvitations",
-                column: "InviteeUserId",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UserInvitations_InviterUserId_Created",
-                schema: "CMS",
-                table: "UserInvitations",
-                columns: new[] { "InviterUserId", "Created" });
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "UserInvitations",
-                schema: "CMS");
-
-            migrationBuilder.DropIndex(
-                name: "IX_User_Mobile_Active",
-                schema: "CMS",
-                table: "Users");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Mobile",
-                schema: "CMS",
-                table: "Users",
-                type: "nvarchar(max)",
-                nullable: false,
-                oldClrType: typeof(string),
-                oldType: "nvarchar(20)",
-                oldMaxLength: 20);
-        }
-    }
-}

src/CMSMicroservice.Infrastructure/Persistence/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -3574,7 +3574,7 @@ namespace CMSMicroservice.Infrastructure.Persistence.Migrations
 
                     b.Property<string>("Mobile")
                         .IsRequired()
-                        .HasColumnType("nvarchar(450)");
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<DateTime?>("MobileVerifiedAt")
                         .HasColumnType("datetime2");
@@ -3606,11 +3606,6 @@ namespace CMSMicroservice.Infrastructure.Persistence.Migrations
                     b.HasIndex("LegPosition")
                         .HasDatabaseName("IX_User_LegPosition");
 
-                    b.HasIndex("Mobile")
-                        .IsUnique()
-                        .HasDatabaseName("IX_User_Mobile_Active")
-                        .HasFilter("[IsDeleted] = 0");
-
                     b.HasIndex("NetworkParentId")
                         .HasDatabaseName("IX_User_NetworkParentId");
 
@@ -3755,47 +3750,6 @@ namespace CMSMicroservice.Infrastructure.Persistence.Migrations
                     b.ToTable("UserContracts", "CMS");
                 });
 
-            modelBuilder.Entity("CMSMicroservice.Domain.Entities.UserInvitation", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
-
-                    b.Property<DateTime>("Created")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("CreatedBy")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<long>("InviteeUserId")
-                        .HasColumnType("bigint");
-
-                    b.Property<long>("InviterUserId")
-                        .HasColumnType("bigint");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("bit");
-
-                    b.Property<DateTime?>("LastModified")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("InviteeUserId")
-                        .IsUnique()
-                        .HasDatabaseName("IX_UserInvitations_InviteeUserId");
-
-                    b.HasIndex("InviterUserId", "Created")
-                        .HasDatabaseName("IX_UserInvitations_InviterUserId_Created");
-
-                    b.ToTable("UserInvitations", "CMS");
-                });
-
             modelBuilder.Entity("CMSMicroservice.Domain.Entities.UserOrder", b =>
                 {
                     b.Property<long>("Id")
@@ -4917,25 +4871,6 @@ namespace CMSMicroservice.Infrastructure.Persistence.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("CMSMicroservice.Domain.Entities.UserInvitation", b =>
-                {
-                    b.HasOne("CMSMicroservice.Domain.Entities.User", "Invitee")
-                        .WithMany()
-                        .HasForeignKey("InviteeUserId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("CMSMicroservice.Domain.Entities.User", "Inviter")
-                        .WithMany()
-                        .HasForeignKey("InviterUserId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Invitee");
-
-                    b.Navigation("Inviter");
-                });
-
             modelBuilder.Entity("CMSMicroservice.Domain.Entities.UserOrder", b =>
                 {
                     b.HasOne("CMSMicroservice.Domain.Entities.Package", "Package")

src/CMSMicroservice.Infrastructure/Persistence/StoredProcedures/GetNetworkTree.sql

@@ -0,0 +1,136 @@
+-- =============================================
+-- Stored Procedure: GetNetworkTree
+-- Description: دریافت درخت شبکه باینری با CTE recursive
+-- Author: FourSat Team
+-- Updated: 2026-04-30 — اضافه کردن IsNewActivation، PackageName، PackageId
+--                       منطق هفته‌بندی از ActivatedAt به PackagePurchasedAt تغییر کرد
+-- =============================================
+
+CREATE OR ALTER PROCEDURE [CMS].[GetNetworkTree]
+    @RootUserId BIGINT,
+    @MaxDepth INT = 100,
+    @IsClubActive BIT = NULL,
+    @ActivationWeekDefinitionId BIGINT = NULL
+AS
+BEGIN
+    SET NOCOUNT ON;
+
+    -- تاریخ شروع و پایان هفته فیلتر
+    DECLARE @WeekStartDate DATETIME = NULL;
+    DECLARE @WeekEndDate   DATETIME = NULL;
+
+    IF @ActivationWeekDefinitionId IS NOT NULL
+    BEGIN
+        SELECT @WeekStartDate = StartDate, @WeekEndDate = EndDate
+        FROM [CMS].[WeekDefinitions]
+        WHERE Id = @ActivationWeekDefinitionId;
+    END
+
+    -- CTE برای پیمایش درخت باینری به صورت recursive
+    ;WITH NetworkTreeCTE AS (
+        -- Base case: ریشه درخت
+        SELECT 
+            u.Id AS UserId,
+            u.Mobile,
+            u.FirstName,
+            u.LastName,
+            u.ReferralCode,
+            u.LegPosition,
+            u.NetworkParentId AS ParentId,
+            0 AS NetworkLevel,
+            u.Created AS UserCreated
+        FROM [CMS].[Users] u
+        WHERE u.Id = @RootUserId
+          AND u.IsDeleted = 0
+
+        UNION ALL
+
+        -- Recursive case: فرزندان
+        SELECT 
+            u.Id AS UserId,
+            u.Mobile,
+            u.FirstName,
+            u.LastName,
+            u.ReferralCode,
+            u.LegPosition,
+            u.NetworkParentId AS ParentId,
+            parent.NetworkLevel + 1 AS NetworkLevel,
+            u.Created AS UserCreated
+        FROM [CMS].[Users] u
+        INNER JOIN NetworkTreeCTE parent ON u.NetworkParentId = parent.UserId
+        WHERE u.IsDeleted = 0
+          AND parent.NetworkLevel < @MaxDepth
+    )
+    SELECT 
+        t.UserId,
+        t.Mobile,
+        t.FirstName,
+        t.LastName,
+        t.ReferralCode,
+        t.LegPosition,
+        t.ParentId,
+        t.NetworkLevel,
+        cm.ActivatedAt AS ClubActivatedAt,
+        ISNULL(cm.IsActive, 0) AS IsClubActive,
+
+        -- هفته فعال‌سازی بر اساس Cycle جاری (PackagePurchasedAt)
+        wd.Id          AS ActivationWeekDefinitionId,
+        wd.DisplayName AS ActivationWeekDisplayName,
+
+        -- آیا کاربر در هفته هدف Cycle داشته؟
+        CASE WHEN cc_target.UserId IS NOT NULL THEN 1 ELSE 0 END AS IsActivatedInTargetWeek,
+
+        -- نوع فعال‌سازی: 1=جدید، 0=تمدید/خرید مجدد، NULL=بدون Cycle
+        CASE
+            WHEN cc_eff.CycleNumber IS NULL THEN NULL
+            WHEN cc_eff.CycleNumber = 1     THEN 1
+            ELSE                            0
+        END AS IsNewActivation,
+
+        -- نام پکیج موثر (هفته هدف اگر فیلتر باشد، وگرنه پکیج فعلی)
+        ISNULL(p_eff.Title, '') AS PackageName,
+        cc_eff.PackageId        AS PackageId,
+
+        t.UserCreated
+    FROM NetworkTreeCTE t
+    LEFT JOIN [CMS].[ClubMemberships] cm ON cm.UserId = t.UserId AND cm.IsDeleted = 0
+
+    -- Cycle جاری — برای نمایش هفته و پکیج وقتی فیلتر هفته نیست
+    OUTER APPLY (
+        SELECT TOP 1 CycleNumber, PackageId, PackagePurchasedAt
+        FROM [CMS].[ClubMembershipCycles]
+        WHERE UserId = t.UserId AND IsCurrentCycle = 1
+    ) cc_current
+
+    -- Cycle هفته هدف — برای IsActivatedInTargetWeek و نوع فعال‌سازی
+    OUTER APPLY (
+        SELECT TOP 1 UserId, CycleNumber, PackageId
+        FROM [CMS].[ClubMembershipCycles]
+        WHERE UserId = t.UserId
+          AND @WeekStartDate IS NOT NULL
+          AND PackagePurchasedAt >= @WeekStartDate
+          AND PackagePurchasedAt <  @WeekEndDate
+        ORDER BY CycleNumber ASC
+    ) cc_target
+
+    -- Cycle موثر: اگر هفته فیلتر داریم → cc_target، وگرنه → cc_current
+    CROSS APPLY (
+        SELECT
+            CASE WHEN @WeekStartDate IS NOT NULL AND cc_target.UserId IS NOT NULL
+                 THEN cc_target.CycleNumber ELSE cc_current.CycleNumber END AS CycleNumber,
+            CASE WHEN @WeekStartDate IS NOT NULL AND cc_target.UserId IS NOT NULL
+                 THEN cc_target.PackageId   ELSE cc_current.PackageId   END AS PackageId
+    ) cc_eff
+
+    -- پکیج موثر
+    LEFT JOIN [CMS].[Packages] p_eff ON p_eff.Id = cc_eff.PackageId AND p_eff.IsDeleted = 0
+
+    -- هفته بر اساس PackagePurchasedAt سایکل جاری
+    LEFT JOIN [CMS].[WeekDefinitions] wd
+        ON cc_current.PackagePurchasedAt >= wd.StartDate
+       AND cc_current.PackagePurchasedAt <  wd.EndDate
+
+    WHERE (@IsClubActive IS NULL OR ISNULL(cm.IsActive, 0) = @IsClubActive OR t.NetworkLevel = 0)
+    ORDER BY t.NetworkLevel, t.ParentId, t.LegPosition
+    OPTION (MAXRECURSION 0);
+END

src/CMSMicroservice.Infrastructure/Services/Payment/PaymentGatewayResolver.cs

@@ -1,35 +0,0 @@
-using CMSMicroservice.Application.Common.Interfaces;
-using CMSMicroservice.Infrastructure.Services.Payment;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace CMSMicroservice.Infrastructure.Services.Payment;
-
-public class PaymentGatewayResolver : IPaymentGatewayResolver
-{
-    private readonly IServiceProvider _serviceProvider;
-    private readonly IConfiguration _configuration;
-
-    public PaymentGatewayResolver(IServiceProvider serviceProvider, IConfiguration configuration)
-    {
-        _serviceProvider = serviceProvider;
-        _configuration = configuration;
-    }
-
-    public IPaymentGatewayService Get(string? provider)
-    {
-        var key = Normalize(provider)
-            ?? Normalize(_configuration["PaymentProvider"])
-            ?? "zarinpal";
-
-        return key switch
-        {
-            "20card" or "twentycard" => _serviceProvider.GetRequiredService<TwentyCardPaymentService>(),
-            "zarinpal" => _serviceProvider.GetRequiredService<ZarinPalPaymentService>(),
-            _ => _serviceProvider.GetRequiredService<IPaymentGatewayService>()
-        };
-    }
-
-    private static string? Normalize(string? value)
-        => string.IsNullOrWhiteSpace(value) ? null : value.Trim().ToLowerInvariant();
-}

src/CMSMicroservice.Infrastructure/Services/Payment/TwentyCardPaymentService.cs

@@ -1,306 +0,0 @@
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using CMSMicroservice.Application.Common.Interfaces;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-
-namespace CMSMicroservice.Infrastructure.Services.Payment;
-
-/// <summary>
-/// درگاه پرداخت بیست‌کارت (20Card IPG Merchant API).
-/// مبلغ ورودی به تومان است. درخواست‌ها به‌صورت multipart/form-data ارسال می‌شوند.
-/// </summary>
-public class TwentyCardPaymentService : IPaymentGatewayService
-{
-    private readonly HttpClient _httpClient;
-    private readonly ILogger<TwentyCardPaymentService> _logger;
-    private readonly string _terminalId;
-    private readonly string _terminalUsername;
-    private readonly string _terminalPassword;
-    private readonly string _defaultEmail;
-
-    private static readonly JsonSerializerOptions JsonOptions = new()
-    {
-        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-        PropertyNameCaseInsensitive = true,
-        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-    };
-
-    public TwentyCardPaymentService(
-        HttpClient httpClient,
-        IConfiguration configuration,
-        ILogger<TwentyCardPaymentService> logger)
-    {
-        _httpClient = httpClient;
-        _logger = logger;
-
-        var baseUrl = configuration["TwentyCard:BaseUrl"]
-            ?? throw new InvalidOperationException("TwentyCard:BaseUrl is not configured.");
-        _terminalId = configuration["TwentyCard:TerminalId"]
-            ?? throw new InvalidOperationException("TwentyCard:TerminalId is not configured.");
-        _terminalUsername = configuration["TwentyCard:TerminalUsername"]
-            ?? throw new InvalidOperationException("TwentyCard:TerminalUsername is not configured.");
-        _terminalPassword = configuration["TwentyCard:TerminalPassword"]
-            ?? throw new InvalidOperationException("TwentyCard:TerminalPassword is not configured.");
-        _defaultEmail = configuration["TwentyCard:DefaultEmail"] ?? "info@kbs2.ir";
-
-        _httpClient.BaseAddress = new Uri(baseUrl.TrimEnd('/') + "/");
-        if (!_httpClient.DefaultRequestHeaders.Contains("Accept"))
-            _httpClient.DefaultRequestHeaders.TryAddWithoutValidation("Accept", "application/json");
-        _logger.LogInformation("TwentyCard payment service initialized. BaseUrl={BaseUrl}", baseUrl);
-    }
-
-    public async Task<PaymentInitiateResult> InitiatePaymentAsync(
-        PaymentRequest request,
-        CancellationToken cancellationToken = default)
-    {
-        try
-        {
-            // ۲۰کارت amount را به ریال می‌گیرد (تومان × ۱۰)
-            var amountRial = ((long)request.Amount) * 10L;
-            var amount = amountRial.ToString();
-            var payerName = string.IsNullOrWhiteSpace(request.Name)
-                ? (string.IsNullOrWhiteSpace(request.Mobile) ? "کاربر" : request.Mobile)
-                : request.Name.Trim();
-            var invoice = string.IsNullOrWhiteSpace(request.Invoice)
-                ? request.UserId.ToString()
-                : request.Invoice;
-
-            using var content = BuildForm(new Dictionary<string, string>
-            {
-                ["terminal_id"] = _terminalId,
-                ["terminal_username"] = _terminalUsername,
-                ["terminal_password"] = _terminalPassword,
-                ["amount"] = amount,
-                ["name"] = payerName,
-                ["mobile"] = request.Mobile ?? string.Empty,
-                ["invoice"] = invoice,
-                ["callback"] = request.CallbackUrl,
-                ["description"] = request.Description ?? string.Empty,
-                // بدون email درگاه ۲۰کارت به‌جای validation، HTTP 500 برمی‌گرداند
-                ["email"] = ResolveEmail(request.Email)
-            });
-
-            if (!string.IsNullOrWhiteSpace(request.NationalId))
-                AddFormField(content, "national_id", request.NationalId);
-
-            _logger.LogInformation(
-                "TwentyCard payment request: Amount={AmountToman} Toman ({AmountRial} Rial), User={UserId}, Invoice={Invoice}",
-                (long)request.Amount, amountRial, request.UserId, invoice);
-
-            var response = await _httpClient.PostAsync("api/pgw/merchant/request", content, cancellationToken);
-            var responseBody = await response.Content.ReadAsStringAsync(cancellationToken);
-
-            if (!response.IsSuccessStatusCode)
-            {
-                _logger.LogError(
-                    "TwentyCard HTTP error on request: StatusCode={StatusCode}, Body={Body}",
-                    (int)response.StatusCode, responseBody);
-
-                return new PaymentInitiateResult
-                {
-                    IsSuccess = false,
-                    ErrorMessage = $"خطای ارتباط با درگاه ۲۰کارت (HTTP {(int)response.StatusCode})"
-                };
-            }
-
-            var result = JsonSerializer.Deserialize<TwentyCardRequestResponse>(responseBody, JsonOptions);
-            var authority = result?.Data?.Authority;
-            var redirectUrl = result?.Data?.RedirectUrl;
-
-            if (string.IsNullOrWhiteSpace(authority) || string.IsNullOrWhiteSpace(redirectUrl))
-            {
-                _logger.LogError("TwentyCard request failed. Body={Body}", responseBody);
-                return new PaymentInitiateResult
-                {
-                    IsSuccess = false,
-                    ErrorMessage = result?.Message
-                        ?? result?.Error?.Message
-                        ?? "ایجاد تراکنش ۲۰کارت ناموفق بود"
-                };
-            }
-
-            return new PaymentInitiateResult
-            {
-                IsSuccess = true,
-                RefId = authority,
-                GatewayUrl = redirectUrl
-            };
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "TwentyCard InitiatePayment failed");
-            return new PaymentInitiateResult
-            {
-                IsSuccess = false,
-                ErrorMessage = "خطا در ارتباط با درگاه ۲۰کارت"
-            };
-        }
-    }
-
-    public Task<PaymentVerificationResult> VerifyPaymentAsync(
-        string refId,
-        string verificationToken,
-        CancellationToken cancellationToken = default)
-        => throw new NotImplementedException("TwentyCard requires VerifyPaymentAsync with amount.");
-
-    public async Task<PaymentVerificationResult> VerifyPaymentAsync(
-        string refId,
-        string verificationToken,
-        decimal amountInToman,
-        CancellationToken cancellationToken = default)
-    {
-        try
-        {
-            if (!string.Equals(verificationToken, "OK", StringComparison.OrdinalIgnoreCase))
-            {
-                return new PaymentVerificationResult
-                {
-                    IsSuccess = false,
-                    RefId = refId,
-                    Message = "پرداخت توسط کاربر لغو شد یا ناموفق بود",
-                    VerificationCode = 0
-                };
-            }
-
-            using var content = BuildForm(new Dictionary<string, string>
-            {
-                ["terminal_id"] = _terminalId,
-                ["terminal_username"] = _terminalUsername,
-                ["terminal_password"] = _terminalPassword,
-                ["authority"] = refId,
-                ["amount"] = (((long)amountInToman) * 10L).ToString()
-            });
-
-            var response = await _httpClient.PostAsync("api/pgw/merchant/verify", content, cancellationToken);
-            var responseBody = await response.Content.ReadAsStringAsync(cancellationToken);
-
-            _logger.LogInformation(
-                "TwentyCard verify response: Authority={Authority}, StatusCode={StatusCode}, Body={Body}",
-                refId, (int)response.StatusCode, responseBody);
-
-            var result = JsonSerializer.Deserialize<TwentyCardVerifyResponse>(responseBody, JsonOptions);
-
-            var paid = result?.Status?.Paid == true;
-            var verified = result?.Status?.Verified == true;
-            var noError = result?.Error != true;
-
-            if (response.IsSuccessStatusCode && noError && paid && verified)
-            {
-                return new PaymentVerificationResult
-                {
-                    IsSuccess = true,
-                    RefId = refId,
-                    TrackingCode = refId,
-                    Message = result?.Message ?? "تراکنش با موفقیت تایید شد",
-                    VerificationCode = result?.Code ?? 200
-                };
-            }
-
-            // Code 103 = already verified — treat as success for idempotency
-            if (result?.Code == 103)
-            {
-                return new PaymentVerificationResult
-                {
-                    IsSuccess = true,
-                    RefId = refId,
-                    TrackingCode = refId,
-                    Message = result.Message ?? "تراکنش قبلاً تایید شده است",
-                    VerificationCode = 103
-                };
-            }
-
-            return new PaymentVerificationResult
-            {
-                IsSuccess = false,
-                RefId = refId,
-                Message = result?.Message ?? "تایید تراکنش ۲۰کارت ناموفق بود",
-                VerificationCode = result?.Code ?? (int)response.StatusCode
-            };
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "TwentyCard VerifyPayment failed. Authority={Authority}", refId);
-            return new PaymentVerificationResult
-            {
-                IsSuccess = false,
-                RefId = refId,
-                Message = "خطا در تایید تراکنش ۲۰کارت"
-            };
-        }
-    }
-
-    public Task<PayoutResult> ProcessPayoutAsync(
-        PayoutRequest request,
-        CancellationToken cancellationToken = default)
-    {
-        return Task.FromResult(new PayoutResult
-        {
-            IsSuccess = false,
-            Message = "واریز از طریق درگاه ۲۰کارت پشتیبانی نمی‌شود"
-        });
-    }
-
-    private static MultipartFormDataContent BuildForm(Dictionary<string, string> fields)
-    {
-        var form = new MultipartFormDataContent();
-        foreach (var (key, value) in fields)
-            AddFormField(form, key, value ?? string.Empty);
-        return form;
-    }
-
-    /// <summary>
-    /// شبیه curl --form: بدون Content-Type روی هر part ( بعضی بک‌اندهای PHP با charset=utf-8 می‌شکنند).
-    /// </summary>
-    private static void AddFormField(MultipartFormDataContent form, string name, string value)
-    {
-        var part = new StringContent(value ?? string.Empty);
-        part.Headers.ContentType = null;
-        form.Add(part, name);
-    }
-
-    private string ResolveEmail(string? email)
-    {
-        if (!string.IsNullOrWhiteSpace(email) && email.Contains('@', StringComparison.Ordinal))
-            return email.Trim();
-        return _defaultEmail;
-    }
-
-    private sealed class TwentyCardRequestResponse
-    {
-        public string? Message { get; set; }
-        public TwentyCardRequestData? Data { get; set; }
-        public TwentyCardErrorBody? Error { get; set; }
-    }
-
-    private sealed class TwentyCardErrorBody
-    {
-        public string? Code { get; set; }
-        public string? Message { get; set; }
-    }
-
-    private sealed class TwentyCardRequestData
-    {
-        [JsonPropertyName("authority")]
-        public string? Authority { get; set; }
-
-        [JsonPropertyName("redirectUrl")]
-        public string? RedirectUrl { get; set; }
-    }
-
-    private sealed class TwentyCardVerifyResponse
-    {
-        public bool Error { get; set; }
-        public int Code { get; set; }
-        public string? Message { get; set; }
-        public TwentyCardVerifyStatus? Status { get; set; }
-    }
-
-    private sealed class TwentyCardVerifyStatus
-    {
-        public bool Paid { get; set; }
-        public bool Verified { 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.214</Version>
+    <Version>0.0.211</Version>
     <DebugType>None</DebugType>
     <DebugSymbols>False</DebugSymbols>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>

src/CMSMicroservice.Protobuf/Protos/package.proto

@@ -249,8 +249,6 @@ message CustomerPurchasePackageRequest
     int64 package_id = 1;
     PurchaseMethodEnum purchase_method = 2;
     string callback_url = 3;
-    // "zarinpal" (default) | "20card"
-    string gateway_provider = 4;
 }
 
 message CustomerPurchasePackageResponse 

src/CMSMicroservice.Protobuf/Protos/paymenttransaction.proto

@@ -66,7 +66,6 @@ message PaymentTransactionModel
     google.protobuf.Int64Value transaction_id = 13;
     string description = 14;
     google.protobuf.Timestamp created_at = 15;
-    string user_full_name = 16;
 }
 
 message GetPaymentTransactionSummaryRequest

src/CMSMicroservice.Protobuf/Protos/transactions.proto

@@ -192,9 +192,6 @@ message GetAllTransactionsByFilterResponseModel
         messages.TransactionType type = 7;
     }
     google.protobuf.Timestamp created = 8;
-    google.protobuf.Int64Value user_id = 9;
-    string user_full_name = 10;
-    google.protobuf.StringValue mobile = 11;
 }
 
 message GetTransactionSummaryRequest

src/CMSMicroservice.Protobuf/Protos/user.proto

@@ -115,16 +115,6 @@ service UserContract
             
         };
     };
-    rpc GetMyInvitees(GetMyInviteesRequest) returns (GetMyInviteesResponse){
-        option (google.api.http) = {
-            get: "/Customer/GetMyInvitees"
-        };
-    };
-    rpc GetInvitationsByFilter(GetInvitationsByFilterRequest) returns (GetInvitationsByFilterResponse){
-        option (google.api.http) = {
-            get: "/GetInvitationsByFilter"
-        };
-    };
     rpc UploadCustomerAvatar(UploadCustomerAvatarRequest) returns (UploadCustomerAvatarResponse){
         option (google.api.http) = {
             post: "/Customer/UploadAvatar"
@@ -304,8 +294,6 @@ message VerifyOtpTokenRequest
     string purpose = 2;
     string code = 3;
     google.protobuf.StringValue parent_referral_code = 4;
-    // شماره موبایل دعوت‌کننده (اختیاری؛ فقط برای ثبت‌نام جدید)
-    google.protobuf.StringValue inviter_mobile = 5;
 }
 message VerifyOtpTokenResponse
 {
@@ -478,78 +466,3 @@ message UpdateCustomerSettingsRequest
     google.protobuf.StringValue time_zone = 6;
     google.protobuf.BoolValue two_factor_auth_enabled = 7;
 }
-
-// ============= Inviter (دعوت‌کننده) — جدا از معرف شبکه =============
-
-message GetMyInviteesRequest
-{
-    city.PaginationState pagination_state = 1;
-    // ALL | ACTIVE | INACTIVE — بر اساس ClubMembership.IsActive
-    google.protobuf.StringValue club_status_filter = 2;
-}
-
-message GetMyInviteesResponse
-{
-    city.MetaData meta_data = 1;
-    repeated InviteeModel invitees = 2;
-    InviteeStats stats = 3;
-}
-
-message InviteeModel
-{
-    int64 user_id = 1;
-    google.protobuf.StringValue first_name = 2;
-    google.protobuf.StringValue last_name = 3;
-    string mobile = 4;
-    google.protobuf.Timestamp registered_at = 5;
-    bool is_club_active = 6;
-}
-
-message InviteeStats
-{
-    int32 total_invitees = 1;
-    int32 club_active_count = 2;
-    int32 club_inactive_count = 3;
-}
-
-message GetInvitationsByFilterRequest
-{
-    city.PaginationState pagination_state = 1;
-    google.protobuf.StringValue sort_by = 2;
-    GetInvitationsByFilterFilter filter = 3;
-}
-
-message GetInvitationsByFilterFilter
-{
-    google.protobuf.StringValue inviter_mobile = 1;
-    google.protobuf.StringValue inviter_first_name = 2;
-    google.protobuf.StringValue inviter_last_name = 3;
-    google.protobuf.StringValue invitee_mobile = 4;
-    google.protobuf.StringValue invitee_first_name = 5;
-    google.protobuf.StringValue invitee_last_name = 6;
-    google.protobuf.BoolValue invitee_club_active = 7;
-    google.protobuf.Timestamp created_from = 8;
-    google.protobuf.Timestamp created_to = 9;
-}
-
-message GetInvitationsByFilterResponse
-{
-    city.MetaData meta_data = 1;
-    repeated InvitationReportModel models = 2;
-}
-
-message InvitationReportModel
-{
-    int64 id = 1;
-    int64 inviter_user_id = 2;
-    google.protobuf.StringValue inviter_first_name = 3;
-    google.protobuf.StringValue inviter_last_name = 4;
-    string inviter_mobile = 5;
-    int64 invitee_user_id = 6;
-    google.protobuf.StringValue invitee_first_name = 7;
-    google.protobuf.StringValue invitee_last_name = 8;
-    string invitee_mobile = 9;
-    google.protobuf.Timestamp invitee_registered_at = 10;
-    bool invitee_club_active = 11;
-    google.protobuf.Timestamp invited_at = 12;
-}

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

@@ -46,8 +46,7 @@ public class PaymentTransactionProfile : IRegister
             .Map(dest => dest.OrderId, src => src.OrderId ?? string.Empty)
             .Map(dest => dest.TransactionId, src => src.TransactionId)
             .Map(dest => dest.Description, src => src.Description ?? string.Empty)
-            .Map(dest => dest.CreatedAt, src => Timestamp.FromDateTimeOffset(src.Created))
-            .Map(dest => dest.UserFullName, src => src.UserFullName ?? string.Empty);
+            .Map(dest => dest.CreatedAt, src => Timestamp.FromDateTimeOffset(src.Created));
 
         config.NewConfig<ProtoPt.GetPaymentTransactionSummaryRequest, AppPtSummary.GetPaymentTransactionSummaryQuery>()
             .Map(dest => dest.Filter, src => src.Filter);

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

@@ -40,10 +40,7 @@ public class TransactionsProfile : IRegister
             .Map(dest => dest.PaymentDate, src => src.PaymentDate.HasValue ? Timestamp.FromDateTime(DateTime.SpecifyKind(src.PaymentDate.Value, DateTimeKind.Utc)) : null)
             .Map(dest => dest.RefId, src => src.RefId)
             .Map(dest => dest.Type, src => src.Type)
-            .Map(dest => dest.Created, src => Timestamp.FromDateTime(DateTime.SpecifyKind(src.Created, DateTimeKind.Utc)))
-            .Map(dest => dest.UserId, src => src.UserId)
-            .Map(dest => dest.UserFullName, src => src.UserFullName ?? string.Empty)
-            .Map(dest => dest.Mobile, src => src.Mobile);
+            .Map(dest => dest.Created, src => Timestamp.FromDateTime(DateTime.SpecifyKind(src.Created, DateTimeKind.Utc)));
 
         config.NewConfig<ProtoTx.GetTransactionSummaryRequest, AppTxSummary.GetTransactionSummaryQuery>()
             .Map(dest => dest.Filter, src => src.Filter);

src/CMSMicroservice.WebApi/Dockerfile

@@ -1,12 +1,12 @@
 
 #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM 185.252.31.44:32082/dotnet/aspnet:9.0 AS base
+FROM 194.5.195.53:32082/dotnet/aspnet:9.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM 185.252.31.44:32082/dotnet/sdk:9.0 AS build
+FROM 194.5.195.53:32082/dotnet/sdk:9.0 AS build
 WORKDIR /src
 COPY ["CMSMicroservice.WebApi/CMSMicroservice.WebApi.csproj", "CMSMicroservice.WebApi/"]
 COPY ["CMSMicroservice.Application/CMSMicroservice.Application.csproj", "CMSMicroservice.Application/"]

src/CMSMicroservice.WebApi/Services/PackageService.cs

@@ -32,7 +32,7 @@ public class PackageService : PackageContract.PackageContractBase
     private readonly ISender _sender;
     private readonly IApplicationDbContext _context;
     private readonly ICurrentUserService _currentUserService;
-    private readonly IPaymentGatewayResolver _paymentGatewayResolver;
+    private readonly IPaymentGatewayService _paymentGateway;
     private readonly IConfiguration _configuration;
     private readonly IUserPaymentLock _paymentLock;
 
@@ -41,7 +41,7 @@ public class PackageService : PackageContract.PackageContractBase
         ISender sender,
         IApplicationDbContext context,
         ICurrentUserService currentUserService,
-        IPaymentGatewayResolver paymentGatewayResolver,
+        IPaymentGatewayService paymentGateway,
         IConfiguration configuration,
         IUserPaymentLock paymentLock)
     {
@@ -49,7 +49,7 @@ public class PackageService : PackageContract.PackageContractBase
         _sender = sender;
         _context = context;
         _currentUserService = currentUserService;
-        _paymentGatewayResolver = paymentGatewayResolver;
+        _paymentGateway = paymentGateway;
         _configuration = configuration;
         _paymentLock = paymentLock;
     }
@@ -171,38 +171,19 @@ public class PackageService : PackageContract.PackageContractBase
         
         if (package == null)
             throw new RpcException(new Status(StatusCode.NotFound, "پکیج مورد نظر یافت نشد"));
-
-        var gatewayProvider = NormalizeGatewayProvider(request.GatewayProvider);
-        var isTwentyCard = gatewayProvider == "20card";
-
-        long gatewayAmount = package.Price;
-        if (isTwentyCard)
-        {
-            var packageKey = $"TwentyCard:Packages:{package.Id}";
-            gatewayAmount = _configuration.GetValue<long?>($"{packageKey}:GatewayAmountToman") ?? 0;
-            var walletCredit = _configuration.GetValue<long?>($"{packageKey}:WalletCreditToman") ?? 0;
-            if (gatewayAmount <= 0 || walletCredit <= 0)
-            {
-                throw new RpcException(new Status(
-                    StatusCode.FailedPrecondition,
-                    "پرداخت ۲۰کارت برای این پکیج پیکربندی نشده است"));
-            }
-        }
-
-        // Create transaction — 20card: Amount = gateway charge; zarinpal: Package.Price
+        
+        // Create transaction
         var transaction = new CMSMicroservice.Domain.Entities.Transaction
         {
-            Amount = gatewayAmount,
-            Description = isTwentyCard
-                ? $"خرید پکیج {package.Title} (۲۰کارت)"
-                : $"خرید پکیج {package.Title}",
+            Amount = package.Price,
+            Description = $"خرید پکیج {package.Title}",
             PaymentStatus = Domain.Enums.PaymentStatus.Pending,
             Type = Domain.Enums.TransactionType.Buy
         };
         _context.Transactions.Add(transaction);
         await _context.SaveChangesAsync(cancellationToken);
         
-        // Create purchase record — UPP.Amount always Package.Price (catalog)
+        // Create purchase record
         var purchaseMethod = request.PurchaseMethod == PurchaseMethodEnum.PurchaseMethodGateway 
             ? Domain.Enums.PackagePurchaseMethod.DirectPurchase 
             : Domain.Enums.PackagePurchaseMethod.DayaLoan;
@@ -223,32 +204,20 @@ public class PackageService : PackageContract.PackageContractBase
         var user = await _context.Users
             .AsNoTracking()
             .Where(u => u.Id == userId)
-            .Select(u => new { u.Mobile, u.FirstName, u.LastName, u.Email, u.NationalCode })
+            .Select(u => new { u.Mobile })
             .FirstOrDefaultAsync(cancellationToken);
         
         // Callback URL از config — نه از ورودی کاربر (امنیت)
-        // ۲۰کارت: CallbackBaseUrl اختیاری (مثلاً استیج → kbs2.ir چون دامنه استیج در ترمینال ثبت نیست)
-        var frontOfficeBaseUrl = isTwentyCard
-            ? (_configuration["TwentyCard:CallbackBaseUrl"]
-               ?? _configuration["FrontOfficeBaseUrl"]
-               ?? "https://localhost:5268")
-            : (_configuration["FrontOfficeBaseUrl"] ?? "https://localhost:5268");
-        var callbackUrl = $"{frontOfficeBaseUrl.TrimEnd('/')}/profile/payment-callback?orderId={purchase.Id}";
-
-        var paymentGateway = _paymentGatewayResolver.Get(gatewayProvider);
-        var payerName = $"{user?.FirstName} {user?.LastName}".Trim();
+        var frontOfficeBaseUrl = _configuration["FrontOfficeBaseUrl"] ?? "https://localhost:5268";
+        var callbackUrl = $"{frontOfficeBaseUrl}/profile/payment-callback?orderId={purchase.Id}";
         
-        var paymentResult = await paymentGateway.InitiatePaymentAsync(new PaymentRequest
+        var paymentResult = await _paymentGateway.InitiatePaymentAsync(new PaymentRequest
         {
-            Amount = gatewayAmount,
+            Amount = package.Price,
             UserId = userId,
             Mobile = user?.Mobile ?? string.Empty,
-            Name = payerName,
-            Invoice = purchase.Id.ToString(),
             Description = $"خرید پکیج {package.Title}",
-            CallbackUrl = callbackUrl,
-            Email = user?.Email,
-            NationalId = user?.NationalCode
+            CallbackUrl = callbackUrl
         }, cancellationToken);
         
         if (!paymentResult.IsSuccess)
@@ -266,14 +235,12 @@ public class PackageService : PackageContract.PackageContractBase
         // Save RefId
         transaction.RefId = paymentResult.RefId;
 
-        // ثبت PaymentTransaction — Amount = gateway amount
+        // ثبت PaymentTransaction
         var paymentTx = new PaymentTransaction
         {
-            GatewayProvider = gatewayProvider,
-            MerchantId = isTwentyCard
-                ? (_configuration["TwentyCard:TerminalId"] ?? "")
-                : (_configuration["ZarinPal:MerchantId"] ?? ""),
-            Amount = gatewayAmount,
+            GatewayProvider = _configuration["PaymentProvider"] ?? "zarinpal",
+            MerchantId = _configuration["ZarinPal:MerchantId"] ?? "",
+            Amount = package.Price,
             CallbackUrl = callbackUrl,
             Description = $"خرید پکیج {package.Title}",
             Mobile = user?.Mobile,
@@ -297,14 +264,6 @@ public class PackageService : PackageContract.PackageContractBase
             Authority = paymentResult.RefId ?? string.Empty
         };
     }
-
-    private static string NormalizeGatewayProvider(string? provider)
-    {
-        if (string.IsNullOrWhiteSpace(provider))
-            return "zarinpal";
-        var key = provider.Trim().ToLowerInvariant();
-        return key is "20card" or "twentycard" ? "20card" : "zarinpal";
-    }
     
     public override async Task<CustomerVerifyPackagePurchaseResponse> CustomerVerifyPackagePurchase(
         CustomerVerifyPackagePurchaseRequest request,

src/CMSMicroservice.WebApi/Services/UserService.cs

@@ -15,11 +15,8 @@ using CMSMicroservice.Application.UserCQ.Commands.VerifyOtpToken;
 using CMSMicroservice.Application.UserCQ.Commands.AcceptContract;
 using CMSMicroservice.Application.UserCQ.Queries.GetCustomerProfile;
 using CMSMicroservice.Application.UserCQ.Queries.GetCustomerReferrals;
-using CMSMicroservice.Application.UserCQ.Queries.GetMyInvitees;
-using CMSMicroservice.Application.UserCQ.Queries.GetInvitationsByFilter;
 using CMSMicroservice.Application.UserCQ.Queries.GetCustomerSettings;
 using CMSMicroservice.Application.Common.Interfaces;
-using CMSMicroservice.Application.Common.Authorization;
 using Google.Protobuf.WellKnownTypes;
 using Microsoft.EntityFrameworkCore;
 using Grpc.Core;
@@ -315,117 +312,6 @@ public class UserService : UserContract.UserContractBase
         return response;
     }
 
-    public override async Task<GetMyInviteesResponse> GetMyInvitees(
-        GetMyInviteesRequest request,
-        ServerCallContext context)
-    {
-        var result = await _sender.Send(new GetMyInviteesQuery
-        {
-            UserId = 0,
-            PaginationState = request.PaginationState?.Adapt<AppModels.PaginationState>(),
-            ClubStatusFilter = request.ClubStatusFilter
-        }, context.CancellationToken);
-
-        var response = new GetMyInviteesResponse
-        {
-            MetaData = new MetaData
-            {
-                CurrentPage = result.MetaData.CurrentPage,
-                TotalPage = result.MetaData.TotalPage,
-                PageSize = result.MetaData.PageSize,
-                TotalCount = result.MetaData.TotalCount,
-                HasPrevious = result.MetaData.HasPrevious,
-                HasNext = result.MetaData.HasNext
-            },
-            Stats = new InviteeStats
-            {
-                TotalInvitees = result.Stats.TotalInvitees,
-                ClubActiveCount = result.Stats.ClubActiveCount,
-                ClubInactiveCount = result.Stats.ClubInactiveCount
-            }
-        };
-
-        foreach (var item in result.Invitees)
-        {
-            response.Invitees.Add(new InviteeModel
-            {
-                UserId = item.UserId,
-                FirstName = item.FirstName,
-                LastName = item.LastName,
-                Mobile = item.Mobile,
-                RegisteredAt = Timestamp.FromDateTime(DateTime.SpecifyKind(item.RegisteredAt, DateTimeKind.Utc)),
-                IsClubActive = item.IsClubActive
-            });
-        }
-
-        return response;
-    }
-
-    [RequiresPermission(PermissionNames.UsersView)]
-    public override async Task<GetInvitationsByFilterResponse> GetInvitationsByFilter(
-        GetInvitationsByFilterRequest request,
-        ServerCallContext context)
-    {
-        DateTime? createdFrom = null;
-        DateTime? createdTo = null;
-        if (request.Filter?.CreatedFrom != null)
-            createdFrom = request.Filter.CreatedFrom.ToDateTime();
-        if (request.Filter?.CreatedTo != null)
-            createdTo = request.Filter.CreatedTo.ToDateTime();
-
-        var result = await _sender.Send(new GetInvitationsByFilterQuery
-        {
-            PaginationState = request.PaginationState?.Adapt<AppModels.PaginationState>(),
-            SortBy = request.SortBy,
-            Filter = request.Filter == null ? null : new GetInvitationsByFilterFilterDto
-            {
-                InviterMobile = request.Filter.InviterMobile,
-                InviterFirstName = request.Filter.InviterFirstName,
-                InviterLastName = request.Filter.InviterLastName,
-                InviteeMobile = request.Filter.InviteeMobile,
-                InviteeFirstName = request.Filter.InviteeFirstName,
-                InviteeLastName = request.Filter.InviteeLastName,
-                InviteeClubActive = request.Filter.InviteeClubActive,
-                CreatedFrom = createdFrom,
-                CreatedTo = createdTo
-            }
-        }, context.CancellationToken);
-
-        var response = new GetInvitationsByFilterResponse
-        {
-            MetaData = new MetaData
-            {
-                CurrentPage = result.MetaData.CurrentPage,
-                TotalPage = result.MetaData.TotalPage,
-                PageSize = result.MetaData.PageSize,
-                TotalCount = result.MetaData.TotalCount,
-                HasPrevious = result.MetaData.HasPrevious,
-                HasNext = result.MetaData.HasNext
-            }
-        };
-
-        foreach (var m in result.Models)
-        {
-            response.Models.Add(new InvitationReportModel
-            {
-                Id = m.Id,
-                InviterUserId = m.InviterUserId,
-                InviterFirstName = m.InviterFirstName,
-                InviterLastName = m.InviterLastName,
-                InviterMobile = m.InviterMobile,
-                InviteeUserId = m.InviteeUserId,
-                InviteeFirstName = m.InviteeFirstName,
-                InviteeLastName = m.InviteeLastName,
-                InviteeMobile = m.InviteeMobile,
-                InviteeRegisteredAt = Timestamp.FromDateTime(DateTime.SpecifyKind(m.InviteeRegisteredAt, DateTimeKind.Utc)),
-                InviteeClubActive = m.InviteeClubActive,
-                InvitedAt = Timestamp.FromDateTime(DateTime.SpecifyKind(m.InvitedAt, DateTimeKind.Utc))
-            });
-        }
-
-        return response;
-    }
-
     public override async Task<UploadCustomerAvatarResponse> UploadCustomerAvatar(UploadCustomerAvatarRequest request, ServerCallContext context)
     {
         if (request.FileData == null || request.FileData.Length == 0)

src/CMSMicroservice.WebApi/appsettings.Production.json

@@ -2,38 +2,16 @@
   "PaymentProvider": "zarinpal",
   "ZarinPal": {
     "MerchantId": "4225d555-5fa9-4df0-9b61-1ce152cbbba8",
-    "UseSandbox": true
-  },
-  "TwentyCard": {
-    "BaseUrl": "https://gateway.20card.ir/ipg",
-    "TerminalId": "165674",
-    "TerminalUsername": "ea5y1biehi",
-    "TerminalPassword": "SaLamAT@1404!",
-    "CreditPortalUrl": "https://userpanel.20card.ir/",
-    "CallbackBaseUrl": "https://kbs2.ir",
-    "DefaultEmail": "info@kbs2.ir",
-    "Packages": {
-      "4": {
-        "GatewayAmountToman": 11200000,
-        "WalletCreditToman": 12656000
-      },
-      "1": {
-        "GatewayAmountToman": 11200000,
-        "WalletCreditToman": 12656000
-      }
-    }
-  },
-  "CmsBaseUrl": "https://cms.se.kbs1.ir",
-  "FrontOfficeBaseUrl": "https://frontoffice.se.kbs1.ir",
-  "FMS": {
-    "Address": "https://dl.afrino.co"
+    "UseSandbox": false
   },
+  "CmsBaseUrl": "https://cms.kbs2.ir",
+  "FrontOfficeBaseUrl": "https://kbs2.ir",
   "JwtSecurityKey": "TvlZVx5TJaHs8e9HgUdGzhGP2CIidoI444nAj+8+g7c=",
   "JwtIssuer": "https://localhost",
   "JwtAudience": "https://localhost",
   "JwtExpiryInDays": 5,
   "ConnectionStrings": {
-    "DefaultConnection": "Data Source=185.252.31.44,31433; Initial Catalog=Foursat;User ID=sa;Password=87zH26nbqT;Connection Timeout=300000;MultipleActiveResultSets=True;Encrypt=False",
+    "DefaultConnection": "Server=mssql-svc;Database=KBS;User Id=sa;Password=YourStrong@Passw0rd;TrustServerCertificate=True;",
     "providerName": "System.Data.SqlClient"
   },
   "Otp": {
@@ -42,12 +20,12 @@
   },
   "Monitoring": {
     "SentryEnabled": false,
-    "SentryDsn": "", 
+    "SentryDsn": "",
     "SlackEnabled": false,
     "SlackWebhookUrl": "",
     "EmailAlertsEnabled": false,
     "AdminEmails": [
-      "admin@example.com"  
+      "admin@example.com"
     ],
     "SmsNotificationsEnabled": false,
     "SmsApiKey": "",
@@ -86,7 +64,7 @@
   },
   "BackgroundJobs": {
     "WeeklyCommissionCalculation": {
-      "Enabled": true,
+      "Enabled": false,
       "CronExpression": "5 0 * * 0"
     }
   },
@@ -106,7 +84,13 @@
     "Audience": "domain_api"
   },
   "Seq": {
-    "ServerUrl": "https://seq.afrino.co",
+    "ServerUrl": "http://seq-svc:5341",
     "ApiKey": "oxpvpUzU1pZxMS4s3Fqq"
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Warning",
+      "Microsoft.AspNetCore": "Warning"
+    }
   }
 }

src/CMSMicroservice.WebApi/appsettings.json

@@ -2,42 +2,16 @@
   "PaymentProvider": "zarinpal",
   "ZarinPal": {
     "MerchantId": "4225d555-5fa9-4df0-9b61-1ce152cbbba8",
-    "UseSandbox": true
-  },
-  "TwentyCard": {
-    "BaseUrl": "https://gateway.20card.ir/ipg",
-    "TerminalId": "165674",
-    "TerminalUsername": "ea5y1biehi",
-    "TerminalPassword": "SaLamAT@1404!",
-    "CreditPortalUrl": "https://userpanel.20card.ir/",
-    "DefaultEmail": "info@kbs2.ir",
-    "Packages": {
-      "4": {
-        "GatewayAmountToman": 11200000,
-        "WalletCreditToman": 12656000
-      },
-      "1": {
-        "GatewayAmountToman": 11200000,
-        "WalletCreditToman": 12656000
-      }
-    }
-  },
-  "CmsBaseUrl": "https://localhost:32846",
-  "FrontOfficeBaseUrl": "http://localhost:5268",
-  "FMS": {
-    "Address": "https://dl.afrino.co"
+    "UseSandbox": false
   },
+  "CmsBaseUrl": "https://cms.kbs2.ir",
+  "FrontOfficeBaseUrl": "https://kbs2.ir",
   "JwtSecurityKey": "TvlZVx5TJaHs8e9HgUdGzhGP2CIidoI444nAj+8+g7c=",
   "JwtIssuer": "https://localhost",
   "JwtAudience": "https://localhost",
   "JwtExpiryInDays": 5,
-  "Kestrel": {
-    "EndpointDefaults": {
-      "Protocols": "Http1AndHttp2"
-    }
-  },
   "ConnectionStrings": {
-    "DefaultConnection": "Data Source=185.252.31.44,31433; Initial Catalog=Foursat;User ID=sa;Password=87zH26nbqT;Connection Timeout=300000;MultipleActiveResultSets=True;Encrypt=False",
+    "DefaultConnection": "Server=45.149.79.127,31433;Database=KBS;User Id=sa;Password=YourStrong@Passw0rd;TrustServerCertificate=True;",
     "providerName": "System.Data.SqlClient"
   },
   "Otp": {
@@ -45,12 +19,12 @@
   },
   "Monitoring": {
     "SentryEnabled": false,
-    "SentryDsn": "", 
+    "SentryDsn": "",
     "SlackEnabled": false,
     "SlackWebhookUrl": "",
     "EmailAlertsEnabled": false,
     "AdminEmails": [
-      "admin@example.com"  
+      "admin@example.com"
     ],
     "SmsNotificationsEnabled": false,
     "SmsApiKey": "",
@@ -69,7 +43,7 @@
   "Sms": {
     "Enabled": true,
     "Provider": "Kavenegar",
-    "KavenegarApiKey": "43676A4E786A6C50452F2F6252507939346A5145764B33566B456454374E657A614468706658656D6534593D",
+    "KavenegarApiKey": "497263626F32626A48685A6137524C4F78575A766E4C74694A556B79317648424964655030682B554545413D",
     "Sender": "1000001110100"
   },
   "DayaPayment": {
@@ -89,7 +63,7 @@
   },
   "BackgroundJobs": {
     "WeeklyCommissionCalculation": {
-      "Enabled": true,
+      "Enabled": false,
       "CronExpression": "5 0 * * 0"
     }
   },
@@ -102,12 +76,23 @@
     }
   },
   "AllowedHosts": "*",
+  "Kestrel": {
+    "EndpointDefaults": {
+      "Protocols": "Http2"
+    }
+  },
   "Authentication": {
     "Authority": "https://ids.domain.com/",
     "Audience": "domain_api"
   },
   "Seq": {
-    "ServerUrl": "https://seq.afrino.co",
+    "ServerUrl": "http://seq-svc:5341",
     "ApiKey": "oxpvpUzU1pZxMS4s3Fqq"
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Warning",
+      "Microsoft.AspNetCore": "Warning"
+    }
   }
 }

src/NuGet.config

@@ -3,8 +3,8 @@
   <packageSources>
     <clear />
     <!-- Nexus (hosts FourSat packages + proxies nuget.org) -->
-    <add key="Nexus" value="http://185.252.31.44:32081/repository/nuget-all/index.json" allowInsecureConnections="true" />
-    <add key="foursat-hosted" value="http://185.252.31.44:32081/repository/foursat-nuget-hosted/index.json" allowInsecureConnections="true" />
+    <add key="Nexus" value="http://194.5.195.53:32081/repository/nuget-all/index.json" allowInsecureConnections="true" />
+    <add key="foursat-hosted" value="http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json" allowInsecureConnections="true" />
   </packageSources>
   <packageSourceCredentials>
     <Nexus>