From 13f24d523b742d5db6a19df7712053db660cf351 Mon Sep 17 00:00:00 2001
From: masoodafar-web <masoud.afarin.moghaddam@outlook.com>
Date: Wed, 24 Dec 2025 01:36:43 +0330
Subject: [PATCH] feat: refine user filtering logic in Chatika account
 activation and Daya loan check jobs

---
 .../BackgroundJobs/ChatikaAccountActivationJob.cs        | 3 +--
 .../Workers/DayaLoanCheckWorker.cs                       | 9 +++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/CMSMicroservice.Infrastructure/BackgroundJobs/ChatikaAccountActivationJob.cs b/src/CMSMicroservice.Infrastructure/BackgroundJobs/ChatikaAccountActivationJob.cs
index 979c5f9..dbb33fd 100644
--- a/src/CMSMicroservice.Infrastructure/BackgroundJobs/ChatikaAccountActivationJob.cs
+++ b/src/CMSMicroservice.Infrastructure/BackgroundJobs/ChatikaAccountActivationJob.cs
@@ -93,8 +93,7 @@ public class ChatikaAccountActivationJob
                     ucf.ClubFeatureId == (long)ClubFeatureType.Chatika &&
                     ucf.ClubMembership.IsActive &&
                     !ucf.IsDeleted &&
-                    ucf.IsActive &&
-                    (ucf.Notes == null || ucf.Notes == "")) // حساب هنوز ساخته نشده
+                    !ucf.IsActive) // حساب هنوز ساخته نشده
                 .ToListAsync(cancellationToken);
 
             if (!pendingUsers.Any())
diff --git a/src/CMSMicroservice.WebApi/Workers/DayaLoanCheckWorker.cs b/src/CMSMicroservice.WebApi/Workers/DayaLoanCheckWorker.cs
index 02df92d..5ef1dab 100644
--- a/src/CMSMicroservice.WebApi/Workers/DayaLoanCheckWorker.cs
+++ b/src/CMSMicroservice.WebApi/Workers/DayaLoanCheckWorker.cs
@@ -39,12 +39,17 @@ public class DayaLoanCheckWorker
         
         try
         {
-            // پیدا کردن کاربرانی که اعتبار دایا را دریافت نکرده‌اند
+
+            // پیدا کردن کاربرانی که:
+            // 1. اعتبار دایا را دریافت نکرده‌اند
+            // 2. کد ملی دارند
+            // 3. قبلاً شماره قرارداد نگرفته‌اند
             var pendingUsers = await _context.Users
                 .Where(u => 
                     u.HasReceivedDayaCredit == false &&
                     u.NationalCode != null &&
-                    u.NationalCode != "")
+                    u.NationalCode != "" 
+                    )
                 .Select(u => new { u.Id, u.NationalCode })
                 .ToListAsync();