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/prod-deploy.yml

@@ -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
 
@@ -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: |

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/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.WebApi/appsettings.Production.json

@@ -2,19 +2,16 @@
   "PaymentProvider": "zarinpal",
   "ZarinPal": {
     "MerchantId": "4225d555-5fa9-4df0-9b61-1ce152cbbba8",
-    "UseSandbox": true
-  },
-  "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=194.5.195.53,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": {
@@ -23,12 +20,12 @@
   },
   "Monitoring": {
     "SentryEnabled": false,
-    "SentryDsn": "", 
+    "SentryDsn": "",
     "SlackEnabled": false,
     "SlackWebhookUrl": "",
     "EmailAlertsEnabled": false,
     "AdminEmails": [
-      "admin@example.com"  
+      "admin@example.com"
     ],
     "SmsNotificationsEnabled": false,
     "SmsApiKey": "",
@@ -67,7 +64,7 @@
   },
   "BackgroundJobs": {
     "WeeklyCommissionCalculation": {
-      "Enabled": true,
+      "Enabled": false,
       "CronExpression": "5 0 * * 0"
     }
   },
@@ -87,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,24 +2,16 @@
   "PaymentProvider": "zarinpal",
   "ZarinPal": {
     "MerchantId": "4225d555-5fa9-4df0-9b61-1ce152cbbba8",
-    "UseSandbox": true
-  },
-  "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=194.5.195.53,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": {
@@ -27,12 +19,12 @@
   },
   "Monitoring": {
     "SentryEnabled": false,
-    "SentryDsn": "", 
+    "SentryDsn": "",
     "SlackEnabled": false,
     "SlackWebhookUrl": "",
     "EmailAlertsEnabled": false,
     "AdminEmails": [
-      "admin@example.com"  
+      "admin@example.com"
     ],
     "SmsNotificationsEnabled": false,
     "SmsApiKey": "",
@@ -51,7 +43,7 @@
   "Sms": {
     "Enabled": true,
     "Provider": "Kavenegar",
-    "KavenegarApiKey": "43676A4E786A6C50452F2F6252507939346A5145764B33566B456454374E657A614468706658656D6534593D",
+    "KavenegarApiKey": "497263626F32626A48685A6137524C4F78575A766E4C74694A556B79317648424964655030682B554545413D",
     "Sender": "1000001110100"
   },
   "DayaPayment": {
@@ -71,7 +63,7 @@
   },
   "BackgroundJobs": {
     "WeeklyCommissionCalculation": {
-      "Enabled": true,
+      "Enabled": false,
       "CronExpression": "5 0 * * 0"
     }
   },
@@ -84,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"
+    }
   }
 }