add message type to search query

.gitignore

@@ -362,8 +362,6 @@ 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/PagedResult.cs

@@ -7,7 +7,7 @@ namespace _0_Framework.Application;
 public class PagedResult<T> where T : class
 {
     public int TotalCount  { get; set; }
-    public List<T> List { get; set; } = [];
+    public List<T> List { get; set; }
 }
 public class PagedResult<T,TMeta>:PagedResult<T> where T : class
 {

Company.Domain/InstitutionContractSendFlagAgg/IInstitutionContractSendFlagRepository.cs

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

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

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.RollCall;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;
@@ -92,9 +91,5 @@ namespace Company.Domain.RollCallAgg
         Task<List<RollCall>> GetRollCallsUntilNowWithWorkshopIdEmployeeIds(long workshopId, List<long> employeeIds,
             DateTime fromDate);
         #endregion
-
-        Task<PagedResult<RollCallCaseHistoryTitleDto>> GetCaseHistoryTitles(long workshopId,RollCallCaseHistorySearchModel searchModel);
-        Task<List<RollCallCaseHistoryDetail>> GetCaseHistoryDetails(long workshopId,
-            string titleId, RollCallCaseHistorySearchModel searchModel);
     }
 }

CompanyManagement.Infrastructure.Excel/RollCall/RollCallExcelGenerator.cs

@@ -1,12 +1,6 @@
 using _0_Framework.Excel;
-using _0_Framework.Application;
-using CompanyManagment.App.Contracts.RollCall;
 using OfficeOpenXml;
 using OfficeOpenXml.Drawing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
 
 namespace CompanyManagement.Infrastructure.Excel.RollCall;
 
@@ -314,111 +308,6 @@ public class RollCallExcelGenerator : ExcelGenerator
         return package.GetAsByteArray();
     }
 
-    public static byte[] CaseHistoryExcelForEmployee(List<RollCallCaseHistoryDetail> data, string titleId)
-    {
-        if (!Regex.IsMatch(titleId, @"^\d{4}_\d{2}$"))
-            throw new ArgumentException("Invalid titleId format.", nameof(titleId));
-
-        var splitDate = titleId.Split("_");
-        var year = Convert.ToInt32(splitDate.First());
-        var month = Convert.ToInt32(splitDate.Last());
-
-        var startDateFa = $"{year:D4}/{month:D2}/01";
-        var startDate = startDateFa.ToGeorgianDateTime();
-        var endDateFa = startDateFa.FindeEndOfMonth();
-        var endDate = endDateFa.ToGeorgianDateTime();
-
-        var dateRange = (int)(endDate.Date - startDate.Date).TotalDays + 1;
-        var dates = Enumerable.Range(0, dateRange).Select(x => startDate.AddDays(x)).ToList();
-
-        var safeData = data ?? new List<RollCallCaseHistoryDetail>();
-        var first = safeData.FirstOrDefault();
-        var totalWorkingTime = new TimeSpan(safeData.Sum(x => x.TotalWorkingTime.Ticks));
-
-        var viewModel = new CaseHistoryRollCallExcelForEmployeeViewModel
-        {
-            EmployeeId = first?.EmployeeId ?? 0,
-            DateGr = startDate,
-            PersonnelCode = first?.PersonnelCode,
-            EmployeeFullName = first?.EmployeeFullName,
-            PersianMonthName = month.ToFarsiMonthByIntNumber(),
-            PersianYear = year.ToString(),
-            TotalWorkingHoursFa = totalWorkingTime.ToFarsiHoursAndMinutes("-"),
-            TotalWorkingTimeSpan = $"{(int)totalWorkingTime.TotalHours}:{totalWorkingTime.Minutes:00}",
-            RollCalls = dates.Select((date, index) =>
-            {
-                var item = index < safeData.Count ? safeData[index] : null;
-                var records = item?.Records ?? new List<RollCallCaseHistoryDetailRecord>();
-
-                return new RollCallItemForEmployeeExcelViewModel
-                {
-                    DateGr = date,
-                    DateFa = date.ToFarsi(),
-                    DayOfWeekFa = date.DayOfWeek.DayOfWeeKToPersian(),
-                    PersonnelCode = item?.PersonnelCode,
-                    EmployeeFullName = item?.EmployeeFullName,
-                    IsAbsent = item?.Status == RollCallRecordStatus.Absent,
-                    HasLeave = item?.Status == RollCallRecordStatus.Leaved,
-                    IsHoliday = false,
-                    TotalWorkingHours = (item?.TotalWorkingTime ?? TimeSpan.Zero).ToFarsiHoursAndMinutes("-"),
-                    StartsItems = JoinRecords(records, r => r.StartTime),
-                    EndsItems = JoinRecords(records, r => r.EndTime),
-                    EnterTimeDifferences = JoinRecords(records, r => FormatSignedTimeSpan(r.EntryTimeDifference)),
-                    ExitTimeDifferences = JoinRecords(records, r => FormatSignedTimeSpan(r.ExitTimeDifference))
-                };
-            }).ToList()
-        };
-
-        return CaseHistoryExcelForEmployee(viewModel);
-    }
-
-    public static byte[] CaseHistoryExcelForOneDay(List<RollCallCaseHistoryDetail> data, string titleId)
-    {
-        if (!Regex.IsMatch(titleId, @"^\d{4}/\d{2}/\d{2}$"))
-            throw new ArgumentException("Invalid titleId format.", nameof(titleId));
-
-        var dateGr = titleId.ToGeorgianDateTime();
-        var safeData = data ?? new List<RollCallCaseHistoryDetail>();
-
-        var viewModel = new CaseHistoryRollCallForOneDayViewModel
-        {
-            DateFa = titleId,
-            DateGr = dateGr,
-            DayOfWeekFa = dateGr.DayOfWeek.DayOfWeeKToPersian(),
-            RollCalls = safeData.Select(item =>
-            {
-                var records = item.Records ?? new List<RollCallCaseHistoryDetailRecord>();
-                return new RollCallItemForOneDayExcelViewModel
-                {
-                    EmployeeFullName = item.EmployeeFullName,
-                    PersonnelCode = item.PersonnelCode,
-                    StartsItems = JoinRecords(records, r => r.StartTime),
-                    EndsItems = JoinRecords(records, r => r.EndTime),
-                    TotalWorkingHours = item.TotalWorkingTime.ToFarsiHoursAndMinutes("-")
-                };
-            }).ToList()
-        };
-
-        return CaseHistoryExcelForOneDay(viewModel);
-    }
-
-    private static string JoinRecords(IEnumerable<RollCallCaseHistoryDetailRecord> records, Func<RollCallCaseHistoryDetailRecord, string> selector)
-    {
-        var safeRecords = records ?? Enumerable.Empty<RollCallCaseHistoryDetailRecord>();
-        var values = safeRecords.Select(selector).Where(x => !string.IsNullOrWhiteSpace(x)).ToList();
-        return values.Count == 0 ? string.Empty : string.Join(Environment.NewLine, values);
-    }
-
-    private static string FormatSignedTimeSpan(TimeSpan value)
-    {
-        if (value == TimeSpan.Zero)
-            return "-";
-
-        var abs = value.Duration();
-        var sign = value.Ticks < 0 ? "-" : "+";
-        return $"{(int)abs.TotalHours}:{abs.Minutes:00}{sign}";
-    }
-
     private string CalculateExitMinuteDifference(TimeSpan early, TimeSpan late)
     {
         if (early == TimeSpan.Zero && late == TimeSpan.Zero)

CompanyManagement.Infrastructure.Mongo/InstitutionContractSendFlagRepo/InstitutionContractSendFlagRepository.cs

@@ -1,58 +0,0 @@
-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/InstitutionContract/GetInstitutionContractListItemsViewModel.cs

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

CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

@@ -305,14 +305,6 @@ public interface IInstitutionContractApplication
     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

CompanyManagment.App.Contracts/InstitutionContract/SetInstitutionContractSendFlagRequest.cs

@@ -1,19 +0,0 @@
-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/RollCall/IRollCallApplication.cs

@@ -4,8 +4,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Application;
-using CompanyManagment.App.Contracts.Workshop;
-using Microsoft.AspNetCore.Mvc;
 
 namespace CompanyManagment.App.Contracts.RollCall
 {
@@ -127,62 +125,7 @@ namespace CompanyManagment.App.Contracts.RollCall
         /// <param name="command"></param>
         /// <returns></returns>
         Task<OperationResult> RecalculateValues(long workshopId, List<ReCalculateRollCallValues> command);
-
-        Task<PagedResult<RollCallCaseHistoryTitleDto>> GetCaseHistoryTitles(long workshopId,RollCallCaseHistorySearchModel searchModel);
-        Task<List<RollCallCaseHistoryDetail>> GetCaseHistoryDetails(long workshopId, string titleId,
-	        RollCallCaseHistorySearchModel searchModel);
-
-        Task<RollCallCaseHistoryExcelDto> DownloadCaseHistoryExcel(long workshopId, string titleId,
-	        RollCallCaseHistorySearchModel searchModel);
     }
-
-    public class RollCallCaseHistoryExcelDto
-    {
-	    public byte[] Bytes { get; set; }
-	    public string FileName { get; set; }
-	    public string MimeType { get; set; }
-    }
-
-    public class RollCallCaseHistoryDetail
-    {
-	    public string EmployeeFullName { get; set; }
-	    public string PersonnelCode { get; set; }
-	    public TimeSpan TotalWorkingTime { get; set; }
-	    public List<RollCallCaseHistoryDetailRecord> Records { get; set; }
-	    public RollCallRecordStatus Status { get; set; }
-	    public long EmployeeId { get; set; }
-    }
-
-    public enum RollCallRecordStatus
-    {
-	    Worked = 0,
-	    Absent = 1,
-	    Leaved = 2
-    }
-
-    public class RollCallCaseHistoryDetailRecord
-    {
-	    public TimeSpan EntryTimeDifference { get; set; }
-	    public string StartTime { get; set; }
-	    public string EndTime { get; set; }
-	    public TimeSpan ExitTimeDifference { get; set; }
-	    
-    }
-
-    public class RollCallCaseHistorySearchModel:PaginationRequest
-    {
-	    public string StartDate { get; set; }
-	    public string EndDate { get; set; }
-	    public string OneDayDate { get; set; }
-	    public long? EmployeeId { get; set; }
-    }
-
-    public class RollCallCaseHistoryTitleDto
-    {
-	    public string Id { get; set; }
-	    public string Title { get; set; }
-    }
-
     public class ReCalculateRollCallValues
     {
         public long EmployeeId { get; set; }

CompanyManagment.Application/CompanyManagment.Application.csproj

@@ -13,7 +13,6 @@
   <ItemGroup>
     <ProjectReference Include="..\0_Framework\0_Framework.csproj" />
     <ProjectReference Include="..\Company.Domain\Company.Domain.csproj" />
-    <ProjectReference Include="..\CompanyManagement.Infrastructure.Excel\CompanyManagement.Infrastructure.Excel.csproj" />
     <ProjectReference Include="..\CompanyManagment.App.Contracts\CompanyManagment.App.Contracts.csproj" />
     <ProjectReference Include="..\CompanyManagment.EFCore\CompanyManagment.EFCore.csproj" />
   </ItemGroup>

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -19,7 +19,6 @@ using Company.Domain.PaymentTransactionAgg;
 using Company.Domain.RepresentativeAgg;
 using Company.Domain.RollCallServiceAgg;
 using Company.Domain.WorkshopAgg;
-using Company.Domain.InstitutionContractSendFlagAgg;
 using CompanyManagment.App.Contracts.FinancialInvoice;
 using CompanyManagment.App.Contracts.FinancialStatment;
 using CompanyManagment.App.Contracts.InstitutionContract;
@@ -52,7 +51,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
     private readonly IPaymentTransactionRepository _paymentTransactionRepository;
     private readonly IRollCallServiceRepository _rollCallServiceRepository;
     private readonly ISepehrPaymentGatewayService _sepehrPaymentGatewayService;
-    private readonly IInstitutionContractSendFlagRepository _institutionContractSendFlagRepository;
 
 
     public InstitutionContractApplication(IInstitutionContractRepository institutionContractRepository,
@@ -64,8 +62,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         IAccountApplication accountApplication, ISmsService smsService,
         IFinancialInvoiceRepository financialInvoiceRepository, IHttpClientFactory httpClientFactory,
         IPaymentTransactionRepository paymentTransactionRepository, IRollCallServiceRepository rollCallServiceRepository,
-        ISepehrPaymentGatewayService sepehrPaymentGatewayService,ILogger<SepehrPaymentGateway> sepehrGatewayLogger,
-        IInstitutionContractSendFlagRepository institutionContractSendFlagRepository)
+        ISepehrPaymentGatewayService sepehrPaymentGatewayService,ILogger<SepehrPaymentGateway> sepehrGatewayLogger)
     {
         _institutionContractRepository = institutionContractRepository;
         _contractingPartyRepository = contractingPartyRepository;
@@ -83,7 +80,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         _rollCallServiceRepository = rollCallServiceRepository;
         _sepehrPaymentGatewayService = sepehrPaymentGatewayService;
         _paymentGateway = new SepehrPaymentGateway(httpClientFactory,sepehrGatewayLogger);
-        _institutionContractSendFlagRepository = institutionContractSendFlagRepository;
     }
 
 	public OperationResult Create(CreateInstitutionContract command)
@@ -898,7 +894,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return opration.Succcedded();
     }
 
-
     public void CreateContractingPartyAccount(long contractingPartyid, long accountId)
     {
         _institutionContractRepository.CreateContractingPartyAccount(contractingPartyid, accountId);
@@ -1825,59 +1820,6 @@ 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}");
-            }
     }
 }
 

CompanyManagment.Application/RollCallApplication.cs

@@ -3,11 +3,9 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
-using _0_Framework.Exceptions;
 using Company.Domain.CheckoutAgg;
 using Company.Domain.CustomizeCheckoutAgg;
 using Company.Domain.CustomizeCheckoutTempAgg;
@@ -18,8 +16,6 @@ using Company.Domain.LeaveAgg;
 using Company.Domain.RollCallAgg;
 using Company.Domain.RollCallAgg.DomainService;
 using Company.Domain.RollCallEmployeeAgg;
-using Company.Domain.WorkshopAgg;
-using CompanyManagement.Infrastructure.Excel.RollCall;
 using CompanyManagment.App.Contracts.Checkout;
 using CompanyManagment.App.Contracts.Employee;
 using CompanyManagment.App.Contracts.RollCall;
@@ -38,9 +34,8 @@ public class RollCallApplication : IRollCallApplication
 	private readonly ICustomizeWorkshopSettingsRepository _customizeWorkshopSettingsRepository;
 	private readonly ICustomizeWorkshopEmployeeSettingsRepository _customizeWorkshopEmployeeSettingsRepository;
     private readonly ICustomizeCheckoutTempRepository _customizeCheckoutTempRepository;
-    private readonly IWorkshopRepository _workshopRepository;
 
-    public RollCallApplication(IRollCallRepository rollCallRepository, IRollCallEmployeeRepository rollCallEmployeeRepository, IEmployeeRepository employeeRepository, ILeaveRepository leaveRepository, ICustomizeCheckoutRepository customizeCheckoutRepository, ICheckoutRepository checkoutRepository, IRollCallDomainService rollCallDomainService, ICustomizeWorkshopSettingsRepository customizeWorkshopSettingsRepository, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository, ICustomizeCheckoutTempRepository customizeCheckoutTempRepository, IWorkshopRepository workshopRepository)
+    public RollCallApplication(IRollCallRepository rollCallRepository, IRollCallEmployeeRepository rollCallEmployeeRepository, IEmployeeRepository employeeRepository, ILeaveRepository leaveRepository, ICustomizeCheckoutRepository customizeCheckoutRepository, ICheckoutRepository checkoutRepository, IRollCallDomainService rollCallDomainService, ICustomizeWorkshopSettingsRepository customizeWorkshopSettingsRepository, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository, ICustomizeCheckoutTempRepository customizeCheckoutTempRepository)
 	{
 		_rollCallRepository = rollCallRepository;
 		_rollCallEmployeeRepository = rollCallEmployeeRepository;
@@ -52,7 +47,6 @@ public class RollCallApplication : IRollCallApplication
 		_customizeWorkshopSettingsRepository = customizeWorkshopSettingsRepository;
 		_customizeWorkshopEmployeeSettingsRepository = customizeWorkshopEmployeeSettingsRepository;
         _customizeCheckoutTempRepository = customizeCheckoutTempRepository;
-        _workshopRepository = workshopRepository;
     }
 
 	public OperationResult Create(CreateRollCall command)
@@ -864,58 +858,4 @@ public class RollCallApplication : IRollCallApplication
         }
     }
 
-    public async Task<PagedResult<RollCallCaseHistoryTitleDto>> GetCaseHistoryTitles(long workshopId,
-	    RollCallCaseHistorySearchModel searchModel)
-    {
-	    return await _rollCallRepository.GetCaseHistoryTitles(workshopId,searchModel);
-    }
-
-    public async Task<List<RollCallCaseHistoryDetail>> GetCaseHistoryDetails(long workshopId,
-	    string titleId, RollCallCaseHistorySearchModel searchModel)
-    {
-	    return await _rollCallRepository.GetCaseHistoryDetails(workshopId, titleId, searchModel);
-    }
-
-    public async Task<RollCallCaseHistoryExcelDto> DownloadCaseHistoryExcel(long workshopId, string titleId,
-        RollCallCaseHistorySearchModel searchModel)
-    {
-        var data = await _rollCallRepository
-            .GetCaseHistoryDetails(workshopId, titleId, searchModel);
-        string nameSecondPart = "";
-        byte[] excelBytes;
-
-        if (Regex.IsMatch(titleId, @"^\d{4}_\d{2}$"))
-        {
-            var splitDate = titleId.Split("_");
-            var year = Convert.ToInt32(splitDate.First());
-            var month = Convert.ToInt32(splitDate.Last());
-
-            var monthName = Convert.ToInt32(month).ToFarsiMonthByIntNumber();
-            nameSecondPart = $"{year}/{monthName}";
-            excelBytes = RollCallExcelGenerator.CaseHistoryExcelForEmployee(data, titleId);
-        }
-        else if (Regex.IsMatch(titleId, @"^\d{4}/\d{2}/\d{2}$"))
-        {
-            var oneDayDate = titleId.ToGeorgianDateTime();
-            nameSecondPart = $" {oneDayDate.DayOfWeek.DayOfWeeKToPersian()}،{titleId}";
-            excelBytes = RollCallExcelGenerator.CaseHistoryExcelForOneDay(data, titleId);
-        }
-        else
-        {
-            throw new BadRequestException("شناسه سر تیتر وارد شده نامعتبر است");
-        }
-
-        var workshopFullName = _workshopRepository.Get(workshopId)?.WorkshopFullName ?? "بدون کارگاه";
-
-        var fileName = $"{workshopFullName} - {nameSecondPart}.xlsx";
-
-        var res = new RollCallCaseHistoryExcelDto()
-        {
-            Bytes = excelBytes,
-            MimeType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-            FileName = fileName
-        };
-
-        return res;
-    }
 }

CompanyManagment.EFCore/Repository/EmployeeDocumentsRepository.cs

@@ -713,15 +713,10 @@ public class EmployeeDocumentsRepository : RepositoryBase<long, EmployeeDocument
         var itemsQuery = _companyContext.EmployeeDocumentItems
             .Where(x => x.DocumentStatus != DocumentStatus.Unsubmitted)
             .Include(x => x.EmployeeDocuments)
-            .ThenInclude(x => x.Workshop)
-            .ThenInclude(x => x.WorkshopEmployers)
-            .ThenInclude(x => x.Employer)
-            .GroupBy(x => x.WorkshopId)
-            .Select(x => new WorkshopWithEmployeeDocumentsViewModel()
+            .ThenInclude(x => x.Workshop).ThenInclude(x => x.WorkshopEmployers).ThenInclude(x => x.Employer)
+            .GroupBy(x => x.WorkshopId).Select(x => new WorkshopWithEmployeeDocumentsViewModel()
             {
-                SubmittedItemsCount = x
-                    .Count(y => y.DocumentStatus == DocumentStatus.SubmittedByAdmin 
-                                || y.DocumentStatus == DocumentStatus.SubmittedByClient),
+                SubmittedItemsCount = x.Count(y => y.DocumentStatus == DocumentStatus.SubmittedByAdmin || y.DocumentStatus == DocumentStatus.SubmittedByClient),
                 WorkshopId = x.Key,
                 WorkshopFullName = x.First().EmployeeDocuments.Workshop.WorkshopName,
                 EmployerName = x.First().EmployeeDocuments.Workshop.WorkshopEmployers.First().Employer.FullName

CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

@@ -11,7 +11,6 @@ using Company.Domain.InstitutionContractAgg;
 using Company.Domain.InstitutionContractAmendmentTempAgg;
 using Company.Domain.InstitutionContractContactInfoAgg;
 using Company.Domain.InstitutionContractExtensionTempAgg;
-using Company.Domain.InstitutionContractSendFlagAgg;
 using Company.Domain.InstitutionPlanAgg;
 using Company.Domain.SmsResultAgg;
 using Company.Domain.WorkshopAgg;
@@ -43,7 +42,6 @@ using AccountManagement.Application.Contracts.Account;
 using Company.Domain.InstitutionContractCreationTempAgg;
 using Company.Domain.RepresentativeAgg;
 using Company.Domain.TemporaryClientRegistrationAgg;
-using Company.Domain.InstitutionContractSendFlagAgg;
 using ContractingPartyAccount = Company.Domain.ContractingPartyAccountAgg.ContractingPartyAccount;
 using FinancialStatment = Company.Domain.FinancialStatmentAgg.FinancialStatment;
 using String = System.String;
@@ -59,7 +57,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     private readonly IMongoCollection<InstitutionContractExtensionTemp> _institutionExtensionTemp;
     private readonly IMongoCollection<InstitutionContractAmendmentTemp> _institutionAmendmentTemp;
     private readonly IMongoCollection<InstitutionContractCreationTemp> _institutionContractCreationTemp;
-    private readonly IMongoCollection<InstitutionContractSendFlag> _institutionContractSendFlag;
     private readonly IPlanPercentageRepository _planPercentageRepository;
     private readonly ISmsService _smsService;
     private readonly ISmsResultRepository _smsResultRepository;
@@ -117,8 +114,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             database.GetCollection<InstitutionContractAmendmentTemp>("InstitutionContractAmendmentTemp");
         _institutionContractCreationTemp =
             database.GetCollection<InstitutionContractCreationTemp>("InstitutionContractCreationTemp");
-        _institutionContractSendFlag =
-            database.GetCollection<InstitutionContractSendFlag>("InstitutionContractSendFlag");
     }
 
     public EditInstitutionContract GetDetails(long id)
@@ -1358,12 +1353,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             .Where(x => contractIds.Contains(x.InstitutionContractId))
             .ToDictionaryAsync(x => x.InstitutionContractId, x => x);
 
-        // بارگذاری وضعیت ارسال قراردادها از MongoDB - کوئری مستقیم
-        var filter = Builders<InstitutionContractSendFlag>.Filter
-            .In(x => x.InstitutionContractId, contractIds);
-        var sendFlagsList = await _institutionContractSendFlag.Find(filter).ToListAsync();
-        var sendFlags = sendFlagsList.ToDictionary(x => x.InstitutionContractId, x => x.IsSent);
-
         var financialStatements = _context.FinancialStatments.Include(x => x.FinancialTransactionList)
             .Where(x => contractingPartyIds.Contains(x.ContractingPartyId)).ToList();
         var res = new PagedResult<GetInstitutionContractListItemsViewModel>()
@@ -1473,8 +1462,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     Workshops = workshopDetails,
                     IsInPersonContract = workshopGroup?.CurrentWorkshops
                         .Any(y => y.Services.ContractInPerson) ?? true,
-                    IsOldContract = x.contract.SigningType == InstitutionContractSigningType.Legacy,
-                    InstitutionContractIsSentFlag = sendFlags.ContainsKey(x.contract.id) ? sendFlags[x.contract.id] : false
+                    IsOldContract = x.contract.SigningType == InstitutionContractSigningType.Legacy
                 };
             }).ToList()
         };
@@ -6346,10 +6334,10 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     }
 
     /// <summary>
-    ///دریافت لیست پیامک قراداد های آبی بدهکار 
+    ///دریافت لیست پیامک قرادا های آبی بدهکار 
     /// </summary>
     /// <returns></returns>
-    //public async Task<List<SmsListData>> GetWarningSmsListData()
+    //public async Task<List<SmsListData>> GetBlueSmsListData()
     //{
 
     //    var institutionContracts = await _context.InstitutionContractSet.AsQueryable().Select(x => new InstitutionContractViewModel
@@ -6370,8 +6358,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     //    }).Where(x => x.IsActiveString == "blue" &&
     //                       x.ContractAmountDouble > 0).GroupBy(x => x.ContractingPartyId).Select(x => x.First()).ToListAsync();
 
-    //    var institutionContractsIds = institutionContracts.Select(x => x.id).ToList();
-
     //    // قرارداد هایی که بطور یکجا پرداخت شده اند
     //    var paidInFull = institutionContracts.Where(x =>
     //        x.SigningType != InstitutionContractSigningType.Legacy && x.IsInstallment == false && x.SigningType != null).ToList();
@@ -6390,7 +6376,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     //        .Where(x => institutionContracts.Select(ins => ins.Id).Contains(x.InstitutionContractId))
     //        .Where(x => x.SendSms && x.PhoneType == "شماره همراه" && !string.IsNullOrWhiteSpace(x.PhoneNumber) &&
     //                    x.PhoneNumber.Length == 11).ToListAsync();
-    //    var legalActionSentSms = await _context.SmsResults
+    //    var legalActionSentSms =await _context.SmsResults
     //        .Where(x => x.TypeOfSms == "اقدام قضایی").ToListAsync();
     //    var warningSentSms = await _context.SmsResults.Where(x => x.TypeOfSms.Contains("هشدار")).ToListAsync();
 
@@ -6403,13 +6389,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     //        {
     //            var contractingParty = GetDetails(item.ContractingPartyId);
     //            bool hasLegalActionSentSms = legalActionSentSms.Any(x => x.InstitutionContractId == item.Id);
-    //            int year = Convert.ToInt32(item.ContractEndFa.Substring(0, 4));
-    //            int month = Convert.ToInt32(item.ContractEndFa.Substring(5, 2));
-    //            var endOfContractNextMonthStart = new PersianDateTime(year, month, 1).AddMonths(1);
-    //            var endOfContractNextMonthEnd = (($"{endOfContractNextMonthStart}").FindeEndOfMonth()).ToGeorgianDateTime();
-    //            var now = DateTime.Now
 
-    //            if (!string.IsNullOrWhiteSpace(contractingParty.LName) && !hasLegalActionSentSms && now.Date <= endOfContractNextMonthEnd.Date)
+    //            if (!string.IsNullOrWhiteSpace(contractingParty.LName) && !hasLegalActionSentSms)
     //            {
     //                //Thread.Sleep(500);
     //                var partyName = contractingParty.LName;
@@ -6465,7 +6446,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     //                                        var isLastAlarmSend = _context.SmsResults.Any(x => (
     //                                            x.ContractingPatyId == contractingParty.Id &&
     //                                            x.Mobile == number.PhoneNumber) && (x.TypeOfSms == "اقدام قضایی" || x.TypeOfSms == "هشدار دوم"));
-    //                                        var t = warningSentSms.Any(x=> x.)
+
     //                                        if (!string.IsNullOrWhiteSpace(number.PhoneNumber) &&
     //                                            number.PhoneNumber.Length == 11 && !isSend && !isLastAlarmSend)
     //                                        {

PersonalContractingParty.Config/PersonalBootstrapper.cs

@@ -61,7 +61,6 @@ 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;
@@ -124,7 +123,6 @@ 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;
@@ -660,9 +658,6 @@ 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/Modules/Projects/Commands/AddTaskToPhase/AddTaskToPhaseCommand.cs

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

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

@@ -1,62 +0,0 @@
-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/ChangeTaskPriority/ChangeTaskPriorityCommand.cs

@@ -1,109 +0,0 @@
-using GozareshgirProgramManager.Application._Common.Interfaces;
-using GozareshgirProgramManager.Application._Common.Models;
-using GozareshgirProgramManager.Domain._Common;
-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<Domain.ProjectAgg.Entities.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<Domain.ProjectAgg.Entities.ProjectPhase>();
-        foreach (var phase in phases)
-        {
-            var tasks = phase.Tasks?.ToList() ?? new List<Domain.ProjectAgg.Entities.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/SetTimeProject/SetTimeProjectCommandHandler.cs

@@ -352,8 +352,7 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
     private void SetSectionTime(TaskSection section, SetTimeProjectSkillItem sectionItem, long? addedByUserId)
     {
         var initData = sectionItem.InitData;
-        var initialTime = TimeSpan.FromHours(initData.Hours)
-            .Add(TimeSpan.FromMinutes(initData.Minutes));
+        var initialTime = TimeSpan.FromHours(initData.Hours);
         
         if (initialTime <= TimeSpan.Zero)
         {
@@ -365,26 +364,10 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
 
         section.ClearAdditionalTimes();
         // افزودن زمان‌های اضافی
-        bool hasAdditionalTime = false;
         foreach (var additionalTime in sectionItem.AdditionalTime)
         {
             var additionalTimeSpan = TimeSpan.FromHours(additionalTime.Hours).Add(TimeSpan.FromMinutes(additionalTime.Minutes));
             section.AddAdditionalTime(additionalTimeSpan, additionalTime.Description, addedByUserId);
-            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/DTOs/ProjectHierarchyDtos.cs

@@ -89,7 +89,6 @@ 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/Extensions/ProjectMappingExtensions.cs

@@ -166,7 +166,6 @@ 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(),
@@ -189,7 +188,6 @@ 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/GetProjectsList/GetProjectListDto.cs

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

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

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

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

@@ -1,32 +0,0 @@
-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,6 +6,5 @@ namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.Project
 
 public record ProjectBoardListQuery: IBaseQuery<List<ProjectBoardListResponse>>
 {
-    public long? UserId { get; set; }
     public TaskSectionStatus? Status { get; set; }
 }

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

@@ -41,11 +41,6 @@ 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);
-        }
-        
         var data = await queryable.ToListAsync(cancellationToken);
 
         var activityUserIds = data.SelectMany(x => x.Activities).Select(a => a.UserId).Distinct().ToList();
@@ -59,9 +54,6 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
         
 
         var result = data
-            .OrderByDescending(x => x.CurrentAssignedUserId == currentUserId)
-            .ThenByDescending(x=>x.Task.Priority)
-            .ThenBy(x => GetStatusOrder(x.Status))
             .Select(x =>
             {
                 // محاسبه یکبار برای هر Activity و Cache کردن نتیجه
@@ -103,6 +95,9 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
                         });
                     }
                 }
+
+                mergedHistories = mergedHistories.OrderByDescending(h => h.IsCurrentUser).ToList();
+
                 return new ProjectBoardListResponse()
                 {
                     Id = x.Id,
@@ -110,11 +105,9 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
                     ProjectName = x.Task.Phase.Project.Name,
                     TaskName = x.Task.Name,
                     SectionStatus = x.Status,
-                    TaskPriority = x.Task.Priority,
                     Progress = new ProjectProgressDto()
                     {
                         CompleteSecond = x.FinalEstimatedHours.TotalSeconds,
-                        Percentage = (int)x.GetProgressPercentage(),
                         CurrentSecond = activityTimeData.Sum(a => a.TotalSeconds),
                         Histories = mergedHistories
                     },
@@ -124,21 +117,19 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
                     SkillName =  x.Skill?.Name??"-",
                     TaskId = x.TaskId
                 };
-            }).ToList();
+            })
+            .OrderByDescending(r => 
+            {
+                // اگر AssignedUser null نباشد، بررسی کن که برابر current user هست یا نه
+                if (r.AssignedUser != null)
+                {
+                    return users.FirstOrDefault(u => u.Value == r.AssignedUser).Key == currentUserId;
+                }
+                // اگر AssignedUser null بود، از OriginalUser بررسی کن
+                return users.FirstOrDefault(u => u.Value == r.OriginalUser).Key == currentUserId;
+            })
+            .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,14 +13,13 @@ 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

@@ -12,16 +12,14 @@ public record ProjectDeployBoardDetailsResponse(
 public record ProjectDeployBoardDetailPhaseItem(
     string Name,
     TimeSpan TotalTimeSpan,
-    TimeSpan DoneTimeSpan,
-    int Percentage);
+    TimeSpan DoneTimeSpan);
 
 public record ProjectDeployBoardDetailTaskItem(
     string Name,
     TimeSpan TotalTimeSpan,
     TimeSpan DoneTimeSpan,
-    int Percentage,
     List<ProjectDeployBoardDetailItemSkill> Skills)
-    : ProjectDeployBoardDetailPhaseItem(Name, TotalTimeSpan, DoneTimeSpan, Percentage);
+    : ProjectDeployBoardDetailPhaseItem(Name, TotalTimeSpan, DoneTimeSpan);
 
 public record ProjectDeployBoardDetailItemSkill(string OriginalUserFullName, string SkillName, int TimePercentage);
 
@@ -73,7 +71,6 @@ public class
 
             var doneTime = t.Sections.Aggregate(TimeSpan.Zero,
                 (sum, next) => sum.Add(next.GetTotalTimeSpent()));
-
             var skills = t.Sections
                 .Select(s =>
                 {
@@ -82,7 +79,11 @@ public class
 
                     var skillName = s.Skill?.Name ?? "بدون مهارت";
 
-                    var timePercentage = (int)s.GetProgressPercentage();
+                    var totalTimeSpent = s.GetTotalTimeSpent();
+                    
+                    var timePercentage = s.FinalEstimatedHours.Ticks > 0
+                        ? (int)((totalTimeSpent.Ticks / (double)s.FinalEstimatedHours.Ticks) * 100)
+                        : 0;
                     
                     return new ProjectDeployBoardDetailItemSkill(
                         originalUserFullName,
@@ -90,22 +91,10 @@ public class
                         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();
 
@@ -115,10 +104,7 @@ public class
         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 phaseRes = new ProjectDeployBoardDetailPhaseItem(phase.Name, totalTimeSpan, doneTimeSpan);
 
         var res = new ProjectDeployBoardDetailsResponse(phaseRes, tasksRes);
 

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

@@ -17,7 +17,6 @@ public record ProjectDeployBoardListItem()
     public int DoneTasks { get; set; }
     public TimeSpan TotalTimeSpan { get; set; }
     public TimeSpan DoneTimeSpan { get; set; }
-    public int Percentage { get; set; }
     public ProjectDeployStatus DeployStatus { get; set; }
 }
 public record GetProjectsDeployBoardListResponse(List<ProjectDeployBoardListItem> Items);
@@ -67,8 +66,7 @@ public class ProjectDeployBoardListQueryHandler:IBaseQueryHandler<GetProjectDepl
                 .Select(x => x.TaskId).Distinct().Count(),
             TotalTimeSpan = TimeSpan.FromTicks(g.Sum(x => x.InitialEstimatedHours.Ticks)),
             DoneTimeSpan = TimeSpan.FromTicks(g.Sum(x=>x.GetTotalTimeSpent().Ticks)),
-            DeployStatus = g.First().Task.Phase.DeployStatus,
-            Percentage = (int)Math.Round(g.Average(x => x.GetProgressPercentage()))
+            DeployStatus = g.First().Task.Phase.DeployStatus
         }).ToList();
         var response = new GetProjectsDeployBoardListResponse(list);
         return OperationResult<GetProjectsDeployBoardListResponse>.Success(response);

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

@@ -1,12 +1,15 @@
 using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Application.Modules.TaskChat.DTOs;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Enums;
+using MediatR;
 using Microsoft.EntityFrameworkCore;
 
 namespace GozareshgirProgramManager.Application.Modules.TaskChat.Queries.GetMessages;
 
 public record GetMessagesQuery(
     Guid TaskId,
+    MessageType? MessageType,
     int Page = 1,
     int PageSize = 50
 ) : IBaseQuery<PaginationResult<MessageDto>>;
@@ -24,39 +27,6 @@ public class GetMessagesQueryHandler : IBaseQueryHandler<GetMessagesQuery, Pagin
         _authHelper = authHelper;
     }
 
-    private List<MessageDto> CreateAdditionalTimeNotes(
-        IEnumerable<Domain.ProjectAgg.Entities.TaskSectionAdditionalTime> additionalTimes,
-        Dictionary<long, string> users,
-        Guid taskId)
-    {
-        var notes = new List<MessageDto>();
-        
-        foreach (var additionalTime in additionalTimes)
-        {
-            var addedByUserName = additionalTime.AddedByUserId.HasValue && users.TryGetValue(additionalTime.AddedByUserId.Value, out var user)
-                ? user
-                : "سیستم";
-
-            var noteContent = $"⏱️ زمان اضافی: {additionalTime.Hours.TotalHours.ToString("F2")} ساعت - {(string.IsNullOrWhiteSpace(additionalTime.Reason) ? "بدون علت" : additionalTime.Reason)} - توسط {addedByUserName}";
-
-            var noteDto = new MessageDto
-            {
-                Id = Guid.NewGuid(),
-                TaskId = taskId,
-                SenderUserId = 0,
-                SenderName = "سیستم",
-                MessageType = "Note",
-                TextContent = noteContent,
-                CreationDate = additionalTime.CreationDate,
-                IsMine = false
-            };
-
-            notes.Add(noteDto);
-        }
-
-        return notes;
-    }
-
     public async Task<OperationResult<PaginationResult<MessageDto>>> Handle(GetMessagesQuery request, CancellationToken cancellationToken)
     {
         var currentUserId = _authHelper.GetCurrentUserId();
@@ -66,7 +36,12 @@ public class GetMessagesQueryHandler : IBaseQueryHandler<GetMessagesQuery, Pagin
         var query = _context.TaskChatMessages
             .Where(m => m.TaskId == request.TaskId && !m.IsDeleted)
             .Include(m => m.ReplyToMessage)
-            .OrderBy(m => m.CreationDate);
+            .OrderBy(m => m.CreationDate).AsQueryable();
+
+        if (request.MessageType.HasValue)
+        {
+            query = query.Where(m => m.MessageType == request.MessageType.Value);
+        }
 
         var totalCount = await query.CountAsync(cancellationToken);
 
@@ -76,52 +51,36 @@ public class GetMessagesQueryHandler : IBaseQueryHandler<GetMessagesQuery, Pagin
             .ToListAsync(cancellationToken);
 
         // ✅ گرفتن تمامی کاربران برای نمایش نام کامل فرستنده به جای "کاربر"
+        // این بخش تمام UserId هایی که در پیام‌ها استفاده شده را جمع‌آوری می‌کند
+        // و یک Dictionary ایجاد می‌کند که UserId را به FullName نگاشت می‌کند
         var senderUserIds = messages.Select(m => m.SenderUserId).Distinct().ToList();
         var users = await _context.Users
             .Where(u => senderUserIds.Contains(u.Id))
             .ToDictionaryAsync(u => u.Id, u => u.FullName, cancellationToken);
 
         // ✅ گرفتن تمامی زمان‌های اضافی (Additional Times) برای نمایش به صورت نوت
+        // در اینجا تمامی TaskSections مربوط به این تسک را می‌گیریم
+        // و برای هر کدام تمام AdditionalTimes آن را بارگذاری می‌کنیم
         var taskSections = await _context.TaskSections
             .Where(ts => ts.TaskId == request.TaskId)
             .Include(ts => ts.AdditionalTimes)
             .ToListAsync(cancellationToken);
 
-        // ✅ تمام زمان‌های اضافی را یکجا بگیر و مرتب کن
-        var allAdditionalTimes = taskSections
-            .SelectMany(ts => ts.AdditionalTimes)
-            .OrderBy(at => at.CreationDate)
-            .ToList();
-
         var messageDtos = new List<MessageDto>();
 
-        // ✅ ابتدا زمان‌های اضافی قبل از اولین پیام را اضافه کن (اگر پیامی وجود داشته باشد)
-        if (messages.Any())
-        {
-            var firstMessageDate = messages.First().CreationDate;
-            var additionalTimesBeforeFirstMessage = allAdditionalTimes
-                .Where(at => at.CreationDate < firstMessageDate)
-                .ToList();
-
-            messageDtos.AddRange(CreateAdditionalTimeNotes(additionalTimesBeforeFirstMessage, users, request.TaskId));
-        }
-        else
-        {
-            // ✅ اگر هیچ پیامی وجود ندارد، همه زمان‌های اضافی را نمایش بده
-            messageDtos.AddRange(CreateAdditionalTimeNotes(allAdditionalTimes, users, request.TaskId));
-        }
-
         foreach (var message in messages)
         {
             // ✅ نام فرستنده را از Dictionary Users بگیر، در صورت عدم وجود "کاربر ناشناس" نمایش بده
-            var senderName = users.GetValueOrDefault(message.SenderUserId, "کاربر ناشناس");
+            var senderName = users.ContainsKey(message.SenderUserId) 
+                ? users[message.SenderUserId] 
+                : "کاربر ناشناس";
 
             var dto = new MessageDto
             {
                 Id = message.Id,
                 TaskId = message.TaskId,
                 SenderUserId = message.SenderUserId,
-                SenderName = senderName,
+                SenderName = senderName, // ✅ از User واقعی استفاده می‌کنیم
                 MessageType = message.MessageType.ToString(),
                 TextContent = message.TextContent,
                 ReplyToMessageId = message.ReplyToMessageId,
@@ -136,7 +95,10 @@ public class GetMessagesQueryHandler : IBaseQueryHandler<GetMessagesQuery, Pagin
 
             if (message.ReplyToMessage != null)
             {
-                var replySenderName = users.GetValueOrDefault(message.ReplyToMessage.SenderUserId, "کاربر ناشناس");
+                // ✅ برای پیام‌های Reply نیز نام فرستنده را درست نمایش بده
+                var replySenderName = users.ContainsKey(message.ReplyToMessage.SenderUserId)
+                    ? users[message.ReplyToMessage.SenderUserId]
+                    : "کاربر ناشناس";
 
                 dto.ReplyToMessage = new MessageDto
                 {
@@ -170,31 +132,55 @@ public class GetMessagesQueryHandler : IBaseQueryHandler<GetMessagesQuery, Pagin
 
             messageDtos.Add(dto);
 
-            // ✅ پیدا کردن پیام بعدی (اگر وجود داشته باشد)
-            var currentIndex = messages.IndexOf(message);
-            var nextMessage = currentIndex < messages.Count - 1 ? messages[currentIndex + 1] : null;
+            // ✅ اینجا بخش جدید است: نوت‌های زمان اضافی را بین پیام‌ها اضافه کن
+            // این بخش تمام AdditionalTimes را که بعد از این پیام اضافه شده‌اند را پیدا می‌کند
+            var additionalTimesAfterMessage = taskSections
+                .SelectMany(ts => ts.AdditionalTimes)
+                .Where(at => at.AddedAt > message.CreationDate) // ✅ تغییر به AddedAt (زمان واقعی اضافه شدن)
+                .OrderBy(at => at.AddedAt)
+                .FirstOrDefault();
 
-            if (nextMessage != null)
+            if (additionalTimesAfterMessage != null)
             {
-                // ✅ زمان‌های اضافی بین این پیام و پیام بعدی
-                var additionalTimesBetween = allAdditionalTimes
-                    .Where(at => at.CreationDate > message.CreationDate && at.CreationDate < nextMessage.CreationDate)
+                // ✅ تمام AdditionalTimes بین این پیام و پیام قبلی را بگیر
+                var additionalTimesByDate = taskSections
+                    .SelectMany(ts => ts.AdditionalTimes)
+                    .Where(at => at.AddedAt <= message.CreationDate && 
+                                 (messageDtos.Count == 1 || at.AddedAt > messageDtos[messageDtos.Count - 2].CreationDate))
+                    .OrderBy(at => at.AddedAt)
                     .ToList();
 
-                messageDtos.AddRange(CreateAdditionalTimeNotes(additionalTimesBetween, users, request.TaskId));
+                foreach (var additionalTime in additionalTimesByDate)
+                {
+                    // ✅ نام کاربری که این زمان اضافی را اضافه کرد
+                    var addedByUserName = additionalTime.AddedByUserId.HasValue && users.TryGetValue(additionalTime.AddedByUserId.Value, out var user)
+                        ? user
+                        : "سیستم";
+
+                    // ✅ محتوای نوت را با اطلاعات کامل ایجاد کن
+                    // نمایش می‌دهد: مقدار زمان + علت + نام کسی که اضافه کرد
+                    var noteContent = $"⏱️ زمان اضافی: {additionalTime.Hours.TotalHours:F2} ساعت - {(string.IsNullOrWhiteSpace(additionalTime.Reason) ? "بدون علت" : additionalTime.Reason)} - توسط {addedByUserName}";
+
+                    // ✅ نوت را به عنوان MessageDto خاصی ایجاد کن
+                    var noteDto = new MessageDto
+                    {
+                        Id = Guid.NewGuid(),
+                        TaskId = request.TaskId,
+                        SenderUserId = 0, // ✅ سیستم برای نشان دادن اینکه یک پیام خودکار است
+                        SenderName = "سیستم",
+                        MessageType = "Note", // ✅ نوع پیام: Note (یادداشت سیستم)
+                        TextContent = noteContent,
+                        CreationDate = additionalTime.AddedAt, // ✅ تاریخ اضافه شدن زمان اضافی
+                        IsMine = false
+                    };
+
+                    messageDtos.Add(noteDto);
                 }
-            else
-            {
-                // ✅ این آخرین پیام است، زمان‌های اضافی بعد از آن را اضافه کن
-                var additionalTimesAfterLastMessage = allAdditionalTimes
-                    .Where(at => at.CreationDate > message.CreationDate)
-                    .ToList();
-
-                messageDtos.AddRange(CreateAdditionalTimeNotes(additionalTimesAfterLastMessage, users, request.TaskId));
             }
         }
 
         // ✅ مرتب کردن نهایی تمام پیام‌ها (معمولی + نوت‌ها) بر اساس زمان ایجاد
+        // اینطور که نوت‌های زمان اضافی در جای درست خود قرار می‌گیرند
         messageDtos = messageDtos.OrderBy(m => m.CreationDate).ToList();
 
         var response = new PaginationResult<MessageDto>()

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

@@ -20,7 +20,7 @@ public class ProjectTask : ProjectHierarchyNode
     {
         PhaseId = phaseId;
         _sections = new List<TaskSection>();
-        Priority = ProjectTaskPriority.Medium;
+        Priority = TaskPriority.Medium;
         AddDomainEvent(new TaskCreatedEvent(Id, phaseId, name));
     }
     
@@ -30,7 +30,7 @@ public class ProjectTask : ProjectHierarchyNode
 
     // Task-specific properties
     public Enums.TaskStatus Status { get; private set; } = Enums.TaskStatus.NotStarted;
-    public ProjectTaskPriority Priority { get; private set; }
+    public TaskPriority Priority { get; private set; }
     public DateTime? StartDate { get; private set; }
     public DateTime? EndDate { get; private set; }
     public DateTime? DueDate { get; private set; }
@@ -119,7 +119,7 @@ public class ProjectTask : ProjectHierarchyNode
         AddDomainEvent(new TaskStatusUpdatedEvent(Id, status));
     }
 
-    public void SetPriority(ProjectTaskPriority priority)
+    public void SetPriority(TaskPriority priority)
     {
         Priority = priority;
         AddDomainEvent(new TaskPriorityUpdatedEvent(Id, priority));

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

@@ -157,27 +157,6 @@ public class TaskSection : EntityBase<Guid>
         return TimeSpan.FromTicks(_activities.Sum(a => a.GetTimeSpent().Ticks));
     }
 
-    /// <summary>
-    /// محاسبه درصد پیشرفت بر اساس زمان مصرف شده به تایم برآورد شده
-    /// اگر وضعیت Completed باشد، همیشه 100 درصد برمی‌گرداند
-    /// </summary>
-    public double GetProgressPercentage()
-    {
-        // اگر تسک کامل شده، همیشه 100 درصد
-        if (Status == TaskSectionStatus.Completed)
-            return 100.0;
-
-        // اگر تایم برآورد شده صفر است، درصد صفر است
-        if (FinalEstimatedHours.TotalHours <= 0)
-            return 0.0;
-
-        var timeSpent = GetTotalTimeSpent();
-        var percentage = (timeSpent.TotalMinutes / FinalEstimatedHours.TotalMinutes) * 100.0;
-
-        // محدود کردن درصد به 100 (در صورتی که زمان مصرف شده بیشتر از تخمین باشد)
-        return Math.Min(percentage, 100.0);
-    }
-
     public bool IsCompleted()
     {
         return Status == TaskSectionStatus.Completed;
@@ -270,7 +249,7 @@ public class TaskSection : EntityBase<Guid>
             // متوقف کردن فعالیت با EndDate دقیق شده
             activeActivity.StopWorkWithSpecificTime(adjustedEndDate, "متوقف خودکار - بیش از تایم تعیین شده");
             
-            UpdateStatus(TaskSectionStatus.PendingForCompletion);
+            UpdateStatus(TaskSectionStatus.Incomplete);
         }
     }
 }

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

@@ -1,23 +0,0 @@
-namespace GozareshgirProgramManager.Domain.ProjectAgg.Enums;
-
-/// <summary>
-/// وضعیت تکلیف دهی برای بخش‌های مختلف پروژه
-/// </summary>
-public enum AssignmentStatus
-{
-    /// <summary>
-    /// تعیین تکلیف نشده
-    /// </summary>
-    Unassigned = 0,
-    
-    /// <summary>
-    /// تعیین تکلیف شده
-    /// </summary>
-    Assigned = 1,
-    
-    /// <summary>
-    /// فقط کاربر تعیین شده
-    /// </summary>
-    UserOnly = 2,
-}
-

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

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

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

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

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

@@ -36,7 +36,7 @@ public interface IProjectTaskRepository : IRepository<Guid, ProjectTask>
     /// <summary>
     /// Get tasks by priority
     /// </summary>
-    Task<List<ProjectTask>> GetByPriorityAsync(ProjectAgg.Enums.ProjectTaskPriority priority);
+    Task<List<ProjectTask>> GetByPriorityAsync(ProjectAgg.Enums.TaskPriority priority);
     
     /// <summary>
     /// Get tasks assigned to user

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

@@ -14,7 +14,4 @@ public interface ITaskSectionRepository: IRepository<Guid,TaskSection>
     Task<List<TaskSection>> GetAssignedToUserAsync(long userId);
     Task<List<TaskSection>> GetActiveSectionsIncludeAllAsync(CancellationToken cancellationToken);
     Task<bool> HasUserAnyInProgressSectionAsync(long userId, CancellationToken cancellationToken = default);
-    
-    // جدید: دریافت سکشن‌هایی که هنوز Completed یا PendingForCompletion نشده‌اند با اطلاعات کامل
-    Task<List<TaskSection>> GetAllNotCompletedOrPendingIncludeAllAsync(CancellationToken cancellationToken);
 }

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/GozareshgirProgramManager.Infrastructure.csproj

@@ -15,7 +15,6 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
         <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.1" />
         <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
         <!--<PackageReference Include="System.Text.Encodings.Web" Version="10.0.0" />-->

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Repositories/ProjectTaskRepository.cs

@@ -58,7 +58,7 @@ public class ProjectTaskRepository : RepositoryBase<Guid, ProjectTask>, IProject
             .ToListAsync();
     }
 
-    public Task<List<ProjectTask>> GetByPriorityAsync(ProjectTaskPriority priority)
+    public Task<List<ProjectTask>> GetByPriorityAsync(TaskPriority priority)
     {
         return _context.ProjectTasks
             .Where(t => t.Priority == priority)

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Repositories/TaskSectionRepository.cs

@@ -19,7 +19,6 @@ public class TaskSectionRepository:RepositoryBase<Guid,TaskSection>,ITaskSection
     {
         return await _context.TaskSections
             .Include(x => x.Activities)
-            .Include(x=>x.AdditionalTimes)
             .FirstOrDefaultAsync(x => x.Id == id, cancellationToken);
     }
 
@@ -53,13 +52,4 @@ public class TaskSectionRepository:RepositoryBase<Guid,TaskSection>,ITaskSection
             .AnyAsync(x => x.CurrentAssignedUserId == userId && x.Status == TaskSectionStatus.InProgress, 
                 cancellationToken);
     }
-
-    public Task<List<TaskSection>> GetAllNotCompletedOrPendingIncludeAllAsync(CancellationToken cancellationToken)
-    {
-        return _context.TaskSections
-            .Where(x => x.Status != TaskSectionStatus.Completed && x.Status != TaskSectionStatus.PendingForCompletion)
-            .Include(x => x.Activities)
-            .Include(x => x.AdditionalTimes)
-            .ToListAsync(cancellationToken);
-    }
 }

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

@@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 
-
 namespace GozareshgirProgramManager.Infrastructure.Services.FileManagement;
 
 /// <summary>

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

@@ -22,8 +22,6 @@ using GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectH
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
 using ServiceHost.BaseControllers;
-using GozareshgirProgramManager.Application.Modules.Projects.Commands.ChangeTaskPriority;
-using GozareshgirProgramManager.Application.Modules.Projects.Commands.AutoPendingFullTimeTaskSections;
 
 namespace ServiceHost.Areas.Admin.Controllers.ProgramManager;
 
@@ -124,8 +122,6 @@ public class ProjectController : ProgramManagerBaseController
     {
         // اجرای Command برای متوقف کردن تسک‌های overtime قبل از نمایش
         await _mediator.Send(new AutoStopOverTimeTaskSectionsCommand());
-        // سپس تسک‌هایی که به 100% زمان تخمینی رسیده‌اند را به حالت PendingForCompletion ببریم
-        await _mediator.Send(new AutoPendingFullTimeTaskSectionsCommand());
 
         var res = await _mediator.Send(query);
         return res;
@@ -169,12 +165,4 @@ public class ProjectController : ProgramManagerBaseController
         var res = await _mediator.Send(command);
         return res;
     }
-    
-    [HttpPost("change-priority")]
-    public async Task<ActionResult<OperationResult>> ChangePriority([FromBody] ChangeTaskPriorityCommand command)
-    {
-        var res = await _mediator.Send(command);
-        return res;
-    }
-    
 }

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

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

ServiceHost/Areas/Admin/Controllers/institutionContractController.cs

@@ -916,17 +916,6 @@ public class institutionContractController : AdminBaseController
             "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
             $"قرارداد های مالی.xlsx");
     }
-
-    /// <summary>
-    /// تنظیم وضعیت ارسال قرارداد
-    /// </summary>
-    [HttpPost("set-is-sent")]
-    public async Task<ActionResult<OperationResult>> SetIsSent([FromBody] SetInstitutionContractSendFlagRequest request)
-    {
-        var result = await _institutionContractApplication.SetContractSendFlag(request);
-        return result;
-    }
-    
 }
 
 public class InstitutionContractCreationGetRepresentativeIdResponse

ServiceHost/Areas/Client/Controllers/RollCall/RollCallCaseHistoryController.cs

@@ -1,200 +0,0 @@
-using _0_Framework.Application;
-using CompanyManagement.Infrastructure.Excel.RollCall;
-using CompanyManagment.App.Contracts.RollCall;
-using CompanyManagment.App.Contracts.RollCallEmployee;
-using CompanyManagment.App.Contracts.Workshop;
-using Microsoft.AspNetCore.Mvc;
-using ServiceHost.BaseControllers;
-
-namespace ServiceHost.Areas.Client.Controllers.RollCall;
-
-public class RollCallCaseHistoryController : ClientBaseController
-{
-    private readonly IRollCallApplication _rollCallApplication;
-    private readonly long _workshopId;
-    private readonly IWorkshopApplication _workshopApplication;
-    private readonly IRollCallEmployeeApplication _rollCallEmployeeApplication;
-    public RollCallCaseHistoryController(IRollCallApplication rollCallApplication,
-        IAuthHelper authHelper, IWorkshopApplication workshopApplication,
-        IRollCallEmployeeApplication rollCallEmployeeApplication)
-    {
-        _rollCallApplication = rollCallApplication;
-        _workshopApplication = workshopApplication;
-        _rollCallEmployeeApplication = rollCallEmployeeApplication;
-        _workshopId = authHelper.GetWorkshopId();
-    }
-
-    [HttpGet]
-    public async Task<ActionResult<PagedResult<RollCallCaseHistoryTitleDto>>> GetTitles(
-        RollCallCaseHistorySearchModel searchModel)
-    {
-        return await _rollCallApplication.GetCaseHistoryTitles(_workshopId, searchModel);
-    }
-
-    [HttpGet("details")]
-    public async Task<ActionResult<List<RollCallCaseHistoryDetail>>> GetDetails(string titleId,
-        RollCallCaseHistorySearchModel searchModel)
-    {
-        return await _rollCallApplication.GetCaseHistoryDetails(_workshopId, titleId, searchModel);
-    }
-
-    /// <summary>
-    /// ایجاد و ویرایش
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    [HttpPost]
-    public ActionResult<OperationResult> Upsert(CreateOrEditEmployeeRollCall command)
-    {
-        command.WorkshopId = _workshopId;
-        return _rollCallApplication.ManualEdit(command);
-    }
-
-    [HttpGet("print")]
-    public async Task<ActionResult<List<RollCallCaseHistoryDetail>>> GetPrintDetails(string titleId,
-        RollCallCaseHistorySearchModel searchModel)
-    {
-        return await _rollCallApplication.GetCaseHistoryDetails(_workshopId, titleId, searchModel);
-    }
-    
-    [HttpGet("total-working")]
-    public ActionResult<OperationResult<string>> OnGetTotalWorking(
-        string startDate, 
-        string startTime, 
-        string endDate, 
-        string endTime)
-    {
-        var op = new OperationResult<string>();
-        const string emptyValue = "-";
-    
-        if (!TryParseDateTime(startDate, startTime, out var start) || 
-            !TryParseDateTime(endDate, endTime, out var end))
-        {
-            return op.Succcedded(emptyValue);
-        }
-
-        if (start >= end)
-        {
-            return op.Succcedded(emptyValue);
-        }
-
-        var duration = (end - start).ToFarsiHoursAndMinutes(emptyValue);
-        return op.Succcedded(duration);
-    }
-    
-
-
-    [HttpGet("excel")]
-    public async Task<IActionResult> GetDownload(string titleId, RollCallCaseHistorySearchModel searchModel)
-    {
-        var res =await _rollCallApplication.DownloadCaseHistoryExcel(_workshopId, titleId, searchModel);
-        
-        return File(res.Bytes,
-            res.MimeType,
-            res.FileName);
-    
-    }
-
-    [HttpGet("edit")]
-    public ActionResult<EditRollCallDetailsResult> GetEditDetails(string date, long employeeId)
-    {
-        var result = _rollCallApplication.GetWorkshopEmployeeRollCallsForDate(_workshopId, employeeId, date);
-        //var dates = _rollCallApplication.GetEditableDatesForManualEdit(date.ToGeorgianDateTime());
-        var name = _rollCallEmployeeApplication.GetByEmployeeIdAndWorkshopId(employeeId, _workshopId);
-        
-        var total = new TimeSpan(result.Sum(x =>
-            (x.EndDate!.Value.Ticks - x.StartDate!.Value.Ticks)));
-        
-        var res = new EditRollCallDetailsResult()
-        {
-            EmployeeFullName = name.EmployeeFullName,
-            EmployeeId = employeeId,
-            DateFa = date,
-            //EditableDates = dates,
-            Records = result.Select(x=>new EmployeeRollCallRecord()
-            {
-                Date = x.DateGr,
-                EndDate = x.EndDateFa,
-                EndTime = x.EndTimeString,
-                RollCallId = x.Id,
-                StartDate = x.StartDateFa,
-                StartTime = x.StartTimeString
-            }).ToList(),
-            TotalRollCallsDuration = total.ToFarsiHoursAndMinutes("-")
-        };
-
-        return res;
-    }
-    [HttpPost("edit")]
-    public ActionResult<OperationResult> Edit(CreateOrEditEmployeeRollCall command)
-    {
-        command.WorkshopId = _workshopId;
-        var result = _rollCallApplication.ManualEdit(command);
-        return result;
-    }
-    [HttpDelete("delete")]
-    public IActionResult OnPostRemoveEmployeeRollCallsInDate(RemoveEmployeeRollCallRequest request)
-    {
-        var result = _rollCallApplication.RemoveEmployeeRollCallsInDate(_workshopId, request.EmployeeId, request.Date);
-
-        return new JsonResult(new
-        {
-            success = result.IsSuccedded,
-            message = result.Message,
-        });
-    }
-    
-    // [HttpGet("edit")]
-    // public ActionResult<> GetEditDetails(string date,long employeeId)
-    // {
-    //     var result = _rollCallApplication.GetWorkshopEmployeeRollCallsForDate(_workshopId, employeeId, date);
-    //     //var dates = _rollCallApplication.GetEditableDatesForManualEdit(date.ToGeorgianDateTime());
-    //     var name = _rollCallEmployeeApplication.GetByEmployeeIdAndWorkshopId(employeeId, _workshopId);
-    //
-    //     var total = new TimeSpan(result.Sum(x =>
-    //         (x.EndDate!.Value.Ticks - x.StartDate!.Value.Ticks)));
-    //
-    //     var command = new EmployeeRollCallsViewModel()
-    //     {
-    //         EmployeeFullName = name.EmployeeFullName,
-    //         EmployeeId = employeeId,
-    //         DateFa = date,
-    //         //EditableDates = dates,
-    //         RollCalls = result,
-    //         TotalRollCallsDuration = total.ToFarsiHoursAndMinutes("-")
-    //     };
-    // }
-    
-    
-    private static bool TryParseDateTime(string date, string time, out DateTime result)
-    {
-        result = default;
-    
-        try
-        {
-            var dateTime = date.ToGeorgianDateTime();
-            var timeOnly = TimeOnly.Parse(time);
-            result = dateTime.AddTicks(timeOnly.Ticks);
-            return true;
-        }
-        catch
-        {
-            return false;
-        }
-    }
-}
-
-public class EditRollCallDetailsResult
-{
-    public string EmployeeFullName { get; set; }
-    public long EmployeeId { get; set; }
-    public string DateFa { get; set; }
-    public string TotalRollCallsDuration { get; set; }
-    public List<EmployeeRollCallRecord> Records { get; set; }
-}
-
-public class RemoveEmployeeRollCallRequest
-{
-    public long EmployeeId { get; set; }
-    public string Date { get; set; }
-}

ServiceHost/Areas/Client/Pages/Company/RollCall/CaseHistory.cshtml.cs

@@ -251,6 +251,8 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall
                 var hours = (int)span.TotalHours;
                 var minutes = span.Minutes;
 
+
+
                 if (hours > 0 && minutes > 0)
                 {
                     return new JsonResult(new

ServiceHost/BaseControllers/AdminBaseController.cs

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-
 namespace ServiceHost.BaseControllers;
 
 [Authorize(Policy = "AdminArea")]

ServiceHost/Controllers/GeneralController.cs

@@ -42,15 +42,6 @@ public class GeneralController : GeneralBaseController
             currentDate
         });
     }
-    [HttpGet("persian-day-of-week")]
-    public ActionResult<OperationResult<string>> OnGetDayOfWeek(string dateFa)
-    {
-        var op = new OperationResult<string>();
-        if (!dateFa.TryToGeorgianDateTime(out DateTime date))
-            return op.Failed("تاریخ وارد شده نامعتبر است");
-        
-        return op.Succcedded(date.DayOfWeek.DayOfWeeKToPersian());
-    }
 
     // [HttpGet("pm-permissions")]
     // public IActionResult GetPMPermissions()
@@ -105,8 +96,44 @@ public class GeneralController : GeneralBaseController
         var statusCode = isSuccess ? "1" : "0";
         return $"{baseUrl}/callback?Status={statusCode}&transactionId={transactionId}";
     }
+}
 
+public class TokenReq
+{
+    public long Amount { get; set; }
 
+    public string CallbackUrl { get; set; }
+
+    [Display(Name = "شماره فاکتور")]
+    [MaxLength(100)]
+    [Required]
+    [Key]
+    // be ezaye har pazirande bayad yekta bashad
+    public string invoiceID { get; set; }
+
+    [Required] public long terminalID { get; set; }
+
+    /*
+     * JSON Bashad
+     * etelaate takmili site harchi
+     * nabayad char khas dashte bashe (*'"xp_%!+- ...)
+     */
+    public string Payload { get; set; } = "";
+    public string email { get; set; }
+}
+
+public class TokenResp
+{
+    // if 0 = success
+    public int Status { get; set; }
+    public string AccessToken { get; set; }
+}
+
+public class PayRequest
+{
+    [Required] [MaxLength(3000)] public string token { get; set; }
+    [Required] public long terminalID { get; set; }
+    public string nationalCode { get; set; }
 }
 
 public class SepehrGatewayPayResponse
@@ -143,3 +170,9 @@ public class SepehrGatewayPayResponse
 
     [Display(Name = " شماره کارت ")] public string cardnumber { get; set; }
 }
+
+public class AdviceReq
+{
+    [Display(Name = " رسید دیجیتال ")] public string digitalreceipt { get; set; }
+    public long Tid { get; set; }
+}

ServiceHost/Program.cs

@@ -63,17 +63,10 @@ if (!Directory.Exists(logDirectory))
     Directory.CreateDirectory(logDirectory);
 }
 
+// فقط برای فایل از Serilog استفاده می‌شود
+// تنظیمات MinimumLevel از appsettings.json خوانده می‌شود
 Log.Logger = new LoggerConfiguration()
-    //NO EF Core log
-    .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning)
-
-    //NO DbCommand log
-    .MinimumLevel.Override("Microsoft.EntityFrameworkCore.Database.Command", LogEventLevel.Warning)
-
-    //NO Microsoft Public log
-    .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
-   
-    //.MinimumLevel.Information()
+    .Enrich.FromLogContext()
     .WriteTo.File(
         path: Path.Combine(logDirectory, "gozareshgir_log.txt"),
         rollingInterval: RollingInterval.Day,
@@ -380,15 +373,20 @@ builder.Services.AddParbad().ConfigureGateways(gateways =>
 });
 
 
-if (builder.Environment.IsDevelopment())
+// فقط Serilog برای File استفاده می‌شه، کنسول از لاگر پیش‌فرض ASP.NET استفاده می‌کنه
+builder.Host.UseSerilog((context, services, configuration) =>
 {
-    builder.Host.UseSerilog((context, services, configuration) =>
-    {
     var logConfig = configuration
         .ReadFrom.Configuration(context.Configuration)
         .ReadFrom.Services(services)
         .Enrich.FromLogContext();
     
+    // در محیط Development، EF Core Commands را هم لاگ می‌کنیم
+    if (context.HostingEnvironment.IsDevelopment())
+    {
+        logConfig
+            .MinimumLevel.Override("Microsoft.EntityFrameworkCore.Database.Command", LogEventLevel.Information);
+    }
     
     logConfig.WriteTo.File(
         path: Path.Combine(logDirectory, "gozareshgir_log.txt"),
@@ -397,13 +395,7 @@ if (builder.Environment.IsDevelopment())
         shared: true,
         outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level}] {Message}{NewLine}{Exception}"
     );
-    }, writeToProviders: true); // این باعث میشه کنسول پیش‌فرض هم کار کنه
-
-}
-else
-{
-    builder.Host.UseSerilog();
-}
+}, writeToProviders: true); // این باعث میشه کنسول پیش‌فرض هم کار کنه
 
 Log.Information("SERILOG STARTED SUCCESSFULLY");
 

ServiceHost/Properties/launchSettings.json

@@ -19,7 +19,7 @@
       "sqlDebugging": true,
       "dotnetRunMessages": "true",
       "nativeDebugging": true,
-      "applicationUrl": "https://localhost:5004;http://localhost:5003;https://192.168.0.117:5005",
+      "applicationUrl": "https://localhost:5004;http://localhost:5003;https://192.168.0.117:5006",
       "jsWebView2Debugging": false,
       "hotReloadEnabled": true
     },
@@ -44,7 +44,7 @@
       "sqlDebugging": true,
       "dotnetRunMessages": "true",
       "nativeDebugging": true,
-      "applicationUrl": "https://localhost:5004;http://localhost:5003;",
+      "applicationUrl": "https://localhost:5004;http://localhost:5003;https://192.168.0.117:5006;",
       "jsWebView2Debugging": false,
       "hotReloadEnabled": true
     }

ServiceHost/ServiceHost.csproj

@@ -10,7 +10,6 @@
   </PropertyGroup>
 	<PropertyGroup>
 		<RazorCompileOnBuild>true</RazorCompileOnBuild>
-		<UserSecretsId>a6049acf-0286-4947-983a-761d06d65f36</UserSecretsId>
 	</PropertyGroup>
 
 	<!--<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

ServiceHost/appsettings.Development.json

@@ -0,0 +1,77 @@
+{
+  "DetailedErrors": true,
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ConnectionStrings": {
+    //تست
+    //"MesbahDb": "Data Source=DESKTOP-NUE119G\\MSNEW;Initial Catalog=Mesbah_db;Integrated Security=True"
+
+    //server
+    "MesbahDbServer": "Data Source=171.22.24.15;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]18[3019]#@ATt;TrustServerCertificate=true;",
+
+    //local
+    "MesbahDb": "Data Source=.;Initial Catalog=mesbah_db;Integrated Security=True;TrustServerCertificate=true;",
+
+    //server 
+    //"MesbahDb": "Data Source=185.208.175.186;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]18[3019]#@ATt;TrustServerCertificate=true;",
+
+    //dad-mehr
+    //"MesbahDb": "Data Source=.;Initial Catalog=teamWork;Integrated Security=True;TrustServerCertificate=true;",
+
+    "TestDb": "Data Source=.;Initial Catalog=TestDb;Integrated Security=True;TrustServerCertificate=true;",
+
+    //program_manager_db
+    "ProgramManagerDb": "Data Source=.;Initial Catalog=program_manager_db;Integrated Security=True;TrustServerCertificate=true;",
+    //"ProgramManagerDb": "Data Source=185.208.175.186;Initial Catalog=program_manager_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]18[3019]#@ATt;TrustServerCertificate=true;"
+    "ProgramManagerDbServer": "Data Source=171.22.24.15;Initial Catalog=program_manager_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]18[3019]#@ATt;TrustServerCertificate=true;"
+    //mahan Docker
+    //"MesbahDb": "Data Source=localhost,5069;Initial Catalog=mesbah_db;User ID=sa;Password=YourPassword123;TrustServerCertificate=True;"
+  },
+
+  "GoogleRecaptchaV3": {
+    "SiteKey": "6Lfhp_AnAAAAAB79WkrMoHd1k8ir4m8VvfjE7FTH",
+    "SecretKey": "6Lfhp_AnAAAAANjDDY6DPrbbUQS7k6ZCRmrVP5Lb"
+  },
+  "SmsSecrets": {
+    "ApiKey": "Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa",
+    "SecretKey": "dadmehr"
+  },
+  "Domain": ".dadmehrg.ir",
+  "MongoDb": {
+    "ConnectionString": "mongodb://localhost:27017",
+    "DatabaseName": "Gozareshgir"
+  },
+  "SmsSettings": {
+    "IsTestMode": true,
+    "TestNumbers": [
+      "09116967898"
+      //, "09116067106", "09114221321"
+    ]
+  },
+  "InternalApi": {
+    "Local": "https://localhost:7032",
+    "Dadmehrg": "https://api.pm.dadmehrg.ir",
+    "Gozareshgir": "https://api.pm.gozareshgir.ir"
+  },
+  "SepehrGateWayTerminalId": 99213700,
+  "JwtSettings": {
+    "SecretKey": ">3£>^1UBG@yw)QdhRC3$£:;r8~?qpp^oKK4D3a~8L2>enF;lkgh",
+    "Issuer": "GozareshgirApp",
+    "Audience": "GozareshgirUsers",
+    "ExpirationMinutes": 30
+  },
+  "FileStorage": {
+    "BaseUrl": "https://localhost:7032/uploads",
+    "MaxFileSizeBytes": 104857600,
+    "AllowedImageExtensions": [ ".jpg", ".jpeg", ".png", ".gif", ".webp" ],
+    "AllowedVideoExtensions": [ ".mp4", ".avi", ".mov", ".wmv" ],
+    "AllowedAudioExtensions": [ ".mp3", ".wav", ".ogg", ".m4a" ],
+    "AllowedDocumentExtensions": [ ".pdf", ".doc", ".docx", ".xls", ".xlsx", ".txt" ]
+  }
+
+}

ServiceHost/appsettings.json

@@ -0,0 +1,62 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ConnectionStrings": {
+     //"MesbahDb": "Data Source=.\\MSSQLSERVER2019;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=mesbah_db;Password=sa142857$@;"
+    "MesbahDb": "Data Source=.;Initial Catalog=mesbah_db;Integrated Security=True;TrustServerCertificate=true;",
+
+    //dad-mehr
+    //"MesbahDb": "Data Source=.;Initial Catalog=teamWork;Integrated Security=True;TrustServerCertificate=true;",
+
+    //testDb
+    "TestDb": "Data Source=.;Initial Catalog=TestDb;Integrated Security=True;TrustServerCertificate=true;",
+    //program_manager_db
+    "ProgramManagerDb": "Data Source=.;Initial Catalog=program_manager_db;Integrated Security=True;TrustServerCertificate=true;"
+  },
+  "BackupOptions": {
+    "DbName": "mesbah_db",
+    "DbBackupZipPath": "c://EveryHourBackupList//",
+    "FastDbBackupZipPath": "c://FastBackupZipList//",
+    "InsuranceListZipPath": "c://Logs//Gozareshgir//"
+  },
+  "faceModels": {
+    "Faces": "c://labels//20//"
+  },
+  "AllowedHosts": "*",
+  //"Domain": ".dad-mehr.ir"
+  "Domain": ".gozareshgir.ir",
+  "MongoDb": {
+    "ConnectionString": "mongodb://localhost:27017",
+    "DatabaseName": "Gozareshgir"
+  },
+  "SmsSettings": {
+    "IsTestMode": false,
+    "TestNumbers": []
+  },
+  "InternalApi": {
+    "Local": "https://localhost:7032",
+    "Dadmehrg": "https://api.pm.dadmehrg.ir",
+    "Gozareshgir": "https://api.pm.gozareshgir.ir"
+  },
+
+  "SepehrGateWayTerminalId": 99213700,
+  "JwtSettings": {
+    "SecretKey": ">3£>^1UBG@yw)QdhRC3$£:;r8~?qpp^oKK4D3a~8L2>enF;lkgh",
+    "Issuer": "GozareshgirApp",
+    "Audience": "GozareshgirUsers",
+    "ExpirationMinutes": 30
+  },
+  "FileStorage": {
+    "BaseUrl": "https://api.pm.gozareshgir.ir/uploads",
+    "MaxFileSizeBytes": 104857600,
+    "AllowedImageExtensions": [ ".jpg", ".jpeg", ".png", ".gif", ".webp" ],
+    "AllowedVideoExtensions": [ ".mp4", ".avi", ".mov", ".wmv" ],
+    "AllowedAudioExtensions": [ ".mp3", ".wav", ".ogg", ".m4a" ],
+    "AllowedDocumentExtensions": [ ".pdf", ".doc", ".docx", ".xls", ".xlsx", ".txt" ]
+  }
+}