chnage loan list to new type

.gitignore

@@ -368,6 +368,3 @@ MigrationBackup/
 # Storage folder - ignore all uploaded files, thumbnails, and temporary files
 ServiceHost/Storage
 
-.env
-.env.*
-

0_Framework/Application/Enums/TypeOfSmsSetting.cs

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

0_Framework/Application/Sms/ApiResultViewModel.cs

@@ -17,18 +17,4 @@ 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,13 +19,6 @@ 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);

0_Framework/Application/StaticWorkshopAccounts.cs

@@ -31,9 +31,8 @@ public static class StaticWorkshopAccounts
     /// 381 - مهدی قربانی
     /// 392 - عمار حسن دوست
     /// 20 - سمیرا الهی نیا
-    /// 322 - ماهان چمنی
     /// </summary>
-    public static List<long> StaticAccountIds = [2, 3, 380, 381, 392, 20, 476,322];
+    public static List<long> StaticAccountIds = [2, 3, 380, 381, 392, 20, 476];
 
     /// <summary>
     /// این تاریخ در جدول اکانت لفت ورک به این معنیست

AccountManagement.Application.Contracts/AccountManagement.Application.Contracts.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
-	  <NuGetAudit>false</NuGetAudit>
   </PropertyGroup>
 
   <ItemGroup>

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Jobs/JobSchedulerRegistrator.cs

@@ -1,6 +1,5 @@
 
 using _0_Framework.Application;
-using _0_Framework.Application.Enums;
 using _0_Framework.Application.Sms;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.InstitutionContractAgg;
@@ -13,21 +12,19 @@ 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, IInstitutionContractSmsServiceRepository institutionContractSmsServiceRepository)
+    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository, ISmsService smsService, ILogger<JobSchedulerRegistrator> logger)
     {
         _smsReminder = smsReminder;
         _backgroundJobClient = backgroundJobClient;
         _institutionContractRepository = institutionContractRepository;
         _smsService = smsService;
         _logger = logger;
-        _institutionContractSmsServiceRepository = institutionContractSmsServiceRepository;
     }
 
     public void Register()
@@ -61,43 +58,17 @@ 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.Block",
-            () => Block(),
-            "*/30 * * * *"  // هر 30 دقیقه یکبار چک کن
-        );
-
-        RecurringJob.AddOrUpdate(
-            "InstitutionContract.UnBlock",
-            () => UnBlock(),
-            "*/10 * * * *"
-        );
-
-        RecurringJob.AddOrUpdate(
-            "InstitutionContract.DeActiveInstitutionEndOfContract",
-            () => DeActiveInstitutionEndOfContract(),
-            "*/30 * * * *"
-        );
-
-        RecurringJob.AddOrUpdate(
-            "InstitutionContract.BlueDeActiveAfterZeroDebt",
-            () => BlueDeActiveAfterZeroDebt(),
-            "*/10 * * * *"
-        );
+        //RecurringJob.AddOrUpdate(
+        //    "InstitutionContract.SendLegalActionSms",
+        //    () => SendLegalActionSms(),
+        //    "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
+        //);
     }
 
 
@@ -108,14 +79,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();
@@ -130,17 +101,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", "خطا-ایجاد سند مالی");
 
             }
-
+           
         }
     }
 
@@ -163,7 +134,7 @@ public class JobSchedulerRegistrator
 
             try
             {
-                await _institutionContractSmsServiceRepository.SendMonthlySms(now);
+                await _institutionContractRepository.SendMonthlySms(now);
                 _lastRunSendMonthlySms = now;
                 Console.WriteLine("Send Monthly sms executed");
 
@@ -185,7 +156,7 @@ public class JobSchedulerRegistrator
     public async System.Threading.Tasks.Task SendReminderSms()
     {
         _logger.LogInformation("SendReminderSms job run");
-        await _institutionContractSmsServiceRepository.SendReminderSmsForBackgroundTask();
+        await _institutionContractRepository.SendReminderSmsForBackgroundTask();
     }
 
     /// <summary>
@@ -196,7 +167,7 @@ public class JobSchedulerRegistrator
     public async System.Threading.Tasks.Task SendBlockSms()
     {
         _logger.LogInformation("SendBlockSms job run");
-        await _institutionContractSmsServiceRepository.SendBlockSmsForBackgroundTask();
+        await _institutionContractRepository.SendBlockSmsForBackgroundTask();
     }
 
 
@@ -208,7 +179,7 @@ public class JobSchedulerRegistrator
     public async System.Threading.Tasks.Task SendInstitutionContractConfirmSms()
     {
         _logger.LogInformation("SendInstitutionContractConfirmSms job run");
-        await _institutionContractSmsServiceRepository.SendInstitutionContractConfirmSmsTask();
+        await _institutionContractRepository.SendInstitutionContractConfirmSmsTask();
     }
 
     /// <summary>
@@ -219,86 +190,14 @@ public class JobSchedulerRegistrator
     public async System.Threading.Tasks.Task SendWarningSms()
     {
         _logger.LogInformation("SendWarningSms job run");
-        await _institutionContractSmsServiceRepository.SendWarningOrLegalActionSmsTask(TypeOfSmsSetting.Warning);
+        await _institutionContractRepository.SendWarningSmsTask();
     }
 
-    /// <summary>
-    /// پیامک اقدام قضایی 
-    /// </summary>
-    /// <returns></returns>
     [DisableConcurrentExecution(timeoutInSeconds: 100)]
     public async System.Threading.Tasks.Task SendLegalActionSms()
     {
         _logger.LogInformation("SendWarningSms job run");
-        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();
+        await _institutionContractRepository.SendLegalActionSmsTask();
     }
 
 }

Company.Domain/CheckoutAgg/Checkout.cs

@@ -31,7 +31,7 @@ public class Checkout : EntityBase
         string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue,
         string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute,
         ICollection<CheckoutLoanInstallment> loanInstallments,
-        ICollection<CheckoutSalaryAid> salaryAids, CheckoutRollCall checkoutRollCall, TimeSpan employeeMandatoryHours, bool hasInsuranceShareTheSameAsList, ICollection<CheckoutReward> rewards,double rewardPay)
+        ICollection<CheckoutSalaryAid> salaryAids, CheckoutRollCall checkoutRollCall, TimeSpan employeeMandatoryHours, bool hasInsuranceShareTheSameAsList)
     {
         EmployeeFullName = employeeFullName;
         FathersName = fathersName;
@@ -71,7 +71,7 @@ public class Checkout : EntityBase
         TotalClaims = totalClaims;
         TotalDeductions = totalDeductions;
         TotalPayment = totalPayment;
-        RewardPay = rewardPay;
+        RewardPay = 0;
         IsActiveString = "true";
         Signature = signature;
         MarriedAllowance = marriedAllowance;
@@ -93,7 +93,6 @@ public class Checkout : EntityBase
         CheckoutRollCall = checkoutRollCall;
         EmployeeMandatoryHours = employeeMandatoryHours;
         HasInsuranceShareTheSameAsList = hasInsuranceShareTheSameAsList;
-        Rewards = rewards;
     }
 
 
@@ -131,7 +130,7 @@ public class Checkout : EntityBase
     public double BonusesPay { get; private set; }
     public double YearsPay { get; private set; }
     public double LeavePay { get; private set; }
-    public double RewardPay { get; private set; }
+    public double? RewardPay { get; private set; }
     public double InsuranceDeduction { get; private set; }
     public double TaxDeducation { get; private set; }
     public double InstallmentDeduction { get; private set; }
@@ -224,8 +223,6 @@ public class Checkout : EntityBase
 
     public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
     public ICollection<CheckoutSalaryAid> SalaryAids { get; set; } = [];
-
-    public ICollection<CheckoutReward> Rewards { get; set; } = [];
     public CheckoutRollCall CheckoutRollCall { get; private set; }
     #endregion
 
@@ -242,7 +239,7 @@ public class Checkout : EntityBase
         double insuranceDeduction, double taxDeducation, double installmentDeduction,
         double salaryAidDeduction, double absenceDeduction, string sumOfWorkingDays
         , string archiveCode, string personnelCode,
-        string totalClaims, string totalDeductions, double totalPayment, double rewardPay)
+        string totalClaims, string totalDeductions, double totalPayment, double? rewardPay)
     {
         EmployeeFullName = employeeFullName;
         FathersName = fathersName;
@@ -340,11 +337,6 @@ public class Checkout : EntityBase
         InstallmentDeduction = installmentsAmount;
     }
 
-    public void SetReward(ICollection<CheckoutReward> rewards, double rewardAmount)
-    {
-        RewardPay = rewardAmount;
-        Rewards = rewards;
-    }
     public void SetCheckoutRollCall(CheckoutRollCall checkoutRollCall)
     {
         CheckoutRollCall = checkoutRollCall;

Company.Domain/CheckoutAgg/ValueObjects/CheckoutReward.cs

@@ -1,57 +0,0 @@
-using System;
-
-namespace Company.Domain.CheckoutAgg.ValueObjects;
-
-public class CheckoutReward
-{
-    public CheckoutReward(string amount, double amountDouble, string grantDateFa, DateTime grantDateGr, string description, string title, long entityId)
-    {
-        Amount = amount;
-        AmountDouble = amountDouble;
-        GrantDateFa = grantDateFa;
-        GrantDateGr = grantDateGr;
-        Description = description;
-        Title = title;
-        EntityId = entityId;
-    }
-
-    /// <summary>
-    /// مبلغ پاداش
-    /// string
-    /// </summary>
-    public string Amount { get; set; }
-
-    /// <summary>
-    /// مبلغ پاداش
-    /// double
-    /// </summary>
-    public double AmountDouble { get; set; }
-
-    /// <summary>
-    /// تاریخ اعطاء
-    /// شمسی
-    /// </summary>
-    public string GrantDateFa { get; set; }
-
-    /// <summary>
-    /// تاریخ اعطاء
-    /// میلادی
-    /// </summary>
-    public DateTime GrantDateGr { get; set; }
-
-    /// <summary>
-    /// توضیحات
-    /// </summary>
-    public string Description { get; set; }
-
-    /// <summary>
-    /// عنوان
-    /// </summary>
-    public string Title { get; set; }
-
-
-    /// <summary>
-    /// آی دی پاداش
-    /// </summary>
-    public long EntityId { get; set; }
-}

Company.Domain/File1/File1.cs

@@ -66,9 +66,4 @@ public class File1 : EntityBase
         Description = description;
         Status = status;
     }
-    
-    public void ChangeStatus(int status)
-    {
-        Status = status;
-    }
 }

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -91,7 +91,65 @@ 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
 
@@ -104,12 +162,24 @@ 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

@@ -1,145 +0,0 @@
-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/RollCallAgg/IRollCallMandatoryRepository.cs

@@ -1,16 +1,15 @@
-using _0_Framework.Domain;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using _0_Framework.Domain;
 using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities;
 using CompanyManagment.App.Contracts.Contract;
 using CompanyManagment.App.Contracts.CustomizeCheckout;
 using CompanyManagment.App.Contracts.Leave;
 using CompanyManagment.App.Contracts.Loan;
-using CompanyManagment.App.Contracts.Reward;
 using CompanyManagment.App.Contracts.RollCall;
 using CompanyManagment.App.Contracts.SalaryAid;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace Company.Domain.RollCallAgg;
 
@@ -54,9 +53,6 @@ public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
     List<SalaryAidViewModel> SalaryAidsForCheckout(long employeeId, long workshopId, DateTime checkoutStart,
         DateTime checkoutEnd);
 
-    List<RewardViewModel> RewardForCheckout(long employeeId, long workshopId, DateTime checkoutEnd,
-        DateTime checkoutStart);
-
     Task<ComputingViewModel> RotatingShiftReport(long workshopId, long employeeId, DateTime contractStart,
         DateTime contractEnd, string shiftwork, bool hasRollCall, CreateWorkingHoursTemp command,bool holidayWorking);
 }

Company.Domain/RollCallAgg/RollCall.cs

@@ -531,11 +531,6 @@ namespace Company.Domain.RollCallAgg
             FridayWorkTimeSpan = CalculateFridayWorkDuration(StartDate.Value, EndDate.Value);
         }
 
-        public void SetStartDate(DateTime start)
-        {
-            StartDate = start;
-        }
-
         /// <summary>
         /// جیزه
         /// </summary>

Company.Domain/SmsResultAgg/ISmsResultRepository.cs

@@ -1,30 +1,10 @@
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.SmsResult;
-using CompanyManagment.App.Contracts.SmsResult.Dto;
+using CompanyManagment.App.Contracts.SmsResult;
 using System.Collections.Generic;
-using System.Threading.Tasks;
+using _0_Framework.Domain;
 
 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/Checkout/CreateCheckout.cs

@@ -193,9 +193,4 @@ public class CreateCheckout
     /// پایه سنوات قبل از تاثیر ساعت کار
     /// </summary>
     public double BaseYearUnAffected { get; set; }
-
-    /// <summary>
-    /// آیا برای محاسبه پاداش مجاز است
-    /// </summary>
-    public bool RewardPayCompute { get; set; }
 }

CompanyManagment.App.Contracts/CompanyManagment.App.Contracts.csproj

@@ -4,7 +4,6 @@
 		<TargetFramework>net10.0</TargetFramework>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<NoWarn>$(NoWarn);1591</NoWarn>
-		<NuGetAudit>false</NuGetAudit>
 	</PropertyGroup>
 
 	<ItemGroup>

CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

@@ -324,7 +324,6 @@ public class InstitutionContractCreationWorkshopsResponse
 {
     public List<WorkshopTempViewModel> WorkshopTemps { get; set; }
     public string TotalAmount { get; set; }
-    public Guid TempId { get; set; }
 }
 
 public class InstitutionContractCreationWorkshopsRequest

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionCompleteRequest.cs

@@ -7,7 +7,6 @@ public class InstitutionContractExtensionCompleteRequest
     public Guid TemporaryId { get; set; }
     public bool IsInstallment { get; set; }
     public long LawId { get; set; }
-    public bool CancelSendVerificationSms { get; set; }
 }
 
 public class InstitutionContractCreationCompleteRequest

CompanyManagment.App.Contracts/Loan/ILoanApplication.cs

@@ -21,6 +21,6 @@ public class LoanGroupedViewModel
 {
     public List<LoanGroupedByDateViewModel> GroupedByDate { get; set; }
     public List<LoanGroupedByEmployeeViewModel>GroupedByEmployee  { get; set; }
-    public List<LoanViewModel> LoanListViewModel { get; set; }
+    public PagedResult<LoanViewModel> LoanListViewModel { get; set; }
 }
 

CompanyManagment.App.Contracts/Loan/LoanSearchViewModel.cs

@@ -16,5 +16,6 @@ public class LoanSearchViewModel
 	public string EndDate { get; set; }
 	
 	public int PageIndex { get; set; }
+	public int PageSize { get; set; } = 30;
     public bool ShowAsGrouped { get; set; }
 }

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

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

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

@@ -1,54 +0,0 @@
-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

@@ -1,43 +0,0 @@
-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,34 +1,14 @@
-using _0_Framework.Application;
-using CompanyManagment.App.Contracts.SmsResult.Dto;
-using System;
+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.App.Contracts/Workshop/CreateWorkshop.cs

@@ -151,9 +151,6 @@ public class CreateWorkshop
     /// تصفیه حساب بصورت استاتیک محاصبه شود
     /// </summary>
     public bool IsStaticCheckout { get; set; }
+    
 
-    /// <summary>
-    /// آیا پاداش در فیش حقوقی محاسبه شود
-    /// </summary>
-    public bool RewardComputeOnCheckout { get; set; }
 }

CompanyManagment.Application/CheckoutApplication.cs

@@ -240,16 +240,6 @@ public class CheckoutApplication : ICheckoutApplication
 
 		command.InstallmentDeduction = loanInstallments.Sum(x => x.AmountForMonth.MoneyToDouble());
 
-        var rewards = new List<CheckoutReward>();
-        double rewardPay = 0;
-        if (command.RewardPayCompute)
-        {
-            rewards = _rollCallMandatoryRepository.RewardForCheckout(command.EmployeeId, command.WorkshopId, checkoutEnd.ToGeorgianDateTime(), checkoutStart.ToGeorgianDateTime())
-                .Select(x => new CheckoutReward(x.Amount, x.AmountDouble, x.GrantDateFa, x.GrantDateGr, x.Description, x.Title, x.Id)).ToList();
-
-            rewardPay = rewards.Sum(x => x.AmountDouble);
-        }
-		
 
 		
 
@@ -371,7 +361,7 @@ public class CheckoutApplication : ICheckoutApplication
 
 
 		var totalClaimsDouble = monthlyWage + bacicYears + consumableItem + housingAllowance + marriedAllowance + command.OvertimePay +
-								command.NightworkPay + familyAllowance + bunos + years + command.LeavePay + command.FridayPay + command.ShiftPay + rewardPay;
+								command.NightworkPay + familyAllowance + bunos + years + command.LeavePay + command.FridayPay + command.ShiftPay;
 		var totalClaims = totalClaimsDouble.ToMoney();
 		var totalDeductionDouble = insuranceDeduction + command.AbsenceDeduction + command.InstallmentDeduction + command.SalaryAidDeduction;
 		var totalDeductions = totalDeductionDouble.ToMoney();
@@ -396,7 +386,7 @@ public class CheckoutApplication : ICheckoutApplication
 				, command.OvertimePay, command.NightworkPay, command.FridayPay, 0, command.ShiftPay, familyAllowance, bunos, years, command.LeavePay, insuranceDeduction, 0, command.InstallmentDeduction, command.SalaryAidDeduction, command.AbsenceDeduction, sumOfWorkingDays,
 				command.ArchiveCode, command.PersonnelCode, totalClaims, totalDeductions, totalPayment, command.Signature, marriedAllowance, command.LeaveCheckout, command.CreditLeaves, command.AbsencePeriod, command.AverageHoursPerDay, command.HasRollCall, command.OverTimeWorkValue, command.OverNightWorkValue
 				, command.FridayWorkValue, command.RotatingShiftValue, command.AbsenceValue, command.TotalDayOfLeaveCompute, command.TotalDayOfYearsCompute, command.TotalDayOfBunosesCompute,
-				loanInstallments, salaryAids,checkoutRollCall,command.EmployeeMandatoryHours, hasInsuranceShareTheSameAsList, rewards, rewardPay);
+				loanInstallments, salaryAids,checkoutRollCall,command.EmployeeMandatoryHours, hasInsuranceShareTheSameAsList);
 
 			_checkoutRepository.CreateCkeckout(checkout).GetAwaiter().GetResult();
 			//_checkoutRepository.SaveChanges();

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -1516,9 +1516,8 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             .Where(x => x.WorkshopCreated && x.WorkshopId is > 0).ToList();
         
         var currentWorkshops = institutionContract.WorkshopGroup.CurrentWorkshops.ToList();
-        var account = _contractingPartyRepository
-            .GetAccountByPersonalContractingParty(institutionContract.ContractingPartyId);
-        var accountId = account.Id;
+        var accountId = _contractingPartyRepository
+            .GetAccountByPersonalContractingParty(institutionContract.ContractingPartyId).Id;
         foreach (var createdWorkshop in initialCreatedWorkshops)
         {
             if (currentWorkshops.Any(x => x.WorkshopId == createdWorkshop.WorkshopId))
@@ -1570,7 +1569,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         var previousInstitutionContract = await _institutionContractRepository
             .GetPreviousContract(institutionContract.id);
         previousInstitutionContract?.DeActive();
-        await _contractingPartyRepository.ActiveAllAsync(institutionContract.ContractingPartyId);
+        ReActiveAllAfterCreateNew(institutionContract.ContractingPartyId);
         await _institutionContractRepository.SaveChangesAsync();
         return op.Succcedded();
     }

CompanyManagment.Application/InsuranceListApplication.cs

@@ -1524,8 +1524,7 @@ public class InsuranceListApplication : IInsuranceListApplication
 			var dateOfBirth = employeeData.DateOfBirthGr.ToFarsi();
 			var dateOfIssue = employeeData.DateOfIssueGr.ToFarsi();
 			var leftDate = employeeData.LeftWorkDateGr != null ? employeeData.LeftWorkDateGr.Value.AddDays(-1) : new DateTime();
-      
-            var workingDays = Tools.GetEmployeeInsuranceWorkingDays(employeeData.StartWorkDateGr, leftDate, startDateGr, endDateGr, employeeData.EmployeeId);
+			var workingDays = Tools.GetEmployeeInsuranceWorkingDays(employeeData.StartWorkDateGr, leftDate, startDateGr, endDateGr, employeeData.EmployeeId);
 			var leftWorkFa = workingDays.hasLeftWorkInMonth ? employeeData.LeftWorkDateGr.ToFarsi() : "";
 			var startWorkFa = employeeData.StartWorkDateGr.ToFarsi();
 			var workshop = _workShopRepository.GetDetails(workshopId);
@@ -1607,7 +1606,7 @@ public class InsuranceListApplication : IInsuranceListApplication
                 MaritalStatus = employeeData.MaritalStatus,
 
 				StartMonthCurrent = startMonthFa,
-				WorkingDays = employeeData.WorkingDays,
+				WorkingDays = workingDays.countWorkingDays,
 				StartWorkDate = startWorkFa,
 				StartWorkDateGr = employeeData.StartWorkDateGr,
 				LeftWorkDate = leftWorkFa,

CompanyManagment.Application/RollCallApplication.cs

@@ -447,7 +447,8 @@ public class RollCallApplication : IRollCallApplication
                 return operation.Failed("کارمند در بازه انتخاب شده مرخصی ساعتی دارد");
         }
 
-       
+        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.StartDate.Value.Date >= y.StartDateGr.Date && x.EndDate.Value.Date <= y.EndDateGr.Date)))
+            return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
 
 
 
@@ -457,10 +458,7 @@ public class RollCallApplication : IRollCallApplication
                 _rollCallDomainService.GetEmployeeShiftDateByRollCallStartDate(command.WorkshopId, command.EmployeeId,
                     x.StartDate!.Value,x.EndDate.Value);
         });
-        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.ShiftDate.Date >= y.StartDateGr.Date && x.ShiftDate.Date <= y.EndDateGr.Date)))
-	        return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
-        
-        
+
         if (newRollCallDates.Any(x => x.ShiftDate.Date != date.Date))
         {
             return operation.Failed("حضور غیاب در حال ویرایش را نمیتوانید از تاریخ شیفت عقب تر یا جلو تر ببرید");
@@ -489,8 +487,8 @@ public class RollCallApplication : IRollCallApplication
 
 
 
-        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.ShiftDate.Date >= y.StartDateGr.Date 
-	            && x.ShiftDate.Date <= y.EndDateGr.Date)))
+        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.StartDate.Value.Date >= y.StartDateGr.Date 
+	            && x.EndDate.Value.Date <= y.EndDateGr.Date)))
             return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
 
 
@@ -634,6 +632,9 @@ public class RollCallApplication : IRollCallApplication
                 return operation.Failed("کارمند در بازه انتخاب شده مرخصی ساعتی دارد");
         }
 
+        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.StartDate.Value.Date >= y.StartDateGr.Date && x.EndDate.Value.Date <= y.EndDateGr.Date)))
+            return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
+
 
         newRollCallDates.ForEach(x =>
         {
@@ -641,11 +642,6 @@ public class RollCallApplication : IRollCallApplication
                 _rollCallDomainService.GetEmployeeShiftDateByRollCallStartDate(command.WorkshopId, command.EmployeeId,
                     x.StartDate!.Value,x.EndDate.Value);
         });
-        
-        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.ShiftDate.Date >= y.StartDateGr.Date && x.ShiftDate.Date <= y.EndDateGr.Date)))
-	        return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
-
-        
         if (newRollCallDates.Any(x => x.ShiftDate.Date != date.Date))
         {
             return operation.Failed("حضور غیاب در حال ویرایش را نمیتوانید از تاریخ شیفت عقب تر یا جلو تر ببرید");
@@ -668,7 +664,7 @@ public class RollCallApplication : IRollCallApplication
                                                                   && (y.StartDate.Value.Date <= x.ContractEndGr.Date))))
             return operation.Failed("برای بازه های وارد شده فیش حقوقی ثبت شده است");
 
-        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.ShiftDate.Date >= y.StartDateGr.Date && x.ShiftDate.Date <= y.EndDateGr.Date)))
+        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.StartDate.Value.Date >= y.StartDateGr.Date && x.EndDate.Value.Date <= y.EndDateGr.Date)))
             return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
 
         var currentDayRollCall = employeeRollCalls.FirstOrDefault(x => x.EndDate == null);

CompanyManagment.Application/SmsResultApplication.cs

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

CompanyManagment.EFCore/Mapping/CheckoutMapping.cs

@@ -34,7 +34,7 @@ class CheckoutMapping : IEntityTypeConfiguration<Checkout>
         builder.Property(x => x.FamilyAllowance);
         builder.Property(x => x.HousingAllowance);
         builder.Property(x => x.ConsumableItems);
-        builder.Property(x => x.RewardPay);
+        builder.Property(x => x.RewardPay).HasColumnType("float").IsRequired(false);
 
         builder.Property(x => x.LeaveCheckout);
         builder.Property(x => x.CreditLeaves);
@@ -82,15 +82,6 @@ class CheckoutMapping : IEntityTypeConfiguration<Checkout>
             salaryAid.Property(x => x.CalculationDateTimeFa).HasMaxLength(15);
         });
 
-
-        builder.OwnsMany(x => x.Rewards, reward =>
-        {
-            reward.Property(x => x.Description).HasColumnType("ntext");
-            reward.Property(x => x.Title).HasMaxLength(255);
-            reward.Property(x=> x.Amount).HasMaxLength(25);
-            reward.Property(x => x.GrantDateFa).HasMaxLength(10);
-        });
-
         builder.OwnsOne(x => x.CheckoutRollCall, rollCall =>
         {
 	        rollCall.Property(x => x.TotalPresentTimeSpan).HasTimeSpanConversion();

CompanyManagment.EFCore/Migrations/20260124132444_Add Reward to checkout.cs

@@ -1,66 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddRewardtocheckout : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<double>(
-                name: "RewardPay",
-                table: "Checkouts",
-                type: "float",
-                nullable: false,
-                defaultValue: 0.0,
-                oldClrType: typeof(double),
-                oldType: "float",
-                oldNullable: true);
-
-            migrationBuilder.CreateTable(
-                name: "CheckoutReward",
-                columns: table => new
-                {
-                    Checkoutid = table.Column<long>(type: "bigint", nullable: false),
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    Amount = table.Column<string>(type: "nvarchar(25)", maxLength: 25, nullable: true),
-                    AmountDouble = table.Column<double>(type: "float", nullable: false),
-                    GrantDateFa = table.Column<string>(type: "nvarchar(10)", maxLength: 10, nullable: true),
-                    GrantDateGr = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    Description = table.Column<string>(type: "ntext", nullable: true),
-                    Title = table.Column<string>(type: "nvarchar(255)", maxLength: 255, nullable: true),
-                    EntityId = table.Column<long>(type: "bigint", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_CheckoutReward", x => new { x.Checkoutid, x.Id });
-                    table.ForeignKey(
-                        name: "FK_CheckoutReward_Checkouts_Checkoutid",
-                        column: x => x.Checkoutid,
-                        principalTable: "Checkouts",
-                        principalColumn: "id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "CheckoutReward");
-
-            migrationBuilder.AlterColumn<double>(
-                name: "RewardPay",
-                table: "Checkouts",
-                type: "float",
-                nullable: true,
-                oldClrType: typeof(double),
-                oldType: "float");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs

@@ -635,7 +635,7 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
 
-                    b.Property<double>("RewardPay")
+                    b.Property<double?>("RewardPay")
                         .HasColumnType("float");
 
                     b.Property<string>("RotatingShiftValue")
@@ -7501,49 +7501,6 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasForeignKey("Checkoutid");
                         });
 
-                    b.OwnsMany("Company.Domain.CheckoutAgg.ValueObjects.CheckoutReward", "Rewards", b1 =>
-                        {
-                            b1.Property<long>("Checkoutid")
-                                .HasColumnType("bigint");
-
-                            b1.Property<int>("Id")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("int");
-
-                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<int>("Id"));
-
-                            b1.Property<string>("Amount")
-                                .HasMaxLength(25)
-                                .HasColumnType("nvarchar(25)");
-
-                            b1.Property<double>("AmountDouble")
-                                .HasColumnType("float");
-
-                            b1.Property<string>("Description")
-                                .HasColumnType("ntext");
-
-                            b1.Property<long>("EntityId")
-                                .HasColumnType("bigint");
-
-                            b1.Property<string>("GrantDateFa")
-                                .HasMaxLength(10)
-                                .HasColumnType("nvarchar(10)");
-
-                            b1.Property<DateTime>("GrantDateGr")
-                                .HasColumnType("datetime2");
-
-                            b1.Property<string>("Title")
-                                .HasMaxLength(255)
-                                .HasColumnType("nvarchar(255)");
-
-                            b1.HasKey("Checkoutid", "Id");
-
-                            b1.ToTable("CheckoutReward");
-
-                            b1.WithOwner()
-                                .HasForeignKey("Checkoutid");
-                        });
-
                     b.OwnsMany("Company.Domain.CheckoutAgg.ValueObjects.CheckoutSalaryAid", "SalaryAids", b1 =>
                         {
                             b1.Property<long>("Checkoutid")
@@ -7588,8 +7545,6 @@ namespace CompanyManagment.EFCore.Migrations
 
                     b.Navigation("LoanInstallments");
 
-                    b.Navigation("Rewards");
-
                     b.Navigation("SalaryAids");
 
                     b.Navigation("Workshop");

CompanyManagment.EFCore/Repository/CheckoutRepository.cs

@@ -531,7 +531,6 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
 
         entity.SetSalaryAid(command.SalaryAids, command.SalaryAidDeduction);
         entity.SetLoanInstallment(command.LoanInstallments, command.InstallmentDeduction);
-        entity.SetReward(command.Rewards,command.RewardPay);
         entity.SetCheckoutRollCall(command.CheckoutRollCall);
         entity.SetEmployeeMandatoryHours(command.EmployeeMandatoryHours);
         if(command.HasInsuranceShareTheSameAsList)
@@ -935,7 +934,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                     TotalClaims = item.TotalClaims,
                     TotalDeductions = item.TotalDeductions,
                     TotalPayment = item.TotalPayment.ToMoney(),
-                    RewardPay = item.RewardPay.ToMoney(),
+                    RewardPay = item.RewardPay.ToMoneyNullable(),
                     ContractStartGr = item.ContractStart,
                     ContractEndGr = item.ContractEnd,
                     IsLeft = false,
@@ -1336,7 +1335,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                 TotalClaims = x.TotalClaims,
                 TotalDeductions = x.TotalDeductions,
                 TotalPayment = x.TotalPayment.ToMoney(),
-                RewardPay = x.RewardPay.ToMoney(),
+                RewardPay = x.RewardPay.ToMoneyNullable(),
                 ContractStartGr = x.ContractStart,
                 ContractEndGr = x.ContractEnd,
                 IsLeft = false,

CompanyManagment.EFCore/Repository/LoanRepository.cs

@@ -171,22 +171,29 @@ public class LoanRepository : RepositoryBase<long, Loan>, ILoanRepository
             query = query.Where(x => x.StartInstallmentPayment >= startDate && x.StartInstallmentPayment <= endDate);
         }
 
-        result.LoanListViewModel = query.OrderByDescending(x => x.StartInstallmentPayment).Skip(searchModel.PageIndex)
-            .Take(30).ToList()
-            .Select(x => new LoanViewModel()
-            {
-                EmployeeFullName = employees.FirstOrDefault(e => e.id == x.EmployeeId).FullName,
-                PersonnelCode = personnelCodes.FirstOrDefault(p => p.EmployeeId == x.EmployeeId).PersonnelCode.ToString(),
-                Amount = x.Amount.ToMoney(),
-                AmountPerMonth = x.AmountPerMonth.ToMoney(),
-                StartDateTime = x.StartInstallmentPayment.ToFarsi(),
-                Count = x.Count,
-                Id = x.id,
-                WorkshopId = x.WorkshopId,
-                EmployeeId = x.EmployeeId,
-                YearFa = pc.GetYear(x.StartInstallmentPayment).ToString(),
+        result.LoanListViewModel = new PagedResult<LoanViewModel>()
+        {
+            TotalCount = query.Count(),
+            List = query.OrderByDescending(x => x.StartInstallmentPayment)
+                .ApplyPagination(searchModel.PageIndex, searchModel.PageSize)
+                .Take(30).ToList()
+                .Select(x => new LoanViewModel()
+                {
+                    EmployeeFullName = employees.FirstOrDefault(e => e.id == x.EmployeeId).FullName,
+                    PersonnelCode = personnelCodes.FirstOrDefault(p => p.EmployeeId == x.EmployeeId).PersonnelCode
+                        .ToString(),
+                    Amount = x.Amount.ToMoney(),
+                    AmountPerMonth = x.AmountPerMonth.ToMoney(),
+                    StartDateTime = x.StartInstallmentPayment.ToFarsi(),
+                    Count = x.Count,
+                    Id = x.id,
+                    WorkshopId = x.WorkshopId,
+                    EmployeeId = x.EmployeeId,
+                    YearFa = pc.GetYear(x.StartInstallmentPayment).ToString(),
+
+                }).ToList()
+        };
 
-            }).ToList();
         return result;
     }
 

CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs

@@ -245,7 +245,7 @@ public class PersonalContractingPartyRepository : RepositoryBase<long, PersonalC
             return new();
         }
 
-        return _accountContext.Accounts.Where(x => x.id == accId).Select(x =>
+        return _accountContext.Accounts.Where(x => x.id == accId && x.IsActiveString == "true").Select(x =>
             new AccountViewModel()
             {
                 Id = x.id,
@@ -845,7 +845,8 @@ public class PersonalContractingPartyRepository : RepositoryBase<long, PersonalC
     public async Task<OperationResult> ActiveAllAsync(long id)
     {
         OperationResult result = new OperationResult();
-        
+        await using var transaction =await _context.Database.BeginTransactionAsync();
+        await using var accountTransaction = await _accountContext.Database.BeginTransactionAsync();
         try
         {
             var personel = _context.PersonalContractingParties
@@ -889,12 +890,15 @@ public class PersonalContractingPartyRepository : RepositoryBase<long, PersonalC
             }
             
             await _context.SaveChangesAsync();
-            
+            await transaction.CommitAsync();
+            await accountTransaction.CommitAsync();
             result.Succcedded();
         }
         catch (Exception)
         {
             result.Failed("فعال کردن طرف حساب با خطا مواجه شد");
+            await transaction.RollbackAsync();
+            await accountTransaction.RollbackAsync();
         }
 
         return result;

CompanyManagment.EFCore/Repository/ReportClientRepository.cs

@@ -74,7 +74,7 @@ public class ReportClientRepository : IReportClientRepository
             TotalClaims = x.TotalClaims,
             TotalDeductions = x.TotalDeductions,
             TotalPayment = x.TotalPayment.ToMoney(),
-            RewardPay = x.RewardPay.ToMoney(),
+            RewardPay = x.RewardPay.ToMoneyNullable(),
             MarriedAllowance = x.MarriedAllowance.ToMoney(),
         }).Where(x => x.WorkshopId == workshopId);
 
@@ -448,7 +448,7 @@ public class ReportClientRepository : IReportClientRepository
             TotalClaims = x.TotalClaims,
             TotalDeductions = x.TotalDeductions,
             TotalPayment = x.TotalPayment.ToMoney(),
-            RewardPay = x.RewardPay.ToMoney(),
+            RewardPay = x.RewardPay.ToMoneyNullable(),
             MarriedAllowance = x.MarriedAllowance.ToMoney(),
         }).Where(x => x.WorkshopId == workshopId);
 

CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs

@@ -5199,10 +5199,10 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
         };
     }
 
-    public List<RewardViewModel> RewardForCheckout(long employeeId, long workshopId, DateTime checkoutEnd,
+    private List<RewardViewModel> RewardForCheckout(long employeeId, long workshopId, DateTime checkoutEnd,
         DateTime checkoutStart)
     {
-        var result = _context.Rewards.Where(x =>
+        return _context.Rewards.Where(x =>
             x.WorkshopId == workshopId && x.EmployeeId == employeeId && x.GrantDate <= checkoutEnd &&
             x.GrantDate >= checkoutStart).Select(x => new RewardViewModel
         {
@@ -5215,8 +5215,6 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
             IsActive = x.IsActive,
             Id = x.id
         }).ToList();
-
-        return result;
     }
 
     private List<FineViewModel> FinesForCheckout(long employeeId, long workshopId, DateTime contractStart,

CompanyManagment.EFCore/Repository/SmsResultRepository.cs

@@ -1,20 +1,13 @@
-using _0_Framework.Application;
+using System.Collections.Generic;
+using System.Linq;
+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)
@@ -22,263 +15,9 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult>, ISmsResultRe
         _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,
@@ -325,7 +64,7 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult>, ISmsResultRe
                 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))
             {
@@ -335,7 +74,7 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult>, ISmsResultRe
                 var startGr = start.ToGeorgianDateTime();
                 var endGr = end.ToGeorgianDateTime();
                 query = query.Where(x => x.CreationDate.Date >= startGr.Date && x.CreationDate.Date <= endGr.Date);
-
+               
             }
         }
 
@@ -343,12 +82,12 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult>, ISmsResultRe
 
 
         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/Repository/WorkshopRepository.cs

@@ -160,9 +160,7 @@ public class WorkshopRepository : RepositoryBase<long, Company.Domain.WorkshopAg
     public EditWorkshop GetDetails(long id)
     {
         var emp = _context.WorkshopEmployers.Where(x => x.WorkshopId == id)
-            .Select(x => x.Employer).ToList();
-        var contractingPart = emp.Select(x => x.ContractingPartyId).ToList();
-        bool rewardCompute = contractingPart.Any(x=>x == 30804);
+            .Select(x => x.EmployerId).ToList();
         return _context.Workshops.Select(x => new EditWorkshop
         {
             Id = x.id,
@@ -195,7 +193,7 @@ public class WorkshopRepository : RepositoryBase<long, Company.Domain.WorkshopAg
             BonusesOptions = string.IsNullOrWhiteSpace(x.BonusesOptions) ? "EndOfContract1402leftWork1403" : x.BonusesOptions,
             YearsOptions = x.YearsOptions,
             IsOldContract = x.IsOldContract,
-            EmployerIdList = emp.Select(e=>e.id).ToList(),
+            EmployerIdList = emp,
             HasRollCallFreeVip = x.HasRollCallFreeVip,
             WorkshopHolidayWorking = x.WorkshopHolidayWorking,
             InsuranceCheckoutOvertime = x.InsuranceCheckoutOvertime,
@@ -207,7 +205,6 @@ public class WorkshopRepository : RepositoryBase<long, Company.Domain.WorkshopAg
             SignCheckout = x.SignCheckout,
             RotatingShiftCompute = x.RotatingShiftCompute,
             IsStaticCheckout = x.IsStaticCheckout,
-            RewardComputeOnCheckout = rewardCompute
 
         }).FirstOrDefault(x => x.Id == id);
     }

CompanyManagment.EFCore/Services/SmsService.cs

@@ -207,11 +207,16 @@ public class SmsService : ISmsService
     }
     public async Task<List<ApiResultViewModel>> GetApiResult(string startDate, string endDate)
     {
-
-
-        if(startDate.TryToGeorgianDateTime(out var st) == false || endDate.TryToGeorgianDateTime(out var ed) == false)
-            return new List<ApiResultViewModel>();
-
+        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();
+        }
         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;
@@ -243,44 +248,6 @@ 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 = "";

PersonalContractingParty.Config/PersonalBootstrapper.cs

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

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

@@ -209,38 +209,22 @@ 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;
-
-        //new chang salary compute
-        var monthlySalaryPay = totalHoursWorked * monthlySalaryDefined;
+        //حقوق کسر شده
+        var deductionFromSalary = monthlySalaryDefined - monthlySalaryPay;
 
         //زمان باقی مانده
         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 = 0 /*deductionFromSalary*/,
+            DeductionFromSalary = deductionFromSalary,
             RemainingHours = remainingTime
         };
         Console.WriteLine(mandatoryHours);

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

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

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

@@ -0,0 +1,16 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.AddTaskToPhase;
+
+/// <summary>
+/// Command to add a task to an existing phase
+/// </summary>
+public record AddTaskToPhaseCommand(
+    Guid PhaseId,
+    string Name,
+    string? Description = null,
+    ProjectTaskPriority Priority = ProjectTaskPriority.Medium,
+    int OrderIndex = 0,
+    DateTime? DueDate = null
+) : IBaseCommand;

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

@@ -0,0 +1,53 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+using MediatR;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.AddTaskToPhase;
+
+public class AddTaskToPhaseCommandHandler : IRequestHandler<AddTaskToPhaseCommand, OperationResult>
+{
+    private readonly IProjectPhaseRepository _phaseRepository;
+    private readonly IUnitOfWork _unitOfWork;
+
+    public AddTaskToPhaseCommandHandler(
+        IProjectPhaseRepository phaseRepository,
+        IUnitOfWork unitOfWork)
+    {
+        _phaseRepository = phaseRepository;
+        _unitOfWork = unitOfWork;
+    }
+
+    public async Task<OperationResult> Handle(AddTaskToPhaseCommand request, CancellationToken cancellationToken)
+    {
+        try
+        {
+            // Get phase
+            var phase = await _phaseRepository.GetByIdAsync(request.PhaseId);
+            if (phase == null)
+            {
+                return OperationResult.NotFound("فاز یافت نشد");
+            }
+
+            // Add task
+            var task = phase.AddTask(request.Name, request.Description);
+            task.SetPriority(request.Priority);
+            task.SetOrderIndex(request.OrderIndex);
+            
+            if (request.DueDate.HasValue)
+            {
+                task.SetDates(dueDate: request.DueDate);
+            }
+
+            // Save changes
+            await _unitOfWork.SaveChangesAsync(cancellationToken);
+
+            return OperationResult.Success();
+        }
+        catch (Exception ex)
+        {
+            return OperationResult.Failure($"خطا در افزودن تسک: {ex.Message}");
+        }
+    }
+}

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

@@ -4,5 +4,4 @@ using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.CreateProject;
 
 public record CreateProjectCommand(string Name,ProjectHierarchyLevel Level,
-    ProjectTaskPriority? Priority,
     Guid? ParentId):IBaseCommand;

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

@@ -16,8 +16,7 @@ public class CreateProjectCommandHandler : IBaseCommandHandler<CreateProjectComm
     private readonly IUnitOfWork _unitOfWork;
 
 
-    public CreateProjectCommandHandler(IProjectRepository projectRepository, IUnitOfWork unitOfWork,
-        IProjectTaskRepository projectTaskRepository, IProjectPhaseRepository projectPhaseRepository)
+    public CreateProjectCommandHandler(IProjectRepository projectRepository, IUnitOfWork unitOfWork, IProjectTaskRepository projectTaskRepository, IProjectPhaseRepository projectPhaseRepository)
     {
         _projectRepository = projectRepository;
         _unitOfWork = unitOfWork;
@@ -56,8 +55,8 @@ public class CreateProjectCommandHandler : IBaseCommandHandler<CreateProjectComm
     {
         if (!request.ParentId.HasValue)
             throw new BadRequestException("برای ایجاد فاز، شناسه پروژه الزامی است");
-
-        if (!_projectRepository.Exists(x => x.Id == request.ParentId.Value))
+        
+        if(!_projectRepository.Exists(x=>x.Id == request.ParentId.Value))
         {
             throw new BadRequestException("والد پروژه یافت نشد");
         }
@@ -70,15 +69,14 @@ public class CreateProjectCommandHandler : IBaseCommandHandler<CreateProjectComm
     {
         if (!request.ParentId.HasValue)
             throw new BadRequestException("برای ایجاد تسک، شناسه فاز الزامی است");
-
-        if (!_projectPhaseRepository.Exists(x => x.Id == request.ParentId.Value))
+        
+        if(!_projectPhaseRepository.Exists(x=>x.Id == request.ParentId.Value))
         {
             throw new BadRequestException("والد پروژه یافت نشد");
         }
 
-        var priority = request.Priority ?? ProjectTaskPriority.Low;
-
-        var projectTask = new ProjectTask(request.Name, request.ParentId.Value, priority);
+        var projectTask = new ProjectTask(request.Name, request.ParentId.Value);
         await _projectTaskRepository.CreateAsync(projectTask);
     }
-}
+}
+   

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

@@ -10,10 +10,8 @@ public class GetProjectItemDto
     public int Percentage { get; init; }
     public ProjectHierarchyLevel Level { get; init; }
     public Guid? ParentId { get; init; }
-    
-    public TimeSpan TotalTime { get; init; }
-    
-    public TimeSpan RemainingTime { get; init; }
+    public int TotalHours { get; set; }
+    public int Minutes { get; set; }
     public AssignmentStatus Front { get; set; }
     public AssignmentStatus Backend { get; set; }
     public AssignmentStatus Design { get; set; }

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

@@ -16,8 +16,7 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         _context = context;
     }
 
-    public async Task<OperationResult<GetProjectsListResponse>> Handle(GetProjectsListQuery request,
-        CancellationToken cancellationToken)
+    public async Task<OperationResult<GetProjectsListResponse>> Handle(GetProjectsListQuery request, CancellationToken cancellationToken)
     {
         var projects = new List<GetProjectDto>();
         var phases = new List<GetPhaseDto>();
@@ -52,14 +51,13 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         {
             return new List<GetProjectDto>();
         }
-
         var entities = await query
             .OrderByDescending(p => p.CreationDate)
             .ToListAsync(cancellationToken);
         var result = new List<GetProjectDto>();
         foreach (var project in entities)
         {
-            var (percentage, totalTime,remainingTime) = await CalculateProjectPercentage(project, cancellationToken);
+            var (percentage, totalTime) = await CalculateProjectPercentage(project, cancellationToken);
             result.Add(new GetProjectDto
             {
                 Id = project.Id,
@@ -67,12 +65,10 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
                 Level = ProjectHierarchyLevel.Project,
                 ParentId = null,
                 Percentage = percentage,
-                TotalTime = totalTime,
-                RemainingTime = remainingTime
+                TotalHours = (int)totalTime.TotalHours,
+                Minutes = totalTime.Minutes,
             });
         }
-
-        result = result.OrderByDescending(x => x.Percentage).ToList();
         return result;
     }
 
@@ -83,14 +79,13 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         {
             query = query.Where(x => x.ProjectId == parentId);
         }
-
         var entities = await query
             .OrderByDescending(p => p.CreationDate)
             .ToListAsync(cancellationToken);
         var result = new List<GetPhaseDto>();
         foreach (var phase in entities)
         {
-            var (percentage, totalTime,remainingTime) = await CalculatePhasePercentage(phase, cancellationToken);
+            var (percentage, totalTime) = await CalculatePhasePercentage(phase, cancellationToken);
             result.Add(new GetPhaseDto
             {
                 Id = phase.Id,
@@ -98,12 +93,10 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
                 Level = ProjectHierarchyLevel.Phase,
                 ParentId = phase.ProjectId,
                 Percentage = percentage,
-                TotalTime = totalTime,
-                RemainingTime = remainingTime
+                TotalHours = (int)totalTime.TotalHours,
+                Minutes = totalTime.Minutes,
             });
         }
-        result = result.OrderByDescending(x => x.Percentage).ToList();
-
         return result;
     }
 
@@ -114,7 +107,6 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         {
             query = query.Where(x => x.PhaseId == parentId);
         }
-
         var entities = await query
             .OrderByDescending(t => t.CreationDate)
             .ToListAsync(cancellationToken);
@@ -126,7 +118,7 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
 
         foreach (var task in entities)
         {
-            var (percentage, totalTime,remainingTime) = await CalculateTaskPercentage(task, cancellationToken);
+            var (percentage, totalTime) = await CalculateTaskPercentage(task, cancellationToken);
             var sections = await _context.TaskSections
                 .Include(s => s.Activities)
                 .Include(s => s.Skill)
@@ -148,12 +140,13 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
 
             // محاسبه SpentTime و RemainingTime
             var spentTime = TimeSpan.FromTicks(sections.Sum(s => s.Activities.Sum(a => a.GetTimeSpent().Ticks)));
+            var remainingTime = totalTime - spentTime;
 
             // ساخت section DTOs برای تمام Skills
             var sectionDtos = allSkills.Select(skill =>
             {
                 var section = sections.FirstOrDefault(s => s.SkillId == skill.Id);
-
+                
                 if (section == null)
                 {
                     // اگر section وجود نداشت، یک DTO با وضعیت Unassigned برمی‌گردانیم
@@ -191,20 +184,18 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
                 Level = ProjectHierarchyLevel.Task,
                 ParentId = task.PhaseId,
                 Percentage = percentage,
-                TotalTime = totalTime,
+                TotalHours = (int)totalTime.TotalHours,
+                Minutes = totalTime.Minutes,
                 SpentTime = spentTime,
                 RemainingTime = remainingTime,
                 Sections = sectionDtos,
                 Priority = task.Priority
             });
         }
-        result = result.OrderByDescending(x => x.Percentage).ToList();
-
         return result;
     }
 
-    private async Task SetSkillFlags<TItem>(List<TItem> items, CancellationToken cancellationToken)
-        where TItem : GetProjectItemDto
+    private async Task SetSkillFlags<TItem>(List<TItem> items, CancellationToken cancellationToken) where TItem : GetProjectItemDto
     {
         if (!items.Any())
             return;
@@ -222,8 +213,7 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
     }
 
 
-    private async Task SetSkillFlagsForProjects<TItem>(List<TItem> items, List<Guid> projectIds,
-        CancellationToken cancellationToken) where TItem : GetProjectItemDto
+    private async Task SetSkillFlagsForProjects<TItem>(List<TItem> items, List<Guid> projectIds, CancellationToken cancellationToken) where TItem : GetProjectItemDto
     {
         // For projects: gather all phases, then tasks, then sections
         var phases = await _context.ProjectPhases
@@ -253,8 +243,7 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         }
     }
 
-    private async Task SetSkillFlagsForPhases<TItem>(List<TItem> items, List<Guid> phaseIds,
-        CancellationToken cancellationToken) where TItem : GetProjectItemDto
+    private async Task SetSkillFlagsForPhases<TItem>(List<TItem> items, List<Guid> phaseIds, CancellationToken cancellationToken) where TItem : GetProjectItemDto
     {
         // For phases: gather tasks, then sections
         var tasks = await _context.ProjectTasks
@@ -280,81 +269,68 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         }
     }
 
-    private async Task<(int Percentage, TimeSpan TotalTime,TimeSpan RemainingTime)> CalculateProjectPercentage(Project project,
-        CancellationToken cancellationToken)
+    private async Task<(int Percentage, TimeSpan TotalTime)> CalculateProjectPercentage(Project project, CancellationToken cancellationToken)
     {
         var phases = await _context.ProjectPhases
             .Where(ph => ph.ProjectId == project.Id)
             .ToListAsync(cancellationToken);
         if (!phases.Any())
-            return (0, TimeSpan.Zero,TimeSpan.Zero);
+            return (0, TimeSpan.Zero);
         var phasePercentages = new List<int>();
         var totalTime = TimeSpan.Zero;
-        var  remainingTime = TimeSpan.Zero;
         foreach (var phase in phases)
         {
-            var (phasePercentage, phaseTime,phaseRemainingTime) = await CalculatePhasePercentage(phase, cancellationToken);
+            var (phasePercentage, phaseTime) = await CalculatePhasePercentage(phase, cancellationToken);
             phasePercentages.Add(phasePercentage);
             totalTime += phaseTime;
-            remainingTime += phaseRemainingTime;
         }
-
         var averagePercentage = phasePercentages.Any() ? (int)phasePercentages.Average() : 0;
-        return (averagePercentage, totalTime,remainingTime);
+        return (averagePercentage, totalTime);
     }
 
-    private async Task<(int Percentage, TimeSpan TotalTime,TimeSpan RemainingTime)> CalculatePhasePercentage(ProjectPhase phase,
-        CancellationToken cancellationToken)
+    private async Task<(int Percentage, TimeSpan TotalTime)> CalculatePhasePercentage(ProjectPhase phase, CancellationToken cancellationToken)
     {
         var tasks = await _context.ProjectTasks
             .Where(t => t.PhaseId == phase.Id)
             .ToListAsync(cancellationToken);
         if (!tasks.Any())
-            return (0, TimeSpan.Zero,TimeSpan.Zero);
+            return (0, TimeSpan.Zero);
         var taskPercentages = new List<int>();
         var totalTime = TimeSpan.Zero;
-        var remainingTime =  TimeSpan.Zero;
         foreach (var task in tasks)
         {
-            var (taskPercentage, taskTime,taskRemainingTime) = await CalculateTaskPercentage(task, cancellationToken);
+            var (taskPercentage, taskTime) = await CalculateTaskPercentage(task, cancellationToken);
             taskPercentages.Add(taskPercentage);
             totalTime += taskTime;
-            remainingTime += taskRemainingTime;
         }
-
         var averagePercentage = taskPercentages.Any() ? (int)taskPercentages.Average() : 0;
-        return (averagePercentage, totalTime,remainingTime);
+        return (averagePercentage, totalTime);
     }
 
-    private async Task<(int Percentage, TimeSpan TotalTime, TimeSpan RemainingTime)> CalculateTaskPercentage(
-        ProjectTask task, CancellationToken cancellationToken)
+    private async Task<(int Percentage, TimeSpan TotalTime)> CalculateTaskPercentage(ProjectTask task, CancellationToken cancellationToken)
     {
         var sections = await _context.TaskSections
             .Include(s => s.Activities)
-            .Include(x => x.AdditionalTimes)
+            .Include(x=>x.AdditionalTimes)
             .Where(s => s.TaskId == task.Id)
             .ToListAsync(cancellationToken);
         if (!sections.Any())
-            return (0, TimeSpan.Zero, TimeSpan.Zero);
+            return (0, TimeSpan.Zero);
         var sectionPercentages = new List<int>();
         var totalTime = TimeSpan.Zero;
-        var spentTime = TimeSpan.Zero;
         foreach (var section in sections)
         {
             var (sectionPercentage, sectionTime) = CalculateSectionPercentage(section);
-            var sectionSpent = TimeSpan.FromTicks(section.Activities.Sum(x => x.GetTimeSpent().Ticks));
             sectionPercentages.Add(sectionPercentage);
             totalTime += sectionTime;
-            spentTime += sectionSpent;
         }
-        var remainingTime = totalTime - spentTime;
         var averagePercentage = sectionPercentages.Any() ? (int)sectionPercentages.Average() : 0;
-        return (averagePercentage, totalTime, remainingTime);
+        return (averagePercentage, totalTime);
     }
 
     private static (int Percentage, TimeSpan TotalTime) CalculateSectionPercentage(TaskSection section)
     {
-        return ((int)section.GetProgressPercentage(), section.FinalEstimatedHours);
+        return ((int)section.GetProgressPercentage(),section.FinalEstimatedHours);
     }
 
     private static AssignmentStatus GetAssignmentStatus(TaskSection? section)
@@ -365,7 +341,7 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
 
         // بررسی وجود user
         bool hasUser = section.CurrentAssignedUserId > 0;
-
+        
         // بررسی وجود time (InitialEstimatedHours بزرگتر از صفر باشد)
         bool hasTime = section.InitialEstimatedHours > TimeSpan.Zero;
 
@@ -380,4 +356,5 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         // تعیین تکلیف نشده: نه user دارد نه time
         return AssignmentStatus.Unassigned;
     }
-}
+}
+

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

@@ -9,8 +9,8 @@ public class GetTaskDto
     public int Percentage { get; init; }
     public ProjectHierarchyLevel Level { get; init; }
     public Guid? ParentId { get; init; }
-    
-    public TimeSpan TotalTime { get; set; }
+    public int TotalHours { get; set; }
+    public int Minutes { get; set; }
     
     // Task-specific fields
     public TimeSpan SpentTime { get; init; }

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

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

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

@@ -3,6 +3,7 @@ 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;
 
@@ -23,8 +24,7 @@ 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)
@@ -45,18 +45,10 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
         {
             queryable = queryable.Where(x => x.CurrentAssignedUserId == request.UserId);
         }
-
-        if (!string.IsNullOrWhiteSpace(request.ProjectName))
-        {
-            queryable = queryable.Where(x=>x.Task.Name.Contains(request.ProjectName)
-            || x.Task.Phase.Name.Contains(request.ProjectName)
-            || x.Task.Phase.Project.Name.Contains(request.ProjectName));
-        }
         
         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();
@@ -70,9 +62,6 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
             .OrderByDescending(x => x.CurrentAssignedUserId == currentUserId)
             .ThenByDescending(x=>x.Task.Priority)
             .ThenBy(x => GetStatusOrder(x.Status))
-            .ThenBy(x=>x.Task.Phase.ProjectId)
-            .ThenBy(x=>x.Task.PhaseId)
-            .ThenBy(x=>x.TaskId)
             .Select(x =>
             {
                 // محاسبه یکبار برای هر Activity و Cache کردن نتیجه
@@ -83,7 +72,7 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
                     {
                         Activity = a,
                         TimeSpent = timeSpent,
-                        timeSpent.TotalSeconds,
+                        TotalSeconds = timeSpent.TotalSeconds,
                         FormattedTime = timeSpent.ToString(@"hh\:mm")
                     };
                 }).ToList();

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

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

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

@@ -28,25 +28,26 @@ public class SendMessageCommandHandler : IBaseCommandHandler<SendMessageCommand,
     private readonly ITaskChatMessageRepository _messageRepository;
     private readonly IUploadedFileRepository _fileRepository;
     private readonly IProjectTaskRepository _taskRepository;
-    private readonly IFileUploadService _fileUploadService;
+    private readonly IFileStorageService _fileStorageService;
+    private readonly IThumbnailGeneratorService _thumbnailService;
     private readonly IAuthHelper _authHelper;
 
     public SendMessageCommandHandler(
         ITaskChatMessageRepository messageRepository,
         IUploadedFileRepository fileRepository,
-        IProjectTaskRepository taskRepository, 
-        IAuthHelper authHelper,
-        IFileUploadService fileUploadService)
+        IProjectTaskRepository taskRepository,
+        IFileStorageService fileStorageService,
+        IThumbnailGeneratorService thumbnailService, IAuthHelper authHelper)
     {
         _messageRepository = messageRepository;
         _fileRepository = fileRepository;
         _taskRepository = taskRepository;
+        _fileStorageService = fileStorageService;
+        _thumbnailService = thumbnailService;
         _authHelper = authHelper;
-        _fileUploadService = fileUploadService;
     }
 
-    public async Task<OperationResult<MessageDto>> Handle(SendMessageCommand request,
-        CancellationToken cancellationToken)
+    public async Task<OperationResult<MessageDto>> Handle(SendMessageCommand request, CancellationToken cancellationToken)
     {
         var currentUserId = _authHelper.GetCurrentUserId()
                             ?? throw new UnAuthorizedException("کاربر احراز هویت نشده است");
@@ -56,21 +57,75 @@ public class SendMessageCommandHandler : IBaseCommandHandler<SendMessageCommand,
         {
             return OperationResult<MessageDto>.NotFound("تسک یافت نشد");
         }
-
+        
         Guid? uploadedFileId = null;
         if (request.File != null)
         {
-           var uploadedFile =  await _fileUploadService.UploadFileAsync
-            (
-                request.File,
-                FileCategory.TaskChatMessage,
-                currentUserId
-            );
-            if (!uploadedFile.IsSuccess)
+            if (request.File.Length == 0)
             {
-                return OperationResult<MessageDto>.Failure(uploadedFile.ErrorMessage ?? "خطا در آپلود فایل");
+                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}");
             }
-            uploadedFileId = uploadedFile.FileId!.Value;
         }
 
         var message = new TaskChatMessage(
@@ -154,4 +209,4 @@ public class SendMessageCommandHandler : IBaseCommandHandler<SendMessageCommand,
 
         return FileType.Document;
     }
-}
+}

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

@@ -1,15 +1,12 @@
 using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Application.Modules.TaskChat.DTOs;
-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>>;
@@ -69,12 +66,7 @@ public class GetMessagesQueryHandler : IBaseQueryHandler<GetMessagesQuery, Pagin
         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);
-        }
+            .OrderBy(m => m.CreationDate);
 
         var totalCount = await query.CountAsync(cancellationToken);
 

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

@@ -1,69 +0,0 @@
-using GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
-using Microsoft.AspNetCore.Http;
-
-namespace GozareshgirProgramManager.Application.Services.FileManagement;
-
-/// <summary>
-/// سرویس آپلود و مدیریت کامل فایل
-/// این سرویس تمام مراحل آپلود، ذخیره، تولید thumbnail و... را انجام می‌دهد
-/// </summary>
-public interface IFileUploadService
-{
-    /// <summary>
-    /// آپلود فایل با تمام مراحل پردازش
-    /// </summary>
-    /// <param name="file">فایل برای آپلود</param>
-    /// <param name="category">دسته‌بندی فایل</param>
-    /// <param name="uploadedByUserId">شناسه کاربر آپلودکننده</param>
-    /// <param name="maxFileSizeBytes">حداکثر حجم مجاز فایل (پیش‌فرض: 100MB)</param>
-    /// <returns>شناسه فایل آپلود شده یا null در صورت خطا</returns>
-    Task<FileUploadResult> UploadFileAsync(
-        IFormFile file,
-        FileCategory category,
-        long uploadedByUserId,
-        long maxFileSizeBytes = 100 * 1024 * 1024);
-    
-    /// <summary>
-    /// آپلود فایل با Stream
-    /// </summary>
-    Task<FileUploadResult> UploadFileFromStreamAsync(
-        Stream fileStream,
-        string fileName,
-        string contentType,
-        FileCategory category,
-        long uploadedByUserId,
-        long maxFileSizeBytes = 100 * 1024 * 1024);
-}
-
-/// <summary>
-/// نتیجه عملیات آپلود فایل
-/// </summary>
-public class FileUploadResult
-{
-    public bool IsSuccess { get; set; }
-    public Guid? FileId { get; set; }
-    public string? ErrorMessage { get; set; }
-    public string? StorageUrl { get; set; }
-    public string? ThumbnailUrl { get; set; }
-
-    public static FileUploadResult Success(Guid fileId, string storageUrl, string? thumbnailUrl = null)
-    {
-        return new FileUploadResult
-        {
-            IsSuccess = true,
-            FileId = fileId,
-            StorageUrl = storageUrl,
-            ThumbnailUrl = thumbnailUrl
-        };
-    }
-
-    public static FileUploadResult Failed(string errorMessage)
-    {
-        return new FileUploadResult
-        {
-            IsSuccess = false,
-            ErrorMessage = errorMessage
-        };
-    }
-}
-

ProgramManager/src/Application/GozareshgirProgramManager.Application/_Common/Constants/ProgramManagerPermissionCode.cs

@@ -149,22 +149,6 @@ public static class ProgramManagerPermissionCode
         {
             public const int Code = 990111;
         }
-
-        /// <summary>
-        /// اولویت بندی
-        /// </summary>
-        public static class Priority
-        {
-            public const int Code = 990112;
-        }
-
-        /// <summary>
-        /// ایجاد تسک باگ
-        /// </summary>
-        public static class CreateBug
-        {
-            public const int Code = 990113;
-        }
     }
 
     #endregion
@@ -242,26 +226,11 @@ public static class ProgramManagerPermissionCode
         {
             public const int Code = 990208;
         }
-
-        /// <summary>
-        /// رد با تایید اتمام اجرا
-        /// </summary>
-        public static class RejectOrApproveTaskComplete
-        {
-            public const int Code = 990209;
-        }
-    }
-
-    #endregion
-
-    #region Workflow[تب کارپوشه]
-    public static class Workflow
-    {
-        public const int Code = 9903;
     }
 
     #endregion
 
+   
     public static Dictionary<string, object> GetAllCodes()
     {
         var result = new Dictionary<string, object>();

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

@@ -41,7 +41,15 @@ public class ProjectPhase : ProjectHierarchyNode
     public ProjectDeployStatus DeployStatus { get; set; }
 
     #region Task Management
-    
+
+    public ProjectTask AddTask(string name, string? description = null)
+    {
+        var task = new ProjectTask(name, Id, description);
+        _tasks.Add(task);
+        AddDomainEvent(new TaskAddedEvent(task.Id, Id, name));
+        return task;
+    }
+
     public void RemoveTask(Guid taskId)
     {
         var task = _tasks.FirstOrDefault(t => t.Id == taskId);

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

@@ -16,11 +16,11 @@ public class ProjectTask : ProjectHierarchyNode
         _sections = new List<TaskSection>();
     }
 
-    public ProjectTask(string name, Guid phaseId,ProjectTaskPriority priority, string? description = null) : base(name, description)
+    public ProjectTask(string name, Guid phaseId, string? description = null) : base(name, description)
     {
         PhaseId = phaseId;
         _sections = new List<TaskSection>();
-        Priority = priority;
+        Priority = ProjectTaskPriority.Medium;
         AddDomainEvent(new TaskCreatedEvent(Id, phaseId, name));
     }
     

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/DependencyInjection.cs

@@ -92,7 +92,6 @@ public static class DependencyInjection
         // File Storage Services
         services.AddScoped<IFileStorageService, Services.FileManagement.LocalFileStorageService>();
         services.AddScoped<IThumbnailGeneratorService, Services.FileManagement.ThumbnailGeneratorService>();
-        services.AddScoped<IFileUploadService, Services.FileManagement.FileUploadService>();
 
         // JWT Settings
         services.Configure<JwtSettings>(configuration.GetSection("JwtSettings"));

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Services/FileManagement/FileUploadService.cs

@@ -1,231 +0,0 @@
-using GozareshgirProgramManager.Application.Services.FileManagement;
-using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
-using GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
-using GozareshgirProgramManager.Domain.FileManagementAgg.Repositories;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-
-namespace GozareshgirProgramManager.Infrastructure.Services.FileManagement;
-
-/// <summary>
-/// پیاده‌سازی سرویس آپلود کامل فایل
-/// </summary>
-public class FileUploadService : IFileUploadService
-{
-    private readonly IUploadedFileRepository _fileRepository;
-    private readonly IFileStorageService _fileStorageService;
-    private readonly IThumbnailGeneratorService _thumbnailService;
-    private readonly ILogger<FileUploadService> _logger;
-
-    public FileUploadService(
-        IUploadedFileRepository fileRepository,
-        IFileStorageService fileStorageService,
-        IThumbnailGeneratorService thumbnailService,
-        ILogger<FileUploadService> logger)
-    {
-        _fileRepository = fileRepository;
-        _fileStorageService = fileStorageService;
-        _thumbnailService = thumbnailService;
-        _logger = logger;
-    }
-
-    public async Task<FileUploadResult> UploadFileAsync(
-        IFormFile file,
-        FileCategory category,
-        long uploadedByUserId,
-        long maxFileSizeBytes = 100 * 1024 * 1024)
-    {
-        try
-        {
-            // اعتبارسنجی ورودی
-            if (file.Length == 0)
-            {
-                return FileUploadResult.Failed("فایل خالی است");
-            }
-
-            if (file.Length > maxFileSizeBytes)
-            {
-                var maxSizeMb = maxFileSizeBytes / (1024 * 1024);
-                return FileUploadResult.Failed($"حجم فایل بیش از حد مجاز است (حداکثر {maxSizeMb}MB)");
-            }
-
-            using var stream = file.OpenReadStream();
-            return await UploadFileFromStreamAsync(
-                stream,
-                file.FileName,
-                file.ContentType,
-                category,
-                uploadedByUserId,
-                maxFileSizeBytes);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "خطا در آپلود فایل {FileName}", file.FileName);
-            return FileUploadResult.Failed($"خطا در آپلود فایل: {ex.Message}");
-        }
-    }
-
-    public async Task<FileUploadResult> UploadFileFromStreamAsync(
-        Stream fileStream,
-        string fileName,
-        string contentType,
-        FileCategory category,
-        long uploadedByUserId,
-        long maxFileSizeBytes = 100 * 1024 * 1024)
-    {
-        UploadedFile? uploadedFile = null;
-
-        try
-        {
-            // تشخیص نوع فایل
-            var fileType = DetectFileType(contentType, Path.GetExtension(fileName));
-
-            // ایجاد رکورد فایل در دیتابیس
-            uploadedFile = new UploadedFile(
-                originalFileName: fileName,
-                fileSizeBytes: fileStream.Length,
-                mimeType: contentType,
-                fileType: fileType,
-                category: category,
-                uploadedByUserId: uploadedByUserId,
-                storageProvider: StorageProvider.LocalFileSystem
-            );
-
-            await _fileRepository.AddAsync(uploadedFile);
-            await _fileRepository.SaveChangesAsync();
-
-            // آپلود فایل به استوریج
-            var categoryFolder = category.ToString();
-            var uploadResult = await _fileStorageService.UploadAsync(
-                fileStream,
-                uploadedFile.UniqueFileName,
-                categoryFolder
-            );
-
-            // به‌روزرسانی اطلاعات آپلود
-            uploadedFile.CompleteUpload(uploadResult.StoragePath, uploadResult.StorageUrl);
-
-            // پردازش‌های خاص بر اساس نوع فایل
-            string? thumbnailUrl = null;
-            if (fileType == FileType.Image)
-            {
-                thumbnailUrl = await ProcessImageAsync(uploadedFile, uploadResult.StoragePath, categoryFolder);
-            }
-            else if (fileType == FileType.Video)
-            {
-                thumbnailUrl = await ProcessVideoAsync(uploadedFile, uploadResult.StoragePath, categoryFolder);
-            }
-
-            // ذخیره تغییرات نهایی
-            await _fileRepository.UpdateAsync(uploadedFile);
-            await _fileRepository.SaveChangesAsync();
-
-            _logger.LogInformation(
-                "فایل {FileName} با شناسه {FileId} با موفقیت آپلود شد",
-                fileName,
-                uploadedFile.Id);
-
-            return FileUploadResult.Success(uploadedFile.Id, uploadResult.StorageUrl, thumbnailUrl);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "خطا در آپلود فایل {FileName}", fileName);
-
-            // در صورت خطا، فایل آپلود شده را حذف کنیم
-            if (uploadedFile != null)
-            {
-                try
-                {
-                    await _fileRepository.DeleteAsync(uploadedFile);
-                    await _fileRepository.SaveChangesAsync();
-                }
-                catch (Exception deleteEx)
-                {
-                    _logger.LogError(deleteEx, "خطا در حذف فایل ناموفق {FileId}", uploadedFile.Id);
-                }
-            }
-
-            return FileUploadResult.Failed($"خطا در آپلود فایل: {ex.Message}");
-        }
-    }
-
-    /// <summary>
-    /// پردازش تصویر (ابعاد و thumbnail)
-    /// </summary>
-    private async Task<string?> ProcessImageAsync(UploadedFile file, string storagePath, string categoryFolder)
-    {
-        try
-        {
-            // دریافت ابعاد تصویر
-            var dimensions = await _thumbnailService.GetImageDimensionsAsync(storagePath);
-            if (dimensions.HasValue)
-            {
-                file.SetImageDimensions(dimensions.Value.Width, dimensions.Value.Height);
-            }
-
-            // تولید thumbnail
-            var thumbnail = await _thumbnailService.GenerateImageThumbnailAsync(
-                storagePath,
-                category: categoryFolder);
-
-            if (thumbnail.HasValue)
-            {
-                file.SetThumbnail(thumbnail.Value.ThumbnailUrl);
-                return thumbnail.Value.ThumbnailUrl;
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "خطا در پردازش تصویر {FileId}", file.Id);
-        }
-
-        return null;
-    }
-
-    /// <summary>
-    /// پردازش ویدیو (thumbnail)
-    /// </summary>
-    private async Task<string?> ProcessVideoAsync(UploadedFile file, string storagePath, string categoryFolder)
-    {
-        try
-        {
-            // تولید thumbnail از ویدیو
-            var thumbnail = await _thumbnailService.GenerateVideoThumbnailAsync(
-                storagePath,
-                category: categoryFolder);
-
-            if (thumbnail.HasValue)
-            {
-                file.SetThumbnail(thumbnail.Value.ThumbnailUrl);
-                return thumbnail.Value.ThumbnailUrl;
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "خطا در پردازش ویدیو {FileId}", file.Id);
-        }
-
-        return null;
-    }
-
-    /// <summary>
-    /// تشخیص نوع فایل از روی MIME type و extension
-    /// </summary>
-    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;
-    }
-}
-

ServiceHost/Areas/Admin/Controllers/ProgramManager/TaskChatController.cs

@@ -8,7 +8,6 @@ using GozareshgirProgramManager.Application.Modules.TaskChat.DTOs;
 using GozareshgirProgramManager.Application.Modules.TaskChat.Queries.GetMessages;
 using GozareshgirProgramManager.Application.Modules.TaskChat.Queries.GetPinnedMessages;
 using GozareshgirProgramManager.Application.Modules.TaskChat.Queries.SearchMessages;
-using GozareshgirProgramManager.Domain.TaskChatAgg.Enums;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
 using ServiceHost.BaseControllers;
@@ -31,17 +30,15 @@ public class TaskChatController : ProgramManagerBaseController
     /// دریافت لیست پیام‌های یک تسک
     /// </summary>
     /// <param name="taskId">شناسه تسک</param>
-    /// <param name="messageType">نوع پیام</param>
     /// <param name="page">صفحه (پیش‌فرض: 1)</param>
     /// <param name="pageSize">تعداد در هر صفحه (پیش‌فرض: 50)</param>
     [HttpGet("{taskId:guid}/messages")]
     public async Task<ActionResult<OperationResult<PaginationResult<MessageDto>>>> GetMessages(
         Guid taskId,
-        [FromQuery] MessageType? messageType,
         [FromQuery] int page = 1,
         [FromQuery] int pageSize = 50)
     {
-        var query = new GetMessagesQuery(taskId,messageType, page, pageSize);
+        var query = new GetMessagesQuery(taskId, page, pageSize);
         var result = await _mediator.Send(query);
         return result;
     }

ServiceHost/Areas/Admin/Controllers/SmsReportController.cs

@@ -1,59 +0,0 @@
-using _0_Framework.Application.Sms;
-using CompanyManagment.App.Contracts.SmsResult;
-using CompanyManagment.App.Contracts.SmsResult.Dto;
-using Microsoft.AspNetCore.Mvc;
-using ServiceHost.BaseControllers;
-
-namespace ServiceHost.Areas.Admin.Controllers;
-
-public class SmsReportController : AdminBaseController
-{
-    private readonly ISmsResultApplication _smsResultApplication;
-    private readonly ISmsService _smsService;
-
-    public SmsReportController(ISmsResultApplication smsResultApplication, ISmsService smsService)
-    {
-        _smsResultApplication = smsResultApplication;
-        _smsService = smsService;
-    }
-
-    /// <summary>
-    /// دریافت لیست پیامک ها
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    [HttpGet]
-    public async Task<List<SmsReportDto>> GetSmsReportList(SmsReportSearchModel searchModel)
-    {
- 
-        var result =await _smsResultApplication.GetSmsReportList(searchModel);
-        return result;
-    }
-
-    /// <summary>
-    /// دریافت اطلاعات هر تاریخ برای اکسپند
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <param name="date"></param>
-    /// <returns></returns>
-    [HttpGet("GetExpandedList")]
-    public async Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date)
-    {
-        var result =await _smsResultApplication.GetSmsReportExpandList(searchModel, date);
-        return result;
-    }
-
-    /// <summary>
-    /// گزارش ای پی آی
-    /// </summary>
-    /// <param name="startDate"></param>
-    /// <param name="endDate"></param>
-    /// <returns></returns>
-    [HttpGet("GetApiReport")]
-    public async Task<List<ApiReportDto>> GetApiReport(string startDate, string endDate)
-    {
-        var result =await _smsService.GetApiReport(startDate, endDate);
-        return result;
-    }
-
-}

ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml

@@ -1216,31 +1216,10 @@
                                     <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
                                         <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
                                     </label>
-                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990111" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد بخش فرعی </span> </label>
+									<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990111" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد بخش فرعی </span> </label>
 
                                   
                                 </div>
-								
-                                <!-- اولویت بندی-->
-                                <div class="child-check level3">
-                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
-                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
-                                    </label>
-                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990112" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> اولویت بندی </span> </label>
-
-                                  
-                                </div>
-								
-                                <!-- ایجاد تسک باگ-->
-                                <div class="child-check level3">
-                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
-                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
-                                    </label>
-                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990113" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد تسک باگ </span> </label>
-
-                                  
-                                </div>
-
                             </div>
                            
                             <!--=================================================-->
@@ -1331,28 +1310,8 @@
 
 									
                                 </div>
-								
-                                <!-- تایید یا رد اتمام اجرا -->
-                                <div class="child-check level3">
-                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
-                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
-                                    </label>
-                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990209" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative">  تایید یا رد اتمام اجرا </span> </label>
-
-									
-                                </div>
-
-                            </div>
-                            <!--=================================================-->
-                            <!--#### کارپوشه ####-->
-                            <div class="child-check level2">
-                                <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
-                                    <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
-                                </label>
-                                <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="9903" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> کارپوشه </span> </label>
-                                <!-----------------------Sub Menu------------------->
-                          
                             </div>
+
 							
 						</div>
 						

ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml

@@ -1202,35 +1202,15 @@
 
 
 								<!-- ایجاد بخش فرعی -->
-                                <div class="child-check level3">
-                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
-                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
-                                    </label>
-                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990111" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد بخش فرعی </span> </label>
+								<div class="child-check level3">
+									<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+										<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+									</label>
+									<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990111" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد بخش فرعی </span> </label>
 
 
-                                </div>
-								
-                                <!-- اولویت بندی-->
-                                <div class="child-check level3">
-                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
-                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
-                                    </label>
-                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990112" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> اولویت بندی </span> </label>
-
-                                  
-                                </div>
-								
-                                <!-- ایجاد تسک باگ-->
-                                <div class="child-check level3">
-                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
-                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
-                                    </label>
-                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990113" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد تسک باگ </span> </label>
-
-                                  
-                                </div>
-                            </div>
+								</div>
+							</div>
 
 							<!--=================================================-->
 							<!--#### تب اجرا ####-->
@@ -1312,36 +1292,17 @@
 								</div>
 
 								<!-- چت -->
-                                <div class="child-check level3">
-                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
-                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
-                                    </label>
-                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990208" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative">  چت </span> </label>
+								<div class="child-check level3">
+									<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+										<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+									</label>
+									<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990208" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative">  چت </span> </label>
 
 
-                                </div>
-								
-                                <!-- تایید یا رد اتمام اجرا -->
-                                <div class="child-check level3">
-                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
-                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
-                                    </label>
-                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990209" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative">  تایید یا رد اتمام اجرا </span> </label>
-
-									
-                                </div>
-                            </div>
-							<!--=================================================-->
-							<!--#### کارپوشه ####-->
-							<div class="child-check level2">
-								<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
-									<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
-								</label>
-								<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="9903" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> کارپوشه </span> </label>
-								<!-----------------------Sub Menu------------------->
-                          
+								</div>
 							</div>
 
+
 						</div>
 
 </fieldset>

ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs

@@ -794,8 +794,7 @@ public class IndexModel : PageModel
                 watch.Stop();
             #endregion
 
-            var firstContract = _contractApplication.GetDetails(ContractsId[0]);
-            var workshop = _workshopApplication.GetDetails(firstContract.WorkshopIds);
+
 
             //int i = 0;
             foreach (var item in ContractsId)
@@ -810,7 +809,7 @@ public class IndexModel : PageModel
                 if (separation.checker)
                 {
                     //workshopInfo
-                  
+                    var workshop = _workshopApplication.GetDetails(contract.WorkshopIds);
 
                     var employeeOptions =
                         _employeeComputeOptionsApplication.GetAllByWorkshopId(contract.WorkshopIds);
@@ -1213,7 +1212,7 @@ public class IndexModel : PageModel
 
                         #endregion
 
-                        RewardPayCompute = workshop.RewardComputeOnCheckout,
+
 
                     };
                     _checkoutApplication.Create(command);

ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml

@@ -1289,7 +1289,7 @@
                                                                 تمدید قرارداد
                                                             </p>
                                                         </a>
-                                                        <a  class="btn btn-inverse pull-left rad" style="background-color: #f57373;border: 1px solid #f57373;margin-left:5px;"
+                                                        <a permission="30715" class="btn btn-inverse pull-left rad" style="background-color: #f57373;border: 1px solid #f57373;margin-left:5px;"
                                                            asp-page="./FinancialStatments" asp-route-name="@item.ContractingPartyName" asp-route-id="@item.ContractingPartyId" asp-route-pageNumber="0">
                                                             <i class="fa fa-file-text-o faSize"></i>
                                                             <p>

ServiceHost/Areas/AdminNew/Pages/Company/ExcelUpload/Index.cshtml

@@ -1,157 +0,0 @@
-@page
-@model ServiceHost.Areas.AdminNew.Pages.Company.ExcelUpload.IndexModel
-@{
-    ViewData["Title"] = "بارگذاری فایل اکسل";
-}
-
-<div class="container-fluid">
-    <div class="row">
-        <div class="col-12">
-            <div class="card">
-                <div class="card-header">
-                    <h3 class="card-title">بارگذاری و بررسی فایل اکسل</h3>
-                </div>
-                <div class="card-body">
-                    <form method="post" enctype="multipart/form-data">
-                        <div class="form-group">
-                            <label for="ExcelFile">انتخاب فایل اکسل (ستون B و C از ردیف 2 به بعد خوانده می‌شود):</label>
-                            <input type="file" class="form-control" id="ExcelFile" name="ExcelFile" accept=".xlsx,.xls" required />
-                        </div>
-                        <button type="submit" asp-page-handler="UploadExcel" class="btn btn-primary">بارگذاری و پردازش</button>
-                    </form>
-
-                    @if (!string.IsNullOrEmpty(Model.Message))
-                    {
-                        <div class="alert alert-info mt-3" role="alert">
-                            @Model.Message
-                        </div>
-                    }
-                </div>
-            </div>
-        </div>
-    </div>
-
-    @if (Model.HasProcessed)
-    {
-        <div class="row mt-4">
-            <!-- دسته اول: فایل‌هایی که در اکسل هستند -->
-            <div class="col-md-6">
-                <div class="card">
-                    <div class="card-header bg-success text-white">
-                        <h4 class="card-title mb-0">فایل‌های موجود در اکسل (@Model.FoundInExcel.Count مورد)</h4>
-                    </div>
-                    <div class="card-body" style="max-height: 600px; overflow-y: auto;">
-                        @if (Model.FoundInExcel.Any())
-                        {
-                            <table class="table table-striped table-hover">
-                                <thead>
-                                    <tr>
-                                        <th>ردیف</th>
-                                        <th>شناسه</th>
-                                        <th>شماره بایگانی</th>
-                                        <th>رده پرونده</th>
-                                        <th>وضعیت</th>
-                                        <th>عملیات</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    @{
-                                        int index = 1;
-                                    }
-                                    @foreach (var item in Model.FoundInExcel)
-                                    {
-                                        <tr>
-                                            <td>@index</td>
-                                            <td>@item.ArchiveNo</td>
-                                            <td>@item.FileClass</td>
-                                            <td>@(item.Status == 2 ? "فعال" : "غیرفعال")</td>
-                                            <td>
-                                                <button class="btn btn-sm btn-primary">ویرایش</button>
-                                            </td>
-                                        </tr>
-                                        index++;
-                                    }
-                                </tbody>
-                            </table>
-                        }
-                        else
-                        {
-                            <p class="text-muted">هیچ موردی یافت نشد.</p>
-                        }
-                    </div>
-                </div>
-            </div>
-
-            <!-- دسته دوم: فایل‌هایی که در اکسل نیستند -->
-            <div class="col-md-6">
-                <div class="card">
-                    <div class="card-header bg-warning text-dark">
-                        <h4 class="card-title mb-0">فایل‌های غیرموجود در اکسل (@Model.NotFoundInExcel.Count مورد)</h4>
-                    </div>
-                    <div class="card-body" style="max-height: 600px; overflow-y: auto;">
-                        @if (Model.NotFoundInExcel.Any())
-                        {
-                            <table class="table table-striped table-hover">
-                                <thead>
-                                    <tr>
-                                        <th>ردیف</th>
-                                        <th>شناسه</th>
-                                        <th>شماره بایگانی</th>
-                                        <th>رده پرونده</th>
-                                        <th>وضعیت</th>
-                                        <th>عملیات</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    @{
-                                        int index2 = 1;
-                                    }
-                                    @foreach (var item in Model.NotFoundInExcel)
-                                    {
-                                        <tr>
-                                            <td>@index2</td>
-                                            <td>@item.ArchiveNo</td>
-                                            <td>@item.FileClass</td>
-                                            <td>@(item.Status == 2 ? "فعال" : "غیرفعال")</td>
-                                            <td>
-                                                <button class="btn btn-sm btn-primary">ویرایش</button>
-                                            </td>
-                                        </tr>
-                                        index2++;
-                                    }
-                                </tbody>
-                            </table>
-                        }
-                        else
-                        {
-                            <p class="text-muted">هیچ موردی یافت نشد.</p>
-                        }
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
-</div>
-
-<style>
-    .card {
-        box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-        border-radius: 8px;
-    }
-    
-    .card-header {
-        border-radius: 8px 8px 0 0;
-    }
-    
-    .table {
-        margin-bottom: 0;
-    }
-    
-    .table thead th {
-        position: sticky;
-        top: 0;
-        background-color: #f8f9fa;
-        z-index: 10;
-    }
-</style>
-

ServiceHost/Areas/AdminNew/Pages/Company/ExcelUpload/Index.cshtml.cs

@@ -1,156 +0,0 @@
-using Company.Domain.File1;
-using Company.Domain.RollCallAgg;
-using Company.Domain.RollCallAgg.DomainService;
-using CompanyManagment.EFCore;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-using OfficeOpenXml;
-
-namespace ServiceHost.Areas.AdminNew.Pages.Company.ExcelUpload;
-
-public class ExcelRowData
-{
-    public string ColumnB { get; set; }
-    public string ColumnC { get; set; }
-}
-
-public class IndexModel : PageModel
-{
-    private readonly CompanyContext _dbContext;
-    private readonly IRollCallDomainService _rollCallDomainService;
-
-    [BindProperty]
-    public IFormFile ExcelFile { get; set; }
-    
-    public string Message { get; set; }
-    public List<File1> FoundInExcel { get; set; } = new List<File1>();
-    public List<File1> NotFoundInExcel { get; set; } = new List<File1>();
-    public List<ExcelRowData> ExcelData { get; set; } = new List<ExcelRowData>();
-    public bool HasProcessed { get; set; }
-    
-    public IndexModel(CompanyContext dbContext, IRollCallDomainService rollCallDomainService)
-    {
-        _dbContext = dbContext;
-        _rollCallDomainService = rollCallDomainService;
-    }
-
-    public void OnGet()
-    {
-    }
-
-    public async Task<IActionResult> OnPostUploadExcel()
-    {
-        if (ExcelFile == null || ExcelFile.Length == 0)
-        {
-            Message = "لطفا یک فایل اکسل انتخاب کنید.";
-            return Page();
-        }
-
-        //await NewMethod();
-
-        // var rollcall = _dbContext.RollCalls.Where(x => x.id > 361628 && x.id < 362119).ToList();
-        //
-        // var diffTime = TimeSpan.FromHours(8) + TimeSpan.FromMinutes(30);
-        // var NoneRollCalls = rollcall
-        //     .Where(x => x.RollCallModifyType == RollCallModifyType.None && x.EndDate == null).ToList();
-        // foreach (var noneRollCall in NoneRollCalls)
-        // {
-        //     noneRollCall.SetStartDate(noneRollCall.StartDate!.Value.Add(diffTime));
-        // }
-        // var rollcallIds = NoneRollCalls.Select(x => x.id).ToList();
-        // var editedRollCall = rollcall.Where(x=>!rollcallIds.Contains(x.id) && x.RollCallModifyType != RollCallModifyType.EditByEmployer).ToList();
-        //
-        // foreach (var rollCall in editedRollCall)
-        // {
-        //     rollCall.Edit(rollCall.StartDate.Value.Add(diffTime),
-        //         rollCall.EndDate.Value.Add(diffTime),_rollCallDomainService);
-        // }
-        //
-        // await _dbContext.SaveChangesAsync();
-        return Page();
-    }
-
-    private async System.Threading.Tasks.Task NewMethod()
-    {
-        try
-        {
-            ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
-            
-            using (var stream = new MemoryStream())
-            {
-                await ExcelFile.CopyToAsync(stream);
-                stream.Position = 0;
-
-                using (var package = new ExcelPackage(stream))
-                {
-                    var worksheet = package.Workbook.Worksheets[0];
-                    int rowCount = worksheet.Dimension?.Rows ?? 0;
-
-                    // خواندن مقادیر از ستون B و C از ردیف 2 به بعد
-                    for (int row = 2; row <= rowCount; row++)
-                    {
-                        var columnB = worksheet.Cells[row, 2].Value?.ToString()?.Trim();
-                        var columnC = worksheet.Cells[row, 3].Value?.ToString()?.Trim();
-                        
-                        if (!string.IsNullOrWhiteSpace(columnB) || !string.IsNullOrWhiteSpace(columnC))
-                        {
-                            ExcelData.Add(new ExcelRowData
-                            {
-                                ColumnB = columnB ?? "",
-                                ColumnC = columnC ?? ""
-                            });
-                        }
-                    }
-                }
-            }
-
-            // ساخت HashSet برای سرچ سریع - هر جفت (B, C) رو با هم نگه داری
-            var excelPairs = new HashSet<(string B, string C)>(
-                ExcelData.Select(x => (
-                    B: (x.ColumnB ?? "").Trim(), 
-                    C: (x.ColumnC ?? "").Trim()
-                )));
-
-            // دریافت تمام داده‌های موجود در دیتابیس
-            var allFiles = _dbContext.Files.ToList();
-            
-            // دسته‌بندی: فایل‌هایی که در اکسل هستند و نیستند
-            foreach (var file in allFiles)
-            {
-                var fileB = file.ArchiveNo.ToString();
-                var fileC = (file.FileClass ?? "").Trim();
-                
-                // بررسی آیا جفت (B, C) این فایل در اکسل وجود دارد
-                bool foundInExcel = excelPairs.Contains((fileB, fileC));
-                
-                if (foundInExcel)
-                {
-                    FoundInExcel.Add(file);
-                }
-                else
-                {
-                    NotFoundInExcel.Add(file);
-                }
-            }
-
-            foreach (var file1 in FoundInExcel)
-            {
-                file1.ChangeStatus(2);
-            }
-
-            foreach (var file1 in NotFoundInExcel)
-            {
-                file1.ChangeStatus(1);
-            }
-
-            await _dbContext.SaveChangesAsync();
-            HasProcessed = true;
-            Message = $"پردازش با موفقیت انجام شد. تعداد ردیف‌های اکسل: {ExcelData.Count} | فایل‌های موجود در اکسل: {FoundInExcel.Count} | فایل‌های غیرموجود در اکسل: {NotFoundInExcel.Count}";
-        }
-        catch (Exception ex)
-        {
-            Message = $"خطا در پردازش فایل: {ex.Message}";
-        }
-    }
-}
-

ServiceHost/Areas/Client/Controllers/LoanController.cs

@@ -0,0 +1,59 @@
+using _0_Framework.Application;
+using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
+using CompanyManagment.App.Contracts.Loan;
+using Microsoft.AspNetCore.Mvc;
+using ServiceHost.BaseControllers;
+
+namespace ServiceHost.Areas.Client.Controllers;
+
+public class LoanController: ClientBaseController
+{
+    private readonly ILoanApplication _loanApplication;
+    private readonly long _workshopId;
+
+    public LoanController(ILoanApplication loanApplication, IAuthHelper authHelper)
+    {
+        _loanApplication = loanApplication;
+        _workshopId= authHelper.GetWorkshopId();
+    }
+    [HttpGet]
+    public ActionResult<LoanGroupedViewModel> GetList(LoanSearchViewModel searchModel)
+    {
+        searchModel.WorkshopId = _workshopId;
+        var loans = _loanApplication.GetSearchListAsGrouped(searchModel);
+        return loans;
+    }
+    
+    [HttpGet("{id}")]
+    public async Task<ActionResult<LoanDetailsViewModel>> GetDetails(long id)
+    {
+        var loan = await _loanApplication.GetDetails(id);
+        return loan;
+    }
+
+    [HttpPost]
+    public ActionResult<OperationResult> Create([FromBody] CreateLoanViewModel command)
+    {
+        var result = _loanApplication.Create(command);
+        return result;
+    }
+
+    [HttpGet("create/installments")]
+    public ActionResult<List<LoanInstallmentViewModel>> CalculateLoanInstallment(string amount,
+        int installmentCount, string loanStartDate, bool getRounded)
+    {
+        var installments =
+            _loanApplication.CalculateLoanInstallment(amount, installmentCount, loanStartDate, getRounded);
+        return installments;
+    }
+
+    [HttpDelete("{id}")]
+    public ActionResult<OperationResult> Remove(long id)
+    {
+        var result = _loanApplication.Remove(id);
+        return result;
+    }
+    
+    
+
+}

WorkFlow/Application/WorkFlow.Application.Contracts/WorkFlow.Application.Contracts.csproj

@@ -4,7 +4,6 @@
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	  <NuGetAudit>false</NuGetAudit>
   </PropertyGroup>
 
   <ItemGroup>