feat: refactor week number handling to use WeekDefinitionId across multiple entities and queries

src/CMSMicroservice.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesQuery.cs

@@ -11,9 +11,10 @@ public record GetUserWeeklyBalancesQuery : IRequest<GetUserWeeklyBalancesRespons
     public long? UserId { get; init; }
 
     /// <summary>
-    /// شماره هفته (اختیاری)
+    /// شناسه تعریف هفته (اختیاری) - روش ترجیحی
     /// </summary>
-    public string? WeekNumber { get; init; }
+    public long? WeekDefinitionId { get; init; }
+
 
     /// <summary>
     /// فقط موارد Expired نشده؟

src/CMSMicroservice.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesQueryHandler.cs

@@ -3,15 +3,20 @@ namespace CMSMicroservice.Application.CommissionCQ.Queries.GetUserWeeklyBalances
 public class GetUserWeeklyBalancesQueryHandler : IRequestHandler<GetUserWeeklyBalancesQuery, GetUserWeeklyBalancesResponseDto>
 {
     private readonly IApplicationDbContext _context;
+    private readonly IWeekDefinitionRepository _weekDefinitionRepository;
 
-    public GetUserWeeklyBalancesQueryHandler(IApplicationDbContext context)
+    public GetUserWeeklyBalancesQueryHandler(
+        IApplicationDbContext context,
+        IWeekDefinitionRepository weekDefinitionRepository)
     {
         _context = context;
+        _weekDefinitionRepository = weekDefinitionRepository;
     }
 
     public async Task<GetUserWeeklyBalancesResponseDto> Handle(GetUserWeeklyBalancesQuery request, CancellationToken cancellationToken)
     {
         var query = _context.NetworkWeeklyBalances
+            .Include(x => x.WeekDefinition)
             .AsNoTracking()
             .AsQueryable();
 
@@ -21,19 +26,20 @@ public class GetUserWeeklyBalancesQueryHandler : IRequestHandler<GetUserWeeklyBa
             query = query.Where(x => x.UserId == request.UserId.Value);
         }
 
-        if (!string.IsNullOrEmpty(request.WeekNumber))
+        // فیلتر بر اساس WeekDefinitionId (روش ترجیحی)
+        if (request.WeekDefinitionId.HasValue)
         {
-            query = query.Where(x => x.WeekNumber == request.WeekNumber);
+            query = query.Where(x => x.WeekDefinitionId == request.WeekDefinitionId.Value);
         }
+    
 
         if (request.OnlyActive.HasValue && request.OnlyActive.Value)
         {
             query = query.Where(x => !x.IsExpired);
         }
 
-        // نمی‌توانیم "-WeekNumber" استفاده کنیم چون WeekNumber یک string است
-        // از Created برای مرتب‌سازی استفاده می‌کنیم (جدیدترین هفته‌ها اول)
-        query = query.ApplyOrder(sortBy: request.SortBy ?? "Created");
+        // مرتب‌سازی بر اساس WeekDefinitionId (نزولی = جدیدترین اول)
+        query = query.ApplyOrder(sortBy: request.SortBy ?? "-WeekDefinitionId");
 
         var meta = await query.GetMetaData(request.PaginationState, cancellationToken);
 
@@ -43,7 +49,8 @@ public class GetUserWeeklyBalancesQueryHandler : IRequestHandler<GetUserWeeklyBa
             {
                 Id = x.Id,
                 UserId = x.UserId,
-                WeekNumber = x.WeekNumber,
+                WeekDefinitionId = x.WeekDefinitionId,
+                WeekDisplayName = x.WeekDefinition != null ? x.WeekDefinition.DisplayName : "",
                 LeftLegBalances = x.LeftLegBalances,
                 RightLegBalances = x.RightLegBalances,
                 TotalBalances = x.TotalBalances,

src/CMSMicroservice.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesQueryValidator.cs

@@ -9,10 +9,10 @@ public class GetUserWeeklyBalancesQueryValidator : AbstractValidator<GetUserWeek
             .WithMessage("شناسه کاربر معتبر نیست")
             .When(x => x.UserId.HasValue);
 
-        RuleFor(x => x.WeekNumber)
-            .Matches(@"^\d{4}-W\d{2}$")
-            .WithMessage("فرمت شماره هفته باید YYYY-Www باشد")
-            .When(x => !string.IsNullOrEmpty(x.WeekNumber));
+        RuleFor(x => x.WeekDefinitionId)
+            .GreaterThan(0)
+            .WithMessage("شماره هفته نمی‌تواند صفر باشد")
+            .When(x => x.WeekDefinitionId.HasValue);
     }
 
     public Func<object, string, Task<IEnumerable<string>>> ValidateValue => async (model, propertyName) =>

src/CMSMicroservice.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesResponseDto.cs

@@ -10,7 +10,9 @@ public class GetUserWeeklyBalancesResponseModel
 {
     public long Id { get; set; }
     public long UserId { get; set; }
-    public string WeekNumber { get; set; } = string.Empty;
+    public long WeekDefinitionId { get; set; }
+
+    public string WeekDisplayName { get; set; } = string.Empty;
     public int LeftLegBalances { get; set; }
     public int RightLegBalances { get; set; }
     public int TotalBalances { get; set; }