From 8ee3fe6f7bdd9378087a9235344ec874fb109b1a Mon Sep 17 00:00:00 2001
From: masoodafar-web <masoud.afarin.moghaddam@outlook.com>
Date: Fri, 12 Dec 2025 07:07:28 +0330
Subject: [PATCH] fix: update week calculation to start from Saturday

---
 .../GetAvailableWeeksQueryHandler.cs          | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs b/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs
index d840504..7e64b3d 100644
--- a/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs
+++ b/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs
@@ -110,13 +110,34 @@ public class GetAvailableWeeksQueryHandler : IRequestHandler<GetAvailableWeeksQu
 
     private static string GetWeekNumber(DateTime date)
     {
-        var calendar = CultureInfo.InvariantCulture.Calendar;
-        var weekOfYear = calendar.GetWeekOfYear(
-            date, 
-            CalendarWeekRule.FirstDay, 
-            DayOfWeek.Saturday);
+        var year = date.Year;
         
-        return $"{date.Year}-W{weekOfYear:D2}";
+        // پیدا کردن اولین شنبه سال
+        var jan1 = new DateTime(year, 1, 1);
+        var jan1DayOfWeek = (int)jan1.DayOfWeek; // 0=Sunday, 1=Monday, ..., 6=Saturday
+        
+        // محاسبه تعداد روزهایی که باید اضافه کنیم تا به اولین شنبه برسیم
+        var daysToFirstSaturday = jan1DayOfWeek == 6 ? 0 : (6 - jan1DayOfWeek + 7) % 7;
+        var firstSaturday = jan1.AddDays(daysToFirstSaturday);
+        
+        // پیدا کردن شنبه شروع هفته جاری
+        var currentDayOfWeek = (int)date.DayOfWeek; // 0=Sun, 1=Mon, ..., 6=Sat
+        var daysToCurrentSaturday = currentDayOfWeek == 6 ? 0 : (currentDayOfWeek + 1) % 7;
+        var weekStartSaturday = date.Date.AddDays(-daysToCurrentSaturday);
+        
+        // محاسبه شماره هفته
+        int weekNum;
+        if (weekStartSaturday < firstSaturday)
+        {
+            weekNum = 1; // هفته اول سال
+        }
+        else
+        {
+            var daysSinceFirstSaturday = (weekStartSaturday - firstSaturday).Days;
+            weekNum = (daysSinceFirstSaturday / 7) + 1;
+        }
+        
+        return $"{year}-W{weekNum:D2}";
     }
 
     private static (DateTime startDate, DateTime endDate) GetWeekRange(DateTime date)