From b19cf5e32ef057052017f648cd2c4be763dbce02 Mon Sep 17 00:00:00 2001
From: masoodafar-web <masoud.afarin.moghaddam@outlook.com>
Date: Fri, 12 Dec 2025 09:39:20 +0330
Subject: [PATCH] fix: use Gregorian week number for API and Persian for
 display

---
 .../GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs b/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs
index bc20198..d5ccd09 100644
--- a/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs
+++ b/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs
@@ -88,14 +88,13 @@ public class GetAvailableWeeksQueryHandler : IRequestHandler<GetAvailableWeeksQu
         
         var isCalculated = pool != null && pool.IsCalculated;
         
-        // تبدیل weekNumber به شمسی
-        var persianWeekNumber = ConvertWeekNumberToPersian(weekNumber, startDate);
-        
         // تبدیل تاریخ به شمسی برای نمایش
         var persianCalendar = new PersianCalendar();
         var startDatePersian = $"{persianCalendar.GetYear(startDate):D4}/{persianCalendar.GetMonth(startDate):D2}/{persianCalendar.GetDayOfMonth(startDate):D2}";
         var endDatePersian = $"{persianCalendar.GetYear(endDate):D4}/{persianCalendar.GetMonth(endDate):D2}/{persianCalendar.GetDayOfMonth(endDate):D2}";
         
+        // تبدیل weekNumber به شمسی فقط برای نمایش
+        var persianWeekNumber = ConvertWeekNumberToPersian(weekNumber, startDate);
         var displayText = $"{persianWeekNumber} ({startDatePersian} - {endDatePersian})";
         
         if (isCalculated)
@@ -105,7 +104,7 @@ public class GetAvailableWeeksQueryHandler : IRequestHandler<GetAvailableWeeksQu
         
         return new WeekInfoDto
         {
-            WeekNumber = persianWeekNumber, // شمسی
+            WeekNumber = weekNumber, // میلادی (برای API)
             StartDate = startDate,
             EndDate = endDate,
             IsCalculated = isCalculated,
@@ -113,7 +112,7 @@ public class GetAvailableWeeksQueryHandler : IRequestHandler<GetAvailableWeeksQu
             LastExecutionStatus = log?.Status.ToString(),
             TotalPoolAmount = pool?.TotalPoolAmount,
             EligibleUsersCount = pool?.UserCommissionPayouts?.Count ?? 0,
-            DisplayText = displayText
+            DisplayText = displayText // شمسی (برای نمایش)
         };
     }