add project details to CreateTimeRequestDetailsResponse and handle section validation

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

.gitignore

@@ -362,3 +362,9 @@ MigrationBackup/
 # # Fody - auto-generated XML schema
 # FodyWeavers.xsd
 .idea
+/ServiceHost/appsettings.Development.json
+/ServiceHost/appsettings.json
+
+# Storage folder - ignore all uploaded files, thumbnails, and temporary files
+ServiceHost/Storage
+

0_Framework/Application/Enums/TypeOfSmsSetting.cs

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

0_Framework/Application/PaymentGateway/SepehrPaymentGateway.cs

@@ -4,6 +4,7 @@ using System.Net.Http;
 using System.Net.Http.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
 namespace _0_Framework.Application.PaymentGateway;
@@ -12,18 +13,24 @@ public class SepehrPaymentGateway:IPaymentGateway
 {
 	private readonly HttpClient _httpClient;
 	private const long TerminalId = 99213700;
+	private readonly ILogger<SepehrPaymentGateway> _logger;
 
-	public SepehrPaymentGateway(IHttpClientFactory httpClient)
+	public SepehrPaymentGateway(IHttpClientFactory httpClient, ILogger<SepehrPaymentGateway> logger)
 	{
+		_logger = logger;
 		_httpClient = httpClient.CreateClient();
 		_httpClient.BaseAddress = new Uri("https://sepehr.shaparak.ir/Rest/V1/PeymentApi/");
 	}
 
 	public async Task<PaymentGatewayResponse> Create(CreatePaymentGatewayRequest command, CancellationToken cancellationToken = default)
 	{
+		_logger.LogInformation("Create payment started. TransactionId: {TransactionId}, Amount: {Amount}", command.TransactionId, command.Amount);
 		command.ExtraData ??= new Dictionary<string, object>();
+		_logger.LogInformation("Initializing extra data with FinancialInvoiceId: {FinancialInvoiceId}", command.FinancialInvoiceId);
 		command.ExtraData.Add("financialInvoiceId", command.FinancialInvoiceId);
 		var extraData = JsonConvert.SerializeObject(command.ExtraData);
+		_logger.LogInformation("Serialized extra data payload: {Payload}", extraData);
+		
 		var res = await _httpClient.PostAsJsonAsync("GetToken", new
 		{
 			TerminalID = TerminalId,
@@ -32,21 +39,25 @@ public class SepehrPaymentGateway:IPaymentGateway
 			callbackURL = command.CallBackUrl,
 			payload = extraData
 		}, cancellationToken: cancellationToken);
+		_logger.LogInformation("Create payment request sent. StatusCode: {StatusCode}", res.StatusCode);
 		// خواندن محتوای پاسخ
 		var content = await res.Content.ReadAsStringAsync(cancellationToken);
-
+		_logger.LogInformation("Create payment response content: {Content}", content);
+		
 		// تبدیل پاسخ JSON به آبجکت دات‌نت
 		var json = System.Text.Json.JsonDocument.Parse(content);
+		_logger.LogInformation("Create payment JSON parsed successfully.");
 
 		// گرفتن مقدار AccessToken
 		var accessToken = json.RootElement.GetProperty("Accesstoken").ToString();
 		var status = json.RootElement.GetProperty("Status").ToString();
-
+		_logger.LogInformation("Create payment parsed values. Status: {Status}, AccessToken: {AccessToken}", status, accessToken);
+		
 		return new PaymentGatewayResponse
 		{
 			Status = status,
 			IsSuccess = status == "0",
-			Token = accessToken
+			Token = accessToken,
 		};
 	}
 
@@ -55,21 +66,24 @@ public class SepehrPaymentGateway:IPaymentGateway
 
 	public async Task<PaymentGatewayResponse> Verify(VerifyPaymentGateWayRequest command, CancellationToken cancellationToken = default)
 	{
+		_logger.LogInformation("Verify payment started. DigitalReceipt: {DigitalReceipt}", command.DigitalReceipt);
 		var res = await _httpClient.PostAsJsonAsync("Advice", new
 		{
 			digitalreceipt = command.DigitalReceipt,
 			Tid = TerminalId,
 		}, cancellationToken: cancellationToken);
-
+		_logger.LogInformation("Verify payment request sent. StatusCode: {StatusCode}", res.StatusCode);
 		// خواندن محتوای پاسخ
 		var content = await res.Content.ReadAsStringAsync(cancellationToken);
-
+		_logger.LogInformation("Verify payment response content: {Content}", content);
+		
 		// تبدیل پاسخ JSON به آبجکت دات‌نت
 		var json = System.Text.Json.JsonDocument.Parse(content);
-
+		_logger.LogInformation("Verify payment JSON parsed successfully.");
-
+		
 		var message = json.RootElement.GetProperty("Message").GetString();
 		var status = json.RootElement.GetProperty("Status").GetString();
+		_logger.LogInformation("Verify payment parsed values. Status: {Status}, Message: {Message}", status, message);
 		return new PaymentGatewayResponse
 		{
 			Status = status,

0_Framework/Application/Sms/ApiResultViewModel.cs

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

0_Framework/Application/Sms/ISmsService.cs

@@ -19,6 +19,13 @@ public interface ISmsService
     bool SendAccountsInfo(string number,string fullName, string userName);
     Task<ApiResultViewModel> GetByMessageId(int messId);
     Task<List<ApiResultViewModel>> GetApiResult(string startDate, string endDate);
+
+    #region ForApi
+
+    Task<List<ApiReportDto>> GetApiReport(string startDate, string endDate);
+
+#endregion
+
     string DeliveryStatus(byte? dv);
     string DeliveryColorStatus(byte? dv);
     string UnixTimeStampToDateTime(int? unixTimeStamp);
@@ -64,6 +71,7 @@ public interface ISmsService
    
     /// <summary>
     /// پیامک مسدودی طرف حساب
+    /// قراردادهای قدیم
     /// </summary>
     /// <param name="number"></param>
     /// <param name="fullname"></param>
@@ -74,6 +82,19 @@ public interface ISmsService
     /// <returns></returns>
     Task<(byte status, string message, int messaeId, bool isSucceded)> BlockMessage(string number, string fullname, string amount, string accountType, string id, string aprove);
 
+    /// <summary>
+    /// پیامک مسدودی طرف حساب
+    /// قرارداد های جدید
+    /// </summary>
+    /// <param name="number"></param>
+    /// <param name="fullname"></param>
+    /// <param name="amount"></param>
+    /// <param name="code1"></param>
+    /// <param name="code2"></param>
+    /// <returns></returns>
+    Task<(byte status, string message, int messaeId, bool isSucceded)> BlockMessageForElectronicContract(string number,
+        string fullname,
+        string amount, string code1, string code2);
     #endregion
 
     #region AlarmMessage

AccountManagement.Application.Contracts/Account/IAccountApplication.cs

@@ -34,7 +34,7 @@ public interface IAccountApplication
     OperationResult DeActive(long id);
     OperationResult DirectLogin(long id);
 
-    AccountLeftWorkViewModel WorkshopList(long accountId);
+    // AccountLeftWorkViewModel WorkshopList(long accountId);
     OperationResult SaveWorkshopAccount(
         List<WorkshopAccountlistViewModel> workshopAccountList,
         string startDate,
@@ -75,7 +75,6 @@ public interface IAccountApplication
     void CameraLogin(CameraLoginRequest request);
 
     Task<GetPmUserDto> GetPmUserAsync(long accountId);
-
 }
 
 public class CameraLoginRequest

AccountManagement.Application/AccountApplication.cs

@@ -18,7 +18,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-
 using Shared.Contracts.PmUser.Commands;
 using Shared.Contracts.PmUser.Queries;
 
@@ -48,7 +47,13 @@ public class AccountApplication : IAccountApplication
     private readonly IPmUserCommandService _pmUserCommandService;
 
     public AccountApplication(IAccountRepository accountRepository, IPasswordHasher passwordHasher,
-        IFileUploader fileUploader, IAuthHelper authHelper, IRoleRepository roleRepository, IWorker worker, ISmsService smsService, ICameraAccountRepository cameraAccountRepository, IPositionRepository positionRepository, IAccountLeftworkRepository accountLeftworkRepository, IWorkshopRepository workshopRepository, ISubAccountRepository subAccountRepository, ISubAccountRoleRepository subAccountRoleRepository, IWorkshopSubAccountRepository workshopSubAccountRepository, ISubAccountPermissionSubtitle1Repository accountPermissionSubtitle1Repository, IUnitOfWork unitOfWork, IPmUserQueryService pmUserQueryService, IPmUserCommandService pmUserCommandService)
+        IFileUploader fileUploader, IAuthHelper authHelper, IRoleRepository roleRepository, IWorker worker,
+        ISmsService smsService, ICameraAccountRepository cameraAccountRepository,
+        IPositionRepository positionRepository, IAccountLeftworkRepository accountLeftworkRepository,
+        IWorkshopRepository workshopRepository, ISubAccountRepository subAccountRepository,
+        ISubAccountRoleRepository subAccountRoleRepository, IWorkshopSubAccountRepository workshopSubAccountRepository,
+        ISubAccountPermissionSubtitle1Repository accountPermissionSubtitle1Repository, IUnitOfWork unitOfWork,
+        IPmUserQueryService pmUserQueryService, IPmUserCommandService pmUserCommandService)
     {
         _authHelper = authHelper;
         _roleRepository = roleRepository;
@@ -68,7 +73,6 @@ public class AccountApplication : IAccountApplication
         _fileUploader = fileUploader;
         _passwordHasher = passwordHasher;
         _accountRepository = accountRepository;
-
     }
 
     public OperationResult EditClient(EditClientAccount command)
@@ -89,7 +93,8 @@ public class AccountApplication : IAccountApplication
                 (x.Mobile == command.Mobile && x.id != command.Id)))
             return opreation.Failed("شماره موبایل تکراری است");
         if (_accountRepository.Exists(x =>
-                (x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(x.NationalCode) && x.id != command.Id)))
+                (x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(x.NationalCode) &&
+                 x.id != command.Id)))
             return opreation.Failed("کد ملی تکراری است");
         if (_accountRepository.Exists(x =>
                 (x.Email == command.Email && !string.IsNullOrWhiteSpace(x.Email) && x.id != command.Id)))
@@ -97,7 +102,8 @@ public class AccountApplication : IAccountApplication
 
         var path = $"profilePhotos";
         var picturePath = _fileUploader.Upload(command.ProfilePhoto, path);
-        editAccount.EditClient(command.Fullname, command.Username, command.Mobile, picturePath, command.Email, command.NationalCode);
+        editAccount.EditClient(command.Fullname, command.Username, command.Mobile, picturePath, command.Email,
+            command.NationalCode);
         _accountRepository.SaveChanges();
         return opreation.Succcedded();
     }
@@ -142,8 +148,8 @@ public class AccountApplication : IAccountApplication
         if (_fileUploader != null)
         {
             picturePath = _fileUploader.Upload(command.ProfilePhoto, path);
-
         }
+
         var account = new Account(command.Fullname, command.Username, password, command.Mobile, command.RoleId,
             picturePath, roleName.Name, "true", "false");
 
@@ -158,7 +164,8 @@ public class AccountApplication : IAccountApplication
             if (command.UserRoles == null)
                 return operation.Failed("حداقل یک نقش برای کاربر مدیریت پروژه لازم است");
             var pmUserRoles = command.UserRoles.Where(x => x > 0).ToList();
-            var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname, command.Username, account.Password, command.Mobile,
+            var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname, command.Username,
+                account.Password, command.Mobile,
                 null, account.id, pmUserRoles));
             if (!createPm.isSuccess)
             {
@@ -167,7 +174,6 @@ public class AccountApplication : IAccountApplication
             }
 
 
-
             //var url = "api/user/create";
             //var key = SecretKeys.ProgramManagerInternalApi;
 
@@ -252,29 +258,30 @@ public class AccountApplication : IAccountApplication
         //    $"api/user/{account.id}",
         //    key
         //);
-        var userResult =await _pmUserQueryService.GetPmUserDataByAccountId(account.id);
+        var userResult = await _pmUserQueryService.GetPmUserDataByAccountId(account.id);
 
         if (command.UserRoles == null)
             return operation.Failed("حداقل یک نقش برای کاربر مدیریت پروژه لازم است");
         var pmUserRoles = command.UserRoles.Where(x => x > 0).ToList();
 
         //اگر کاربر در پروگرام منیجر قبلا ایجاد شده
-        if (userResult.Id >0)
+        if (userResult.Id > 0)
         {
             if (!command.UserRoles.Any())
             {
                 _unitOfWork.RollbackAccountContext();
                 return operation.Failed("حداقل یک نقش باید انتخاب شود");
             }
-           
+
-            var editPm =await _pmUserCommandService.Edit(new EditPmUserDto(command.Fullname, command.Username, command.Mobile, account.id, pmUserRoles,
+            var editPm = await _pmUserCommandService.Edit(new EditPmUserDto(command.Fullname, command.Username,
+                command.Mobile, account.id, pmUserRoles,
                 command.IsProgramManagerUser));
             if (!editPm.isSuccess)
             {
                 _unitOfWork.RollbackAccountContext();
                 return operation.Failed("خطا در ویرایش کاربر پروگرام منیجر");
             }
- 
+
             //var parameters = new EditUserCommand(
             //    command.Fullname,
             //    command.Username,
@@ -302,7 +309,6 @@ public class AccountApplication : IAccountApplication
             //    _unitOfWork.RollbackAccountContext();
             //    return operation.Failed(response.Error);
             //}
-
         }
         else //اگر کاربر قبلا ایجاد نشده
         {
@@ -315,19 +321,15 @@ public class AccountApplication : IAccountApplication
                     return operation.Failed("حداقل یک نقش باید انتخاب شود");
                 }
 
-             
 
-                
+                var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname,
-
+                    command.Username, account.Password, command.Mobile,
-               
-                var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname, command.Username, account.Password, command.Mobile,
                     null, account.id, pmUserRoles));
                 if (!createPm.isSuccess)
                 {
                     _unitOfWork.RollbackAccountContext();
                     return operation.Failed("خطا در ویرایش کاربر پروگرام منیجر");
                 }
-              
 
 
                 //var parameters = new CreateProgramManagerUser(
@@ -362,7 +364,6 @@ public class AccountApplication : IAccountApplication
                 //    return operation.Failed(response.Error);
                 //}
             }
-
         }
 
         _unitOfWork.CommitAccountContext();
@@ -376,7 +377,6 @@ public class AccountApplication : IAccountApplication
 
     public OperationResult Login(Login command)
     {
-
         long idAutoriz = 0;
         var operation = new OperationResult();
         if (string.IsNullOrWhiteSpace(command.Password))
@@ -401,21 +401,27 @@ public class AccountApplication : IAccountApplication
                 .Select(x => x.Code)
                 .ToList();
             //PmPermission
-            var PmUserData = _pmUserQueryService.GetPmUserDataByAccountId(account.id).GetAwaiter().GetResult();
+            var PmUserData = _pmUserQueryService.GetPmUserDataByAccountId(account.id)
-            if (PmUserData.AccountId > 0 && PmUserData.IsActive)
+                .GetAwaiter().GetResult();
+            long? pmUserId = null;
+            if (PmUserData != null)
             {
-                
+                if (PmUserData.AccountId > 0 && PmUserData.IsActive)
-                var pmUserPermissions =
+                {
-                    PmUserData.RoleListDto != null
+                    var pmUserPermissions =
-                        ? PmUserData.RoleListDto
+                        PmUserData.RoleListDto != null
-                            .SelectMany(x => x.Permissions)
+                            ? PmUserData.RoleListDto
-                            .Where(p => p != 99)
+                                .SelectMany(x => x.Permissions)
-                            .Distinct()                    
+                                .Where(p => p != 99)
-                            .ToList()
+                                .Distinct()
-                        : new List<int>();
+                                .ToList()
-                permissions.AddRange(pmUserPermissions);
+                            : new List<int>();
+                    permissions.AddRange(pmUserPermissions);
+                }
+
+                pmUserId = PmUserData.Id > 0 ? PmUserData.Id : null;
             }
-           
+
 
             int? positionValue;
             if (account.PositionId != null)
@@ -426,24 +432,25 @@ public class AccountApplication : IAccountApplication
             {
                 positionValue = null;
             }
-            var pmUserId = PmUserData.AccountId > 0 ? PmUserData.AccountId : null;
+
             var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
                 , account.Username, account.Mobile, account.ProfilePhoto,
-                permissions, account.RoleName, account.AdminAreaPermission, 
+                permissions, account.RoleName, account.AdminAreaPermission,
-                account.ClientAriaPermission, positionValue,0,pmUserId);
+                account.ClientAriaPermission, positionValue, 0, pmUserId);
 
             if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" &&
                 account.IsActiveString == "true")
             {
                 var clientPermissions = _accountPermissionSubtitle1Repository.GetAllPermissionCodes();
                 authViewModel.Permissions = clientPermissions;
-                var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x => new WorkshopClaim
+                var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x =>
-                {
+                    new WorkshopClaim
-                    PersonnelCount = x.PersonnelCount,
+                    {
-                    Id = x.Id,
+                        PersonnelCount = x.PersonnelCount,
-                    Name = x.WorkshopFullName,
+                        Id = x.Id,
-                    Slug = _passwordHasher.SlugHasher(x.Id)
+                        Name = x.WorkshopFullName,
-                }).OrderByDescending(x => x.PersonnelCount).ToList();
+                        Slug = _passwordHasher.SlugHasher(x.Id)
+                    }).OrderByDescending(x => x.PersonnelCount).ToList();
                 authViewModel.WorkshopList = workshopList;
                 if (workshopList.Any())
                 {
@@ -456,10 +463,14 @@ public class AccountApplication : IAccountApplication
 
             _authHelper.Signin(authViewModel);
 
-            if ((account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" && account.IsActiveString == "true") || (account.AdminAreaPermission == "true" && account.ClientAriaPermission == "false" && account.IsActiveString == "true"))
+            if ((account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" &&
+                 account.IsActiveString == "true") || (account.AdminAreaPermission == "true" &&
+                                                       account.ClientAriaPermission == "false" &&
+                                                       account.IsActiveString == "true"))
                 idAutoriz = 1;
 
-            if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" && account.IsActiveString == "true")
+            if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" &&
+                account.IsActiveString == "true")
                 idAutoriz = 2;
         }
 
@@ -471,7 +482,8 @@ public class AccountApplication : IAccountApplication
 
             var mobile = string.IsNullOrWhiteSpace(cameraAccount.Mobile) ? " " : cameraAccount.Mobile;
             var authViewModel = new CameraAuthViewModel(cameraAccount.id, cameraAccount.WorkshopId,
-                cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId, cameraAccount.IsActiveSting);
+                cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId,
+                cameraAccount.IsActiveSting);
             if (cameraAccount.IsActiveSting == "true")
             {
                 _authHelper.CameraSignIn(authViewModel);
@@ -481,7 +493,6 @@ public class AccountApplication : IAccountApplication
             {
                 idAutoriz = 0;
             }
-
         }
 
         if (subAccount != null)
@@ -511,12 +522,14 @@ public class AccountApplication : IAccountApplication
                 authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.WorkshopId);
                 authViewModel.WorkshopId = workshop.WorkshopId;
             }
+
             _authHelper.Signin(authViewModel);
             idAutoriz = 2;
         }
 
         return operation.Succcedded(idAutoriz);
     }
+
     public OperationResult LoginWithMobile(long id)
     {
         var operation = new OperationResult();
@@ -525,7 +538,6 @@ public class AccountApplication : IAccountApplication
             return operation.Failed(ApplicationMessages.WrongUserPass);
 
 
-
         var permissions = _roleRepository.Get(account.RoleId)
             .Permissions
             .Select(x => x.Code)
@@ -541,20 +553,22 @@ public class AccountApplication : IAccountApplication
         }
 
         var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
-            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, account.AdminAreaPermission, account.ClientAriaPermission, positionValue);
+            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName,
+            account.AdminAreaPermission, account.ClientAriaPermission, positionValue);
 
         if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" &&
             account.IsActiveString == "true")
         {
             var clientPermissions = _accountPermissionSubtitle1Repository.GetAllPermissionCodes();
             authViewModel.Permissions = clientPermissions;
-            var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x => new WorkshopClaim
+            var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x =>
-            {
+                new WorkshopClaim
-                PersonnelCount = x.PersonnelCount,
+                {
-                Id = x.Id,
+                    PersonnelCount = x.PersonnelCount,
-                Name = x.WorkshopFullName,
+                    Id = x.Id,
-                Slug = _passwordHasher.SlugHasher(x.Id)
+                    Name = x.WorkshopFullName,
-            }).OrderByDescending(x => x.PersonnelCount).ToList();
+                    Slug = _passwordHasher.SlugHasher(x.Id)
+                }).OrderByDescending(x => x.PersonnelCount).ToList();
             authViewModel.WorkshopList = workshopList;
             if (workshopList.Any())
             {
@@ -567,13 +581,15 @@ public class AccountApplication : IAccountApplication
 
         _authHelper.Signin(authViewModel);
         long idAutoriz = 0;
-        if (account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" || account.AdminAreaPermission == "true" && account.ClientAriaPermission == "false")
+        if (account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" ||
+            account.AdminAreaPermission == "true" && account.ClientAriaPermission == "false")
             idAutoriz = 1;
 
         if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false")
             idAutoriz = 2;
         return operation.Succcedded(idAutoriz);
     }
+
     public void Logout()
     {
         _authHelper.SignOut();
@@ -609,6 +625,7 @@ public class AccountApplication : IAccountApplication
         _accountRepository.SaveChanges();
         return operation.Succcedded();
     }
+
     public EditAccount GetByVerifyCode(string code, string phone)
     {
         return _accountRepository.GetByVerifyCode(code, phone);
@@ -637,7 +654,6 @@ public class AccountApplication : IAccountApplication
         await _accountRepository.RemoveCode(id);
 
         return operation.Succcedded();
-
     }
 
 
@@ -682,7 +698,6 @@ public class AccountApplication : IAccountApplication
             return operation.Failed("این اکانت وجود ندارد");
 
 
-
         var permissions = _roleRepository.Get(account.RoleId)
             .Permissions
             .Select(x => x.Code)
@@ -691,7 +706,8 @@ public class AccountApplication : IAccountApplication
 
         _authHelper.SignOut();
         var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
-            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, "false", "true", null);
+            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, "false", "true",
+            null);
         var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x => new WorkshopClaim
         {
             PersonnelCount = x.PersonnelCount,
@@ -711,9 +727,11 @@ public class AccountApplication : IAccountApplication
             authViewModel.WorkshopName = workshop.Name;
             authViewModel.WorkshopId = workshop.Id;
         }
+
         _authHelper.Signin(authViewModel);
         return operation.Succcedded(2);
     }
+
     public OperationResult DirectCameraLogin(long cameraAccountId)
     {
         var prAcc = _authHelper.CurrentAccountInfo();
@@ -723,47 +741,45 @@ public class AccountApplication : IAccountApplication
             return operation.Failed("این اکانت وجود ندارد");
 
 
-
-
-
         _authHelper.SignOut();
 
 
         var mobile = string.IsNullOrWhiteSpace(cameraAccount.Mobile) ? " " : cameraAccount.Mobile;
         var authViewModel = new CameraAuthViewModel(cameraAccount.id, cameraAccount.WorkshopId,
-            cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId, cameraAccount.IsActiveSting);
+            cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId,
+            cameraAccount.IsActiveSting);
         if (cameraAccount.IsActiveSting == "true")
         {
             _authHelper.CameraSignIn(authViewModel);
-
         }
         else
         {
             return operation.Failed("این اکانت غیر فعال شده است");
         }
+
         return operation.Succcedded(2);
     }
 
 
-    public AccountLeftWorkViewModel WorkshopList(long accountId)
+    // public AccountLeftWorkViewModel WorkshopList(long accountId)
-    {
+    // {
-        string fullname = this._accountRepository.GetById(accountId).Fullname;
+    //     string fullname = this._accountRepository.GetById(accountId).Fullname;
-        List<WorkshopAccountlistViewModel> source = _accountLeftworkRepository.WorkshopList(accountId);
+    //     List<WorkshopAccountlistViewModel> source = _accountLeftworkRepository.WorkshopList(accountId);
-        List<long> userWorkshopIds = source.Select(x => x.WorkshopId).ToList();
+    //     List<long> userWorkshopIds = source.Select(x => x.WorkshopId).ToList();
-        List<WorkshopSelectList> allWorkshops = this._accountLeftworkRepository.GetAllWorkshops();
+    //     List<WorkshopSelectList> allWorkshops = this._accountLeftworkRepository.GetAllWorkshops();
-        List<AccountViewModel> accountSelectList = this._accountRepository.GetAdminAccountSelectList();
+    //     List<AccountViewModel> accountSelectList = this._accountRepository.GetAdminAccountSelectList();
-        (string StartWorkFa, string LeftWorkFa) byAccountId = this._accountLeftworkRepository.GetByAccountId(accountId);
+    //     (string StartWorkFa, string LeftWorkFa) byAccountId = this._accountLeftworkRepository.GetByAccountId(accountId);
-        return new AccountLeftWorkViewModel()
+    //     return new AccountLeftWorkViewModel()
-        {
+    //     {
-            AccountId = accountId,
+    //         AccountId = accountId,
-            AccountFullName = fullname,
+    //         AccountFullName = fullname,
-            StartDateFa = byAccountId.StartWorkFa,
+    //         StartDateFa = byAccountId.StartWorkFa,
-            LeftDateFa = byAccountId.LeftWorkFa,
+    //         LeftDateFa = byAccountId.LeftWorkFa,
-            WorkshopAccountlist = source,
+    //         WorkshopAccountlist = source,
-            WorkshopSelectList = new SelectList(allWorkshops.Where(x => !userWorkshopIds.Contains(x.Id)), "Id", "WorkshopFullName"),
+    //         WorkshopSelectList = new SelectList(allWorkshops.Where(x => !userWorkshopIds.Contains(x.Id)), "Id", "WorkshopFullName"),
-            AccountSelectList = new SelectList(accountSelectList, "Id", "Fullname")
+    //         AccountSelectList = new SelectList(accountSelectList, "Id", "Fullname")
-        };
+    //     };
-    }
+    // }
 
     public OperationResult SaveWorkshopAccount(
         List<WorkshopAccountlistViewModel> workshopAccountList,
@@ -773,10 +789,12 @@ public class AccountApplication : IAccountApplication
     {
         return this._accountLeftworkRepository.SaveWorkshopAccount(workshopAccountList, startDate, leftDate, accountId);
     }
+
     public OperationResult CreateNewWorkshopAccount(long currentAccountId, long newAccountId)
     {
         return this._accountLeftworkRepository.CopyWorkshopToNewAccount(currentAccountId, newAccountId);
     }
+
     #region Mahan
 
     public List<AccountViewModel> AccountsForAssign(long taskId)
@@ -790,6 +808,7 @@ public class AccountApplication : IAccountApplication
         {
             return new List<AccountViewModel>();
         }
+
         return _accountRepository.GetAccountsByPositionId(positionId);
     }
 
@@ -807,7 +826,6 @@ public class AccountApplication : IAccountApplication
             return operation.Failed("این اکانت وجود ندارد");
 
 
-
         var permissions = _roleRepository.Get(account.RoleId)
             .Permissions
             .Select(x => x.Code)
@@ -816,10 +834,10 @@ public class AccountApplication : IAccountApplication
 
         _authHelper.SignOut();
         var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
-            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, account.AdminAreaPermission, account.ClientAriaPermission, account.Position.PositionValue);
+            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName,
+            account.AdminAreaPermission, account.ClientAriaPermission, account.Position.PositionValue);
         _authHelper.Signin(authViewModel);
         return operation.Succcedded(2);
-
     }
 
     public async Task<List<AccountSelectListViewModel>> GetAdminSelectList()
@@ -828,8 +846,11 @@ public class AccountApplication : IAccountApplication
     }
 
     #endregion
+
     #region Pooya
-    public OperationResult IsPhoneNumberAndPasswordValid(long accountId, string phoneNumber, string password, string rePassword)
+
+    public OperationResult IsPhoneNumberAndPasswordValid(long accountId, string phoneNumber, string password,
+        string rePassword)
     {
         OperationResult op = new();
 
@@ -847,7 +868,8 @@ public class AccountApplication : IAccountApplication
                 return op.Failed("رمز عبور نمی تواند کمتر از 8 کاراکتر باشد");
         }
 
-        if ((string.IsNullOrWhiteSpace(phoneNumber) || entity.Mobile == phoneNumber) && string.IsNullOrWhiteSpace(rePassword))
+        if ((string.IsNullOrWhiteSpace(phoneNumber) || entity.Mobile == phoneNumber) &&
+            string.IsNullOrWhiteSpace(rePassword))
             return op.Failed("چیزی برای تغییر وجود ندارد");
 
 
@@ -873,20 +895,22 @@ public class AccountApplication : IAccountApplication
         var entity = _accountRepository.Get(command.AccountId);
         if (entity == null)
             return op.Failed(ApplicationMessages.RecordNotFound);
-        var validationResult = IsPhoneNumberAndPasswordValid(command.AccountId, command.PhoneNumber, command.Password, command.RePassword);
+        var validationResult = IsPhoneNumberAndPasswordValid(command.AccountId, command.PhoneNumber, command.Password,
+            command.RePassword);
         if (validationResult.IsSuccedded == false)
             return validationResult;
 
         if (!string.IsNullOrWhiteSpace(command.RePassword))
         {
-
             entity.ChangePassword(_passwordHasher.Hash(command.Password));
         }
 
         if (!string.IsNullOrWhiteSpace(command.PhoneNumber))
         {
-            entity.Edit(entity.Fullname, entity.Username, command.PhoneNumber, entity.RoleId, entity.ProfilePhoto, entity.RoleName);
+            entity.Edit(entity.Fullname, entity.Username, command.PhoneNumber, entity.RoleId, entity.ProfilePhoto,
+                entity.RoleName);
         }
+
         _accountRepository.SaveChanges();
         return op.Succcedded();
     }
@@ -982,6 +1006,7 @@ public class AccountApplication : IAccountApplication
 
     //    return claimsResponse.Failed(ApplicationMessages.WrongUserPass);
     //}
+
     #endregion
 
 

AccountManagement.Domain/AccountLeftWorkAgg/IAccountLeftworkRepository.cs

@@ -10,7 +10,7 @@ public interface IAccountLeftworkRepository : IRepository<long, AccountLeftWork>
 {
 	(string StartWorkFa, string LeftWorkFa) GetByAccountId(long accountId);
 	List<WorkshopAccountlistViewModel> WorkshopList(long accountId);
-    List<WorkshopSelectList> GetAllWorkshops();
+    // List<WorkshopSelectList> GetAllWorkshops();
 
     OperationResult CopyWorkshopToNewAccount(long currentAccountId, long newAccountId);
 

AccountMangement.Infrastructure.EFCore/Repository/AccountLeftworkRepository.cs

@@ -18,14 +18,13 @@ public class AccountLeftworkRepository : RepositoryBase<long, AccountLeftWork>,
 {
 	private readonly AccountContext _accountContext;
   private readonly IWorkshopAccountRepository _workshopAccountRepository;
-  private readonly IWorkshopApplication _workshopApplication;
 
-    public AccountLeftworkRepository(AccountContext accountContext, IWorkshopAccountRepository workshopAccountRepository, IWorkshopApplication workshopApplication) : base(accountContext)
+    public AccountLeftworkRepository(AccountContext accountContext,
+	    IWorkshopAccountRepository workshopAccountRepository) : base(accountContext)
 	{
 		_accountContext = accountContext;
 		_workshopAccountRepository = workshopAccountRepository;
-        _workshopApplication = workshopApplication;
+	}
-    }
 
 	public (string StartWorkFa, string LeftWorkFa) GetByAccountId(long accountId)
 	{
@@ -58,14 +57,14 @@ public class AccountLeftworkRepository : RepositoryBase<long, AccountLeftWork>,
 		}).ToList();
 	}
 
-    public List<WorkshopSelectList> GetAllWorkshops()
+    // public List<WorkshopSelectList> GetAllWorkshops()
-    {
+    // {
-        return this._workshopApplication.GetWorkshopAll().Select(x => new WorkshopSelectList()
+    //     return this._workshopApplication.GetWorkshopAll().Select(x => new WorkshopSelectList()
-        {
+    //     {
-            Id = x.Id,
+    //         Id = x.Id,
-            WorkshopFullName = x.WorkshopFullName
+    //         WorkshopFullName = x.WorkshopFullName
-        }).ToList();
+    //     }).ToList();
-    }
+    // }
 
     public OperationResult CopyWorkshopToNewAccount(long currentAccountId, long newAccountId)
     {

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Jobs/JobSchedulerRegistrator.cs

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

Company.Domain/ContarctingPartyAgg/IPersonalContractingPartyRepository.cs

@@ -1,4 +1,5 @@
-using CompanyManagment.App.Contracts.PersonalContractingParty;
+using System;
+using CompanyManagment.App.Contracts.PersonalContractingParty;
 using System.Collections.Generic;
 using _0_Framework.Application;
 using _0_Framework.Domain;
@@ -32,7 +33,9 @@ public interface IPersonalContractingPartyRepository :IRepository<long, Personal
     List<PersonalContractingPartyViewModel> SearchForMain(PersonalContractingPartySearchModel searchModel2); 
     OperationResult DeletePersonalContractingParties(long id);
     bool GetHasContract(long id);
+    [Obsolete("از متدهای async استفاده کنید")]
     OperationResult DeActiveAll(long id);
+    [Obsolete("از متدهای async استفاده کنید")]
     OperationResult ActiveAll(long id);
 
     #endregion
@@ -76,4 +79,9 @@ public interface IPersonalContractingPartyRepository :IRepository<long, Personal
 
     Task<PersonalContractingParty> GetByNationalCode(string nationalCode);
     Task<PersonalContractingParty> GetByNationalId(string registerId);
+    
+    Task<OperationResult> DeActiveAllAsync(long id);
+    Task<OperationResult> ActiveAllAsync(long id);
+    
+    
 }

Company.Domain/FinancialInvoiceAgg/IFinancialInvoiceRepository.cs

@@ -10,4 +10,6 @@ public interface IFinancialInvoiceRepository : IRepository<long, FinancialInvoic
     EditFinancialInvoice GetDetails(long id);
     List<FinancialInvoiceViewModel> Search(FinancialInvoiceSearchModel searchModel);
     Task<FinancialInvoice> GetUnPaidByEntityId(long entityId, FinancialInvoiceItemType financialInvoiceItemType);
+    Task<FinancialInvoice> GetUnPaidFinancialInvoiceByContractingPartyIdAndAmount(long contractingPartyId,
+        double amount);
 }

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -13,7 +13,7 @@ namespace Company.Domain.InstitutionContractAgg;
 
 public interface IInstitutionContractRepository : IRepository<long, InstitutionContract>
 {
-    
+
     EditInstitutionContract GetDetails(long id);
     EditInstitutionContract GetFirstContract(long contractingPartyId, string typeOfContract);
     List<InstitutionContractViewModel> InstitutionContractsWithoutAccount();
@@ -56,9 +56,13 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     void UpdateStatusIfNeeded(long institutionContractId);
     Task<GetInstitutionVerificationDetailsViewModel> GetVerificationDetails(Guid id);
     Task<InstitutionContract> GetByPublicIdAsync(Guid id);
-    InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request,string contractStart = null);
+    InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request, string contractStart = null);
     InstitutionContractDiscountResponse ResetDiscountCreate(InstitutionContractResetDiscountForCreateRequest request);
-    
+
+    #region Creation
+
+
+    #endregion
 
     #region Extension
 
@@ -69,83 +73,25 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     Task<InstitutionContractDiscountResponse> SetDiscountForExtension(
         InstitutionContractSetDiscountForExtensionRequest request);
     Task<InstitutionContractDiscountResponse> ResetDiscountForExtension(InstitutionContractResetDiscountForExtensionRequest request);
-    
+
     Task<OperationResult> ExtensionComplete(InstitutionContractExtensionCompleteRequest request);
 
     #endregion
 
     #region Upgrade(Amendment)
 
-        Task<InstitutionContractAmendmentWorkshopsResponse> GetAmendmentWorkshops(long institutionContractId);
+    Task<InstitutionContractAmendmentWorkshopsResponse> GetAmendmentWorkshops(long institutionContractId);
-        Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(InsitutionContractAmendmentPaymentRequest request);
+    Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(InsitutionContractAmendmentPaymentRequest request);
 
-        Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request);
+    Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request);
-        Task RemoveAmendmentWorkshops(Guid workshopTempId);
+    Task RemoveAmendmentWorkshops(Guid workshopTempId);
-        #endregion
+    #endregion
 
     Task<List<InstitutionContractSelectListViewModel>> GetInstitutionContractSelectList(string search, string selected);
     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
 
@@ -158,6 +104,21 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
 
     #endregion
 
+
+
+
+
+   
+
+
     Task<long> GetIdByInstallmentId(long installmentId);
     Task<InstitutionContract> GetPreviousContract(long currentInstitutionContractId);
+    Task<InstitutionContractCreationInquiryResult> CreationInquiry(InstitutionContractCreationInquiryRequest request);
+    Task<InstitutionContractCreationWorkshopsResponse> GetCreationWorkshops(InstitutionContractCreationWorkshopsRequest request);
+    Task<InstitutionContractCreationPlanResponse> GetCreationInstitutionPlan(InstitutionContractCreationPlanRequest request);
+    Task<InstitutionContractCreationPaymentResponse> GetCreationPaymentMethod(InstitutionContractCreationPaymentRequest request);
+    Task<InstitutionContractDiscountResponse> SetDiscountForCreation(InstitutionContractSetDiscountForCreationRequest request);
+    Task<InstitutionContractDiscountResponse> ResetDiscountForCreation(InstitutionContractResetDiscountForExtensionRequest request);
+    Task<OperationResult> CreationComplete(InstitutionContractExtensionCompleteRequest request);
+    Task<InstitutionContract> GetIncludeInstallments(long id);
 }

Company.Domain/InstitutionContractAgg/IInstitutionContractSmsServiceRepository.cs

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

Company.Domain/InstitutionContractCreationTempAgg/InstitutionContractCreationTemp.cs

@@ -0,0 +1,340 @@
+using System;
+using System.Collections.Generic;
+using _0_Framework.Application;
+using _0_Framework.Application.Enums;
+using CompanyManagment.App.Contracts.InstitutionContract;
+using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+
+namespace Company.Domain.InstitutionContractCreationTempAgg;
+
+public class InstitutionContractCreationTemp
+{
+    public InstitutionContractCreationTemp()
+    {
+        Id = Guid.NewGuid();
+    }
+    
+    [BsonId] // Specifies this field as the _id in MongoDB
+    [BsonRepresentation(BsonType.String)] // Ensures the GUID is stored as a string
+    public Guid Id { get; set; }
+    
+    /// <summary>
+    /// نوع حقوقی طرف قرارداد (حقیقی یا حقوقی)
+    /// </summary>
+    public LegalType ContractingPartyLegalType { get; set; }
+    
+    /// <summary>
+    /// اطلاعات شخص حقیقی
+    /// </summary>
+    public InstitutionContractCreationTempRealParty RealParty { get; set; }
+    
+    /// <summary>
+    /// اطلاعات شخص حقوقی
+    /// </summary>
+    public InstitutionContractCreationTempLegalParty LegalParty { get; set; }
+    
+    public string Address { get; set; }
+    public string City { get; set; }
+    public string Province { get; set; }
+    public List<EditContactInfo> ContactInfos { get; set; }
+    public long RepresentativeId { get; set; }
+    
+
+    public List<InstitutionContractCreationTempWorkshop> Workshops { get; set; }
+
+    public InstitutionContractCreationPlanDetail OneMonth { get; set; }
+    public InstitutionContractCreationPlanDetail ThreeMonths { get; set; }
+    public InstitutionContractCreationPlanDetail SixMonths { get; set; }
+    public InstitutionContractCreationPlanDetail TwelveMonths { get; set; }
+    public InstitutionContractPaymentMonthlyViewModel MonthlyPayment { get; set; }
+    public InstitutionContractPaymentOneTimeViewModel OneTimePayment { get; set; }
+
+    public bool HasContractInPerson { get; set; }
+
+    public InstitutionContractDuration? Duration { get; set; }
+    
+    public void SetContractingPartyInfo(LegalType legalType,
+        InstitutionContractCreationTempRealParty realParty,
+        InstitutionContractCreationTempLegalParty legalParty)
+    {
+        ContractingPartyLegalType = legalType;
+        RealParty = realParty;
+        LegalParty = legalParty;
+    }
+    
+    public void SetWorkshopsAndPlanAmounts(List<InstitutionContractCreationTempWorkshop> workshops,
+        InstitutionContractCreationPlanDetail oneMonth,
+        InstitutionContractCreationPlanDetail threeMonth, InstitutionContractCreationPlanDetail sixMonth,
+        InstitutionContractCreationPlanDetail twelveMonth, bool hasContractInPerson)
+    {
+        Workshops = workshops;
+        OneMonth = oneMonth;
+        ThreeMonths = threeMonth;
+        SixMonths = sixMonth;
+        TwelveMonths = twelveMonth;
+        HasContractInPerson = hasContractInPerson;
+    }
+
+    public void SetAmountAndDuration(InstitutionContractDuration duration,InstitutionContractPaymentMonthlyViewModel monthly,
+        InstitutionContractPaymentOneTimeViewModel oneTime)
+    {
+        Duration = duration;
+        MonthlyPayment = monthly;
+        OneTimePayment = oneTime;
+    }
+
+
+    public void SetContractingPartyContactInfo(string address, string city, string province, List<EditContactInfo> requestContactInfos,long representativeId)
+    {
+        Address = address;
+        City = city;
+        Province = province;
+        ContactInfos = requestContactInfos;
+        RepresentativeId = representativeId;
+    }
+
+}
+
+public class InstitutionContractCreationTempLegalParty
+{
+    /// <summary>
+    /// آیدی طرف حساب در صورتی که از قبل ایجاد شده باشد
+    /// </summary>
+    public long Id { get; set; }
+    
+    /// <summary>
+    /// نام شرکت
+    /// </summary>
+    public string CompanyName { get; set; }
+    
+    /// <summary>
+    /// شماره ثبت
+    /// </summary>
+    public string RegisterId { get; set; }
+    
+    /// <summary>
+    /// شناسه ملی شرکت
+    /// </summary>
+    public string NationalId { get; set; }
+    
+    /// <summary>
+    /// شماره تلفن شرکت
+    /// </summary>
+    public string PhoneNumber { get; set; }
+    
+    /// <summary>
+    /// شناسه موقت طرف قرارداد
+    /// </summary>
+    public long ContractingPartyTempId { get; set; }
+    
+    /// <summary>
+    /// کد ملی نماینده قانونی
+    /// </summary>
+    public string NationalCode { get; set; }
+    
+    /// <summary>
+    /// تاریخ تولد نماینده قانونی فارسی
+    /// </summary>
+    public string BirthDateFa { get; set; }
+    
+    /// <summary>
+    /// نام نماینده قانونی
+    /// </summary>
+    public string FName { get; set; }
+    
+    /// <summary>
+    /// نام خانوادگی نماینده قانونی
+    /// </summary>
+    public string LName { get; set; }
+    
+    /// <summary>
+    /// نام پدر نماینده قانونی
+    /// </summary>
+    public string FatherName { get; set; }
+    
+    /// <summary>
+    /// شماره شناسنامه نماینده قانونی
+    /// </summary>
+    public string IdNumber { get; set; }
+    
+    /// <summary>
+    /// وضعیت احراز هویت نماینده قانونی
+    /// </summary>
+    public bool IsAuth { get; set; }
+    
+    /// <summary>
+    /// سمت نماینده قانونی در شرکت
+    /// </summary>
+    public string Position { get; set; }
+
+    /// <summary>
+    /// جنسیت نماینده قانونی
+    /// </summary>
+    public Gender Gender { get; set; }
+    
+    public string IdNumberSeri { get; set; }
+    
+    public string IdNumberSerial { get; set; }
+}
+
+public class InstitutionContractCreationTempRealParty
+{
+    /// <summary>
+    /// آیدی طرف حساب در صورتی که از قبل ایجاد شده باشد
+    /// </summary>
+    public long Id { get; set; }
+    /// <summary>
+    /// کد ملی
+    /// </summary>
+    public string NationalCode { get; set; }
+    
+    /// <summary>
+    /// تاریخ تولد فارسی
+    /// </summary>
+    public string BirthDateFa { get; set; }
+    
+    /// <summary>
+    /// شماره تلفن
+    /// </summary>
+    public string PhoneNumber { get; set; }
+    
+    /// <summary>
+    /// وضعیت احراز هویت
+    /// </summary>
+    public bool IsAuth { get; set; }
+    
+    /// <summary>
+    /// نام
+    /// </summary>
+    public string FName { get; set; }
+    
+    /// <summary>
+    /// نام خانوادگی
+    /// </summary>
+    public string LName { get; set; }
+    
+    /// <summary>
+    /// نام پدر
+    /// </summary>
+    public string FatherName { get; set; }
+    
+    /// <summary>
+    /// شماره شناسنامه
+    /// </summary>
+    public string IdNumber { get; set; }
+    
+    /// <summary>
+    /// شناسه موقت طرف قرارداد
+    /// </summary>
+    public long ContractingPartyTempId { get; set; }
+    
+    /// <summary>
+    /// جنسیت
+    /// </summary>
+    public Gender Gender { get; set; }
+    
+    public string IdNumberSeri { get; set; }
+    
+    public string IdNumberSerial { get; set; }
+}
+
+public class InstitutionContractCreationTempPlan
+{
+    public InstitutionContractCreationTempPlan(string contractStart, string contractEnd, 
+        string oneMonthPaymentDiscounted, string oneMonthDiscount, string oneMonthOriginalPayment,
+        string totalPayment, string dailyCompensation, string obligation)
+    {
+        ContractStart = contractStart;
+        ContractEnd = contractEnd;
+        OneMonthPaymentDiscounted = oneMonthPaymentDiscounted;
+        OneMonthDiscount = oneMonthDiscount;
+        OneMonthOriginalPayment = oneMonthOriginalPayment;
+        TotalPayment = totalPayment;
+        DailyCompensation = dailyCompensation;
+        Obligation = obligation;
+    }
+
+    public string ContractStart { get; set; }
+    public string ContractEnd { get; set; }
+    public string OneMonthPaymentDiscounted { get; set; }
+    public string OneMonthDiscount { get; set; }
+    public string OneMonthOriginalPayment { get; set; }
+    public string TotalPayment { get; set; }
+    public string DailyCompensation { get; set; }
+    public string Obligation { get; set; }
+}
+
+public class InstitutionContractCreationTempWorkshop
+{
+    public InstitutionContractCreationTempWorkshop(string workshopName, int countPerson, bool contractAndCheckout, bool contractAndCheckoutInPerson, 
+        bool insurance, bool insuranceInPerson,
+        bool rollCall,bool rollCallInPerson, bool customizeCheckout,double price,long workshopId)
+    {
+        WorkshopName = workshopName;
+        CountPerson = countPerson;
+        ContractAndCheckout = contractAndCheckout;
+        Insurance = insurance;
+        RollCall = rollCall;
+        CustomizeCheckout = customizeCheckout;
+        ContractAndCheckoutInPerson = contractAndCheckoutInPerson;
+        InsuranceInPerson = insuranceInPerson;
+        RollCallInPerson = rollCallInPerson;
+        Price = price;
+        WorkshopId = workshopId;
+    }
+
+    public long WorkshopId { get; set; }
+
+    /// <summary>
+    /// نام کارگاه
+    /// </summary>
+    public string WorkshopName { get; private set; }
+
+    /// <summary>
+    /// تعداد پرسنل 
+    /// </summary>
+    public int CountPerson { get; private  set; }
+    
+    
+    #region ServiceSelection
+
+    /// <summary>
+    /// قرارداد و تصفیه
+    /// </summary>
+    public bool ContractAndCheckout { get; private  set; }
+
+    /// <summary>
+    /// بیمه
+    /// </summary>
+    public bool Insurance { get; private  set; }
+
+    /// <summary>
+    /// حضورغباب
+    /// </summary>
+    public bool RollCall { get; private  set; }
+
+    public bool RollCallInPerson { get; set; }
+
+    /// <summary>
+    /// فیش غیر رسمی
+    /// </summary>
+    public bool CustomizeCheckout { get;private  set; }
+
+    /// <summary>
+    /// خدمات حضوری قرداد و تصفیه
+    /// </summary>
+    public bool ContractAndCheckoutInPerson { get; private  set; }
+
+    /// <summary>
+    /// خدمات حضوری بیمه
+    /// </summary>
+    public bool InsuranceInPerson { get; private  set; }
+
+    public double Price{ get; set; }
+
+    #endregion    
+}
+
+

Company.Domain/InstitutionContractSendFlagAgg/IInstitutionContractSendFlagRepository.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Company.Domain.InstitutionContractSendFlagAgg;
+
+/// <summary>
+/// Interface برای Repository مربوط به فلگ ارسال قرارداد
+/// </summary>
+public interface IInstitutionContractSendFlagRepository
+{
+    /// <summary>
+    /// ایجاد یک رکورد جدید برای فلگ ارسال قرارداد
+    /// </summary>
+    Task Create(InstitutionContractSendFlag flag);
+
+    /// <summary>
+    /// بازیابی فلگ بر اساس شناسه قرارداد
+    /// </summary>
+    Task<InstitutionContractSendFlag> GetByContractId(long contractId);
+
+    /// <summary>
+    /// به‌روزرسانی فلگ ارسال
+    /// </summary>
+    Task Update(InstitutionContractSendFlag flag);
+
+    /// <summary>
+    /// بررسی اینکه آیا قرارداد ارسال شده است
+    /// </summary>
+    Task<bool> IsContractSent(long contractId);
+    
+
+}
+

Company.Domain/InstitutionContractSendFlagAgg/InstitutionContractSendFlag.cs

@@ -0,0 +1,82 @@
+using System;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+
+namespace Company.Domain.InstitutionContractSendFlagAgg;
+
+/// <summary>
+/// نمایندگی فلگ ارسال قرارداد در MongoDB
+/// این موجودیت برای ردیابی اینکه آیا قرارداد ارسال شده است استفاده می‌شود
+/// </summary>
+public class InstitutionContractSendFlag
+{
+    public InstitutionContractSendFlag(long institutionContractId,bool isSent)
+    {
+        Id = Guid.NewGuid();
+        InstitutionContractId = institutionContractId;
+        IsSent = isSent;
+        CreatedDate = DateTime.Now;
+    }
+
+    /// <summary>
+    /// شناسه یکتای MongoDB
+    /// </summary>
+    [BsonId]
+    [BsonRepresentation(BsonType.String)]
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// شناسه قرارداد در SQL
+    /// </summary>
+    public long InstitutionContractId { get; set; }
+    
+    /// <summary>
+    /// آیا قرارداد ارسال شده است
+    /// </summary>
+    public bool IsSent { get; set; }
+
+    /// <summary>
+    /// تاریخ و زمان ارسال
+    /// </summary>
+    public DateTime? SentDate { get; set; }
+
+    /// <summary>
+    /// تاریخ و زمان ایجاد رکورد
+    /// </summary>
+    public DateTime CreatedDate { get; set; }
+
+    /// <summary>
+    /// تاریخ و زمان آخرین به‌روزرسانی
+    /// </summary>
+    public DateTime? LastModifiedDate { get; set; }
+    
+
+    /// <summary>
+    /// علامت‌گذاری قرارداد به عنوان ارسال‌شده
+    /// </summary>
+    public void MarkAsSent()
+    {
+        IsSent = true;
+        SentDate = DateTime.Now;
+        LastModifiedDate = DateTime.Now;
+    }
+
+    /// <summary>
+    /// بازگردانی علامت ارسال
+    /// </summary>
+    public void MarkAsNotSent()
+    {
+        IsSent = false;
+        SentDate = null;
+        LastModifiedDate = DateTime.Now;
+    }
+
+    /// <summary>
+    /// به‌روزرسانی علامت آخری اصلاح
+    /// </summary>
+    public void UpdateLastModified()
+    {
+        LastModifiedDate = DateTime.Now;
+    }
+}
+

Company.Domain/SalaryAidAgg/ISalaryAidRepository.cs

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

Company.Domain/SmsResultAgg/ISmsResultRepository.cs

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

CompanyManagement.Infrastructure.Mongo/InstitutionContractSendFlagRepo/InstitutionContractSendFlagRepository.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Company.Domain.InstitutionContractSendFlagAgg;
+using MongoDB.Driver;
+
+namespace CompanyManagement.Infrastructure.Mongo.InstitutionContractSendFlagRepo;
+
+/// <summary>
+/// Repository برای مدیریت فلگ ارسال قرارداد در MongoDB
+/// </summary>
+public class InstitutionContractSendFlagRepository : IInstitutionContractSendFlagRepository
+{
+    private readonly IMongoCollection<InstitutionContractSendFlag> _collection;
+
+    public InstitutionContractSendFlagRepository(IMongoDatabase database)
+    {
+        _collection = database.GetCollection<InstitutionContractSendFlag>("InstitutionContractSendFlag");
+    }
+    
+    public async Task Create(InstitutionContractSendFlag flag)
+    {
+        await _collection.InsertOneAsync(flag);
+    }
+
+    public async Task<InstitutionContractSendFlag> GetByContractId(long contractId)
+    {
+        var filter = Builders<InstitutionContractSendFlag>.Filter
+            .Eq(x => x.InstitutionContractId, contractId);
+        
+        return await _collection.Find(filter).FirstOrDefaultAsync();
+    }
+    
+
+    public async Task Update(InstitutionContractSendFlag flag)
+    {
+        var filter = Builders<InstitutionContractSendFlag>.Filter
+            .Eq(x => x.InstitutionContractId, flag.InstitutionContractId);
+        
+        await _collection.ReplaceOneAsync(filter, flag);
+    }
+
+    public async Task<bool> IsContractSent(long contractId)
+    {
+        var flag = await GetByContractId(contractId);
+        return flag != null && flag.IsSent;
+    }
+
+    public async Task Remove(long contractId)
+    {
+        var filter = Builders<InstitutionContractSendFlag>.Filter
+            .Eq(x => x.InstitutionContractId, contractId);
+        
+        await _collection.DeleteOneAsync(filter);
+    }
+    
+}
+

CompanyManagment.App.Contracts/AuthorizedBankDetails/IAuthorizedBankDetailsApplication.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using _0_Framework.Application;
 using Company.Application.Contracts.AuthorizedBankDetails;
 
-namespace Company.Application.Contracts.AuthorizedBankDetails
+namespace CompanyManagment.App.Contracts.AuthorizedBankDetails
 {
     public interface IAuthorizedBankDetailsApplication
     {

CompanyManagment.App.Contracts/FinancialInvoice/CreateFinancialInvoice.cs

@@ -8,7 +8,7 @@ public class CreateFinancialInvoice
     public double Amount { get; set; }
     public long ContractingPartyId { get; set; }
     public string Description { get; set; }
-    public List<CreateFinancialInvoiceItem>? Items { get; set; }
+    public List<CreateFinancialInvoiceItem> Items { get; set; }
 }
 
 public class CreateFinancialInvoiceItem

CompanyManagment.App.Contracts/FinancialInvoice/EditFinancialInvoice.cs

@@ -10,7 +10,8 @@ public class EditFinancialInvoice
     public double Amount { get; set; }
     public FinancialInvoiceStatus Status  { get; set; }
     
-    public List<EditFinancialInvoiceItem>? Items { get; set; }
+    public List<EditFinancialInvoiceItem> Items { get; set; }
+    public long ContractingPartyId { get; set; }
 }
 
 public class EditFinancialInvoiceItem

CompanyManagment.App.Contracts/FinancialStatment/IFinancialStatmentApplication.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using CompanyManagment.App.Contracts.SepehrPaymentGateway;
 
 namespace CompanyManagment.App.Contracts.FinancialStatment;
 
@@ -62,7 +63,17 @@ public interface IFinancialStatmentApplication
     /// <returns></returns>
     Task<FinancialStatmentDetailsByContractingPartyViewModel> GetDetailsByContractingParty(long contractingPartyId,
         FinancialStatementSearchModel searchModel);
+
+    /// <summary>
+    /// پردازش شارژ حساب از طریق درگاه پرداخت سپهر
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="gateWayCallBackUrl">مسیر برگشت درگاه پرداخت</param>
+    /// 
+    Task<OperationResult<CreateSepehrPaymentGatewayResponse>> CreatePaymentGateWayAndCreateInvoice(
+        CreateFinancialPayRequest request, string gateWayCallBackUrl);
 }
+public record CreateFinancialPayRequest(long Id,  string BaseUrl);
 
 public class FinancialStatmentDetailsByContractingPartyViewModel
 {

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListItemsViewModel.cs

@@ -96,6 +96,8 @@ public class GetInstitutionContractListItemsViewModel
     /// مبلغ قسط
     /// </summary>
     public double InstallmentAmount { get; set; }
+
+    public bool InstitutionContractIsSentFlag { get; set; }
 }
 
 public class InstitutionContractListWorkshop

CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

@@ -5,8 +5,10 @@ using System.Drawing;
 using System.Linq;
 using System.Threading.Tasks;
 using _0_Framework.Application;
+using _0_Framework.Application.Enums;
 using _0_Framework.Application.Sms;
 using CompanyManagment.App.Contracts.Checkout;
+using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.App.Contracts.WorkshopPlan;
@@ -26,21 +28,21 @@ public interface IInstitutionContractApplication
     /// <param name="command">اطلاعات قرارداد جدید</param>
     /// <returns>نتیجه عملیات</returns>
     OperationResult Create(CreateInstitutionContract command);
-    
+
     /// <summary>
     /// تمدید قرارداد موجود
     /// </summary>
     /// <param name="command">اطلاعات قرارداد برای تمدید</param>
     /// <returns>نتیجه عملیات</returns>
     OperationResult Extension(CreateInstitutionContract command);
-    
+
     /// <summary>
     /// ویرایش قرارداد موجود
     /// </summary>
     /// <param name="command">اطلاعات جدید قرارداد</param>
     /// <returns>نتیجه عملیات</returns>
     OperationResult Edit(EditInstitutionContract command);
-    
+
     /// <summary>
     /// دریافت جزئیات قرارداد برای ویرایش
     /// </summary>
@@ -54,7 +56,7 @@ public interface IInstitutionContractApplication
     /// <param name="searchModel">مدل جستجو</param>
     /// <returns>لیست قراردادها</returns>
     List<InstitutionContractViewModel> Search(InstitutionContractSearchModel searchModel);
-    
+
     /// <summary>
     /// جستجوی جدید در قراردادها
     /// </summary>
@@ -76,7 +78,7 @@ public interface IInstitutionContractApplication
     /// <param name="id">لیست شناسه قراردادها</param>
     /// <returns>لیست قراردادها برای چاپ</returns>
     List<InstitutionContractViewModel> PrintAll(List<long> id);
-    
+
 
     [Obsolete("استفاده نشود، از متد غیرهمزمان استفاده شود")]
     /// <summary>
@@ -191,32 +193,56 @@ public interface IInstitutionContractApplication
     /// <param name="command"></param>
     /// <returns></returns>
     Task<OperationResult> EditAsync(EditInstitutionContractRequest command);
-    
+
-    
+
     /// <summary>
     /// دریافت لیست طرف حساب هایی که ثبت نام آنها تکمیل شده
     /// جهت نمایش در کارپوشه
     /// </summary>
     /// <returns></returns>
     Task<List<RegistrationWorkflowMainListViewModel>> RegistrationWorkflowMainList();
+
     /// <summary>
     /// دریافت آیتم های کارپوشه ثبت نام
     /// </summary>
     /// <param name="institutionContractId"></param>
     /// <returns></returns>
     Task<List<RegistrationWorkflowItemsViewModel>> RegistrationWorkflowItems(long institutionContractId);
-    
-    
 
     #endregion
-    
+
     Task<GetInstitutionVerificationDetailsViewModel> GetVerificationDetails(Guid id);
     Task<OperationResult<OtpResultViewModel>> SendVerifyOtp(Guid id);
     Task<OperationResult<string>> VerifyOtpAndMakeGateway(Guid publicId, string code, string callbackUrl);
     Task<InstitutionContractWorkshopDetailViewModel> GetWorkshopInitialDetails(long workshopDetailsId);
     InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request);
     InstitutionContractDiscountResponse ResetDiscountCreate(InstitutionContractResetDiscountForCreateRequest request);
-    
+
+    #region Creation
+
+    /// <summary>
+    /// تب ایجاد قرارداد مؤسسه - احراز هویت
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    Task<InstitutionContractCreationInquiryResult> CreationInquiry(InstitutionContractCreationInquiryRequest request);
+
+    /// <summary>
+    /// تب ایجاد قرارداد مؤسسه -مشخصات طرف قرارداد و انتخاب کارگاه ها
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    Task<InstitutionContractCreationWorkshopsResponse> GetCreationWorkshops(
+        InstitutionContractCreationWorkshopsRequest request);
+    /// <summary>
+    /// تب ایجاد قرارداد مؤسسه - مالی
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    Task<InstitutionContractCreationPlanResponse> GetCreationInstitutionPlan(InstitutionContractCreationPlanRequest request);
+
+    #endregion
+
     #region Extension
 
     Task<InstitutionContractExtensionInquiryResult> GetExtensionInquiry(long previousContractId);
@@ -229,25 +255,31 @@ public interface IInstitutionContractApplication
 
     Task<InstitutionContractExtensionPaymentResponse> GetExtensionPaymentMethod(
         InstitutionContractExtensionPaymentRequest request);
-    
+
     Task<InstitutionContractDiscountResponse> SetDiscountForExtension(
         InstitutionContractSetDiscountForExtensionRequest request);
+
     Task<InstitutionContractDiscountResponse> ResetDiscountForExtension(
         InstitutionContractResetDiscountForExtensionRequest request);
-    
+
 
     Task<OperationResult> ExtensionComplete(InstitutionContractExtensionCompleteRequest request);
-    Task<List<InstitutionContractSelectListViewModel>> GetInstitutionContractSelectList(string search,string selected);
+    Task<List<InstitutionContractSelectListViewModel>> GetInstitutionContractSelectList(string search, string selected);
 
     #endregion
 
     #region Upgrade (Amendment)
 
     Task<InstitutionContractAmendmentWorkshopsResponse> GetAmendmentWorkshops(long institutionContractId);
-    Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request);
+
+    Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(
+        InstitutionContractAmendmentTempWorkshopViewModel request);
+
     Task RemoveAmendmentWorkshops(Guid workshopTempId);
-    Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(InsitutionContractAmendmentPaymentRequest request);
+
-    
+    Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(
+        InsitutionContractAmendmentPaymentRequest request);
+
     #endregion
 
     Task<OperationResult> ResendVerifyLink(long institutionContractId);
@@ -259,8 +291,9 @@ public interface IInstitutionContractApplication
     /// <returns></returns>
     Task<InstitutionContractPrintViewModel> PrintOneAsync(long id);
 
-    Task<OperationResult> SetPendingWorkflow(long entityId,InstitutionContractSigningType signingType);
+    Task<OperationResult> SetPendingWorkflow(long entityId, InstitutionContractSigningType signingType);
     Task<long> GetIdByInstallmentId(long installmentId);
+
     /// <summary>
     /// تایید قرارداد مالی به صورت دستی
     /// </summary>
@@ -268,4 +301,50 @@ public interface IInstitutionContractApplication
     /// <returns></returns>
     Task<OperationResult> VerifyInstitutionContractManually(long institutionContractId);
 
+    Task<InstitutionContractCreationPaymentResponse> GetCreationPaymentMethod(InstitutionContractCreationPaymentRequest request);
+    Task<InstitutionContractDiscountResponse> SetDiscountForCreation(InstitutionContractSetDiscountForCreationRequest request);
+    Task<InstitutionContractDiscountResponse> ResetDiscountForCreation(InstitutionContractResetDiscountForExtensionRequest request);
+    Task<OperationResult> CreationComplete(InstitutionContractExtensionCompleteRequest request);
+
+    /// <summary>
+    /// تعیین فلگ ارسال قرارداد در MongoDB
+    /// اگر فلگ وجود نداشتن‌د ایجاد می‌کند
+    /// </summary>
+    /// <param name="request">درخواست تعیین فلگ</param>
+    /// <returns>نتیجه عملیات</returns>
+    Task<OperationResult> SetContractSendFlag(SetInstitutionContractSendFlagRequest request);
+}
+
+public class CreationSetContractingPartyResponse
+{
+    public long RepresentativeId { get; set; }
+}
+
+public class InstitutionContractCreationWorkshopsResponse
+{
+    public List<WorkshopTempViewModel> WorkshopTemps { get; set; }
+    public string TotalAmount { get; set; }
+}
+
+public class InstitutionContractCreationWorkshopsRequest
+{
+    public Guid TempId { get; set; }
+    public string City { get; set; }
+    public string Province { get; set; }
+    public string Address { get; set; }
+    public List<EditContactInfo> ContactInfos { get; set; }
+
+    /// <summary>
+    /// اطلاعات شخص حقیقی
+    /// </summary>
+    public CreateInstitutionContractRealPartyRequest RealParty { get; set; }
+
+    /// <summary>
+    /// اطلاعات شخص حقوقی
+    /// </summary>
+    public CreateInstitutionContractLegalPartyRequest LegalParty { get; set; }
+
+    public LegalType LegalType { get; set; }
+
+    public long RepresentativeId { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractCreationInquiryRequest.cs

@@ -0,0 +1,11 @@
+using _0_Framework.Application.Enums;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractCreationInquiryRequest
+{
+    public string NationalCode { get; set; }
+    public string DateOfBirth { get; set; }
+    public string Mobile { get; set; }
+    public LegalType LegalType { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionCompleteRequest.cs

@@ -3,6 +3,13 @@ using System;
 namespace CompanyManagment.App.Contracts.InstitutionContract;
 
 public class InstitutionContractExtensionCompleteRequest
+{
+    public Guid TemporaryId { get; set; }
+    public bool IsInstallment { get; set; }
+    public long LawId { get; set; }
+}
+
+public class InstitutionContractCreationCompleteRequest
 {
     public Guid TemporaryId { get; set; }
     public bool IsInstallment { get; set; }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionInquiryResult.cs

@@ -24,4 +24,21 @@ public class InstitutionContractExtensionInquiryResult
     public string Province { get; set; }
     public List<EditContactInfo> ContactInfoViewModels { get; set; }
     public long RepresentativeId { get; set; }
+}
+
+public class InstitutionContractCreationInquiryResult
+{
+    /// <summary>
+    /// اطلاعات شخص حقیقی
+    /// </summary>
+    public CreateInstitutionContractRealPartyRequest RealParty { get; set; }
+    
+    /// <summary>
+    /// اطلاعات شخص حقوقی
+    /// </summary>
+    public CreateInstitutionContractLegalPartyRequest LegalParty { get; set; }
+
+    public LegalType LegalType { get; set; }
+    
+    public Guid TempId { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionPaymentRequest.cs

@@ -3,6 +3,11 @@ using System;
 namespace CompanyManagment.App.Contracts.InstitutionContract;
 
 public class InstitutionContractExtensionPaymentRequest
+{
+    public InstitutionContractDuration Duration { get; set; }
+    public Guid TempId { get; set; }
+}
+public class InstitutionContractCreationPaymentRequest
 {
     public InstitutionContractDuration Duration { get; set; }
     public Guid TempId { get; set; }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionPaymentResponse.cs

@@ -5,4 +5,11 @@ public class InstitutionContractExtensionPaymentResponse
     public InstitutionContractPaymentOneTimeViewModel OneTime { get; set; }
     public InstitutionContractPaymentMonthlyViewModel Monthly { get; set; }
     
+}
+
+public class InstitutionContractCreationPaymentResponse
+{
+    public InstitutionContractPaymentOneTimeViewModel OneTime { get; set; }
+    public InstitutionContractPaymentMonthlyViewModel Monthly { get; set; }
+    
 }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionPlanRequest.cs

@@ -5,6 +5,13 @@ using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 namespace CompanyManagment.App.Contracts.InstitutionContract;
 
 public class InstitutionContractExtensionPlanRequest
+{
+    public List<WorkshopTempViewModel> WorkshopTemps { get; set; }
+    public string TotalAmount { get; set; }
+    public Guid TempId { get; set; }
+}
+
+public class InstitutionContractCreationPlanRequest
 {
     public List<WorkshopTempViewModel> WorkshopTemps { get; set; }
     public string TotalAmount { get; set; }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionPlanResponse.cs

@@ -7,7 +7,18 @@ public class InstitutionContractExtensionPlanResponse
     public InstitutionContractExtensionPlanDetail SixMonths { get; set; }
     public InstitutionContractExtensionPlanDetail TwelveMonths { get; set; }
 }
-public class InstitutionContractExtensionPlanDetail
+public class InstitutionContractExtensionPlanDetail:InstitutionContractCreationPlanDetail
+{
+}
+
+public class InstitutionContractCreationPlanResponse
+{
+    public InstitutionContractCreationPlanDetail OneMonth { get; set; }
+    public InstitutionContractCreationPlanDetail ThreeMonths { get; set; }
+    public InstitutionContractCreationPlanDetail SixMonths { get; set; }
+    public InstitutionContractCreationPlanDetail TwelveMonths { get; set; }
+}   
+public class InstitutionContractCreationPlanDetail
 {
     public string ContractStart { get; set; }
     public string ContractEnd { get; set; }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPaymentOneTimeViewModel.cs

@@ -33,5 +33,5 @@ public class InstitutionContractPaymentOneTimeViewModel
 }
 public class InstitutionContractPaymentMonthlyViewModel:InstitutionContractPaymentOneTimeViewModel
 {
-    public List<MonthlyInstallment> Installments { get; set; }
+    public List<MonthlyInstallment> Installments { get; set; } = [];
 }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractResetDiscountForExtensionRequest.cs

@@ -3,6 +3,11 @@ using System;
 namespace CompanyManagment.App.Contracts.InstitutionContract;
 
 public class InstitutionContractResetDiscountForExtensionRequest
+{
+    public Guid TempId { get; set; }
+    public bool IsInstallment { get; set; }
+}
+public class InstitutionContractResetCreationForExtensionRequest
 {
     public Guid TempId { get; set; }
     public bool IsInstallment { get; set; }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractSetDiscountForExtensionRequest.cs

@@ -3,6 +3,13 @@ using System;
 namespace CompanyManagment.App.Contracts.InstitutionContract;
 
 public class InstitutionContractSetDiscountForExtensionRequest
+{
+    public Guid TempId { get; set; }
+    public int DiscountPercentage { get; set; }
+    public double TotalAmount { get; set; }
+    public bool IsInstallment { get; set; }
+}
+public class InstitutionContractSetDiscountForCreationRequest
 {
     public Guid TempId { get; set; }
     public int DiscountPercentage { get; set; }

CompanyManagment.App.Contracts/InstitutionContract/SetInstitutionContractSendFlagRequest.cs

@@ -0,0 +1,19 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+/// <summary>
+/// درخواست برای تعیین فلگ ارسال قرارداد
+/// </summary>
+public class SetInstitutionContractSendFlagRequest
+{
+    /// <summary>
+    /// شناسه قرارداد
+    /// </summary>
+    public long InstitutionContractId { get; set; }
+
+    /// <summary>
+    /// آیا قرارداد ارسال شده است
+    /// </summary>
+    public bool IsSent { get; set; }
+    
+}
+

CompanyManagment.App.Contracts/InstitutionContract/SmsListData.cs

@@ -94,4 +94,29 @@ public class BlockSmsListData
     /// آی دی صورت حساب مالی
     /// </summary>
     public string AproveId { get; set; }
+
+    /// <summary>
+    /// آیا قرداد مالی قدیمی است
+    /// </summary>
+    public bool IsElectronicContract { get; set; }
+
+    /// <summary>
+    /// پابلیک آی دی بخش یک
+    /// </summary>
+    public string Code1 { get; set; }
+
+    /// <summary>
+    /// پابلیک آی دی بخش دو
+    /// </summary>
+    public string Code2 { get; set; }
+}
+
+
+/// <summary>
+/// لیست قراداد های آبی
+/// جهت ارسال هشدار یا اقدام قضائی
+/// </summary>
+public class BlueWarningSmsData
+{
+
 }

CompanyManagment.App.Contracts/PaymentCallback/IPaymentCallbackHandler.cs

@@ -0,0 +1,21 @@
+using _0_Framework.Application;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace CompanyManagment.App.Contracts.PaymentCallback;
+
+/// <summary>
+/// رابط برای مدیریت Callback درگاه‌های پرداخت
+/// </summary>
+public interface IPaymentCallbackHandler
+{
+    /// <summary>
+    /// تأیید و پردازش callback درگاه پرداخت سپهر
+    /// </summary>
+    /// <param name="command">داده‌های callback درگاه</param>
+    /// <param name="cancellationToken">توکن لغو عملیات</param>
+    /// <returns>نتیجه عملیات</returns>
+    Task<OperationResult> VerifySepehrPaymentCallback(VerifyPaymentCallbackCommand command,
+        CancellationToken cancellationToken = default);
+}
+

CompanyManagment.App.Contracts/PaymentCallback/VerifyPaymentCallbackCommand.cs

@@ -0,0 +1,53 @@
+namespace CompanyManagment.App.Contracts.PaymentCallback;
+
+/// <summary>
+/// دستور تأیید callback درگاه پرداخت
+/// </summary>
+public class VerifyPaymentCallbackCommand
+{
+    /// <summary>
+    /// کد پاسخ درگاه (0 = موفق)
+    /// </summary>
+    public int ResponseCode { get; set; }
+
+    /// <summary>
+    /// شناسه فاکتور/تراکنش
+    /// </summary>
+    public long InvoiceId { get; set; }
+
+    /// <summary>
+    /// داده‌های اضافی JSON
+    /// </summary>
+    public string Payload { get; set; }
+
+    /// <summary>
+    /// مبلغ تراکنش
+    /// </summary>
+    public long Amount { get; set; }
+
+    /// <summary>
+    /// شماره پیگیری درگاه
+    /// </summary>
+    public long TraceNumber { get; set; }
+
+    /// <summary>
+    /// شماره سند بانکی (RRN)
+    /// </summary>
+    public long Rrn { get; set; }
+
+    /// <summary>
+    /// رسید دیجیتال
+    /// </summary>
+    public string DigitalReceipt { get; set; }
+
+    /// <summary>
+    /// بانک صادر کننده کارت
+    /// </summary>
+    public string IssuerBank { get; set; }
+
+    /// <summary>
+    /// شماره کارت
+    /// </summary>
+    public string CardNumber { get; set; }
+}
+

CompanyManagment.App.Contracts/PersonalContractingParty/IPersonalContractingPartyApp.cs

@@ -132,4 +132,5 @@ public interface IPersonalContractingPartyApp
 
     #endregion
 
+    Task<long> GetRepresentativeIdByNationalCode(string nationalCode);
 }

CompanyManagment.App.Contracts/SepehrPaymentGateway/CreateSepehrPaymentGatewayResponse.cs

@@ -0,0 +1,22 @@
+namespace CompanyManagment.App.Contracts.SepehrPaymentGateway;
+
+/// <summary>
+/// پاسخ ایجاد درگاه پرداخت سپهر
+/// </summary>
+public class CreateSepehrPaymentGatewayResponse
+{
+    /// <summary>
+    /// توکن درگاه
+    /// </summary>
+    public string Token { get; set; }
+
+    /// <summary>
+    /// شناسه تراکنش
+    /// </summary>
+    public long TransactionId { get; set; }
+
+    /// <summary>
+    /// URL درگاه پرداخت
+    /// </summary>
+    public string PaymentUrl { get; set; }
+}

CompanyManagment.App.Contracts/SepehrPaymentGateway/ISepehrPaymentGatewayService.cs

@@ -0,0 +1,32 @@
+using _0_Framework.Application;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace CompanyManagment.App.Contracts.SepehrPaymentGateway;
+
+/// <summary>
+/// رابط برای سرویس مشترک ایجاد درگاه پرداخت سپهر
+/// </summary>
+public interface ISepehrPaymentGatewayService
+{
+    /// <summary>
+    /// ایجاد درگاه پرداخت سپهر برای یک تراکنش
+    /// </summary>
+    /// <param name="amount">مبلغ</param>
+    /// <param name="contractingPartyId">شناسه طرف قرارداد</param>
+    /// <param name="frontCallbackUrl">آدرس بازگشتی به فرانت برای نمایش نتیجه</param>
+    /// <param name="gatewayCallbackUrl">آدرس بازگشتی درگاه پرداخت</param>
+    /// <param name="financialInvoiceId">شناسه فاکتور مالی (اختیاری) - این پارامتر مستقیماً به درگاه فرستاده می‌شود</param>
+    /// <param name="extraData">داده‌های اضافی سفارشی برای payload (اختیاری)</param>
+    /// <param name="cancellationToken">توکن لغو</param>
+    /// <returns>شامل Token درگاه یا OperationResult با خطا</returns>
+    Task<OperationResult<CreateSepehrPaymentGatewayResponse>> CreateSepehrPaymentGateway(
+        double amount,
+        long contractingPartyId,
+        long financialInvoiceId,
+        string gatewayCallbackUrl,
+        string frontCallbackUrl="https://client.gozareshgir.ir",
+        Dictionary<string, object> extraData = null,
+        CancellationToken cancellationToken = default);
+}

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

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

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

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

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

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

CompanyManagment.App.Contracts/SmsResult/ISmsResultApplication.cs

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

CompanyManagment.Application/AuthorizedBankDetailsApplication.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using _0_Framework.Application;
 using Company.Application.Contracts.AuthorizedBankDetails;
 using Company.Domain.AuthorizedBankDetailsAgg;
+using CompanyManagment.App.Contracts.AuthorizedBankDetails;
 
 namespace CompanyManagment.Application
 {

CompanyManagment.Application/FinancialInvoiceApplication.cs

@@ -9,15 +9,13 @@ using CompanyManagment.EFCore;
 
 namespace CompanyManagment.Application;
 
-public class FinancialInvoiceApplication : RepositoryBase<long, FinancialInvoice>, IFinancialInvoiceApplication
+public class FinancialInvoiceApplication : IFinancialInvoiceApplication
 {
     private readonly IFinancialInvoiceRepository _financialInvoiceRepository;
-    private readonly CompanyContext _context;
 
-    public FinancialInvoiceApplication(IFinancialInvoiceRepository financialInvoiceRepository, CompanyContext context) : base(context)
+    public FinancialInvoiceApplication(IFinancialInvoiceRepository financialInvoiceRepository)
     {
         _financialInvoiceRepository = financialInvoiceRepository;
-        _context = context;
     }
 
     public OperationResult Create(CreateFinancialInvoice command)
@@ -185,6 +183,7 @@ public class FinancialInvoiceApplication : RepositoryBase<long, FinancialInvoice
     {
         return _financialInvoiceRepository.Search(searchModel);
     }
+    
 
     //public OperationResult Remove(long id)
     //{

CompanyManagment.Application/FinancialStatmentApplication.cs

@@ -3,9 +3,12 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using Company.Domain.ContarctingPartyAgg;
+using Company.Domain.FinancialInvoiceAgg;
 using Company.Domain.FinancialStatmentAgg;
+using CompanyManagment.App.Contracts.FinancialInvoice;
 using CompanyManagment.App.Contracts.FinancialStatment;
 using CompanyManagment.App.Contracts.FinancilTransaction;
+using CompanyManagment.App.Contracts.SepehrPaymentGateway;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Mvc;
 
@@ -16,12 +19,20 @@ public class FinancialStatmentApplication : IFinancialStatmentApplication
     private readonly IFinancialStatmentRepository _financialStatmentRepository;
     private readonly IFinancialTransactionApplication _financialTransactionApplication;
     private readonly IPersonalContractingPartyRepository _contractingPartyRepository;
+    private readonly IFinancialInvoiceRepository _financialInvoiceRepository;
+    private readonly ISepehrPaymentGatewayService _sepehrPaymentGatewayService;
 
-    public FinancialStatmentApplication(IFinancialStatmentRepository financialStatmentRepository, IFinancialTransactionApplication financialTransactionApplication, IPersonalContractingPartyRepository contractingPartyRepository)
+    public FinancialStatmentApplication(IFinancialStatmentRepository financialStatmentRepository,
+        IFinancialTransactionApplication financialTransactionApplication,
+        IPersonalContractingPartyRepository contractingPartyRepository,
+        IFinancialInvoiceRepository financialInvoiceRepository,
+        ISepehrPaymentGatewayService sepehrPaymentGatewayService)
     {
         _financialStatmentRepository = financialStatmentRepository;
         _financialTransactionApplication = financialTransactionApplication;
         _contractingPartyRepository = contractingPartyRepository;
+        _financialInvoiceRepository = financialInvoiceRepository;
+        _sepehrPaymentGatewayService = sepehrPaymentGatewayService;
     }
 
     public OperationResult CreateFromBankGateway(CreateFinancialStatment command)
@@ -51,7 +62,6 @@ public class FinancialStatmentApplication : IFinancialStatmentApplication
             if (createTransaction.IsSuccedded)
                 return op.Succcedded();
             return op.Failed("خطا در انجام عملیات");
-
         }
         else
         {
@@ -71,8 +81,6 @@ public class FinancialStatmentApplication : IFinancialStatmentApplication
                 Balance = 0,
                 TypeOfTransaction = command.TypeOfTransaction,
                 DescriptionOption = command.DescriptionOption
-
-
             };
             var createTransaction = _financialTransactionApplication.Create(transaction);
             if (createTransaction.IsSuccedded)
@@ -98,22 +106,22 @@ public class FinancialStatmentApplication : IFinancialStatmentApplication
         {
             debtor = 0;
             creditor = command.CreditorString.MoneyToDouble();
-            
         }
         else if (command.TypeOfTransaction == "debt")
         {
             creditor = 0;
             debtor = command.DeptorString.MoneyToDouble();
-             
         }
 
         if (!command.TdateFa.TryToGeorgianDateTime(out var tDateGr))
         {
             return op.Failed("تاریخ وارد شده صحیح نمی باشد");
         }
+
         if (_financialStatmentRepository.Exists(x => x.ContractingPartyId == command.ContractingPartyId))
         {
-            var financialStatment = _financialStatmentRepository.GetDetailsByContractingPartyId(command.ContractingPartyId);
+            var financialStatment =
+                _financialStatmentRepository.GetDetailsByContractingPartyId(command.ContractingPartyId);
             var transaction = new CreateFinancialTransaction()
             {
                 FinancialStatementId = financialStatment.Id,
@@ -124,20 +132,15 @@ public class FinancialStatmentApplication : IFinancialStatmentApplication
                 Creditor = creditor,
                 TypeOfTransaction = command.TypeOfTransaction,
                 DescriptionOption = command.DescriptionOption
-     
-
-
             };
-      
+
-           var createTransaction = _financialTransactionApplication.Create(transaction);
+            var createTransaction = _financialTransactionApplication.Create(transaction);
             if (createTransaction.IsSuccedded)
                 return op.Succcedded();
             return op.Failed("خطا در انجام عملیات");
-
         }
         else
         {
-
             var statement = new FinancialStatment(command.ContractingPartyId, command.ContractingPartyName);
             _financialStatmentRepository.Create(statement);
             _financialStatmentRepository.SaveChanges();
@@ -153,20 +156,14 @@ public class FinancialStatmentApplication : IFinancialStatmentApplication
                 Balance = 0,
                 TypeOfTransaction = command.TypeOfTransaction,
                 DescriptionOption = command.DescriptionOption
-
-
             };
             var createTransaction = _financialTransactionApplication.Create(transaction);
             if (createTransaction.IsSuccedded)
                 return op.Succcedded();
             return op.Failed("خطا در انجام عملیات");
-
         }
-           
     }
 
-       
- 
 
     public List<FinancialStatmentViewModel> Search(FinancialStatmentSearchModel searchModel)
     {
@@ -203,6 +200,45 @@ public class FinancialStatmentApplication : IFinancialStatmentApplication
     public async Task<FinancialStatmentDetailsByContractingPartyViewModel> GetDetailsByContractingParty(
         long contractingPartyId, FinancialStatementSearchModel searchModel)
     {
-        return await _financialStatmentRepository.GetDetailsByContractingParty(contractingPartyId,searchModel);
+        return await _financialStatmentRepository.GetDetailsByContractingParty(contractingPartyId, searchModel);
+    }
+
+    public async Task<OperationResult<CreateSepehrPaymentGatewayResponse>> CreatePaymentGateWayAndCreateInvoice(
+        CreateFinancialPayRequest request, string gateWayCallBackUrl)
+    {
+        var op = new OperationResult<CreateSepehrPaymentGatewayResponse>();
+        // گام 1: دریافت موجودی حساب
+        var balanceAmount = await GetBalanceAmount(request.Id);
+        if (balanceAmount.Amount <= 0)
+        {
+            return op.Failed("موجودی حساب شما صفر است");
+        }
+        // گام 2: ایجاد درگاه پرداخت سپهر
+
+        var financialInvoice = await _financialInvoiceRepository
+            .GetUnPaidFinancialInvoiceByContractingPartyIdAndAmount(balanceAmount.ContractingPartyId,
+                balanceAmount.Amount);
+
+        if (financialInvoice == null)
+        {
+            financialInvoice = new FinancialInvoice(balanceAmount.Amount, balanceAmount.ContractingPartyId,
+                "پرداخت بدهی صورت حساب مالی");
+
+            var items = new FinancialInvoiceItem("پرداخت بدهی صورت حساب مالی", balanceAmount.Amount,
+                financialInvoice.id, FinancialInvoiceItemType.PreviousDebt, 0);
+            financialInvoice.AddItem(items);
+            await _financialInvoiceRepository.CreateAsync(financialInvoice);
+            await _financialInvoiceRepository.SaveChangesAsync();
+        }
+
+        var gatewayResult = await _sepehrPaymentGatewayService.CreateSepehrPaymentGateway(
+            amount: balanceAmount.Amount,
+            contractingPartyId: balanceAmount.ContractingPartyId,
+            frontCallbackUrl: request.BaseUrl,
+            gatewayCallbackUrl: gateWayCallBackUrl,
+            financialInvoiceId: financialInvoice.id,
+            extraData: null);
+
+        return gatewayResult;
     }
 }

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -1,40 +1,33 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Net.Http;
-using System.Threading;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Application.Enums;
 using _0_Framework.Application.PaymentGateway;
 using _0_Framework.Application.Sms;
-using _0_Framework.Application.UID;
 using _0_Framework.Exceptions;
 using AccountManagement.Application.Contracts.Account;
 using Company.Domain.ContarctingPartyAgg;
-using Company.Domain.EmployeeAgg;
 using Company.Domain.empolyerAgg;
 using Company.Domain.FinancialInvoiceAgg;
 using Company.Domain.FinancialStatmentAgg;
 using Company.Domain.FinancialTransactionAgg;
 using Company.Domain.InstitutionContractAgg;
-using Company.Domain.LeftWorkAgg;
 using Company.Domain.PaymentTransactionAgg;
 using Company.Domain.RepresentativeAgg;
 using Company.Domain.RollCallServiceAgg;
-using Company.Domain.TemporaryClientRegistrationAgg;
 using Company.Domain.WorkshopAgg;
+using Company.Domain.InstitutionContractSendFlagAgg;
 using CompanyManagment.App.Contracts.FinancialInvoice;
 using CompanyManagment.App.Contracts.FinancialStatment;
 using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
 using CompanyManagment.App.Contracts.PaymentTransaction;
-using CompanyManagment.App.Contracts.PersonalContractingParty;
+using CompanyManagment.App.Contracts.SepehrPaymentGateway;
 using CompanyManagment.App.Contracts.Workshop;
-using CompanyManagment.EFCore.Migrations;
+using Microsoft.Extensions.Logging;
-using Microsoft.AspNetCore.Mvc;
-using OfficeOpenXml.Packaging.Ionic.Zip;
 using PersianTools.Core;
 using ConnectedPersonnelViewModel = CompanyManagment.App.Contracts.Workshop.ConnectedPersonnelViewModel;
 using FinancialStatment = Company.Domain.FinancialStatmentAgg.FinancialStatment;
@@ -49,49 +42,48 @@ public class InstitutionContractApplication : IInstitutionContractApplication
     private readonly IFinancialStatmentApplication _financialStatmentApplication;
     private readonly IEmployerRepository _employerRepository;
     private readonly IWorkshopRepository _workshopRepository;
-    private readonly ILeftWorkRepository _leftWorkRepository;
     private readonly IWorkshopApplication _workshopApplication;
-    private readonly IContractingPartyTempRepository _contractingPartyTempRepository;
     private readonly IFinancialStatmentRepository _financialStatmentRepository;
     private readonly IContactInfoApplication _contactInfoApplication;
     private readonly IAccountApplication _accountApplication;
     private readonly ISmsService _smsService;
-    private readonly IUidService _uidService;
     private readonly IFinancialInvoiceRepository _financialInvoiceRepository;
     private readonly IPaymentGateway _paymentGateway;
     private readonly IPaymentTransactionRepository _paymentTransactionRepository;
     private readonly IRollCallServiceRepository _rollCallServiceRepository;
+    private readonly ISepehrPaymentGatewayService _sepehrPaymentGatewayService;
+    private readonly IInstitutionContractSendFlagRepository _institutionContractSendFlagRepository;
 
 
     public InstitutionContractApplication(IInstitutionContractRepository institutionContractRepository,
         IPersonalContractingPartyRepository contractingPartyRepository,
         IRepresentativeRepository representativeRepository, IEmployerRepository employerRepository,
-        IWorkshopRepository workshopRepository, ILeftWorkRepository leftWorkRepository,
+        IWorkshopRepository workshopRepository,
         IFinancialStatmentApplication financialStatmentApplication, IWorkshopApplication workshopApplication,
-        IContractingPartyTempRepository contractingPartyTempRepository,
         IFinancialStatmentRepository financialStatmentRepository, IContactInfoApplication contactInfoApplication,
-        IAccountApplication accountApplication, ISmsService smsService, IUidService uidService,
+        IAccountApplication accountApplication, ISmsService smsService,
         IFinancialInvoiceRepository financialInvoiceRepository, IHttpClientFactory httpClientFactory,
-        IPaymentTransactionRepository paymentTransactionRepository, IRollCallServiceRepository rollCallServiceRepository)
+        IPaymentTransactionRepository paymentTransactionRepository, IRollCallServiceRepository rollCallServiceRepository,
+        ISepehrPaymentGatewayService sepehrPaymentGatewayService,ILogger<SepehrPaymentGateway> sepehrGatewayLogger,
+        IInstitutionContractSendFlagRepository institutionContractSendFlagRepository)
     {
         _institutionContractRepository = institutionContractRepository;
         _contractingPartyRepository = contractingPartyRepository;
         _representativeRepository = representativeRepository;
         _employerRepository = employerRepository;
         _workshopRepository = workshopRepository;
-        _leftWorkRepository = leftWorkRepository;
         _financialStatmentApplication = financialStatmentApplication;
         _workshopApplication = workshopApplication;
-        _contractingPartyTempRepository = contractingPartyTempRepository;
         _financialStatmentRepository = financialStatmentRepository;
         _contactInfoApplication = contactInfoApplication;
         _accountApplication = accountApplication;
         _smsService = smsService;
-        _uidService = uidService;
         _financialInvoiceRepository = financialInvoiceRepository;
         _paymentTransactionRepository = paymentTransactionRepository;
         _rollCallServiceRepository = rollCallServiceRepository;
-        _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
+        _sepehrPaymentGatewayService = sepehrPaymentGatewayService;
+        _paymentGateway = new SepehrPaymentGateway(httpClientFactory,sepehrGatewayLogger);
+        _institutionContractSendFlagRepository = institutionContractSendFlagRepository;
     }
 
 	public OperationResult Create(CreateInstitutionContract command)
@@ -817,20 +809,11 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         var contractingParty = _contractingPartyRepository.Get(institutionContract.ContractingPartyId);
         if (contractingParty != null)
         {
-            contractingParty.DeActive();
+            var accountsDeActiveRes = _contractingPartyRepository.DeActiveAllAsync(contractingParty.id)
-            _contractingPartyRepository.SaveChanges();
+                .GetAwaiter().GetResult();
-            var employers =
+            
-                _employerRepository.GetEmployerByContracrtingPartyID(institutionContract.ContractingPartyId);
+            if (!accountsDeActiveRes.IsSuccedded)
-            //var employersIdList = employers.Select(x => x.Id).ToList();
+                return opration.Failed(accountsDeActiveRes.Message);
-            //var workshops = _workshopApplication.GetWorkshopsByEmployerId(employersIdList);
-            //foreach (var workshop in workshops)
-            //{
-            //    var res = _workshopApplication.DeActive(workshop.Id);
-            //}
-            foreach (var employer in employers)
-            {
-                var res = _employerRepository.DeActiveAll(employer.Id);
-            }
         }
 
         return opration.Succcedded();
@@ -847,20 +830,10 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         var contractingParty = _contractingPartyRepository.Get(institutionContract.ContractingPartyId);
         if (contractingParty != null)
         {
-            contractingParty.Active();
+           var activeRes =  _contractingPartyRepository.ActiveAllAsync(contractingParty.id).GetAwaiter()
-            _contractingPartyRepository.SaveChanges();
+                .GetResult();
-            var employers =
+              if (!activeRes.IsSuccedded)
-                _employerRepository.GetEmployerByContracrtingPartyID(institutionContract.ContractingPartyId);
+                  return opration.Failed(activeRes.Message);
-            //var employersIdList = employers.Select(x => x.Id).ToList();
-            //var workshops = _workshopApplication.GetWorkshopsByEmployerId(employersIdList);
-            //foreach (var workshop in workshops)
-            //{
-            //    var res = _workshopApplication.DeActive(workshop.Id);
-            //}
-            foreach (var employer in employers)
-            {
-                var res = _employerRepository.ActiveAll(employer.Id);
-            }
         }
 
         return opration.Succcedded();
@@ -925,6 +898,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return opration.Succcedded();
     }
 
+
     public void CreateContractingPartyAccount(long contractingPartyid, long accountId)
     {
         _institutionContractRepository.CreateContractingPartyAccount(contractingPartyid, accountId);
@@ -1294,119 +1268,87 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         if (contractingParty == null)
             throw new NotFoundException("طرف قرارداد یافت نشد");
 
-		if (institutionContract.VerifyCode != code)
+        if (institutionContract.VerifyCode != code)
-			return op.Failed("کد وارد شده صحیح نمی باشد");
+            return op.Failed("کد وارد شده صحیح نمی باشد");
-		
-		var financialStatement =await _financialStatmentRepository.GetByContractingPartyId(contractingParty.id);
 
-		var dbTransaction = await _institutionContractRepository.BeginTransactionAsync();
+        var financialStatement = await _financialStatmentRepository.GetByContractingPartyId(contractingParty.id);
-		FinancialInvoice financialInvoice;
-		FinancialInvoiceItem financialInvoiceItem;
-		var today = DateTime.Today;
-		double invoiceAmount = 0;
-		string invoiceItemDescription = string.Empty;
-		FinancialInvoiceItemType invoiceItemType = FinancialInvoiceItemType.BuyInstitutionContract;
-		long invoiceItemEntityId = 0;
 
-		if (institutionContract.IsInstallment)
+        var dbTransaction = await _institutionContractRepository.BeginTransactionAsync();
-		{
+        FinancialInvoice financialInvoice;
-			var firstInstallment = institutionContract.Installments.First();
+        FinancialInvoiceItem financialInvoiceItem;
-			var firstInstallmentAmount = firstInstallment.Amount;
+        var today = DateTime.Today;
+        double invoiceAmount = 0;
+        string invoiceItemDescription = string.Empty;
+        FinancialInvoiceItemType invoiceItemType = FinancialInvoiceItemType.BuyInstitutionContract;
+        long invoiceItemEntityId = 0;
 
-			financialInvoice = await _financialInvoiceRepository.GetUnPaidByEntityId(firstInstallment.Id, FinancialInvoiceItemType.BuyInstitutionContractInstallment);
+        if (institutionContract.IsInstallment)
-			if (financialInvoice == null)
+        {
-			{
+            var firstInstallment = institutionContract.Installments.First();
-				var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
+            var firstInstallmentAmount = firstInstallment.Amount;
-					"قسط اول سرویس", "debt", "بابت خدمات", firstInstallmentAmount, 0, 0);
-				financialStatement.AddFinancialTransaction(financialTransaction);
-				invoiceAmount = firstInstallmentAmount;
-				invoiceItemDescription = $"پرداخت قسط اول قرارداد شماره {institutionContract.ContractNo}";
-				invoiceItemType = FinancialInvoiceItemType.BuyInstitutionContractInstallment;
-				invoiceItemEntityId = firstInstallment.Id;
-			}
-			else
-			{
-				invoiceAmount = financialInvoice.Amount;
-				invoiceItemDescription = financialInvoice.Items.First().Description;
-				invoiceItemType = financialInvoice.Items.First().Type;
-				invoiceItemEntityId = financialInvoice.Items.First().EntityId;
-			}
-		}
-		else
-		{
-			financialInvoice = await _financialInvoiceRepository.GetUnPaidByEntityId(institutionContract.id, FinancialInvoiceItemType.BuyInstitutionContract);
-			if (financialInvoice == null)
-			{
-				var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
-					"پرداخت کل سرویس", "debt", "بابت خدمات", institutionContract.TotalAmount, 0, 0);
-				financialStatement.AddFinancialTransaction(financialTransaction);
-				invoiceAmount = institutionContract.TotalAmount;
-				invoiceItemDescription = $"پرداخت کل قرارداد شماره {institutionContract.ContractNo}";
-				invoiceItemType = FinancialInvoiceItemType.BuyInstitutionContract;
-				invoiceItemEntityId = institutionContract.id;
-			}
-			else
-			{
-				invoiceAmount = financialInvoice.Amount;
-				invoiceItemDescription = financialInvoice.Items.First().Description;
-				invoiceItemType = financialInvoice.Items.First().Type;
-				invoiceItemEntityId = financialInvoice.Items.First().EntityId;
-			}
-		}
 
-		if (financialInvoice == null)
+            financialInvoice = await _financialInvoiceRepository.GetUnPaidByEntityId(firstInstallment.Id, FinancialInvoiceItemType.BuyInstitutionContractInstallment);
-		{
+            if (financialInvoice == null)
-			financialInvoice = new FinancialInvoice(invoiceAmount, contractingParty.id, $"خرید قرارداد مالی شماره {institutionContract.ContractNo}");
+            {
-			financialInvoiceItem = new FinancialInvoiceItem(invoiceItemDescription, invoiceAmount, 0, invoiceItemType, invoiceItemEntityId);
+                invoiceAmount = firstInstallmentAmount;
-			financialInvoice.AddItem(financialInvoiceItem);
+                invoiceItemDescription = $"پرداخت قسط اول قرارداد شماره {institutionContract.ContractNo}";
-			await _financialInvoiceRepository.CreateAsync(financialInvoice);
+                invoiceItemType = FinancialInvoiceItemType.BuyInstitutionContractInstallment;
-		}
+                invoiceItemEntityId = firstInstallment.Id;
+            }
+            else
+            {
+                invoiceAmount = financialInvoice.Amount;
+                invoiceItemDescription = financialInvoice.Items.First().Description;
+                invoiceItemType = financialInvoice.Items.First().Type;
+                invoiceItemEntityId = financialInvoice.Items.First().EntityId;
+            }
+        }
+        else
+        {
+            financialInvoice = await _financialInvoiceRepository.GetUnPaidByEntityId(institutionContract.id, FinancialInvoiceItemType.BuyInstitutionContract);
+            if (financialInvoice == null)
+            {
+                invoiceAmount = institutionContract.TotalAmount;
+                invoiceItemDescription = $"پرداخت کل قرارداد شماره {institutionContract.ContractNo}";
+                invoiceItemType = FinancialInvoiceItemType.BuyInstitutionContract;
+                invoiceItemEntityId = institutionContract.id;
+            }
+            else
+            {
+                invoiceAmount = financialInvoice.Amount;
+                invoiceItemDescription = financialInvoice.Items.First().Description;
+                invoiceItemType = financialInvoice.Items.First().Type;
+                invoiceItemEntityId = financialInvoice.Items.First().EntityId;
+            }
+        }
 
-		await _financialInvoiceRepository.SaveChangesAsync();
+        if (financialInvoice == null)
+        {
+            financialInvoice = new FinancialInvoice(invoiceAmount, contractingParty.id, $"خرید قرارداد مالی شماره {institutionContract.ContractNo}");
+            financialInvoiceItem = new FinancialInvoiceItem(invoiceItemDescription, invoiceAmount, 0, invoiceItemType, invoiceItemEntityId);
+            financialInvoice.AddItem(financialInvoiceItem);
+            await _financialInvoiceRepository.CreateAsync(financialInvoice);
+        }
 
-		var transaction = new PaymentTransaction(institutionContract.ContractingPartyId, invoiceAmount,
+        await _financialInvoiceRepository.SaveChangesAsync();
-			institutionContract.ContractingPartyName, "https://client.gozareshgir.ir",
-			PaymentTransactionGateWay.SepehrPay);
-		await _paymentTransactionRepository.CreateAsync(transaction);
-		await _financialInvoiceRepository.SaveChangesAsync();
 
-		var createPayment = new CreatePaymentGatewayRequest()
+        // استفاده از سرویس مشترک برای ایجاد درگاه پرداخت
-		{
+        var gatewayResult = await _sepehrPaymentGatewayService.CreateSepehrPaymentGateway(
-			Amount = invoiceAmount,
+            amount: (long)invoiceAmount,
-			TransactionId = transaction.id.ToString(),
+            contractingPartyId: institutionContract.ContractingPartyId,
-			CallBackUrl = callbackUrl,
+            gatewayCallbackUrl: callbackUrl,
-			FinancialInvoiceId = financialInvoice.id,
+            financialInvoiceId: financialInvoice.id,
-		};
+            extraData: null);
-		var gatewayResponse = await _paymentGateway.Create(createPayment);
-		if (!gatewayResponse.IsSuccess)
-			return op.Failed("خطا در ایجاد درگاه پرداخت: " + gatewayResponse.Message + gatewayResponse.ErrorCode);
 
-
+        if (!gatewayResult.IsSuccedded)
-        // institutionContract.SetPendingWorkflow();
+        {
-        //
+            await dbTransaction.RollbackAsync();
-        // var phone = institutionContract.ContactInfoList.FirstOrDefault(x =>
+            return op.Failed(gatewayResult.Message);
-        //     x.SendSms && x.Position == "طرف قرارداد" && x.PhoneType == "شماره همراه");
+        }
-        // if (phone !=null)
-        // {
-        //     var userPass = contractingParty.IsLegal == "حقیقی"
-        //         ? contractingParty.Nationalcode
-        //         : contractingParty.NationalId;
-        //     var createAcc = new RegisterAccount
-        //     {
-        //         Fullname = contractingParty.LName,
-        //         Username = userPass,
-        //         Password = userPass,
-        //         Mobile = phone.PhoneNumber,
-        //         NationalCode = userPass
-        //     };
-        //     var res = _accountApplication.RegisterClient(createAcc);
-        //     if (res.IsSuccedded) 
-        //         CreateContractingPartyAccount(contractingParty.id, res.SendId);
-        // }
 
         await dbTransaction.CommitAsync();
         await _institutionContractRepository.SaveChangesAsync();
-        return op.Succcedded(gatewayResponse.Token);
+        return op.Succcedded(gatewayResult.Data.Token);
     }
 
     public async Task<InstitutionContractWorkshopDetailViewModel> GetWorkshopInitialDetails(long workshopDetailsId)
@@ -1444,6 +1386,22 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return _institutionContractRepository.ResetDiscountCreate(request);
     }
 
+    public Task<InstitutionContractCreationInquiryResult> CreationInquiry(InstitutionContractCreationInquiryRequest request)
+    {
+        return _institutionContractRepository.CreationInquiry(request);
+    }
+
+    public Task<InstitutionContractCreationWorkshopsResponse> GetCreationWorkshops(InstitutionContractCreationWorkshopsRequest request)
+    {
+        return _institutionContractRepository.GetCreationWorkshops(request);
+    }
+
+    public Task<InstitutionContractCreationPlanResponse> GetCreationInstitutionPlan(InstitutionContractCreationPlanRequest request)
+    {
+        return _institutionContractRepository.GetCreationInstitutionPlan(request);
+    }
+
+
     public async Task<InstitutionContractExtensionInquiryResult> GetExtensionInquiry(long previousContractId)
     {
         return await _institutionContractRepository.GetExtensionInquiry(previousContractId);
@@ -1662,6 +1620,28 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return op.Succcedded();
     }
 
+    public Task<InstitutionContractCreationPaymentResponse> GetCreationPaymentMethod(InstitutionContractCreationPaymentRequest request)
+    {
+        return _institutionContractRepository.GetCreationPaymentMethod(request);
+    }
+
+    public Task<InstitutionContractDiscountResponse> SetDiscountForCreation(InstitutionContractSetDiscountForCreationRequest request)
+    {
+        return _institutionContractRepository.SetDiscountForCreation(request);
+    }
+
+    public Task<InstitutionContractDiscountResponse> ResetDiscountForCreation(InstitutionContractResetDiscountForExtensionRequest request)
+    {
+        return _institutionContractRepository.ResetDiscountForCreation(request);
+    }
+
+    public Task<OperationResult> CreationComplete(InstitutionContractExtensionCompleteRequest request)
+    {
+        return _institutionContractRepository.CreationComplete(request);
+    }
+
+  
+
     private async Task<OperationResult<PersonalContractingParty>> CreateLegalContractingPartyEntity(
         CreateInstitutionContractLegalPartyRequest request, long representativeId, string address, string city,
         string state)
@@ -1845,7 +1825,60 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             installments.Add(lastInstallment);
             return installments;
         }
+
+     
     }
+       /// <summary>
+        /// تعیین فلگ ارسال قرارداد
+        /// اگر فلگ وجود نداشتن‌د ایجاد می‌کند
+        /// </summary>
+        public async Task<OperationResult> SetContractSendFlag(SetInstitutionContractSendFlagRequest request)
+        {
+            var operationResult = new OperationResult();
+
+            try
+            {
+                // بازیابی قرارداد از SQL
+                var contract = _institutionContractRepository.Get(request.InstitutionContractId);
+                if (contract == null)
+                    return operationResult.Failed("قرارداد مورد نظر یافت نشد");
+
+                // بررسی اینکه آیا فلگ در MongoDB وجود دارد
+                var existingFlag = await _institutionContractSendFlagRepository
+                    .GetByContractId(request.InstitutionContractId);
+
+                if (existingFlag != null)
+                {
+                    // اگر فلگ وجود داشتن‌د، آن را اپدیت کنیم
+                    if (request.IsSent)
+                    {
+                        existingFlag.MarkAsSent();
+                    }
+                    else
+                    {
+                        existingFlag.MarkAsNotSent();
+                    }
+                    existingFlag.UpdateLastModified();
+                    await _institutionContractSendFlagRepository.Update(existingFlag);
+                }
+                else
+                {
+                    // اگر فلگ وجود ندارد، آن را ایجاد کنیم
+                    var newFlag = new InstitutionContractSendFlag(
+                        request.InstitutionContractId,
+                        request.IsSent
+                    );
+
+                    await _institutionContractSendFlagRepository.Create(newFlag);
+                }
+
+                return operationResult.Succcedded();
+            }
+            catch (Exception ex)
+            {
+                return operationResult.Failed($"خطا در تعیین فلگ ارسال: {ex.Message}");
+            }
+        }
 }
 
 #region CustomViewModels

CompanyManagment.Application/PaymentCallbackHandler.cs

@@ -0,0 +1,239 @@
+using _0_Framework.Application;
+using Company.Domain.PaymentTransactionAgg;
+using CompanyManagment.App.Contracts.FinancialInvoice;
+using CompanyManagment.App.Contracts.FinancialStatment;
+using CompanyManagment.App.Contracts.InstitutionContract;
+using CompanyManagment.App.Contracts.PaymentCallback;
+using CompanyManagment.App.Contracts.PaymentTransaction;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Transactions;
+using _0_Framework.Application.PaymentGateway;
+using Company.Domain.FinancialStatmentAgg;
+using Company.Domain.FinancialTransactionAgg;
+using Company.Domain.InstitutionContractAgg;
+using CompanyManagment.EFCore.Migrations;
+using Microsoft.Extensions.Logging;
+
+namespace CompanyManagment.Application;
+
+public class PaymentCallbackHandler : IPaymentCallbackHandler
+{
+    private readonly IPaymentTransactionApplication _paymentTransactionApplication;
+    private readonly IFinancialStatmentApplication _financialStatmentApplication;
+    private readonly IFinancialStatmentRepository _financialStatmentRepository;
+    private readonly IFinancialInvoiceApplication _financialInvoiceApplication;
+    private readonly IInstitutionContractApplication _institutionContractApplication;
+    private readonly IInstitutionContractRepository _institutionContractRepository;
+    private readonly IPaymentGateway _paymentGateway;
+
+    public PaymentCallbackHandler(
+        IPaymentTransactionApplication paymentTransactionApplication,
+        IFinancialStatmentApplication financialStatmentApplication,
+        IFinancialInvoiceApplication financialInvoiceApplication,
+        IInstitutionContractApplication institutionContractApplication,
+        IHttpClientFactory httpClientFactory, IInstitutionContractRepository institutionContractRepository,
+        IFinancialStatmentRepository financialStatmentRepository,
+        ILogger<SepehrPaymentGateway> sepehrGatewayLogger)
+    {
+        _paymentTransactionApplication = paymentTransactionApplication;
+        _financialStatmentApplication = financialStatmentApplication;
+        _financialInvoiceApplication = financialInvoiceApplication;
+        _institutionContractApplication = institutionContractApplication;
+        _institutionContractRepository = institutionContractRepository;
+        _financialStatmentRepository = financialStatmentRepository;
+        _paymentGateway = new SepehrPaymentGateway(httpClientFactory, sepehrGatewayLogger);
+    }
+
+    /// <summary>
+    /// تأیید و پردازش callback درگاه پرداخت سپهر
+    /// </summary>
+    public async Task<OperationResult> VerifySepehrPaymentCallback(VerifyPaymentCallbackCommand command,
+        CancellationToken cancellationToken = default)
+    {
+        var operation = new OperationResult();
+
+        try
+        {
+            await using var transactionScope =await _financialStatmentRepository.BeginTransactionAsync();
+
+            // گام 1: دریافت اطلاعات تراکنش
+            var transaction = await _paymentTransactionApplication.GetDetails(command.InvoiceId);
+
+            if (transaction == null)
+                return operation.Failed("تراکنش مورد نظر یافت نشد");
+
+            // گام 2: بررسی وضعیت قبلی تراکنش
+            if (transaction.Status != PaymentTransactionStatus.Pending)
+                return operation.Failed("این تراکنش قبلا پرداخت شده است");
+
+            // گام 3: بررسی کد پاسخ درگاه
+            if (command.ResponseCode != 0)
+            {
+                var failResult = _paymentTransactionApplication.SetFailed(command.InvoiceId);
+                return failResult.IsSuccedded
+                    ? operation.Failed("تراکنش توسط درگاه رد شد")
+                    : operation.Failed("خطا در به‌روزرسانی وضعیت تراکنش");
+            }
+
+            // گام 4: استخراج اطلاعات فاکتور مالی
+            var extraData = JsonConvert.DeserializeObject<IDictionary<string, object>>(command.Payload ?? "{}");
+            
+            extraData.TryGetValue("financialInvoiceId", out var financialInvoiceIdObj);
+
+            if (financialInvoiceIdObj == null ||
+                !long.TryParse(financialInvoiceIdObj.ToString(), out var financialInvoiceId))
+                return operation.Failed("فاکتور مالی نامعتبر است");
+
+            // گام 5: دریافت اطلاعات فاکتور مالی
+            var financialInvoice = _financialInvoiceApplication.GetDetails(financialInvoiceId);
+
+            if (financialInvoice == null)
+                return operation.Failed("فاکتور مالی نامعتبر است");
+
+            if (financialInvoice.Status != FinancialInvoiceStatus.Unpaid)
+                return operation.Failed("فاکتور مالی نامعتبر است");
+
+            // گام 6: بررسی تطابق مبلغ
+            if ((long)financialInvoice.Amount != command.Amount)
+            {
+                var failResult = _paymentTransactionApplication.SetFailed(command.InvoiceId);
+                return operation.Failed("مبلغ تراکنش با مبلغ فاکتور مطابقت ندارد");
+            }
+
+            // گام 7: به‌روزرسانی فاکتور مالی
+            var setPaidResult = _financialInvoiceApplication.SetPaid(financialInvoiceId, DateTime.Now);
+            if (!setPaidResult.IsSuccedded)
+            {
+                var failResult = _paymentTransactionApplication.SetFailed(command.InvoiceId);
+                return operation.Failed("خطا در به‌روزرسانی فاکتور مالی");
+            }
+
+
+
+            // گام 8: به‌روزرسانی وضعیت تراکنش
+            var setSuccessResult = _paymentTransactionApplication.SetSuccess(
+                command.InvoiceId,
+                command.CardNumber,
+                command.IssuerBank,
+                command.Rrn.ToString(),
+                command.DigitalReceipt);
+
+            if (!setSuccessResult.IsSuccedded)
+            {
+                return operation.Failed("خطا در به‌روزرسانی وضعیت تراکنش");
+            }
+
+            // گام 9: به‌روزرسانی وضعیت قرارداد‌های نهادی (اگر وجود داشته باشند)
+            var institutionContractItems = financialInvoice.Items.Where(x =>
+                x.Type is FinancialInvoiceItemType.BuyInstitutionContract
+                    or FinancialInvoiceItemType.BuyInstitutionContractInstallment).ToList();
+            
+            if (institutionContractItems.Any())
+            {
+                await HandleInstitutionContractItems(financialInvoice);
+            }
+
+
+            // گام 10: ایجاد سند مالی (Financial Statement)
+            var createCreditStatementCommand = new CreateFinancialStatment()
+            {
+                ContractingPartyId = transaction.ContractingPartyId,
+                Deptor = 0,
+                Creditor = command.Amount,
+                DeptorString = "0",
+                TypeOfTransaction = "credit",
+                DescriptionOption = (financialInvoice.Description ?? "") + " شماره فاکتور: " +
+                                    (financialInvoice.InvoiceNumber ?? ""),
+                Description = "درگاه بانکی",
+            };
+
+            var statementResult = _financialStatmentApplication.CreateFromBankGateway(createCreditStatementCommand);
+            if (!statementResult.IsSuccedded)
+            {
+                 _paymentTransactionApplication.SetFailed(command.InvoiceId);
+                return operation.Failed("خطا در ایجاد سند مالی");
+            }
+            // گام 11: تأیید نهایی با درگاه پرداخت
+            var verifyCommand = new VerifyPaymentGateWayRequest()
+            {
+                Amount = transaction.Amount,
+                TransactionId = command.InvoiceId.ToString(),
+                DigitalReceipt = command.DigitalReceipt
+            };
+
+            var verifyRes = await _paymentGateway.Verify(verifyCommand, cancellationToken);
+#if DEBUG
+            verifyRes.IsSuccess = true;
+#endif
+            if (!verifyRes.IsSuccess)
+            {
+                return operation.Failed("خطا در تایید پرداخت از درگاه");
+            }
+
+            // تمام عملیات موفق - تایید transaction
+            await transactionScope.CommitAsync(cancellationToken);
+            return operation.Succcedded();
+        }
+        catch (Exception ex)
+        {
+            // در صورت بروز هرگونه خطا، transaction خودکار rollback می‌شود
+            return operation.Failed($"خطا در پردازش callback: {ex.Message}");
+        }
+    }
+
+    /// <summary>
+    /// مدیریت آپدیت قرارداد‌های نهادی
+    /// </summary>
+    private async Task HandleInstitutionContractItems(EditFinancialInvoice financialInvoice)
+    {
+        // قرارداد‌های خریداری مستقیم
+        var directContractItems = financialInvoice.Items
+            .Where(x => x.Type == FinancialInvoiceItemType.BuyInstitutionContract);
+        var financialStatement =
+            await _financialStatmentRepository.GetByContractingPartyId(financialInvoice.ContractingPartyId);
+        
+        var today = DateTime.Now;
+        foreach (var item in directContractItems)
+        {
+            var institutionContract = _institutionContractRepository.Get(item.EntityId);
+            
+            await _institutionContractApplication.SetPendingWorkflow(item.EntityId,
+                InstitutionContractSigningType.OtpBased);
+            
+            var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
+                "پرداخت کل سرویس", "debt", "بابت خدمات", institutionContract.TotalAmount, 0, 0);
+            
+            financialStatement.AddFinancialTransaction(financialTransaction);
+        }
+
+        // قرارداد‌های خریداری با اقساط
+        var installmentItems = financialInvoice.Items
+            .Where(x => x.Type == FinancialInvoiceItemType.BuyInstitutionContractInstallment);
+
+        foreach (var item in installmentItems)
+        {
+            var institutionContractId =await _institutionContractRepository.GetIdByInstallmentId(item.EntityId);
+            var institutionContract = _institutionContractRepository.Get(institutionContractId);
+            
+
+            await _institutionContractApplication.SetPendingWorkflow(institutionContractId,
+                InstitutionContractSigningType.OtpBased);
+            
+            var firstInstallment = institutionContract.Installments.First();
+            
+            var firstInstallmentAmount = firstInstallment.Amount;
+            
+            var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
+                "قسط اول سرویس", "debt", "بابت خدمات", firstInstallmentAmount, 0, 0);
+            
+            financialStatement.AddFinancialTransaction(financialTransaction);
+        }
+        await _financialStatmentRepository.SaveChangesAsync();
+    }
+}

CompanyManagment.Application/PersonalContractingPartyApplication.cs

@@ -722,5 +722,11 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
         return await _personalContractingPartyRepository.GetLegalDetails(id);
     }
 
+    public async Task<long> GetRepresentativeIdByNationalCode(string nationalCode)
+    {
+        var entity = await _personalContractingPartyRepository.GetByNationalCode(nationalCode);
+        return entity?.RepresentativeId??0;
+    }
+
     #endregion
 }

CompanyManagment.Application/SepehrPaymentGatewayService.cs

@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using _0_Framework.Application;
+using _0_Framework.Application.PaymentGateway;
+using CompanyManagment.App.Contracts.PaymentTransaction;
+using CompanyManagment.App.Contracts.SepehrPaymentGateway;
+using Microsoft.Extensions.Logging;
+
+namespace CompanyManagment.Application;
+
+/// <summary>
+/// سرویس مشترک برای ایجاد درگاه پرداخت سپهر
+/// </summary>
+public class SepehrPaymentGatewayService : ISepehrPaymentGatewayService
+{
+    private readonly IPaymentGateway _paymentGateway;
+    private readonly IPaymentTransactionApplication _paymentTransactionApplication;
+
+    public SepehrPaymentGatewayService(
+        IPaymentTransactionApplication paymentTransactionApplication,
+        IHttpClientFactory httpClientFactory,
+        ILogger<SepehrPaymentGateway> sepehrGatewayLogger)
+    {
+        _paymentGateway = new SepehrPaymentGateway(httpClientFactory, sepehrGatewayLogger);
+        _paymentTransactionApplication = paymentTransactionApplication;
+    }
+
+    /// <summary>
+    /// ایجاد درگاه پرداخت سپهر برای یک تراکنش
+    /// </summary>
+    /// <param name="amount">مبلغ</param>
+    /// <param name="contractingPartyId">شناسه طرف قرارداد</param>
+    /// <param name="frontCallbackUrl">آدرس بازگشتی به فرانت برای نمایش نتیجه</param>
+    /// <param name="gatewayCallbackUrl">آدرس بازگشتی درگاه پرداخت</param>
+    /// <param name="financialInvoiceId">شناسه فاکتور مالی (اختیاری)</param>
+    /// <param name="extraData">داده‌های اضافی (اختیاری)</param>
+    /// <param name="cancellationToken">توکن لغو</param>
+    /// <returns>شامل Token درگاه یا OperationResult با خطا</returns>
+    public async Task<OperationResult<CreateSepehrPaymentGatewayResponse>> CreateSepehrPaymentGateway(
+        double amount,
+        long contractingPartyId,
+        long financialInvoiceId,
+        string gatewayCallbackUrl,
+        string frontCallbackUrl="https://client.gozareshgir.ir",
+        Dictionary<string, object> extraData = null,
+        CancellationToken cancellationToken = default)
+    {
+        var op = new OperationResult<CreateSepehrPaymentGatewayResponse>();
+
+        try
+        {
+            // گام 1: ایجاد تراکنش پرداخت
+            var transactionCommand = new CreatePaymentTransaction()
+            {
+                Amount = amount,
+                ContractingPartyId = contractingPartyId,
+                CallBackUrl = frontCallbackUrl,
+                Gateway = PaymentTransactionGateWay.SepehrPay
+            };
+
+            var transactionResult = await _paymentTransactionApplication.Create(transactionCommand);
+
+            if (!transactionResult.IsSuccedded)
+            {
+                return op.Failed(transactionResult.Message);
+            }
+
+            // گام 2: ایجاد درخواست درگاه پرداخت
+            extraData ??= new Dictionary<string, object>();
+
+            var createPaymentCommand = new CreatePaymentGatewayRequest()
+            {
+                Amount = amount,
+                TransactionId = transactionResult.SendId.ToString(),
+                CallBackUrl = gatewayCallbackUrl,
+                FinancialInvoiceId = financialInvoiceId,
+                ExtraData = extraData
+            };
+
+            // گام 3: ارسال درخواست به درگاه سپهر
+            var gatewayResponse = await _paymentGateway.Create(createPaymentCommand, cancellationToken);
+
+#if DEBUG
+            gatewayResponse.IsSuccess = true;    
+#endif
+            if (!gatewayResponse.IsSuccess)
+            {
+                return op.Failed($"خطا در ایجاد درگاه پرداخت: {gatewayResponse.Message ?? gatewayResponse.ErrorCode?.ToString()}");
+            }
+
+            // گام 4: ذخیره Token در تراکنش
+            var setTokenResult = await _paymentTransactionApplication.SetTransactionId(
+                transactionResult.SendId,
+                gatewayResponse.Token);
+
+            if (!setTokenResult.IsSuccedded)
+            {
+                return op.Failed("خطا در ذخیره Token درگاه");
+            }
+
+            // گام 5: بازگشت اطلاعات درگاه پرداخت
+            var response = new CreateSepehrPaymentGatewayResponse
+            {
+                Token = gatewayResponse.Token,
+                TransactionId = transactionResult.SendId,
+                PaymentUrl = _paymentGateway.GetStartPayUrl(gatewayResponse.Token)
+            };
+
+            return op.Succcedded(response);
+        }
+        catch (Exception ex)
+        {
+            return op.Failed($"خطا در ایجاد درگاه پرداخت: {ex.Message}");
+        }
+    }
+}

CompanyManagment.Application/SmsResultApplication.cs

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

CompanyManagment.Application/SmsSettingApplication.cs

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

CompanyManagment.Application/WorkshopAppliction.cs

@@ -407,6 +407,10 @@ public class WorkshopAppliction : IWorkshopApplication
     public EditWorkshop GetDetails(long id)
     {
         var workshop = _workshopRepository.GetDetails(id);
+        if (workshop == null)
+        {
+            return null;
+        }
         if (workshop.IsClassified)
         {
             workshop.CreatePlan = _workshopPlanApplication.GetWorkshopPlanByWorkshopId(id);

CompanyManagment.EFCore/Repository/FinancialInvoiceRepository.cs

@@ -34,6 +34,7 @@ public class FinancialInvoiceRepository : RepositoryBase<long, FinancialInvoice>
             Amount = financialInvoice.Amount,
             Status =  financialInvoice.Status,
             InvoiceNumber = financialInvoice.InvoiceNumber,
+            ContractingPartyId = financialInvoice.ContractingPartyId,
             Items = financialInvoice.Items?.Select(x => new EditFinancialInvoiceItem
             {
                 Id = x.id,
@@ -100,4 +101,12 @@ public class FinancialInvoiceRepository : RepositoryBase<long, FinancialInvoice>
             .Where(x => x.Status == FinancialInvoiceStatus.Unpaid).FirstOrDefaultAsync(x => x.Items
                 .Any(y => y.Type == financialInvoiceItemType && y.EntityId == entityId));
     }
+
+    public async Task<FinancialInvoice> GetUnPaidFinancialInvoiceByContractingPartyIdAndAmount(long contractingPartyId,
+        double amount)
+    {
+       return await _context.FinancialInvoices.FirstOrDefaultAsync(x=>x.ContractingPartyId == contractingPartyId &&
+                                                          x.Amount == amount &&
+                                                          x.Status == FinancialInvoiceStatus.Unpaid);
+    }
 }

CompanyManagment.EFCore/Repository/FinancialStatmentRepository.cs

@@ -210,6 +210,7 @@ public class FinancialStatmentRepository : RepositoryBase<long, FinancialStatmen
                 }
                 return new FinancialTransactionDetailViewModel()
                 {
+                    Id = t.id,
                     DateTimeGr = t.TdateGr,
                     DateFa = t.TdateGr.ToFarsi(),
                     TimeFa = $"{t.TdateGr:HH:mm}",

CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs

@@ -773,6 +773,137 @@ public class PersonalContractingPartyRepository : RepositoryBase<long, PersonalC
         return await _context.PersonalContractingParties.FirstOrDefaultAsync(x => x.NationalId == nationalId);
     }
 
+    public async Task<OperationResult> DeActiveAllAsync(long id)
+    {
+        OperationResult result = new OperationResult();
+        await using var transaction = await _context.Database.BeginTransactionAsync();
+        await using var accountTransaction = await _accountContext.Database.BeginTransactionAsync();
+        try
+        {
+            var contractingParty = _context.PersonalContractingParties
+                .FirstOrDefault(x => x.id == id);
+            
+            if (contractingParty == null)
+                return result.Failed("طرف حساب یافت نشد");
+            
+            contractingParty.DeActive();
+
+            var employers = _context.Employers
+                .Where(x => x.ContractingPartyId == id).ToList();
+            employers.ForEach(x => x.DeActive());
+
+            var employerIds = employers.Select(x => x.id).ToList();
+            var workshopIds = _context.WorkshopEmployers
+                .Where(x => employerIds.Contains(x.EmployerId))
+                .Select(x => x.WorkshopId).ToList();
+            
+            var workshops = _context.Workshops
+                .Where(x => workshopIds.Contains(x.id)).ToList();
+            workshops.ForEach(x => x.DeActive(x.ArchiveCode));
+
+            var contracts = _context.Contracts
+                .Where(x => workshopIds.Contains(x.WorkshopIds)).ToList();
+            contracts.ForEach(x => x.DeActive());
+
+            var contractIds = contracts.Select(x => x.id).ToList();
+            var checkouts = _context.CheckoutSet
+                .Where(x => contractIds.Contains(x.ContractId)).ToList();
+            checkouts.ForEach(x => x.DeActive());
+
+            var contractingPartyAccount =await _context.ContractingPartyAccounts
+                .FirstOrDefaultAsync(x => x.PersonalContractingPartyId == id);
+            if (contractingPartyAccount != null)
+            {
+                var account = await _accountContext.Accounts
+                    .FirstOrDefaultAsync(x => x.id == contractingPartyAccount.AccountId);
+                
+                account?.DeActive();
+                
+                var cameraAccount =await _accountContext.CameraAccounts
+                    .FirstOrDefaultAsync(x=>x.AccountId==account.id);
+                
+                cameraAccount?.DeActive();
+                
+                await _accountContext.SaveChangesAsync();
+            }
+            
+            await _context.SaveChangesAsync();
+            await transaction.CommitAsync();
+            await accountTransaction.CommitAsync();
+            result.Succcedded();
+        }
+        catch (Exception)
+        {
+            result.Failed("غیرفعال کردن طرف حساب با خطا مواجه شد");
+            await transaction.RollbackAsync();
+            await accountTransaction.RollbackAsync();
+        }
+
+        return result;
+    }
+
+    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
+                .FirstOrDefault(x => x.id == id);
+            if (personel == null)
+                return result.Failed("طرف حساب یافت نشد");
+            
+            personel.Active();
+
+            var employers = _context.Employers.Where(x => x.ContractingPartyId == id).ToList();
+            employers.ForEach(x => x.Active());
+
+            var employerIds = employers.Select(x => x.id).ToList();
+            var workshopIds = _context.WorkshopEmployers.Where(x => employerIds.Contains(x.EmployerId))
+                .Select(x => x.WorkshopId).ToList();
+            var workshops = _context.Workshops.Where(x => workshopIds.Contains(x.id)).ToList();
+            workshops.ForEach(x => x.Active(x.ArchiveCode));
+
+            var contracts = _context.Contracts.Where(x => workshopIds.Contains(x.WorkshopIds)).ToList();
+            contracts.ForEach(x => x.Active());
+
+            var contractIds = contracts.Select(x => x.id).ToList();
+            var checkouts = _context.CheckoutSet.Where(x => contractIds.Contains(x.ContractId)).ToList();
+            checkouts.ForEach(x => x.Active());
+
+            var contractingPartyAccount =await _context.ContractingPartyAccounts
+                .FirstOrDefaultAsync(x => x.PersonalContractingPartyId == id);
+            if (contractingPartyAccount != null)
+            {
+                var account = await _accountContext.Accounts
+                    .FirstOrDefaultAsync(x => x.id == contractingPartyAccount.AccountId);
+                
+                account?.Active();
+                
+                var cameraAccount =await _accountContext.CameraAccounts
+                    .FirstOrDefaultAsync(x=>x.AccountId==account.id);
+                
+                cameraAccount?.Active();
+                
+                await _accountContext.SaveChangesAsync();
+            }
+            
+            await _context.SaveChangesAsync();
+            await transaction.CommitAsync();
+            await accountTransaction.CommitAsync();
+            result.Succcedded();
+        }
+        catch (Exception)
+        {
+            result.Failed("فعال کردن طرف حساب با خطا مواجه شد");
+            await transaction.RollbackAsync();
+            await accountTransaction.RollbackAsync();
+        }
+
+        return result;
+    }
+
     #endregion
 }
 

CompanyManagment.EFCore/Repository/SmsResultRepository.cs

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

CompanyManagment.EFCore/Services/SmsService.cs

@@ -207,16 +207,11 @@ public class SmsService : ISmsService
     }
     public async Task<List<ApiResultViewModel>> GetApiResult(string startDate, string endDate)
     {
-        var st = new DateTime(2024, 6, 2);
+
-        var ed = new DateTime(2024, 7, 1);
+
-        if (!string.IsNullOrWhiteSpace(startDate) && startDate.Length == 10)
+        if(startDate.TryToGeorgianDateTime(out var st) == false || endDate.TryToGeorgianDateTime(out var ed) == false)
-        {
+            return new List<ApiResultViewModel>();
-            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;
@@ -248,6 +243,44 @@ public class SmsService : ISmsService
         return res;
     }
 
+    public async Task<List<ApiReportDto>> GetApiReport(string startDate, string endDate)
+    {
+
+
+        if (startDate.TryToGeorgianDateTime(out var st) == false || endDate.TryToGeorgianDateTime(out var ed) == false)
+            return new List<ApiReportDto>();
+
+        var res = new List<ApiReportDto>();
+        Int32 unixTimestamp = (int)st.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
+        Int32 unixTimestamp2 = (int)ed.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
+        //   int? fromDateUnixTime = null; // unix time - for instance: 1700598600
+        //int? toDateUnixTime = null; // unix time - for instance: 1703190600
+        int pageNumber = 2;
+        int pageSize = 100; // max: 100
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+        var response = await smsIr.GetArchivedReportAsync(pageNumber, pageSize, unixTimestamp, unixTimestamp2);
+
+        MessageReportResult[] messages = response.Data;
+        foreach (var message in messages)
+        {
+            var appendData = new ApiReportDto()
+            {
+                MessageId = message.MessageId,
+    
+                Mobile = message.Mobile,
+
+                SendUnixTime = UnixTimeStampToDateTime(message.SendDateTime),
+                DeliveryState = DeliveryStatus(message.DeliveryState),
+                DeliveryUnixTime = UnixTimeStampToDateTime(message.DeliveryDateTime),
+                DeliveryColor = DeliveryColorStatus(message.DeliveryState),
+            };
+            res.Add(appendData);
+        }
+
+
+        return res;
+    }
+
     public string DeliveryStatus(byte? dv)
     {
         string mess = "";
@@ -518,6 +551,31 @@ public class SmsService : ISmsService
         return result;
     }
 
+
+    public async Task<(byte status, string message, int messaeId, bool isSucceded)> BlockMessageForElectronicContract(string number, string fullname, string amount,string code1, string code2)
+    {
+        var tamplateId = 117685;
+        var result = new ValueTuple<byte, string, int, bool>();
+        var smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+
+        var sendResult = await smsIr.VerifySendAsync(number, tamplateId,
+            new VerifySendParameter[]
+            {
+                new("FULLNAME", fullname), new("AMOUNT", amount), new("CODE1", code1), new("CODE2", code2)
+            });
+        Thread.Sleep(500);
+
+
+        if (sendResult.Message == "موفق")
+        {
+
+            result = (sendResult.Status, sendResult.Message, sendResult.Data.MessageId, true);
+            return result;
+        }
+
+        result = (sendResult.Status, sendResult.Message, sendResult.Data.MessageId, false);
+        return result;
+    }
     #endregion
 
 

CompanyManagment.EFCore/Services/UidService.cs

@@ -10,6 +10,7 @@ using CompanyManagment.App.Contracts.AuthorizedPerson;
 using _0_Framework.Application;
 using _0_Framework.Application.UID;
 using Company.Application.Contracts.AuthorizedBankDetails;
+using CompanyManagment.App.Contracts.AuthorizedBankDetails;
 
 namespace CompanyManagment.EFCore.Services;
 

DadmehrGostar.sln

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

PersonalContractingParty.Config/PersonalBootstrapper.cs

@@ -61,6 +61,7 @@ using Company.Domain.HolidayItemAgg;
 using Company.Domain.InstitutionContractAgg;
 using Company.Domain.InstitutionContractContactInfoAgg;
 using Company.Domain.InstitutionContractExtensionTempAgg;
+using Company.Domain.InstitutionContractSendFlagAgg;
 using Company.Domain.InstitutionPlanAgg;
 using Company.Domain.InsuranceAgg;
 using Company.Domain.InsuranceEmployeeInfoAgg;
@@ -123,6 +124,7 @@ using Company.Domain.ZoneAgg;
 using CompanyManagement.Infrastructure.Excel.SalaryAid;
 using CompanyManagement.Infrastructure.Mongo.EmployeeFaceEmbeddingRepo;
 using CompanyManagement.Infrastructure.Mongo.InstitutionContractInsertTempRepo;
+using CompanyManagement.Infrastructure.Mongo.InstitutionContractSendFlagRepo;
 using CompanyManagment.App.Contracts.AdminMonthlyOverview;
 using CompanyManagment.App.Contracts.AndroidApkVersion;
 using CompanyManagment.App.Contracts.AuthorizedPerson;
@@ -229,153 +231,16 @@ using CompanyManagment.Application;
 using CompanyManagment.EFCore;
 using CompanyManagment.EFCore._common;
 using CompanyManagment.EFCore.Repository;
-using CompanyManagment.EFCore.Repository;
 using File.EfCore.Repository;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using P_TextManager.Domin.TextManagerAgg;
-using CompanyManagment.App.Contracts.CrossJobItems;
+using CompanyManagment.App.Contracts.PaymentCallback;
-using Company.Domain.CrossJobItemsAgg;
+using CompanyManagment.App.Contracts.SepehrPaymentGateway;
-using Company.Domain.DateSalaryAgg;
-using Company.Domain.DateSalaryItemAgg;
-using Company.Domain.FinancialStatmentAgg;
-using Company.Domain.FinancialTransactionAgg;
-using Company.Domain.GroupPlanAgg;
-using Company.Domain.GroupPlanJobItemAgg;
-using Company.Domain.InstitutionContractAgg;
-using Company.Domain.InstitutionContractContactInfoAgg;
-using CompanyManagment.App.Contracts.Insurance;
-using Company.Domain.InsuranceAgg;
-using Company.Domain.InsuranceEmployeeInfoAgg;
-using Company.Domain.InsuranceJobItemAgg;
-using Company.Domain.InsuranceListAgg;
-using Company.Domain.InsurancJobAgg;
-using Company.Domain.InsurancWorkshopInfoAgg;
-using Company.Domain.LeftWorkInsuranceAgg;
-using Company.Domain.PaymentToEmployeeAgg;
-using Company.Domain.PaymentToEmployeeItemAgg;
-using Company.Domain.PercentageAgg;
-using Company.Domain.PersonnelCodeAgg;
-using Company.Domain.SmsResultAgg;
-using Company.Domain.WorkingHoursTempAgg;
-using Company.Domain.WorkingHoursTempItemAgg;
-using Company.Domain.WorkshopPlanAgg;
-using Company.Domain.WorkshopPlanEmployeeAgg;
-using Company.Domain.ZoneAgg;
-using CompanyManagment.App.Contracts.ClassifiedSalary;
-using CompanyManagment.App.Contracts.DateSalary;
-using CompanyManagment.App.Contracts.DateSalaryItem;
-using CompanyManagment.App.Contracts.EmployeeInsurancListData;
-using CompanyManagment.App.Contracts.FinancialStatment;
-using CompanyManagment.App.Contracts.FinancilTransaction;
-using CompanyManagment.App.Contracts.InstitutionContract;
-using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
-using CompanyManagment.App.Contracts.InsuranceEmployeeInfo;
-using CompanyManagment.App.Contracts.InsuranceJob;
-using CompanyManagment.App.Contracts.InsuranceList;
-using CompanyManagment.App.Contracts.InsuranceWorkshopInfo;
-using CompanyManagment.App.Contracts.LeftWorkInsurance;
-using CompanyManagment.App.Contracts.PaymentToEmployee;
-using CompanyManagment.App.Contracts.Percentage;
-using CompanyManagment.App.Contracts.PersonnleCode;
-using CompanyManagment.App.Contracts.SmsResult;
-using CompanyManagment.App.Contracts.WorkingHoursTemp;
-using CompanyManagment.App.Contracts.WorkingHoursTempItem;
-using CompanyManagment.App.Contracts.WorkshopPlan;
-using CompanyManagment.App.Contracts.Zone;
-using CompanyManagment.App.Contracts.EmployeeComputeOptions;
-using Company.Domain.EmployeeComputeOptionsAgg;
-using Company.Domain.InsuranceYearlySalaryAgg;
-using Company.Domain.ReportAgg;
-using Company.Domain.RollCallAgg;
-using Company.Domain.RollCallEmployeeAgg;
-using Company.Domain.RollCallPlanAgg;
-using Company.Domain.RollCallServiceAgg;
-using CompanyManagment.App.Contracts.InsuranceYearlySalary;
-using CompanyManagment.App.Contracts.Report;
-using CompanyManagment.App.Contracts.RollCall;
-using CompanyManagment.App.Contracts.RollCallEmployee;
-using CompanyManagment.App.Contracts.RollCallService;
-using CompanyManagment.App.Contracts.RollCallPlan;
-using Company.Domain.ReportClientAgg;
-using Company.Domain.TaxJobCategoryAgg;
-using Company.Domain.WorkshopAccountAgg;
-using CompanyManagment.App.Contracts.ReportClient;
-using CompanyManagment.App.Contracts.TaxJobCategory;
-using Company.Domain.RollCallEmployeeStatusAgg;
-using CompanyManagment.App.Contracts.RollCallEmployeeStatus;
-using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg;
-using Company.Domain.CustomizeWorkshopGroupSettingsAgg;
-using Company.Domain.CustomizeWorkshopSettingsAgg;
-using Company.Domain.FineAgg;
-using Company.Domain.LoanAgg;
-using Company.Domain.RewardAgg;
-using Company.Domain.SalaryAidAgg;
-using CompanyManagment.App.Contracts.CustomizeWorkshopSettings;
-using CompanyManagment.App.Contracts.Fine;
-using CompanyManagment.App.Contracts.Loan;
-using CompanyManagment.App.Contracts.Reward;
-using CompanyManagment.App.Contracts.SalaryAid;
-using Company.Domain.AndroidApkVersionAgg;
-using Company.Domain.BankAgg;
-using CompanyManagment.App.Contracts.AndroidApkVersion;
-using Company.Domain.FineSubjectAgg;
-using CompanyManagment.App.Contracts.FineSubject;
-using Company.Domain.CustomizeCheckoutAgg;
-using CompanyManagment.App.Contracts.CustomizeCheckout;
-using Company.Domain.WorkshopSubAccountAgg;
-using Company.Domain.CustomizeCheckoutTempAgg;
-using Company.Domain.EmployeeBankInformationAgg;
-using Company.Domain.RollCallAgg.DomainService;
-using CompanyManagment.App.Contracts.Bank;
-using CompanyManagment.App.Contracts.EmployeeBankInformation;
-using Company.Domain.EmployeeDocumentItemAgg;
-using Company.Domain.EmployeeDocumentsAdminSelectionAgg;
-using Company.Domain.EmployeeDocumentsAgg;
-using CompanyManagement.Infrastructure.Excel.SalaryAid;
-using CompanyManagment.App.Contracts.EmployeeDocuments;
-using CompanyManagment.App.Contracts.EmployeeDocumentsAdminSelection;
-using Company.Domain.EmployeeClientTempAgg;
-using Company.Domain.InstitutionPlanAgg;
-using Company.Domain.LeftWorkTempAgg;
-using Company.Domain.TemporaryClientRegistrationAgg;
-using CompanyManagment.App.Contracts.EmployeeClientTemp;
-using CompanyManagment.App.Contracts.InstitutionPlan;
-using CompanyManagment.App.Contracts.LeftWorkTemp;
-using CompanyManagment.App.Contracts.TemporaryClientRegistration;
-using Company.Domain.ContactUsAgg;
-using CompanyManagment.App.Contracts.ContactUs;
-using Company.Domain.EmployeeAuthorizeTempAgg;
-using Company.Domain.AdminMonthlyOverviewAgg;
-using Company.Domain.AuthorizedBankDetailsAgg;
-using Company.Domain.ContractingPartyBankAccountsAgg;
-using Company.Domain.PaymentInstrumentAgg;
-using Company.Domain.PaymentTransactionAgg;
-using Company.Domain.FinancialInvoiceAgg;
-using CompanyManagment.App.Contracts.AdminMonthlyOverview;
-using CompanyManagment.App.Contracts.ContractingPartyBankAccounts;
-using CompanyManagment.App.Contracts.PaymentInstrument;
-using CompanyManagment.App.Contracts.PaymentTransaction;
-using CompanyManagment.App.Contracts.AuthorizedPerson;
-using Company.Domain.AuthorizedPersonAgg;
-using Company.Domain.EmployeeFaceEmbeddingAgg;
-using Company.Domain.InstitutionContractExtensionTempAgg;
-using Company.Domain.LawAgg;
-using CompanyManagement.Infrastructure.Mongo.EmployeeFaceEmbeddingRepo;
-using CompanyManagement.Infrastructure.Mongo.InstitutionContractInsertTempRepo;
-using CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
-using CompanyManagment.App.Contracts.Law;
-using CompanyManagment.EFCore.Repository;
-using CompanyManagment.App.Contracts.FinancialInvoice;
-using _0_Framework.Application.FaceEmbedding;
-using _0_Framework.Infrastructure;
-using _0_Framework.InfraStructure;
 using Company.Domain.CameraBugReportAgg;
+using CompanyManagment.App.Contracts.AuthorizedBankDetails;
 using CompanyManagment.App.Contracts.CameraBugReport;
-using CompanyManagement.Infrastructure.Mongo.CameraBugReportRepo;
 using CameraBugReportRepository = CompanyManagement.Infrastructure.Mongo.CameraBugReportRepo.CameraBugReportRepository;
-using Company.Domain._common;
-using CompanyManagment.EFCore._common;
 using CompanyManagment.EFCore.Services;
 using Shared.Contracts.Holidays;
 
@@ -622,6 +487,8 @@ public class PersonalBootstrapper
 
         services.AddTransient<IPaymentTransactionRepository, PaymentTransactionRepository>();
         services.AddTransient<IPaymentTransactionApplication, PaymentTransactionApplication>();
+        services.AddTransient<IPaymentCallbackHandler, PaymentCallbackHandler>();
+        services.AddTransient<ISepehrPaymentGatewayService, SepehrPaymentGatewayService>();
 
         services.AddTransient<IContractingPartyBankAccountsApplication, ContractingPartyBankAccountsApplication>();
         services.AddTransient<IContractingPartyBankAccountsRepository, ContractingPartyBankAccountsRepository>();
@@ -696,6 +563,7 @@ public class PersonalBootstrapper
         services.AddTransient<ISmsSettingsRepository, SmsSettingsRepository>();
         services.AddTransient<ISmsSettingApplication, SmsSettingApplication>();
 
+        services.AddTransient<IInstitutionContractSmsServiceRepository, InstitutionContractSmsServiceRepository>();
         #endregion
 
 
@@ -793,6 +661,9 @@ public class PersonalBootstrapper
         services.AddTransient<ICameraBugReportApplication, CameraBugReportApplication>();
         services.AddTransient<ICameraBugReportRepository, CameraBugReportRepository>(); // MongoDB Implementation
 
+        // InstitutionContractSendFlag - MongoDB
+        services.AddTransient<IInstitutionContractSendFlagRepository, InstitutionContractSendFlagRepository>();
+
         services.AddDbContext<CompanyContext>(x => x.UseSqlServer(connectionString));
     }
 }

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

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

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

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

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

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

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

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

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ApproveTaskSectionCompletion/ApproveTaskSectionCompletionCommand.cs

@@ -0,0 +1,57 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain._Common.Exceptions;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.ApproveTaskSectionCompletion;
+
+public record ApproveTaskSectionCompletionCommand(Guid TaskSectionId, bool IsApproved) : IBaseCommand;
+
+public class ApproveTaskSectionCompletionCommandHandler : IBaseCommandHandler<ApproveTaskSectionCompletionCommand>
+{
+    private readonly ITaskSectionRepository _taskSectionRepository;
+    private readonly IUnitOfWork _unitOfWork;
+    private readonly IAuthHelper _authHelper;
+
+    public ApproveTaskSectionCompletionCommandHandler(
+        ITaskSectionRepository taskSectionRepository,
+        IUnitOfWork unitOfWork,
+        IAuthHelper authHelper)
+    {
+        _taskSectionRepository = taskSectionRepository;
+        _unitOfWork = unitOfWork;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult> Handle(ApproveTaskSectionCompletionCommand request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId()
+            ?? throw new UnAuthorizedException("˜ÇÑÈÑ ÇÍÑÇÒ åæ?Ê äÔÏå ÇÓÊ");
+
+        var section = await _taskSectionRepository.GetByIdAsync(request.TaskSectionId, cancellationToken);
+        if (section == null)
+        {
+            return OperationResult.NotFound("ÈÎÔ ãæÑÏ äÙÑ ?ÇÝÊ äÔÏ");
+        }
+
+        if (section.Status != TaskSectionStatus.PendingForCompletion)
+        {
+            return OperationResult.Failure("ÝÞØ ÈÎÔ<C38E>åÇ?? ˜å ÏÑ ÇäÊÙÇÑ Ê˜ã?á åÓÊäÏ ÞÇÈá ÊÇ??Ï ?Ç ÑÏ åÓÊäÏ");
+        }
+
+        if (request.IsApproved)
+        {
+            section.UpdateStatus(TaskSectionStatus.Completed);
+        }
+        else
+        {
+            section.UpdateStatus(TaskSectionStatus.Incomplete);
+        }
+
+        await _unitOfWork.SaveChangesAsync(cancellationToken);
+
+        return OperationResult.Success();
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ApproveTaskSectionCompletion/ApproveTaskSectionCompletionCommandValidator.cs

@@ -0,0 +1,14 @@
+using FluentValidation;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.ApproveTaskSectionCompletion;
+
+public class ApproveTaskSectionCompletionCommandValidator : AbstractValidator<ApproveTaskSectionCompletionCommand>
+{
+    public ApproveTaskSectionCompletionCommandValidator()
+    {
+        RuleFor(c => c.TaskSectionId)
+            .NotEmpty()
+            .NotNull()
+            .WithMessage("ÔäÇÓå ÈÎÔ äã?<3F>ÊæÇäÏ ÎÇá? ÈÇÔÏ");
+    }
+}

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

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

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

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

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

@@ -0,0 +1,53 @@
+using System.Linq;
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.AutoUpdateDeployStatus;
+
+public record AutoUpdateDeployStatusCommand : IBaseCommand;
+
+public class AutoUpdateDeployStatusCommandHandler : IBaseCommandHandler<AutoUpdateDeployStatusCommand>
+{
+    private readonly IProgramManagerDbContext _dbContext;
+
+    public AutoUpdateDeployStatusCommandHandler(IProgramManagerDbContext dbContext)
+    {
+        _dbContext = dbContext;
+    }
+
+    public async Task<OperationResult> Handle(AutoUpdateDeployStatusCommand request,
+        CancellationToken cancellationToken)
+    {
+        // Fetch all sections whose phase is still marked as not completed
+        var sections = await _dbContext.TaskSections
+            .Include(ts => ts.Task)
+            .ThenInclude(t => t.Phase)
+            .Where(ts => ts.Task.Phase.DeployStatus == ProjectDeployStatus.NotCompleted)
+            .ToListAsync(cancellationToken);
+
+        if (sections.Count == 0)
+            return OperationResult.Success();
+
+        var phasesToUpdate = sections
+            .GroupBy(ts => ts.Task.PhaseId)
+            .Where(g => g.All(s => s.Status == TaskSectionStatus.Completed))
+            .Select(g => g.First().Task.Phase)
+            .Distinct()
+            .ToList();
+
+        if (phasesToUpdate.Count == 0)
+            return OperationResult.Success();
+
+        foreach (var phase in phasesToUpdate)
+        {
+            phase.UpdateDeployStatus(ProjectDeployStatus.PendingDevDeploy);
+        }
+
+        await _dbContext.SaveChangesAsync(cancellationToken);
+        return OperationResult.Success();
+    }
+}

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

@@ -0,0 +1,45 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.ChangeDeployStatusProject;
+
+public record ChangeDeployStatusProjectCommand(Guid PhaseId, ProjectDeployStatus Status):IBaseCommand;
+
+public class ChangeDeployStatusProjectCommandHandler : IBaseCommandHandler<ChangeDeployStatusProjectCommand>
+{
+    private readonly IProjectRepository _projectRepository;
+    private readonly IProjectPhaseRepository _projectPhaseRepository;
+    private readonly IUnitOfWork _unitOfWork;
+
+    public ChangeDeployStatusProjectCommandHandler(IProjectRepository projectRepository, IUnitOfWork unitOfWork, IProjectPhaseRepository projectPhaseRepository)
+    {
+        _projectRepository = projectRepository;
+        _unitOfWork = unitOfWork;
+        _projectPhaseRepository = projectPhaseRepository;
+    }
+
+    public async Task<OperationResult> Handle(ChangeDeployStatusProjectCommand request, CancellationToken cancellationToken)
+    {
+        var project = await _projectPhaseRepository.GetByIdAsync(request.PhaseId, cancellationToken);
+        if (project == null)
+            return OperationResult.NotFound("بخش مورد نظر یافت نشد");
+
+        if (project.DeployStatus == ProjectDeployStatus.NotCompleted)
+        {
+            return OperationResult.Failure("وضعیت استقرار نمی‌تواند از حالت 'تایید نشده' تغییر کند.");
+        }
+
+        if (request.Status == ProjectDeployStatus.NotCompleted)
+        {
+            return OperationResult.Failure("وضعیت استقرار نمی‌تواند به حالت 'تایید نشده' تغییر کند.");
+        }
+        project.UpdateDeployStatus(request.Status);
+
+        await _unitOfWork.SaveChangesAsync(cancellationToken);
+        return OperationResult.Success();
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ChangeStatusSection/ChangeStatusSectionCommandHandler.cs

@@ -52,7 +52,10 @@ public class ChangeStatusSectionCommandHandler : IBaseCommandHandler<ChangeStatu
 			// Going TO InProgress: Check if section has remaining time, then start work
 			if (!section.HasRemainingTime())
 				return OperationResult.ValidationError("زمان این بخش به پایان رسیده است");
-
+            if (await _taskSectionRepository.HasUserAnyInProgressSectionAsync(section.CurrentAssignedUserId, cancellationToken))
+            {
+                return OperationResult.ValidationError("کاربر مورد نظر در حال حاضر بخش دیگری را در وضعیت 'درحال انجام' دارد");
+            }
 			section.StartWork();
         }
         else
@@ -86,9 +89,9 @@ public class ChangeStatusSectionCommandHandler : IBaseCommandHandler<ChangeStatu
         var validTransitions = new Dictionary<TaskSectionStatus, List<TaskSectionStatus>>
         {
             { TaskSectionStatus.ReadyToStart, [TaskSectionStatus.InProgress] },
-            { TaskSectionStatus.InProgress, [TaskSectionStatus.Incomplete, TaskSectionStatus.Completed] },
+            { TaskSectionStatus.InProgress, [TaskSectionStatus.Incomplete, TaskSectionStatus.PendingForCompletion] },
-            { TaskSectionStatus.Incomplete, [TaskSectionStatus.InProgress, TaskSectionStatus.Completed] },
+            { TaskSectionStatus.Incomplete, [TaskSectionStatus.InProgress, TaskSectionStatus.PendingForCompletion] },
-            { TaskSectionStatus.Completed, [TaskSectionStatus.InProgress, TaskSectionStatus.Incomplete] }, // Can return to InProgress or Incomplete
+            { TaskSectionStatus.PendingForCompletion, [TaskSectionStatus.InProgress, TaskSectionStatus.Incomplete] }, // Can return to InProgress or Incomplete
             { TaskSectionStatus.NotAssigned, [TaskSectionStatus.InProgress, TaskSectionStatus.ReadyToStart] }
         };
 

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

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

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

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

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

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

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

@@ -1,13 +1,21 @@
 using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application.Modules.Projects.DTOs;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.SetTimeProject;
 
-public record SetTimeProjectCommand(List<SetTimeProjectSectionItem> SectionItems, Guid Id, ProjectHierarchyLevel Level):IBaseCommand;
+public record SetTimeProjectCommand(
+    List<SetTimeProjectSkillItem> SkillItems,
+    Guid Id,
+    ProjectHierarchyLevel Level,
+    bool CascadeToChildren) : IBaseCommand;
 
 public class SetTimeSectionTime
 {
     public string Description { get; set; }
     public int Hours { get; set; }
+    public int Minutes { get; set; }
+    public TaskSectionAdditionalTimeType Type { get; set; }
 }

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

@@ -4,8 +4,13 @@ using GozareshgirProgramManager.Application.Modules.Projects.DTOs;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain._Common.Exceptions;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+using GozareshgirProgramManager.Domain.SkillAgg.Repositories;
+using GozareshgirProgramManager.Domain.UserAgg.Repositories;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.SetTimeProject;
 
@@ -15,21 +20,33 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
     private readonly IProjectPhaseRepository _projectPhaseRepository;
     private readonly IProjectTaskRepository _projectTaskRepository;
     private readonly IUnitOfWork _unitOfWork;
-    private readonly IAuthHelper _authHelper;
+    private readonly IUserRepository _userRepository;
+    private readonly ISkillRepository _skillRepository;
+    private readonly IPhaseSectionRepository _phaseSectionRepository;
+    private readonly IProjectSectionRepository _projectSectionRepository;
     private long? _userId;
+    private readonly ITaskSectionRepository _taskSectionRepository;
 
 
     public SetTimeProjectCommandHandler(
         IProjectRepository projectRepository,
         IProjectPhaseRepository projectPhaseRepository,
         IProjectTaskRepository projectTaskRepository,
-        IUnitOfWork unitOfWork, IAuthHelper authHelper)
+        IUnitOfWork unitOfWork, IAuthHelper authHelper, 
+        IUserRepository userRepository, ISkillRepository skillRepository,
+        IPhaseSectionRepository phaseSectionRepository,
+        IProjectSectionRepository projectSectionRepository, 
+        ITaskSectionRepository taskSectionRepository)
     {
         _projectRepository = projectRepository;
         _projectPhaseRepository = projectPhaseRepository;
         _projectTaskRepository = projectTaskRepository;
         _unitOfWork = unitOfWork;
-        _authHelper = authHelper;
+        _userRepository = userRepository;
+        _skillRepository = skillRepository;
+        _phaseSectionRepository = phaseSectionRepository;
+        _projectSectionRepository = projectSectionRepository;
+        _taskSectionRepository = taskSectionRepository;
         _userId = authHelper.GetCurrentUserId();
     }
 
@@ -37,6 +54,10 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
     {
         switch (request.Level)
         {
+            case ProjectHierarchyLevel.Project:
+                return await AssignProject(request);
+            case ProjectHierarchyLevel.Phase:
+                return await AssignProjectPhase(request);
             case ProjectHierarchyLevel.Task:
                 return await SetTimeForProjectTask(request, cancellationToken);
             default:
@@ -44,67 +65,229 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
         }
     }
 
-    private async Task<OperationResult> SetTimeForProject(SetTimeProjectCommand request,
+    private async Task<OperationResult> AssignProject(SetTimeProjectCommand request)
-        CancellationToken cancellationToken)
     {
         var project = await _projectRepository.GetWithFullHierarchyAsync(request.Id);
-        if (project == null)
+        if (project is null)
         {
             return OperationResult.NotFound("پروژه یافت نشد");
-            return OperationResult.NotFound("<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD>");
         }
 
-        long? addedByUserId = _userId;
+        var skillItems = request.SkillItems.Where(x=>x.UserId is > 0).ToList();
+        
+        // حذف ProjectSections که در validSkills نیستند
+        var validSkillIds = skillItems.Select(x => x.SkillId).ToList();
+        var sectionsToRemove = project.ProjectSections
+            .Where(s => !validSkillIds.Contains(s.SkillId))
+            .ToList();
+        
+        foreach (var section in sectionsToRemove)
+        {
+            project.RemoveProjectSection(section.SkillId);
+        }
+        
+        // تخصیص در سطح پروژه
+        foreach (var item in skillItems)
+        {
+            var skill = await _skillRepository.GetByIdAsync(item.SkillId);
+            if (skill is null)
+            {
+                return OperationResult.NotFound($"مهارت با شناسه {item.SkillId} یافت نشد");
+            }
 
-        // تنظیم زمان برای تمام sections در تمام فازها و تسک‌های پروژه
+            // بررسی و به‌روزرسانی یا اضافه کردن ProjectSection
+            var existingSection = project.ProjectSections.FirstOrDefault(s => s.SkillId == item.SkillId);
+            if (existingSection != null)
+            {
+                // اگر وجود داشت، فقط userId را به‌روزرسانی کن
+                existingSection.UpdateUser(item.UserId.Value);
+            }
+            else
+            {
+                // اگر وجود نداشت، اضافه کن
+                var newSection = new ProjectSection(project.Id, item.UserId.Value, item.SkillId);
+                await _projectSectionRepository.CreateAsync(newSection);
+            }
+        }
+
+        // حالا برای تمام فازها و تسک‌ها cascade کن
         foreach (var phase in project.Phases)
         {
-            foreach (var task in phase.Tasks)
+            // اگر CascadeToChildren true است یا فاز override ندارد
+            if (request.CascadeToChildren || !phase.HasAssignmentOverride)
             {
-                foreach (var section in task.Sections)
+                // حذف PhaseSections که در validSkills نیستند
+                var phaseSectionsToRemove = phase.PhaseSections
+                    .Where(s => !validSkillIds.Contains(s.SkillId))
+                    .ToList();
+                
+                foreach (var section in phaseSectionsToRemove)
                 {
-                    var sectionItem = request.SectionItems.FirstOrDefault(si => si.SectionId == section.Id);
+                    phase.RemovePhaseSection(section.SkillId);
-                    if (sectionItem != null)
+                }
+                
+                // برای phase هم باید section‌ها را به‌روزرسانی کنیم
+                foreach (var item in skillItems )
+                {
+                    var existingSection = phase.PhaseSections.FirstOrDefault(s => s.SkillId == item.SkillId);
+                    if (existingSection != null)
                     {
-                        SetSectionTime(section, sectionItem, addedByUserId);
+                        existingSection.Update(item.UserId.Value, item.SkillId);
+                    }
+                    else
+                    {
+                        var newPhaseSection = new PhaseSection(phase.Id, item.UserId.Value, item.SkillId);
+                        await _phaseSectionRepository.CreateAsync(newPhaseSection);
+                    }
+                }
+                
+                foreach (var task in phase.Tasks)
+                {
+                    // اگر CascadeToChildren true است یا تسک override ندارد
+                    if (request.CascadeToChildren || !task.HasAssignmentOverride)
+                    {
+                        // حذف TaskSections که در validSkills نیستند
+                        var taskSectionsToRemove = task.Sections
+                            .Where(s => !validSkillIds.Contains(s.SkillId))
+                            .ToList();
+                        
+                        foreach (var section in taskSectionsToRemove)
+                        {
+                            task.RemoveSection(section.Id);
+                        }
+                        
+                        foreach (var item in skillItems)
+                        {
+                            var section = task.Sections.FirstOrDefault(s => s.SkillId == item.SkillId);
+                            if (section != null)
+                            {
+                                // استفاده از TransferToUser
+                                if (section.CurrentAssignedUserId != item.UserId)
+                                {
+                                    if (section.CurrentAssignedUserId > 0)
+                                    {
+                                        section.TransferToUser(section.CurrentAssignedUserId, item.UserId.Value);
+                                    }
+                                    else
+                                    {
+                                        section.AssignToUser(item.UserId.Value);
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                var newTaskSection = new TaskSection(task.Id, item.SkillId, item.UserId.Value);
+                                await _taskSectionRepository.CreateAsync(newTaskSection);
+                            }
+                        }
                     }
                 }
             }
         }
 
-        await _unitOfWork.SaveChangesAsync(cancellationToken);
+        await _unitOfWork.SaveChangesAsync();
         return OperationResult.Success();
     }
 
-    private async Task<OperationResult> SetTimeForProjectPhase(SetTimeProjectCommand request,
+    private async Task<OperationResult> AssignProjectPhase(SetTimeProjectCommand request)
-        CancellationToken cancellationToken)
     {
         var phase = await _projectPhaseRepository.GetWithTasksAsync(request.Id);
-        if (phase == null)
+        if (phase is null)
         {
             return OperationResult.NotFound("فاز پروژه یافت نشد");
-            return OperationResult.NotFound("<22><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD>");
         }
 
-        long? addedByUserId = _userId;
+        // تخصیص در سطح فاز
+        foreach (var item in request.SkillItems)
+        {
+            var skill = await _skillRepository.GetByIdAsync(item.SkillId);
+            if (skill is null)
+            {
+                return OperationResult.NotFound($"مهارت با شناسه {item.SkillId} یافت نشد");
+            }
+        }
 
-        // تنظیم زمان برای تمام sections در تمام تسک‌های این فاز
+        // علامت‌گذاری که این فاز نسبت به parent متمایز است
+        phase.MarkAsOverridden();
+
+        var skillItems = request.SkillItems.Where(x=>x.UserId is > 0).ToList();
+        
+        // حذف PhaseSections که در validSkills نیستند
+        var validSkillIds = skillItems.Select(x => x.SkillId).ToList();
+        var sectionsToRemove = phase.PhaseSections
+            .Where(s => !validSkillIds.Contains(s.SkillId))
+            .ToList();
+        
+        foreach (var section in sectionsToRemove)
+        {
+            phase.RemovePhaseSection(section.SkillId);
+        }
+        
+        // به‌روزرسانی یا اضافه کردن PhaseSection
+        foreach (var item in skillItems)
+        {
+            var existingSection = phase.PhaseSections.FirstOrDefault(s => s.SkillId == item.SkillId);
+            if (existingSection != null)
+            {
+                // اگر وجود داشت، فقط userId را به‌روزرسانی کن
+                existingSection.Update(item.UserId!.Value, item.SkillId); 
+            }
+            else
+            {
+                // اگر وجود نداشت، اضافه کن
+                var newPhaseSection = new PhaseSection(phase.Id, item.UserId!.Value, item.SkillId);
+                await _phaseSectionRepository.CreateAsync(newPhaseSection);
+            }
+        }
+
+        // cascade به تمام تسک‌ها
         foreach (var task in phase.Tasks)
         {
-            foreach (var section in task.Sections)
+            // اگر CascadeToChildren true است یا تسک override ندارد
+            if (request.CascadeToChildren || !task.HasAssignmentOverride)
             {
-                var sectionItem = request.SectionItems.FirstOrDefault(si => si.SectionId == section.Id);
+                // حذف TaskSections که در validSkills نیستند
-                if (sectionItem != null)
+                var taskSectionsToRemove = task.Sections
+                    .Where(s => !validSkillIds.Contains(s.SkillId))
+                    .ToList();
+                
+                foreach (var section in taskSectionsToRemove)
                 {
-                    SetSectionTime(section, sectionItem, addedByUserId);
+                    task.RemoveSection(section.Id);
+                }
+                
+                foreach (var item in skillItems) 
+                {
+                    var section = task.Sections.FirstOrDefault(s => s.SkillId == item.SkillId);
+                    if (section != null)
+                    {
+                        // استفاده از TransferToUser
+                        if (section.CurrentAssignedUserId != item.UserId)
+                        {
+                            if (section.CurrentAssignedUserId > 0)
+                            {
+                                section.TransferToUser(section.CurrentAssignedUserId, item.UserId!.Value);
+                            }
+                            else
+                            {
+                                section.AssignToUser(item.UserId!.Value);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        var newTaskSection = new TaskSection(task.Id, item.SkillId, item.UserId!.Value);
+                        await _taskSectionRepository.CreateAsync(newTaskSection);
+                    }
                 }
             }
         }
 
-        await _unitOfWork.SaveChangesAsync(cancellationToken);
+        await _unitOfWork.SaveChangesAsync();
         return OperationResult.Success();
     }
 
+
     private async Task<OperationResult> SetTimeForProjectTask(SetTimeProjectCommand request,
         CancellationToken cancellationToken)
     {
@@ -116,24 +299,64 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
 
         long? addedByUserId = _userId;
 
-        // تنظیم زمان مستقیماً برای sections این تسک
+        var validSkills = request.SkillItems
-        foreach (var section in task.Sections)
+            .Where(x=>x.UserId is > 0).ToList();
+        
+        // حذف سکشن‌هایی که در validSkills نیستند
+        var validSkillIds = validSkills.Select(x => x.SkillId).ToList();
+        var sectionsToRemove = task.Sections
+            .Where(s => !validSkillIds.Contains(s.SkillId))
+            .ToList();
+        
+        foreach (var sectionToRemove in sectionsToRemove)
         {
-            var sectionItem = request.SectionItems.FirstOrDefault(si => si.SectionId == section.Id);
+            task.RemoveSection(sectionToRemove.Id);
-            if (sectionItem != null)
-            {
-                SetSectionTime(section, sectionItem, addedByUserId);
-            }
         }
+        
+        foreach (var skillItem in validSkills)
+        {
+            var section = task.Sections.FirstOrDefault(s => s.SkillId == skillItem.SkillId);
 
+            if (!_userRepository.Exists(x=>x.Id == skillItem.UserId!.Value))
+            {
+                throw new BadRequestException("کاربر با شناسه یافت نشد.");
+            }
+            
+            if (section == null)
+            {
+                var taskSection = new TaskSection(task.Id,
+                    skillItem.SkillId, skillItem.UserId!.Value);
+                
+                task.AddSection(taskSection);
+                section = taskSection;
+            }
+            else
+            {
+                if (section.CurrentAssignedUserId != skillItem.UserId)
+                {
+                    if (section.CurrentAssignedUserId > 0)
+                    {
+                        section.TransferToUser(section.CurrentAssignedUserId, skillItem.UserId!.Value);
+                    }
+                    else
+                    {
+                        section.AssignToUser(skillItem.UserId!.Value);
+                    }
+                }
+            }
+            
+            SetSectionTime(section, skillItem, addedByUserId);
+            
+        }
         await _unitOfWork.SaveChangesAsync(cancellationToken);
         return OperationResult.Success();
     }
 
-    private void SetSectionTime(TaskSection section, SetTimeProjectSectionItem sectionItem, long? addedByUserId)
+    private void SetSectionTime(TaskSection section, SetTimeProjectSkillItem sectionItem, long? addedByUserId)
     {
         var initData = sectionItem.InitData;
-        var initialTime = TimeSpan.FromHours(initData.Hours);
+        var initialTime = TimeSpan.FromHours(initData.Hours)
+            .Add(TimeSpan.FromMinutes(initData.Minutes));
         
         if (initialTime <= TimeSpan.Zero)
         {
@@ -145,10 +368,26 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
 
         section.ClearAdditionalTimes();
         // افزودن زمان‌های اضافی
+        bool hasAdditionalTime = false;
         foreach (var additionalTime in sectionItem.AdditionalTime)
         {
-            var additionalTimeSpan = TimeSpan.FromHours(additionalTime.Hours);
+            var additionalTimeSpan = TimeSpan.FromHours(additionalTime.Hours).Add(TimeSpan.FromMinutes(additionalTime.Minutes));
-            section.AddAdditionalTime(additionalTimeSpan, additionalTime.Description, addedByUserId);
+            section.AddAdditionalTime(additionalTimeSpan, additionalTime.Type, additionalTime.Description, addedByUserId);
+            hasAdditionalTime = true;
+        }
+        
+        // تغییر status به Incomplete فقط اگر زمان اضافی اضافه شده باشد و در وضعیتی غیر از ReadyToStart باشد
+        if (hasAdditionalTime && section.Status != TaskSectionStatus.ReadyToStart)
+        {
+            // اگر سکشن درحال انجام است، باید متوقف شود قبل از تغییر status
+            if (section.Status == TaskSectionStatus.InProgress)
+            {
+                section.StopWork(TaskSectionStatus.Incomplete);
+            }
+            else
+            {
+                section.UpdateStatus(TaskSectionStatus.Incomplete);
+            }
         }
     }
 

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

@@ -13,19 +13,15 @@ public class SetTimeProjectCommandValidator:AbstractValidator<SetTimeProjectComm
             .NotNull()
             .WithMessage("شناسه پروژه نمی‌تواند خالی باشد.");
 
-        RuleForEach(x => x.SectionItems)
+        RuleForEach(x => x.SkillItems)
-            .SetValidator(command => new SetTimeProjectSectionItemValidator());
+            .SetValidator(command => new SetTimeProjectSkillItemValidator());
-
-        RuleFor(x => x.SectionItems)
-            .Must(sectionItems => sectionItems.Any(si => si.InitData?.Hours > 0))
-            .WithMessage("حداقل یکی از بخش‌ها باید مقدار ساعت معتبری داشته باشد.");
     }
 }
-public class SetTimeProjectSectionItemValidator:AbstractValidator<SetTimeProjectSectionItem>
+public class SetTimeProjectSkillItemValidator:AbstractValidator<SetTimeProjectSkillItem>
 {
-    public SetTimeProjectSectionItemValidator()
+    public SetTimeProjectSkillItemValidator()
     {
-        RuleFor(x=>x.SectionId)
+        RuleFor(x=>x.SkillId)
             .NotEmpty()
             .NotNull()
             .WithMessage("شناسه بخش نمی‌تواند خالی باشد.");
@@ -47,6 +43,18 @@ public class AdditionalTimeDataValidator: AbstractValidator<SetTimeSectionTime>
             .GreaterThanOrEqualTo(0)
             .WithMessage("ساعت نمی‌تواند منفی باشد.");
         
+        RuleFor(x => x.Hours)
+            .LessThan(1_000)
+            .WithMessage("ساعت باید کمتر از 1000 باشد.");
+
+        RuleFor(x => x.Minutes)
+            .GreaterThanOrEqualTo(0)
+            .WithMessage("دقیقه نمی‌تواند منفی باشد.");
+
+        RuleFor(x => x.Minutes)
+            .LessThan(60)
+            .WithMessage("دقیقه باید بین 0 تا 59 باشد.");
+        
         RuleFor(x=>x.Description)
             .MaximumLength(500)
             .WithMessage("توضیحات نمی‌تواند بیشتر از 500 کاراکتر باشد.");

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/DTOs/ProjectHierarchyDtos.cs

@@ -89,6 +89,7 @@ public class ProjectSectionDto
     
     public TimeSpan FinalEstimatedHours { get; set; }
     public TimeSpan TotalTimeSpent { get; set; }
+    public double ProgressPercentage { get; set; }
     public bool IsCompleted { get; set; }
     public bool IsInProgress { get; set; }
     

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/DTOs/SetTimeProjectSectionItem.cs

@@ -2,9 +2,10 @@ using GozareshgirProgramManager.Application.Modules.Projects.Commands.SetTimePro
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.DTOs;
 
-public class SetTimeProjectSectionItem
+public class SetTimeProjectSkillItem
 {
-    public Guid SectionId { get; set; }
+    public Guid SkillId { get; set; }
+    public long? UserId { get; set; }
     public SetTimeSectionTime InitData { get; set; }
     public List<SetTimeSectionTime> AdditionalTime { get; set; } = [];
 }

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

@@ -1,5 +1,9 @@
 using GozareshgirProgramManager.Application.Modules.Projects.DTOs;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Extensions;
@@ -166,6 +170,7 @@ public static class ProjectMappingExtensions
             CreationDate = section.CreationDate,
             FinalEstimatedHours = section.FinalEstimatedHours,
             TotalTimeSpent = section.GetTotalTimeSpent(),
+            ProgressPercentage = section.GetProgressPercentage(),
             IsCompleted = section.IsCompleted(),
             IsInProgress = section.IsInProgress(),
             Activities = section.Activities.Select(a => a.ToDto()).ToList(),
@@ -188,6 +193,7 @@ public static class ProjectMappingExtensions
             CreationDate = section.CreationDate,
             FinalEstimatedHours = section.FinalEstimatedHours,
             TotalTimeSpent = section.GetTotalTimeSpent(),
+            ProgressPercentage = section.GetProgressPercentage(),
             IsCompleted = section.IsCompleted(),
             IsInProgress = section.IsInProgress()
             // No activities or additional times for summary

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectHierarchySearch/GetProjectSearchQuery.cs

@@ -0,0 +1,11 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectHierarchySearch;
+
+/// <summary>
+/// درخواست جستجو در سراسر سلسله‌مراتب پروژه (پروژه، فاز، تسک).
+/// نتایج با اطلاعات مسیر سلسله‌مراتب برای پشتیبانی از ناوبری درخت در رابط کاربری بازگردانده می‌شود.
+/// </summary>
+public record GetProjectSearchQuery(
+    string SearchQuery) : IBaseQuery<GetProjectSearchResponse>;
+ 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectHierarchySearch/GetProjectSearchQueryHandler.cs

@@ -0,0 +1,132 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectHierarchySearch;
+
+/// <summary>
+/// Handler برای درخواست جستجوی سراسری در سلسله‌مراتب پروژه.
+/// این handler در تمام سطح‌های پروژه، فاز و تسک جستجو می‌کند و از تمام فیلدهای متنی (نام، توضیحات) استفاده می‌کند.
+/// همچنین در زیرمجموعه‌های هر سطح (ProjectSections، PhaseSections، TaskSections) جستجو می‌کند.
+/// </summary>
+public class GetProjectSearchQueryHandler : IBaseQueryHandler<GetProjectSearchQuery, GetProjectSearchResponse>
+{
+    private readonly IProgramManagerDbContext _context;
+    private const int MaxResults = 50;
+
+    public GetProjectSearchQueryHandler(IProgramManagerDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<OperationResult<GetProjectSearchResponse>> Handle(
+        GetProjectSearchQuery request,
+        CancellationToken cancellationToken)
+    {
+        var searchQuery = request.SearchQuery.ToLower();
+        var results = new List<ProjectHierarchySearchResultDto>();
+
+        // جستجو در پروژه‌ها و ProjectSections
+        var projects = await SearchProjects(searchQuery, cancellationToken);
+        results.AddRange(projects);
+
+        // جستجو در فازها و PhaseSections
+        var phases = await SearchPhases(searchQuery, cancellationToken);
+        results.AddRange(phases);
+
+        // جستجو در تسک‌ها و TaskSections
+        var tasks = await SearchTasks(searchQuery, cancellationToken);
+        results.AddRange(tasks);
+
+        // مرتب‌سازی نتایج: ابتدا بر اساس سطح سلسله‌مراتب (پروژه → فاز → تسک)، سپس بر اساس نام
+        var sortedResults = results
+            .OrderBy(r => r.Level)
+            .ThenBy(r => r.Title)
+            .Take(MaxResults)
+            .ToList();
+
+        var response = new GetProjectSearchResponse(sortedResults);
+        return OperationResult<GetProjectSearchResponse>.Success(response);
+    }
+
+    /// <summary>
+    /// جستجو در جدول پروژه‌ها (نام، توضیحات) و ProjectSections (نام مهارت، توضیحات اولیه)
+    /// </summary>
+    private async Task<List<ProjectHierarchySearchResultDto>> SearchProjects(
+        string searchQuery,
+        CancellationToken cancellationToken)
+    {
+        var projects = await _context.Projects
+            .Where(p => 
+                p.Name.ToLower().Contains(searchQuery) ||
+                (p.Description != null && p.Description.ToLower().Contains(searchQuery)))
+            .Select(p => new ProjectHierarchySearchResultDto
+            {
+                Id = p.Id,
+                Title = p.Name,
+                Level = ProjectHierarchyLevel.Project,
+                ProjectId = null,
+                PhaseId = null
+            })
+            .ToListAsync(cancellationToken);
+
+        return projects;
+    }
+
+    /// <summary>
+    /// جستجو در جدول فازهای پروژه (نام، توضیحات) و PhaseSections
+    /// </summary>
+    private async Task<List<ProjectHierarchySearchResultDto>> SearchPhases(
+        string searchQuery,
+        CancellationToken cancellationToken)
+    {
+        var phases = await _context.ProjectPhases
+            .Where(ph => 
+                ph.Name.ToLower().Contains(searchQuery) ||
+                (ph.Description != null && ph.Description.ToLower().Contains(searchQuery)))
+            .Select(ph => new ProjectHierarchySearchResultDto
+            {
+                Id = ph.Id,
+                Title = ph.Name,
+                Level = ProjectHierarchyLevel.Phase,
+                ProjectId = ph.ProjectId,
+                PhaseId = null
+            })
+            .ToListAsync(cancellationToken);
+
+        return phases;
+    }
+
+    /// <summary>
+    /// جستجو در جدول تسک‌های پروژه (نام، توضیحات) و TaskSections (نام مهارت، توضیح اولیه، اطلاعات اضافی)
+    /// </summary>
+    private async Task<List<ProjectHierarchySearchResultDto>> SearchTasks(
+        string searchQuery,
+        CancellationToken cancellationToken)
+    {
+        var tasks = await _context.ProjectTasks
+            .Include(t => t.Sections)
+            .Include(t => t.Phase)
+            .Where(t => 
+                t.Name.ToLower().Contains(searchQuery) ||
+                (t.Description != null && t.Description.ToLower().Contains(searchQuery)) ||
+                t.Sections.Any(s =>
+                    (s.InitialDescription != null && s.InitialDescription.ToLower().Contains(searchQuery)) ||
+                    s.AdditionalTimes.Any(at => at.Reason != null && at.Reason.ToLower().Contains(searchQuery))))
+            .Select(t => new ProjectHierarchySearchResultDto
+            {
+                Id = t.Id,
+                Title = t.Name,
+                Level = ProjectHierarchyLevel.Task,
+                ProjectId = t.Phase.ProjectId,
+                PhaseId = t.PhaseId
+            })
+            .ToListAsync(cancellationToken);
+
+        return tasks;
+    }
+    
+}
+
+

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectHierarchySearch/GetProjectSearchQueryValidator.cs

@@ -0,0 +1,18 @@
+using FluentValidation;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectHierarchySearch;
+
+/// <summary>
+/// اعتبارسنج برای درخواست جستجوی سراسری
+/// </summary>
+public class GetProjectSearchQueryValidator : AbstractValidator<GetProjectSearchQuery>
+{
+    public GetProjectSearchQueryValidator()
+    {
+        RuleFor(x => x.SearchQuery)
+            .NotEmpty().WithMessage("متن جستجو نمی‌تواند خالی باشد.")
+            .MinimumLength(2).WithMessage("متن جستجو باید حداقل 2 حرف باشد.")
+            .MaximumLength(500).WithMessage("متن جستجو نمی‌تواند بیش از 500 حرف باشد.");
+    }
+}
+

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectHierarchySearch/GetProjectSearchResponse.cs

@@ -0,0 +1,8 @@
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectHierarchySearch;
+
+/// <summary>
+/// پوسته‌ی پاسخ برای نتایج جستجوی سراسری
+/// </summary>
+public record GetProjectSearchResponse(
+    List<ProjectHierarchySearchResultDto> Results);
+

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectHierarchySearch/ProjectHierarchySearchResultDto.cs

@@ -0,0 +1,36 @@
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectHierarchySearch;
+
+/// <summary>
+/// DTO برای نتایج جستجوی سراسری در سلسله‌مراتب پروژه.
+/// حاوی اطلاعات کافی برای بازسازی مسیر سلسله‌مراتب و بسط درخت در رابط کاربری است.
+/// </summary>
+public record ProjectHierarchySearchResultDto
+{
+    /// <summary>
+    /// شناسه آیتم (پروژه، فاز یا تسک)
+    /// </summary>
+    public Guid Id { get; init; }
+
+    /// <summary>
+    /// نام/عنوان آیتم
+    /// </summary>
+    public string Title { get; init; } = string.Empty;
+
+    /// <summary>
+    /// سطح سلسله‌مراتب این آیتم
+    /// </summary>
+    public ProjectHierarchyLevel Level { get; init; }
+
+    /// <summary>
+    /// شناسه پروژه - همیشه برای فاز و تسک پر شده است، برای پروژه با شناسه خود پر می‌شود
+    /// </summary>
+    public Guid? ProjectId { get; init; }
+
+    /// <summary>
+    /// شناسه فاز - فقط برای تسک پر شده است، برای پروژه و فاز خالی است
+    /// </summary>
+    public Guid? PhaseId { get; init; }
+}
+

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

@@ -1,18 +1,28 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
-public record GetProjectListDto
+
+// Base DTO shared across project, phase, and task
+public class GetProjectItemDto
 {
     public Guid Id { get; init; }
     public string Name { get; init; } = string.Empty;
     public int Percentage { get; init; }
     public ProjectHierarchyLevel Level { get; init; }
     public Guid? ParentId { get; init; }
-    public bool HasFront { get; set; }
+    public int TotalHours { get; set; }
-    public bool HasBackend { get; set; }
+    public int Minutes { get; set; }
-    public bool HasDesign { get; set; }
+    public AssignmentStatus Front { get; set; }
-        
+    public AssignmentStatus Backend { get; set; }
+    public AssignmentStatus Design { get; set; }
 }
 
+// Project DTO (no extra fields; inherits from base)
+public class GetProjectDto : GetProjectItemDto
+{
+}
 
-
+// Phase DTO (no extra fields; inherits from base)
+public class GetPhaseDto : GetProjectItemDto
+{
+}

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

@@ -3,6 +3,11 @@ using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using Microsoft.EntityFrameworkCore;
+using System.Linq;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
 
@@ -17,278 +22,343 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
 
     public async Task<OperationResult<GetProjectsListResponse>> Handle(GetProjectsListQuery request, CancellationToken cancellationToken)
     {
-        List<GetProjectListDto> projects;
+        var projects = new List<GetProjectDto>();
+        var phases = new List<GetPhaseDto>();
+        var tasks = new List<GetTaskDto>();
 
         switch (request.HierarchyLevel)
         {
             case ProjectHierarchyLevel.Project:
                 projects = await GetProjects(request.ParentId, cancellationToken);
+                await SetSkillFlags(projects, cancellationToken);
                 break;
             case ProjectHierarchyLevel.Phase:
-                projects = await GetPhases(request.ParentId, cancellationToken);
+                phases = await GetPhases(request.ParentId, cancellationToken);
+                await SetSkillFlags(phases, cancellationToken);
                 break;
             case ProjectHierarchyLevel.Task:
-                projects = await GetTasks(request.ParentId, cancellationToken);
+                tasks = await GetTasks(request.ParentId, cancellationToken);
+                // Tasks don't need SetSkillFlags because they have Sections list
                 break;
             default:
                 return OperationResult<GetProjectsListResponse>.Failure("سطح سلسله مراتب نامعتبر است");
         }
-        await SetSkillFlags(projects, cancellationToken);
 
-        var response = new GetProjectsListResponse(projects);
+        var response = new GetProjectsListResponse(projects, phases, tasks);
         return OperationResult<GetProjectsListResponse>.Success(response);
     }
 
-    private async Task<List<GetProjectListDto>> GetProjects(Guid? parentId, CancellationToken cancellationToken)
+    private async Task<List<GetProjectDto>> GetProjects(Guid? parentId, CancellationToken cancellationToken)
     {
         var query = _context.Projects.AsQueryable();
-
-        // پروژه‌ها سطح بالا هستند و parentId ندارند، فقط در صورت null بودن parentId نمایش داده می‌شوند
         if (parentId.HasValue)
         {
-            return new List<GetProjectListDto>(); // پروژه‌ها parent ندارند
+            return new List<GetProjectDto>();
         }
-
+        var entities = await query
-        var projects = await query
             .OrderByDescending(p => p.CreationDate)
             .ToListAsync(cancellationToken);
-        var result = new List<GetProjectListDto>();
+        var result = new List<GetProjectDto>();
-
+        foreach (var project in entities)
-        foreach (var project in projects)
         {
-            var percentage = await CalculateProjectPercentage(project, cancellationToken);
+            var (percentage, totalTime) = await CalculateProjectPercentage(project, cancellationToken);
-            result.Add(new GetProjectListDto
+            result.Add(new GetProjectDto
             {
                 Id = project.Id,
                 Name = project.Name,
                 Level = ProjectHierarchyLevel.Project,
                 ParentId = null,
-                Percentage = percentage
+                Percentage = percentage,
+                TotalHours = (int)totalTime.TotalHours,
+                Minutes = totalTime.Minutes,
             });
         }
-
         return result;
     }
 
-    private async Task<List<GetProjectListDto>> GetPhases(Guid? parentId, CancellationToken cancellationToken)
+    private async Task<List<GetPhaseDto>> GetPhases(Guid? parentId, CancellationToken cancellationToken)
     {
         var query = _context.ProjectPhases.AsQueryable();
-
         if (parentId.HasValue)
         {
             query = query.Where(x => x.ProjectId == parentId);
         }
-
+        var entities = await query
-        var phases = await query
             .OrderByDescending(p => p.CreationDate)
             .ToListAsync(cancellationToken);
-        var result = new List<GetProjectListDto>();
+        var result = new List<GetPhaseDto>();
-
+        foreach (var phase in entities)
-        foreach (var phase in phases)
         {
-            var percentage = await CalculatePhasePercentage(phase, cancellationToken);
+            var (percentage, totalTime) = await CalculatePhasePercentage(phase, cancellationToken);
-            result.Add(new GetProjectListDto
+            result.Add(new GetPhaseDto
             {
                 Id = phase.Id,
                 Name = phase.Name,
                 Level = ProjectHierarchyLevel.Phase,
                 ParentId = phase.ProjectId,
-                Percentage = percentage
+                Percentage = percentage,
+                TotalHours = (int)totalTime.TotalHours,
+                Minutes = totalTime.Minutes,
             });
         }
-
         return result;
     }
 
-    private async Task<List<GetProjectListDto>> GetTasks(Guid? parentId, CancellationToken cancellationToken)
+    private async Task<List<GetTaskDto>> GetTasks(Guid? parentId, CancellationToken cancellationToken)
     {
         var query = _context.ProjectTasks.AsQueryable();
-
         if (parentId.HasValue)
         {
             query = query.Where(x => x.PhaseId == parentId);
         }
-
+        var entities = await query
-        var tasks = await query
             .OrderByDescending(t => t.CreationDate)
             .ToListAsync(cancellationToken);
-        var result = new List<GetProjectListDto>();
+        var result = new List<GetTaskDto>();
+        // دریافت تمام Skills
+        var allSkills = await _context.Skills
+            .Select(s => new { s.Id, s.Name })
+            .ToListAsync(cancellationToken);
 
-        foreach (var task in tasks)
+        foreach (var task in entities)
         {
-            var percentage = await CalculateTaskPercentage(task, cancellationToken);
+            var (percentage, totalTime) = await CalculateTaskPercentage(task, cancellationToken);
-            result.Add(new GetProjectListDto
+            var sections = await _context.TaskSections
+                .Include(s => s.Activities)
+                .Include(s => s.Skill)
+                .Where(s => s.TaskId == task.Id)
+                .ToListAsync(cancellationToken);
+
+            // جمع‌آوری تمام userId های مورد نیاز
+            var userIds = sections
+                .Where(s => s.CurrentAssignedUserId > 0)
+                .Select(s => s.CurrentAssignedUserId)
+                .Distinct()
+                .ToList();
+
+            // دریافت اطلاعات کاربران
+            var users = await _context.Users
+                .Where(u => userIds.Contains(u.Id))
+                .Select(u => new { u.Id, u.FullName })
+                .ToDictionaryAsync(u => u.Id, u => u.FullName, cancellationToken);
+
+            // محاسبه 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 برمی‌گردانیم
+                    return new GetTaskSectionDto
+                    {
+                        Id = Guid.Empty,
+                        SkillName = skill.Name ?? string.Empty,
+                        SpentTime = TimeSpan.Zero,
+                        TotalTime = TimeSpan.Zero,
+                        Percentage = 0,
+                        UserFullName = string.Empty,
+                        AssignmentStatus = AssignmentStatus.Unassigned
+                    };
+                }
+
+                // اگر section وجود داشت
+                return new GetTaskSectionDto
+                {
+                    Id = section.Id,
+                    SkillName = skill.Name ?? string.Empty,
+                    SpentTime = TimeSpan.FromTicks(section.Activities.Sum(a => a.GetTimeSpent().Ticks)),
+                    TotalTime = section.FinalEstimatedHours,
+                    Percentage = (int)section.GetProgressPercentage(),
+                    UserFullName = section.CurrentAssignedUserId > 0 && users.ContainsKey(section.CurrentAssignedUserId)
+                        ? users[section.CurrentAssignedUserId]
+                        : string.Empty,
+                    AssignmentStatus = GetAssignmentStatus(section)
+                };
+            }).ToList();
+
+            result.Add(new GetTaskDto
             {
                 Id = task.Id,
                 Name = task.Name,
                 Level = ProjectHierarchyLevel.Task,
                 ParentId = task.PhaseId,
-                Percentage = percentage
+                Percentage = percentage,
+                TotalHours = (int)totalTime.TotalHours,
+                Minutes = totalTime.Minutes,
+                SpentTime = spentTime,
+                RemainingTime = remainingTime,
+                Sections = sectionDtos,
+                Priority = task.Priority
             });
         }
-
         return result;
     }
 
-    private async Task SetSkillFlags(List<GetProjectListDto> projects, CancellationToken cancellationToken)
+    private async Task SetSkillFlags<TItem>(List<TItem> items, CancellationToken cancellationToken) where TItem : GetProjectItemDto
     {
-        if (!projects.Any())
+        if (!items.Any())
             return;
-
+        var ids = items.Select(x => x.Id).ToList();
-        var projectIds = projects.Select(x => x.Id).ToList();
+        var hierarchyLevel = items.First().Level;
-        var hierarchyLevel = projects.First().Level;
-
         switch (hierarchyLevel)
         {
             case ProjectHierarchyLevel.Project:
-                await SetSkillFlagsForProjects(projects, projectIds, cancellationToken);
+                await SetSkillFlagsForProjects(items, ids, cancellationToken);
                 break;
-                
             case ProjectHierarchyLevel.Phase:
-                await SetSkillFlagsForPhases(projects, projectIds, cancellationToken);
+                await SetSkillFlagsForPhases(items, ids, cancellationToken);
-                break;
-                
-            case ProjectHierarchyLevel.Task:
-                await SetSkillFlagsForTasks(projects, projectIds, cancellationToken);
                 break;
         }
     }
 
-    private async Task SetSkillFlagsForProjects(List<GetProjectListDto> projects, List<Guid> projectIds, CancellationToken cancellationToken)
+
+    private async Task SetSkillFlagsForProjects<TItem>(List<TItem> items, List<Guid> projectIds, CancellationToken cancellationToken) where TItem : GetProjectItemDto
     {
-        var projectSections = await _context.ProjectSections
+        // For projects: gather all phases, then tasks, then sections
-            .Include(x => x.Skill)
+        var phases = await _context.ProjectPhases
-            .Where(s => projectIds.Contains(s.ProjectId))
+            .Where(ph => projectIds.Contains(ph.ProjectId))
+            .Select(ph => ph.Id)
+            .ToListAsync(cancellationToken);
+        var tasks = await _context.ProjectTasks
+            .Where(t => phases.Contains(t.PhaseId))
+            .Select(t => t.Id)
+            .ToListAsync(cancellationToken);
+        var sections = await _context.TaskSections
+            .Include(s => s.Skill)
+            .Where(s => tasks.Contains(s.TaskId))
             .ToListAsync(cancellationToken);
 
-        if (!projectSections.Any())
+        foreach (var item in items)
-            return;
-
-        foreach (var project in projects)
         {
-            var sections = projectSections.Where(s => s.ProjectId == project.Id).ToList();
+            var relatedPhases = phases; // used for filtering tasks by project
-            project.HasBackend = sections.Any(x => x.Skill?.Name == "Backend");
+            var relatedTasks = await _context.ProjectTasks
-            project.HasFront = sections.Any(x => x.Skill?.Name == "Frontend");
+                .Where(t => t.PhaseId != Guid.Empty && relatedPhases.Contains(t.PhaseId))
-            project.HasDesign = sections.Any(x => x.Skill?.Name == "UI/UX Design");
+                .Select(t => t.Id)
+                .ToListAsync(cancellationToken);
+            var itemSections = sections.Where(s => relatedTasks.Contains(s.TaskId));
+            item.Backend = GetAssignmentStatus(itemSections.FirstOrDefault(x => x.Skill?.Name == "Backend"));
+            item.Front = GetAssignmentStatus(itemSections.FirstOrDefault(x => x.Skill?.Name == "Frontend"));
+            item.Design = GetAssignmentStatus(itemSections.FirstOrDefault(x => x.Skill?.Name == "UI/UX Design"));
         }
     }
 
-    private async Task SetSkillFlagsForPhases(List<GetProjectListDto> projects, List<Guid> phaseIds, CancellationToken cancellationToken)
+    private async Task SetSkillFlagsForPhases<TItem>(List<TItem> items, List<Guid> phaseIds, CancellationToken cancellationToken) where TItem : GetProjectItemDto
     {
-        var phaseSections = await _context.PhaseSections
+        // For phases: gather tasks, then sections
-            .Include(x => x.Skill)
+        var tasks = await _context.ProjectTasks
-            .Where(s => phaseIds.Contains(s.PhaseId))
+            .Where(t => phaseIds.Contains(t.PhaseId))
+            .Select(t => t.Id)
+            .ToListAsync(cancellationToken);
+        var sections = await _context.TaskSections
+            .Include(s => s.Skill)
+            .Where(s => tasks.Contains(s.TaskId))
             .ToListAsync(cancellationToken);
 
-        if (!phaseSections.Any())
+        foreach (var item in items)
-            return;
-
-        foreach (var phase in projects)
         {
-            var sections = phaseSections.Where(s => s.PhaseId == phase.Id).ToList();
+            // Filter tasks for this phase
-            phase.HasBackend = sections.Any(x => x.Skill?.Name == "Backend");
+            var phaseTaskIds = await _context.ProjectTasks
-            phase.HasFront = sections.Any(x => x.Skill?.Name == "Frontend");
+                .Where(t => t.PhaseId == item.Id)
-            phase.HasDesign = sections.Any(x => x.Skill?.Name == "UI/UX Design");
+                .Select(t => t.Id)
+                .ToListAsync(cancellationToken);
+            var itemSections = sections.Where(s => phaseTaskIds.Contains(s.TaskId));
+            item.Backend = GetAssignmentStatus(itemSections.FirstOrDefault(x => x.Skill?.Name == "Backend"));
+            item.Front = GetAssignmentStatus(itemSections.FirstOrDefault(x => x.Skill?.Name == "Frontend"));
+            item.Design = GetAssignmentStatus(itemSections.FirstOrDefault(x => x.Skill?.Name == "UI/UX Design"));
         }
     }
 
-    private async Task SetSkillFlagsForTasks(List<GetProjectListDto> projects, List<Guid> taskIds, CancellationToken cancellationToken)
+    private async Task<(int Percentage, TimeSpan TotalTime)> CalculateProjectPercentage(Project project, CancellationToken cancellationToken)
     {
-        var taskSections = await _context.TaskSections
-            .Include(x => x.Skill)
-            .Where(s => taskIds.Contains(s.TaskId))
-            .ToListAsync(cancellationToken);
-
-        if (!taskSections.Any())
-            return;
-
-        foreach (var task in projects)
-        {
-            var sections = taskSections.Where(s => s.TaskId == task.Id).ToList();
-            task.HasBackend = sections.Any(x => x.Skill?.Name == "Backend");
-            task.HasFront = sections.Any(x => x.Skill?.Name == "Frontend");
-            task.HasDesign = sections.Any(x => x.Skill?.Name == "UI/UX Design");
-        }
-    }
-
-    private async Task<int> CalculateProjectPercentage(Project project, CancellationToken cancellationToken)
-    {
-        // گرفتن تمام فازهای پروژه
         var phases = await _context.ProjectPhases
             .Where(ph => ph.ProjectId == project.Id)
             .ToListAsync(cancellationToken);
-
         if (!phases.Any())
-            return 0;
+            return (0, TimeSpan.Zero);
-
-        // محاسبه درصد هر فاز و میانگین‌گیری
         var phasePercentages = new List<int>();
+        var totalTime = TimeSpan.Zero;
         foreach (var phase in phases)
         {
-            var phasePercentage = await CalculatePhasePercentage(phase, cancellationToken);
+            var (phasePercentage, phaseTime) = await CalculatePhasePercentage(phase, cancellationToken);
             phasePercentages.Add(phasePercentage);
+            totalTime += phaseTime;
         }
-
+        var averagePercentage = phasePercentages.Any() ? (int)phasePercentages.Average() : 0;
-        return phasePercentages.Any() ? (int)phasePercentages.Average() : 0;
+        return (averagePercentage, totalTime);
     }
 
-    private async Task<int> 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;
+            return (0, TimeSpan.Zero);
-
-        // محاسبه درصد هر تسک و میانگین‌گیری
         var taskPercentages = new List<int>();
+        var totalTime = TimeSpan.Zero;
         foreach (var task in tasks)
         {
-            var taskPercentage = await CalculateTaskPercentage(task, cancellationToken);
+            var (taskPercentage, taskTime) = await CalculateTaskPercentage(task, cancellationToken);
             taskPercentages.Add(taskPercentage);
+            totalTime += taskTime;
         }
-
+        var averagePercentage = taskPercentages.Any() ? (int)taskPercentages.Average() : 0;
-        return taskPercentages.Any() ? (int)taskPercentages.Average() : 0;
+        return (averagePercentage, totalTime);
     }
 
-    private async Task<int> CalculateTaskPercentage(ProjectTask task, CancellationToken cancellationToken)
+    private async Task<(int Percentage, TimeSpan TotalTime)> CalculateTaskPercentage(ProjectTask task, CancellationToken cancellationToken)
     {
-        // گرفتن تمام سکشن‌های تسک با activities
         var sections = await _context.TaskSections
             .Include(s => s.Activities)
+            .Include(x=>x.AdditionalTimes)
             .Where(s => s.TaskId == task.Id)
             .ToListAsync(cancellationToken);
-
         if (!sections.Any())
-            return 0;
+            return (0, TimeSpan.Zero);
-
-        // محاسبه درصد هر سکشن و میانگین‌گیری
         var sectionPercentages = new List<int>();
+        var totalTime = TimeSpan.Zero;
         foreach (var section in sections)
         {
-            var sectionPercentage = CalculateSectionPercentage(section);
+            var (sectionPercentage, sectionTime) = CalculateSectionPercentage(section);
             sectionPercentages.Add(sectionPercentage);
+            totalTime += sectionTime;
         }
-
+        var averagePercentage = sectionPercentages.Any() ? (int)sectionPercentages.Average() : 0;
-        return sectionPercentages.Any() ? (int)sectionPercentages.Average() : 0;
+        return (averagePercentage, totalTime);
     }
 
-    private static int CalculateSectionPercentage(TaskSection section)
+    private static (int Percentage, TimeSpan TotalTime) CalculateSectionPercentage(TaskSection section)
     {
-        // محاسبه کل زمان تخمین زده شده (اولیه + اضافی)
+        return ((int)section.GetProgressPercentage(),section.FinalEstimatedHours);
-        var totalEstimatedHours = section.FinalEstimatedHours.TotalHours;
+    }
 
-        if (totalEstimatedHours <= 0)
+    private static AssignmentStatus GetAssignmentStatus(TaskSection? section)
-            return 0;
+    {
+        // تعیین تکلیف نشده: section وجود ندارد
+        if (section == null)
+            return AssignmentStatus.Unassigned;
 
-        // محاسبه کل زمان صرف شده از activities
+        // بررسی وجود user
-        var totalSpentHours = section.Activities.Sum(a => a.GetTimeSpent().TotalHours);
+        bool hasUser = section.CurrentAssignedUserId > 0;
+        
+        // بررسی وجود time (InitialEstimatedHours بزرگتر از صفر باشد)
+        bool hasTime = section.InitialEstimatedHours > TimeSpan.Zero;
 
-        // محاسبه درصد (حداکثر 100%)
+        // تعیین تکلیف شده: هم user و هم time تعیین شده
-        var percentage = (totalSpentHours / totalEstimatedHours) * 100;
+        if (hasUser && hasTime)
-        return Math.Min((int)Math.Round(percentage), 100);
+            return AssignmentStatus.Assigned;
+
+        // فقط کاربر تعیین شده: user دارد ولی time ندارد
+        if (hasUser && !hasTime)
+            return AssignmentStatus.UserOnly;
+
+        // تعیین تکلیف نشده: نه user دارد نه time
+        return AssignmentStatus.Unassigned;
     }
 }
 

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

@@ -1,5 +1,6 @@
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
 
 public record GetProjectsListResponse(
-    List<GetProjectListDto> Projects);
+    List<GetProjectDto> Projects,
-
+    List<GetPhaseDto> Phases,
+    List<GetTaskDto> Tasks);

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

@@ -0,0 +1,32 @@
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
+
+public class GetTaskDto
+{
+    public Guid Id { get; init; }
+    public string Name { get; init; } = string.Empty;
+    public int Percentage { get; init; }
+    public ProjectHierarchyLevel Level { get; init; }
+    public Guid? ParentId { get; init; }
+    public int TotalHours { get; set; }
+    public int Minutes { get; set; }
+    
+    // Task-specific fields
+    public TimeSpan SpentTime { get; init; }
+    public TimeSpan RemainingTime { get; init; }
+    public ProjectTaskPriority Priority { get; set; }
+    public List<GetTaskSectionDto> Sections { get;  init; }
+}
+
+public class GetTaskSectionDto
+{
+    public Guid Id { get; init; }
+    public string SkillName { get; init; } = string.Empty;
+    public TimeSpan SpentTime { get; init; }
+    public TimeSpan TotalTime { get; init; }
+    public int Percentage { get; init; }
+    public string UserFullName{ get; init; } = string.Empty;
+    public AssignmentStatus AssignmentStatus { get; set; }
+    
+}

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

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

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

@@ -3,7 +3,6 @@ using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Query.Internal;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectBoardList;
 
@@ -22,8 +21,10 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
         CancellationToken cancellationToken)
     {
         var currentUserId = _authHelper.GetCurrentUserId();
+        
         var queryable = _programManagerDbContext.TaskSections.AsNoTracking()
-            .Where(x => x.InitialEstimatedHours > TimeSpan.Zero)
+            .Where(x => x.InitialEstimatedHours > TimeSpan.Zero 
+                        && x.Status != TaskSectionStatus.Completed)
             .Include(x => x.Task)
             .ThenInclude(x => x.Phase)
             .ThenInclude(x => x.Project)
@@ -39,10 +40,23 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
         {
             queryable = queryable.Where(x => x.Status == request.Status);
         }
+
+        if (request.UserId is > 0)
+        {
+            queryable = queryable.Where(x => x.CurrentAssignedUserId == request.UserId);
+        }
+
+        if (!string.IsNullOrWhiteSpace(request.SearchText))
+        {
+            queryable = queryable.Where(x=>x.Task.Name.Contains(request.SearchText)
+            || x.Task.Phase.Name.Contains(request.SearchText)
+            || x.Task.Phase.Project.Name.Contains(request.SearchText));
+        }
         
         var data = await queryable.ToListAsync(cancellationToken);
 
-        var activityUserIds = data.SelectMany(x => x.Activities).Select(a => a.UserId).Distinct().ToList();
+        var activityUserIds = data.SelectMany(x => x.Activities)
+            .Select(a => a.UserId).Distinct().ToList();
         var assignedUser = data.Select(x => x.CurrentAssignedUserId)
             .Concat(data.Select(x => x.OriginalAssignedUserId)).ToList(); 
         var allUserIds = activityUserIds.Concat(assignedUser).Distinct().ToList();
@@ -52,68 +66,87 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
             .ToDictionaryAsync(x => x.Id, x => x.FullName, cancellationToken);
         
 
-        var result = data.Select(x =>
+        var result = data
-        {
+            .OrderByDescending(x => x.CurrentAssignedUserId == currentUserId)
-            // محاسبه یکبار برای هر Activity و Cache کردن نتیجه
+            .ThenByDescending(x=>x.Task.Priority)
-            var activityTimeData = x.Activities.Select(a =>
+            .ThenBy(x => GetStatusOrder(x.Status))
+            .Select(x =>
             {
-                var timeSpent = a.GetTimeSpent();
+                // محاسبه یکبار برای هر Activity و Cache کردن نتیجه
-                return new
+                var activityTimeData = x.Activities.Select(a =>
                 {
-                    Activity = a,
+                    var timeSpent = a.GetTimeSpent();
-                    TimeSpent = timeSpent,
+                    return new
-                    TotalSeconds = timeSpent.TotalSeconds,
+                    {
-                    FormattedTime = timeSpent.ToString(@"hh\:mm")
+                        Activity = a,
+                        TimeSpent = timeSpent,
+                        timeSpent.TotalSeconds,
+                        FormattedTime = timeSpent.ToString(@"hh\:mm")
+                    };
+                }).ToList();
+
+                // ادغام پشت سر هم فعالیت‌های یک کاربر
+                var mergedHistories = new List<ProjectProgressHistoryDto>();
+                foreach (var activityData in activityTimeData)
+                {
+                    var lastHistory = mergedHistories.LastOrDefault();
+
+                    // اگر آخرین history برای همین کاربر باشد، زمان‌ها را جمع می‌کنیم
+                    if (lastHistory != null && lastHistory.UserId == activityData.Activity.UserId)
+                    {
+                        var totalTimeSpan = lastHistory.WorkedTimeSpan + activityData.TimeSpent;
+                        lastHistory.WorkedTimeSpan = totalTimeSpan;
+                        lastHistory.WorkedTime = totalTimeSpan.ToString(@"hh\:mm");
+                    }
+                    else
+                    {
+                        // در غیر این صورت، یک history جدید اضافه می‌کنیم
+                        mergedHistories.Add(new ProjectProgressHistoryDto()
+                        {
+                            UserId = activityData.Activity.UserId,
+                            IsCurrentUser = activityData.Activity.UserId == currentUserId,
+                            Name = users.GetValueOrDefault(activityData.Activity.UserId, "ناشناس"),
+                            WorkedTime = activityData.FormattedTime,
+                            WorkedTimeSpan = activityData.TimeSpent,
+                        });
+                    }
+                }
+                return new ProjectBoardListResponse()
+                {
+                    Id = x.Id,
+                    PhaseName = x.Task.Phase.Name,
+                    ProjectName = x.Task.Phase.Project.Name,
+                    TaskName = x.Task.Name,
+                    SectionStatus = x.Status,
+                    TaskPriority = x.Task.Priority,
+                    Progress = new ProjectProgressDto()
+                    {
+                        CompleteSecond = x.FinalEstimatedHours.TotalSeconds,
+                        Percentage = (int)x.GetProgressPercentage(),
+                        CurrentSecond = activityTimeData.Sum(a => a.TotalSeconds),
+                        Histories = mergedHistories
+                    },
+                    OriginalUser = users.GetValueOrDefault(x.OriginalAssignedUserId, "ناشناس"),
+                    AssignedUser = x.CurrentAssignedUserId == x.OriginalAssignedUserId ? null 
+                        : users.GetValueOrDefault(x.CurrentAssignedUserId, "ناشناس"),
+                    SkillName =  x.Skill?.Name??"-",
+                    TaskId = x.TaskId
                 };
             }).ToList();
 
-            // ادغام پشت سر هم فعالیت‌های یک کاربر
-            var mergedHistories = new List<ProjectProgressHistoryDto>();
-            foreach (var activityData in activityTimeData)
-            {
-                var lastHistory = mergedHistories.LastOrDefault();
-
-                // اگر آخرین history برای همین کاربر باشد، زمان‌ها را جمع می‌کنیم
-                if (lastHistory != null && lastHistory.UserId == activityData.Activity.UserId)
-                {
-                    var totalTimeSpan = lastHistory.WorkedTimeSpan + activityData.TimeSpent;
-                    lastHistory.WorkedTimeSpan = totalTimeSpan;
-                    lastHistory.WorkedTime = totalTimeSpan.ToString(@"hh\:mm");
-                }
-                else
-                {
-                    // در غیر این صورت، یک history جدید اضافه می‌کنیم
-                    mergedHistories.Add(new ProjectProgressHistoryDto()
-                    {
-                        UserId = activityData.Activity.UserId,
-                        IsCurrentUser = activityData.Activity.UserId == currentUserId,
-                        Name = users.GetValueOrDefault(activityData.Activity.UserId, "ناشناس"),
-                        WorkedTime = activityData.FormattedTime,
-                        WorkedTimeSpan = activityData.TimeSpent,
-                    });
-                }
-            }
-
-            return new ProjectBoardListResponse()
-            {
-                Id = x.Id,
-                PhaseName = x.Task.Phase.Name,
-                ProjectName = x.Task.Phase.Project.Name,
-                TaskName = x.Task.Name,
-                SectionStatus = x.Status,
-                Progress = new ProjectProgressDto()
-                {
-                    CompleteSecond = x.FinalEstimatedHours.TotalSeconds,
-                    CurrentSecond = activityTimeData.Sum(a => a.TotalSeconds),
-                    Histories = mergedHistories
-                },
-                OriginalUser = users.GetValueOrDefault(x.OriginalAssignedUserId, "ناشناس"),
-                AssignedUser = x.CurrentAssignedUserId == x.OriginalAssignedUserId ? null 
-                    : users.GetValueOrDefault(x.CurrentAssignedUserId, "ناشناس"),
-                SkillName =  x.Skill?.Name??"-",
-            };
-        }).ToList();
-
         return OperationResult<List<ProjectBoardListResponse>>.Success(result);
     }
+
+    private static int GetStatusOrder(TaskSectionStatus status)
+    {
+        return status switch
+        {
+            TaskSectionStatus.InProgress => 0,
+            TaskSectionStatus.Incomplete => 1,
+            TaskSectionStatus.NotAssigned => 2,
+            TaskSectionStatus.ReadyToStart => 2,
+            TaskSectionStatus.PendingForCompletion => 3,
+            _ => 99
+        };
+    }
 }

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

@@ -13,11 +13,14 @@ public class ProjectBoardListResponse
     public string? AssignedUser { get; set; }
     public string OriginalUser { get; set; }
     public string SkillName { get; set; }
+    public ProjectTaskPriority TaskPriority { get; set; }
+    public Guid TaskId { get; set; }
     
 }
 public class ProjectProgressDto
 {
     public double CurrentSecond { get; set; }
+    public int Percentage { get; set; }
     public double CompleteSecond { get; set; }
     public List<ProjectProgressHistoryDto> Histories { get; set; }
 }

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

@@ -0,0 +1,127 @@
+using System.Security.AccessControl;
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectDeployBoardDetail;
+
+public record ProjectDeployBoardDetailsResponse(
+    ProjectDeployBoardDetailPhaseItem Phase,
+    List<ProjectDeployBoardDetailTaskItem> Tasks);
+
+public record ProjectDeployBoardDetailPhaseItem(
+    string Name,
+    TimeSpan TotalTimeSpan,
+    TimeSpan DoneTimeSpan,
+    int Percentage);
+
+public record ProjectDeployBoardDetailTaskItem(
+    string Name,
+    TimeSpan TotalTimeSpan,
+    TimeSpan DoneTimeSpan,
+    int Percentage,
+    List<ProjectDeployBoardDetailItemSkill> Skills)
+    : ProjectDeployBoardDetailPhaseItem(Name, TotalTimeSpan, DoneTimeSpan, Percentage);
+
+public record ProjectDeployBoardDetailItemSkill(string OriginalUserFullName, string SkillName, int TimePercentage);
+
+public record ProjectDeployBoardDetailsQuery(Guid PhaseId) : IBaseQuery<ProjectDeployBoardDetailsResponse>;
+
+public class
+    ProjectDeployBoardDetailsQueryHandler : IBaseQueryHandler<ProjectDeployBoardDetailsQuery,
+    ProjectDeployBoardDetailsResponse>
+{
+    private readonly IProgramManagerDbContext _dbContext;
+
+    public ProjectDeployBoardDetailsQueryHandler(IProgramManagerDbContext dbContext)
+    {
+        _dbContext = dbContext;
+    }
+
+    public async Task<OperationResult<ProjectDeployBoardDetailsResponse>> Handle(ProjectDeployBoardDetailsQuery request,
+        CancellationToken cancellationToken)
+    {
+        var phase = await _dbContext.ProjectPhases
+            .Include(x => x.Tasks)
+            .ThenInclude(x => x.Sections)
+            .ThenInclude(x => x.Activities)
+            .Include(x => x.Tasks)
+            .ThenInclude(x => x.Sections)
+            .ThenInclude(x => x.AdditionalTimes)
+            .Include(x => x.Tasks)
+            .ThenInclude(x => x.Sections)
+            .ThenInclude(x => x.Skill)
+            .FirstOrDefaultAsync(x => x.Id == request.PhaseId, cancellationToken);
+
+        if (phase == null)
+            return OperationResult<ProjectDeployBoardDetailsResponse>.NotFound("بخش اصلی مورد نظر یافت نشد");
+
+        var userIds = phase.Tasks
+            .SelectMany(t => t.Sections)
+            .Select(s => s.OriginalAssignedUserId)
+            .Distinct()
+            .ToList();
+
+        var usersDict = await _dbContext.Users
+            .Where(x => userIds.Contains(x.Id))
+            .ToDictionaryAsync(x => x.Id, x => x.FullName, cancellationToken);
+
+        var tasksRes = phase.Tasks.Select(t =>
+        {
+            var totalTime = t.Sections.Select(s => s.FinalEstimatedHours)
+                .Aggregate(TimeSpan.Zero, (sum, next) => sum.Add(next));
+
+            var doneTime = t.Sections.Aggregate(TimeSpan.Zero,
+                (sum, next) => sum.Add(next.GetTotalTimeSpent()));
+
+            var skills = t.Sections
+                .Select(s =>
+                {
+                    var originalUserFullName = usersDict.GetValueOrDefault(s.OriginalAssignedUserId,
+                        "کاربر ناشناس");
+
+                    var skillName = s.Skill?.Name ?? "بدون مهارت";
+
+                    var timePercentage = (int)s.GetProgressPercentage();
+
+                    return new ProjectDeployBoardDetailItemSkill(
+                        originalUserFullName,
+                        skillName,
+                        timePercentage);
+                }).ToList();
+
+            int taskPercentage;
+
+            if (skills.Count == 0)
+            {
+                taskPercentage = 0;
+            }
+            else
+            {
+                taskPercentage = (int)Math.Round(skills.Average(x => x.TimePercentage));
+            }
+
+            return new ProjectDeployBoardDetailTaskItem(
+                t.Name,
+                totalTime,
+                doneTime,
+                taskPercentage,
+                skills);
+        }).ToList();
+
+        var totalTimeSpan = tasksRes.Aggregate(TimeSpan.Zero,
+            (sum, next) => sum.Add(next.TotalTimeSpan));
+
+        var doneTimeSpan = tasksRes.Aggregate(TimeSpan.Zero,
+            (sum, next) => sum.Add(next.DoneTimeSpan));
+
+        var phasePercentage = tasksRes.Average(x => x.Percentage);
+
+        var phaseRes = new ProjectDeployBoardDetailPhaseItem(phase.Name, totalTimeSpan, doneTimeSpan,
+            (int)phasePercentage);
+
+        var res = new ProjectDeployBoardDetailsResponse(phaseRes, tasksRes);
+
+        return OperationResult<ProjectDeployBoardDetailsResponse>.Success(res);
+    }
+}