add project details to CreateTimeRequestDetailsResponse and handle section validation

# Conflicts:
#	ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Queries/GetMessages/GetMessagesQuery.cs

.gitignore

@@ -364,3 +364,7 @@ MigrationBackup/
 .idea
 /ServiceHost/appsettings.Development.json
 /ServiceHost/appsettings.json
+
+# Storage folder - ignore all uploaded files, thumbnails, and temporary files
+ServiceHost/Storage
+

0_Framework/Application/Enums/TypeOfSmsSetting.cs

@@ -2,6 +2,8 @@
 
 public enum TypeOfSmsSetting
 {
+    //همه انواع پیامک
+    All = 0,
 
     /// <summary>
     /// پیامک
@@ -23,7 +25,7 @@ public enum TypeOfSmsSetting
 
     /// <summary>
     /// پیامک
-    /// هشدار اول
+    /// هشدار بدهی
     /// </summary>
     Warning,
 
@@ -38,4 +40,14 @@ public enum TypeOfSmsSetting
     /// </summary>
     InstitutionContractConfirm,
 
+    /// <summary>
+    /// ارسال کد تاییدیه قرارداد مالی
+    /// </summary>
+    SendInstitutionContractConfirmationCode,
+
+    /// <summary>
+    /// یادآور وظایف
+    /// </summary>
+    TaskReminder,
+
 }

0_Framework/Application/Sms/ApiResultViewModel.cs

@@ -17,4 +17,18 @@ public class ApiResultViewModel
     public string DeliveryUnixTime { get; set; }
     public string DeliveryColor { get; set; }
     public string FullName { get; set; }
+}
+
+
+public class ApiReportDto
+{
+    public int MessageId { get; set; }
+
+    public long Mobile { get; set; }
+
+    public string SendUnixTime { get; set; }
+    public string DeliveryState { get; set; }
+    public string DeliveryUnixTime { get; set; }
+    public string DeliveryColor { get; set; }
+
 }

0_Framework/Application/Sms/ISmsService.cs

@@ -19,6 +19,13 @@ public interface ISmsService
     bool SendAccountsInfo(string number,string fullName, string userName);
     Task<ApiResultViewModel> GetByMessageId(int messId);
     Task<List<ApiResultViewModel>> GetApiResult(string startDate, string endDate);
+
+    #region ForApi
+
+    Task<List<ApiReportDto>> GetApiReport(string startDate, string endDate);
+
+#endregion
+
     string DeliveryStatus(byte? dv);
     string DeliveryColorStatus(byte? dv);
     string UnixTimeStampToDateTime(int? unixTimeStamp);

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Jobs/JobSchedulerRegistrator.cs

@@ -1,5 +1,6 @@
 
 using _0_Framework.Application;
+using _0_Framework.Application.Enums;
 using _0_Framework.Application.Sms;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.InstitutionContractAgg;
@@ -12,19 +13,21 @@ public class JobSchedulerRegistrator
     private readonly IBackgroundJobClient _backgroundJobClient;
     private readonly SmsReminder _smsReminder;
     private readonly IInstitutionContractRepository _institutionContractRepository;
+    private readonly IInstitutionContractSmsServiceRepository _institutionContractSmsServiceRepository;
     private static DateTime? _lastRunCreateTransaction;
     private static DateTime? _lastRunSendMonthlySms;
     private readonly ISmsService _smsService;
     private readonly ILogger<JobSchedulerRegistrator> _logger;
 
 
-    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository, ISmsService smsService, ILogger<JobSchedulerRegistrator> logger)
+    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository, ISmsService smsService, ILogger<JobSchedulerRegistrator> logger, IInstitutionContractSmsServiceRepository institutionContractSmsServiceRepository)
     {
         _smsReminder = smsReminder;
         _backgroundJobClient = backgroundJobClient;
         _institutionContractRepository = institutionContractRepository;
         _smsService = smsService;
         _logger = logger;
+        _institutionContractSmsServiceRepository = institutionContractSmsServiceRepository;
     }
 
     public void Register()
@@ -58,17 +61,43 @@ public class JobSchedulerRegistrator
             "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
         );
 
-        //RecurringJob.AddOrUpdate(
-        //    "InstitutionContract.SendWarningSms",
-        //    () => SendWarningSms(),
-        //    "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
-        //);
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.SendWarningSms",
+            () => SendWarningSms(),
+            "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
+        );
 
-        //RecurringJob.AddOrUpdate(
-        //    "InstitutionContract.SendLegalActionSms",
-        //    () => SendLegalActionSms(),
-        //    "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
-        //);
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.SendLegalActionSms",
+            () => SendLegalActionSms(),
+            "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
+        );
+
+
+
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.Block",
+            () => Block(),
+            "*/30 * * * *"  // هر 30 دقیقه یکبار چک کن
+        );
+
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.UnBlock",
+            () => UnBlock(),
+            "*/10 * * * *"
+        );
+
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.DeActiveInstitutionEndOfContract",
+            () => DeActiveInstitutionEndOfContract(),
+            "*/30 * * * *"
+        );
+
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.BlueDeActiveAfterZeroDebt",
+            () => BlueDeActiveAfterZeroDebt(),
+            "*/10 * * * *"
+        );
     }
 
 
@@ -79,14 +108,14 @@ public class JobSchedulerRegistrator
     [DisableConcurrentExecution(timeoutInSeconds: 1200)]
     public async System.Threading.Tasks.Task CreateFinancialTransaction()
     {
-        var now =DateTime.Now;
+        var now = DateTime.Now;
         var endOfMonth = now.ToFarsi().FindeEndOfMonth();
         var endOfMonthGr = endOfMonth.ToGeorgianDateTime();
         _logger.LogInformation("CreateFinancialTransaction job run");
         if (now.Date == endOfMonthGr.Date && now.Hour >= 2 && now.Hour < 4 &&
             now.Date != _lastRunCreateTransaction?.Date)
         {
-            
+
             var month = endOfMonth.Substring(5, 2);
             var year = endOfMonth.Substring(0, 4);
             var monthName = month.ToFarsiMonthByNumber();
@@ -101,17 +130,17 @@ public class JobSchedulerRegistrator
 
             try
             {
-                 await _institutionContractRepository.CreateTransactionForInstitutionContracts(endNewGr, endNewFa, description);
+                await _institutionContractRepository.CreateTransactionForInstitutionContracts(endNewGr, endNewFa, description);
                 _lastRunCreateTransaction = now;
                 Console.WriteLine("CreateTransAction executed");
-      
+
             }
             catch (Exception e)
             {
                 await _smsService.Alarm("09114221321", "خطا-ایجاد سند مالی");
 
             }
-           
+
         }
     }
 
@@ -134,7 +163,7 @@ public class JobSchedulerRegistrator
 
             try
             {
-                await _institutionContractRepository.SendMonthlySms(now);
+                await _institutionContractSmsServiceRepository.SendMonthlySms(now);
                 _lastRunSendMonthlySms = now;
                 Console.WriteLine("Send Monthly sms executed");
 
@@ -156,7 +185,7 @@ public class JobSchedulerRegistrator
     public async System.Threading.Tasks.Task SendReminderSms()
     {
         _logger.LogInformation("SendReminderSms job run");
-        await _institutionContractRepository.SendReminderSmsForBackgroundTask();
+        await _institutionContractSmsServiceRepository.SendReminderSmsForBackgroundTask();
     }
 
     /// <summary>
@@ -167,7 +196,7 @@ public class JobSchedulerRegistrator
     public async System.Threading.Tasks.Task SendBlockSms()
     {
         _logger.LogInformation("SendBlockSms job run");
-        await _institutionContractRepository.SendBlockSmsForBackgroundTask();
+        await _institutionContractSmsServiceRepository.SendBlockSmsForBackgroundTask();
     }
 
 
@@ -179,7 +208,7 @@ public class JobSchedulerRegistrator
     public async System.Threading.Tasks.Task SendInstitutionContractConfirmSms()
     {
         _logger.LogInformation("SendInstitutionContractConfirmSms job run");
-        await _institutionContractRepository.SendInstitutionContractConfirmSmsTask();
+        await _institutionContractSmsServiceRepository.SendInstitutionContractConfirmSmsTask();
     }
 
     /// <summary>
@@ -190,14 +219,86 @@ public class JobSchedulerRegistrator
     public async System.Threading.Tasks.Task SendWarningSms()
     {
         _logger.LogInformation("SendWarningSms job run");
-        await _institutionContractRepository.SendWarningSmsTask();
+        await _institutionContractSmsServiceRepository.SendWarningOrLegalActionSmsTask(TypeOfSmsSetting.Warning);
     }
 
+    /// <summary>
+    /// پیامک اقدام قضایی 
+    /// </summary>
+    /// <returns></returns>
     [DisableConcurrentExecution(timeoutInSeconds: 100)]
     public async System.Threading.Tasks.Task SendLegalActionSms()
     {
         _logger.LogInformation("SendWarningSms job run");
-        await _institutionContractRepository.SendLegalActionSmsTask();
+        await _institutionContractSmsServiceRepository.SendWarningOrLegalActionSmsTask(TypeOfSmsSetting.LegalAction);
+    }
+
+    /// <summary>
+    /// بلاگ سازی
+    /// </summary>
+    /// <returns></returns>
+    [DisableConcurrentExecution(timeoutInSeconds: 100)]
+    public async System.Threading.Tasks.Task Block()
+    {
+        _logger.LogInformation("block job run");
+        var now = DateTime.Now;
+        var executeDate = now.ToFarsi().Substring(8, 2);
+        if (executeDate == "20")
+        {
+            if (now.Hour >= 9 && now.Hour < 10)
+            {
+                await _institutionContractSmsServiceRepository.Block(now);
+            }
+
+        }
+    }
+
+    /// <summary>
+    /// آنبلاک
+    /// </summary>
+    /// <returns></returns>
+    [DisableConcurrentExecution(timeoutInSeconds: 100)]
+    public async System.Threading.Tasks.Task UnBlock()
+    {
+        _logger.LogInformation("UnBlock job run");
+
+        await _institutionContractSmsServiceRepository.UnBlock();
+
+    }
+
+
+    /// <summary>
+    /// غیر فعال سازی قراداد های پایان یافته
+    /// </summary>
+    /// <returns></returns>
+    [DisableConcurrentExecution(timeoutInSeconds: 100)]
+    public async System.Threading.Tasks.Task DeActiveInstitutionEndOfContract()
+    {
+        _logger.LogInformation("DeActiveInstitutionEndOfContract job run");
+
+
+        var now = DateTime.Now;
+        var executeDate = now.ToFarsi().Substring(8, 2);
+        if (executeDate == "01")
+        {
+            if (now.Hour >= 9 && now.Hour < 10)
+            {
+                await _institutionContractSmsServiceRepository.DeActiveInstitutionEndOfContract(now);
+            }
+
+        }
+
+    }
+
+    /// <summary>
+    /// غیرفعال سازس قرارداد های آبی که بدهی ندارند
+    /// </summary>
+    /// <returns></returns>
+    [DisableConcurrentExecution(timeoutInSeconds: 800)]
+    public async System.Threading.Tasks.Task BlueDeActiveAfterZeroDebt()
+    {
+        _logger.LogInformation("BlueDeActiveAfterZeroDebt job run");
+        await _institutionContractSmsServiceRepository.BlueDeActiveAfterZeroDebt();
     }
 
 }

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -91,65 +91,7 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     Task<List<InstitutionContractPrintViewModel>> PrintAllAsync(List<long> ids);
 
 
-    #region ReminderSMS
-    /// <summary>
-    /// دریافت لیست - ارسال پیامک
-    /// فراخوانی از سمت بک گراند سرویس
-    /// </summary>
-    /// <returns></returns>
-    Task<bool> SendReminderSmsForBackgroundTask();
-
-    /// <summary>
-    /// ارسال پیامک صورت حساب ماهانه
-    /// </summary>
-    /// <param name="now"></param>
-    /// <returns></returns>
-    Task SendMonthlySms(DateTime now);
-
-    /// <summary>
-    /// ارسال پیامک مسدودی از طرف بک گراند سرویس
-    /// </summary>
-    /// <returns></returns>
-    Task SendBlockSmsForBackgroundTask();
-
-    /// <summary>
-    /// دریافت لیست واجد شرایط بلاک
-    /// جهت ارسال پیامک مسدودی
-    /// </summary>
-    /// <param name="checkDate"></param>
-    /// <returns></returns>
-    Task<List<BlockSmsListData>> GetBlockListData(DateTime checkDate);
-
-    /// <summary>
-    /// ارسال پیامک مسدودی
-    /// </summary>
-    /// <param name="smsListData"></param>
-    /// <param name="typeOfSms"></param>
-    /// <param name="sendMessStart"></param>
-    /// <param name="sendMessEnd"></param>
-    /// <returns></returns>
-    Task SendBlockSmsToContractingParties(List<BlockSmsListData> smsListData, string typeOfSms,
-        string sendMessStart, string sendMessEnd);
-
-    /// <summary>
-    ///دریافت لیست بدهکارن
-    /// جهت ارسال پیامک
-    /// </summary>
-    /// <returns></returns>
-    Task<List<SmsListData>> GetSmsListData(DateTime checkDate, TypeOfSmsSetting typeOfSmsSetting);
-
-    /// <summary>
-    /// ارسال پیامک های یاد آور بدهی
-    /// </summary>
-    /// <returns></returns>
-    Task SendReminderSmsToContractingParties(List<SmsListData> smsListData, string typeOfSms, string sendMessStart, string sendMessEnd);
-
-    /// <summary>
-    /// ارسال پیامک یادآور تایید قراداد مالی
-    /// </summary>
-    /// <returns></returns>
-    Task SendInstitutionContractConfirmSmsTask();
-    #endregion
+  
 
     #region CreateMontlyTransaction
 
@@ -162,24 +104,12 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
 
     #endregion
 
-    #region WarningSms
-    /// <summary>
-    /// پیامک های هشدار
-    /// </summary>
-    /// <returns></returns>
-    Task SendWarningSmsTask();
-
-    #endregion
 
 
-    #region legalAction
-    /// <summary>
-    /// پیامک اقدام قضائی
-    /// </summary>
-    /// <returns></returns>
-    Task SendLegalActionSmsTask();
 
-    #endregion
+
+   
+
 
     Task<long> GetIdByInstallmentId(long installmentId);
     Task<InstitutionContract> GetPreviousContract(long currentInstitutionContractId);

Company.Domain/InstitutionContractAgg/IInstitutionContractSmsServiceRepository.cs

@@ -0,0 +1,145 @@
+using _0_Framework.Application.Enums;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.InstitutionContract;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Company.Domain.InstitutionContractAgg;
+
+public interface IInstitutionContractSmsServiceRepository : IRepository<long, InstitutionContract>
+{
+    #region reminderSMs
+
+
+    /// <summary>
+    /// ارسال پیامک یادآور تایید قراداد مالی
+    /// </summary>
+    /// <returns></returns>
+    Task SendInstitutionContractConfirmSmsTask();
+    #endregion
+
+    //هشدار و اقدام قضایی
+    #region WarningOrLegalActionSmsListData
+    /// <summary>
+    /// اجرای تسک پیامک هشدار یا اقدام قضایی
+    /// </summary>
+    /// <param name="typeOfSmsSetting"></param>
+    /// <returns></returns>
+    Task SendWarningOrLegalActionSmsTask(TypeOfSmsSetting typeOfSmsSetting);
+
+    /// <summary>
+    /// دریافت لیست بدهکاران آبی جهت هشدار یا اقدام قضایی
+    /// </summary>
+    /// <param name="typeOfSmsSetting"></param>
+    /// <returns></returns>
+    Task<List<SmsListData>> GetWarningOrLegalActionSmsListData(TypeOfSmsSetting typeOfSmsSetting);
+
+    /// <summary>
+    /// ارسال پیامک هشدار یا اقدام قضایی
+    /// </summary>
+    /// <param name="smsListData"></param>
+    /// <param name="typeOfSmsSetting"></param>
+    /// <returns></returns>
+    Task SendWarningOrLegalActionSms(List<SmsListData> smsListData, TypeOfSmsSetting typeOfSmsSetting);
+
+    #endregion
+
+    //بلاک - آنبلاک - پیامک بلاک - 
+    // غیر فعال سازی قراداد های پایان یافته
+    #region Block
+
+    /// <summary>
+    /// ارسال پیامک مسدودی از طرف بک گراند سرویس
+    /// </summary>
+    /// <returns></returns>
+    Task SendBlockSmsForBackgroundTask();
+
+    /// <summary>
+    /// دریافت لیست واجد شرایط بلاک
+    /// جهت ارسال پیامک مسدودی
+    /// </summary>
+    /// <param name="checkDate"></param>
+    /// <returns></returns>
+    Task<List<BlockSmsListData>> GetBlockListData(DateTime checkDate);
+
+    /// <summary>
+    /// ارسال پیامک مسدودی
+    /// </summary>
+    /// <param name="smsListData"></param>
+    /// <param name="typeOfSms"></param>
+    /// <param name="sendMessStart"></param>
+    /// <param name="sendMessEnd"></param>
+    /// <returns></returns>
+    Task SendBlockSmsToContractingParties(List<BlockSmsListData> smsListData, string typeOfSms,
+        string sendMessStart, string sendMessEnd);
+
+    /// <summary>
+    /// بلاک سازی
+    /// </summary>
+    /// <param name="checkDate"></param>
+    /// <returns></returns>
+    Task Block(DateTime checkDate);
+
+    /// <summary>
+    /// دریافت لیست بدهکارانی که باید بلاک شوند 
+    /// </summary>
+    /// <param name="checkDate"></param>
+    /// <returns></returns>
+    Task<List<long>> GetToBeBlockList(DateTime checkDate);
+
+    /// <summary>
+    /// آنبلاک
+    /// </summary>
+    /// <returns></returns>
+    Task UnBlock();
+
+
+    /// <summary>
+    /// غیر فعالسازی قرارداد های پایان یافته
+    /// </summary>
+    /// <param name="checkDate"></param>
+    /// <returns></returns>
+    Task DeActiveInstitutionEndOfContract(DateTime checkDate);
+
+    /// <summary>
+    /// غیرفعال سازس قرارداد های آبی که بدهی ندارند
+    /// </summary>
+    /// <returns></returns>
+    Task BlueDeActiveAfterZeroDebt();
+    #endregion
+
+
+    #region ReminderSMS
+
+    /// <summary>
+    /// دریافت لیست - ارسال پیامک
+    /// فراخوانی از سمت بک گراند سرویس
+    /// </summary>
+    /// <returns></returns>
+    Task<bool> SendReminderSmsForBackgroundTask();
+
+    /// <summary>
+    /// ارسال پیامک صورت حساب ماهانه
+    /// </summary>
+    /// <param name="now"></param>
+    /// <returns></returns>
+    Task SendMonthlySms(DateTime now);
+
+
+
+    /// <summary>
+    ///دریافت لیست بدهکارن
+    /// جهت ارسال پیامک
+    /// </summary>
+    /// <returns></returns>
+    Task<List<SmsListData>> GetSmsListData(DateTime checkDate, TypeOfSmsSetting typeOfSmsSetting);
+
+    /// <summary>
+    /// ارسال پیامک های یاد آور بدهی
+    /// </summary>
+    /// <returns></returns>
+    Task SendReminderSmsToContractingParties(List<SmsListData> smsListData, string typeOfSms, string sendMessStart, string sendMessEnd);
+
+    #endregion
+}

Company.Domain/SalaryAidAgg/ISalaryAidRepository.cs

@@ -15,12 +15,11 @@ public interface ISalaryAidRepository:IRepository<long,SalaryAid>
 	void RemoveRange(IEnumerable<SalaryAid> salaryAids);
 
 	#region Pooya
-
 	/// <summary>
 	/// گروهبندی بر اساس ماه هنگام جستجو با انتخاب کارمند
 	/// </summary>
 
-	SalaryAidsGroupedViewModel GetSearchListAsGrouped(SalaryAidSearchViewModel searchModel); 
+	SalaryAidsGroupedViewModel GetSearchListAsGrouped(SalaryAidSearchViewModel searchModel);
 	#endregion
 
 }

Company.Domain/SmsResultAgg/ISmsResultRepository.cs

@@ -1,10 +1,30 @@
-using CompanyManagment.App.Contracts.SmsResult;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.SmsResult;
+using CompanyManagment.App.Contracts.SmsResult.Dto;
 using System.Collections.Generic;
-using _0_Framework.Domain;
+using System.Threading.Tasks;
 
 namespace Company.Domain.SmsResultAgg;
 
 public interface ISmsResultRepository : IRepository<long, SmsResult>
 {
+    #region ForApi
+
+    /// <summary>
+    /// دریافت لیست پیامکها
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<List<SmsReportDto>> GetSmsReportList(SmsReportSearchModel searchModel);
+
+    /// <summary>
+    /// دریافت اکسپند لیست هر تاریخ
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <param name="date"></param>
+    /// <returns></returns>
+    Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date);
+
+    #endregion
     List<SmsResultViewModel> Search(SmsResultSearchModel searchModel);
 }

CompanyManagment.App.Contracts/SmsResult/Dto/SendStatus.cs

@@ -0,0 +1,15 @@
+namespace CompanyManagment.App.Contracts.SmsResult.Dto;
+
+/// <summary>
+/// وضعیت ارسال پیامک
+/// </summary>
+public enum SendStatus
+{
+    All=0,
+    /// <summary>
+    /// موفق
+    /// </summary>
+    Success,
+    //ناموفق
+    Failed,
+}

CompanyManagment.App.Contracts/SmsResult/Dto/SmsReportDto.cs

@@ -0,0 +1,54 @@
+using System;
+
+namespace CompanyManagment.App.Contracts.SmsResult.Dto;
+
+public class SmsReportDto
+{
+    /// <summary>
+    /// تاریخ ارسال
+    /// </summary>
+    public string SentDate { get; set; }
+
+
+}
+
+public class SmsReportListDto
+{
+    /// <summary>
+    /// آی دی
+    /// </summary>
+    public long Id { get; set; }
+    /// <summary>
+    /// آی دی پیامک در sms.ir
+    /// </summary>
+    public int MessageId { get; set; }
+
+    /// <summary>
+    /// وضعیت ارسال
+    /// </summary>
+    public string Status { get; set; }
+
+    /// <summary>
+    /// نوع پیامک
+    /// </summary>
+    public string TypeOfSms { get; set; }
+
+    /// <summary>
+    /// نام طرف حساب
+    /// </summary>
+    public string ContractingPartyName { get; set; }
+
+    /// <summary>
+    /// شماره موبایل
+    /// </summary>
+    public string Mobile { get; set; }
+
+
+    /// <summary>
+    /// ساعت و دقیقه
+    /// </summary>
+    public string HourAndMinute { get; set; }
+}
+
+
+

CompanyManagment.App.Contracts/SmsResult/Dto/SmsReportSearchModel.cs

@@ -0,0 +1,43 @@
+using _0_Framework.Application.Enums;
+
+namespace CompanyManagment.App.Contracts.SmsResult.Dto;
+
+public class SmsReportSearchModel
+{
+    //نوع پیامک
+    public TypeOfSmsSetting TypeOfSms { get; set; }
+
+    /// <summary>
+    /// وضعیت ارسال پیامک
+    /// </summary>
+    public SendStatus SendStatus { get; set; }
+
+    /// <summary>
+    /// شماره موبایل
+    /// </summary>
+    public string Mobile { get; set; }
+
+    /// <summary>
+    /// آی دی طرف حساب
+    /// </summary>
+    public long ContractingPatyId { get; set; }
+
+    /// <summary>
+    /// سال
+    /// </summary>
+    public string Year { get; set; }
+    /// <summary>
+    /// ماه
+    /// </summary>
+    public string Month { get; set; }
+
+    /// <summary>
+    /// تاریخ شروع
+    /// </summary>
+    public string StartDateFa { get; set; }
+
+    /// <summary>
+    /// تاریخ پایان
+    /// </summary>
+    public string EndDateFa { get; set; }
+}

CompanyManagment.App.Contracts/SmsResult/ISmsResultApplication.cs

@@ -1,14 +1,34 @@
-using System;
+using _0_Framework.Application;
+using CompanyManagment.App.Contracts.SmsResult.Dto;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using _0_Framework.Application;
 
 namespace CompanyManagment.App.Contracts.SmsResult;
 
 public interface ISmsResultApplication
 {
+    #region ForApi
+
+    /// <summary>
+    /// دریافت لیست پیامکها
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    Task<List<SmsReportDto>> GetSmsReportList(SmsReportSearchModel searchModel);
+
+    /// <summary>
+    /// دریافت اکسپند لیست هر تاریخ
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <param name="date"></param>
+    /// <returns></returns>
+    Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date);
+
+    #endregion
+
     OperationResult Create(CreateSmsResult command);
     List<SmsResultViewModel> Search(SmsResultSearchModel searchModel);
 }

CompanyManagment.Application/SmsResultApplication.cs

@@ -1,8 +1,10 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using Company.Domain.SmsResultAgg;
 using CompanyManagment.App.Contracts.SmsResult;
+using CompanyManagment.App.Contracts.SmsResult.Dto;
 
 namespace CompanyManagment.Application;
 
@@ -15,6 +17,23 @@ public class SmsResultApplication : ISmsResultApplication
         _smsResultRepository = smsResultRepository;
     }
 
+
+    #region ForApi
+
+    public async Task<List<SmsReportDto>> GetSmsReportList(SmsReportSearchModel searchModel)
+    {
+        return await _smsResultRepository.GetSmsReportList(searchModel);
+    }
+
+    public async Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date)
+    {
+        return await _smsResultRepository.GetSmsReportExpandList(searchModel, date);
+    }
+
+    #endregion
+
+
+
     public OperationResult Create(CreateSmsResult command)
     {
         var op = new OperationResult();

CompanyManagment.Application/SmsSettingApplication.cs

@@ -1,13 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using _0_Framework.Application;
+using _0_Framework.Application;
 using _0_Framework.Application.Enums;
 using Company.Domain.InstitutionContractAgg;
 using Company.Domain.SmsResultAgg;
 using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.SmsResult;
+using CompanyManagment.EFCore.Repository;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace CompanyManagment.Application;
 
@@ -15,11 +16,13 @@ public class SmsSettingApplication : ISmsSettingApplication
 {
     private readonly ISmsSettingsRepository _smsSettingsRepository;
     private readonly IInstitutionContractRepository _institutionContractRepository;
+    private readonly IInstitutionContractSmsServiceRepository _institutionContractSmsServiceRepository;
 
-    public SmsSettingApplication(ISmsSettingsRepository smsSettingsRepository, IInstitutionContractRepository institutionContractRepository)
+    public SmsSettingApplication(ISmsSettingsRepository smsSettingsRepository, IInstitutionContractRepository institutionContractRepository, IInstitutionContractSmsServiceRepository institutionContractSmsServiceRepository)
     {
         _smsSettingsRepository = smsSettingsRepository;
         _institutionContractRepository = institutionContractRepository;
+        _institutionContractSmsServiceRepository = institutionContractSmsServiceRepository;
     }
 
 
@@ -116,12 +119,12 @@ public class SmsSettingApplication : ISmsSettingApplication
 
     public async Task<List<SmsListData>> GetSmsListData(TypeOfSmsSetting typeOfSmsSetting)
     {
-       return await _institutionContractRepository.GetSmsListData(DateTime.Now, typeOfSmsSetting);
+       return await _institutionContractSmsServiceRepository.GetSmsListData(DateTime.Now, typeOfSmsSetting);
     }
 
     public async Task<List<BlockSmsListData>> GetBlockSmsListData(TypeOfSmsSetting typeOfSmsSetting)
     {
-        return await _institutionContractRepository.GetBlockListData(DateTime.Now);
+        return await _institutionContractSmsServiceRepository.GetBlockListData(DateTime.Now);
     }
 
 
@@ -134,7 +137,7 @@ public class SmsSettingApplication : ISmsSettingApplication
 
         if (command.Any())
         {
-            await _institutionContractRepository.SendReminderSmsToContractingParties(command, typeOfSms, sendMessStart, sendMessEnd);
+            await _institutionContractSmsServiceRepository.SendReminderSmsToContractingParties(command, typeOfSms, sendMessStart, sendMessEnd);
             return op.Succcedded();
         }
         else
@@ -153,7 +156,7 @@ public class SmsSettingApplication : ISmsSettingApplication
         string sendMessEnd = "پایان مسدودی آنی ";
         if (command.Any())
         {
-            await _institutionContractRepository.SendBlockSmsToContractingParties(command, typeOfSms, sendMessStart,
+            await _institutionContractSmsServiceRepository.SendBlockSmsToContractingParties(command, typeOfSms, sendMessStart,
                 sendMessEnd);
             return op.Succcedded();
         }

CompanyManagment.EFCore/Repository/SmsResultRepository.cs

@@ -1,13 +1,20 @@
-using System.Collections.Generic;
-using System.Linq;
-using _0_Framework.Application;
+using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using Company.Domain.SmsResultAgg;
 using CompanyManagment.App.Contracts.SmsResult;
+using CompanyManagment.App.Contracts.SmsResult.Dto;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using _0_Framework.Application.Enums;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
 namespace CompanyManagment.EFCore.Repository;
 
-public class SmsResultRepository : RepositoryBase<long, SmsResult> , ISmsResultRepository
+public class SmsResultRepository : RepositoryBase<long, SmsResult>, ISmsResultRepository
 {
     private readonly CompanyContext _context;
     public SmsResultRepository(CompanyContext context) : base(context)
@@ -15,9 +22,263 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult> , ISmsResultR
         _context = context;
     }
 
+    #region ForApi
+
+
+
+    public async Task<List<SmsReportDto>> GetSmsReportList(SmsReportSearchModel searchModel)
+    {
+
+        // مرحله 1: همه رکوردها را با projection ساده بگیرید
+        var rawQuery = await _context.SmsResults
+            .Select(x => new
+            {
+                x.id,
+                x.ContractingPatyId,
+                x.Mobile,
+                x.Status,
+                x.TypeOfSms,
+                x.CreationDate,
+                DateOnly = x.CreationDate.Date // فقط تاریخ بدون ساعت
+            })
+            .AsNoTracking()
+            .ToListAsync(); // اینجا SQL اجرا می‌شود و همه داده‌ها به client می‌آیند
+
+        if (searchModel.ContractingPatyId > 0)
+        {
+            rawQuery = rawQuery.Where(x => x.ContractingPatyId == searchModel.ContractingPatyId).ToList();
+        }
+
+        if (!string.IsNullOrWhiteSpace(searchModel.Mobile))
+        {
+            rawQuery = rawQuery.Where(x => x.Mobile.Contains(searchModel.Mobile)).ToList();
+        }
+       
+        if (searchModel.TypeOfSms != TypeOfSmsSetting.All && searchModel.TypeOfSms != TypeOfSmsSetting.Warning)
+        {
+            var typeOfSms = "All";
+            switch (searchModel.TypeOfSms)
+            {
+                case TypeOfSmsSetting.InstitutionContractDebtReminder:
+                    typeOfSms = "یادآور بدهی ماهانه";
+                    break;
+                case TypeOfSmsSetting.MonthlyInstitutionContract:
+                    typeOfSms = "صورت حساب ماهانه";
+                    break;
+                case TypeOfSmsSetting.BlockContractingParty:
+                    typeOfSms = "اعلام مسدودی طرف حساب";
+                    break;
+                case TypeOfSmsSetting.LegalAction:
+                    typeOfSms = "اقدام قضایی";
+                    break;
+                case TypeOfSmsSetting.InstitutionContractConfirm:
+                    typeOfSms = "یادآور تایید قرارداد مالی";
+                    break;
+                case TypeOfSmsSetting.SendInstitutionContractConfirmationCode:
+                    typeOfSms = "کد تاییدیه قرارداد مالی";
+                    break;
+                case TypeOfSmsSetting.TaskReminder:
+                    typeOfSms = "یادآور وظایف";
+                    break;
+            }
+
+            rawQuery = rawQuery.Where(x => x.TypeOfSms == typeOfSms).ToList();
+        }
+
+        if (searchModel.TypeOfSms == TypeOfSmsSetting.Warning)
+        {
+            rawQuery = rawQuery.Where(x => x.TypeOfSms.Contains("هشدار")).ToList();
+        }
+
+        if (searchModel.SendStatus != SendStatus.All)
+        {
+            var status = "All";
+
+            switch (searchModel.SendStatus)
+            {
+                case SendStatus.Success: status = "موفق";
+                    break;
+                case SendStatus.Failed: status = "ناموفق";
+                    break;
+
+            
+            }
+
+            rawQuery = rawQuery.Where(x => x.Status == status).ToList();
+
+        }
+        #region searchByDate
+
+        if (!string.IsNullOrWhiteSpace(searchModel.StartDateFa) &&
+            !string.IsNullOrWhiteSpace(searchModel.EndDateFa))
+        {
+            if (searchModel.StartDateFa.TryToGeorgianDateTime(out var startGr) == false ||
+                searchModel.EndDateFa.TryToGeorgianDateTime(out var endGr) == false)
+                return new List<SmsReportDto>();
+
+            rawQuery = rawQuery.Where(x => x.CreationDate.Date >= startGr.Date && x.CreationDate.Date <= endGr.Date).ToList();
+
+        }
+        else
+        {
+            if (!string.IsNullOrWhiteSpace(searchModel.Year) && !string.IsNullOrWhiteSpace(searchModel.Month))
+            {
+                var start = searchModel.Year + "/" + searchModel.Month + "/01";
+                var end = start.FindeEndOfMonth();
+                var startGr = start.ToGeorgianDateTime();
+                var endGr = end.ToGeorgianDateTime();
+                rawQuery = rawQuery.Where(x => x.CreationDate.Date >= startGr.Date && x.CreationDate.Date <= endGr.Date).ToList();
+
+
+            }
+            else if (!string.IsNullOrWhiteSpace(searchModel.Year) && string.IsNullOrWhiteSpace(searchModel.Month))
+            {
+                var start = searchModel.Year + "/01/01";
+                var findEndOfYear = searchModel.Year + "/12/01";
+                var end = findEndOfYear.FindeEndOfMonth();
+                var startGr = start.ToGeorgianDateTime();
+                var endGr = end.ToGeorgianDateTime();
+                rawQuery = rawQuery.Where(x => x.CreationDate.Date >= startGr.Date && x.CreationDate.Date <= endGr.Date).ToList();
+
+            }
+        }
+
+        #endregion
+
+        // مرحله 2: گروه‌بندی و انتخاب آخرین رکورد هر روز روی Client
+        var grouped = rawQuery
+            .GroupBy(x => x.DateOnly)
+            .Select(g => g.OrderByDescending(x => x.CreationDate).First())
+            .OrderByDescending(x => x.CreationDate)
+            .ToList();
+
+        // مرحله 3: تبدیل به DTO و ToFarsi
+        var result = grouped.Select(x => new SmsReportDto
+        {
+            SentDate = x.CreationDate.ToFarsi()
+        }).ToList();
+        return result;
+    }
+
+
+    public async Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date)
+    {
+        if(string.IsNullOrWhiteSpace(date))
+            return new List<SmsReportListDto>();
+
+        if (date.TryToGeorgianDateTime(out var searchDate) == false)
+            return new List<SmsReportListDto>();
+
+        var query = await _context.SmsResults.Where(x => x.CreationDate.Date == searchDate.Date)
+            .Select(x =>
+                new
+                {
+                    x.id,
+                    x.MessageId,
+                    x.Status,
+                    x.TypeOfSms,
+                    x.ContractingPartyName,
+                    x.Mobile,
+                    x.ContractingPatyId,
+                    x.InstitutionContractId,
+                    x.CreationDate,
+                    x.CreationDate.Hour,
+                    x.CreationDate.Minute
+
+                }).AsNoTracking()
+            .ToListAsync(); ;
+
+        if (searchModel.ContractingPatyId > 0)
+        {
+            query = query.Where(x => x.ContractingPatyId == searchModel.ContractingPatyId).ToList();
+        }
+
+        if (!string.IsNullOrWhiteSpace(searchModel.Mobile))
+        {
+            query = query.Where(x => x.Mobile.Contains(searchModel.Mobile)).ToList();
+        }
+
+        if (searchModel.TypeOfSms != TypeOfSmsSetting.All && searchModel.TypeOfSms != TypeOfSmsSetting.Warning)
+        {
+            var typeOfSms = "All";
+            switch (searchModel.TypeOfSms)
+            {
+                case TypeOfSmsSetting.InstitutionContractDebtReminder:
+                    typeOfSms = "یادآور بدهی ماهانه";
+                    break;
+                case TypeOfSmsSetting.MonthlyInstitutionContract:
+                    typeOfSms = "صورت حساب ماهانه";
+                    break;
+                case TypeOfSmsSetting.BlockContractingParty:
+                    typeOfSms = "اعلام مسدودی طرف حساب";
+                    break;
+                case TypeOfSmsSetting.LegalAction:
+                    typeOfSms = "اقدام قضایی";
+                    break;
+                case TypeOfSmsSetting.InstitutionContractConfirm:
+                    typeOfSms = "یادآور تایید قرارداد مالی";
+                    break;
+                case TypeOfSmsSetting.SendInstitutionContractConfirmationCode:
+                    typeOfSms = "کد تاییدیه قرارداد مالی";
+                    break;
+                case TypeOfSmsSetting.TaskReminder:
+                    typeOfSms = "یادآور وظایف";
+                    break;
+            }
+
+            query = query.Where(x => x.TypeOfSms == typeOfSms).ToList();
+        }
+
+        if (searchModel.TypeOfSms == TypeOfSmsSetting.Warning)
+        {
+            query = query.Where(x => x.TypeOfSms.Contains("هشدار")).ToList();
+        }
+
+        if (searchModel.SendStatus != SendStatus.All)
+        {
+            var status = "All";
+
+            switch (searchModel.SendStatus)
+            {
+                case SendStatus.Success:
+                    status = "موفق";
+                    break;
+                case SendStatus.Failed:
+                    status = "ناموفق";
+                    break;
+
+
+            }
+
+            query = query.Where(x => x.Status == status).ToList();
+
+        }
+
+        if (query.Count == 0)
+            return new List<SmsReportListDto>();
+
+        var result =  query.OrderByDescending(x => x.CreationDate.Hour)
+            .ThenByDescending(x => x.CreationDate.Minute).Select(x =>
+                new SmsReportListDto()
+                {
+                    Id = x.id,
+                    MessageId = x.MessageId,
+                    Status = x.Status,
+                    TypeOfSms = x.TypeOfSms,
+                    ContractingPartyName = x.ContractingPartyName,
+                    Mobile = x.Mobile,
+                    HourAndMinute = x.CreationDate.TimeOfDay.ToString(@"hh\:mm"),
+                }).ToList();
+
+        return result;
+
+    }
+
+    #endregion
+
     public List<App.Contracts.SmsResult.SmsResultViewModel> Search(SmsResultSearchModel searchModel)
     {
-       
+
         var query = _context.SmsResults.Select(x => new App.Contracts.SmsResult.SmsResultViewModel()
         {
             Id = x.id,
@@ -64,7 +325,7 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult> , ISmsResultR
                 var endGr = end.ToGeorgianDateTime();
                 query = query.Where(x => x.CreationDate.Date >= startGr.Date && x.CreationDate.Date <= endGr.Date);
 
-                  
+
             }
             else if (!string.IsNullOrWhiteSpace(searchModel.Year) && string.IsNullOrWhiteSpace(searchModel.Month))
             {
@@ -74,7 +335,7 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult> , ISmsResultR
                 var startGr = start.ToGeorgianDateTime();
                 var endGr = end.ToGeorgianDateTime();
                 query = query.Where(x => x.CreationDate.Date >= startGr.Date && x.CreationDate.Date <= endGr.Date);
-               
+
             }
         }
 
@@ -82,12 +343,12 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult> , ISmsResultR
 
 
         query = query.OrderByDescending(x => x.CreationDate)
-            .ThenByDescending(x=>x.CreationDate.Hour).ThenByDescending(x=>x.CreationDate.Minute);
-          
+            .ThenByDescending(x => x.CreationDate.Hour).ThenByDescending(x => x.CreationDate.Minute);
+
         return query.Skip(searchModel.PageIndex).Take(30).ToList();
-            
-              
+
+
     }
 
-       
+
 }

CompanyManagment.EFCore/Services/SmsService.cs

@@ -207,16 +207,11 @@ public class SmsService : ISmsService
     }
     public async Task<List<ApiResultViewModel>> GetApiResult(string startDate, string endDate)
     {
-        var st = new DateTime(2024, 6, 2);
-        var ed = new DateTime(2024, 7, 1);
-        if (!string.IsNullOrWhiteSpace(startDate) && startDate.Length == 10)
-        {
-            st = startDate.ToGeorgianDateTime();
-        }
-        if (!string.IsNullOrWhiteSpace(endDate) && endDate.Length == 10)
-        {
-            ed = endDate.ToGeorgianDateTime();
-        }
+
+
+        if(startDate.TryToGeorgianDateTime(out var st) == false || endDate.TryToGeorgianDateTime(out var ed) == false)
+            return new List<ApiResultViewModel>();
+
         var res = new List<ApiResultViewModel>();
         Int32 unixTimestamp = (int)st.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
         Int32 unixTimestamp2 = (int)ed.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
@@ -248,6 +243,44 @@ public class SmsService : ISmsService
         return res;
     }
 
+    public async Task<List<ApiReportDto>> GetApiReport(string startDate, string endDate)
+    {
+
+
+        if (startDate.TryToGeorgianDateTime(out var st) == false || endDate.TryToGeorgianDateTime(out var ed) == false)
+            return new List<ApiReportDto>();
+
+        var res = new List<ApiReportDto>();
+        Int32 unixTimestamp = (int)st.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
+        Int32 unixTimestamp2 = (int)ed.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
+        //   int? fromDateUnixTime = null; // unix time - for instance: 1700598600
+        //int? toDateUnixTime = null; // unix time - for instance: 1703190600
+        int pageNumber = 2;
+        int pageSize = 100; // max: 100
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+        var response = await smsIr.GetArchivedReportAsync(pageNumber, pageSize, unixTimestamp, unixTimestamp2);
+
+        MessageReportResult[] messages = response.Data;
+        foreach (var message in messages)
+        {
+            var appendData = new ApiReportDto()
+            {
+                MessageId = message.MessageId,
+    
+                Mobile = message.Mobile,
+
+                SendUnixTime = UnixTimeStampToDateTime(message.SendDateTime),
+                DeliveryState = DeliveryStatus(message.DeliveryState),
+                DeliveryUnixTime = UnixTimeStampToDateTime(message.DeliveryDateTime),
+                DeliveryColor = DeliveryColorStatus(message.DeliveryState),
+            };
+            res.Add(appendData);
+        }
+
+
+        return res;
+    }
+
     public string DeliveryStatus(byte? dv)
     {
         string mess = "";

DadmehrGostar.sln

@@ -89,6 +89,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BackgroundInstitutionContract.Task", "BackgroundInstitutionContract\BackgroundInstitutionContract.Task\BackgroundInstitutionContract.Task.csproj", "{F78FBB92-294B-88BA-168D-F0C578B0D7D6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProgramManager", "ProgramManager", "{67AFF7B6-4C4F-464C-A90D-9BDB644D83A9}"
+	ProjectSection(SolutionItems) = preProject
+		ProgramManager\appsettings.FileStorage.json = ProgramManager\appsettings.FileStorage.json
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{48F6F6A5-7340-42F8-9216-BEB7A4B7D5A1}"
 EndProject

PersonalContractingParty.Config/PersonalBootstrapper.cs

@@ -563,6 +563,7 @@ public class PersonalBootstrapper
         services.AddTransient<ISmsSettingsRepository, SmsSettingsRepository>();
         services.AddTransient<ISmsSettingApplication, SmsSettingApplication>();
 
+        services.AddTransient<IInstitutionContractSmsServiceRepository, InstitutionContractSmsServiceRepository>();
         #endregion
 
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/GozareshgirProgramManager.Application.csproj

@@ -9,6 +9,7 @@
     <ItemGroup>
         <PackageReference Include="FluentValidation" Version="12.1.1" />
         <PackageReference Include="MediatR" Version="14.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
     </ItemGroup>
@@ -18,4 +19,10 @@
       <ProjectReference Include="..\..\Domain\GozareshgirProgramManager.Domain\GozareshgirProgramManager.Domain.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Reference Include="Microsoft.AspNetCore.Http.Features">
+        <HintPath>C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App\10.0.1\Microsoft.AspNetCore.Http.Features.dll</HintPath>
+      </Reference>
+    </ItemGroup>
+
 </Project>

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Checkouts/Commands/CreateCheckout/CreateOrEditCheckoutCommandHandler.cs

@@ -209,22 +209,38 @@ public class CreateOrEditCheckoutCommandHandler : IBaseCommandHandler<CreateOrEd
             }
 
         }
-        //حقوق نهایی
-        var monthlySalaryPay = (totalHoursWorked * monthlySalaryDefined) / mandatoryHours;
-        // اگر اضافه کار داشت حقوق تعین شده به عنوان حقوق نهایی در نظر گرفته میشود
-        monthlySalaryPay = monthlySalaryPay > monthlySalaryDefined ? monthlySalaryDefined : monthlySalaryPay;
+        ////حقوق نهایی
+        //var monthlySalaryPay = (totalHoursWorked * monthlySalaryDefined) / mandatoryHours;
+        //// اگر اضافه کار داشت حقوق تعین شده به عنوان حقوق نهایی در نظر گرفته میشود
+        //monthlySalaryPay = monthlySalaryPay > monthlySalaryDefined ? monthlySalaryDefined : monthlySalaryPay;
 
-        //حقوق کسر شده
-        var deductionFromSalary = monthlySalaryDefined - monthlySalaryPay;
+        ////حقوق کسر شده
+        //var deductionFromSalary = monthlySalaryDefined - monthlySalaryPay;
+
+        //new chang salary compute
+        var monthlySalaryPay = totalHoursWorked * monthlySalaryDefined;
 
         //زمان باقی مانده
         var remainingTime = totalHoursWorked - mandatoryHours;
 
+
+        //تناسب به دقیقه
+        #region MyRegion
+
+        //var monthlySalaryDefinedTest = monthlySalaryDefined * mandatoryHours;
+        //var monthlySalaryPayTest = totalHoursWorked * monthlySalaryDefined;
+        ////// اگر اضافه کار داشت حقوق تعین شده به عنوان حقوق نهایی در نظر گرفته میشود
+        //monthlySalaryPayTest = monthlySalaryPayTest > monthlySalaryDefinedTest ? monthlySalaryDefinedTest : monthlySalaryPayTest;
+        //////حقوق کسر شده
+        //var deductionFromSalaryTest = monthlySalaryDefinedTest - monthlySalaryPayTest;
+
+        #endregion
+
         var computeResult = new ComputeResultDto
         {
             MandatoryHours = mandatoryHours,
             MonthlySalaryPay = monthlySalaryPay,
-            DeductionFromSalary = deductionFromSalary,
+            DeductionFromSalary = 0 /*deductionFromSalary*/,
             RemainingHours = remainingTime
         };
         Console.WriteLine(mandatoryHours);

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Checkouts/Queries/GetUserToGropCreate/GetUserToGroupCreatingQueryHandler.cs

@@ -1,10 +1,11 @@
-using GozareshgirProgramManager.Application._Common.Interfaces;
+using DNTPersianUtils.Core;
+using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Application.Modules.SalaryPaymentSettings.Queries.GetUserListWhoHaveSettings;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.CheckoutAgg.Enums;
 using Microsoft.EntityFrameworkCore;
-using PersianTools.Core;
+using PersianDateTime = PersianTools.Core.PersianDateTime;
 
 namespace GozareshgirProgramManager.Application.Modules.Checkouts.Queries.GetUserToGropCreate;
 
@@ -45,8 +46,8 @@ public class GetUserToGroupCreatingQueryHandler : IBaseQueryHandler<GetUserToGro
                 "ایجاد فیش فقط برای ماه های گذشته امکان پذیر است");
 
 
-        var lastMonthStart = lastMonth; 
-        var lastMonthEnd = lastMonth;  
+        //var lastMonthStart = lastMonth; 
+        var lastMonthEnd = ((selectedDate.ToFarsi().FindeEndOfMonth())).ToGeorgianDateTime();  
 
         var query =
             await (from u in _context.Users
@@ -60,8 +61,8 @@ public class GetUserToGroupCreatingQueryHandler : IBaseQueryHandler<GetUserToGro
                     // LEFT JOIN 
                     //فیش
                     join ch in _context.Checkouts
-                            .Where(x => x.CheckoutStartDate < lastMonthStart
-                                        && x.CheckoutEndDate >= lastMonthStart)
+                            .Where(x => x.CheckoutStartDate < lastMonthEnd
+                                        && x.CheckoutEndDate > selectedDate)
                         on u.Id equals ch.UserId into chJoin
                     from ch in chJoin.DefaultIfEmpty()
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AddTaskToPhase/AddTaskToPhaseCommand.cs

@@ -10,7 +10,7 @@ public record AddTaskToPhaseCommand(
     Guid PhaseId,
     string Name,
     string? Description = null,
-    TaskPriority Priority = TaskPriority.Medium,
+    ProjectTaskPriority Priority = ProjectTaskPriority.Medium,
     int OrderIndex = 0,
     DateTime? DueDate = null
 ) : IBaseCommand;

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AssignProject/AssignProjectCommandHandler.cs

@@ -2,6 +2,9 @@ using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using GozareshgirProgramManager.Domain.SkillAgg.Repositories;

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AutoPendingFullTimeTaskSections/AutoPendingFullTimeTaskSectionsCommand.cs

@@ -0,0 +1,62 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.AutoPendingFullTimeTaskSections;
+
+public record AutoPendingFullTimeTaskSectionsCommand : IBaseCommand;
+
+public class AutoPendingFullTimeTaskSectionsCommandHandler : IBaseCommandHandler<AutoPendingFullTimeTaskSectionsCommand>
+{
+    private readonly ITaskSectionRepository _taskSectionRepository;
+    private readonly IUnitOfWork _unitOfWork;
+
+    public AutoPendingFullTimeTaskSectionsCommandHandler(
+        ITaskSectionRepository taskSectionRepository,
+        IUnitOfWork unitOfWork)
+    {
+        _taskSectionRepository = taskSectionRepository;
+        _unitOfWork = unitOfWork;
+    }
+
+    public async Task<OperationResult> Handle(AutoPendingFullTimeTaskSectionsCommand request, CancellationToken cancellationToken)
+    {
+        try
+        {
+            // تمام سکشن‌هایی که هنوز Pending یا Completed نشده‌اند را دریافت کن
+            var taskSections = await _taskSectionRepository.GetAllNotCompletedOrPendingIncludeAllAsync(cancellationToken);
+
+            foreach (var section in taskSections)
+            {
+                var totalSpent = section.GetTotalTimeSpent();
+                var estimate = section.FinalEstimatedHours;
+
+                if (estimate.TotalMinutes <= 0)
+                    continue; // تسک بدون تخمین را نادیده بگیر
+
+                if (totalSpent >= estimate)
+                {
+                    // مهم: وضعیت را مستقل از فعال/غیرفعال بودن فعالیت‌ها PendingForCompletion کنیم
+                    if (section.IsInProgress())
+                    {
+                        // اگر فعالیت فعال دارد، با وضعیت جدید متوقف شود
+                        section.StopWork(TaskSectionStatus.PendingForCompletion, "اتمام خودکار - رسیدن به ۱۰۰٪ زمان تخمینی");
+                    }
+                    else
+                    {
+                        section.UpdateStatus(TaskSectionStatus.PendingForCompletion);
+                    }
+                }
+            }
+
+            await _unitOfWork.SaveChangesAsync(cancellationToken);
+            return OperationResult.Success();
+        }
+        catch (Exception ex)
+        {
+            return OperationResult.Failure($"خطا در در انتظار تکمیل قرار دادن خودکار تسک‌ها: {ex.Message}");
+        }
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AutoUpdateDeployStatus/AutoUpdateDeployStatusCommand.cs

@@ -2,6 +2,7 @@ using System.Linq;
 using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using Microsoft.EntityFrameworkCore;
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ChangeDeployStatusProject/ChangeDeployeStatusProjectComand.cs

@@ -2,6 +2,7 @@ using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.ChangeDeployStatusProject;

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ChangeTaskPriority/ChangeTaskPriorityCommand.cs

@@ -0,0 +1,111 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.ChangeTaskPriority;
+
+public record ChangeTaskPriorityCommand(
+    Guid Id,
+    ProjectHierarchyLevel Level,
+    ProjectTaskPriority Priority
+) : IBaseCommand;
+
+public class ChangeTaskPriorityCommandHandler : IBaseCommandHandler<ChangeTaskPriorityCommand>
+{
+    private readonly IProjectTaskRepository _taskRepository;
+    private readonly IProjectPhaseRepository _phaseRepository;
+    private readonly IProjectRepository _projectRepository;
+    private readonly IUnitOfWork _unitOfWork;
+
+    public ChangeTaskPriorityCommandHandler(
+        IProjectTaskRepository taskRepository,
+        IProjectPhaseRepository phaseRepository,
+        IProjectRepository projectRepository,
+        IUnitOfWork unitOfWork)
+    {
+        _taskRepository = taskRepository;
+        _phaseRepository = phaseRepository;
+        _projectRepository = projectRepository;
+        _unitOfWork = unitOfWork;
+    }
+
+    public async Task<OperationResult> Handle(ChangeTaskPriorityCommand request, CancellationToken cancellationToken)
+    {
+        switch (request.Level)
+        {
+            case ProjectHierarchyLevel.Task:
+                return await HandleTaskLevelAsync(request.Id, request.Priority, cancellationToken);
+            case ProjectHierarchyLevel.Phase:
+                return await HandlePhaseLevelAsync(request.Id, request.Priority, cancellationToken);
+            case ProjectHierarchyLevel.Project:
+                return await HandleProjectLevelAsync(request.Id, request.Priority, cancellationToken);
+            default:
+                return OperationResult.Failure("سطح نامعتبر است");
+        }
+    }
+
+    // Task-level priority update
+    private async Task<OperationResult> HandleTaskLevelAsync(Guid taskId, ProjectTaskPriority priority, CancellationToken ct)
+    {
+        var task = await _taskRepository.GetByIdAsync(taskId, ct);
+        if (task is null)
+            return OperationResult.NotFound("تسک یافت نشد");
+
+        if (task.Priority != priority)
+        {
+            task.SetPriority(priority);
+        }
+
+        await _unitOfWork.SaveChangesAsync(ct);
+        return OperationResult.Success();
+    }
+
+    // Phase-level bulk priority update
+    private async Task<OperationResult> HandlePhaseLevelAsync(Guid phaseId, ProjectTaskPriority priority, CancellationToken ct)
+    {
+        var phase = await _phaseRepository.GetWithTasksAsync(phaseId);
+        if (phase is null)
+            return OperationResult.NotFound("فاز یافت نشد");
+
+        var tasks = phase.Tasks?.ToList() ?? new List<ProjectTask>();
+        foreach (var t in tasks)
+        {
+            if (t.Priority != priority)
+            {
+                t.SetPriority(priority);
+            }
+        }
+
+        await _unitOfWork.SaveChangesAsync(ct);
+        return OperationResult.Success();
+    }
+
+    // Project-level bulk priority update across all phases
+    private async Task<OperationResult> HandleProjectLevelAsync(Guid projectId, ProjectTaskPriority priority, CancellationToken ct)
+    {
+        var project = await _projectRepository.GetWithFullHierarchyAsync(projectId);
+        if (project is null)
+            return OperationResult.NotFound("پروژه یافت نشد");
+
+        var phases = project.Phases?.ToList() ?? new List<ProjectPhase>();
+        foreach (var phase in phases)
+        {
+            var tasks = phase.Tasks?.ToList() ?? new List<ProjectTask>();
+            foreach (var t in tasks)
+            {
+                if (t.Priority != priority)
+                {
+                    t.SetPriority(priority);
+                }
+            }
+        }
+
+        await _unitOfWork.SaveChangesAsync(ct);
+        return OperationResult.Success();
+    }
+}
+

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/CreateProject/CreateProjectCommandHandler.cs

@@ -3,6 +3,9 @@ using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain._Common.Exceptions;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/CreateProjectWithHierarchy/CreateProjectWithHierarchyCommandHandler.cs

@@ -2,6 +2,7 @@ using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using MediatR;
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/SetTimeProject/SetTimeProjectCommand.cs

@@ -1,5 +1,7 @@
 using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application.Modules.Projects.DTOs;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.SetTimeProject;
@@ -15,4 +17,5 @@ public class SetTimeSectionTime
     public string Description { get; set; }
     public int Hours { get; set; }
     public int Minutes { get; set; }
+    public TaskSectionAdditionalTimeType Type { get; set; }
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/SetTimeProject/SetTimeProjectCommandHandler.cs

@@ -4,6 +4,9 @@ using GozareshgirProgramManager.Application.Modules.Projects.DTOs;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain._Common.Exceptions;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using GozareshgirProgramManager.Domain.SkillAgg.Repositories;
@@ -365,10 +368,26 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
 
         section.ClearAdditionalTimes();
         // افزودن زمان‌های اضافی
+        bool hasAdditionalTime = false;
         foreach (var additionalTime in sectionItem.AdditionalTime)
         {
             var additionalTimeSpan = TimeSpan.FromHours(additionalTime.Hours).Add(TimeSpan.FromMinutes(additionalTime.Minutes));
-            section.AddAdditionalTime(additionalTimeSpan, additionalTime.Description, addedByUserId);
+            section.AddAdditionalTime(additionalTimeSpan, additionalTime.Type, additionalTime.Description, addedByUserId);
+            hasAdditionalTime = true;
+        }
+        
+        // تغییر status به Incomplete فقط اگر زمان اضافی اضافه شده باشد و در وضعیتی غیر از ReadyToStart باشد
+        if (hasAdditionalTime && section.Status != TaskSectionStatus.ReadyToStart)
+        {
+            // اگر سکشن درحال انجام است، باید متوقف شود قبل از تغییر status
+            if (section.Status == TaskSectionStatus.InProgress)
+            {
+                section.StopWork(TaskSectionStatus.Incomplete);
+            }
+            else
+            {
+                section.UpdateStatus(TaskSectionStatus.Incomplete);
+            }
         }
     }
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Extensions/ProjectMappingExtensions.cs

@@ -1,5 +1,9 @@
 using GozareshgirProgramManager.Application.Modules.Projects.DTOs;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Extensions;

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectsListQueryHandler.cs

@@ -4,6 +4,10 @@ using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using Microsoft.EntityFrameworkCore;
 using System.Linq;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
 
@@ -189,6 +193,7 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
                 SpentTime = spentTime,
                 RemainingTime = remainingTime,
                 Sections = sectionDtos,
+                Priority = task.Priority
             });
         }
         return result;

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetTaskListDto.cs

@@ -15,6 +15,7 @@ public class GetTaskDto
     // Task-specific fields
     public TimeSpan SpentTime { get; init; }
     public TimeSpan RemainingTime { get; init; }
+    public ProjectTaskPriority Priority { get; set; }
     public List<GetTaskSectionDto> Sections { get;  init; }
 }
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListQuery.cs

@@ -6,5 +6,7 @@ namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.Project
 
 public record ProjectBoardListQuery: IBaseQuery<List<ProjectBoardListResponse>>
 {
+    public long? UserId { get; set; }
+    public string? SearchText { get; set; }
     public TaskSectionStatus? Status { get; set; }
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListQueryHandler.cs

@@ -3,7 +3,6 @@ using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Query.Internal;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectBoardList;
 
@@ -24,7 +23,8 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
         var currentUserId = _authHelper.GetCurrentUserId();
         
         var queryable = _programManagerDbContext.TaskSections.AsNoTracking()
-            .Where(x => x.InitialEstimatedHours > TimeSpan.Zero && x.Status != TaskSectionStatus.Completed)
+            .Where(x => x.InitialEstimatedHours > TimeSpan.Zero 
+                        && x.Status != TaskSectionStatus.Completed)
             .Include(x => x.Task)
             .ThenInclude(x => x.Phase)
             .ThenInclude(x => x.Project)
@@ -40,10 +40,23 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
         {
             queryable = queryable.Where(x => x.Status == request.Status);
         }
+
+        if (request.UserId is > 0)
+        {
+            queryable = queryable.Where(x => x.CurrentAssignedUserId == request.UserId);
+        }
+
+        if (!string.IsNullOrWhiteSpace(request.SearchText))
+        {
+            queryable = queryable.Where(x=>x.Task.Name.Contains(request.SearchText)
+            || x.Task.Phase.Name.Contains(request.SearchText)
+            || x.Task.Phase.Project.Name.Contains(request.SearchText));
+        }
         
         var data = await queryable.ToListAsync(cancellationToken);
 
-        var activityUserIds = data.SelectMany(x => x.Activities).Select(a => a.UserId).Distinct().ToList();
+        var activityUserIds = data.SelectMany(x => x.Activities)
+            .Select(a => a.UserId).Distinct().ToList();
         var assignedUser = data.Select(x => x.CurrentAssignedUserId)
             .Concat(data.Select(x => x.OriginalAssignedUserId)).ToList(); 
         var allUserIds = activityUserIds.Concat(assignedUser).Distinct().ToList();
@@ -53,7 +66,9 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
             .ToDictionaryAsync(x => x.Id, x => x.FullName, cancellationToken);
         
 
-        var result = data .OrderByDescending(x => x.CurrentAssignedUserId == currentUserId)
+        var result = data
+            .OrderByDescending(x => x.CurrentAssignedUserId == currentUserId)
+            .ThenByDescending(x=>x.Task.Priority)
             .ThenBy(x => GetStatusOrder(x.Status))
             .Select(x =>
             {
@@ -65,7 +80,7 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
                     {
                         Activity = a,
                         TimeSpent = timeSpent,
-                        TotalSeconds = timeSpent.TotalSeconds,
+                        timeSpent.TotalSeconds,
                         FormattedTime = timeSpent.ToString(@"hh\:mm")
                     };
                 }).ToList();
@@ -103,6 +118,7 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
                     ProjectName = x.Task.Phase.Project.Name,
                     TaskName = x.Task.Name,
                     SectionStatus = x.Status,
+                    TaskPriority = x.Task.Priority,
                     Progress = new ProjectProgressDto()
                     {
                         CompleteSecond = x.FinalEstimatedHours.TotalSeconds,
@@ -114,6 +130,7 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
                     AssignedUser = x.CurrentAssignedUserId == x.OriginalAssignedUserId ? null 
                         : users.GetValueOrDefault(x.CurrentAssignedUserId, "ناشناس"),
                     SkillName =  x.Skill?.Name??"-",
+                    TaskId = x.TaskId
                 };
             }).ToList();
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListResponse.cs

@@ -13,6 +13,8 @@ public class ProjectBoardListResponse
     public string? AssignedUser { get; set; }
     public string OriginalUser { get; set; }
     public string SkillName { get; set; }
+    public ProjectTaskPriority TaskPriority { get; set; }
+    public Guid TaskId { get; set; }
     
 }
 public class ProjectProgressDto

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectDeployBoardDetail/ProjectDeployBoardDetailsQueryHandler.cs

@@ -21,7 +21,7 @@ public record ProjectDeployBoardDetailTaskItem(
     TimeSpan DoneTimeSpan,
     int Percentage,
     List<ProjectDeployBoardDetailItemSkill> Skills)
-    : ProjectDeployBoardDetailPhaseItem(Name, TotalTimeSpan, DoneTimeSpan,Percentage);
+    : ProjectDeployBoardDetailPhaseItem(Name, TotalTimeSpan, DoneTimeSpan, Percentage);
 
 public record ProjectDeployBoardDetailItemSkill(string OriginalUserFullName, string SkillName, int TimePercentage);
 
@@ -73,6 +73,7 @@ public class
 
             var doneTime = t.Sections.Aggregate(TimeSpan.Zero,
                 (sum, next) => sum.Add(next.GetTotalTimeSpent()));
+
             var skills = t.Sections
                 .Select(s =>
                 {
@@ -82,13 +83,23 @@ public class
                     var skillName = s.Skill?.Name ?? "بدون مهارت";
 
                     var timePercentage = (int)s.GetProgressPercentage();
-                    
+
                     return new ProjectDeployBoardDetailItemSkill(
                         originalUserFullName,
                         skillName,
                         timePercentage);
                 }).ToList();
-            var taskPercentage = (int)Math.Round(skills.Average(x => x.TimePercentage));
+
+            int taskPercentage;
+
+            if (skills.Count == 0)
+            {
+                taskPercentage = 0;
+            }
+            else
+            {
+                taskPercentage = (int)Math.Round(skills.Average(x => x.TimePercentage));
+            }
 
             return new ProjectDeployBoardDetailTaskItem(
                 t.Name,
@@ -105,7 +116,7 @@ public class
             (sum, next) => sum.Add(next.DoneTimeSpan));
 
         var phasePercentage = tasksRes.Average(x => x.Percentage);
-            
+
         var phaseRes = new ProjectDeployBoardDetailPhaseItem(phase.Name, totalTimeSpan, doneTimeSpan,
             (int)phasePercentage);
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectDeployBoardList/ProjectDeployBoardListQueryHandler.cs

@@ -3,6 +3,7 @@ using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using Microsoft.EntityFrameworkCore;
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQueryHandler.cs

@@ -56,6 +56,7 @@ public class ProjectSetTimeDetailsQueryHandler
         
         var skills = await _context.Skills
             .AsNoTracking()
+            .OrderBy(x=>x.CreationDate)
             .ToListAsync(cancellationToken);
 
         var res = new ProjectSetTimeResponse(
@@ -84,7 +85,7 @@ public class ProjectSetTimeDetailsQueryHandler
                     UserId = section?.OriginalAssignedUserId ?? 0,
                     SkillId = skill.Id,
                 };
-            }).OrderBy(x => x.SkillId).ToList(),
+            }).ToList(),
             task.Id,
             level);
 
@@ -114,6 +115,7 @@ public class ProjectSetTimeDetailsQueryHandler
 
         var skills = await _context.Skills
             .AsNoTracking()
+            .OrderBy(x=>x.CreationDate)
             .ToListAsync(cancellationToken);
 
         var res = new ProjectSetTimeResponse(
@@ -135,7 +137,7 @@ public class ProjectSetTimeDetailsQueryHandler
                     UserId = section?.UserId ?? 0,
                     SkillId = skill.Id,
                 };
-            }).OrderBy(x => x.SkillId).ToList(),
+            }).ToList(),
             phase.Id,
             level);
 
@@ -165,6 +167,7 @@ public class ProjectSetTimeDetailsQueryHandler
 
         var skills = await _context.Skills
             .AsNoTracking()
+            .OrderBy(x=>x.CreationDate)
             .ToListAsync(cancellationToken);
 
         var res = new ProjectSetTimeResponse(
@@ -186,7 +189,7 @@ public class ProjectSetTimeDetailsQueryHandler
                     UserId = section?.UserId ?? 0,
                     SkillId = skill.Id,
                 };
-            }).OrderBy(x => x.SkillId).ToList(),
+            }).ToList(),
             project.Id,
             level);
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Commands/DeleteMessage/DeleteMessageCommand.cs

@@ -0,0 +1,47 @@
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Domain._Common.Exceptions;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Repositories;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.Commands.DeleteMessage;
+
+public record DeleteMessageCommand(Guid MessageId) : IBaseCommand;
+
+public class DeleteMessageCommandHandler : IBaseCommandHandler<DeleteMessageCommand>
+{
+    private readonly ITaskChatMessageRepository _repository;
+    private readonly IAuthHelper _authHelper;
+
+    public DeleteMessageCommandHandler(ITaskChatMessageRepository repository, IAuthHelper authHelper)
+    {
+        _repository = repository;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult> Handle(DeleteMessageCommand request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId()??
+                            throw new UnAuthorizedException("کاربر احراز هویت نشده است");
+
+        var message = await _repository.GetByIdAsync(request.MessageId);
+        if (message == null)
+        {
+            return OperationResult.NotFound("پیام یافت نشد");
+        }
+
+        try
+        {
+            message.DeleteMessage(currentUserId);
+            await _repository.UpdateAsync(message);
+            await _repository.SaveChangesAsync();
+
+            // TODO: SignalR notification
+
+            return OperationResult.Success();
+        }
+        catch (Exception ex)
+        {
+            return OperationResult.ValidationError(ex.Message);
+        }
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Commands/EditMessage/EditMessageCommand.cs

@@ -0,0 +1,51 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common.Exceptions;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Repositories;
+using MediatR;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.Commands.EditMessage;
+
+public record EditMessageCommand(
+    Guid MessageId,
+    string NewTextContent
+) : IBaseCommand;
+
+public class EditMessageCommandHandler : IBaseCommandHandler<EditMessageCommand>
+{
+    private readonly ITaskChatMessageRepository _repository;
+    private readonly IAuthHelper _authHelper;
+
+    public EditMessageCommandHandler(ITaskChatMessageRepository repository, IAuthHelper authHelper)
+    {
+        _repository = repository;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult> Handle(EditMessageCommand request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId()??
+                            throw new UnAuthorizedException("کاربر احراز هویت نشده است");
+
+        var message = await _repository.GetByIdAsync(request.MessageId);
+        if (message == null)
+        {
+            return OperationResult.NotFound("پیام یافت نشد");
+        }
+
+        try
+        {
+            message.EditMessage(request.NewTextContent, currentUserId);
+            await _repository.UpdateAsync(message);
+            await _repository.SaveChangesAsync();
+
+            // TODO: SignalR notification
+
+            return OperationResult.Success();
+        }
+        catch (Exception ex)
+        {
+            return OperationResult.ValidationError(ex.Message);
+        }
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Commands/PinMessage/PinMessageCommand.cs

@@ -0,0 +1,46 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common.Exceptions;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Repositories;
+using MediatR;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.Commands.PinMessage;
+
+public record PinMessageCommand(Guid MessageId) : IBaseCommand;
+
+public class PinMessageCommandHandler : IBaseCommandHandler<PinMessageCommand>
+{
+    private readonly ITaskChatMessageRepository _repository;
+    private  readonly IAuthHelper _authHelper;
+
+    public PinMessageCommandHandler(ITaskChatMessageRepository repository, IAuthHelper authHelper)
+    {
+        _repository = repository;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult> Handle(PinMessageCommand request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId()??
+                            throw new UnAuthorizedException("کاربر احراز هویت نشده است");
+
+        var message = await _repository.GetByIdAsync(request.MessageId);
+        if (message == null)
+        {
+            return OperationResult.NotFound("پیام یافت نشد");
+        }
+
+        try
+        {
+            message.PinMessage(currentUserId);
+            await _repository.UpdateAsync(message);
+            await _repository.SaveChangesAsync();
+
+            return OperationResult.Success();
+        }
+        catch (Exception ex)
+        {
+            return OperationResult.ValidationError(ex.Message);
+        }
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Commands/SendMessage/SendMessageCommand.cs

@@ -0,0 +1,212 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.TaskChat.DTOs;
+using GozareshgirProgramManager.Application.Services.FileManagement;
+using GozareshgirProgramManager.Domain._Common.Exceptions;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Entities;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Repositories;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Enums;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Repositories;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+using MediatR;
+using Microsoft.AspNetCore.Http;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.Commands.SendMessage;
+
+public record SendMessageCommand(
+    Guid TaskId,
+    MessageType MessageType,
+    string? TextContent,
+    IFormFile? File,
+    Guid? ReplyToMessageId
+) : IBaseCommand<MessageDto>;
+
+public class SendMessageCommandHandler : IBaseCommandHandler<SendMessageCommand, MessageDto>
+{
+    private readonly ITaskChatMessageRepository _messageRepository;
+    private readonly IUploadedFileRepository _fileRepository;
+    private readonly IProjectTaskRepository _taskRepository;
+    private readonly IFileStorageService _fileStorageService;
+    private readonly IThumbnailGeneratorService _thumbnailService;
+    private readonly IAuthHelper _authHelper;
+
+    public SendMessageCommandHandler(
+        ITaskChatMessageRepository messageRepository,
+        IUploadedFileRepository fileRepository,
+        IProjectTaskRepository taskRepository,
+        IFileStorageService fileStorageService,
+        IThumbnailGeneratorService thumbnailService, IAuthHelper authHelper)
+    {
+        _messageRepository = messageRepository;
+        _fileRepository = fileRepository;
+        _taskRepository = taskRepository;
+        _fileStorageService = fileStorageService;
+        _thumbnailService = thumbnailService;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult<MessageDto>> Handle(SendMessageCommand request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId()
+                            ?? throw new UnAuthorizedException("کاربر احراز هویت نشده است");
+
+        var task = await _taskRepository.GetByIdAsync(request.TaskId, cancellationToken);
+        if (task == null)
+        {
+            return OperationResult<MessageDto>.NotFound("تسک یافت نشد");
+        }
+        
+        Guid? uploadedFileId = null;
+        if (request.File != null)
+        {
+            if (request.File.Length == 0)
+            {
+                return OperationResult<MessageDto>.ValidationError("فایل خالی است");
+            }
+
+            const long maxFileSize = 100 * 1024 * 1024;
+            if (request.File.Length > maxFileSize)
+            {
+                return OperationResult<MessageDto>.ValidationError("حجم فایل بیش از حد مجاز است (حداکثر 100MB)");
+            }
+
+            var fileType = DetectFileType(request.File.ContentType, Path.GetExtension(request.File.FileName));
+
+            var uploadedFile = new UploadedFile(
+                originalFileName: request.File.FileName,
+                fileSizeBytes: request.File.Length,
+                mimeType: request.File.ContentType,
+                fileType: fileType,
+                category: FileCategory.TaskChatMessage,
+                uploadedByUserId: currentUserId,
+                storageProvider: StorageProvider.LocalFileSystem
+            );
+
+            await _fileRepository.AddAsync(uploadedFile);
+            await _fileRepository.SaveChangesAsync();
+
+            try
+            {
+                using var stream = request.File.OpenReadStream();
+                var uploadResult = await _fileStorageService.UploadAsync(
+                    stream,
+                    uploadedFile.UniqueFileName,
+                    "TaskChatMessage"
+                );
+
+                uploadedFile.CompleteUpload(uploadResult.StoragePath, uploadResult.StorageUrl);
+
+                if (fileType == FileType.Image)
+                {
+                    var dimensions = await _thumbnailService.GetImageDimensionsAsync(uploadResult.StoragePath);
+                    if (dimensions.HasValue)
+                    {
+                        uploadedFile.SetImageDimensions(dimensions.Value.Width, dimensions.Value.Height);
+                    }
+
+                    var thumbnail = await _thumbnailService
+                        .GenerateImageThumbnailAsync(uploadResult.StoragePath, category: "TaskChatMessage");
+                    if (thumbnail.HasValue)
+                    {
+                        uploadedFile.SetThumbnail(thumbnail.Value.ThumbnailUrl);
+                    }
+                }
+
+                await _fileRepository.UpdateAsync(uploadedFile);
+                await _fileRepository.SaveChangesAsync();
+
+                uploadedFileId = uploadedFile.Id;
+            }
+            catch (Exception ex)
+            {
+                await _fileRepository.DeleteAsync(uploadedFile);
+                await _fileRepository.SaveChangesAsync();
+
+                return OperationResult<MessageDto>.ValidationError($"خطا در آپلود فایل: {ex.Message}");
+            }
+        }
+
+        var message = new TaskChatMessage(
+            taskId: request.TaskId,
+            senderUserId: currentUserId,
+            messageType: request.MessageType,
+            textContent: request.TextContent,
+            uploadedFileId
+        );
+
+        if (request.ReplyToMessageId.HasValue)
+        {
+            message.SetReplyTo(request.ReplyToMessageId.Value);
+        }
+
+        await _messageRepository.AddAsync(message);
+        await _messageRepository.SaveChangesAsync();
+
+        if (uploadedFileId.HasValue)
+        {
+            var file = await _fileRepository.GetByIdAsync(uploadedFileId.Value);
+            if (file != null)
+            {
+                file.SetReference("TaskChatMessage", message.Id.ToString());
+                await _fileRepository.UpdateAsync(file);
+                await _fileRepository.SaveChangesAsync();
+            }
+        }
+
+        var dto = new MessageDto
+        {
+            Id = message.Id,
+            TaskId = message.TaskId,
+            SenderUserId = message.SenderUserId,
+            SenderName = "کاربر",
+            MessageType = message.MessageType.ToString(),
+            TextContent = message.TextContent,
+            ReplyToMessageId = message.ReplyToMessageId,
+            IsEdited = message.IsEdited,
+            IsPinned = message.IsPinned,
+            CreationDate = message.CreationDate,
+            IsMine = true
+        };
+
+        if (uploadedFileId.HasValue)
+        {
+            var file = await _fileRepository.GetByIdAsync(uploadedFileId.Value);
+            if (file != null)
+            {
+                dto.File = new MessageFileDto
+                {
+                    Id = file.Id,
+                    FileName = file.OriginalFileName,
+                    FileUrl = file.StorageUrl ?? "",
+                    FileSizeBytes = file.FileSizeBytes,
+                    FileType = file.FileType.ToString(),
+                    ThumbnailUrl = file.ThumbnailUrl,
+                    ImageWidth = file.ImageWidth,
+                    ImageHeight = file.ImageHeight,
+                    DurationSeconds = file.DurationSeconds
+                };
+            }
+        }
+
+        return OperationResult<MessageDto>.Success(dto);
+    }
+
+    private FileType DetectFileType(string mimeType, string extension)
+    {
+        if (mimeType.StartsWith("image/", StringComparison.OrdinalIgnoreCase))
+            return FileType.Image;
+
+        if (mimeType.StartsWith("video/", StringComparison.OrdinalIgnoreCase))
+            return FileType.Video;
+
+        if (mimeType.StartsWith("audio/", StringComparison.OrdinalIgnoreCase))
+            return FileType.Audio;
+
+        if (new[] { ".zip", ".rar", ".7z", ".tar", ".gz" }.Contains(extension.ToLower()))
+            return FileType.Archive;
+
+        return FileType.Document;
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Commands/UnpinMessage/UnpinMessageCommand.cs

@@ -0,0 +1,46 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common.Exceptions;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Repositories;
+using MediatR;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.Commands.UnpinMessage;
+
+public record UnpinMessageCommand(Guid MessageId) : IBaseCommand;
+
+public class UnpinMessageCommandHandler : IBaseCommandHandler<UnpinMessageCommand>
+{
+    private readonly ITaskChatMessageRepository _repository;
+    private readonly  IAuthHelper _authHelper;
+
+    public UnpinMessageCommandHandler(ITaskChatMessageRepository repository, IAuthHelper authHelper)
+    {
+        _repository = repository;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult> Handle(UnpinMessageCommand request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId()??
+                            throw new UnAuthorizedException("کاربر احراز هویت نشده است");
+
+        var message = await _repository.GetByIdAsync(request.MessageId);
+        if (message == null)
+        {
+            return OperationResult.NotFound("پیام یافت نشد");
+        }
+
+        try
+        {
+            message.UnpinMessage(currentUserId);
+            await _repository.UpdateAsync(message);
+            await _repository.SaveChangesAsync();
+
+            return OperationResult.Success();
+        }
+        catch (Exception ex)
+        {
+            return OperationResult.ValidationError(ex.Message);
+        }
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/DTOs/MessageDto.cs

@@ -0,0 +1,63 @@
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.DTOs;
+
+public class SendMessageDto
+{
+    public Guid TaskId { get; set; }
+    public string MessageType { get; set; } = string.Empty; // "Text", "File", "Image", "Voice", "Video"
+    public string? TextContent { get; set; }
+    public Guid? FileId { get; set; }
+    public Guid? ReplyToMessageId { get; set; }
+}
+
+public class MessageDto
+{
+    public Guid Id { get; set; }
+    public Guid TaskId { get; set; }
+    public long SenderUserId { get; set; }
+    public string SenderName { get; set; } = string.Empty;
+    public string MessageType { get; set; } = string.Empty;
+    public string? TextContent { get; set; }
+    public MessageFileDto? File { get; set; }
+    public Guid? ReplyToMessageId { get; set; }
+    public MessageDto? ReplyToMessage { get; set; }
+    public bool IsEdited { get; set; }
+    public DateTime? EditedDate { get; set; }
+    public bool IsPinned { get; set; }
+    public DateTime? PinnedDate { get; set; }
+    public long? PinnedByUserId { get; set; }
+    public DateTime CreationDate { get; set; }
+    public bool IsMine { get; set; }
+}
+
+public class MessageFileDto
+{
+    public Guid Id { get; set; }
+    public string FileName { get; set; } = string.Empty;
+    public string FileUrl { get; set; } = string.Empty;
+    public long FileSizeBytes { get; set; }
+    public string FileType { get; set; } = string.Empty;
+    public string? ThumbnailUrl { get; set; }
+    public int? ImageWidth { get; set; }
+    public int? ImageHeight { get; set; }
+    public int? DurationSeconds { get; set; }
+    
+    public string FileSizeFormatted
+    {
+        get
+        {
+            const long kb = 1024;
+            const long mb = kb * 1024;
+            const long gb = mb * 1024;
+
+            if (FileSizeBytes >= gb)
+                return $"{FileSizeBytes / (double)gb:F2} GB";
+            if (FileSizeBytes >= mb)
+                return $"{FileSizeBytes / (double)mb:F2} MB";
+            if (FileSizeBytes >= kb)
+                return $"{FileSizeBytes / (double)kb:F2} KB";
+            
+            return $"{FileSizeBytes} Bytes";
+        }
+    }
+}
+

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Queries/GetMessages/GetMessagesQuery.cs

@@ -0,0 +1,217 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.TaskChat.DTOs;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Enums;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.Queries.GetMessages;
+
+public record GetMessagesQuery(
+    Guid TaskId,
+    MessageType? MessageType,
+    int Page = 1,
+    int PageSize = 50
+) : IBaseQuery<PaginationResult<MessageDto>>;
+
+
+
+public class GetMessagesQueryHandler : IBaseQueryHandler<GetMessagesQuery, PaginationResult<MessageDto>>
+{
+    private readonly IProgramManagerDbContext _context;
+    private readonly IAuthHelper _authHelper;
+
+    public GetMessagesQueryHandler(IProgramManagerDbContext context, IAuthHelper authHelper)
+    {
+        _context = context;
+        _authHelper = authHelper;
+    }
+
+    private List<MessageDto> CreateAdditionalTimeNotes(
+        IEnumerable<TaskSectionAdditionalTime> additionalTimes,
+        Dictionary<long, string> users,
+        Guid taskId)
+    {
+        var notes = new List<MessageDto>();
+        
+        foreach (var additionalTime in additionalTimes)
+        {
+            var addedByUserName = additionalTime.AddedByUserId.HasValue && users.TryGetValue(additionalTime.AddedByUserId.Value, out var user)
+                ? user
+                : "سیستم";
+
+            var noteContent = $"⏱️ زمان اضافی: {additionalTime.Hours.TotalHours.ToString("F2")} ساعت - {(string.IsNullOrWhiteSpace(additionalTime.Reason) ? "بدون علت" : additionalTime.Reason)} - توسط {addedByUserName}";
+
+            var noteDto = new MessageDto
+            {
+                Id = Guid.NewGuid(),
+                TaskId = taskId,
+                SenderUserId = 0,
+                SenderName = "سیستم",
+                MessageType = "Note",
+                TextContent = noteContent,
+                CreationDate = additionalTime.CreationDate,
+                IsMine = false
+            };
+
+            notes.Add(noteDto);
+        }
+
+        return notes;
+    }
+
+    public async Task<OperationResult<PaginationResult<MessageDto>>> Handle(GetMessagesQuery request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId();
+
+        var skip = (request.Page - 1) * request.PageSize;
+
+        var query = _context.TaskChatMessages
+            .Where(m => m.TaskId == request.TaskId && !m.IsDeleted)
+            .Include(m => m.ReplyToMessage)
+            .OrderBy(m => m.CreationDate).AsQueryable();
+
+        if (request.MessageType.HasValue)
+        {
+            query = query.Where(m => m.MessageType == request.MessageType.Value);
+        }
+
+        var totalCount = await query.CountAsync(cancellationToken);
+
+        var messages = await query
+            .Skip(skip)
+            .Take(request.PageSize)
+            .ToListAsync(cancellationToken);
+
+        // ✅ گرفتن تمامی کاربران برای نمایش نام کامل فرستنده به جای "کاربر"
+        var senderUserIds = messages.Select(m => m.SenderUserId).Distinct().ToList();
+        var users = await _context.Users
+            .Where(u => senderUserIds.Contains(u.Id))
+            .ToDictionaryAsync(u => u.Id, u => u.FullName, cancellationToken);
+
+        // ✅ گرفتن تمامی زمان‌های اضافی (Additional Times) برای نمایش به صورت نوت
+        var taskSections = await _context.TaskSections
+            .Where(ts => ts.TaskId == request.TaskId)
+            .Include(ts => ts.AdditionalTimes)
+            .ToListAsync(cancellationToken);
+
+        // ✅ تمام زمان‌های اضافی را یکجا بگیر و مرتب کن
+        var allAdditionalTimes = taskSections
+            .SelectMany(ts => ts.AdditionalTimes)
+            .OrderBy(at => at.CreationDate)
+            .ToList();
+
+        var messageDtos = new List<MessageDto>();
+
+        // ✅ ابتدا زمان‌های اضافی قبل از اولین پیام را اضافه کن (اگر پیامی وجود داشته باشد)
+        if (messages.Any())
+        {
+            var firstMessageDate = messages.First().CreationDate;
+            var additionalTimesBeforeFirstMessage = allAdditionalTimes
+                .Where(at => at.CreationDate < firstMessageDate)
+                .ToList();
+
+            messageDtos.AddRange(CreateAdditionalTimeNotes(additionalTimesBeforeFirstMessage, users, request.TaskId));
+        }
+        else
+        {
+            // ✅ اگر هیچ پیامی وجود ندارد، همه زمان‌های اضافی را نمایش بده
+            messageDtos.AddRange(CreateAdditionalTimeNotes(allAdditionalTimes, users, request.TaskId));
+        }
+
+        foreach (var message in messages)
+        {
+            // ✅ نام فرستنده را از Dictionary Users بگیر، در صورت عدم وجود "کاربر ناشناس" نمایش بده
+            var senderName = users.GetValueOrDefault(message.SenderUserId, "کاربر ناشناس");
+
+            var dto = new MessageDto
+            {
+                Id = message.Id,
+                TaskId = message.TaskId,
+                SenderUserId = message.SenderUserId,
+                SenderName = senderName,
+                MessageType = message.MessageType.ToString(),
+                TextContent = message.TextContent,
+                ReplyToMessageId = message.ReplyToMessageId,
+                IsEdited = message.IsEdited,
+                EditedDate = message.EditedDate,
+                IsPinned = message.IsPinned,
+                PinnedDate = message.PinnedDate,
+                PinnedByUserId = message.PinnedByUserId,
+                CreationDate = message.CreationDate,
+                IsMine = message.SenderUserId == currentUserId
+            };
+
+            if (message.ReplyToMessage != null)
+            {
+                var replySenderName = users.GetValueOrDefault(message.ReplyToMessage.SenderUserId, "کاربر ناشناس");
+
+                dto.ReplyToMessage = new MessageDto
+                {
+                    Id = message.ReplyToMessage.Id,
+                    SenderUserId = message.ReplyToMessage.SenderUserId,
+                    SenderName = replySenderName,
+                    TextContent = message.ReplyToMessage.TextContent,
+                    CreationDate = message.ReplyToMessage.CreationDate
+                };
+            }
+
+            if (message.FileId.HasValue)
+            {
+                var file = await _context.UploadedFiles.FirstOrDefaultAsync(f => f.Id == message.FileId.Value, cancellationToken);
+                if (file != null)
+                {
+                    dto.File = new MessageFileDto
+                    {
+                        Id = file.Id,
+                        FileName = file.OriginalFileName,
+                        FileUrl = file.StorageUrl ?? "",
+                        FileSizeBytes = file.FileSizeBytes,
+                        FileType = file.FileType.ToString(),
+                        ThumbnailUrl = file.ThumbnailUrl,
+                        ImageWidth = file.ImageWidth,
+                        ImageHeight = file.ImageHeight,
+                        DurationSeconds = file.DurationSeconds
+                    };
+                }
+            }
+
+            messageDtos.Add(dto);
+
+            // ✅ پیدا کردن پیام بعدی (اگر وجود داشته باشد)
+            var currentIndex = messages.IndexOf(message);
+            var nextMessage = currentIndex < messages.Count - 1 ? messages[currentIndex + 1] : null;
+
+            if (nextMessage != null)
+            {
+                // ✅ زمان‌های اضافی بین این پیام و پیام بعدی
+                var additionalTimesBetween = allAdditionalTimes
+                    .Where(at => at.CreationDate > message.CreationDate && at.CreationDate < nextMessage.CreationDate)
+                    .ToList();
+
+                messageDtos.AddRange(CreateAdditionalTimeNotes(additionalTimesBetween, users, request.TaskId));
+            }
+            else
+            {
+                // ✅ این آخرین پیام است، زمان‌های اضافی بعد از آن را اضافه کن
+                var additionalTimesAfterLastMessage = allAdditionalTimes
+                    .Where(at => at.CreationDate > message.CreationDate)
+                    .ToList();
+
+                messageDtos.AddRange(CreateAdditionalTimeNotes(additionalTimesAfterLastMessage, users, request.TaskId));
+            }
+        }
+
+        // ✅ مرتب کردن نهایی تمام پیام‌ها (معمولی + نوت‌ها) بر اساس زمان ایجاد
+        messageDtos = messageDtos.OrderBy(m => m.CreationDate).ToList();
+
+        var response = new PaginationResult<MessageDto>()
+        {
+            List = messageDtos,
+            TotalCount = totalCount,
+        };
+
+        return OperationResult<PaginationResult<MessageDto>>.Success(response);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Queries/GetPinnedMessages/GetPinnedMessagesQuery.cs

@@ -0,0 +1,82 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.TaskChat.DTOs;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.Queries.GetPinnedMessages;
+
+public record GetPinnedMessagesQuery(Guid TaskId) : IBaseQuery<List<MessageDto>>;
+
+public class GetPinnedMessagesQueryHandler : IBaseQueryHandler<GetPinnedMessagesQuery, List<MessageDto>>
+{
+    private readonly IProgramManagerDbContext _context;
+    private readonly IAuthHelper _authHelper;
+
+    public GetPinnedMessagesQueryHandler(IProgramManagerDbContext context, IAuthHelper authHelper)
+    {
+        _context = context;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult<List<MessageDto>>> Handle(GetPinnedMessagesQuery request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId();
+
+        var messages = await _context.TaskChatMessages
+            .Where(m => m.TaskId == request.TaskId && m.IsPinned && !m.IsDeleted)
+            .Include(m => m.ReplyToMessage)
+            .OrderByDescending(m => m.PinnedDate)
+            .ToListAsync(cancellationToken);
+
+        // ✅ گرفتن تمامی کاربران برای نمایش نام کامل فرستنده
+        var senderUserIds = messages.Select(m => m.SenderUserId).Distinct().ToList();
+        var users = await _context.Users
+            .Where(u => senderUserIds.Contains(u.Id))
+            .ToDictionaryAsync(u => u.Id, u => u.FullName, cancellationToken);
+
+        var messageDtos = new List<MessageDto>();
+
+        foreach (var message in messages)
+        {
+            // ✅ نام فرستنده را از User واقعی بگیر (به جای "کاربر" ثابت)
+            var senderName = users.GetValueOrDefault(message.SenderUserId, "کاربر ناشناس");
+
+            var dto = new MessageDto
+            {
+                Id = message.Id,
+                TaskId = message.TaskId,
+                SenderUserId = message.SenderUserId,
+                SenderName = senderName,
+                MessageType = message.MessageType.ToString(),
+                TextContent = message.TextContent,
+                IsPinned = message.IsPinned,
+                PinnedDate = message.PinnedDate,
+                PinnedByUserId = message.PinnedByUserId,
+                CreationDate = message.CreationDate,
+                IsMine = message.SenderUserId == currentUserId
+            };
+
+            if (message.FileId.HasValue)
+            {
+                var file = await _context.UploadedFiles.FirstOrDefaultAsync(f => f.Id == message.FileId.Value, cancellationToken);
+                if (file != null)
+                {
+                    dto.File = new MessageFileDto
+                    {
+                        Id = file.Id,
+                        FileName = file.OriginalFileName,
+                        FileUrl = file.StorageUrl ?? "",
+                        FileSizeBytes = file.FileSizeBytes,
+                        FileType = file.FileType.ToString(),
+                        ThumbnailUrl = file.ThumbnailUrl
+                    };
+                }
+            }
+
+            messageDtos.Add(dto);
+        }
+
+        return OperationResult<List<MessageDto>>.Success(messageDtos);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Queries/SearchMessages/SearchMessagesQuery.cs

@@ -0,0 +1,72 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.TaskChat.DTOs;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.Queries.SearchMessages;
+
+public record SearchMessagesQuery(
+    Guid TaskId,
+    string SearchText,
+    int Page = 1,
+    int PageSize = 20
+) : IBaseQuery<List<MessageDto>>;
+
+public class SearchMessagesQueryHandler : IBaseQueryHandler<SearchMessagesQuery, List<MessageDto>>
+{
+    private readonly IProgramManagerDbContext _context;
+    private readonly IAuthHelper _authHelper;
+
+    public SearchMessagesQueryHandler(IProgramManagerDbContext context, IAuthHelper authHelper)
+    {
+        _context = context;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult<List<MessageDto>>> Handle(SearchMessagesQuery request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId();
+        var skip = (request.Page - 1) * request.PageSize;
+
+        var messages = await _context.TaskChatMessages
+            .Where(m => m.TaskId == request.TaskId &&
+                        m.TextContent != null &&
+                        m.TextContent.Contains(request.SearchText) &&
+                        !m.IsDeleted)
+            .Include(m => m.ReplyToMessage)
+            .OrderByDescending(m => m.CreationDate)
+            .Skip(skip)
+            .Take(request.PageSize)
+            .ToListAsync(cancellationToken);
+
+        // ✅ گرفتن تمامی کاربران برای نمایش نام کامل فرستنده
+        var senderUserIds = messages.Select(m => m.SenderUserId).Distinct().ToList();
+        var users = await _context.Users
+            .Where(u => senderUserIds.Contains(u.Id))
+            .ToDictionaryAsync(u => u.Id, u => u.FullName, cancellationToken);
+
+        var messageDtos = new List<MessageDto>();
+        foreach (var message in messages)
+        {
+            // ✅ نام فرستنده را از User واقعی بگیر
+            var senderName = users.GetValueOrDefault(message.SenderUserId, "کاربر ناشناس");
+
+            var dto = new MessageDto
+            {
+                Id = message.Id,
+                TaskId = message.TaskId,
+                SenderUserId = message.SenderUserId,
+                SenderName = senderName,
+                MessageType = message.MessageType.ToString(),
+                TextContent = message.TextContent,
+                CreationDate = message.CreationDate,
+                IsMine = message.SenderUserId == currentUserId
+            };
+
+            messageDtos.Add(dto);
+        }
+
+        return OperationResult<List<MessageDto>>.Success(messageDtos);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionRevision/Commands/CreateTaskSectionRevision/CreateTaskSectionRevisionCommand.cs

@@ -0,0 +1,136 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.TaskChat.DTOs;
+using GozareshgirProgramManager.Application.Services.FileManagement;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Repositories;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+using Microsoft.AspNetCore.Http;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionRevision.Commands.CreateTaskSectionRevision;
+
+public record CreateTaskSectionRevisionCommand(string Message, List<IFormFile> Files, Guid SectionId) : IBaseCommand;
+
+public class CreateTaskSectionRevisionCommandHandler : IBaseCommandHandler<CreateTaskSectionRevisionCommand>
+{
+    private readonly ITaskSectionRevisionRepository _revisionRepository;
+    private readonly IFileStorageService _fileStorageService;
+    private readonly IAuthHelper _authHelper;
+    private readonly IUnitOfWork _unitOfWork;
+    private readonly IUploadedFileRepository _fileRepository;
+    private readonly IThumbnailGeneratorService _thumbnailService;
+
+    public CreateTaskSectionRevisionCommandHandler(ITaskSectionRevisionRepository revisionRepository,
+        IFileStorageService fileStorageService, IAuthHelper authHelper, IUnitOfWork unitOfWork, IUploadedFileRepository fileRepository, IThumbnailGeneratorService thumbnailService)
+    {
+        _revisionRepository = revisionRepository;
+        _fileStorageService = fileStorageService;
+        _authHelper = authHelper;
+        _unitOfWork = unitOfWork;
+        _fileRepository = fileRepository;
+        _thumbnailService = thumbnailService;
+    }
+
+    public async Task<OperationResult> Handle(CreateTaskSectionRevisionCommand request,
+        CancellationToken cancellationToken)
+    {
+        var currentId = _authHelper.GetCurrentUserId();
+        
+        var entity = new Domain.ProjectAgg.Entities.Task.TaskSection.TaskSectionRevision(request.SectionId, request.Message, currentId!.Value);
+        if (request.Files is { Count: > 0 })
+        {
+            foreach (var file in request.Files)
+            {
+                if (file.Length == 0)
+                {
+                    return OperationResult.ValidationError("فایل خالی است");
+                }
+
+                const long maxFileSize = 100 * 1024 * 1024;
+                if (file.Length > maxFileSize)
+                {
+                    return OperationResult.ValidationError("حجم فایل بیش از حد مجاز است (حداکثر 100MB)");
+                }
+
+                var fileType = DetectFileType(file.ContentType, Path.GetExtension(file.FileName));
+
+                var uploadedFile = new UploadedFile(
+                    originalFileName: file.FileName,
+                    fileSizeBytes: file.Length,
+                    mimeType: file.ContentType,
+                    fileType: fileType,
+                    category: FileCategory.TaskSectionRevision,
+                    uploadedByUserId: currentId!.Value,
+                    storageProvider: StorageProvider.LocalFileSystem
+                );
+
+                await _fileRepository.AddAsync(uploadedFile);
+                await _fileRepository.SaveChangesAsync();
+
+                try
+                {
+                    await using var stream = file.OpenReadStream();
+                    var uploadResult = await _fileStorageService.UploadAsync(
+                        stream,
+                        uploadedFile.UniqueFileName,
+                        "TaskSectionRevision"
+                    );
+
+                    uploadedFile.CompleteUpload(uploadResult.StoragePath, uploadResult.StorageUrl);
+
+                    if (fileType == FileType.Image)
+                    {
+                        var dimensions = await _thumbnailService.GetImageDimensionsAsync(uploadResult.StoragePath);
+                        if (dimensions.HasValue)
+                        {
+                            uploadedFile.SetImageDimensions(dimensions.Value.Width, dimensions.Value.Height);
+                        }
+
+                        var thumbnail = await _thumbnailService
+                            .GenerateImageThumbnailAsync(uploadResult.StoragePath, category: "TaskSectionRevision");
+                        if (thumbnail.HasValue)
+                        {
+                            uploadedFile.SetThumbnail(thumbnail.Value.ThumbnailUrl);
+                        }
+                    }
+
+                    await _fileRepository.UpdateAsync(uploadedFile);
+                    await _fileRepository.SaveChangesAsync();
+
+                    var taskRevisionFile = new TaskRevisionFile(uploadedFile.Id);
+                    entity.AddFile(taskRevisionFile);
+                }
+                catch (Exception ex)
+                {
+                    await _fileRepository.DeleteAsync(uploadedFile);
+                    await _fileRepository.SaveChangesAsync();
+
+                    return OperationResult<MessageDto>.ValidationError($"خطا در آپلود فایل: {ex.Message}");
+                }
+            }
+        }
+
+        await _revisionRepository.CreateAsync(entity);
+        await _unitOfWork.SaveChangesAsync(cancellationToken);
+        return OperationResult.Success();
+    }
+    private FileType DetectFileType(string mimeType, string extension)
+    {
+        if (mimeType.StartsWith("image/", StringComparison.OrdinalIgnoreCase))
+            return FileType.Image;
+
+        if (mimeType.StartsWith("video/", StringComparison.OrdinalIgnoreCase))
+            return FileType.Video;
+
+        if (mimeType.StartsWith("audio/", StringComparison.OrdinalIgnoreCase))
+            return FileType.Audio;
+
+        if (new[] { ".zip", ".rar", ".7z", ".tar", ".gz" }.Contains(extension.ToLower()))
+            return FileType.Archive;
+
+        return FileType.Document;
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionRevision/Commands/CreateTaskSectionRevision/CreateTaskSectionRevisionValidator.cs

@@ -0,0 +1,14 @@
+using FluentValidation;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionRevision.Commands.CreateTaskSectionRevision;
+
+public class CreateTaskSectionRevisionValidator:AbstractValidator<CreateTaskSectionRevisionCommand>
+{
+    public CreateTaskSectionRevisionValidator()
+    {
+        RuleFor(x=>x.Message)
+            .NotEmpty()
+            .WithMessage("توضیحات اجباری است");
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionRevision/Commands/SetStatusReviewedRevision/SetStatusReviewedRevisionCommand.cs

@@ -0,0 +1,35 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionRevision.Commands.SetStatusReviewedRevision;
+
+public record SetStatusReviewedRevisionCommand(Guid TaskSectionId):IBaseCommand;
+
+public class SetStatusReviewedRevisionCommandHandler : IBaseCommandHandler<SetStatusReviewedRevisionCommand>
+{
+    private readonly ITaskSectionRevisionRepository _revisionRepository;
+    private readonly IUnitOfWork _unitOfWork;
+
+    public SetStatusReviewedRevisionCommandHandler(ITaskSectionRevisionRepository revisionRepository, IUnitOfWork unitOfWork)
+    {
+        _revisionRepository = revisionRepository;
+        _unitOfWork = unitOfWork;
+    }
+
+    public async Task<OperationResult> Handle(SetStatusReviewedRevisionCommand request, CancellationToken cancellationToken)
+    {
+        var taskSectionRevisions = await _revisionRepository.GetByTaskSectionId(request.TaskSectionId);
+        if (taskSectionRevisions == null || taskSectionRevisions.Count == 0)
+            return OperationResult.NotFound("اصلاحی برای این بخش یافت نشد");
+
+        foreach (var revision in taskSectionRevisions)
+        {
+            revision.MarkReviewed();
+        }
+
+        await _unitOfWork.SaveChangesAsync(cancellationToken);
+        return OperationResult.Success();
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionRevision/Queries/TaskRevisionsByTaskSectionId/TaskRevisionsByTaskSectionIdQuery.cs

@@ -0,0 +1,92 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionRevision.Queries.TaskRevisionsByTaskSectionId;
+
+public record TaskRevisionsByTaskSectionIdQuery(Guid TaskSectionId)
+    : IBaseQuery<TaskRevisionsByTaskSectionIdResponse>;
+
+public class TaskRevisionsByTaskSectionIdQueryHandler : IBaseQueryHandler<TaskRevisionsByTaskSectionIdQuery,
+    TaskRevisionsByTaskSectionIdResponse>
+{
+    private readonly IProgramManagerDbContext _dbContext;
+
+    public TaskRevisionsByTaskSectionIdQueryHandler(IProgramManagerDbContext dbContext)
+    {
+        _dbContext = dbContext;
+    }
+
+    public async Task<OperationResult<TaskRevisionsByTaskSectionIdResponse>> Handle(
+        TaskRevisionsByTaskSectionIdQuery request, CancellationToken cancellationToken)
+    {
+        var taskSectionEntity = await _dbContext.TaskSections
+            .Include(x=>x.Task)
+            .ThenInclude(x => x.Phase)
+            .ThenInclude(x => x.Project)
+            .FirstOrDefaultAsync(x => x.Id == request.TaskSectionId,
+                cancellationToken: cancellationToken);
+        
+        if (taskSectionEntity == null)
+        {
+            return OperationResult<TaskRevisionsByTaskSectionIdResponse>.NotFound("بخش فرعی یافت نشد");
+        }
+        
+        var taskRevisions = await _dbContext.TaskSectionRevisions
+            .Include(x => x.Files).Where(x => x.TaskSectionId == request.TaskSectionId)
+            .ToListAsync(cancellationToken);
+        if (taskRevisions.Count == 0)
+        {
+            return OperationResult<TaskRevisionsByTaskSectionIdResponse>.NotFound("اصلاحی یافت نشد");
+        }
+
+        var skill = await _dbContext.Skills.FirstOrDefaultAsync(x => x.Id == taskSectionEntity.SkillId,
+            cancellationToken: cancellationToken);
+        
+        if (skill == null)
+            return OperationResult<TaskRevisionsByTaskSectionIdResponse>.NotFound("مهارت مورد نظر یافت نشد");
+
+
+        var user =await _dbContext.Users.FirstOrDefaultAsync(x => x.Id == taskSectionEntity.CurrentAssignedUserId,
+            cancellationToken: cancellationToken);
+        if (user == null)
+            return OperationResult<TaskRevisionsByTaskSectionIdResponse>.NotFound("کاربر مورد نظر یافت نشد");
+        
+        var fileIds = taskRevisions.SelectMany(x => x.Files)
+            .Select(x => x.FileId).Distinct().ToList();
+
+        var uploadedFiles = _dbContext.UploadedFiles
+            .Where(x => fileIds.Contains(x.Id)).ToList();
+
+        var resItems = taskRevisions.Select(x =>
+        {
+            var itemFileIds = x.Files.Select(f => f.FileId).Distinct().ToList();
+
+            var files = uploadedFiles
+                .Where(f => itemFileIds.Contains(f.Id))
+                .Select(file => new TaskRevisionsByTaskSectionIdItemFile()
+                {
+                    Id = file.Id,
+                    FileName = file.OriginalFileName,
+                    FileUrl = file.StorageUrl ?? "",
+                    FileSizeBytes = file.FileSizeBytes,
+                    FileType = file.FileType.ToString(),
+                    ThumbnailUrl = file.ThumbnailUrl,
+                    ImageWidth = file.ImageWidth,
+                    ImageHeight = file.ImageHeight,
+                    DurationSeconds = file.DurationSeconds
+                }).ToList();
+
+            return new TaskRevisionsByTaskSectionIdItem(x.Message, files,$"{x.CreationDate.ToFarsi()} {x.CreationDate:HH:mm}");
+        }).ToList();
+
+        var res = new TaskRevisionsByTaskSectionIdResponse(resItems, taskSectionEntity.Task.Phase.Project.Name,
+            taskSectionEntity.Task.Phase.Name, taskSectionEntity.Task.Name,
+            skill.Name,
+            user.FullName
+            );
+        
+        return OperationResult<TaskRevisionsByTaskSectionIdResponse>.Success(res);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionRevision/Queries/TaskRevisionsByTaskSectionId/TaskRevisionsByTaskSectionIdResponse.cs

@@ -0,0 +1,16 @@
+using GozareshgirProgramManager.Application._Common.Models;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionRevision.Queries.TaskRevisionsByTaskSectionId;
+
+public record TaskRevisionsByTaskSectionIdResponse(
+    List<TaskRevisionsByTaskSectionIdItem> Items,
+    string ProjectName,
+    string PhaseName,
+    string TaskName,
+    string SkillName,
+    string UserName);
+    
+    
+public record TaskRevisionsByTaskSectionIdItem(string Message, List<TaskRevisionsByTaskSectionIdItemFile> Files,string CreationDate);
+
+public class TaskRevisionsByTaskSectionIdItemFile:UploadedFileDto;

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionTimeRequests/Commands/AcceptTimeRequest/AcceptTimeRequestCommand.cs

@@ -0,0 +1,56 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionTimeRequests.Commands.AcceptTimeRequest;
+
+public record AcceptTimeRequestCommand(Guid TimeRequestId,
+    Guid SectionId,TaskSectionAdditionalTimeType TimeType,int Hour,int Minute):IBaseCommand;
+
+public class AcceptTimeRequestCommandHandler:IBaseCommandHandler<AcceptTimeRequestCommand>
+{
+    private readonly ITaskSectionTimeRequestRepository _timeRequestRepository;
+    private readonly ITaskSectionRepository _taskSectionRepository;
+    private readonly IUnitOfWork _unitOfWork;
+    public AcceptTimeRequestCommandHandler(ITaskSectionTimeRequestRepository timeRequestRepository, ITaskSectionRepository taskSectionRepository, IUnitOfWork unitOfWork)
+    {
+        _timeRequestRepository = timeRequestRepository;
+        _taskSectionRepository = taskSectionRepository;
+        _unitOfWork = unitOfWork;
+    }
+
+    public async Task<OperationResult> Handle(AcceptTimeRequestCommand request, CancellationToken cancellationToken)
+    {
+        var timeRequest = await _timeRequestRepository.GetByIdAsync(request.TimeRequestId, cancellationToken);
+        if (timeRequest == null)
+        {
+            return OperationResult.NotFound("درخواست زمان شما یافت نشد");
+        }
+
+        var taskSection = await _taskSectionRepository.GetByIdAsync(request.SectionId, cancellationToken);
+
+        if (taskSection == null)
+        {
+            return OperationResult.NotFound("بخش فرعی وارد شده نامعتبر است");
+        }
+        if (timeRequest.RequestStatus == TaskSectionTimeRequestStatus.Accepted)
+        {
+            return OperationResult.Failure("این درخواست قبلا تایید شده است");
+        }
+        
+        // تایید درخواست زمان
+        timeRequest.AcceptTimeRequest();
+        
+        // اضافه کردن زمان به TaskSection
+        var totalMinutes = (request.Hour * 60) + request.Minute;
+        var additionalTime = TimeSpan.FromMinutes(totalMinutes);
+        taskSection.AddAdditionalTime(additionalTime, request.TimeType, timeRequest.Description);
+        
+        await _unitOfWork.SaveChangesAsync(cancellationToken);
+        return OperationResult.Success();
+
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionTimeRequests/Commands/AcceptTimeRequest/AcceptTimeRequestCommandValidator.cs

@@ -0,0 +1,24 @@
+using FluentValidation;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionTimeRequests.Commands.AcceptTimeRequest;
+
+public class AcceptTimeRequestCommandValidator : AbstractValidator<AcceptTimeRequestCommand>
+{
+    public AcceptTimeRequestCommandValidator()
+    {
+        RuleFor(c => c.TimeRequestId)
+            .NotEmpty().WithMessage("شناسه درخواست نمیتواند خالی باشد");
+
+        RuleFor(c => c.SectionId)
+            .NotEmpty().WithMessage("شناسه بخش فرعی نمیتواند خالی باشد");
+
+        RuleFor(c => c.TimeType)
+            .NotNull().WithMessage("نوع زمان درخواست شده نامعتبر است")
+            .IsInEnum();
+
+        RuleFor(c => c.Hour)
+            .InclusiveBetween(0, 100).WithMessage("ساعت وارد شده میتواند بین 0 تا 100 باشد");
+        RuleFor(c => c.Minute)
+            .InclusiveBetween(0, 60).WithMessage("دقیقه وارد شده میتواند بین 0 تا 60 باشد");
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionTimeRequests/Commands/CreateTimeRequest/CreateTimeRequestCommand.cs

@@ -0,0 +1,52 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionTimeRequests.Commands.CreateTimeRequest;
+
+public record CreateTimeRequestCommand(int Hours, int Minutes, string Description,
+    TaskSectionTimeRequestType RequestType,Guid TaskSectionId) : IBaseCommand;
+
+public class CreateTimeRequestCommandHandler : IBaseCommandHandler<CreateTimeRequestCommand>
+{
+    private readonly IAuthHelper _authHelper;
+    private readonly ITaskSectionTimeRequestRepository _timeRequestRepository;
+    private readonly ITaskSectionRepository _taskSectionRepository;
+    private readonly IUnitOfWork _unitOfWork;
+
+    public CreateTimeRequestCommandHandler
+        (ITaskSectionTimeRequestRepository timeRequestRepository, IAuthHelper authHelper, IUnitOfWork unitOfWork, ITaskSectionRepository taskSectionRepository)
+    {
+        _timeRequestRepository = timeRequestRepository;
+        _authHelper = authHelper;
+        _unitOfWork = unitOfWork;
+        _taskSectionRepository = taskSectionRepository;
+    }
+
+    public async Task<OperationResult> Handle(CreateTimeRequestCommand request, CancellationToken cancellationToken)
+    {
+        var currentUser = _authHelper.GetCurrentUserId();
+        if (!currentUser.HasValue)
+        {
+            return OperationResult.Unauthorized();
+        }
+
+        if (!_taskSectionRepository.Exists(x=>x.Id == request.TaskSectionId))
+        {
+            return OperationResult.NotFound("وظیفه فرعی مورد نظر یافت نشد");
+        }
+        
+
+        var requestTimeSpan = TimeSpan.FromHours(request.Hours) + TimeSpan.FromMinutes(request.Minutes);
+        
+        var entity = new TaskSectionTimeRequest(currentUser.Value, request.Description, requestTimeSpan,
+            request.RequestType,request.TaskSectionId);
+        await _timeRequestRepository.CreateAsync(entity);
+        await _unitOfWork.SaveChangesAsync(cancellationToken);
+        return OperationResult.Success();
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionTimeRequests/Commands/CreateTimeRequest/CreateTimeRequestValidator.cs

@@ -0,0 +1,20 @@
+using FluentValidation;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionTimeRequests.Commands.CreateTimeRequest;
+
+public class CreateTimeRequestValidator : AbstractValidator<CreateTimeRequestCommand>
+{
+    public CreateTimeRequestValidator()
+    {
+        RuleFor(c => c.Hours)
+            .InclusiveBetween(0, 100).WithMessage("ساعت درخواست شده باید کمتر از 100 ساعت باشد");
+
+        RuleFor(c => c.Minutes)
+            .InclusiveBetween(0, 59)
+            .WithMessage("دقیقه وارد شده باید بین 0 تا 60 باشد");
+
+        RuleFor(x => x.RequestType)
+            .IsInEnum()
+            .NotNull();
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionTimeRequests/Queries/CreateTimeRequestDetails/CreateTimeRequestDetailsQuery.cs

@@ -0,0 +1,66 @@
+using GozareshgirProgramManager.Application._Common.Extensions;
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain._Common.Exceptions;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionTimeRequests.Queries.CreateTimeRequestDetails;
+
+public record CreateTimeRequestDetailsResponse(List<CreateTimeRequestDetailsRevision> Revisions,
+    string ProjectName,string PhaseName,string SectionName,string SkillName);
+
+public record CreateTimeRequestDetailsRevision(string Message, List<UploadedFileDto> Files,Guid Id,string CreationDate);
+
+public record CreateTimeRequestDetailsQuery(Guid TaskSectionId) : IBaseQuery<CreateTimeRequestDetailsResponse>;
+
+public class
+    CreateTimeRequestDetailsQueryHandler : IBaseQueryHandler<CreateTimeRequestDetailsQuery,
+    CreateTimeRequestDetailsResponse>
+{
+    private readonly IProgramManagerDbContext _context;
+
+    public CreateTimeRequestDetailsQueryHandler(IProgramManagerDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<OperationResult<CreateTimeRequestDetailsResponse>> Handle(CreateTimeRequestDetailsQuery request,
+        CancellationToken cancellationToken)
+    {
+        var section =await _context.TaskSections
+            .Include(x => x.Task)
+            .ThenInclude(x => x.Phase)
+            .ThenInclude(x => x.Project)
+            .Include(x => x.Skill)
+            .FirstOrDefaultAsync(x => x.Id == request.TaskSectionId, cancellationToken: cancellationToken);
+
+        if (section == null)
+        {
+            throw new BadRequestException("بخش فرعی نامعتبر است");
+        }
+        
+        var revisions = await _context.TaskSectionRevisions.Where(x =>
+            x.TaskSectionId == request.TaskSectionId && x.Status == RevisionReviewStatus.Pending).ToListAsync(cancellationToken: cancellationToken);
+
+        var fileIds = revisions.SelectMany(x => x.Files)
+            .Select(x => x.FileId).ToList();
+
+        var files =await _context.UploadedFiles
+            .Where(x => fileIds.Contains(x.Id)).ToListAsync(cancellationToken: cancellationToken);
+
+        var resItem = revisions.Select(x =>
+        {
+            var selectFileIds = x.Files.Select(f => f.FileId).ToList();
+            var filesDto = files.Where(f => selectFileIds.Contains(f.Id))
+                .Select(f => f.ToDto()).ToList();
+            
+            return new CreateTimeRequestDetailsRevision(x.Message, filesDto,x.Id,x.CreationDate.ToFarsi());
+        }).ToList();
+        var res = new CreateTimeRequestDetailsResponse(resItem,section.Task.Phase.Project.Name,section.Task.Phase.Name,section.Task.Name,
+            section.Skill!.Name);
+
+        return OperationResult<CreateTimeRequestDetailsResponse>.Success(res);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Workflows/Queries/WorkflowList/IWorkflowProvider.cs

@@ -0,0 +1,11 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList;
+
+namespace GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList;
+
+public interface IWorkflowProvider
+{
+    WorkflowType Type { get; }
+    Task<List<WorkflowListItem>> GetItems(long currentUserId, IProgramManagerDbContext context, CancellationToken cancellationToken);
+    Task<int> GetCount(long currentUserId, IProgramManagerDbContext context, CancellationToken cancellationToken);
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Workflows/Queries/WorkflowList/Providers/NotAssignedWorkflowProvider.cs

@@ -0,0 +1,31 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList.Providers;
+
+public class NotAssignedWorkflowProvider : IWorkflowProvider
+{
+    public WorkflowType Type => WorkflowType.NotAssigned;
+
+    public async Task<List<WorkflowListItem>> GetItems(long currentUserId, IProgramManagerDbContext context, CancellationToken cancellationToken)
+    {
+        // Assuming 0 means unassigned in CurrentAssignedUserId
+        var sections = await context.TaskSections
+            .Where(x => x.CurrentAssignedUserId == 0)
+            .ToListAsync(cancellationToken);
+
+        return sections.Select(ts => new WorkflowListItem
+        {
+            EntityId = ts.Id,
+            Title = "تخصیص‌ نیافته",
+            Type = WorkflowType.NotAssigned
+        }).ToList();
+    }
+
+    public async Task<int> GetCount(long currentUserId, IProgramManagerDbContext context, CancellationToken cancellationToken)
+    {
+        return await context.TaskSections
+            .Where(x => x.CurrentAssignedUserId == 0)
+            .CountAsync(cancellationToken);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Workflows/Queries/WorkflowList/Providers/RejectedRevisionsWorkflowProvider.cs

@@ -0,0 +1,41 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList.Providers;
+
+public class RejectedRevisionsWorkflowProvider : IWorkflowProvider
+{
+    public WorkflowType Type => WorkflowType.Rejected;
+
+    public async Task<List<WorkflowListItem>> GetItems(long currentUserId, IProgramManagerDbContext context, CancellationToken cancellationToken)
+    {
+        var query = from revision in context.TaskSectionRevisions
+                        .Where(x => x.Status == RevisionReviewStatus.Pending)
+                    join taskSection in context.TaskSections
+                        on revision.TaskSectionId equals taskSection.Id
+                    where taskSection.CurrentAssignedUserId == currentUserId
+                    select taskSection;
+
+        var sections = await query.ToListAsync(cancellationToken);
+
+        return sections.Select(ts => new WorkflowListItem
+        {
+            EntityId = ts.Id,
+            Title = "برگشت از سمت مدیر",
+            Type = WorkflowType.Rejected
+        }).ToList();
+    }
+
+    public async Task<int> GetCount(long currentUserId, IProgramManagerDbContext context, CancellationToken cancellationToken)
+    {
+        var query = from revision in context.TaskSectionRevisions
+                        .Where(x => x.Status == RevisionReviewStatus.Pending)
+                    join taskSection in context.TaskSections
+                        on revision.TaskSectionId equals taskSection.Id
+                    where taskSection.CurrentAssignedUserId == currentUserId
+                    select revision.Id;
+
+        return await query.CountAsync(cancellationToken);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Workflows/Queries/WorkflowList/WorkflowCountQuery.cs

@@ -0,0 +1,50 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList.Providers;
+
+namespace GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList;
+
+public record WorkflowCountResponse(int Total, int Rejected, int NotAssigned, int PendingForApproval);
+
+public record WorkflowCountQuery() : IBaseQuery<WorkflowCountResponse>;
+
+public class WorkflowCountQueryHandler : IBaseQueryHandler<WorkflowCountQuery, WorkflowCountResponse>
+{
+    private readonly IProgramManagerDbContext _context;
+    private readonly IAuthHelper _authHelper;
+    private readonly IEnumerable<IWorkflowProvider> _providers;
+
+    public WorkflowCountQueryHandler(IProgramManagerDbContext context, IAuthHelper authHelper, IEnumerable<IWorkflowProvider> providers)
+    {
+        _context = context;
+        _authHelper = authHelper;
+        _providers = providers;
+    }
+
+    public async Task<OperationResult<WorkflowCountResponse>> Handle(WorkflowCountQuery request, CancellationToken cancellationToken)
+    {
+        long currentUserId = _authHelper.GetCurrentUserId()!.Value;
+
+        int rejectedCount = 0;
+        int notAssignedCount = 0;
+        int pendingForApprovalCount = 0;
+
+        foreach (var provider in _providers)
+        {
+            var count = await provider.GetCount(currentUserId, _context, cancellationToken);
+            switch (provider.Type)
+            {
+                case WorkflowType.Rejected:
+                    rejectedCount += count; break;
+                case WorkflowType.NotAssigned:
+                    notAssignedCount += count; break;
+                case WorkflowType.PendingForApproval:
+                    pendingForApprovalCount += count; break;
+            }
+        }
+
+        var total = rejectedCount + notAssignedCount + pendingForApprovalCount;
+        var response = new WorkflowCountResponse(total, rejectedCount, notAssignedCount, pendingForApprovalCount);
+        return OperationResult<WorkflowCountResponse>.Success(response);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Workflows/Queries/WorkflowList/WorkflowListQuery.cs

@@ -0,0 +1,56 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList.Providers;
+
+namespace GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList;
+
+public record WorkflowListResponse(List<WorkflowListItem>Items);
+
+public class WorkflowListItem
+{
+    public string Title { get; set; }
+    public WorkflowType Type { get; set; }
+    public Guid EntityId { get; set; }
+}
+
+public enum WorkflowType
+{
+    Rejected,
+    NotAssigned,
+    PendingForApproval,
+}
+
+public record WorkflowListQuery():IBaseQuery<WorkflowListResponse>;
+
+public class WorkflowListQueryHandler:IBaseQueryHandler<WorkflowListQuery,WorkflowListResponse>
+{
+    private readonly IProgramManagerDbContext _context;
+    private readonly IAuthHelper _authHelper;
+    private readonly IEnumerable<IWorkflowProvider> _providers;
+
+    public WorkflowListQueryHandler(IProgramManagerDbContext context,
+        IAuthHelper authHelper,
+        IEnumerable<IWorkflowProvider> providers)
+    {
+        _context = context;
+        _authHelper = authHelper;
+        _providers = providers;
+    }
+
+    public async Task<OperationResult<WorkflowListResponse>> Handle(WorkflowListQuery request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId()!.Value;
+        var items = new List<WorkflowListItem>();
+
+        foreach (var provider in _providers)
+        {
+            var providerItems = await provider.GetItems(currentUserId, _context, cancellationToken);
+            if (providerItems?.Count > 0)
+                items.AddRange(providerItems);
+        }
+
+        var res = new WorkflowListResponse(items);
+        return OperationResult<WorkflowListResponse>.Success(res);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Services/FileManagement/IFileStorageService.cs

@@ -0,0 +1,38 @@
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+
+namespace GozareshgirProgramManager.Application.Services.FileManagement;
+
+/// <summary>
+/// سرویس ذخیره‌سازی فایل
+/// </summary>
+public interface IFileStorageService
+{
+    /// <summary>
+    /// آپلود فایل
+    /// </summary>
+    Task<(string StoragePath, string StorageUrl)> UploadAsync(
+        Stream fileStream, 
+        string uniqueFileName, 
+        string category);
+
+    /// <summary>
+    /// حذف فایل
+    /// </summary>
+    Task DeleteAsync(string storagePath);
+
+    /// <summary>
+    /// دریافت فایل
+    /// </summary>
+    Task<Stream?> GetFileStreamAsync(string storagePath);
+
+    /// <summary>
+    /// بررسی وجود فایل
+    /// </summary>
+    Task<bool> ExistsAsync(string storagePath);
+
+    /// <summary>
+    /// دریافت URL فایل
+    /// </summary>
+    string GetFileUrl(string storagePath);
+}
+

ProgramManager/src/Application/GozareshgirProgramManager.Application/Services/FileManagement/IThumbnailGeneratorService.cs

@@ -0,0 +1,34 @@
+namespace GozareshgirProgramManager.Application.Services.FileManagement;
+
+/// <summary>
+/// سرویس تولید thumbnail برای تصاویر و ویدیوها
+/// </summary>
+public interface IThumbnailGeneratorService
+{
+    /// <summary>
+    /// تولید thumbnail برای تصویر
+    /// </summary>
+    Task<(string ThumbnailPath, string ThumbnailUrl)?> GenerateImageThumbnailAsync(
+        string imagePath,
+        string category,
+        int width = 200,
+        int height = 200);
+
+    /// <summary>
+    /// تولید thumbnail برای ویدیو
+    /// </summary>
+    Task<(string ThumbnailPath, string ThumbnailUrl)?> GenerateVideoThumbnailAsync(
+        string videoPath,
+        string category);
+
+    /// <summary>
+    /// حذف thumbnail
+    /// </summary>
+    Task DeleteThumbnailAsync(string thumbnailPath);
+
+    /// <summary>
+    /// دریافت ابعاد تصویر
+    /// </summary>
+    Task<(int Width, int Height)?> GetImageDimensionsAsync(string imagePath);
+}
+

ProgramManager/src/Application/GozareshgirProgramManager.Application/_Common/Extensions/FileExtensions.cs

@@ -0,0 +1,23 @@
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+
+namespace GozareshgirProgramManager.Application._Common.Extensions;
+
+public static class FileExtensions
+{
+    public static UploadedFileDto ToDto(this UploadedFile file)
+    {
+        return new UploadedFileDto()
+        {
+            Id = file.Id,
+            FileName = file.OriginalFileName,
+            FileUrl = file.StorageUrl ?? "",
+            FileSizeBytes = file.FileSizeBytes,
+            FileType = file.FileType.ToString(),
+            ThumbnailUrl = file.ThumbnailUrl,
+            ImageWidth = file.ImageWidth,
+            ImageHeight = file.ImageHeight,
+            DurationSeconds = file.DurationSeconds
+        };
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/_Common/Interfaces/IProgramManagerDbContext.cs

@@ -7,6 +7,12 @@ using GozareshgirProgramManager.Domain.SalaryPaymentSettingAgg.Entities;
 using GozareshgirProgramManager.Domain.SkillAgg.Entities;
 using GozareshgirProgramManager.Domain.UserAgg.Entities;
 using Microsoft.EntityFrameworkCore;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Entities;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 
 namespace GozareshgirProgramManager.Application._Common.Interfaces;
 
@@ -26,6 +32,15 @@ public interface IProgramManagerDbContext
     
     DbSet<ProjectTask> ProjectTasks { get; set; }
     
+    DbSet<TaskChatMessage> TaskChatMessages { get; set; }
+    DbSet<UploadedFile> UploadedFiles { get; set; }
+    
+    //Task Section Time Request
+    DbSet<TaskSectionTimeRequest> TaskSectionTimeRequests { get; set; }
+    
+    // Task Section Revision
+    DbSet<TaskSectionRevision>  TaskSectionRevisions { get; set; }
+    
     DbSet<Skill> Skills { get; set; }
     Task<int> SaveChangesAsync(CancellationToken cancellationToken = default);
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/_Common/Models/OperationResult.cs

@@ -31,7 +31,7 @@ public class OperationResult
     
     // Helper methods for specific error types
     public static OperationResult NotFound(string errorMessage) => new(false, errorMessage, errorType: ErrorType.NotFound);
-    public static OperationResult Unauthorized(string errorMessage) => new(false, errorMessage, errorType: ErrorType.Unauthorized);
+    public static OperationResult Unauthorized(string errorMessage="احراز هویت شما منقضی شده است. لطفا دوباره وارد شوید") => new(false, errorMessage, errorType: ErrorType.Unauthorized);
     public static OperationResult ValidationError(string errorMessage) => new(false, errorMessage, errorType: ErrorType.Validation);
     public static OperationResult ValidationError(List<string> errors) => new(false, errors: errors, errorType: ErrorType.Validation);
     public static OperationResult InternalServerError(string errorMessage) => new(false, errorMessage, errorType: ErrorType.InternalServerError);

ProgramManager/src/Application/GozareshgirProgramManager.Application/_Common/Models/UploadedFileDto.cs

@@ -0,0 +1,34 @@
+namespace GozareshgirProgramManager.Application._Common.Models;
+
+public class UploadedFileDto
+{
+    
+    public Guid Id { get; set; }
+    public string FileName { get; set; } = string.Empty;
+    public string FileUrl { get; set; } = string.Empty;
+    public long FileSizeBytes { get; set; }
+    public string FileType { get; set; } = string.Empty;
+    public string? ThumbnailUrl { get; set; }
+    public int? ImageWidth { get; set; }
+    public int? ImageHeight { get; set; }
+    public int? DurationSeconds { get; set; }
+
+    public string FileSizeFormatted
+    {
+        get
+        {
+            const long kb = 1024;
+            const long mb = kb * 1024;
+            const long gb = mb * 1024;
+
+            if (FileSizeBytes >= gb)
+                return $"{FileSizeBytes / (double)gb:F2} GB";
+            if (FileSizeBytes >= mb)
+                return $"{FileSizeBytes / (double)mb:F2} MB";
+            if (FileSizeBytes >= kb)
+                return $"{FileSizeBytes / (double)kb:F2} KB";
+
+            return $"{FileSizeBytes} Bytes";
+        }
+    }
+}

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/FileManagementAgg/Entities/UploadedFile.cs

@@ -0,0 +1,244 @@
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain._Common.Exceptions;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Events;
+using FileType = GozareshgirProgramManager.Domain.FileManagementAgg.Enums.FileType;
+
+namespace GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+
+/// <summary>
+/// فایل آپلود شده - Aggregate Root
+/// مدیریت مرکزی تمام فایل‌های سیستم
+/// </summary>
+public class UploadedFile : EntityBase<Guid>
+{
+    private UploadedFile()
+    {
+    }
+
+    public UploadedFile(
+        string originalFileName,
+        long fileSizeBytes,
+        string mimeType,
+        FileType fileType,
+        FileCategory category,
+        long uploadedByUserId,
+        StorageProvider storageProvider = StorageProvider.LocalFileSystem)
+    {
+        OriginalFileName = originalFileName;
+        FileSizeBytes = fileSizeBytes;
+        MimeType = mimeType;
+        FileType = fileType;
+        Category = category;
+        UploadedByUserId = uploadedByUserId;
+        UploadDate = DateTime.Now;
+        StorageProvider = storageProvider;
+        Status = FileStatus.Uploading;
+        
+        // Generate unique file name
+        FileExtension = Path.GetExtension(originalFileName);
+        UniqueFileName = $"{Guid.NewGuid()}{FileExtension}";
+        
+        ValidateFile();
+        AddDomainEvent(new FileUploadStartedEvent(Id, originalFileName, uploadedByUserId));
+    }
+
+    // اطلاعات فایل
+    public string OriginalFileName { get; private set; } = string.Empty;
+    public string UniqueFileName { get; private set; } = string.Empty;
+    public string FileExtension { get; private set; } = string.Empty;
+    public long FileSizeBytes { get; private set; }
+    public string MimeType { get; private set; } = string.Empty;
+    public FileType FileType { get; private set; }
+    public FileCategory Category { get; private set; }
+    
+    // ذخیره‌سازی
+    public StorageProvider StorageProvider { get; private set; }
+    public string? StoragePath { get; private set; }
+    public string? StorageUrl { get; private set; }
+    public string? ThumbnailUrl { get; private set; }
+    
+    // متادیتا
+    public long UploadedByUserId { get; private set; }
+    public DateTime UploadDate { get; private set; }
+    public FileStatus Status { get; private set; }
+    
+    // اطلاعات تصویر (اختیاری - برای Image)
+    public int? ImageWidth { get; private set; }
+    public int? ImageHeight { get; private set; }
+    
+    // اطلاعات صوت/ویدیو (اختیاری)
+    public int? DurationSeconds { get; private set; }
+    
+    // امنیت
+    public DateTime? VirusScanDate { get; private set; }
+    public bool? IsVirusScanPassed { get; private set; }
+    public string? VirusScanResult { get; private set; }
+    
+    // Soft Delete
+    public bool IsDeleted { get; private set; }
+    public DateTime? DeletedDate { get; private set; }
+    public long? DeletedByUserId { get; private set; }
+    
+    // Reference tracking (چه entityهایی از این فایل استفاده می‌کنند)
+    public string? ReferenceEntityType { get; private set; }
+    public string? ReferenceEntityId { get; private set; }
+
+    private void ValidateFile()
+    {
+        if (string.IsNullOrWhiteSpace(OriginalFileName))
+        {
+            throw new BadRequestException("نام فایل نمی‌تواند خالی باشد");
+        }
+
+        if (FileSizeBytes <= 0)
+        {
+            throw new BadRequestException("حجم فایل باید بیشتر از صفر باشد");
+        }
+
+        if (string.IsNullOrWhiteSpace(MimeType))
+        {
+            throw new BadRequestException("نوع MIME فایل باید مشخص شود");
+        }
+
+        // محدودیت حجم (مثلاً 100MB)
+        const long maxSizeBytes = 100 * 1024 * 1024; // 100MB
+        if (FileSizeBytes > maxSizeBytes)
+        {
+            throw new BadRequestException($"حجم فایل نباید بیشتر از {maxSizeBytes / (1024 * 1024)} مگابایت باشد");
+        }
+    }
+
+    public void CompleteUpload(string storagePath, string storageUrl)
+    {
+        if (Status != FileStatus.Uploading)
+        {
+            throw new BadRequestException("فایل قبلاً آپلود شده است");
+        }
+
+        if (string.IsNullOrWhiteSpace(storagePath))
+        {
+            throw new BadRequestException("مسیر ذخیره‌سازی نمی‌تواند خالی باشد");
+        }
+
+        if (string.IsNullOrWhiteSpace(storageUrl))
+        {
+            throw new BadRequestException("URL فایل نمی‌تواند خالی باشد");
+        }
+
+        StoragePath = storagePath;
+        StorageUrl = storageUrl;
+        Status = FileStatus.Active;
+        
+        AddDomainEvent(new FileUploadCompletedEvent(Id, OriginalFileName, StorageUrl, UploadedByUserId));
+    }
+
+    public void SetThumbnail(string thumbnailUrl)
+    {
+        if (FileType != FileType.Image && FileType != FileType.Video)
+        {
+            throw new BadRequestException("فقط می‌توان برای تصاویر و ویدیوها thumbnail تنظیم کرد");
+        }
+
+        ThumbnailUrl = thumbnailUrl;
+    }
+
+    public void SetImageDimensions(int width, int height)
+    {
+        if (FileType != FileType.Image)
+        {
+            throw new BadRequestException("فقط می‌توان برای تصاویر ابعاد تنظیم کرد");
+        }
+
+        if (width <= 0 || height <= 0)
+        {
+            throw new BadRequestException("ابعاد تصویر باید بیشتر از صفر باشد");
+        }
+
+        ImageWidth = width;
+        ImageHeight = height;
+    }
+
+    public void SetDuration(int durationSeconds)
+    {
+        if (FileType != FileType.Audio && FileType != FileType.Video)
+        {
+            throw new BadRequestException("فقط می‌توان برای فایل‌های صوتی و تصویری مدت زمان تنظیم کرد");
+        }
+
+        if (durationSeconds <= 0)
+        {
+            throw new BadRequestException("مدت زمان باید بیشتر از صفر باشد");
+        }
+
+        DurationSeconds = durationSeconds;
+    }
+    
+    public void MarkAsDeleted(long deletedByUserId)
+    {
+        if (IsDeleted)
+        {
+            throw new BadRequestException("فایل قبلاً حذف شده است");
+        }
+
+        IsDeleted = true;
+        DeletedDate = DateTime.Now;
+        DeletedByUserId = deletedByUserId;
+        Status = FileStatus.Deleted;
+        
+        AddDomainEvent(new FileDeletedEvent(Id, OriginalFileName, deletedByUserId));
+    }
+
+    public void SetReference(string entityType, string entityId)
+    {
+        ReferenceEntityType = entityType;
+        ReferenceEntityId = entityId;
+    }
+
+    public bool IsImage()
+    {
+        return FileType == FileType.Image;
+    }
+
+    public bool IsVideo()
+    {
+        return FileType == FileType.Video;
+    }
+
+    public bool IsAudio()
+    {
+        return FileType == FileType.Audio;
+    }
+
+    public bool IsDocument()
+    {
+        return FileType == FileType.Document;
+    }
+
+    public bool IsUploadedBy(long userId)
+    {
+        return UploadedByUserId == userId;
+    }
+
+    public bool IsActive()
+    {
+        return Status == FileStatus.Active && !IsDeleted;
+    }
+
+    public string GetFileSizeFormatted()
+    {
+        const long kb = 1024;
+        const long mb = kb * 1024;
+        const long gb = mb * 1024;
+
+        if (FileSizeBytes >= gb)
+            return $"{FileSizeBytes / (double)gb:F2} GB";
+        if (FileSizeBytes >= mb)
+            return $"{FileSizeBytes / (double)mb:F2} MB";
+        if (FileSizeBytes >= kb)
+            return $"{FileSizeBytes / (double)kb:F2} KB";
+        
+        return $"{FileSizeBytes} Bytes";
+    }
+}
+

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/FileManagementAgg/Enums/FileCategory.cs

@@ -0,0 +1,16 @@
+namespace GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+
+/// <summary>
+/// دسته‌بندی فایل - مشخص می‌کند فایل در کجا استفاده شده
+/// </summary>
+public enum FileCategory
+{
+    TaskChatMessage = 1,        // پیام چت تسک
+    TaskAttachment = 2,         // ضمیمه تسک
+    ProjectDocument = 3,        // مستندات پروژه
+    UserProfilePhoto = 4,       // عکس پروفایل کاربر
+    Report = 5,                 // گزارش
+    Other = 6,                   // سایر
+    TaskSectionRevision
+}
+

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/FileManagementAgg/Enums/FileStatus.cs

@@ -0,0 +1,13 @@
+namespace GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+
+/// <summary>
+/// وضعیت فایل
+/// </summary>
+public enum FileStatus
+{
+    Uploading = 1,      // در حال آپلود
+    Active = 2,         // فعال و قابل استفاده
+    Deleted = 5,        // حذف شده (Soft Delete)
+    Archived = 6        // آرشیو شده
+}
+

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/FileManagementAgg/Enums/FileType.cs

@@ -0,0 +1,15 @@
+namespace GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+
+/// <summary>
+/// نوع فایل
+/// </summary>
+public enum FileType
+{
+    Document = 1,   // اسناد (PDF, Word, Excel, etc.)
+    Image = 2,      // تصویر
+    Video = 3,      // ویدیو
+    Audio = 4,      // صوت
+    Archive = 5,    // فایل فشرده (ZIP, RAR)
+    Other = 6       // سایر
+}
+

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/FileManagementAgg/Enums/StorageProvider.cs

@@ -0,0 +1,10 @@
+namespace GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+
+/// <summary>
+/// نوع ذخیره‌ساز فایل
+/// </summary>
+public enum StorageProvider
+{
+    LocalFileSystem = 1,    // دیسک محلی سرور
+}
+

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/FileManagementAgg/Events/FileEvents.cs

@@ -0,0 +1,36 @@
+using GozareshgirProgramManager.Domain._Common;
+
+namespace GozareshgirProgramManager.Domain.FileManagementAgg.Events;
+
+// File Upload Events
+public record FileUploadStartedEvent(Guid FileId, string FileName, long UploadedByUserId) : IDomainEvent
+{
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
+}
+
+public record FileUploadCompletedEvent(Guid FileId, string FileName, string StorageUrl, long UploadedByUserId) : IDomainEvent
+{
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
+}
+
+public record FileDeletedEvent(Guid FileId, string FileName, long DeletedByUserId) : IDomainEvent
+{
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
+}
+
+// Virus Scan Events
+public record FileQuarantinedEvent(Guid FileId, string FileName) : IDomainEvent
+{
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
+}
+
+public record FileVirusScanPassedEvent(Guid FileId, string FileName) : IDomainEvent
+{
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
+}
+
+public record FileInfectedEvent(Guid FileId, string FileName, string ScanResult) : IDomainEvent
+{
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
+}
+

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/FileManagementAgg/Repositories/IUploadedFileRepository.cs

@@ -0,0 +1,91 @@
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+
+namespace GozareshgirProgramManager.Domain.FileManagementAgg.Repositories;
+
+/// <summary>
+/// Repository برای مدیریت فایل‌های آپلود شده
+/// </summary>
+public interface IUploadedFileRepository
+{
+    /// <summary>
+    /// دریافت فایل بر اساس شناسه
+    /// </summary>
+    Task<UploadedFile?> GetByIdAsync(Guid fileId);
+
+    /// <summary>
+    /// دریافت فایل بر اساس نام یکتا
+    /// </summary>
+    Task<UploadedFile?> GetByUniqueFileNameAsync(string uniqueFileName);
+
+    /// <summary>
+    /// دریافت لیست فایل‌های یک کاربر
+    /// </summary>
+    Task<List<UploadedFile>> GetUserFilesAsync(long userId, int pageNumber, int pageSize);
+
+    /// <summary>
+    /// دریافت فایل‌های یک دسته خاص
+    /// </summary>
+    Task<List<UploadedFile>> GetByCategoryAsync(FileCategory category, int pageNumber, int pageSize);
+
+    /// <summary>
+    /// دریافت فایل‌های با وضعیت خاص
+    /// </summary>
+    Task<List<UploadedFile>> GetByStatusAsync(FileStatus status, int pageNumber, int pageSize);
+
+    /// <summary>
+    /// دریافت فایل‌های یک Reference خاص
+    /// </summary>
+    Task<List<UploadedFile>> GetByReferenceAsync(string entityType, string entityId);
+
+    /// <summary>
+    /// جستجو در فایل‌ها بر اساس نام
+    /// </summary>
+    Task<List<UploadedFile>> SearchByNameAsync(string searchTerm, int pageNumber, int pageSize);
+
+    /// <summary>
+    /// دریافت تعداد کل فایل‌های یک کاربر
+    /// </summary>
+    Task<int> GetUserFilesCountAsync(long userId);
+
+    /// <summary>
+    /// دریافت مجموع حجم فایل‌های یک کاربر (به بایت)
+    /// </summary>
+    Task<long> GetUserTotalFileSizeAsync(long userId);
+
+    /// <summary>
+    /// دریافت فایل‌های منقضی شده برای پاک‌سازی
+    /// </summary>
+    Task<List<UploadedFile>> GetExpiredFilesAsync(DateTime olderThan);
+
+    /// <summary>
+    /// اضافه کردن فایل جدید
+    /// </summary>
+    Task<UploadedFile> AddAsync(UploadedFile file);
+
+    /// <summary>
+    /// به‌روزرسانی فایل
+    /// </summary>
+    Task UpdateAsync(UploadedFile file);
+
+    /// <summary>
+    /// حذف فیزیکی فایل (فقط برای cleanup)
+    /// </summary>
+    Task DeleteAsync(UploadedFile file);
+
+    /// <summary>
+    /// ذخیره تغییرات
+    /// </summary>
+    Task<int> SaveChangesAsync();
+
+    /// <summary>
+    /// بررسی وجود فایل
+    /// </summary>
+    Task<bool> ExistsAsync(Guid fileId);
+
+    /// <summary>
+    /// بررسی وجود فایل با نام یکتا
+    /// </summary>
+    Task<bool> ExistsByUniqueFileNameAsync(string uniqueFileName);
+}
+

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Phase/PhaseSection.cs

@@ -1,7 +1,7 @@
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.SkillAgg.Entities;
 
-namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 
 /// <summary>
 /// بخش فاز - برای ذخیره تخصیص کاربر و مهارت در سطح Phase

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Phase/ProjectPhase.cs

@@ -1,8 +1,9 @@
-using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Events;
 
-namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 
 /// <summary>
 /// فاز پروژه - سطح میانی در سلسله مراتب
@@ -28,7 +29,7 @@ public class ProjectPhase : ProjectHierarchyNode
     }
     
     public Guid ProjectId { get; private set; }
-    public Project Project { get; private set; } = null!;
+    public Project.Project Project { get; private set; } = null!;
     public IReadOnlyList<ProjectTask> Tasks => _tasks.AsReadOnly();
     public IReadOnlyList<PhaseSection> PhaseSections => _phaseSections.AsReadOnly();
 

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Project/Project.cs

@@ -1,8 +1,8 @@
-using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Events;
 
-namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
 
 /// <summary>
 /// پروژه - بالاترین سطح در سلسله مراتب و Aggregate Root

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Project/ProjectSection.cs

@@ -1,7 +1,7 @@
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.SkillAgg.Entities;
 
-namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
 
 /// <summary>
 /// ProjectSection: shortcut container for UserId + SkillId at Project level

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Task/ProjectTask.cs

@@ -1,36 +1,36 @@
-using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Events;
 
-namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
 
 /// <summary>
 /// تسک - پایین‌ترین سطح در سلسله مراتب که شامل بخش‌ها می‌شود
 /// </summary>
 public class ProjectTask : ProjectHierarchyNode
 {
-    private readonly List<TaskSection> _sections;
+    private readonly List<TaskSection.TaskSection> _sections;
 
     private ProjectTask()
     {
-        _sections = new List<TaskSection>();
+        _sections = new List<TaskSection.TaskSection>();
     }
 
     public ProjectTask(string name, Guid phaseId, string? description = null) : base(name, description)
     {
         PhaseId = phaseId;
-        _sections = new List<TaskSection>();
-        Priority = TaskPriority.Medium;
+        _sections = new List<TaskSection.TaskSection>();
+        Priority = ProjectTaskPriority.Low;
         AddDomainEvent(new TaskCreatedEvent(Id, phaseId, name));
     }
     
     public Guid PhaseId { get; private set; }
     public ProjectPhase Phase { get; private set; } = null!;
-    public IReadOnlyList<TaskSection> Sections => _sections.AsReadOnly();
+    public IReadOnlyList<TaskSection.TaskSection> Sections => _sections.AsReadOnly();
 
     // Task-specific properties
     public Enums.TaskStatus Status { get; private set; } = Enums.TaskStatus.NotStarted;
-    public TaskPriority Priority { get; private set; }
+    public ProjectTaskPriority Priority { get; private set; }
     public DateTime? StartDate { get; private set; }
     public DateTime? EndDate { get; private set; }
     public DateTime? DueDate { get; private set; }
@@ -40,7 +40,7 @@ public class ProjectTask : ProjectHierarchyNode
     
     #region Section Management
 
-    public void AddSection(TaskSection section, bool cascadeToChildren = false)
+    public void AddSection(TaskSection.TaskSection section, bool cascadeToChildren = false)
     {
         var existingSection = _sections.FirstOrDefault(s => s.SkillId == section.SkillId);
         if (existingSection != null)
@@ -84,7 +84,7 @@ public class ProjectTask : ProjectHierarchyNode
             return;
         }
 
-        var section = new TaskSection(Id, skillId, assignedUserId);
+        var section = new TaskSection.TaskSection(Id, skillId, assignedUserId);
         _sections.Add(section);
         AddDomainEvent(new TaskSectionAddedEvent(Id, section.Id, skillId));
     }
@@ -119,7 +119,7 @@ public class ProjectTask : ProjectHierarchyNode
         AddDomainEvent(new TaskStatusUpdatedEvent(Id, status));
     }
 
-    public void SetPriority(TaskPriority priority)
+    public void SetPriority(ProjectTaskPriority priority)
     {
         Priority = priority;
         AddDomainEvent(new TaskPriorityUpdatedEvent(Id, priority));
@@ -204,12 +204,12 @@ public class ProjectTask : ProjectHierarchyNode
 
     #region Query Helpers
 
-    public IEnumerable<TaskSection> GetSectionsBySkill(Guid skillId)
+    public IEnumerable<TaskSection.TaskSection> GetSectionsBySkill(Guid skillId)
     {
         return _sections.Where(s => s.SkillId == skillId);
     }
 
-    public TaskSection? GetSectionBySkill(Guid skillId)
+    public TaskSection.TaskSection? GetSectionBySkill(Guid skillId)
     {
         return _sections.FirstOrDefault(s => s.SkillId == skillId);
     }
@@ -219,7 +219,7 @@ public class ProjectTask : ProjectHierarchyNode
         return _sections.Any(s => s.SkillId == skillId);
     }
 
-    public IEnumerable<TaskSection> GetAssignedSections(long userId)
+    public IEnumerable<TaskSection.TaskSection> GetAssignedSections(long userId)
     {
         return _sections.Where(s => s.CurrentAssignedUserId == userId);
     }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Task/TaskSection/TaskSection.cs

@@ -1,12 +1,10 @@
-using System.Linq;
-using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain._Common.Exceptions;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Events;
-using GozareshgirProgramManager.Domain.ProjectAgg.Models;
 using GozareshgirProgramManager.Domain.SkillAgg.Entities;
 
-namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 
 /// <summary>
 /// بخش تسک - برای ذخیره کار واقعی که کاربر روی یک مهارت خاص انجام می‌دهد
@@ -61,12 +59,13 @@ public class TaskSection : EntityBase<Guid>
     // برای backward compatibility
     public TimeSpan EstimatedHours => FinalEstimatedHours;
 
-    public void AddAdditionalTime(TimeSpan additionalHours, string? reason = null, long? addedByUserId = null)
+    public void AddAdditionalTime(TimeSpan additionalHours, TaskSectionAdditionalTimeType type, string? reason = null,
+        long? addedByUserId = null)
     {
         if (additionalHours <= TimeSpan.Zero)
             throw new BadRequestException("تایم اضافی باید بزرگتر از صفر باشد", nameof(additionalHours));
 
-        var additionalTime = new TaskSectionAdditionalTime(additionalHours, reason, addedByUserId);
+        var additionalTime = new TaskSectionAdditionalTime(additionalHours,type, reason, addedByUserId);
         _additionalTimes.Add(additionalTime);
     }
 
@@ -270,7 +269,7 @@ public class TaskSection : EntityBase<Guid>
             // متوقف کردن فعالیت با EndDate دقیق شده
             activeActivity.StopWorkWithSpecificTime(adjustedEndDate, "متوقف خودکار - بیش از تایم تعیین شده");
             
-            UpdateStatus(TaskSectionStatus.Incomplete);
+            UpdateStatus(TaskSectionStatus.PendingForCompletion);
         }
     }
 }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Task/TaskSection/TaskSectionActivity.cs

@@ -1,7 +1,6 @@
-using System.Diagnostics.CodeAnalysis;
 using GozareshgirProgramManager.Domain._Common;
 
-namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 
 /// <summary>
 /// فعالیت کاری روی یک بخش

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Task/TaskSection/TaskSectionAdditionalTime.cs

@@ -1,6 +1,6 @@
 using GozareshgirProgramManager.Domain._Common;
 
-namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 
 /// <summary>
 /// زمان اضافی اضافه شده بعد از تخمین اولیه
@@ -9,12 +9,13 @@ public class TaskSectionAdditionalTime : EntityBase<Guid>
 {
     private TaskSectionAdditionalTime() { }
 
-    public TaskSectionAdditionalTime(TimeSpan hours, string? reason = null, long? addedByUserId = null)
+    public TaskSectionAdditionalTime(TimeSpan hours, TaskSectionAdditionalTimeType type, string? reason = null,long? addedByUserId = null)
     {
         Hours = hours;
         Reason = reason;
         AddedByUserId = addedByUserId;
-        AddedAt = DateTime.UtcNow;
+        AddedAt = DateTime.Now;
+        Type = type;
     }
 
     public TimeSpan Hours { get; private set; }
@@ -22,8 +23,15 @@ public class TaskSectionAdditionalTime : EntityBase<Guid>
     public long? AddedByUserId { get; private set; }
     public DateTime AddedAt { get; private set; }
 
+    public TaskSectionAdditionalTimeType Type { get; set; }
     public void UpdateReason(string? reason)
     {
         Reason = reason;
     }
 }
+
+public enum TaskSectionAdditionalTimeType
+{
+    Effective,
+    Ineffective,
+}

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Task/TaskSection/TaskSectionRevision.cs

@@ -0,0 +1,56 @@
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+
+public class TaskSectionRevision : EntityBase<Guid>
+{
+    public TaskSectionRevision(Guid taskSectionId,
+        string message, long createdByUserId)
+        {
+            TaskSectionId = taskSectionId;
+            Status = RevisionReviewStatus.Pending;
+            Message = message;
+            CreatedByUserId = createdByUserId;
+        }
+    
+    public Guid TaskSectionId { get; private set; }
+
+    public RevisionReviewStatus Status { get; private set; }
+
+
+    public string Message { get; private set; }
+
+    public long CreatedByUserId { get; private set; }
+    
+    public IReadOnlyCollection<TaskRevisionFile> Files => _files;
+    private readonly List<TaskRevisionFile> _files = new();
+
+    public void AddFile(TaskRevisionFile file)
+    {
+        _files.Add(file);
+    }
+
+    public void MarkReviewed()
+    {
+        if (Status == RevisionReviewStatus.Reviewed)
+            return;
+        Status = RevisionReviewStatus.Reviewed;
+    }
+    
+}
+public class TaskRevisionFile: EntityBase<Guid>
+{
+    public TaskRevisionFile(Guid fileId)
+    {
+        FileId = fileId;
+    }
+
+    public Guid FileId { get; private set; }
+}
+
+public enum RevisionReviewStatus : short
+{
+    Pending = 1,
+    Reviewed = 2
+}

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Task/TaskSection/TaskSectionTimeRequest.cs

@@ -0,0 +1,33 @@
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+
+public class TaskSectionTimeRequest:EntityBase<Guid>
+{
+    
+    public TaskSectionTimeRequest(long userId, string description,
+        TimeSpan requestedTime, TaskSectionTimeRequestType requestType,
+        Guid taskSectionId)
+    {
+        UserId = userId;
+        Description = description;
+        RequestedTime = requestedTime;
+        RequestType = requestType;
+        TaskSectionId = taskSectionId;
+        RequestStatus = TaskSectionTimeRequestStatus.Pending;
+    }
+
+    public TaskSection TaskSection { get; set; }
+    public Guid TaskSectionId { get; set; }
+    public long UserId { get; private set; }
+    public string Description { get; private set; }
+    public TimeSpan RequestedTime { get; private set; }
+    public TaskSectionTimeRequestType RequestType { get; private set; }
+    public TaskSectionTimeRequestStatus RequestStatus { get; private set; }
+
+    public void AcceptTimeRequest()
+    {
+        RequestStatus = TaskSectionTimeRequestStatus.Accepted;
+    }
+}

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Enums/ProjectTaskPriority.cs

@@ -3,7 +3,7 @@ namespace GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 /// <summary>
 /// اولویت تسک
 /// </summary>
-public enum TaskPriority
+public enum ProjectTaskPriority
 {
     /// <summary>
     /// پایین

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Enums/TaskSectionTimeRequestStatus.cs

@@ -0,0 +1,8 @@
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+
+public enum TaskSectionTimeRequestStatus
+{
+    Pending,
+    Accepted,
+    Rejected
+}

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Enums/TaskSectionTimeRequestType.cs

@@ -0,0 +1,8 @@
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+
+public enum TaskSectionTimeRequestType
+{
+    InitialTime,
+    AdditionalTime,
+    RejectedTime,
+}

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Events/ProjectEvents.cs

@@ -78,7 +78,7 @@ public record TaskStatusUpdatedEvent(Guid TaskId, TaskStatus Status) : IDomainEv
     public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
-public record TaskPriorityUpdatedEvent(Guid TaskId, TaskPriority Priority) : IDomainEvent
+public record TaskPriorityUpdatedEvent(Guid TaskId, ProjectTaskPriority Priority) : IDomainEvent
 {
     public DateTime OccurredOn { get; init; } = DateTime.Now;
 }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/IPhaseSectionRepository.cs

@@ -1,5 +1,7 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
 using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+
 namespace GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 public interface IPhaseSectionRepository : IRepository<Guid, PhaseSection>
 {

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/IProjectPhaseRepository.cs

@@ -1,5 +1,6 @@
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 
 namespace GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/IProjectRepository.cs

@@ -1,5 +1,6 @@
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
 
 namespace GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/IProjectSectionRepository.cs

@@ -1,5 +1,6 @@
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
 
 namespace GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/IProjectTaskRepository.cs

@@ -1,5 +1,6 @@
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
 
 namespace GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 
@@ -36,7 +37,7 @@ public interface IProjectTaskRepository : IRepository<Guid, ProjectTask>
     /// <summary>
     /// Get tasks by priority
     /// </summary>
-    Task<List<ProjectTask>> GetByPriorityAsync(ProjectAgg.Enums.TaskPriority priority);
+    Task<List<ProjectTask>> GetByPriorityAsync(ProjectAgg.Enums.ProjectTaskPriority priority);
     
     /// <summary>
     /// Get tasks assigned to user

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/ITaskSectionActivityRepository.cs

@@ -1,5 +1,6 @@
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 
 namespace GozareshgirProgramManager.Domain.ProjectAgg.Repositories;