From db951699f80664273c2e73e1cea11b5f660e8359 Mon Sep 17 00:00:00 2001
From: masoodafar-web <masoud.afarin.moghaddam@outlook.com>
Date: Fri, 12 Dec 2025 04:22:16 +0330
Subject: [PATCH] fix: handle null pool and adjust week calculation rules

---
 .../GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs        | 4 ++--
 .../GetWeeklyCommissionPoolQueryHandler.cs                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs b/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs
index 1ac83e9..63b4307 100644
--- a/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs
+++ b/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs
@@ -113,8 +113,8 @@ public class GetAvailableWeeksQueryHandler : IRequestHandler<GetAvailableWeeksQu
         var calendar = CultureInfo.InvariantCulture.Calendar;
         var weekOfYear = calendar.GetWeekOfYear(
             date, 
-            CalendarWeekRule.FirstFourDayWeek, 
-            DayOfWeek.Monday);
+            CalendarWeekRule.FirstDay, 
+            DayOfWeek.Saturday);
         
         return $"{date.Year}-W{weekOfYear:D2}";
     }
diff --git a/src/CMSMicroservice.Application/CommissionCQ/Queries/GetWeeklyCommissionPool/GetWeeklyCommissionPoolQueryHandler.cs b/src/CMSMicroservice.Application/CommissionCQ/Queries/GetWeeklyCommissionPool/GetWeeklyCommissionPoolQueryHandler.cs
index 067dfb6..ff34cdf 100644
--- a/src/CMSMicroservice.Application/CommissionCQ/Queries/GetWeeklyCommissionPool/GetWeeklyCommissionPoolQueryHandler.cs
+++ b/src/CMSMicroservice.Application/CommissionCQ/Queries/GetWeeklyCommissionPool/GetWeeklyCommissionPoolQueryHandler.cs
@@ -27,6 +27,6 @@ public class GetWeeklyCommissionPoolQueryHandler : IRequestHandler<GetWeeklyComm
             })
             .FirstOrDefaultAsync(cancellationToken);
 
-        return pool;
+        return pool??new WeeklyCommissionPoolDto();
     }
 }