feat: filter workshops by active status in employee document workflows

0_Framework/Application/Enums/TypeOfCheckoutWarning.cs

@@ -1,15 +0,0 @@
-namespace _0_Framework.Application.Enums;
-
-public enum TypeOfCheckoutWarning
-{
-    /// <summary>
-    /// هشدار های متفرقه
-    /// </summary>
-    OthersWarning,
-    /// <summary>
-    /// هشدار سهم بیمه کارگر
-    /// </summary>
-    InsuranceEmployeeShare,
-
-
-}

0_Framework/Application/PaymentGateway/IPaymentGateway.cs

@@ -29,11 +29,9 @@ public class PaymentGatewayResponse
     public int? ErrorCode { get; set; }
 
     [JsonPropertyName("transid")]
-	public string Token { get; set; }
+    public string TransactionId { get; set; }
 
-    public bool IsSuccess { get; set; }
-
-    public string Message { get; set; }
+    public bool IsSuccess => Status == "success";
 }
 
 public class WalletAmountResponse
@@ -55,12 +53,10 @@ public class CreatePaymentGatewayRequest
     public string Mobile { get; set; }
     public string Email { get; set; }
     public string Description { get; set; }
-    public IDictionary<string, object> ExtraData { get; set; }
 }
 
 public class VerifyPaymentGateWayRequest
 {
-	public string DigitalReceipt { get; set; }
-	public string TransactionId { get; set; }
+    public string TransactionId { get; set; }
     public double Amount { get; set; }
 }

0_Framework/Application/PaymentGateway/SepehrPaymentGateway.cs

@@ -1,97 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-
-namespace _0_Framework.Application.PaymentGateway;
-
-public class SepehrPaymentGateway:IPaymentGateway
-{
-	private readonly HttpClient _httpClient;
-	private const long TerminalId = 99213700;
-
-	public SepehrPaymentGateway(IHttpClientFactory httpClient)
-	{
-		_httpClient = httpClient.CreateClient();
-		_httpClient.BaseAddress = new Uri("https://sepehr.shaparak.ir/Rest/V1/PeymentApi/");
-
-
-	}
-
-	public async Task<PaymentGatewayResponse> Create(CreatePaymentGatewayRequest command, CancellationToken cancellationToken = default)
-	{
-		var extraData = JsonConvert.SerializeObject(command.ExtraData);
-		var res = await _httpClient.PostAsJsonAsync("GetToken", new
-		{
-			TerminalID = TerminalId,
-			Amount = command.Amount,
-			InvoiceID = command.InvoiceId,
-			callbackURL = command.CallBackUrl,
-			payload = extraData
-		}, cancellationToken: cancellationToken);
-		// خواندن محتوای پاسخ
-		var content = await res.Content.ReadAsStringAsync(cancellationToken);
-
-		// تبدیل پاسخ JSON به آبجکت دات‌نت
-		var json = System.Text.Json.JsonDocument.Parse(content);
-
-		// گرفتن مقدار AccessToken
-		var accessToken = json.RootElement.GetProperty("Accesstoken").ToString();
-		var status = json.RootElement.GetProperty("Status").ToString();
-
-		return new PaymentGatewayResponse
-		{
-			Status = status,
-			IsSuccess = status == "0",
-			Token = accessToken
-		};
-	}
-
-	public string GetStartPayUrl(string token)=>
-		$"https://sepehr.shaparak.ir/Payment/Pay?token={token}&terminalId={TerminalId}";
-
-	public async Task<PaymentGatewayResponse> Verify(VerifyPaymentGateWayRequest command, CancellationToken cancellationToken = default)
-	{
-		var res = await _httpClient.PostAsJsonAsync("Advice", new
-		{
-			digitalreceipt = command.DigitalReceipt,
-			Tid = TerminalId,
-		}, cancellationToken: cancellationToken);
-
-		// خواندن محتوای پاسخ
-		var content = await res.Content.ReadAsStringAsync(cancellationToken);
-
-		// تبدیل پاسخ JSON به آبجکت دات‌نت
-		var json = System.Text.Json.JsonDocument.Parse(content);
-
-
-		var message = json.RootElement.GetProperty("Message").GetString();
-		var status = json.RootElement.GetProperty("Status").GetString();
-		return new PaymentGatewayResponse
-		{
-			Status = status,
-			IsSuccess = status.ToLower() == "ok",
-			Message = message
-		};
-
-
-
-	}
-
-	public Task<PaymentGatewayResponse> CreateSandBox(CreatePaymentGatewayRequest command, CancellationToken cancellationToken = default)
-	{
-		throw new System.NotImplementedException();
-	}
-
-	public string GetStartPaySandBoxUrl(string transactionId)
-	{
-		throw new System.NotImplementedException();
-	}
-
-	public Task<WalletAmountResponse> GetWalletAmount(CancellationToken cancellationToken)
-	{
-		throw new System.NotImplementedException();
-	}
-}

0_Framework/Application/Sms/ISmsService.cs

@@ -27,10 +27,9 @@ public interface ISmsService
 
     Task<double> GetCreditAmount();
     
-    public Task<bool> SendInstitutionCreationVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId);
+    public Task<bool> SendInstitutionVerificationLink(string number,string fullName, Guid institutionId);
     
-    public Task<bool> SendInstitutionVerificationCode(string number, string code, string contractingPartyFullName,
-        long contractingPartyId, long institutionContractId);
+    public Task<bool> SendInstitutionVerificationCode(string number, string code);
 
     #endregion
 

0_Framework/Application/Sms/SmsService.cs

@@ -1,61 +1,30 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices.ComTypes;
+using System.Security.AccessControl;
 using System.Threading;
 using System.Threading.Tasks;
-using _0_Framework.Application;
-using _0_Framework.Application.Sms;
-using Company.Domain.SmsResultAgg;
-using CompanyManagment.App.Contracts.SmsResult;
 using IPE.SmsIrClient;
 using IPE.SmsIrClient.Models.Requests;
 using IPE.SmsIrClient.Models.Results;
 using Microsoft.Extensions.Configuration;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 
-namespace CompanyManagment.EFCore.Services;
+namespace _0_Framework.Application.Sms;
 
 public class SmsService : ISmsService
 {
     private readonly IConfiguration _configuration;
-    private readonly ISmsResultRepository _smsResultRepository;
-    private readonly bool _isDevEnvironment;
-    private readonly List<string> _testNumbers;
     public SmsIr SmsIr { get; set; }
 
 
-    public SmsService(IConfiguration configuration, ISmsResultRepository smsResultRepository)
+    public SmsService(IConfiguration configuration)
     {
         _configuration = configuration;
-        _smsResultRepository = smsResultRepository;
         SmsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
 
-        // خواندن تنظیمات SMS از appsettings
-        var smsSettings = _configuration.GetSection("SmsSettings");
-        _isDevEnvironment = smsSettings.GetValue<bool>("IsTestMode");
-        _testNumbers = smsSettings.GetSection("TestNumbers").Get<List<string>>() ?? new List<string>();
-    }
-
-    /// <summary>
-    /// متد مرکزی برای ارسال پیامک که محیط dev را چک می‌کند
-    /// </summary>
-    private async Task<SmsIrResult<VerifySendResult>> VerifySendSmsAsync(string number, int templateId, VerifySendParameter[] parameters)
-    {
-        // اگر محیط dev است و شماره‌های تست وجود دارد، به شماره‌های تست ارسال می‌شود
-        if (_isDevEnvironment && _testNumbers is { Count: > 0 })
-        {
-            // ارسال به همه شماره‌های تست
-            SmsIrResult<VerifySendResult> lastResult = null;
-            foreach (var testNumber in _testNumbers)
-            {
-                lastResult = await SmsIr.VerifySendAsync(testNumber, templateId, parameters);
-            }
-            return lastResult; // برگرداندن نتیجه آخرین ارسال
-        }
-        else
-        {
-            // ارسال به شماره واقعی
-            return await SmsIr.VerifySendAsync(number, templateId, parameters);
-        }
     }
 
     public void Send(string number, string message)
@@ -85,7 +54,12 @@ public class SmsService : ISmsService
     }
     public bool VerifySend(string number, string message)
     {
-        var verificationSendResult = VerifySendSmsAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", message) });
+         
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+
+        //var bulkSendResult =  smsIr.BulkSendAsync(95007079000006, "your text message", new string[] { "9120000000" });
+
+        var verificationSendResult =  smsIr.VerifySendAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", message) });
         Thread.Sleep(2000);
         if (verificationSendResult.IsCompletedSuccessfully)
         {
@@ -114,7 +88,11 @@ public class SmsService : ISmsService
 
     public bool LoginSend(string number, string message)
     {
-        var verificationSendResult = VerifySendSmsAsync(number, 635330, new VerifySendParameter[] { new VerifySendParameter("LOGINCODE", message) });
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+
+        //var bulkSendResult =  smsIr.BulkSendAsync(95007079000006, "your text message", new string[] { "9120000000" });
+
+        var verificationSendResult = smsIr.VerifySendAsync(number, 635330, new VerifySendParameter[] { new VerifySendParameter("LOGINCODE", message) });
         Thread.Sleep(2000);
         if (verificationSendResult.IsCompletedSuccessfully)
         {
@@ -139,8 +117,11 @@ public class SmsService : ISmsService
 
     public async Task<SentSmsViewModel> SendVerifyCodeToClient(string number, string code)
     {
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
         var result = new SentSmsViewModel();
-        var sendResult = await VerifySendSmsAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", code) });
+        //var bulkSendResult =  smsIr.BulkSendAsync(95007079000006, "your text message", new string[] { "9120000000" });
+
+        var sendResult = await smsIr.VerifySendAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", code) });
         Thread.Sleep(2000);
 
         if (sendResult.Message == "موفق")
@@ -165,8 +146,9 @@ public class SmsService : ISmsService
         var checkLength = fullName.Length;
         if (checkLength > 25)
             fullName = fullName.Substring(0, 24);
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
 
-        var sendResult = VerifySendSmsAsync(number, 725814, new VerifySendParameter[] { new VerifySendParameter("FULLNAME", fullName), new VerifySendParameter("USERNAME", userName),  new VerifySendParameter("PASSWORD", userName) });
+        var sendResult = smsIr.VerifySendAsync(number, 725814, new VerifySendParameter[] { new VerifySendParameter("FULLNAME", fullName), new VerifySendParameter("USERNAME", userName),  new VerifySendParameter("PASSWORD", userName) });
        
 
         Console.WriteLine(userName + " - " +  sendResult.Result.Status);
@@ -222,7 +204,8 @@ public class SmsService : ISmsService
 	    int pageSize = 100; // max: 100
 	    SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
 		var response = await smsIr.GetArchivedReportAsync(pageNumber, pageSize, unixTimestamp, unixTimestamp2);
-        
+
+
         MessageReportResult[] messages = response.Data;
 	    foreach (var message in messages)
 	    {
@@ -348,57 +331,26 @@ public class SmsService : ISmsService
         }
        
     }
-    
-    public async Task<bool> SendInstitutionCreationVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId)
+    public async Task<bool> SendInstitutionVerificationLink(string number,string fullName, Guid institutionId)
     {
        var guidStr=institutionId.ToString();
        var firstPart = guidStr.Substring(0, 15);
        var secondPart = guidStr.Substring(15);
-        var verificationSendResult =await VerifySendSmsAsync(number, 527519, new VerifySendParameter[]
+        var verificationSendResult =await SmsIr.VerifySendAsync(number, 527519, new VerifySendParameter[]
         {
             new("FULLNAME", fullName),
             new("CODE1",firstPart),
             new("CODE2",secondPart)
         });
-      
-       var smsResult =  new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message,  "لینک تاییدیه ایجاد قرارداد مالی",
-            fullName, number, contractingPartyId, institutionContractId);
-        await _smsResultRepository.CreateAsync(smsResult);
-        await _smsResultRepository.SaveChangesAsync();
         return verificationSendResult.Status == 0;
     }
 
-    public async Task<bool> SendInstitutionAmendmentVerificationLink(string number, string fullName, Guid institutionId,
-        long contractingPartyId, long institutionContractId)
+    public async Task<bool> SendInstitutionVerificationCode(string number, string code)
     {
-        var guidStr=institutionId.ToString();
-        var firstPart = guidStr.Substring(0, 15);
-        var secondPart = guidStr.Substring(15);
-        var verificationSendResult =await VerifySendSmsAsync(number, 527519, new VerifySendParameter[]
-        {
-            new("FULLNAME", fullName),
-            new("CODE1",firstPart),
-            new("CODE2",secondPart)
-        });
-        var smsResult =  new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message,  "لینک تاییدیه ارتقا قرارداد مالی",
-            fullName, number, contractingPartyId, institutionContractId);
-        await _smsResultRepository.CreateAsync(smsResult);
-        await _smsResultRepository.SaveChangesAsync();
-        return verificationSendResult.Status == 0;
-    }
-
-    public async Task<bool> SendInstitutionVerificationCode(string number, string code, string contractingPartyFullName,
-        long contractingPartyId, long institutionContractId)
-    {
-        var verificationSendResult =await VerifySendSmsAsync(number, 965348, new VerifySendParameter[]
+        var verificationSendResult =await  SmsIr.VerifySendAsync(number, 965348, new VerifySendParameter[]
         {
             new("VERIFYCODE", code)
         });
-        
-        var smsResult =  new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message,  "کد تاییدیه قرارداد مالی",
-            contractingPartyFullName, number, contractingPartyId, institutionContractId);
-        await _smsResultRepository.CreateAsync(smsResult);
-        await _smsResultRepository.SaveChangesAsync();
         return verificationSendResult.Status == 0;
     }
 

0_Framework/Application/Tools.cs

@@ -1512,14 +1512,6 @@ public static class Tools
     #region Mahan
 
 
-    public static bool IsvalidIban(this string iban)
-    {
-        return Regex.IsMatch(iban, @"^IR[0-9]{24}$");
-    }
-    public static bool IsValidCardNumber(this string cardNumber)
-    {
-        return Regex.IsMatch(cardNumber, @"^[0-9]{16}$");
-    }
     /// <summary>
     /// این متد حروف عربی را به فارسی در میاورد. مثال: علي را به علی تبدیل میکند
     /// </summary>

0_Framework/Application/UID/IUidService.cs

@@ -110,53 +110,6 @@ public interface IUidService
 {
     Task<PersonalInfoResponse> GetPersonalInfo(string nationalCode , string birthDate);
     Task<MatchMobileWithNationalCodeResponse> IsMachPhoneWithNationalCode(string nationalCode , string phoneNumber);
-    Task<IbanInquiryResponse> IbanInquiry (string iban);
-    Task<AccountToIbanResponse> AccountToIban(string accountNumber, UidBanks bank);
-    Task<CardToNumberResponse> CardToIban(string cardNumber);
-}
-
-public class CardToNumberResponse:UidBaseResponse
-{
-    public string Iban { get; set; }
-    public string CardNumber { get; set; }
-}
-
-public class AccountToIbanResponse:UidBaseResponse
-{
-    public string Iban { get; set; }
-}
-
-public class IbanInquiryResponse:UidBaseResponse
-{
-    public IbanInquiryAccountBasicInformation AccountBasicInformation { get; set; }
-    [JsonProperty("owners")]
-    public List<IbanInquiryOwner> Owners { get; set; }
-}
-
-public class IbanInquiryAccountBasicInformation
-{
-    public string Iban { get; set; }
-    public string AccountNumber { get; set; }
-    public IbanInquiryBankInformation BankInformation { get; set; }
-    public string AccountStatus { get; set; }
-
-}
-
-public class IbanInquiryBankInformation
-{
-    public string BankName { get; set; }
-}
-
-public class IbanInquiryOwner
-{
-    [JsonProperty("firstName")]
-    public string FirstName { get; set; }
-    [JsonProperty("lastName")]
-    public string LastName { get; set; }
-    [JsonProperty("nationalIdentifier")]
-    public string NationalIdentifier { get; set; }
-    [JsonProperty("customerType")]
-    public string CustomerType { get; set; }
 }
 
 public class MatchMobileWithNationalCodeResponse
@@ -165,7 +118,4 @@ public class MatchMobileWithNationalCodeResponse
 
     public ResponseContext ResponseContext { get; set; }
 }
-public class UidBaseResponse
-{
-    public ResponseContext ResponseContext { get; set; }
-}
+

0_Framework/Application/UID/UidBanks.cs

@@ -1,117 +0,0 @@
-using System.ComponentModel;
-
-namespace _0_Framework.Application.UID;
-
-public enum UidBanks
-{
-    [Description("بانک دی")]
-    BANK_DEY = 66,
-    
-    [Description("بانک سپه")]
-    BANK_SEPAH = 15,
-    
-    [Description("بانک شهر")]
-    BANK_SHAHR = 61,
-    
-    [Description("بانک ملت")]
-    BANK_MELAT = 12,
-    
-    [Description("بانک ملی")]
-    BANK_MELLI = 17,
-    
-    [Description("بانک رفاه کارگران")]
-    BANK_REFAH = 13,
-    
-    [Description("بانک سینا")]
-    BANK_SINA = 59,
-    
-    [Description("بانک مسکن")]
-    BANK_MASKAN = 14,
-    
-    [Description("بانک آینده")]
-    BANK_AYANDEH = 62,
-    
-    [Description("بانک انصار")]
-    BANK_ANSAR = 63,
-    
-    [Description("بانک تجارت")]
-    BANK_TEJARAT = 18,
-    
-    [Description("بانک رسالت")]
-    BANK_RESALAT = 70,
-    
-    [Description("بانک سامان")]
-    BANK_SAMAN = 56,
-    
-    [Description("بانک مرکزی")]
-    BANK_MARKAZI = 10,
-    
-    [Description("بانک سرمایه")]
-    BANK_SARMAYEH = 58,
-    
-    [Description("بانک صادرات")]
-    BANK_SADERAT = 19,
-    
-    [Description("بانک قوامین")]
-    BANK_GHAVAMIN = 52,
-    
-    [Description("بانک پارسیان")]
-    BANK_PARSIAN = 54,
-    
-    [Description("بانک کشاورزی")]
-    BANK_KESHAVARZI = 16,
-    
-    [Description("بانک گردشگری")]
-    BANK_GARDESHGARI = 64,
-    
-    [Description("پست بانک")]
-    BANK_POST_BANK = 21,
-    
-    [Description("بانک پاسارگاد")]
-    BANK_PASARGAD = 57,
-    
-    [Description("بانک کارآفرین")]
-    BANK_KARAFARIN = 53,
-    
-    [Description("بانک خاورمیانه")]
-    BANK_KHAVARMIANEH = 78,
-    
-    [Description("بانک ایران زمین")]
-    BANK_IRAN_ZAMIN = 69,
-    
-    [Description("بانک مهر اقتصاد")]
-    BANK_MEHR_EQTESAD = 79,
-    
-    [Description("بانک صنعت و معدن")]
-    BANK_SANAT_MADAN = 11,
-    
-    [Description("بانک اقتصاد نوین")]
-    BANK_EGHTESAD_NOVIN = 55,
-    
-    [Description("بانک توسعه تعاون")]
-    BANK_TOSSE_TAAVON = 22,
-    
-    [Description("بانک توسعه صادرات")]
-    BANK_TOSSE_SADERAT = 20,
-    
-    [Description("بانک ایران و ونزوئلا")]
-    BANK_IRAN_VENEZUELA = 95,
-    
-    [Description("بانک حکمت ایرانیان")]
-    BANK_HEKMAT_IRANIAN = 65,
-    
-    [Description("بانک قرض الحسنه مهر")]
-    BANK_GHARZOLHASANEH_MEHR = 60,
-    
-    [Description("موسسه مالی و اعتباری ملل")]
-    BANK_MOASSASE_MELLAL = 75,
-    
-    [Description("موسسه مالی و اعتباری نور")]
-    BANK_MOASSASE_NOOR = 80,
-    
-    [Description("موسسه مالی و اعتباری کوثر")]
-    BANK_MOASSASE_KOSAR = 73,
-    
-    [Description("موسسه مالی و اعتباری توسعه")]
-    BANK_MOASSASE_TOSSE = 51
-}

0_Framework/Application/UID/UidBanksExtension.cs

@@ -1,27 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Reflection;
-
-namespace _0_Framework.Application.UID
-{
-    public static class UidBanksExtension
-    {
-        /// <summary>
-        /// دریافت نام فارسی بانک
-        /// </summary>
-        /// <param name="bank">بانک</param>
-        /// <returns>نام فارسی بانک</returns>
-        public static string GetPersianName(this UidBanks bank)
-        {
-            var fieldInfo = bank.GetType().GetField(bank.ToString());
-            
-            if (fieldInfo == null) 
-                return string.Empty;
-            
-            var attribute = (DescriptionAttribute)Attribute.GetCustomAttribute(
-                fieldInfo, typeof(DescriptionAttribute));
-            
-            return attribute?.Description ?? bank.ToString();
-        }
-    }
-}

AccountManagement.Application.Contracts/Account/IAccountApplication.cs

@@ -66,11 +66,4 @@ public interface IAccountApplication
     public bool CheckExistClientAccount(string userName);
     List<AccountViewModel> GetAdminAccountsNew();
 
-    void CameraLogin(CameraLoginRequest request);
-}
-
-public class CameraLoginRequest
-{
-    public string UserName { get; set; }
-    public string Password { get; set; }
 }

AccountManagement.Application/AccountApplication.cs

@@ -18,7 +18,6 @@ using Microsoft.AspNetCore.Mvc.Rendering;
 using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 using Company.Domain.WorkshopAgg;
 using System.Security.Claims;
-using _0_Framework.Exceptions;
 using AccountManagement.Domain.PositionAgg;
 using AccountManagement.Domain.SubAccountAgg;
 using AccountManagement.Domain.SubAccountPermissionSubtitle1Agg;
@@ -804,29 +803,4 @@ public class AccountApplication : IAccountApplication
     {
         return _accountRepository.GetAdminAccountsNew();
     }
-
-    public void CameraLogin(CameraLoginRequest request)
-    {
-        var cameraAccount = _cameraAccountRepository.GetBy(request.UserName);
-
-        if (cameraAccount == null)
-        {
-            throw new BadRequestException(ApplicationMessages.WrongUserPass);
-        }
-
-        (bool Verified, bool NeedUpgrade) result = _passwordHasher.Check(cameraAccount.Password, request.Password);
-        
-        if (!result.Verified)
-            throw new BadRequestException(ApplicationMessages.WrongUserPass);
-
-        var mobile = string.IsNullOrWhiteSpace(cameraAccount.Mobile) ? " " : cameraAccount.Mobile;
-        
-        var authViewModel = new CameraAuthViewModel(cameraAccount.id, cameraAccount.WorkshopId,
-            cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId,
-            cameraAccount.IsActiveSting);
-        if (cameraAccount.IsActiveSting != "true")
-            throw new BadRequestException(ApplicationMessages.WrongUserPass);
-
-        _authHelper.CameraSignIn(authViewModel);
-    }
 }

Company.Domain/AuthorizedBankDetailsAgg/AuthorizedBankDetails.cs

@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using _0_Framework_b.Domain;
-
-namespace Company.Domain.AuthorizedBankDetailsAgg
-{
-    public class AuthorizedBankDetails : EntityBase
-    {
-        private AuthorizedBankDetails() 
-        {
-            OwnersList = new List<AuthorizedBankDetailsOwner>();
-        }
-
-        public AuthorizedBankDetails(string cardNumber, string accountNumber, string ban, string bankName, List<AuthorizedBankDetailsOwner> ownersList)
-        {
-            CardNumber = cardNumber;
-            AccountNumber = accountNumber;
-            IBan = ban;
-            BankName = bankName;
-            OwnersList = ownersList ?? new List<AuthorizedBankDetailsOwner>();
-        }
-
-        public string CardNumber { get; private set; }
-        public string AccountNumber { get; private set; }
-        public string IBan { get; private set; }
-        public string BankName { get; private set; }
-        public List<AuthorizedBankDetailsOwner> OwnersList { get; private set; }
-    }
-
-    public class AuthorizedBankDetailsOwner // Value Object - not inheriting from EntityBase
-    {
-        private AuthorizedBankDetailsOwner() { }
-
-        public AuthorizedBankDetailsOwner(string fName, string lName, string nationalIdentifier, string customerType)
-        {
-            FName = fName;
-            LName = lName;
-            NationalIdentifier = nationalIdentifier;
-            CustomerType = customerType;
-        }
-        
-        public string FName { get; private set; }
-        public string LName { get; private set; }
-        public string NationalIdentifier { get; private set; }
-        public string CustomerType { get; private set; }
-    }
-}

Company.Domain/AuthorizedBankDetailsAgg/IAuthorizedBankDetailsRepository.cs

@@ -1,13 +0,0 @@
-using _0_Framework_b.Domain;
-using System.Collections.Generic;
-using Company.Application.Contracts.AuthorizedBankDetails;
-
-namespace Company.Domain.AuthorizedBankDetailsAgg
-{
-    public interface IAuthorizedBankDetailsRepository : IRepository<long, AuthorizedBankDetails>
-    {
-        EditAuthorizedBankDetails GetDetails(long id);
-        List<AuthorizedBankDetailsViewModel> Search(AuthorizedBankDetailsSearchModel searchModel);
-        AuthorizedBankDetailsViewModel GetByIban(string iban);
-    }
-}

Company.Domain/CheckoutAgg/Checkout.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Security.AccessControl;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
@@ -13,25 +12,25 @@ namespace Company.Domain.CheckoutAgg;
 
 public class Checkout : EntityBase
 {
-    public Checkout()
-    {
-    }
-
+	private Checkout()
+	{
+	
+	}
     public Checkout(string employeeFullName, string fathersName, string nationalCode, string dateOfBirth,
         long employeeId, string workshopName, long workshopId, string contractNo, DateTime contractStart,
-        DateTime contractEnd, string month, string year, long contractId, long workingHoursId,
+        DateTime contractEnd, string month, string year, long contractId, long workingHoursId, 
         double monthlySalary, double baseYearsPay, double consumableItems, double housingAllowance,
         double overtimePay, double nightworkPay, double fridayPay, double missionPay, double shiftPay,
         double familyAllowance, double bonusesPay, double yearsPay, double leavePay,
         double insuranceDeduction, double taxDeducation, double installmentDeduction,
         double salaryAidDeduction, double absenceDeduction, string sumOfWorkingDays
-        , string archiveCode, string personnelCode,
+        , string archiveCode, string personnelCode, 
         string totalClaims, string totalDeductions, double totalPayment, string signature, double marriedAllowance, bool leaveCheckout,
         double creditLeaves, double absencePeriod, double averageHoursPerDay, bool hasRollCall, string overTimeWorkvalue,
         string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue,
         string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute,
         ICollection<CheckoutLoanInstallment> loanInstallments,
-        ICollection<CheckoutSalaryAid> salaryAids, CheckoutRollCall checkoutRollCall, TimeSpan employeeMandatoryHours, bool hasInsuranceShareTheSameAsList)
+        ICollection<CheckoutSalaryAid> salaryAids,CheckoutRollCall checkoutRollCall,TimeSpan employeeMandatoryHours)
     {
         EmployeeFullName = employeeFullName;
         FathersName = fathersName;
@@ -92,7 +91,6 @@ public class Checkout : EntityBase
         SalaryAids = salaryAids;
         CheckoutRollCall = checkoutRollCall;
         EmployeeMandatoryHours = employeeMandatoryHours;
-        HasInsuranceShareTheSameAsList = hasInsuranceShareTheSameAsList;
     }
 
 
@@ -101,7 +99,7 @@ public class Checkout : EntityBase
     public string Signature { get; private set; }
     public string FathersName { get; private set; }
     public string NationalCode { get; private set; }
-    public string DateOfBirth { get; private set; }
+    public string DateOfBirth { get; private set; } 
     public long EmployeeId { get; private set; }
 
     public string WorkshopName { get; private set; }
@@ -137,7 +135,7 @@ public class Checkout : EntityBase
     public double SalaryAidDeduction { get; private set; }
 
     public double AbsenceDeduction { get; private set; }
-
+    
     public string SumOfWorkingDays { get; private set; }
     public string ArchiveCode { get; private set; }
     public string PersonnelCode { get; private set; }
@@ -159,70 +157,58 @@ public class Checkout : EntityBase
     //میانگین ساعت کار در یک روز
     public double AverageHoursPerDay { get; private set; }
     public bool HasRollCall { get; private set; }
-    /// <summary>
-    /// مقدار اضافه کار
-    /// </summary>
+   /// <summary>
+   /// مقدار اضافه کار
+   /// </summary>
     public string OverTimeWorkValue { get; private set; }
-
-    /// <summary>
-    /// مقدار شبکاری
-    /// </summary>
+   
+   /// <summary>
+   /// مقدار شبکاری
+   /// </summary>
     public string OverNightWorkValue { get; private set; }
-
-    /// <summary>
-    /// مقدار جمعه کاری
-    /// </summary>
-    public string FridayWorkValue { get; private set; }
-
-    /// <summary>
-    /// درصد نوبت کاری
-    /// </summary>
-    public string RotatingShiftValue { get; private set; }
-
-    /// <summary>
+ 
+   /// <summary>
+   /// مقدار جمعه کاری
+   /// </summary>
+   public string FridayWorkValue { get; private set; }
+ 
+   /// <summary>
+   /// درصد نوبت کاری
+   /// </summary>
+   public string RotatingShiftValue { get; private set; }
+    
+   /// <summary>
     /// مقدار غیبت  
     /// </summary>
-    public string AbsenceValue { get; private set; }
+   public string AbsenceValue { get; private set; }
 
-    /// <summary>
-    /// تعداد روزهای محاسبه شده برای مزد مرخصی
-    /// </summary>
-    public string TotalDayOfLeaveCompute { get; private set; }
-    /// <summary>
-    /// تعداد روزهای محاسبه شده برای سنوات
-    /// </summary>
-    public string TotalDayOfYearsCompute { get; private set; }
-    /// <summary>
-    /// تعداد روزهای محاسبه شده برای عیدی و پاداش
-    /// </summary>
-    public string TotalDayOfBunosesCompute { get; private set; }
+   /// <summary>
+   /// تعداد روزهای محاسبه شده برای مزد مرخصی
+   /// </summary>
+   public string TotalDayOfLeaveCompute { get; private set; }
+   /// <summary>
+   /// تعداد روزهای محاسبه شده برای سنوات
+   /// </summary>
+   public string TotalDayOfYearsCompute { get; private set; }
+   /// <summary>
+   /// تعداد روزهای محاسبه شده برای عیدی و پاداش
+   /// </summary>
+   public string TotalDayOfBunosesCompute { get; private set; }
 
-    /// <summary>
-    /// دارای تداخل مبلغ است. این در زمانی اتفاق می افتد که فیش مبلغ آن تغییر کرده ولی به دلیل مسائل قانونی امکان صدور دوباره آن وجود ندارد
-    /// </summary>
-    public bool HasAmountConflict { get; private set; }
+   /// <summary>
+   /// دارای تداخل مبلغ است. این در زمانی اتفاق می افتد که فیش مبلغ آن تغییر کرده ولی به دلیل مسائل قانونی امکان صدور دوباره آن وجود ندارد
+   /// </summary>
+   public bool HasAmountConflict { get; private set; }
 
-    /// <summary>
-    /// ساعت موظفی پرسنل در ماه
-    /// </summary>
+   /// <summary>
+   /// ساعت موظفی پرسنل در ماه
+   /// </summary>
     public TimeSpan EmployeeMandatoryHours { get; set; }
+   
+   #region valueObjects
 
-    /// <summary>
-    /// آیا حق بیمه مشابه لیست بیمه حساب شده؟
-    /// </summary>
-    public bool HasInsuranceShareTheSameAsList { get; private set; }
-
-    /// <summary>
-    /// آیا فیش  نیاز به بروزرسانی دارد
-    /// </summary>
-    public bool IsUpdateNeeded { get; private set; }
-
-    public List<CheckoutWarningMessage> CheckoutWarningMessageList { get; set; }
-
-    #region valueObjects
-
-    public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
-    public ICollection<CheckoutSalaryAid> SalaryAids { get; set; } = [];
+   public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
+   public ICollection<CheckoutSalaryAid> SalaryAids { get; set; } = [];
     public CheckoutRollCall CheckoutRollCall { get; private set; }
     #endregion
 
@@ -291,7 +277,7 @@ public class Checkout : EntityBase
         var year = contarctStart.ToFarsiYear();
         var sumYear = year.Substring(Math.Max(0, year.Length - 2));
 
-
+          
         ContractNo = archiveCode + "/" + personnelCode + "/" + sumYear + "/" + month;
     }
     public void Active()
@@ -326,7 +312,7 @@ public class Checkout : EntityBase
     }
 
 
-    public void SetSalaryAid(ICollection<CheckoutSalaryAid> salaryAids, double salaryAidAmount)
+    public void SetSalaryAid(ICollection<CheckoutSalaryAid> salaryAids,double salaryAidAmount)
     {
         SalaryAids = salaryAids;
         SalaryAidDeduction = salaryAidAmount;
@@ -344,45 +330,30 @@ public class Checkout : EntityBase
 
     public void SetAmountConflict(bool hasAmountConflict)
     {
-        HasAmountConflict = hasAmountConflict;
+	    HasAmountConflict = hasAmountConflict;
     }
 
     public void SetEmployeeMandatoryHours(TimeSpan employeeMandatoryHours)
     {
         EmployeeMandatoryHours = employeeMandatoryHours;
     }
-
-    public void SetInsuranceShare()
-    {
-        HasInsuranceShareTheSameAsList = true;
-    }
-
-    /// <summary>
-    /// نیاز به آپدیت 
-    /// </summary>
-    public void SetUpdateNeeded()
-    {
-        IsUpdateNeeded = true;
-    }
-
-
 }
 
 public class CheckoutRollCall
 {
-    private CheckoutRollCall() { }
-    public CheckoutRollCall(TimeSpan totalMandatoryTimeSpan, TimeSpan totalPresentTimeSpan, TimeSpan totalBreakTimeSpan,
-        TimeSpan totalWorkingTimeSpan, TimeSpan totalPaidLeaveTmeSpan, TimeSpan totalSickLeaveTimeSpan,
-        ICollection<CheckoutRollCallDay> rollCallDaysCollection)
-    {
-        TotalMandatoryTimeSpan = totalMandatoryTimeSpan;
-        TotalPresentTimeSpan = totalPresentTimeSpan;
-        TotalBreakTimeSpan = totalBreakTimeSpan;
-        TotalWorkingTimeSpan = totalWorkingTimeSpan;
-        TotalPaidLeaveTmeSpan = totalPaidLeaveTmeSpan;
-        TotalSickLeaveTimeSpan = totalSickLeaveTimeSpan;
-        RollCallDaysCollection = rollCallDaysCollection;
-    }
+    private CheckoutRollCall(){}
+	public CheckoutRollCall(TimeSpan totalMandatoryTimeSpan, TimeSpan totalPresentTimeSpan, TimeSpan totalBreakTimeSpan,
+		TimeSpan totalWorkingTimeSpan, TimeSpan totalPaidLeaveTmeSpan, TimeSpan totalSickLeaveTimeSpan,
+		ICollection<CheckoutRollCallDay> rollCallDaysCollection)
+	{
+		TotalMandatoryTimeSpan = totalMandatoryTimeSpan;
+		TotalPresentTimeSpan = totalPresentTimeSpan;
+		TotalBreakTimeSpan = totalBreakTimeSpan;
+		TotalWorkingTimeSpan = totalWorkingTimeSpan;
+		TotalPaidLeaveTmeSpan = totalPaidLeaveTmeSpan;
+		TotalSickLeaveTimeSpan = totalSickLeaveTimeSpan;
+		RollCallDaysCollection = rollCallDaysCollection;
+	}
 
 
     /// <summary>
@@ -423,27 +394,27 @@ public class CheckoutRollCall
 
 public class CheckoutRollCallDay
 {
-    private CheckoutRollCallDay() { }
-    public CheckoutRollCallDay(DateTime date, string firstStartDate, string firstEndDate,
-        string secondStartDate, string secondEndDate, TimeSpan breakTimeSpan,
-        bool isSliced, TimeSpan workingTimeSpan, bool isAbsent, bool isFriday,
-        bool isHoliday, string leaveType)
-    {
-        Date = date;
-        FirstStartDate = firstStartDate;
-        FirstEndDate = firstEndDate;
-        SecondStartDate = secondStartDate;
-        SecondEndDate = secondEndDate;
-        BreakTimeSpan = breakTimeSpan;
-        IsSliced = isSliced;
-        WorkingTimeSpan = workingTimeSpan;
-        IsAbsent = isAbsent;
-        IsFriday = isFriday;
-        IsHoliday = isHoliday;
-        LeaveType = leaveType;
-    }
+    private CheckoutRollCallDay(){}
+	public CheckoutRollCallDay(DateTime date, string firstStartDate, string firstEndDate,
+		string secondStartDate, string secondEndDate, TimeSpan breakTimeSpan,
+		bool isSliced, TimeSpan workingTimeSpan, bool isAbsent, bool isFriday,
+		bool isHoliday, string leaveType)
+	{
+		Date = date;
+		FirstStartDate = firstStartDate;
+		FirstEndDate = firstEndDate;
+		SecondStartDate = secondStartDate;
+		SecondEndDate = secondEndDate;
+		BreakTimeSpan = breakTimeSpan;
+		IsSliced = isSliced;
+		WorkingTimeSpan = workingTimeSpan;
+		IsAbsent = isAbsent;
+		IsFriday = isFriday;
+		IsHoliday = isHoliday;
+		LeaveType = leaveType;
+	}
 
-    public long Id { get; set; }
+	public long Id { get; set; }
 
     /// <summary>
     /// تاریخ
@@ -487,12 +458,12 @@ public class CheckoutRollCallDay
     /// <summary>
     /// آیا غیبت است
     /// </summary>
-	public bool IsAbsent { get; private set; }
+	public bool IsAbsent { get; private set; }  
 
     /// <summary>
     /// آیا جمعه است
     /// </summary>
-    public bool IsFriday { get; private set; }
+	public bool IsFriday { get; private set; }
 
     /// <summary>
     /// آیا تعطیل رسمی است
@@ -504,6 +475,6 @@ public class CheckoutRollCallDay
     /// </summary>
 	public string LeaveType { get; private set; }
 
-    public long CheckoutId { get; set; }
+	public long CheckoutId { get; set; }
 
 }

Company.Domain/CheckoutAgg/CheckoutWarningMessage.cs

@@ -1,32 +0,0 @@
-using _0_Framework.Application.Enums;
-using _0_Framework.Domain;
-
-namespace Company.Domain.CheckoutAgg;
-
-public class CheckoutWarningMessage : EntityBaseWithoutCreationDate
-{
-    public CheckoutWarningMessage(string warningMessage, long checkoutId, TypeOfCheckoutWarning typeOfCheckoutWarning)
-    {
-        WarningMessage = warningMessage;
-        CheckoutId = checkoutId;
-        TypeOfCheckoutWarning = typeOfCheckoutWarning;
-    }
-
-    /// <summary>
-    /// پیام هشدار
-    /// </summary>
-    public string WarningMessage { get; private set; }
-
-
-    /// <summary>
-    /// آی دی فیش حقوقی
-    /// </summary>
-    public long CheckoutId { get; private set; }
-
-    /// <summary>
-    /// نوع هشدار فیش حقوقی
-    /// </summary>
-    public TypeOfCheckoutWarning TypeOfCheckoutWarning { get; private set; }
-
-    public Checkout Checkout { get; set; }
-}

Company.Domain/EmployeeFaceEmbeddingAgg/EmployeeFaceEmbedding.cs

@@ -1,189 +0,0 @@
-using System;
-using System.Collections.Generic;
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization.Attributes;
-
-namespace Company.Domain.EmployeeFaceEmbeddingAgg;
-
-public class EmployeeFaceEmbedding
-    {
-        public EmployeeFaceEmbedding()
-        {
-            EmbeddingHistory = new List<EmbeddingHistoryItem>();
-            MetadataHistory = new List<MetadataHistoryItem>();
-        }
-
-        public EmployeeFaceEmbedding(string employeeFullName, long employeeId, long workshopId, 
-            List<double> embeddings, EmployeeFaceEmbeddingMetadata metadata)
-        {
-            Id = Guid.NewGuid().ToString();
-            EmployeeFullName = employeeFullName;
-            EmployeeId = employeeId;
-            WorkshopId = workshopId;
-            Embeddings = embeddings;
-            Metadata = metadata;
-            EmbeddingHistory = new List<EmbeddingHistoryItem>();
-            MetadataHistory = new List<MetadataHistoryItem>();
-            CreatedAt = DateTime.UtcNow;
-            UpdatedAt = DateTime.UtcNow;
-        }
-
-        [BsonId]
-        [BsonRepresentation(BsonType.String)]
-        public string Id { get; set; }
-
-        [BsonElement("employeeFullName")]
-        public string EmployeeFullName { get; set; }
-        
-        [BsonElement("employeeId")]
-        public long EmployeeId { get; set; }
-        
-        [BsonElement("workshopId")]
-        public long WorkshopId { get; set; }
-
-        [BsonElement("embeddings")]
-        public List<double> Embeddings { get; set; }
-        
-        [BsonElement("metadata")]
-        public EmployeeFaceEmbeddingMetadata Metadata { get; set; }
-
-        [BsonElement("embeddingHistory")]
-        public List<EmbeddingHistoryItem> EmbeddingHistory { get; set; }
-        
-        [BsonElement("metadataHistory")]
-        public List<MetadataHistoryItem> MetadataHistory { get; set; }
-
-        [BsonElement("createdAt")]
-        public DateTime CreatedAt { get; set; }
-        
-        [BsonElement("updatedAt")]
-        public DateTime UpdatedAt { get; set; }
-
-        public void UpdateEmbedding(List<double> newEmbedding, double confidence, double refinementPercentage)
-        {
-            if (Embeddings != null)
-            {
-                EmbeddingHistory.Add(new EmbeddingHistoryItem
-                {
-                    Embedding = new List<double>(Embeddings),
-                    Timestamp = DateTime.UtcNow,
-                    Confidence = confidence,
-                    RefinementPercentage = refinementPercentage
-                });
-            }
-
-            Embeddings = newEmbedding;
-            UpdatedAt = DateTime.UtcNow;
-        }
-
-        public void UpdateMetadata(EmployeeFaceEmbeddingMetadata newMetadata, double confidence, double refinementPercentage)
-        {
-            if (Metadata != null)
-            {
-                MetadataHistory.Add(new MetadataHistoryItem
-                {
-                    Metadata = Metadata,
-                    Timestamp = DateTime.UtcNow,
-                    Confidence = confidence,
-                    RefinementPercentage = refinementPercentage
-                });
-            }
-
-            Metadata = newMetadata;
-            UpdatedAt = DateTime.UtcNow;
-        }
-
-        public void UpdateEmployeeInfo(string employeeFullName, long workshopId)
-        {
-            EmployeeFullName = employeeFullName;
-            WorkshopId = workshopId;
-            UpdatedAt = DateTime.UtcNow;
-        }
-    }
-
-    public class EmployeeFaceEmbeddingMetadata
-    {
-        [BsonElement("avg_eye_distance_normalized")]
-        public double AvgEyeDistanceNormalized { get; set; }
-
-        [BsonElement("avg_eye_to_face_ratio")]
-        public double AvgEyeToFaceRatio { get; set; }
-
-        [BsonElement("avg_face_aspect_ratio")]
-        public double AvgFaceAspectRatio { get; set; }
-
-        [BsonElement("avg_detection_confidence")]
-        public double AvgDetectionConfidence { get; set; }
-
-        [BsonElement("avg_keypoints_normalized")]
-        public EmployeeFaceEmbeddingKeypoints AvgKeypointsNormalized { get; set; }
-
-        [BsonElement("per_image_metadata")]
-        public List<ImageMetadata> PerImageMetadata { get; set; }
-    }
-
-    public class EmployeeFaceEmbeddingKeypoints
-    {
-        [BsonElement("left_eye")]
-        public double[] LeftEye { get; set; }
-
-        [BsonElement("right_eye")]
-        public double[] RightEye { get; set; }
-
-        [BsonElement("nose")]
-        public double[] Nose { get; set; }
-
-        [BsonElement("mouth_left")]
-        public double[] MouthLeft { get; set; }
-
-        [BsonElement("mouth_right")]
-        public double[] MouthRight { get; set; }
-    }
-
-    public class ImageMetadata
-    {
-        [BsonElement("face_aspect_ratio")]
-        public double FaceAspectRatio { get; set; }
-
-        [BsonElement("eye_distance_normalized")]
-        public double EyeDistanceNormalized { get; set; }
-
-        [BsonElement("eye_to_face_ratio")]
-        public double EyeToFaceRatio { get; set; }
-
-        [BsonElement("detection_confidence")]
-        public double DetectionConfidence { get; set; }
-
-        [BsonElement("keypoints_normalized")]
-        public EmployeeFaceEmbeddingKeypoints KeypointsNormalized { get; set; }
-    }
-
-    public class EmbeddingHistoryItem
-    {
-        [BsonElement("embedding")]
-        public List<double> Embedding { get; set; }
-
-        [BsonElement("timestamp")]
-        public DateTime Timestamp { get; set; }
-
-        [BsonElement("confidence")]
-        public double Confidence { get; set; }
-
-        [BsonElement("refinementPercentage")]
-        public double RefinementPercentage { get; set; }
-    }
-
-    public class MetadataHistoryItem
-    {
-        [BsonElement("metadata")]
-        public EmployeeFaceEmbeddingMetadata Metadata { get; set; }
-
-        [BsonElement("timestamp")]
-        public DateTime Timestamp { get; set; }
-
-        [BsonElement("confidence")]
-        public double Confidence { get; set; }
-
-        [BsonElement("refinementPercentage")]
-        public double RefinementPercentage { get; set; }
-    }

Company.Domain/EmployeeFaceEmbeddingAgg/IEmployeeFaceEmbeddingRepository.cs

@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Company.Domain.EmployeeFaceEmbeddingAgg;
-
-public interface IEmployeeFaceEmbeddingRepository
-{
-    Task CreateAsync(EmployeeFaceEmbedding employeeFaceEmbedding);
-    Task UpdateAsync(EmployeeFaceEmbedding employeeFaceEmbedding);
-    Task<EmployeeFaceEmbedding> GetByIdAsync(string id);
-    Task<EmployeeFaceEmbedding> GetByEmployeeIdAsync(long employeeId);
-    Task<List<EmployeeFaceEmbedding>> GetByWorkshopIdAsync(long workshopId);
-    Task<List<EmployeeFaceEmbedding>> GetByWorkshopIdsAsync(List<long> workshopIds);
-    Task DeleteAsync(string id);
-}

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -6,7 +6,6 @@ using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.Workshop;
-using Microsoft.AspNetCore.Mvc;
 
 namespace Company.Domain.InstitutionContractAgg;
 
@@ -55,26 +54,10 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     void UpdateStatusIfNeeded(long institutionContractId);
     Task<GetInstitutionVerificationDetailsViewModel> GetVerificationDetails(Guid id);
     Task<InstitutionContract> GetByPublicIdAsync(Guid id);
-
-    #region Extension
-
     Task<InstitutionContractExtensionInquiryResult> GetExtensionInquiry(long previousContractId);
     Task<InstitutionContractExtensionWorkshopsResponse> GetExtensionWorkshops(InstitutionContractExtensionWorkshopsRequest request);
     Task<InstitutionContractExtensionPlanResponse> GetExtensionInstitutionPlan(InstitutionContractExtensionPlanRequest request);
     Task<InstitutionContractExtensionPaymentResponse> GetExtensionPaymentMethod(InstitutionContractExtensionPaymentRequest request);
     Task<OperationResult> ExtensionComplete(InstitutionContractExtensionCompleteRequest request);
-
-        #endregion
-
-    #region Upgrade(Amendment)
-
-        Task<InstitutionContractAmendmentWorkshopsResponse> GetAmendmentWorkshops(long institutionContractId);
-        Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(InsitutionContractAmendmentPaymentRequest request);
-
-        Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request);
-        Task RemoveAmendmentWorkshops(Guid workshopTempId);
-        #endregion
-
     Task<List<InstitutionContractSelectListViewModel>> GetInstitutionContractSelectList(string search, string selected);
-    Task<List<InstitutionContractPrintViewModel>> PrintAllAsync(List<long> ids);
 }

Company.Domain/InstitutionContractAgg/InstitutionContract.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
 using System.Security.Cryptography;
 using _0_Framework.Domain;
 using Company.Domain.InstitutionContractContactInfoAgg;
@@ -120,25 +119,26 @@ public class InstitutionContract : EntityBase
     public string HasValueAddedTax { get; private set; }
 
     public double ValueAddedTax { get; private set; }
-
+    
     public Guid PublicId { get; private set; }
 
     public string VerifyCode { get; private set; }
     public DateTime VerifyCodeCreation { get; private set; }
-    public string VerifierFullName { get; private set; }
-    public string VerifierPhoneNumber { get; private set; }
-
-    [NotMapped] public bool VerifyCodeExpired => VerifyCodeCreation.Add(ExpireTime) <= DateTime.Now;
-
-    [NotMapped] public bool CanResendVerifyCode => VerifyCodeCreation.Add(ReSendTime) <= DateTime.Now;
+    
+    [NotMapped]
+    public bool VerifyCodeExpired => VerifyCodeCreation.Add(ExpireTime) <= DateTime.Now;
 
+    [NotMapped]
+    public bool CanResendVerifyCode => VerifyCodeCreation.Add(ReSendTime) <= DateTime.Now;
+    
     [NotMapped] public TimeSpan ExpireTime => TimeSpan.FromMinutes(5);
-
-
+    
+    
+    
     [NotMapped] public TimeSpan ReSendTime => TimeSpan.FromMinutes(2);
-
+    
     public bool IsInstallment { get; set; }
-
+    
     public InstitutionContractVerificationStatus VerificationStatus { get; private set; }
 
     public InstitutionContractWorkshopGroup WorkshopGroup { get; private set; }
@@ -227,12 +227,10 @@ public class InstitutionContract : EntityBase
     }
 
 
-    public void SetVerifyCode(string code,string verifierFullName, string verifierPhoneNumber)
+    public void SetVerifyCode(string code)
     {
         VerifyCode = code;
         VerifyCodeCreation = DateTime.Now;
-        VerifierFullName = verifierFullName;
-        VerifierPhoneNumber = verifierPhoneNumber;
     }
 
     public void SetWorkshopGroup(InstitutionContractWorkshopGroup workshopGroup)
@@ -256,19 +254,6 @@ public class InstitutionContract : EntityBase
 
 public class InstitutionContractAmendment : EntityBase
 {
-    private InstitutionContractAmendment(){}
-    public InstitutionContractAmendment(long institutionContractId,
-        List<InstitutionContractInstallment> installments, double amount, bool hasInstallment,
-        InstitutionContractAmendmentChange amendmentChange, long lawId)
-    {
-        InstitutionContractId = institutionContractId;
-        Installments = installments is { Count: > 0} ? installments : [];
-        Amount = amount;
-        HasInstallment = hasInstallment;
-        AmendmentChanges = [amendmentChange];
-        LawId = lawId;
-    }
-
     public long InstitutionContractId { get; set; }
     public InstitutionContract InstitutionContract { get; set; }
     public List<InstitutionContractInstallment> Installments { get; set; }
@@ -277,47 +262,10 @@ public class InstitutionContractAmendment : EntityBase
     public string VerifyCode { get; set; }
     public DateTime VerificationCreation { get; set; }
     public List<InstitutionContractAmendmentChange> AmendmentChanges { get; set; }
-
-    public long LawId { get; set; }
-
-    public void SetVerifyCode(string code,string verifierFullName, string verifierPhoneNumber)
-    {
-        VerifyCode = code;
-        VerifyCodeCreation = DateTime.Now;
-        VerifierFullName = verifierFullName;
-        VerifierPhoneNumber = verifierPhoneNumber;
-    }
-
-    public string VerifierPhoneNumber { get; private set; }
-
-    public string VerifierFullName { get; private set; }
-
-    public DateTime VerifyCodeCreation { get; set; }
 }
 
 public class InstitutionContractAmendmentChange : EntityBase
 {
-    private InstitutionContractAmendmentChange() { }
-    private InstitutionContractAmendmentChange(long institutionContractAmendmentId,
-        InstitutionContractAmendment institutionContractAmendment, InstitutionContractAmendmentChangeType changeType,
-        DateTime changeDateGr, bool? hasRollCallPlan, bool? hasCustomizeCheckoutPlan, bool? hasContractPlan,
-        bool? hasContractPlanInPerson, bool? hasInsurancePlan, bool? hasInsurancePlanInPerson, int? personnelCount,
-        long? workshopDetailsId)
-    {
-        InstitutionContractAmendmentId = institutionContractAmendmentId;
-        InstitutionContractAmendment = institutionContractAmendment;
-        ChangeType = changeType;
-        ChangeDateGr = changeDateGr;
-        HasRollCallPlan = hasRollCallPlan;
-        HasCustomizeCheckoutPlan = hasCustomizeCheckoutPlan;
-        HasContractPlan = hasContractPlan;
-        HasContractPlanInPerson = hasContractPlanInPerson;
-        HasInsurancePlan = hasInsurancePlan;
-        HasInsurancePlanInPerson = hasInsurancePlanInPerson;
-        PersonnelCount = personnelCount;
-        WorkshopDetailsId = workshopDetailsId;
-    }
-
     public long InstitutionContractAmendmentId { get; private set; }
     public InstitutionContractAmendment InstitutionContractAmendment { get; private set; }
     public InstitutionContractAmendmentChangeType ChangeType { get; private set; }
@@ -362,6 +310,8 @@ public class InstitutionContractAmendmentChange : EntityBase
     /// تعداد کارگاه
     /// </summary>
     public long? WorkshopDetailsId { get; private set; }
+    
+    
 }
 
 public enum InstitutionContractAmendmentChangeType

Company.Domain/InstitutionContractAmendmentTempAgg/InstitutionContractAmendmentTemp.cs

@@ -1,151 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization.Attributes;
-
-namespace Company.Domain.InstitutionContractAmendmentTempAgg;
-
-public class InstitutionContractAmendmentTemp
-{
-    public InstitutionContractAmendmentTemp(List<InstitutionContractAmendmentTempPrevWorkshop> prevWorkshops,
-        long institutionContractId)
-    {
-        Id = Guid.NewGuid();
-        PrevWorkshops = prevWorkshops;
-        NewWorkshops = prevWorkshops.Select(x=> new InstitutionContractAmendmentTempNewWorkshop(
-            x.WorkshopName, x.CountPerson, x.ContractAndCheckout, x.ContractAndCheckoutInPerson, x.Insurance,
-            x.InsuranceInPerson, x.RollCall, x.RollCallInPerson, x.CustomizeCheckout, x.Price, x.WorkshopId,
-            x.CurrentWorkshopId, 0)).ToList();
-        InstitutionContractId = institutionContractId;
-    }
-
-    [BsonId]
-    [BsonRepresentation(BsonType.String)]
-    public Guid Id { get; private set; }
-    public List<InstitutionContractAmendmentTempPrevWorkshop> PrevWorkshops { get; private set; }
-    public List<InstitutionContractAmendmentTempNewWorkshop> NewWorkshops { get; private set; }
-    public long InstitutionContractId { get; private set; }
-}
-
-public class InstitutionContractAmendmentTempNewWorkshop : InstitutionContractAmendmentTempPrevWorkshop
-{
-    public InstitutionContractAmendmentTempNewWorkshop(string workshopName, int countPerson, bool contractAndCheckout,
-        bool contractAndCheckoutInPerson, bool insurance, bool insuranceInPerson, bool rollCall, bool rollCallInPerson,
-        bool customizeCheckout, double price, long workshopId, long currentWorkshopId,double priceDifference) : base(
-        workshopName, countPerson, contractAndCheckout, contractAndCheckoutInPerson, insurance, insuranceInPerson,
-        rollCall, rollCallInPerson, customizeCheckout, price, workshopId, currentWorkshopId)
-    {
-        PriceDifference = priceDifference;
-    }
-
-    /// <summary>
-    /// مبلغ اختلاف کارگاه جدید با کارگاه قبلی(مبلغ اصلی ارتقاء)
-    /// </summary>
-    public double PriceDifference { get; private set; }
-    
-    
-    public void Edit(string workshopName, int countPerson, bool contractAndCheckout,
-        bool contractAndCheckoutInPerson,
-        bool insurance, bool insuranceInPerson, bool rollCall, bool customizeCheckout,
-        double price,double priceDifference)
-    {
-        base.Edit(workshopName, countPerson, contractAndCheckout, contractAndCheckoutInPerson, insurance,
-            insuranceInPerson, rollCall, customizeCheckout, price);
-        PriceDifference = priceDifference;
-    }
-}
-
-public class InstitutionContractAmendmentTempPrevWorkshop
-{
-    public InstitutionContractAmendmentTempPrevWorkshop(string workshopName, int countPerson, bool contractAndCheckout,
-        bool contractAndCheckoutInPerson,
-        bool insurance, bool insuranceInPerson,
-        bool rollCall, bool rollCallInPerson, bool customizeCheckout, double price, long workshopId,
-        long currentWorkshopId)
-    {
-        Id = Guid.NewGuid();
-        WorkshopName = workshopName;
-        CountPerson = countPerson;
-        ContractAndCheckout = contractAndCheckout;
-        Insurance = insurance;
-        RollCall = rollCall;
-        CustomizeCheckout = customizeCheckout;
-        ContractAndCheckoutInPerson = contractAndCheckoutInPerson;
-        InsuranceInPerson = insuranceInPerson;
-        RollCallInPerson = rollCallInPerson;
-        Price = price;
-        WorkshopId = workshopId;
-        CurrentWorkshopId = currentWorkshopId;
-    }
-
-    [BsonRepresentation(BsonType.String)]
-    public Guid Id { get; set; }
-
-    public long CurrentWorkshopId { get; private set; }
-    public long WorkshopId { get; set; }
-
-    /// <summary>
-    /// نام کارگاه
-    /// </summary>
-    public string WorkshopName { get; private set; }
-
-    /// <summary>
-    /// تعداد پرسنل 
-    /// </summary>
-    public int CountPerson { get; private set; }
-
-
-    #region ServiceSelection
-
-    /// <summary>
-    /// قرارداد و تصفیه
-    /// </summary>
-    public bool ContractAndCheckout { get; private set; }
-
-    /// <summary>
-    /// بیمه
-    /// </summary>
-    public bool Insurance { get; private set; }
-
-    /// <summary>
-    /// حضورغباب
-    /// </summary>
-    public bool RollCall { get; private set; }
-
-    public bool RollCallInPerson { get; set; }
-
-    /// <summary>
-    /// فیش غیر رسمی
-    /// </summary>
-    public bool CustomizeCheckout { get; private set; }
-
-    /// <summary>
-    /// خدمات حضوری قرداد و تصفیه
-    /// </summary>
-    public bool ContractAndCheckoutInPerson { get; private set; }
-
-    /// <summary>
-    /// خدمات حضوری بیمه
-    /// </summary>
-    public bool InsuranceInPerson { get; private set; }
-
-    public double Price { get; private set; }
-
-    #endregion
-
-    public void Edit(string workshopName, int countPerson, bool contractAndCheckout, bool contractAndCheckoutInPerson,
-        bool insurance, bool insuranceInPerson, bool rollCall, bool customizeCheckout,
-        double price)
-    {
-        WorkshopName = workshopName;
-        CountPerson = countPerson;
-        ContractAndCheckout = contractAndCheckout;
-        Insurance = insurance;
-        RollCall = rollCall;
-        CustomizeCheckout = customizeCheckout;
-        ContractAndCheckoutInPerson = contractAndCheckoutInPerson;
-        InsuranceInPerson = insuranceInPerson;
-        Price = price;
-    }
-}

Company.Domain/InstitutionContractInsertTempAgg/IInstitutionContractExtenstionTempRepository.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Threading.Tasks;
+using _0_Framework.Application;
 
-namespace Company.Domain.InstitutionContractExtensionTempAgg;
+namespace Company.Domain.InstitutionContractInsertTempAgg;
 
 public interface IInstitutionContractExtenstionTempRepository
 {

Company.Domain/InstitutionContractInsertTempAgg/InstitutionContractExtensionTemp.cs

@@ -5,7 +5,7 @@ using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
 
-namespace Company.Domain.InstitutionContractExtensionTempAgg;
+namespace Company.Domain.InstitutionContractInsertTempAgg;
 
 public class InstitutionContractExtensionTemp
 {
@@ -30,8 +30,8 @@ public class InstitutionContractExtensionTemp
     public InstitutionContractExtensionPlanDetail ThreeMonths { get; set; }
     public InstitutionContractExtensionPlanDetail SixMonths { get; set; }
     public InstitutionContractExtensionPlanDetail TwelveMonths { get; set; }
-    public InstitutionContractPaymentMonthlyViewModel MonthlyPayment { get; set; }
-    public InstitutionContractPaymentOneTimeViewModel OneTimePayment { get; set; }
+    public InstitutionContractExtensionPaymentMonthly MonthlyPayment { get; set; }
+    public InstitutionContractExtensionPaymentOneTime OneTimePayment { get; set; }
 
     public bool HasContractInPerson { get; set; }
 
@@ -58,8 +58,8 @@ public class InstitutionContractExtensionTemp
         HasContractInPerson = hasContractInPerson;
     }
 
-    public void SetAmountAndDuration(InstitutionContractDuration duration,InstitutionContractPaymentMonthlyViewModel monthly,
-        InstitutionContractPaymentOneTimeViewModel oneTime)
+    public void SetAmountAndDuration(InstitutionContractDuration duration,InstitutionContractExtensionPaymentMonthly monthly,
+        InstitutionContractExtensionPaymentOneTime oneTime)
     {
         Duration = duration;
         MonthlyPayment = monthly;

Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs

@@ -51,14 +51,6 @@ public interface IInsuranceListRepository:IRepository<long, InsuranceList>
     List<EmployeeInsurancListDataViewModel> GetEmployeeInsuranceDataAmonthAgo(DateTime currentMonthStartDate, long workshopId);
     #endregion
 
-    /// <summary>
-    /// دریافت اطلاعات بیمه کارکنان برای استفاده در فیش حقوقی
-    /// </summary>
-    /// <param name="startDate"></param>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    List<EmployeeInsurancListDataViewModel> EmployeeInsuranceDataBy(DateTime startDate, long workshopId);
-
     /// <summary>
     /// بدست آوردن اطلاعات محاسباتی ماه پرسنل برای ویرایش
     /// </summary>

Company.Domain/PaymentTransactionAgg/PaymentTransaction.cs

@@ -18,15 +18,13 @@ public class PaymentTransaction:EntityBase
     /// <param name="callBackUrl"></param>
     public PaymentTransaction(long contractingPartyId,
         double amount,
-        string contractingPartyName,string callBackUrl,
-        PaymentTransactionGateWay gateway)
+        string contractingPartyName,string callBackUrl)
     {
         ContractingPartyId = contractingPartyId;
         Status = PaymentTransactionStatus.Pending;
         Amount = amount;
         ContractingPartyName = contractingPartyName;
         CallBackUrl = callBackUrl;
-        Gateway = gateway;
     }
 
     /// <summary>
@@ -70,20 +68,13 @@ public class PaymentTransaction:EntityBase
     public string TransactionId { get; private set; }
 
     public string CallBackUrl { get; private set; }
-    public PaymentTransactionGateWay Gateway { get; private set; }
-    public string Rrn { get; private set; }
-    public string DigitalReceipt { get; private set; }
 
-
-    public void SetPaid(string cardNumber,string bankName,string rrn,string digitalReceipt)
+    public void SetPaid(string cardNumber,string bankName)
     {
         Status = PaymentTransactionStatus.Success;
         TransactionDate = DateTime.Now;
         CardNumber = cardNumber;
         BankName = bankName;
-        Rrn = rrn;
-        DigitalReceipt = digitalReceipt;
-
     }
     public void SetFailed()
     {
@@ -94,5 +85,4 @@ public class PaymentTransaction:EntityBase
     {
         TransactionId = transactionId;
     }
-}
-
+}

Company.Domain/ReportAgg/IReportRepository.cs

@@ -11,23 +11,21 @@ namespace Company.Domain.ReportAgg
     {
         Task<AllReport> GetAllActiveWorkshopsNew(string year, string month);
         AllReport GetAllActiveWorkshops(string year, string month);
-        Task<WorkshopResult> GetWorkshopContractDone(string year, string month, long accountId, List<long> workshopList);
-        Task<WorkshopResult> GetWorkshopContractSignDone(string year, string month, long accountId,
+        WorkshopResult GetWorkshopContractDone(string year, string month, long accountId, List<long> workshopList);
+        WorkshopResult GetWorkshopContractSignDone(string year, string month, long accountId, List<long> workshopList);
+        WorkshopResult GetWorkshopCheckoutDone(string year, string month, long accountId, List<long> workshopList);
+        WorkshopResult GetWorkshopCheckoutSignDone(string year, string month, long accountId, List<long> workshopList);
+        List<EmployeeNotDone> GetEmployeeContract(string year, string month, long workshopId);
+        List<EmployeeNotDone> GetEmployeeContractSign(string year, string month, long workshopId);
+        List<EmployeeNotDone> GetEmployeeCheckout(string year, string month, long workshopId);
+        List<EmployeeNotDone> GetEmployeeCheckoutSign(string year, string month, long workshopId);
+        PrintAllContractCheckout GetPrintAllContractDone(string year, string month, long accountId,
             List<long> workshopList);
-        Task<WorkshopResult> GetWorkshopCheckoutDone(string year, string month, long accountId, List<long> workshopList);
-        Task<WorkshopResult> GetWorkshopCheckoutSignDone(string year, string month, long accountId,
+        PrintAllContractCheckout GetPrintAllContractSignDone(string year, string month, long accountId,
             List<long> workshopList);
-        Task<List<EmployeeNotDone>> GetEmployeeContract(string year, string month, long workshopId);
-        Task<List<EmployeeNotDone>> GetEmployeeContractSign(string year, string month, long workshopId);
-        Task<List<EmployeeNotDone>> GetEmployeeCheckout(string year, string month, long workshopId);
-        Task<List<EmployeeNotDone>> GetEmployeeCheckoutSign(string year, string month, long workshopId);
-        Task<PrintAllContractCheckout> GetPrintAllContractDone(string year, string month, long accountId,
+        PrintAllContractCheckout GetPrintAllCheckoutDone(string year, string month, long accountId,
             List<long> workshopList);
-        Task<PrintAllContractCheckout> GetPrintAllContractSignDone(string year, string month, long accountId,
-            List<long> workshopList);
-        Task<PrintAllContractCheckout> GetPrintAllCheckoutDone(string year, string month, long accountId,
-            List<long> workshopList);
-        Task<PrintAllContractCheckout> GetPrintAllCheckoutSignDone(string year, string month, long accountId,
+        PrintAllContractCheckout GetPrintAllCheckoutSignDone(string year, string month, long accountId,
             List<long> workshopList);
 
 

Company.Domain/RollCallEmployeeStatusAgg/IRollCallEmployeeStatusRepository.cs

@@ -26,6 +26,5 @@ namespace Company.Domain.RollCallEmployeeStatusAgg
         List<RollCallEmployeeStatusViewModel> GetActiveByWorkshopIdInDate(long workshopId, DateTime startDateGr, DateTime endDateGr);
         List<RollCallEmployeeStatusViewModel> GetByWorkshopIdInDates(long workshopId, DateTime start, DateTime end);
         bool IsActiveInPeriod(long employeeId, long workshopId, DateTime startDate, DateTime endDate);
-        void RemoveRange(IEnumerable<RollCallEmployeeStatus> rollCallEmployeeStatusList);
-	}
+    }
 }

Company.Domain/SmsResultAgg/SmsResult.cs

@@ -5,8 +5,7 @@ namespace Company.Domain.SmsResultAgg;
 
 public class SmsResult: EntityBase
 {
-    public SmsResult(int messageId, string status,string typeOfSms, 
-        string contractingPartyName,string mobile, long contractingPatyId, long institutionContractId)
+    public SmsResult(int messageId, string status,string typeOfSms, string contractingPartyName,string mobile, long contractingPatyId, long institutionContractId)
     {
         MessageId = messageId;
         Status = status;

CompanyManagement.Infrastructure.Excel/RollCall/CaseHistoryRollCallExcelViewModel.cs

@@ -12,7 +12,9 @@ public class CaseHistoryRollCallExcelForEmployeeViewModel
     public string EmployeeFullName { get; set; }
     public string TotalWorkingHoursFa { get; set; }
     public string TotalWorkingTimeSpan { get; set; }
-    
+
+
+
     public List<RollCallItemForEmployeeExcelViewModel> RollCalls { get; set; }
 }
 
@@ -38,8 +40,7 @@ public class RollCallItemForEmployeeExcelViewModel
     public bool HasLeave { get; set; }
 
     public string TotalWorkingHours { get; set; }
-    public string EnterTimeDifferences { get; set; }
-    public string ExitTimeDifferences { get; set; }
+
 }
 
 public class RollCallTimeExcelViewModel

CompanyManagement.Infrastructure.Excel/RollCall/RollCallExcelGenerator.cs

@@ -113,12 +113,11 @@ public class RollCallExcelGenerator : ExcelGenerator
             worksheet.Cells[i + row + 1, 1].Value = i + 1;
             worksheet.Cells[i + row + 1, 2].Value = rollCall.DayOfWeekFa;
             worksheet.Cells[i + row + 1, 3].Value = rollCall.DateFa;
-            worksheet.Cells[i + row + 1, 4].Value = rollCall.EnterTimeDifferences;
+            worksheet.Cells[i + row + 1, 4].Value = "-";
             worksheet.Cells[i + row + 1, 5].Value = rollCall.StartsItems;
             worksheet.Cells[i + row + 1, 6].Value = rollCall.EndsItems;
-            worksheet.Cells[i + row + 1, 7].Value = rollCall.ExitTimeDifferences;
-            worksheet.Cells[i + row + 1, 8].Value = rollCall.TotalWorkingHours == string.Empty 
-                ? "ندارد" : rollCall.TotalWorkingHours;
+            worksheet.Cells[i + row + 1, 7].Value = "-";
+            worksheet.Cells[i + row + 1, 8].Value = rollCall.TotalWorkingHours == string.Empty ? "ندارد" : rollCall.TotalWorkingHours;
 
             // Style data cells
             for (int j = 1; j <= 8; j++)
@@ -308,49 +307,6 @@ public class RollCallExcelGenerator : ExcelGenerator
         return package.GetAsByteArray();
     }
 
-    private string CalculateExitMinuteDifference(TimeSpan early, TimeSpan late)
-    {
-        if (early == TimeSpan.Zero && late == TimeSpan.Zero)
-        {
-            return "-";
-        }
-        else if (late != TimeSpan.Zero)
-        {
-            var minutes = late.TotalMinutes > 999 ? "999" : late.TotalMinutes.ToString();
-            return $"{minutes}+";
-        }
-        else if (early != TimeSpan.Zero)
-        {
-            var minutes = early.TotalMinutes > 999 ? "999" : early.TotalMinutes.ToString();
-            return $"{minutes}-";
-        }
-        else
-        {
-            return $"";
-        }
-    }
-
-    private string CalculateEntryMinuteDifference(TimeSpan early, TimeSpan late)
-    {
-        if (early == TimeSpan.Zero && late == TimeSpan.Zero)
-        {
-            return "-";
-        }
-        else if (late != TimeSpan.Zero)
-        {
-            var minutes = late.TotalMinutes > 999 ? "999" : late.TotalMinutes.ToString();
-            return $"{minutes}-";
-        }
-        else if (early != TimeSpan.Zero)
-        {
-            var minutes = early.TotalMinutes > 999 ? "999" : early.TotalMinutes.ToString();
-            return $"{minutes}+";
-        }
-        else
-        {
-            return $"";
-        }
-    }
 
 
 }

CompanyManagement.Infrastructure.Mongo/EmployeeFaceEmbeddingRepo/EmployeeFaceEmbeddingRepository.cs

@@ -1,60 +0,0 @@
-using Company.Domain.EmployeeFaceEmbeddingAgg;
-using MongoDB.Driver;
-
-namespace CompanyManagement.Infrastructure.Mongo.EmployeeFaceEmbeddingRepo;
-
-public class EmployeeFaceEmbeddingRepository : IEmployeeFaceEmbeddingRepository
-{
-    private readonly IMongoCollection<EmployeeFaceEmbedding> _employeeFaceEmbeddings;
-
-    public EmployeeFaceEmbeddingRepository(IMongoDatabase database)
-    {
-        _employeeFaceEmbeddings = database.GetCollection<EmployeeFaceEmbedding>("EmployeeFaces");
-    }
-
-    public async Task CreateAsync(EmployeeFaceEmbedding employeeFaceEmbedding)
-    {
-        await _employeeFaceEmbeddings.InsertOneAsync(employeeFaceEmbedding);
-    }
-
-    public async Task UpdateAsync(EmployeeFaceEmbedding employeeFaceEmbedding)
-    {
-        await _employeeFaceEmbeddings.ReplaceOneAsync(
-            x => x.Id == employeeFaceEmbedding.Id, 
-            employeeFaceEmbedding);
-    }
-
-    public async Task<EmployeeFaceEmbedding> GetByIdAsync(string id)
-    {
-        return await _employeeFaceEmbeddings
-            .Find(x => x.Id == id)
-            .FirstOrDefaultAsync();
-    }
-
-    public async Task<EmployeeFaceEmbedding> GetByEmployeeIdAsync(long employeeId)
-    {
-        return await _employeeFaceEmbeddings
-            .Find(x => x.EmployeeId == employeeId)
-            .FirstOrDefaultAsync();
-    }
-
-    public async Task<List<EmployeeFaceEmbedding>> GetByWorkshopIdAsync(long workshopId)
-    {
-        return await _employeeFaceEmbeddings
-            .Find(x => x.WorkshopId == workshopId)
-            .ToListAsync();
-    }
-
-    public async Task<List<EmployeeFaceEmbedding>> GetByWorkshopIdsAsync(List<long> workshopIds)
-    {
-        return await _employeeFaceEmbeddings
-            .Find(x => workshopIds.First()==x.WorkshopId)
-            .ToListAsync();
-    }
-
-    public async Task DeleteAsync(string id)
-    {
-        await _employeeFaceEmbeddings.DeleteOneAsync(x => x.Id == id);
-    }
-}
-

CompanyManagement.Infrastructure.Mongo/InstitutionContractInsertTempRepo/InstitutionContractExtenstionTempRepository.cs

@@ -1,4 +1,4 @@
-using Company.Domain.InstitutionContractExtensionTempAgg;
+using Company.Domain.InstitutionContractInsertTempAgg;
 using MongoDB.Driver;
 
 namespace CompanyManagement.Infrastructure.Mongo.InstitutionContractInsertTempRepo;

CompanyManagment.App.Contracts/AuthorizedBankDetails/AuthorizedBankDetailsSearchModel.cs

@@ -1,12 +0,0 @@
-namespace Company.Application.Contracts.AuthorizedBankDetails
-{
-    public class AuthorizedBankDetailsSearchModel
-    {
-        public string CardNumber { get; set; }
-        public string AccountNumber { get; set; }
-        public string IBan { get; set; }
-        public string BankName { get; set; }
-        public string NationalIdentifier { get; set; }
-    }
-}
-

CompanyManagment.App.Contracts/AuthorizedBankDetails/AuthorizedBankDetailsViewModel.cs

@@ -1,18 +0,0 @@
-using System;
-using System;
-
-using System.Collections.Generic;
-namespace Company.Application.Contracts.AuthorizedBankDetails;
-
-public class AuthorizedBankDetailsViewModel
-{
-    public string NationalIdentifier { get; set; }
-        
-    public long Id { get; set; }
-    public string CustomerType { get; set; }
-    public string CardNumber { get; set; }
-    public string AccountNumber { get; set; }
-    public string IBan { get; set; }
-    public string BankName { get; set; }
-    public List<AuthorizedBankDetailsOwnerViewModel> Owners { get; set; }
-}

CompanyManagment.App.Contracts/AuthorizedBankDetails/CreateAuthorizedBankDetails.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-
-namespace Company.Application.Contracts.AuthorizedBankDetails
-{
-    public class CreateAuthorizedBankDetails
-    {
-        public string CardNumber { get; set; }
-
-        public string AccountNumber { get; set; }
-
-        public string IBan { get; set; }
-
-        public string BankName { get; set; }
-
-        public List<CreateAuthorizedBankDetailsOwner> OwnersList { get; set; }
-    }
-
-    public class CreateAuthorizedBankDetailsOwner
-    {
-        public string FName { get; set; }
-
-        public string LName { get; set; }
-
-        public string NationalIdentifier { get; set; }
-
-        public string CustomerType { get; set; }
-    }
-}

CompanyManagment.App.Contracts/AuthorizedBankDetails/EditAuthorizedBankDetails.cs

@@ -1,28 +0,0 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-
-namespace Company.Application.Contracts.AuthorizedBankDetails
-{
-    public class EditAuthorizedBankDetails
-    {
-        public long Id { get; set; }
-        
-        public string CardNumber { get; set; }
-
-        public string AccountNumber { get; set; }
-
-        public string IBan { get; set; }
-
-        public string BankName { get; set; }
-
-        public List<AuthorizedBankDetailsOwnerViewModel> OwnersList { get; set; }
-    }
-
-    public class AuthorizedBankDetailsOwnerViewModel
-    {
-        public string FName { get; set; }
-        public string LName { get; set; }
-        public string NationalIdentifier { get; set; }
-        public string CustomerType { get; set; }
-    }
-}

CompanyManagment.App.Contracts/AuthorizedBankDetails/IAuthorizedBankDetailsApplication.cs

@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-using _0_Framework.Application;
-using Company.Application.Contracts.AuthorizedBankDetails;
-
-namespace Company.Application.Contracts.AuthorizedBankDetails
-{
-    public interface IAuthorizedBankDetailsApplication
-    {
-        OperationResult Create(CreateAuthorizedBankDetails command);
-        EditAuthorizedBankDetails GetDetails(long id);
-        List<AuthorizedBankDetailsViewModel> Search(AuthorizedBankDetailsSearchModel searchModel);
-        AuthorizedBankDetailsViewModel GetByIban(string iban);
-    }
-}

CompanyManagment.App.Contracts/Checkout/CheckoutViewModel.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using _0_Framework.Application.Enums;
 using CompanyManagment.App.Contracts.Employer;
 using CompanyManagment.App.Contracts.Loan;
 using CompanyManagment.App.Contracts.RollCall;
@@ -134,15 +133,6 @@ public class CheckoutViewModel
     /// </summary>
     public string TotalPaidLeave { get; set; }
 
-    /// <summary>
-    /// آیا فیش  نیاز به بروزرسانی دارد
-    /// </summary>
-    public bool IsUpdateNeeded { get; set; }
-
-    /// <summary>
-    /// لیست پیام های هشدار فیش حقوقی
-    /// </summary>
-    public List<CheckoutWarningMessageModel> CheckoutWarningMessageList { get; set; }
 
     public bool HasSignCheckout { get; set; }    
 

CompanyManagment.App.Contracts/Checkout/CheckoutWarningMessageModel.cs

@@ -1,25 +0,0 @@
-using _0_Framework.Application.Enums;
-
-namespace CompanyManagment.App.Contracts.Checkout;
-
-/// <summary>
-/// مدل هشدار فیش حقوقی
-/// </summary>
-public class CheckoutWarningMessageModel
-{
-    /// <summary>
-    /// پیام هشدار
-    /// </summary>
-    public string WarningMessage { get; set; }
-
-
-    /// <summary>
-    /// آی دی فیش حقوقی
-    /// </summary>
-    public long CheckoutId { get; set; }
-
-    /// <summary>
-    /// نوع هشدار فیش حقوقی
-    /// </summary>
-    public TypeOfCheckoutWarning TypeOfCheckoutWarning { get; set; }
-}

CompanyManagment.App.Contracts/ContractingPartyBankAccounts/IContractingPartyBankAccountsApplication.cs

@@ -1,10 +1,8 @@
 using System.Collections.Generic;
 using System.Security.AccessControl;
-using System.Security.Cryptography;
 using System.Threading.Tasks;
 using System.Transactions;
 using _0_Framework.Application;
-using _0_Framework.Application.UID;
 using CompanyManagment.App.Contracts.OriginalTitle;
 
 namespace CompanyManagment.App.Contracts.ContractingPartyBankAccounts;
@@ -76,27 +74,5 @@ public interface IContractingPartyBankAccountsApplication
     /// <param name="selected">نام سلکت شده</param>
     /// <returns></returns>
     Task<List<string>> ContractingPartyNamesSelectList(string search, string selected);
-    
-    /// <summary>
-    /// احراز هویت اطلاعات بانکی طرف حساب
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    Task<ContractingPartyBankInquiryResponse> InquiryContractingPartyBankDetails(InquiryContractingPartyBankDetailsRequest command);
-    
-}
-public class InquiryContractingPartyBankDetailsRequest
-{
-    public string CardNumber { get; set; }
-    public string AccountNumber { get; set; }
-    public string IBan { get; set; }
-    public UidBanks? UidBank { get; set; }
-}
-public class ContractingPartyBankInquiryResponse
-{
-    public string FullName { get; set; }
-    public string Iban { get; set; }
-    public string AccountNumber { get; set; }
-    public string CardNumber { get; set; }
 }
 

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CustomizeWorkshopEmployeeSettingsViewModel.cs

@@ -25,5 +25,4 @@ public class CustomizeWorkshopEmployeeSettingsViewModel
     public int LeavePermittedDays { get; set; }
     public ICollection<CustomizeRotatingShiftsViewModel> CustomizeRotatingShiftsViewModels { get; set; }
     public List<DayOfWeek> WeeklyOffDays { get; set; }
-    public bool HasLeft { get; set; }
 }

CompanyManagment.App.Contracts/EmployeeFaceEmbedding/EmployeeFaceEmbeddingDto.cs

@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
-
-public class EmployeeFaceEmbeddingDto
-{
-    public string Id { get; set; }
-    public string EmployeeFullName { get; set; }
-    public long EmployeeId { get; set; }
-    public long WorkshopId { get; set; }
-    public List<double> Embeddings { get; set; }
-    public EmployeeFaceEmbeddingMetadataDto Metadata { get; set; }
-}
-

CompanyManagment.App.Contracts/EmployeeFaceEmbedding/EmployeeFaceEmbeddingDtos.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
-
-public class EmployeeFaceEmbeddingMetadataDto
-{
-    public double AvgEyeDistanceNormalized { get; set; }
-    public double AvgEyeToFaceRatio { get; set; }
-    public double AvgFaceAspectRatio { get; set; }
-    public double AvgDetectionConfidence { get; set; }
-    public EmployeeFaceEmbeddingKeypointsDto AvgKeypointsNormalized { get; set; }
-    public List<ImageMetadataDto> PerImageMetadata { get; set; }
-}
-
-public class EmployeeFaceEmbeddingKeypointsDto
-{
-    public double[] LeftEye { get; set; }
-    public double[] RightEye { get; set; }
-    public double[] Nose { get; set; }
-    public double[] MouthLeft { get; set; }
-    public double[] MouthRight { get; set; }
-}
-
-public class ImageMetadataDto
-{
-    public double FaceAspectRatio { get; set; }
-    public double EyeDistanceNormalized { get; set; }
-    public double EyeToFaceRatio { get; set; }
-    public double DetectionConfidence { get; set; }
-    public EmployeeFaceEmbeddingKeypointsDto KeypointsNormalized { get; set; }
-}
-
-public class EmbeddingHistoryItemDto
-{
-    public List<double> Embedding { get; set; }
-    public DateTime Timestamp { get; set; }
-    public double Confidence { get; set; }
-    public double RefinementPercentage { get; set; }
-}
-
-public class MetadataHistoryItemDto
-{
-    public EmployeeFaceEmbeddingMetadataDto Metadata { get; set; }
-    public DateTime Timestamp { get; set; }
-    public double Confidence { get; set; }
-    public double RefinementPercentage { get; set; }
-}
-

CompanyManagment.App.Contracts/EmployeeFaceEmbedding/IEmployeeFaceEmbeddingApplication.cs

@@ -1,43 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
-
-/// <summary>
-/// سرویس مدیریت Embedding چهره کارکنان
-/// این سرویس فقط برای دریافت و ارسال داده است و هیچ command-driven نیست
-/// </summary>
-public interface IEmployeeFaceEmbeddingApplication
-{
-    /// <summary>
-    /// دریافت embedding بر اساس شناسه
-    /// </summary>
-    Task<EmployeeFaceEmbeddingDto> GetByIdAsync(string id);
-
-    /// <summary>
-    /// دریافت embedding بر اساس شناسه کارمند
-    /// </summary>
-    Task<EmployeeFaceEmbeddingDto> GetByEmployeeIdAsync(long employeeId);
-
-    /// <summary>
-    /// دریافت لیست embeddings بر اساس شناسه کارگاه
-    /// </summary>
-    Task<List<EmployeeFaceEmbeddingDto>> GetByWorkshopIdAsync(long workshopId);
-
-    /// <summary>
-    /// دریافت لیست embeddings بر اساس لیست شناسه کارگاه‌ها
-    /// </summary>
-    Task<List<EmployeeFaceEmbeddingDto>> GetByWorkshopIdsAsync(List<long> workshopIds);
-
-    /// <summary>
-    /// ذخیره یا به‌روزرسانی embedding
-    /// اگر Id وجود داشته باشد، به‌روزرسانی می‌شود، در غیر این صورت ایجاد می‌شود
-    /// </summary>
-    Task<string> SaveAsync(EmployeeFaceEmbeddingDto dto);
-
-    /// <summary>
-    /// حذف embedding
-    /// </summary>
-    Task DeleteAsync(string id);
-}
-

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListItemsViewModel.cs

@@ -87,10 +87,6 @@ public class GetInstitutionContractListItemsViewModel
     public long ContractingPartyId { get; set; }
 
     public List<InstitutionContractListWorkshop> Workshops { get; set; }
-
-    public bool IsInPersonContract { get; set; }
-    
-    public bool IsOldContract { get; set; }
 }
 
 public class InstitutionContractListWorkshop
@@ -106,13 +102,13 @@ public class WorkshopServicesViewModel
     public string InsuranceLabel => "ارسال لیست بیمه";
 
     public bool InsuranceInPerson { get; set; }
-    public string InsuranceInPersonLabel => "خدمات مستقیم";
+    public string InsuranceInPersonLabel => "خدمات حضوری";
 
     public bool Contract { get; set; }
     public string ContractLabel => "قرارداد و تصفیه حساب";
 
     public bool ContractInPerson { get; set; }
-    public string ContractInPersonLabel => "خدمات مستقیم";
+    public string ContractInPersonLabel => "خدمات حضوری";
 
     public bool RollCall { get; set; }
     public string RollCallLabel => "ساعت حضور و غیاب";

CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Application.Sms;
 using CompanyManagment.App.Contracts.Checkout;
-using CompanyManagment.App.Contracts.Law;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.App.Contracts.WorkshopPlan;
@@ -78,8 +77,6 @@ public interface IInstitutionContractApplication
     /// <returns>لیست قراردادها برای چاپ</returns>
     List<InstitutionContractViewModel> PrintAll(List<long> id);
     
-
-    [Obsolete("استفاده نشود، از متد غیرهمزمان استفاده شود")]
     /// <summary>
     /// چاپ یک قرارداد
     /// </summary>
@@ -215,80 +212,14 @@ public interface IInstitutionContractApplication
     Task<OperationResult<OtpResultViewModel>> SendVerifyOtp(Guid id);
     Task<OperationResult> VerifyOtp(Guid publicId, string code);
     Task<InstitutionContractWorkshopDetailViewModel> GetWorkshopInitialDetails(long workshopDetailsId);
-
-    #region Extension
-
     Task<InstitutionContractExtensionInquiryResult> GetExtensionInquiry(long previousContractId);
-
-    Task<InstitutionContractExtensionWorkshopsResponse> GetExtensionWorkshops(
-        InstitutionContractExtensionWorkshopsRequest request);
-
-    Task<InstitutionContractExtensionPlanResponse> GetExtensionInstitutionPlan(
-        InstitutionContractExtensionPlanRequest request);
-
+    Task<InstitutionContractExtensionWorkshopsResponse> GetExtensionWorkshops(InstitutionContractExtensionWorkshopsRequest request);
+    Task<InstitutionContractExtensionPlanResponse> GetExtensionInstitutionPlan(InstitutionContractExtensionPlanRequest request);
     Task<InstitutionContractExtensionPaymentResponse> GetExtensionPaymentMethod(
         InstitutionContractExtensionPaymentRequest request);
-
+    
     Task<OperationResult> ExtensionComplete(InstitutionContractExtensionCompleteRequest request);
     Task<List<InstitutionContractSelectListViewModel>> GetInstitutionContractSelectList(string search,string selected);
-
-    #endregion
-
-    #region Upgrade (Amendment)
-
-    Task<InstitutionContractAmendmentWorkshopsResponse> GetAmendmentWorkshops(long institutionContractId);
-    Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request);
-    Task RemoveAmendmentWorkshops(Guid workshopTempId);
-    Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(InsitutionContractAmendmentPaymentRequest request);
-    
-    #endregion
-
-    Task<OperationResult> ResendVerifyLink(long institutionContractId);
-
-    /// <summary>
-    /// دیتای پرینت قرارداد مالی
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    Task<InstitutionContractPrintViewModel> PrintOneAsync(long id);
-}
-
-public class InstitutionContractPrintViewModel
-{
-    public InstitutionContratVerificationParty FirstParty { get; set; }
-    public InstitutionContratVerificationParty SecondParty { get; set; }
-    public string ContractNo { get; set; }
-    public string CreationDate { get; set; }
-    public string ContractStart { get; set; }
-    public string ContractEnd { get; set; }
-    public List<GetInstitutionVerificationDetailsWorkshopsViewModel> Workshops { get; set; }
-    public string TotalPrice { get; set; }
-    public string TaxPrice { get; set; }
-    public string PaymentPrice { get; set; }
-    public string VerifyCode { get; set; }
-    public string VerifyDate { get; set; }
-    public string VerifyTime { get; set; }
-    public string VerifierFullName { get; set; }
-    public string VerifierPhoneNumber { get; set; }
-    public LawViewModel LawViewModel { get; set; }
-    public string Obligation { get; set; }
-}
-
-public class InsertAmendmentTempWorkshopResponse
-{
-    public Guid WorkshopTempId { get; set; }
-    public string Amount { get; set; }
-}
-
-public class InstitutionContractAmendmentWorkshopsResponse
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public List<InstitutionContractAmendmentTempWorkshopViewModel> Workshops { get; set; }
-
-    public Guid TempId { get; set; }
-
 }
 
 public class InstitutionContractSelectListViewModel : SelectListViewModel;
@@ -310,7 +241,19 @@ public class InstitutionContractExtensionInquiryResponse
     public string NationalCode { get; set; }
 }
 
+public class InstitutionContractExtensionCompleteRequest
+{
+    public Guid TemporaryId { get; set; }
+    public bool IsInstallment { get; set; }
+    public long LawId { get; set; }
+}
 
+public class InstitutionContractExtensionPaymentResponse
+{
+    public InstitutionContractExtensionPaymentOneTime OneTime { get; set; }
+    public InstitutionContractExtensionPaymentMonthly Monthly { get; set; }
+    
+}
 
 public class InstitutionContractExtensionPaymentMonthly:InstitutionContractExtensionPaymentOneTime
 {

CompanyManagment.App.Contracts/InstitutionContract/InsitutionContractAmendmentPaymentRequest.cs

@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-using CompanyManagment.App.Contracts.TemporaryClientRegistration;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InsitutionContractAmendmentPaymentRequest
-{
-    public Guid TempId { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InsitutionContractAmendmentPaymentResponse.cs

@@ -1,11 +0,0 @@
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InsitutionContractAmendmentPaymentResponse
-{
-    public InstitutionContractPaymentOneTimeViewModel OneTime { get; set; }
-    public InstitutionContractPaymentMonthlyViewModel Monthly { get; set; }
-    public string ContractStart { get; set; }
-    public string ContractEnd { get; set; }
-    public string OneMonthAmount { get; set; }
-    public string TotalAmount { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractAmendmentTempWorkshopViewModel.cs

@@ -1,64 +0,0 @@
-using System;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractAmendmentTempWorkshopViewModel
-{
-    public Guid TempId { get; set; }
-    
-    public Guid WorkshopTempId { get; set; }
-
-    public long CurrentWorkshopId { get; set; }
-    
-    public long WorkshopId { get; set; }
-
-    /// <summary>
-    /// نام کارگاه
-    /// </summary>
-    public string WorkshopName { get; set; }
-
-    /// <summary>
-    /// تعداد پرسنل 
-    /// </summary>
-    public int CountPerson { get; set; }
-    
-    
-    #region ServiceSelection
-
-    /// <summary>
-    /// قرارداد و تصفیه
-    /// </summary>
-    public bool ContractAndCheckout { get; set; }
-
-    /// <summary>
-    /// بیمه
-    /// </summary>
-    public bool Insurance { get; set; }
-
-    /// <summary>
-    /// حضورغباب
-    /// </summary>
-    public bool RollCall { get; set; }
-
-    public bool RollCallInPerson { get; set; }
-
-    /// <summary>
-    /// فیش غیر رسمی
-    /// </summary>
-    public bool CustomizeCheckout { get; set; }
-
-    /// <summary>
-    /// خدمات حضوری قرداد و تصفیه
-    /// </summary>
-    public bool ContractAndCheckoutInPerson { get; set; }
-
-    /// <summary>
-    /// خدمات حضوری بیمه
-    /// </summary>
-    public bool InsuranceInPerson { get; set; }
-
-    public double Price{ get; set; }
-    public string PriceStr{ get; set; }
-
-    #endregion    
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionCompleteRequest.cs

@@ -1,10 +0,0 @@
-using System;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractExtensionCompleteRequest
-{
-    public Guid TemporaryId { get; set; }
-    public bool IsInstallment { get; set; }
-    public long LawId { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionPaymentResponse.cs

@@ -1,8 +0,0 @@
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractExtensionPaymentResponse
-{
-    public InstitutionContractPaymentOneTimeViewModel OneTime { get; set; }
-    public InstitutionContractPaymentMonthlyViewModel Monthly { get; set; }
-    
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPaymentOneTimeViewModel.cs

@@ -1,24 +0,0 @@
-using System.Collections.Generic;
-using CompanyManagment.App.Contracts.TemporaryClientRegistration;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractPaymentOneTimeViewModel
-{
-    /// <summary>
-    /// مجموع مبالغ
-    /// </summary>
-    public string TotalAmount { get; set; }
-    /// <summary>
-    /// ارزش افزوده
-    /// </summary>
-    public string Tax { get; set; }
-    /// <summary>
-    /// مبلغ قابل پرداخت
-    /// </summary>
-    public string PaymentAmount { get; set; }
-}
-public class InstitutionContractPaymentMonthlyViewModel:InstitutionContractPaymentOneTimeViewModel
-{
-    public List<MonthlyInstallment> Installments { get; set; }
-}

CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs

@@ -31,50 +31,6 @@ public interface IInsuranceListApplication
     double GetRoundValue(double value);
     OperationResult ConfirmInsuranceList(long id);
 
-    #region New
-    /// <summary>
-    /// دستمزد روزانه مشاغل مقطوع بیمه
-    /// </summary>
-    /// <param name="year"></param>
-    /// <param name="workshopId"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="startDateGr"></param>
-    /// <param name="endDateGr"></param>
-    /// <param name="jobId"></param>
-    /// <param name="population"></param>
-    /// <param name="insuranceJobId"></param>
-    /// <returns></returns>
-    double? GetDailyWageFixedSalary(string year, long workshopId, long employeeId, DateTime? startDateGr,
-        DateTime? endDateGr, long jobId, string population, long? insuranceJobId);
-
-    /// <summary>
-    ///  محاسبه مزایای ماهانه
-    /// </summary>
-    /// <param name="endMonthCurrentDay"></param>
-    /// <param name="consumableItemsItemValue"></param>
-    /// <param name="housingAllowanceItemValue"></param>
-    /// <param name="maritalStatus"></param>
-    /// <param name="countWorkingDays"></param>
-    /// <param name="typeOfInsuranceSendWorkshop"></param>
-    /// <param name="jobId"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="includeStatus"></param>
-    /// <returns></returns>
-    public double GetMonthlyBenefits(int endMonthCurrentDay, double consumableItemsItemValue,
-        double housingAllowanceItemValue, double maritalStatus, int countWorkingDays,
-        string typeOfInsuranceSendWorkshop, long jobId, long employeeId, bool includeStatus);
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="yearlysalaryItemValue"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="workshopId"></param>
-    /// <param name="year"></param>
-    /// <returns></returns>
-    public double ComputeDailyWage(double yearlysalaryItemValue, long employeeId, long workshopId, string year);
-
-        #endregion
     List<InsuranceListViewModel> SearchForClient(InsuranceListSearchModel searchModel);
 
     //farokhiChanges

CompanyManagment.App.Contracts/PaymentTransaction/CreatePaymentTransaction.cs

@@ -17,14 +17,4 @@ public class CreatePaymentTransaction
     /// مسیر برگشت پس از پرداخت
     /// </summary>
     public string CallBackUrl { get; set; }
-
-    /// <summary>
-    /// نوع درگاه
-    /// </summary>
-    public PaymentTransactionGateWay Gateway { get; set; }
-}
-public enum PaymentTransactionGateWay
-{
-	AqayePardakht = 1,
-	SepehrPay = 2
 }

CompanyManagment.App.Contracts/PaymentTransaction/IPaymentTransactionApplication.cs

@@ -49,7 +49,7 @@ public interface IPaymentTransactionApplication
     /// <param name="cardNumber"></param>
     /// <param name="bankName"></param>
     /// <returns></returns>
-    OperationResult SetSuccess(long paymentTransactionId, string cardNumber, string bankName, string rrn, string digitalReceipt);
+    OperationResult SetSuccess(long paymentTransactionId, string cardNumber, string bankName);
 
     Task<OperationResult> SetTransactionId(long id, string transactionId);
 }

CompanyManagment.App.Contracts/Report/AllReport.cs

@@ -27,8 +27,6 @@ namespace CompanyManagment.App.Contracts.Report
         public int ContractSignNotDone { get; set; }
         public int ContractSignDone { get; set; }
 
-        public int ContractSignToBe { get; set; }
-
         //تصفیه
         public int AllCheckout { get; set; }
         public int CheckoutNotDone { get; set; }
@@ -36,8 +34,6 @@ namespace CompanyManagment.App.Contracts.Report
         public int CheckoutSignNotDone { get; set; }
         public int CheckoutSignDone { get; set; }
 
-        public int CheckoutSignToBe { get; set; }
-
 
 
     }

CompanyManagment.App.Contracts/Report/IReportApplication.cs

@@ -10,23 +10,21 @@ namespace CompanyManagment.App.Contracts.Report
     {
         Task<AllReport> GetAllActiveWorkshops(string year, string month);
         Task<AllReport> GetAllReports(string year, string month);
-        Task<WorkshopResult> GetWorkshopContractDone(string year, string month, long accountId, List<long> workshopList);
-        Task<WorkshopResult> GetWorkshopContractSignDone(string year, string month, long accountId,
+        WorkshopResult GetWorkshopContractDone(string year, string month, long accountId, List<long> workshopList);
+        WorkshopResult GetWorkshopContractSignDone(string year, string month, long accountId, List<long> workshopList);
+        WorkshopResult GetWorkshopCheckoutDone(string year, string month, long accountId, List<long> workshopList);
+        WorkshopResult GetWorkshopCheckoutSignDone(string year, string month, long accountId, List<long> workshopList);
+        List<EmployeeNotDone> GetEmployeeContract(string year, string month, long workshopId);
+        List<EmployeeNotDone> GetEmployeeContractSign(string year, string month, long workshopId);
+        List<EmployeeNotDone> GetEmployeeCheckout(string year, string month, long workshopId);
+        List<EmployeeNotDone> GetEmployeeCheckoutSign(string year, string month, long workshopId);
+        PrintAllContractCheckout GetPrintAllContractDone(string year, string month, long accountId,
             List<long> workshopList);
-        Task<WorkshopResult> GetWorkshopCheckoutDone(string year, string month, long accountId, List<long> workshopList);
-        Task<WorkshopResult> GetWorkshopCheckoutSignDone(string year, string month, long accountId,
+        PrintAllContractCheckout GetPrintAllContractSignDone(string year, string month, long accountId,
             List<long> workshopList);
-        Task<List<EmployeeNotDone>> GetEmployeeContract(string year, string month, long workshopId);
-        Task<List<EmployeeNotDone>> GetEmployeeContractSign(string year, string month, long workshopId);
-        Task<List<EmployeeNotDone>> GetEmployeeCheckout(string year, string month, long workshopId);
-        Task<List<EmployeeNotDone>> GetEmployeeCheckoutSign(string year, string month, long workshopId);
-        Task<PrintAllContractCheckout> GetPrintAllContractDone(string year, string month, long accountId,
+        PrintAllContractCheckout GetPrintAllCheckoutDone(string year, string month, long accountId,
             List<long> workshopList);
-        Task<PrintAllContractCheckout> GetPrintAllContractSignDone(string year, string month, long accountId,
-            List<long> workshopList);
-        Task<PrintAllContractCheckout> GetPrintAllCheckoutDone(string year, string month, long accountId,
-            List<long> workshopList);
-        Task<PrintAllContractCheckout> GetPrintAllCheckoutSignDone(string year, string month, long accountId,
+        PrintAllContractCheckout GetPrintAllCheckoutSignDone(string year, string month, long accountId,
             List<long> workshopList);
     }
 }

CompanyManagment.App.Contracts/Workshop/WorkshopAccountViewModel.cs

@@ -9,4 +9,5 @@ public class WorkshopAccountViewModel
 	public string Insurance { get; set; }
 	public string Tax { get; set; }
 	public string IsActiveSting { get; set; }
+	public string WorkshopIsActive { get; set; }
 }

CompanyManagment.Application/AuthorizedBankDetailsApplication.cs

@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using _0_Framework.Application;
-using Company.Application.Contracts.AuthorizedBankDetails;
-using Company.Domain.AuthorizedBankDetailsAgg;
-
-namespace CompanyManagment.Application
-{
-    public class AuthorizedBankDetailsApplication : IAuthorizedBankDetailsApplication
-    {
-        private readonly IAuthorizedBankDetailsRepository _authorizedBankDetailsRepository;
-
-        public AuthorizedBankDetailsApplication(IAuthorizedBankDetailsRepository authorizedBankDetailsRepository)
-        {
-            _authorizedBankDetailsRepository = authorizedBankDetailsRepository;
-        }
-
-        public OperationResult Create(CreateAuthorizedBankDetails command)
-        {
-            var operation = new OperationResult();
-            
-            if (_authorizedBankDetailsRepository.Exists(x => x.CardNumber == command.CardNumber && 
-                                                        x.AccountNumber == command.AccountNumber &&
-                                                        x.IBan == command.IBan))
-                return operation.Failed(ApplicationMessages.DuplicatedRecord);
-
-            var ownersList = new List<AuthorizedBankDetailsOwner>();
-            if (command.OwnersList != null && command.OwnersList.Count > 0)
-            {
-                foreach (var owner in command.OwnersList)
-                {
-                    var bankDetailsOwner = new AuthorizedBankDetailsOwner(
-                        owner.FName,
-                        owner.LName,
-                        owner.NationalIdentifier,
-                        owner.CustomerType
-                    );
-                    ownersList.Add(bankDetailsOwner);
-                }
-            }
-
-            var authorizedBankDetails = new AuthorizedBankDetails(
-                command.CardNumber,
-                command.AccountNumber,
-                command.IBan,
-                command.BankName,
-                ownersList
-            );
-
-            _authorizedBankDetailsRepository.Create(authorizedBankDetails);
-            _authorizedBankDetailsRepository.SaveChanges();
-            return operation.Succcedded();
-        }
-
-        public EditAuthorizedBankDetails GetDetails(long id)
-        {
-            return _authorizedBankDetailsRepository.GetDetails(id);
-        }
-
-        public List<AuthorizedBankDetailsViewModel> Search(AuthorizedBankDetailsSearchModel searchModel)
-        {
-            return _authorizedBankDetailsRepository.Search(searchModel);
-        }
-
-        public AuthorizedBankDetailsViewModel GetByIban(string iban)
-        {
-            return _authorizedBankDetailsRepository.GetByIban(iban);
-        }
-    }
-}

CompanyManagment.Application/CheckoutApplication.cs

@@ -193,19 +193,8 @@ public class CheckoutApplication : ICheckoutApplication
         //حق بیمه سهم کارگر
         #region InsuranceDeduction
 
-        double insuranceDeduction = 0;
-        bool hasInsuranceShareTheSameAsList = false;
-        if (command.InsuranceDeduction == 0)
-        {
-            var insuranceOverTime = command.HasInsuranceChekoutOverTime ? command.OvertimePay : 0; 
-            insuranceDeduction = (monthlyWage + bacicYears + consumableItem + housingAllowance + marriedAllowance + insuranceOverTime) * 7 / 100;
-        }
-        else
-        {
-            insuranceDeduction = command.InsuranceDeduction;
-            hasInsuranceShareTheSameAsList = true;
-        }
-
+        var insuranceOverTime = command.HasInsuranceChekoutOverTime ? command.OvertimePay : 0;
+        var insuranceDeduction = (monthlyWage + bacicYears + consumableItem + housingAllowance + marriedAllowance + insuranceOverTime) * 7 / 100;
 
         #endregion
 
@@ -386,7 +375,7 @@ public class CheckoutApplication : ICheckoutApplication
 				, command.OvertimePay, command.NightworkPay, command.FridayPay, 0, command.ShiftPay, familyAllowance, bunos, years, command.LeavePay, insuranceDeduction, 0, command.InstallmentDeduction, command.SalaryAidDeduction, command.AbsenceDeduction, sumOfWorkingDays,
 				command.ArchiveCode, command.PersonnelCode, totalClaims, totalDeductions, totalPayment, command.Signature, marriedAllowance, command.LeaveCheckout, command.CreditLeaves, command.AbsencePeriod, command.AverageHoursPerDay, command.HasRollCall, command.OverTimeWorkValue, command.OverNightWorkValue
 				, command.FridayWorkValue, command.RotatingShiftValue, command.AbsenceValue, command.TotalDayOfLeaveCompute, command.TotalDayOfYearsCompute, command.TotalDayOfBunosesCompute,
-				loanInstallments, salaryAids,checkoutRollCall,command.EmployeeMandatoryHours, hasInsuranceShareTheSameAsList);
+				loanInstallments, salaryAids,checkoutRollCall,command.EmployeeMandatoryHours);
 
 			_checkoutRepository.CreateCkeckout(checkout).GetAwaiter().GetResult();
 			//_checkoutRepository.SaveChanges();

CompanyManagment.Application/ContractingPartyBankAccountsApplication.cs

@@ -1,10 +1,6 @@
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
 using System.Threading.Tasks;
 using _0_Framework.Application;
-using _0_Framework.Application.UID;
-using _0_Framework.Exceptions;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.ContractingPartyBankAccountsAgg;
 using CompanyManagment.App.Contracts.ContractingPartyBankAccounts;
@@ -16,15 +12,13 @@ public class ContractingPartyBankAccountsApplication : IContractingPartyBankAcco
 {
     private readonly IContractingPartyBankAccountsRepository _contractingPartyBankAccountsRepository;
     private readonly IPersonalContractingPartyRepository _personalContractingPartyRepository;
-    private readonly IUidService _uidService;
 
     public ContractingPartyBankAccountsApplication(
         IContractingPartyBankAccountsRepository contractingPartyBankAccountsRepository,
-        IPersonalContractingPartyRepository personalContractingPartyRepository, IUidService uidService)
+        IPersonalContractingPartyRepository personalContractingPartyRepository)
     {
         _contractingPartyBankAccountsRepository = contractingPartyBankAccountsRepository;
         _personalContractingPartyRepository = personalContractingPartyRepository;
-        _uidService = uidService;
     }
 
     public async Task<OperationResult> Create(CreateContractingPartyBankAccounts command)
@@ -75,19 +69,18 @@ public class ContractingPartyBankAccountsApplication : IContractingPartyBankAcco
                 if (string.IsNullOrWhiteSpace(command.IBan))
                     return operationResult.Failed("شماره شبا خود را وارد کنید");
             }
-            else if (string.IsNullOrWhiteSpace(command.CardNumber) &&
+            else if(string.IsNullOrWhiteSpace(command.CardNumber) &&
                      string.IsNullOrWhiteSpace(command.AccountNumber) &&
                      string.IsNullOrWhiteSpace(command.IBan))
             {
-                return operationResult.Failed(
-                    " حداقل یکی از اطلاعات بانکی را وارد کنید: شماره کارت، شماره حساب یا شماره شبا");
+                return operationResult.Failed(" حداقل یکی از اطلاعات بانکی را وارد کنید: شماره کارت، شماره حساب یا شماره شبا");
             }
 
             if (string.IsNullOrWhiteSpace(command.AccountHolderName))
             {
                 return operationResult.Failed("نام صاحب حساب را وارد کنید");
             }
-
+            
 
             var entity = new ContractingPartyBankAccount(command.ContractingPartyId, command.CardNumber,
                 command.AccountHolderName, command.AccountNumber, command.IBan, command.IsAuth);
@@ -137,83 +130,4 @@ public class ContractingPartyBankAccountsApplication : IContractingPartyBankAcco
     {
         return await _contractingPartyBankAccountsRepository.ContractingPartyNamesSelectList(search, selected);
     }
-
-    public async Task<ContractingPartyBankInquiryResponse> InquiryContractingPartyBankDetails(
-        InquiryContractingPartyBankDetailsRequest command)
-    {
-        var iBan = command.IBan;
-        var cardNumber = command.CardNumber;
-        var accountNumber = command.AccountNumber;
-        var uidBank = command.UidBank;
-        ContractingPartyBankInquiryResponse result = new ContractingPartyBankInquiryResponse();
-        if (!string.IsNullOrWhiteSpace(iBan))
-        {
-            if (!iBan.IsvalidIban())
-            {
-                throw new BadRequestException("شماره شبا وارد شده معتبر نمی باشد");
-            }
-
-            var response = await _uidService.IbanInquiry(iBan);
-            if (response.ResponseContext.Status.Code != 0)
-            {
-                throw new BadRequestException("خطای احراز هویت. کد خطا: " + response.ResponseContext.Status.Code);
-            }
-
-            var owner = response.Owners.FirstOrDefault();
-            var ownerFirstName = owner != null ? $"{owner.FirstName} {owner.LastName}" : "";
-            result.FullName = ownerFirstName;
-            result.AccountNumber = response.AccountBasicInformation.AccountNumber;
-            result.Iban = response.AccountBasicInformation.Iban;
-        }
-        else if (!string.IsNullOrWhiteSpace(cardNumber))
-        {
-            if (!cardNumber.IsValidCardNumber())
-            {
-                throw new BadRequestException("شماره کارت وارد شده معتبر نمی باشد");
-            }
-
-            var bankCardRes = await _uidService.CardToIban(cardNumber);
-            if (bankCardRes.ResponseContext.Status.Code != 0)
-            {
-                throw new BadRequestException("خطای احراز هویت. کد خطا: " + bankCardRes.ResponseContext.Status.Code);
-            }
-
-            var response = await _uidService.IbanInquiry(bankCardRes.Iban);
-            if (response.ResponseContext.Status.Code != 0)
-            {
-                throw new BadRequestException("خطای احراز هویت. کد خطا: " + response.ResponseContext.Status.Code);
-            }
-
-            var owner = response.Owners.FirstOrDefault();
-            var ownerFirstName = owner != null ? $"{owner.FirstName} {owner.LastName}" : "";
-            result.FullName = ownerFirstName;
-            result.AccountNumber = response.AccountBasicInformation.AccountNumber;
-            result.CardNumber = cardNumber;
-            result.Iban = response.AccountBasicInformation.Iban;
-        }
-        else if (!string.IsNullOrWhiteSpace(accountNumber))
-        {
-            var accountNumberRes = await _uidService.AccountToIban(accountNumber, uidBank.Value);
-            if (accountNumberRes.ResponseContext.Status.Code != 0)
-            {
-                throw new BadRequestException(
-                    "خطای احراز هویت. کد خطا: " + accountNumberRes.ResponseContext.Status.Code);
-            }
-
-            var response = await _uidService.IbanInquiry(accountNumberRes.Iban);
-
-            var owner = response.Owners.FirstOrDefault();
-            var ownerFirstName = owner != null ? $"{owner.FirstName} {owner.LastName}" : "";
-            result.FullName = ownerFirstName;
-            result.AccountNumber = response.AccountBasicInformation.AccountNumber;
-            result.Iban = response.AccountBasicInformation.Iban;
-        }
-        else
-        {
-            throw new BadRequestException(
-                "حداقل یکی از اطلاعات بانکی را وارد کنید: شماره کارت، شماره حساب یا شماره شبا");
-        }
-
-        return result;
-    }
 }

CompanyManagment.Application/CustomizeCheckoutApplication.cs

@@ -373,9 +373,7 @@ namespace CompanyManagment.Application
                         Color = color,
                         PersonnelCode = personnelCodes.FirstOrDefault(y => x.Id == y.EmployeeId)?.PersonnelCode.ToString() ?? "-"
                     };
-                }).OrderBy(x => x.Color switch { "orange" => 0, "white" => 1, "red" => 2, "green" => 3, "black" => 4, _ => 5 })
-                .ToList();
-            
+                }).OrderByDescending(x => x.IsEligible).ThenByDescending(x => x.Reason).ToList();
             return op.Succcedded(employees);
         }
     }

CompanyManagment.Application/EmployeeFaceEmbeddingApplication.cs

@@ -1,170 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Company.Domain.EmployeeFaceEmbeddingAgg;
-using CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
-
-namespace CompanyManagment.Application;
-
-public class EmployeeFaceEmbeddingApplication : IEmployeeFaceEmbeddingApplication
-{
-    private readonly IEmployeeFaceEmbeddingRepository _repository;
-
-    public EmployeeFaceEmbeddingApplication(IEmployeeFaceEmbeddingRepository repository)
-    {
-        _repository = repository;
-    }
-
-    public async Task<EmployeeFaceEmbeddingDto> GetByIdAsync(string id)
-    {
-        var entity = await _repository.GetByIdAsync(id);
-        return entity == null ? null : MapToDto(entity);
-    }
-
-    public async Task<EmployeeFaceEmbeddingDto> GetByEmployeeIdAsync(long employeeId)
-    {
-        var entity = await _repository.GetByEmployeeIdAsync(employeeId);
-        return entity == null ? null : MapToDto(entity);
-    }
-
-    public async Task<List<EmployeeFaceEmbeddingDto>> GetByWorkshopIdAsync(long workshopId)
-    {
-        var entities = await _repository.GetByWorkshopIdAsync(workshopId);
-        return entities.Select(MapToDto).ToList();
-    }
-
-    public async Task<List<EmployeeFaceEmbeddingDto>> GetByWorkshopIdsAsync(List<long> workshopIds)
-    {
-        var entities = await _repository.GetByWorkshopIdsAsync(workshopIds);
-        return entities.Select(MapToDto).ToList();
-    }
-
-    public async Task<string> SaveAsync(EmployeeFaceEmbeddingDto dto)
-    {
-        if (string.IsNullOrWhiteSpace(dto.Id))
-        {
-            // ایجاد جدید
-            var metadata = MapMetadataFromDto(dto.Metadata);
-            var entity = new EmployeeFaceEmbedding(
-                dto.EmployeeFullName,
-                dto.EmployeeId,
-                dto.WorkshopId,
-                dto.Embeddings,
-                metadata
-            );
-
-            await _repository.CreateAsync(entity);
-            return entity.Id;
-        }
-        else
-        {
-            // به‌روزرسانی
-            var entity = await _repository.GetByIdAsync(dto.Id);
-            if (entity == null)
-                throw new Exception($"EmployeeFaceEmbedding با شناسه {dto.Id} یافت نشد");
-
-            entity.UpdateEmployeeInfo(dto.EmployeeFullName, dto.WorkshopId);
-            entity.UpdateEmbedding(dto.Embeddings, 0, 0);
-            entity.UpdateMetadata(MapMetadataFromDto(dto.Metadata), 0, 0);
-
-            await _repository.UpdateAsync(entity);
-            return entity.Id;
-        }
-    }
-
-    public async Task DeleteAsync(string id)
-    {
-        await _repository.DeleteAsync(id);
-    }
-
-    #region Mapping Methods
-
-    private EmployeeFaceEmbeddingDto MapToDto(EmployeeFaceEmbedding entity)
-    {
-        return new EmployeeFaceEmbeddingDto
-        {
-            Id = entity.Id,
-            EmployeeFullName = entity.EmployeeFullName,
-            EmployeeId = entity.EmployeeId,
-            WorkshopId = entity.WorkshopId,
-            Embeddings = entity.Embeddings,
-            Metadata = MapMetadataToDto(entity.Metadata)
-        };
-    }
-
-    private EmployeeFaceEmbeddingMetadataDto MapMetadataToDto(EmployeeFaceEmbeddingMetadata metadata)
-    {
-        if (metadata == null) return null;
-
-        return new EmployeeFaceEmbeddingMetadataDto
-        {
-            AvgEyeDistanceNormalized = metadata.AvgEyeDistanceNormalized,
-            AvgEyeToFaceRatio = metadata.AvgEyeToFaceRatio,
-            AvgFaceAspectRatio = metadata.AvgFaceAspectRatio,
-            AvgDetectionConfidence = metadata.AvgDetectionConfidence,
-            AvgKeypointsNormalized = MapKeypointsToDto(metadata.AvgKeypointsNormalized),
-            PerImageMetadata = metadata.PerImageMetadata?.Select(x => new ImageMetadataDto
-            {
-                FaceAspectRatio = x.FaceAspectRatio,
-                EyeDistanceNormalized = x.EyeDistanceNormalized,
-                EyeToFaceRatio = x.EyeToFaceRatio,
-                DetectionConfidence = x.DetectionConfidence,
-                KeypointsNormalized = MapKeypointsToDto(x.KeypointsNormalized)
-            }).ToList()
-        };
-    }
-
-    private EmployeeFaceEmbeddingKeypointsDto MapKeypointsToDto(EmployeeFaceEmbeddingKeypoints keypoints)
-    {
-        if (keypoints == null) return null;
-
-        return new EmployeeFaceEmbeddingKeypointsDto
-        {
-            LeftEye = keypoints.LeftEye,
-            RightEye = keypoints.RightEye,
-            Nose = keypoints.Nose,
-            MouthLeft = keypoints.MouthLeft,
-            MouthRight = keypoints.MouthRight
-        };
-    }
-
-    private EmployeeFaceEmbeddingMetadata MapMetadataFromDto(EmployeeFaceEmbeddingMetadataDto dto)
-    {
-        if (dto == null) return null;
-
-        return new EmployeeFaceEmbeddingMetadata
-        {
-            AvgEyeDistanceNormalized = dto.AvgEyeDistanceNormalized,
-            AvgEyeToFaceRatio = dto.AvgEyeToFaceRatio,
-            AvgFaceAspectRatio = dto.AvgFaceAspectRatio,
-            AvgDetectionConfidence = dto.AvgDetectionConfidence,
-            AvgKeypointsNormalized = MapKeypointsFromDto(dto.AvgKeypointsNormalized),
-            PerImageMetadata = dto.PerImageMetadata?.Select(x => new ImageMetadata
-            {
-                FaceAspectRatio = x.FaceAspectRatio,
-                EyeDistanceNormalized = x.EyeDistanceNormalized,
-                EyeToFaceRatio = x.EyeToFaceRatio,
-                DetectionConfidence = x.DetectionConfidence,
-                KeypointsNormalized = MapKeypointsFromDto(x.KeypointsNormalized)
-            }).ToList()
-        };
-    }
-
-    private EmployeeFaceEmbeddingKeypoints MapKeypointsFromDto(EmployeeFaceEmbeddingKeypointsDto dto)
-    {
-        if (dto == null) return null;
-
-        return new EmployeeFaceEmbeddingKeypoints
-        {
-            LeftEye = dto.LeftEye,
-            RightEye = dto.RightEye,
-            Nose = dto.Nose,
-            MouthLeft = dto.MouthLeft,
-            MouthRight = dto.MouthRight
-        };
-    }
-
-    #endregion
-}
-

CompanyManagment.Application/EmployerApplication.cs

@@ -1340,10 +1340,6 @@ public class EmployerApplication : IEmployerApplication
         var workshopDetails =
             await _institutionContractRepository.GetInstitutionWorkshopInitialDetails(command
                 .InstitutionWorkshopInitialId);
-        if (workshopDetails.Employers.Any(x => x.EmployerId == employer.id))
-        {
-            throw new BadRequestException("این کارفرما قبلا در این کارگاه ثبت شده است");
-        }
         workshopDetails.AddEmployer(employer.id);
 
         await _institutionContractRepository.SaveChangesAsync();
@@ -1391,14 +1387,12 @@ public class EmployerApplication : IEmployerApplication
 
         // Get workshop details
         var workshopDetails =
-            await _institutionContractRepository
-                .GetInstitutionWorkshopInitialDetails(institutionWorkshopDetailsId);
+            await _institutionContractRepository.GetInstitutionWorkshopInitialDetails(institutionWorkshopDetailsId);
         if (workshopDetails == null)
             return operation.Failed("جزئیات کارگاه موسسه یافت نشد");
 
         // Find and remove the employer from workshop details
-        var employerDetail = workshopDetails
-            .Employers.FirstOrDefault(e => e.EmployerId == employerId);
+        var employerDetail = workshopDetails.Employers.FirstOrDefault(e => e.EmployerId == employerId);
         if (employerDetail == null)
             return operation.Failed("کارفرما در لیست کارگاه یافت نشد");
 
@@ -1406,7 +1400,10 @@ public class EmployerApplication : IEmployerApplication
         workshopDetails.Employers.Remove(employerDetail);
 
         await _institutionContractRepository.SaveChangesAsync();
-        
+
+        // Delete the employer
+        _EmployerRepository.Remove(employerId);
+        await _EmployerRepository.SaveChangesAsync();
 
         return operation.Succcedded();
     }

CompanyManagment.Application/FinancialStatmentApplication.cs

@@ -106,11 +106,8 @@ public class FinancialStatmentApplication : IFinancialStatmentApplication
             debtor = command.DeptorString.MoneyToDouble();
              
         }
-
-        if (!command.TdateFa.TryToGeorgianDateTime(out var tDateGr))
-        {
-            return op.Failed("تاریخ وارد شده صحیح نمی باشد");
-        }
+           
+        var tDateGr = command.TdateFa.ToGeorgianDateTime();
         if (_financialStatmentRepository.Exists(x => x.ContractingPartyId == command.ContractingPartyId))
         {
             var financialStatment = _financialStatmentRepository.GetDetailsByContractingPartyId(command.ContractingPartyId);

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -318,7 +318,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             command.DailyCompenseation, command.Obligation,
             command.TotalAmount, command.ExtensionNo, command.WorkshopManualCount, command.EmployeeManualCount,
             command.Description, command.OfficialCompany, command.TypeOfContract, command.HasValueAddedTax,
-            command.ValueAddedTax, [], command.LawId);
+            command.ValueAddedTax, [],command.LawId);
 
         _institutionContractRepository.Create(createContract);
         _institutionContractRepository.SaveChanges();
@@ -1046,7 +1046,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             command.Workshops.Count.ToString(),
             command.Workshops.Sum(x => x.PersonnelCount).ToString(), command.Description,
             "NotOfficial", "JobRelation", hasValueAddedTax,
-            command.TaxAmount, workshopDetails, command.LawId);
+            command.TaxAmount, workshopDetails,command.LawId);
 
 
         FinancialStatment financialStatement;
@@ -1139,12 +1139,12 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         if (res.IsSuccedded)
             CreateContractingPartyAccount(contractingParty.id, res.SendId);
 
-
-        await _smsService.SendInstitutionCreationVerificationLink(contractingParty.Phone, contractingPartyFullName,
-            entity.PublicId, contractingParty.id,entity.id );
-
         await _institutionContractRepository.SaveChangesAsync();
 
+        await _smsService.SendInstitutionVerificationLink(contractingParty.Phone, contractingPartyFullName,
+            entity.PublicId);
+
+
         await transaction.CommitAsync();
         return opration.Succcedded();
     }
@@ -1153,7 +1153,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
     {
         throw new NotImplementedException();
     }
-
+    
 
     public Task<List<RegistrationWorkflowMainListViewModel>> RegistrationWorkflowMainList()
     {
@@ -1203,12 +1203,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             throw new NotFoundException("طرف قرارداد یافت نشد");
 
         var code = new Random().Next(1000, 9999).ToString();
-        
-        var contractingPartyFullName = contractingParty.IsLegal == "حقیقی"
-            ? contractingParty.FName + " " + contractingParty.LName
-            : contractingParty.CeoFName + " " + contractingParty.CeoLName;
-        
-        institutionContract.SetVerifyCode(code,contractingPartyFullName ,contractingParty.Phone);
+        institutionContract.SetVerifyCode(code);
 
         var transaction = await _institutionContractRepository.BeginTransactionAsync();
         try
@@ -1254,31 +1249,8 @@ public class InstitutionContractApplication : IInstitutionContractApplication
 
         if (institutionContract.VerifyCode != code)
             return op.Failed("کد وارد شده صحیح نمی باشد");
-
-        var transaction = await _institutionContractRepository.BeginTransactionAsync();
         institutionContract.SetPendingWorkflow();
 
-        var phone = institutionContract.ContactInfoList.FirstOrDefault(x =>
-            x.SendSms && x.Position == "طرف قرارداد" && x.PhoneType == "شماره همراه");
-        if (phone !=null)
-        {
-            var userPass = contractingParty.IsLegal == "حقیقی"
-                ? contractingParty.Nationalcode
-                : contractingParty.NationalId;
-            var createAcc = new RegisterAccount
-            {
-                Fullname = contractingParty.LName,
-                Username = userPass,
-                Password = userPass,
-                Mobile = phone.PhoneNumber,
-                NationalCode = userPass
-            };
-            var res = _accountApplication.RegisterClient(createAcc);
-            if (res.IsSuccedded) 
-                CreateContractingPartyAccount(contractingParty.id, res.SendId);
-        }
-
-        await transaction.CommitAsync();
         await _institutionContractRepository.SaveChangesAsync();
         return op.Succcedded();
     }
@@ -1302,7 +1274,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
                 RollCallInPerson = services.RollCallInPerson
             },
             WorkshopName = details.WorkshopName,
-            ArchiveCode = newArchiveCode
+            ArchiveCode  =newArchiveCode
         };
         return res;
     }
@@ -1318,14 +1290,12 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return await _institutionContractRepository.GetExtensionWorkshops(request);
     }
 
-    public async Task<InstitutionContractExtensionPlanResponse> GetExtensionInstitutionPlan(
-        InstitutionContractExtensionPlanRequest request)
+    public async Task<InstitutionContractExtensionPlanResponse> GetExtensionInstitutionPlan(InstitutionContractExtensionPlanRequest request)
     {
         return await _institutionContractRepository.GetExtensionInstitutionPlan(request);
     }
 
-    public async Task<InstitutionContractExtensionPaymentResponse> GetExtensionPaymentMethod(
-        InstitutionContractExtensionPaymentRequest request)
+    public async Task<InstitutionContractExtensionPaymentResponse> GetExtensionPaymentMethod(InstitutionContractExtensionPaymentRequest request)
     {
         return await _institutionContractRepository.GetExtensionPaymentMethod(request);
     }
@@ -1340,53 +1310,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return await _institutionContractRepository.GetInstitutionContractSelectList(search,selected);
     }
 
-    public async Task<InstitutionContractAmendmentWorkshopsResponse> GetAmendmentWorkshops(long institutionContractId)
-    {
-        return await _institutionContractRepository.GetAmendmentWorkshops(institutionContractId);
-    }
-
-    public async Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request)
-    {
-        return await _institutionContractRepository.InsertAmendmentTempWorkshops(request);
-    }
-
-    public Task RemoveAmendmentWorkshops(Guid workshopTempId)
-    {
-        return _institutionContractRepository.RemoveAmendmentWorkshops(workshopTempId);
-    }
-
-    public Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(InsitutionContractAmendmentPaymentRequest request)
-    {
-        return _institutionContractRepository.GetAmendmentPaymentDetails(request);
-    }
-
-    public async Task<OperationResult> ResendVerifyLink(long institutionContractId)
-    {
-        var institutionContract = _institutionContractRepository.Get(institutionContractId);
-        
-        if (institutionContract == null)
-        {
-            throw new NotFoundException("رکورد مورد نظر یافت نشد");
-        }
-
-        if (institutionContract.VerificationStatus != InstitutionContractVerificationStatus.PendingForVerify)
-        {
-            throw new BadRequestException("این قرارداد مالی در وضعیت مناسبی برای ارسال مجدد لینک تایید نمی باشد");
-        }
-        var contractingParty = _contractingPartyRepository.Get(institutionContract.ContractingPartyId);
-        if (contractingParty == null)
-            throw new NotFoundException("طرف قرارداد یافت نشد");
-        var contractingPartyFullName = contractingParty.FName + " " + contractingParty.LName;
-         await _smsService.SendInstitutionCreationVerificationLink(contractingParty.Phone, contractingPartyFullName,
-            institutionContract.PublicId, contractingParty.id, institutionContract.id);
-        return new OperationResult().Succcedded();
-    }
-
-    public async Task<InstitutionContractPrintViewModel> PrintOneAsync(long id)
-    {
-        return (await _institutionContractRepository.PrintAllAsync([id])).FirstOrDefault();
-    }
-
 
     private async Task<OperationResult<PersonalContractingParty>> CreateLegalContractingPartyEntity(
         CreateInstitutionContractLegalPartyRequest request, long representativeId, string address, string city,
@@ -1427,8 +1350,8 @@ public class InstitutionContractApplication : IInstitutionContractApplication
 
         if (request.IsAuth)
         {
-            legalContractingParty.LegalAuthentication(request.FName, request.LName, request.FatherName,
-                request.IdNumber, null, null, request.BirthDateFa, request.Gender, request.PhoneNumber);
+            legalContractingParty.LegalAuthentication(request.FName,request.LName,request.FatherName,
+                request.IdNumber,null,null,request.BirthDateFa,request.Gender,request.PhoneNumber);
         }
 
         await _contractingPartyRepository.CreateAsync(legalContractingParty);
@@ -1473,7 +1396,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         if (request.IsAuth)
         {
             personalContractingParty.Authentication(request.FName, request.LName, request.FatherName,
-                request.IdNumber, null, null, request.BirthDateFa, request.Gender, request.PhoneNumber);
+                request.IdNumber, null,null, request.BirthDateFa, request.Gender,request.PhoneNumber);
         }
 
         await _contractingPartyRepository.CreateAsync(personalContractingParty);
@@ -1482,7 +1405,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return operation.Succcedded(personalContractingParty);
     }
 
-    public static List<InstitutionContractInstallment> CalculateInstallment(double amount, int installmentCount,
+    private List<InstitutionContractInstallment> CalculateInstallment(double amount, int installmentCount,
         string loanStartDate, bool getRounded)
     {
         int day = Convert.ToInt32(loanStartDate.Substring(8, 2));
@@ -1590,4 +1513,4 @@ public class WorkshopsAndEmployeeViewModel
     public int ArchiveCode { get; set; }
 }
 
-#endregion
+#endregion

CompanyManagment.Application/InsuranceListApplication.cs

@@ -1707,7 +1707,7 @@ public class InsuranceListApplication : IInsuranceListApplication
 		return result;
 	}
 
-    public double? GetDailyWageFixedSalary(string year, long workshopId, long employeeId, DateTime? startDateGr, DateTime? endDateGr, long jobId, string population, long? insuranceJobId)
+    private double? GetDailyWageFixedSalary(string year, long workshopId, long employeeId, DateTime? startDateGr, DateTime? endDateGr, long jobId, string population, long? insuranceJobId)
     {
 
         double? result = 0;
@@ -1858,7 +1858,7 @@ public class InsuranceListApplication : IInsuranceListApplication
     /// <param name="jobId"></param>
     /// <param name="employeeId"></param>
     /// <returns></returns>
-    public double GetMonthlyBenefits(int endMonthCurrentDay, double consumableItemsItemValue, double housingAllowanceItemValue, double maritalStatus, int countWorkingDays, string typeOfInsuranceSendWorkshop, long jobId, long employeeId, bool includeStatus)
+    private double GetMonthlyBenefits(int endMonthCurrentDay, double consumableItemsItemValue, double housingAllowanceItemValue, double maritalStatus, int countWorkingDays, string typeOfInsuranceSendWorkshop, long jobId, long employeeId, bool includeStatus)
     {
         //ToDo
         //افزودن شرط مشمول مزایای
@@ -1869,11 +1869,6 @@ public class InsuranceListApplication : IInsuranceListApplication
         bool isManager = jobId is 10 or 16 or 17 or 18 or 3498;
         if (isManager && !includeStatus)
             return 0;
-
-        //پرسنل استثناء سیدعسکر موسوی زاده - فروشگاه ولی عصر
-        if (employeeId == 1496)
-            return 0;
-
         //پرسنل استثناء
         if (employeeId == 42783)
             return 53082855;
@@ -1898,7 +1893,7 @@ public class InsuranceListApplication : IInsuranceListApplication
 
 
 
-    public double ComputeDailyWage(double yearlysalaryItemValue, long employeeId, long workshopId, string year)
+    private double ComputeDailyWage(double yearlysalaryItemValue, long employeeId, long workshopId, string year)
     {
         double dailyWage = yearlysalaryItemValue;
         InsuranceListSearchModel searchModel = new InsuranceListSearchModel();

CompanyManagment.Application/LeftWorkApplication.cs

@@ -30,14 +30,13 @@ public class LeftWorkApplication : ILeftWorkApplication
     private readonly IEmployeeRepository _employeeRepository;
     private readonly IWorkshopRepository _workshopRepository;
     private readonly IRollCallEmployeeRepository _rollCallEmployeeRepository;
-    private readonly IRollCallEmployeeStatusRepository _rollCallEmployeeStatusRepository;
+	private readonly IRollCallEmployeeStatusRepository _rollCallEmployeeStatusRepository;
 
 
-    public LeftWorkApplication(ILeftWorkRepository leftWorkRepository, IContractRepository contractRepository,
+	public LeftWorkApplication(ILeftWorkRepository leftWorkRepository, IContractRepository contractRepository,
         IContractApplication contractApplication, IWorkingHoursApplication workingHoursApplication,
         IWorkingHoursItemsApplication workingHoursItemsApplication, IEmployeeRepository employeeRepository,
-        IWorkshopRepository workshopRepository, IRollCallEmployeeStatusRepository rollCallEmployeeStatusRepository,
-        IRollCallEmployeeRepository rollCallEmployeeRepository)
+        IWorkshopRepository workshopRepository, IRollCallEmployeeStatusRepository rollCallEmployeeStatusRepository, IRollCallEmployeeRepository rollCallEmployeeRepository)
     {
         _leftWorkRepository = leftWorkRepository;
         _contractRepository = contractRepository;
@@ -52,6 +51,7 @@ public class LeftWorkApplication : ILeftWorkApplication
 
     public OperationResult Create(CreateLeftWork command)
     {
+
         //   var Contracts = _contractRepository.Search(new ContractSearchModel()
         //   {
         //       EmployeeId = command.EmployeeId,
@@ -70,6 +70,7 @@ public class LeftWorkApplication : ILeftWorkApplication
         var start = command.StartWorkDate.ToGeorgianDateTime();
 
 
+
         //if (_leftWorkRepository.Exists(x =>
         //    x.StartWorkDate > start && x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId))
         //    return operation.Failed("تاریخ وارد شده کوچکتر از سابقه  شروع به کار قبلی است");
@@ -111,17 +112,16 @@ public class LeftWorkApplication : ILeftWorkApplication
             return operation.Failed("تاریخ وارد شده در بازه زمانی سابقه ترک کار قبلی است");
 
         var employeeFullName = _employeeRepository.GetDetails(command.EmployeeId).EmployeeFullName;
-        var workshop = _workshopRepository.GetDetails(command.WorkshopId);
-        var workshopName = workshop.WorkshopFullName;
+       var workshop = _workshopRepository.GetDetails(command.WorkshopId);
+       var workshopName = workshop.WorkshopFullName;
         var leftWork = new LeftWork(left, start, command.WorkshopId,
             command.EmployeeId, employeeFullName, workshopName, command.JobId, command.IncludeStatus,
-            command.AddBonusesPay, command.AddYearsPay, command.AddLeavePay, workshop.ComputeOptions,
-            workshop.BonusesOptions);
+            command.AddBonusesPay, command.AddYearsPay, command.AddLeavePay,workshop.ComputeOptions,workshop.BonusesOptions);
         _leftWorkRepository.Create(leftWork);
         _leftWorkRepository.SaveChanges();
-        IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(command.EmployeeId, command.WorkshopId);
+        IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(command.EmployeeId);
 
-        return operation.Succcedded();
+		return operation.Succcedded();
     }
 
     //public OperationResult Create(CreateLeftWork command)
@@ -193,8 +193,8 @@ public class LeftWorkApplication : ILeftWorkApplication
             command.EmployeeId, command.JobId, command.IncludeStatus, command.AddBonusesPay, command.AddYearsPay,
             command.AddLeavePay);
         _leftWorkRepository.SaveChanges();
-        IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(command.EmployeeId, command.WorkshopId);
-        return operation.Succcedded();
+        IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(command.EmployeeId);
+		return operation.Succcedded();
     }
 
     public EditLeftWork GetDetails(long id)
@@ -214,9 +214,11 @@ public class LeftWorkApplication : ILeftWorkApplication
 
     public List<LeftWorkViewModel> SearchCreateContract(LeftWorkSearchModel searchModel)
     {
+
         return _leftWorkRepository.SearchCreateContract(searchModel);
     }
 
+ 
 
     public async Task<List<LeftWorkViewModel>> searchAsync(LeftWorkSearchModel searchModel)
     {
@@ -226,6 +228,7 @@ public class LeftWorkApplication : ILeftWorkApplication
 
     public string GetBeforeDate(string date)
     {
+
         var persianBefore = "";
         var year = Convert.ToInt32(date.Substring(0, 4));
         var month = Convert.ToInt32(date.Substring(5, 2));
@@ -252,8 +255,10 @@ public class LeftWorkApplication : ILeftWorkApplication
     }
 
 
+
     public void LeftWorkExtension(long contractId, string CStart, string CEnd)
     {
+
         var step1 = _contractApplication.GetDetails(contractId);
         var step2 = _workingHoursApplication.GetByContractId(contractId);
         var step3 = _workingHoursItemsApplication.GetWorkingHoursItems();
@@ -375,11 +380,13 @@ public class LeftWorkApplication : ILeftWorkApplication
             ContarctStart = CStart,
             ContractEnd = CEnd,
             GetWorkDateHide = step1.GetWorkDate,
+
         };
         var step5 = _contractApplication.MandatoryHours(computing);
         string workingDays = string.Empty;
         if (step5.NumberOfWorkingDays == "0")
         {
+
             workingDays = step5.ComplexNumberOfWorkingDays;
         }
         else
@@ -470,6 +477,8 @@ public class LeftWorkApplication : ILeftWorkApplication
             OverTimeWorkM = step5.OverTimeWorkM == "0" ? "" : step5.OverTimeWorkM,
             OverNightWorkH = step5.OverNightWorkH == "0" ? "" : step5.OverNightWorkH,
             OverNightWorkM = step5.OverNightWorkM == "0" ? "" : step5.OverNightWorkM,
+
+
         };
         var resss = _contractApplication.Create(createNew);
     }
@@ -520,9 +529,7 @@ public class LeftWorkApplication : ILeftWorkApplication
                 item.LeftWorkDate = string.IsNullOrWhiteSpace(item.LeftWorkDate) ? "1500/01/01" : item.LeftWorkDate;
                 var left = item.LeftWorkDate.ToGeorgianDateTime();
                 var start = item.StartWorkDate.ToGeorgianDateTime();
-                if (_leftWorkRepository.Exists(x =>
-                        x.StartWorkDate > start && left == null && x.EmployeeId == informationLeftwork.EmployeeId &&
-                        x.WorkshopId == informationLeftwork.WorkshopId && x.id != item.Id))
+                if (_leftWorkRepository.Exists(x => x.StartWorkDate > start && left == null && x.EmployeeId == informationLeftwork.EmployeeId && x.WorkshopId == informationLeftwork.WorkshopId  && x.id!=item.Id))
                     return operation.Failed("وارد کردن تاریخ پایان کار اجباری است ");
                 if (_leftWorkRepository.Exists(x =>
                         x.StartWorkDate == start && x.EmployeeId == informationLeftwork.EmployeeId &&
@@ -533,23 +540,17 @@ public class LeftWorkApplication : ILeftWorkApplication
                         x.EmployeeId == informationLeftwork.EmployeeId &&
                         x.WorkshopId == informationLeftwork.WorkshopId && x.id != item.Id))
                     return operation.Failed("شروع به کار قبلی این شخص ترک کار ندارد ");
-                if (_leftWorkRepository.Exists(x =>
-                        x.StartWorkDate <= start && x.LeftWorkDate < left && x.LeftWorkDate >= start &&
-                        x.EmployeeId == informationLeftwork.EmployeeId &&
-                        x.WorkshopId == informationLeftwork.WorkshopId && x.id != item.Id))
+                if (_leftWorkRepository.Exists(x => x.StartWorkDate <= start && x.LeftWorkDate < left && x.LeftWorkDate >= start && x.EmployeeId == informationLeftwork.EmployeeId && x.WorkshopId == informationLeftwork.WorkshopId && x.id != item.Id))
                     return operation.Failed("تاریخ وارد شده در بازه زمانی سابقه ترک کار قبلی است");
             }
         }
 
-        operation = _leftWorkRepository.CreateLeftWork(informationLeftwork);
-        if (informationLeftwork != null && operation.IsSuccedded)
-            IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(informationLeftwork.EmployeeId,
-                informationLeftwork.WorkshopId);
-        return operation;
-    }
+		operation = _leftWorkRepository.CreateLeftWork(informationLeftwork);
+		if (informationLeftwork != null && operation.IsSuccedded) IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(informationLeftwork.EmployeeId);
+		return operation;
+	}
 
-    public OperationResult CreateLeftWorkByLeftWorkGroups(string employeeFullName, long commandEmployeeId,
-        List<PersonnelCodeViewModel> commandPersonnelCode, List<LeftWorkGroup> leftWorkGroups)
+    public OperationResult CreateLeftWorkByLeftWorkGroups(string employeeFullName, long commandEmployeeId, List<PersonnelCodeViewModel> commandPersonnelCode, List<LeftWorkGroup> leftWorkGroups)
     {
         var operation = new OperationResult();
 
@@ -559,9 +560,7 @@ public class LeftWorkApplication : ILeftWorkApplication
             {
                 foreach (var item2 in item.LeftWorkViewModels)
                 {
-                    item2.LeftWorkDate = string.IsNullOrWhiteSpace(item2.LeftWorkDate)
-                        ? "1500/01/01"
-                        : item2.LeftWorkDate;
+                    item2.LeftWorkDate = string.IsNullOrWhiteSpace(item2.LeftWorkDate) ? "1500/01/01" : item2.LeftWorkDate;
                     var left = item2.LeftWorkDate.ToGeorgianDateTime();
                     var start = item2.StartWorkDate.ToGeorgianDateTime();
                     if (_leftWorkRepository.Exists(x =>
@@ -587,16 +586,14 @@ public class LeftWorkApplication : ILeftWorkApplication
             }
         }
 
-        operation = _leftWorkRepository.CreateLeftWorkByLeftWorkGroups(employeeFullName, commandEmployeeId,
-            commandPersonnelCode, leftWorkGroups);
-        if (operation.IsSuccedded)
-            IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(commandEmployeeId);
-        return operation;
-    }
+		operation = _leftWorkRepository.CreateLeftWorkByLeftWorkGroups(employeeFullName, commandEmployeeId, commandPersonnelCode, leftWorkGroups);
+		if (operation.IsSuccedded) IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(commandEmployeeId);
+		return operation;
+	}
 
     public OperationResult CheckDeleteLeftWork(long workshopId, long employeeId, string date, int type)
     {
-        return _leftWorkRepository.CheckDeleteLeftWork(workshopId, employeeId, date.ToGeorgianDateTime(), type);
+        return _leftWorkRepository.CheckDeleteLeftWork( workshopId, employeeId, date.ToGeorgianDateTime(),type);
     }
 
     public OperationResult CheckEditLeftWork(long workshopId, long employeeId, string date, int type)
@@ -610,23 +607,21 @@ public class LeftWorkApplication : ILeftWorkApplication
     }
 
     #region Pooya
-
     //این متد ترک کار های کارمند را با فعالیت حضور غیاب یکپارچه می کند
     private void IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(long employeeId)
     {
         //get last leftworks for employee in all workshops
-        var leftWorks = _leftWorkRepository.search(new LeftWorkSearchModel() { EmployeeId = employeeId })
-            .GroupBy(x => x.WorkshopId).Select(x =>
+        var leftWorks = _leftWorkRepository.search(new LeftWorkSearchModel() { EmployeeId = employeeId }).GroupBy(x => x.WorkshopId).Select(x =>
+        {
+            var leftWork = x.MaxBy(y => y.StartWorkDateGr);
+            return new LeftWorkViewModel()
             {
-                var leftWork = x.MaxBy(y => y.StartWorkDateGr);
-                return new LeftWorkViewModel()
-                {
-                    EmployeeId = employeeId,
-                    WorkshopId = x.Key,
-                    LeftWorkDateGr = leftWork.LeftWorkDateGr.Date.AddDays(-1),
-                    StartWorkDateGr = leftWork.StartWorkDateGr
-                };
-            }).ToList();
+                EmployeeId = employeeId,
+                WorkshopId = x.Key,
+                LeftWorkDateGr = leftWork.LeftWorkDateGr.Date.AddDays(-1),
+                StartWorkDateGr = leftWork.StartWorkDateGr
+            };
+        }).ToList();
 
         //get rollCallEmployee associated with those leftworks which have a higher end date than leftworkDate
         var rollCallsEmployee = _rollCallEmployeeRepository.GetByEmployeeIdWithStatuses(employeeId)
@@ -637,90 +632,17 @@ public class LeftWorkApplication : ILeftWorkApplication
             x.WorkshopId,
             x.EmployeeId,
             y.LeftWorkDateGr,
-            Status = x.Statuses.OrderByDescending(z => z.StartDate).FirstOrDefault(z =>
-                z.StartDateGr.Date < y.LeftWorkDateGr && z.EndDateGr.Date > y.LeftWorkDateGr)
+            Status = x.Statuses.OrderByDescending(z => z.StartDate).FirstOrDefault(z => z.StartDateGr.Date < y.LeftWorkDateGr && z.EndDateGr.Date > y.LeftWorkDateGr)
         });
 
         //shaping up the list to send as parameter to repository
-        var newRollCallRecords = joinedList.Where(x => x.Status != null).Select(x =>
-            new AdjustRollCallEmployeesWithEmployeeLeftWork()
-            {
-                LeaveDate = x.LeftWorkDateGr,
-                RollCallStatusId = x.Status.Id
-            }).ToList();
-        if (newRollCallRecords.Count > 0)
+        var newRollCallRecords = joinedList.Where(x => x.Status != null).Select(x => new AdjustRollCallEmployeesWithEmployeeLeftWork()
+        {
+            LeaveDate = x.LeftWorkDateGr,
+            RollCallStatusId = x.Status.Id
+        }).ToList();
+        if(newRollCallRecords.Count > 0)
             _rollCallEmployeeStatusRepository.AdjustRollCallStatusEndDates(newRollCallRecords);
-
-        foreach (var rollCallEmployeeViewModel in rollCallsEmployee)
-        {
-            var maxLeftWork = leftWorks.FirstOrDefault(x => x.WorkshopId == rollCallEmployeeViewModel.WorkshopId);
-            if (maxLeftWork == null)
-            {
-                continue;
-            }
-
-            var employeeStatus = _rollCallEmployeeRepository.GetBy(rollCallEmployeeViewModel.EmployeeId,
-                rollCallEmployeeViewModel.WorkshopId);
-            var rollCallEmployeeStatusList = employeeStatus.EmployeesStatus
-                .Where(x => x.StartDate >= maxLeftWork.LeftWorkDateGr).ToList();
-            if (rollCallEmployeeStatusList.Any())
-            {
-                _rollCallEmployeeStatusRepository.RemoveRange(rollCallEmployeeStatusList);
-                _rollCallEmployeeStatusRepository.SaveChanges();
-            }
-        }
-    }
-
-    private void IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(long employeeId, long workshopId)
-    {
-        //get last leftworks for employee in all workshops
-        var leftWorks = _leftWorkRepository.search(new LeftWorkSearchModel()
-                { EmployeeId = employeeId, WorkshopId = workshopId })
-            .Select(x => new LeftWorkViewModel()
-            {
-                EmployeeId = employeeId,
-                WorkshopId = x.WorkshopId,
-                LeftWorkDateGr = x.LeftWorkDateGr.Date.AddDays(-1),
-                StartWorkDateGr = x.StartWorkDateGr
-            }).ToList();
-
-        var maxLeftWork = leftWorks.MaxBy(y => y.StartWorkDateGr);
-
-
-        //get rollCallEmployee associated with those leftworks which have a higher end date than leftworkDate
-        var rollCallsEmployee = _rollCallEmployeeRepository.GetBy(employeeId, workshopId);
-
-        // var joinedList = rollCallsEmployee.Join(leftWorks, x => x.WorkshopId, y => y.WorkshopId, (x, y) => new
-        // {
-        //     x.WorkshopId,
-        //     x.EmployeeId,
-        //     y.LeftWorkDateGr,
-        //     Status = x.Statuses.OrderByDescending(z => z.StartDate).FirstOrDefault(z => z.StartDateGr.Date < y.LeftWorkDateGr && z.EndDateGr.Date > y.LeftWorkDateGr)
-        // });
-
-
-        var status = rollCallsEmployee.EmployeesStatus.OrderByDescending(z => z.StartDate)
-            .FirstOrDefault(rollCallEmployeeStatus => rollCallEmployeeStatus.StartDate.Date < maxLeftWork.LeftWorkDateGr
-                                                      && rollCallEmployeeStatus.EndDate.Date >
-                                                      maxLeftWork.LeftWorkDateGr);
-
-        if (status != null)
-        {
-            var adjust = new AdjustRollCallEmployeesWithEmployeeLeftWork()
-            {
-                LeaveDate = maxLeftWork.LeftWorkDateGr,
-                RollCallStatusId = status.id
-            };
-            _rollCallEmployeeStatusRepository.AdjustRollCallStatusEndDates([adjust]);
-        }
-
-        var rollCallEmployeeStatusList = rollCallsEmployee.EmployeesStatus
-            .Where(x => x.StartDate >= maxLeftWork.LeftWorkDateGr).ToList();
-        if (rollCallEmployeeStatusList.Any())
-        {
-            _rollCallEmployeeStatusRepository.RemoveRange(rollCallEmployeeStatusList);
-            _rollCallEmployeeStatusRepository.SaveChanges();
-        }
     }
 
     #endregion

CompanyManagment.Application/LeftWorkTempApplication.cs

@@ -27,30 +27,26 @@ namespace CompanyManagment.Application;
 
 public class LeftWorkTempApplication : ILeftWorkTempApplication
 {
-    private readonly ILeftWorkTempRepository _leftWorkTempRepository;
-    private readonly ILeftWorkRepository _leftWorkRepository;
-    private readonly IWorkshopRepository _workshopRepository;
-    private readonly IEmployeeRepository _employeeRepository;
-    private readonly IJobRepository _jobRepository;
-    private readonly ICheckoutRepository _checkoutRepository;
-    private readonly IContractRepository _contractRepository;
+	private readonly ILeftWorkTempRepository _leftWorkTempRepository;
+	private readonly ILeftWorkRepository _leftWorkRepository;
+	private readonly IWorkshopRepository _workshopRepository;
+	private readonly IEmployeeRepository _employeeRepository;
+	private readonly IJobRepository _jobRepository;
+	private readonly ICheckoutRepository _checkoutRepository;
+	private readonly IContractRepository _contractRepository;
     private readonly IRollCallEmployeeRepository _rollCallEmployeeRepository;
     private readonly IRollCallEmployeeStatusRepository _rollCallEmployeeStatusRepository;
 
 
-    public LeftWorkTempApplication(ILeftWorkTempRepository leftWorkTempRepository,
-        ILeftWorkRepository leftWorkRepository, IWorkshopRepository workshopRepository,
-        IEmployeeRepository employeeRepository, IJobRepository jobRepository, ICheckoutRepository checkoutRepository,
-        IContractRepository contractRepository, IRollCallEmployeeStatusRepository rollCallEmployeeStatusRepository,
-        IRollCallEmployeeRepository rollCallEmployeeRepository)
-    {
-        _leftWorkTempRepository = leftWorkTempRepository;
-        _leftWorkRepository = leftWorkRepository;
-        _workshopRepository = workshopRepository;
-        _employeeRepository = employeeRepository;
-        _jobRepository = jobRepository;
-        _checkoutRepository = checkoutRepository;
-        _contractRepository = contractRepository;
+    public LeftWorkTempApplication(ILeftWorkTempRepository leftWorkTempRepository, ILeftWorkRepository leftWorkRepository, IWorkshopRepository workshopRepository, IEmployeeRepository employeeRepository, IJobRepository jobRepository, ICheckoutRepository checkoutRepository, IContractRepository contractRepository, IRollCallEmployeeStatusRepository rollCallEmployeeStatusRepository, IRollCallEmployeeRepository rollCallEmployeeRepository)
+	{
+		_leftWorkTempRepository = leftWorkTempRepository;
+		_leftWorkRepository = leftWorkRepository;
+		_workshopRepository = workshopRepository;
+		_employeeRepository = employeeRepository;
+		_jobRepository = jobRepository;
+		_checkoutRepository = checkoutRepository;
+		_contractRepository = contractRepository;
         _rollCallEmployeeStatusRepository = rollCallEmployeeStatusRepository;
         _rollCallEmployeeRepository = rollCallEmployeeRepository;
     }
@@ -63,16 +59,15 @@ public class LeftWorkTempApplication : ILeftWorkTempApplication
         {
             #region Validation
 
-            if (_leftWorkTempRepository.Exists(x => x.WorkshopId == command.WorkshopId && x.EmployeeId == employeeId))
+            if (_leftWorkTempRepository.Exists(x=>x.WorkshopId == command.WorkshopId && x.EmployeeId == employeeId))
             {
-                return op.Failed("برای پرسنل وارد شده قبلا درخواست ترک کار ثبت کرده اید");
+	            return op.Failed("برای پرسنل وارد شده قبلا درخواست ترک کار ثبت کرده اید");
             }
 
             if (command.LeftWorkTime.TryToGeorgianDateTime(out var leftWorkDateGr) == false)
             {
                 return op.Failed("تاریخ شروع به کار وارد شده نامعتبر است");
             }
-
             if (command.LastDayStanding.TryToGeorgianDateTime(out var lastDayStandingDateGr) == false)
             {
                 return op.Failed("تاریخ شروع به کار وارد شده نامعتبر است");
@@ -106,6 +101,7 @@ public class LeftWorkTempApplication : ILeftWorkTempApplication
             }
 
 
+
             //if (leftWork.StartWorkDate >= leftWorkDateGr)
             //{
             //    return op.Failed("ترک کار نمیتواند کوچک تر یا مساوی شروع به کار باشد");
@@ -125,10 +121,10 @@ public class LeftWorkTempApplication : ILeftWorkTempApplication
             //    return op.Failed("این پرسنل در تاریخ ترک کار وارد شده دارای قرارداد میباشد");
             //}
 
+
             #endregion
 
-            var leftWorkTemp = LeftWorkTemp.CreateLeftWork(leftWork.id, leftWork.StartWorkDate, leftWorkDateGr,
-                lastDayStandingDateGr,
+            var leftWorkTemp = LeftWorkTemp.CreateLeftWork(leftWork.id, leftWork.StartWorkDate, leftWorkDateGr, lastDayStandingDateGr,
                 command.WorkshopId, employeeId, leftWork.JobId);
 
             await _leftWorkTempRepository.CreateAsync(leftWorkTemp);
@@ -139,63 +135,61 @@ public class LeftWorkTempApplication : ILeftWorkTempApplication
     }
 
     public Task<GetStartWorkTempDetails> GetStartAndLeftWorkDetails(long employeeId, long workshopId)
-    {
-        return _leftWorkTempRepository.GetStartAndLeftWorkDetails(employeeId, workshopId);
-    }
+	{
+		return _leftWorkTempRepository.GetStartAndLeftWorkDetails(employeeId, workshopId);
+	}
 
-    public async Task<OperationResult> AcceptStartWork(AcceptStartWorkTemp command)
-    {
-        var op = new OperationResult();
-        if (command.StartDateTime.TryToGeorgianDateTime(out var startDateGr) == false)
-        {
-            return op.Failed("تاریخ شروع به کار وارد شده نامعتبر است");
-        }
+	public async Task<OperationResult> AcceptStartWork(AcceptStartWorkTemp command)
+	{
+		var op = new OperationResult();
+		if (command.StartDateTime.TryToGeorgianDateTime(out var startDateGr) == false)
+		{
+			return op.Failed("تاریخ شروع به کار وارد شده نامعتبر است");
+		}
 
-        var leftWorkTemp = _leftWorkTempRepository.Get(command.LeftWorkTempId);
+		var leftWorkTemp = _leftWorkTempRepository.Get(command.LeftWorkTempId);
 
-        if (leftWorkTemp.LeftWorkType != LeftWorkTempType.StartWork)
-        {
-            return op.Failed("اطلاعات وارد شده نامعتبر است");
-        }
+		if (leftWorkTemp.LeftWorkType != LeftWorkTempType.StartWork)
+		{
+			return op.Failed("اطلاعات وارد شده نامعتبر است");
+		}
 
-        if (_leftWorkRepository.Exists(x =>
-                x.WorkshopId == leftWorkTemp.WorkshopId && x.EmployeeId == leftWorkTemp.EmployeeId &&
-                x.LeftWorkDate >= startDateGr))
-        {
-            return op.Failed("شروع به کار وارد شده با ترک کار های قبلی تداخل دارد");
-        }
+		if (_leftWorkRepository.Exists(x => x.WorkshopId == leftWorkTemp.WorkshopId && x.EmployeeId == leftWorkTemp.EmployeeId && x.LeftWorkDate >= startDateGr))
+		{
+			return op.Failed("شروع به کار وارد شده با ترک کار های قبلی تداخل دارد");
+		}
 
 
-        if (_jobRepository.Exists(x => x.id == command.JobId) == false)
-        {
-            return op.Failed("سمت وارد شده نامعتبر است");
-        }
+		if (_jobRepository.Exists(x => x.id == command.JobId) == false)
+		{
+			return op.Failed("سمت وارد شده نامعتبر است");
+		}
 
-        var defaultTime = new DateTime(2121, 03, 21);
+		var defaultTime = new DateTime(2121, 03, 21);
 
-        var workshop = _workshopRepository.Get(leftWorkTemp.WorkshopId);
-        var employee = _employeeRepository.Get(leftWorkTemp.EmployeeId);
+		var workshop = _workshopRepository.Get(leftWorkTemp.WorkshopId);
+		var employee = _employeeRepository.Get(leftWorkTemp.EmployeeId);
 
-        var newLeftWork = new LeftWork(defaultTime, startDateGr, leftWorkTemp.WorkshopId, leftWorkTemp.EmployeeId,
-            employee.FullName, workshop.WorkshopFullName, command.JobId, false, false, false, false, "", "");
+		var newLeftWork = new LeftWork(defaultTime, startDateGr, leftWorkTemp.WorkshopId, leftWorkTemp.EmployeeId,
+			employee.FullName, workshop.WorkshopFullName, command.JobId, false, false, false, false, "", "");
 
-        await _leftWorkRepository.CreateAsync(newLeftWork);
-        _leftWorkTempRepository.Remove(leftWorkTemp);
-        var rollCallEmployee = _rollCallEmployeeRepository.GetBy(leftWorkTemp.EmployeeId, leftWorkTemp.WorkshopId);
+		await _leftWorkRepository.CreateAsync(newLeftWork);
+		_leftWorkTempRepository.Remove(leftWorkTemp);
+		var rollCallEmployee = _rollCallEmployeeRepository.GetBy(leftWorkTemp.EmployeeId, leftWorkTemp.WorkshopId);
 
-        var rollCallStatus = rollCallEmployee?.EmployeesStatus.MaxBy(x => x.StartDate);
+		var rollCallStatus = rollCallEmployee?.EmployeesStatus.MaxBy(x => x.StartDate);
 
-        if (rollCallStatus != null)
-        {
-            var startWork = newLeftWork.StartWorkDate;
-            rollCallStatus.Edit(startWork, rollCallStatus.EndDate);
-        }
+		if (rollCallStatus != null)
+		{
+			var startWork = newLeftWork.StartWorkDate;
+			rollCallStatus.Edit(startWork, rollCallStatus.EndDate);
 
-        await _leftWorkRepository.SaveChangesAsync();
-        await _leftWorkTempRepository.SaveChangesAsync();
+		}
+		await _leftWorkRepository.SaveChangesAsync();
+		await _leftWorkTempRepository.SaveChangesAsync();
 
-        return op.Succcedded();
-    }
+		return op.Succcedded();
+	}
 
     public async Task<OperationResult> AcceptLeftWork(AcceptLeftWorkTemp command)
     {
@@ -243,12 +237,9 @@ public class LeftWorkTempApplication : ILeftWorkTempApplication
                                             x.WorkshopId == leftWorkTemp.WorkshopId &&
                                             x.ContractStart <= lastDayStandingGr && x.ContractEnd >= lastDayStandingGr))
         {
-            return op.Failed(
-                "این پرسنل در تاریخ ترک کار وارد شده دارای فیش حقوقی میباشد. ابتدا فیش حقوقی پرسنل را حذف کنید ");
+            return op.Failed("این پرسنل در تاریخ ترک کار وارد شده دارای فیش حقوقی میباشد. ابتدا فیش حقوقی پرسنل را حذف کنید ");
         }
 
-        var transaction = await _rollCallEmployeeStatusRepository.BeginTransactionAsync();
-
         leftWork.Edit(leftWorkDateGr, leftWork.StartWorkDate, leftWork.WorkshopId, leftWork.EmployeeId, leftWork.JobId,
             leftWork.IncludeStatus, leftWork.AddBonusesPay, leftWork.AddYearsPay, leftWork.AddLeavePay);
 
@@ -256,9 +247,8 @@ public class LeftWorkTempApplication : ILeftWorkTempApplication
         await _leftWorkRepository.SaveChangesAsync();
         await _leftWorkTempRepository.SaveChangesAsync();
 
-        IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(leftWork.EmployeeId, leftWork.WorkshopId);
+        IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(leftWork.EmployeeId);
 
-        await transaction.CommitAsync();
         return op.Succcedded();
     }
 
@@ -269,59 +259,45 @@ public class LeftWorkTempApplication : ILeftWorkTempApplication
 
     public List<LeftWorkTempViewModel> GetLeftWorksByWorkshopId(long workshopId)
     {
-        return _leftWorkTempRepository.GetLeftWorksByWorkshopId(workshopId);
+	   return  _leftWorkTempRepository.GetLeftWorksByWorkshopId(workshopId);
+
     }
 
     //این متد ترک کار های کارمند را با فعالیت حضور غیاب یکپارچه می کند
-    private void IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(long employeeId, long workshopId)
+    private void IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(long employeeId)
     {
         //get last leftworks for employee in all workshops
-        var leftWorks = _leftWorkRepository.search(new LeftWorkSearchModel()
-                { EmployeeId = employeeId, WorkshopId = workshopId })
-            .Select(x => new LeftWorkViewModel()
+        var leftWorks = _leftWorkRepository.search(new LeftWorkSearchModel() { EmployeeId = employeeId }).GroupBy(x => x.WorkshopId).Select(x =>
+        {
+            var leftWork = x.MaxBy(y => y.StartWorkDateGr);
+            return new LeftWorkViewModel()
             {
                 EmployeeId = employeeId,
-                WorkshopId = x.WorkshopId,
-                LeftWorkDateGr = x.LeftWorkDateGr.Date.AddDays(-1),
-                StartWorkDateGr = x.StartWorkDateGr
-            }).ToList();
-
-        var maxLeftWork = leftWorks.MaxBy(y => y.StartWorkDateGr);
-
+                WorkshopId = x.Key,
+                LeftWorkDateGr = leftWork.LeftWorkDateGr.Date.AddDays(-1),
+                StartWorkDateGr = leftWork.StartWorkDateGr
+            };
+        }).ToList();
 
         //get rollCallEmployee associated with those leftworks which have a higher end date than leftworkDate
-        var rollCallsEmployee = _rollCallEmployeeRepository.GetBy(employeeId, workshopId);
+        var rollCallsEmployee = _rollCallEmployeeRepository.GetByEmployeeIdWithStatuses(employeeId)
+            .Where(x => leftWorks.Any(y => y.WorkshopId == x.WorkshopId)).ToList();
 
-        // var joinedList = rollCallsEmployee.Join(leftWorks, x => x.WorkshopId, y => y.WorkshopId, (x, y) => new
-        // {
-        //     x.WorkshopId,
-        //     x.EmployeeId,
-        //     y.LeftWorkDateGr,
-        //     Status = x.Statuses.OrderByDescending(z => z.StartDate).FirstOrDefault(z => z.StartDateGr.Date < y.LeftWorkDateGr && z.EndDateGr.Date > y.LeftWorkDateGr)
-        // });
-
-
-        var status = rollCallsEmployee.EmployeesStatus.OrderByDescending(z => z.StartDate)
-            .FirstOrDefault(rollCallEmployeeStatus => rollCallEmployeeStatus.StartDate.Date < maxLeftWork.LeftWorkDateGr
-                                                      && rollCallEmployeeStatus.EndDate.Date >
-                                                      maxLeftWork.LeftWorkDateGr);
-
-        if (status != null)
+        var joinedList = rollCallsEmployee.Join(leftWorks, x => x.WorkshopId, y => y.WorkshopId, (x, y) => new
         {
-            var adjust = new AdjustRollCallEmployeesWithEmployeeLeftWork()
-            {
-                LeaveDate = maxLeftWork.LeftWorkDateGr,
-                RollCallStatusId = status.id
-            };
-            _rollCallEmployeeStatusRepository.AdjustRollCallStatusEndDates([adjust]);
-        }
+            x.WorkshopId,
+            x.EmployeeId,
+            y.LeftWorkDateGr,
+            Status = x.Statuses.OrderByDescending(z => z.StartDate).FirstOrDefault(z => z.StartDateGr.Date < y.LeftWorkDateGr && z.EndDateGr.Date > y.LeftWorkDateGr)
+        });
 
-        var rollCallEmployeeStatusList = rollCallsEmployee.EmployeesStatus
-            .Where(x => x.StartDate >= maxLeftWork.LeftWorkDateGr).ToList();
-        if (rollCallEmployeeStatusList.Any())
+        //shaping up the list to send as parameter to repository
+        var newRollCallRecords = joinedList.Where(x => x.Status != null).Select(x => new AdjustRollCallEmployeesWithEmployeeLeftWork()
         {
-            _rollCallEmployeeStatusRepository.RemoveRange(rollCallEmployeeStatusList);
-            _rollCallEmployeeStatusRepository.SaveChanges();
-        }
+            LeaveDate = x.LeftWorkDateGr,
+            RollCallStatusId = x.Status.Id
+        }).ToList();
+        if (newRollCallRecords.Count > 0)
+            _rollCallEmployeeStatusRepository.AdjustRollCallStatusEndDates(newRollCallRecords);
     }
 }

CompanyManagment.Application/PaymentTransactionApplication.cs

@@ -50,7 +50,7 @@ public class PaymentTransactionApplication : IPaymentTransactionApplication
             command.ContractingPartyId,
             command.Amount,
             contractingPartyName,
-            command.CallBackUrl,command.Gateway);
+            command.CallBackUrl);
 
         await _paymentTransactionRepository.CreateAsync(entity);
         await _paymentTransactionRepository.SaveChangesAsync();
@@ -87,7 +87,7 @@ public class PaymentTransactionApplication : IPaymentTransactionApplication
         return op.Succcedded();
     }
 
-    public OperationResult SetSuccess(long paymentTransactionId,string cardNumber, string bankName, string rrn, string digitalReceipt)
+    public OperationResult SetSuccess(long paymentTransactionId,string cardNumber, string bankName)
     {
         var op = new OperationResult();
 
@@ -97,7 +97,7 @@ public class PaymentTransactionApplication : IPaymentTransactionApplication
         {
             return op.Failed("تراکنش مورد نظر یافت نشد");
         }
-        paymentTransaction.SetPaid(cardNumber, bankName,rrn, digitalReceipt);
+        paymentTransaction.SetPaid(cardNumber, bankName);
         _paymentTransactionRepository.SaveChanges();
 
         return op.Succcedded();

CompanyManagment.Application/ReportApplication.cs

@@ -29,67 +29,67 @@ public class ReportApplication : IReportApplication
         return await _reportRepository.GetAllActiveWorkshopsNew(year, month);
     }
 
-    public async Task<WorkshopResult> GetWorkshopContractDone(string year, string month, long accountId, List<long> workshopList)
+    public WorkshopResult GetWorkshopContractDone(string year, string month, long accountId, List<long> workshopList)
     {
-        return await _reportRepository.GetWorkshopContractDone(year, month, accountId, workshopList);
+        return _reportRepository.GetWorkshopContractDone(year, month, accountId, workshopList);
     }
 
-    public async Task<WorkshopResult> GetWorkshopContractSignDone(string year, string month, long accountId, List<long> workshopList)
+    public WorkshopResult GetWorkshopContractSignDone(string year, string month, long accountId, List<long> workshopList)
     {
-        return await _reportRepository.GetWorkshopContractSignDone(year, month, accountId, workshopList);
+        return _reportRepository.GetWorkshopContractSignDone(year, month, accountId, workshopList);
     }
 
-    public async Task<WorkshopResult> GetWorkshopCheckoutDone(string year, string month, long accountId, List<long> workshopList)
+    public WorkshopResult GetWorkshopCheckoutDone(string year, string month, long accountId, List<long> workshopList)
     {
-        return await _reportRepository.GetWorkshopCheckoutDone(year, month, accountId, workshopList);
+        return _reportRepository.GetWorkshopCheckoutDone(year, month, accountId, workshopList);
     }
 
-    public async Task<WorkshopResult> GetWorkshopCheckoutSignDone(string year, string month, long accountId, List<long> workshopList)
+    public WorkshopResult GetWorkshopCheckoutSignDone(string year, string month, long accountId, List<long> workshopList)
     {
-        return await _reportRepository.GetWorkshopCheckoutSignDone(year, month, accountId, workshopList);
+        return _reportRepository.GetWorkshopCheckoutSignDone(year, month, accountId, workshopList);
     }
 
-    public async Task<List<EmployeeNotDone>> GetEmployeeContract(string year, string month, long workshopId)
+    public List<EmployeeNotDone> GetEmployeeContract(string year, string month, long workshopId)
     {
-        return await _reportRepository.GetEmployeeContract(year, month, workshopId);
+        return _reportRepository.GetEmployeeContract(year, month, workshopId);
     }
 
-    public async Task<List<EmployeeNotDone>> GetEmployeeContractSign(string year, string month, long workshopId)
+    public List<EmployeeNotDone> GetEmployeeContractSign(string year, string month, long workshopId)
     {
-        return await _reportRepository.GetEmployeeContractSign(year, month, workshopId);
+        return _reportRepository.GetEmployeeContractSign(year, month, workshopId);
     }
 
-    public async Task<List<EmployeeNotDone>> GetEmployeeCheckout(string year, string month, long workshopId)
+    public List<EmployeeNotDone> GetEmployeeCheckout(string year, string month, long workshopId)
     {
-        return await _reportRepository.GetEmployeeCheckout(year, month, workshopId);
+        return _reportRepository.GetEmployeeCheckout(year, month, workshopId);
     }
 
-    public async Task<List<EmployeeNotDone>> GetEmployeeCheckoutSign(string year, string month, long workshopId)
+    public List<EmployeeNotDone> GetEmployeeCheckoutSign(string year, string month, long workshopId)
     {
-        return await _reportRepository.GetEmployeeCheckoutSign(year, month, workshopId);
+        return _reportRepository.GetEmployeeCheckoutSign(year, month, workshopId);
     }
 
     #region Print
 
-    public async Task<PrintAllContractCheckout> GetPrintAllContractDone(string year, string month, long accountId,
+    public PrintAllContractCheckout GetPrintAllContractDone(string year, string month, long accountId,
         List<long> workshopList)
     {
-        return await _reportRepository.GetPrintAllContractDone(year, month, accountId, workshopList);
+        return _reportRepository.GetPrintAllContractDone(year, month, accountId, workshopList);
     }
-    public async Task<PrintAllContractCheckout> GetPrintAllContractSignDone(string year, string month, long accountId,
+    public PrintAllContractCheckout GetPrintAllContractSignDone(string year, string month, long accountId,
         List<long> workshopList)
     {
-        return await _reportRepository.GetPrintAllContractSignDone(year, month, accountId, workshopList);
+        return _reportRepository.GetPrintAllContractSignDone(year, month, accountId, workshopList);
     }
-    public async Task<PrintAllContractCheckout> GetPrintAllCheckoutDone(string year, string month, long accountId,
+    public PrintAllContractCheckout GetPrintAllCheckoutDone(string year, string month, long accountId,
         List<long> workshopList)
     {
-        return await _reportRepository.GetPrintAllCheckoutDone(year, month, accountId, workshopList);
+        return _reportRepository.GetPrintAllCheckoutDone(year, month, accountId, workshopList);
     }
-    public async Task<PrintAllContractCheckout> GetPrintAllCheckoutSignDone(string year, string month, long accountId,
+    public PrintAllContractCheckout GetPrintAllCheckoutSignDone(string year, string month, long accountId,
         List<long> workshopList)
     {
-        return await _reportRepository.GetPrintAllCheckoutSignDone(year, month, accountId, workshopList);
+        return _reportRepository.GetPrintAllCheckoutSignDone(year, month, accountId, workshopList);
     }
 
     #endregion

CompanyManagment.Application/TemporaryClientRegistrationApplication.cs

@@ -674,7 +674,7 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
             result.MonthlyValueAddedTaxStr= tenPercent.ToMoney();
             var monthlyTotalPaymentDouble = sumOfWorkshopsPaymentDouble + tenPercent;
             result.MonthlyTotalPaymentStr = monthlyTotalPaymentDouble.ToMoney();
-            var installmentList = InstitutionContractRepository.InstitutionMonthlyInstallmentCaculation((int)duration, monthlyTotalPaymentDouble, installmentstart);
+            var installmentList = InstitutionContractRepository.InstitutionMonthlyInstallmentCaculation(duration, monthlyTotalPaymentDouble, installmentstart);
 
             #endregion
 

CompanyManagment.EFCore/CompanyContext.cs

@@ -1,6 +1,5 @@
 using Company.Domain.AdminMonthlyOverviewAgg;
 using Company.Domain.AndroidApkVersionAgg;
-using Company.Domain.AuthorizedBankDetailsAgg;
 using Company.Domain.BankAgg;
 using Company.Domain.BillAgg;
 using Company.Domain.Board;
@@ -202,9 +201,6 @@ public class CompanyContext : DbContext
 
     public DbSet<InstitutionContractContactInfoTemp> InstitutionContractContactInfoTemps { get; set; }
     
-    public DbSet<AuthorizedBankDetails> AuthorizedBankDetails { get; set; }
-    
-    
     #endregion
 
     #region Pooya
@@ -230,8 +226,6 @@ public class CompanyContext : DbContext
 
     #endregion
 
-    public DbSet<CheckoutWarningMessage> CheckoutWarningMessages { get; set; }
-
     public DbSet<CustomizeCheckout> CustomizeCheckouts { get; set; }
     public DbSet<CustomizeCheckoutTemp> CustomizeCheckoutTemps { get; set; }
     public DbSet<TaxLeftWorkItem> TaxLeftWorkItems { get; set; }
@@ -315,6 +309,7 @@ public class CompanyContext : DbContext
 
     public DbSet<Employer> Employers { get; set; }
 
+
     public CompanyContext(DbContextOptions<CompanyContext> options) :base(options)
     {
             

CompanyManagment.EFCore/CompanyManagment.EFCore.csproj

@@ -13,7 +13,6 @@
     </PackageReference>
     <PackageReference Include="Microsoft.QualityTools.Testing.Fakes" Version="16.11.230815" />
     <PackageReference Include="MongoDB.Driver" Version="3.5.0" />
-    <PackageReference Include="Parbad.Gateway.Sepehr" Version="1.7.0" />
     <PackageReference Include="PersianTools.Core" Version="2.0.4" />
   </ItemGroup>
 

CompanyManagment.EFCore/Mapping/AuthorizedBankDetailsMapping.cs

@@ -1,34 +0,0 @@
-using Company.Domain.AuthorizedBankDetailsAgg;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-
-namespace CompanyManagment.EFCore.Mapping
-{
-    public class AuthorizedBankDetailsMapping : IEntityTypeConfiguration<AuthorizedBankDetails>
-    {
-        public void Configure(EntityTypeBuilder<AuthorizedBankDetails> builder)
-        {
-            builder.ToTable("AuthorizedBankDetails");
-            builder.HasKey(x => x.id);
-
-            builder.Property(x => x.CardNumber).HasMaxLength(50);
-            builder.Property(x => x.AccountNumber).HasMaxLength(50);
-            builder.Property(x => x.IBan).HasMaxLength(50);
-            builder.Property(x => x.BankName).HasMaxLength(100);
-
-            // Configure owners as owned entities (value objects)
-            builder.OwnsMany(x => x.OwnersList, ownersBuilder =>
-            {
-                ownersBuilder.ToTable("AuthorizedBankDetailsOwners");
-                ownersBuilder.WithOwner().HasForeignKey("AuthorizedBankDetailsId");
-                ownersBuilder.Property<int>("Id").ValueGeneratedOnAdd();
-                ownersBuilder.HasKey("Id");
-                
-                ownersBuilder.Property(x => x.FName).HasMaxLength(100);
-                ownersBuilder.Property(x => x.LName).HasMaxLength(100);
-                ownersBuilder.Property(x => x.NationalIdentifier).HasMaxLength(20);
-                ownersBuilder.Property(x => x.CustomerType).HasMaxLength(50);
-            });
-        }
-    }
-}

CompanyManagment.EFCore/Mapping/CheckoutMapping.cs

@@ -50,18 +50,12 @@ class CheckoutMapping : IEntityTypeConfiguration<Checkout>
         builder.Property(x => x.TotalDayOfLeaveCompute).HasMaxLength(10);
         builder.Property(x => x.TotalDayOfYearsCompute).HasMaxLength(10);
         builder.Property(x => x.TotalDayOfBunosesCompute).HasMaxLength(10);
-   
 
         builder.Property(x => x.EmployeeMandatoryHours).HasTimeSpanConversion();
 		builder.HasOne(x => x.Workshop)
             .WithMany(x => x.Checkouts)
             .HasForeignKey(x => x.WorkshopId);
 
-        builder.HasMany(x => x.CheckoutWarningMessageList)
-            .WithOne(x => x.Checkout)
-            .HasForeignKey(x => x.CheckoutId);
-            
-
         builder.OwnsMany(x => x.LoanInstallments, installments =>
         {
             installments.Property(x => x.AmountForMonth).HasMaxLength(25);

CompanyManagment.EFCore/Mapping/CheckoutWarningMessageMapping.cs

@@ -1,26 +0,0 @@
-using System;
-using _0_Framework.Application.Enums;
-using Company.Domain.CheckoutAgg;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-
-namespace CompanyManagment.EFCore.Mapping;
-
-public class CheckoutWarningMessageMapping : IEntityTypeConfiguration<CheckoutWarningMessage>
-{
-    public void Configure(EntityTypeBuilder<CheckoutWarningMessage> builder)
-    {
-        builder.ToTable("CheckoutWarningMessage");
-        builder.HasKey(x => x.id);
-
-        builder.Property(x => x.WarningMessage).HasMaxLength(150);
-
-        builder.Property(x => x.TypeOfCheckoutWarning).HasConversion(
-            v => v.ToString(),
-            v => (TypeOfCheckoutWarning)Enum.Parse(typeof(TypeOfCheckoutWarning), v)).HasMaxLength(30);
-
-        builder.HasOne(x => x.Checkout)
-            .WithMany(x => x.CheckoutWarningMessageList)
-            .HasForeignKey(x => x.CheckoutId);
-    }
-}

CompanyManagment.EFCore/Mapping/InstitutionContractAmendmentMapping.cs

@@ -12,8 +12,6 @@ public class InstitutionContractAmendmentMapping:IEntityTypeConfiguration<Instit
         builder.HasKey(x => x.id);
 
         builder.Property(x => x.VerifyCode).HasMaxLength(10);
-        builder.Property(x => x.VerifierFullName).HasMaxLength(100);
-        builder.Property(x => x.VerifierPhoneNumber).HasMaxLength(20);
 
         builder.HasOne(x => x.InstitutionContract)
             .WithMany(x => x.Amendments)

CompanyManagment.EFCore/Mapping/InstitutionContractMapping.cs

@@ -30,8 +30,6 @@ public class InstitutionContractMapping : IEntityTypeConfiguration<InstitutionCo
         builder.Property(x => x.HasValueAddedTax).HasMaxLength(10);
 
         builder.Property(x => x.VerifyCode).HasMaxLength(20);
-        builder.Property(x => x.VerifierFullName).HasMaxLength(100);
-        builder.Property(x => x.VerifierPhoneNumber).HasMaxLength(20);
 
         builder.Property(x => x.VerificationStatus).HasConversion<string>().HasMaxLength(122);
 

CompanyManagment.EFCore/Mapping/PaymentTransactionMapping.cs

@@ -15,12 +15,8 @@ public class PaymentTransactionMapping:IEntityTypeConfiguration<PaymentTransacti
         builder.Property(x => x.CardNumber).HasMaxLength(25);
         builder.Property(x => x.BankName).HasMaxLength(50);
         builder.Property(x => x.Status).HasConversion<string>().HasMaxLength(35);
-        builder.Property(x => x.Gateway).HasConversion<string>().HasMaxLength(35);
         builder.Property(x => x.ContractingPartyName).HasMaxLength(255);
         builder.Property(x => x.CallBackUrl).HasMaxLength(500);
-        builder.Property(x => x.Rrn).HasMaxLength(50);
-        builder.Property(x => x.DigitalReceipt).HasMaxLength(50);
-        
 
     }
 }

CompanyManagment.EFCore/Migrations/20251019092906_add authorized bank details.cs

@@ -1,68 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addauthorizedbankdetails : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "AuthorizedBankDetails",
-                columns: table => new
-                {
-                    id = table.Column<long>(type: "bigint", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    CardNumber = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    AccountNumber = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    IBan = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    BankName = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
-                    CreationDate = table.Column<DateTime>(type: "datetime2", nullable: false)
-                },
-                constraints: table => { table.PrimaryKey("PK_AuthorizedBankDetails", x => x.id); });
-
-            migrationBuilder.CreateTable(
-                name: "AuthorizedBankDetailsOwners",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    FName = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
-                    LName = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
-                    NationalIdentifier = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: true),
-                    CustomerType = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    AuthorizedBankDetailsId = table.Column<long>(type: "bigint", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AuthorizedBankDetailsOwners", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_AuthorizedBankDetailsOwners_AuthorizedBankDetails_AuthorizedBankDetailsId",
-                        column: x => x.AuthorizedBankDetailsId,
-                        principalTable: "AuthorizedBankDetails",
-                        principalColumn: "id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AuthorizedBankDetailsOwners_AuthorizedBankDetailsId",
-                table: "AuthorizedBankDetailsOwners",
-                column: "AuthorizedBankDetailsId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "AuthorizedBankDetailsOwners");
-
-            migrationBuilder.DropTable(
-                name: "AuthorizedBankDetails");
-
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20251023102559_Add Verifier details in instituion contract and amendment.cs

@@ -1,74 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddVerifierdetailsininstituioncontractandamendment : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "VerifierFullName",
-                table: "InstitutionContracts",
-                type: "nvarchar(100)",
-                maxLength: 100,
-                nullable: true);
-
-            migrationBuilder.AddColumn<string>(
-                name: "VerifierPhoneNumber",
-                table: "InstitutionContracts",
-                type: "nvarchar(20)",
-                maxLength: 20,
-                nullable: true);
-
-            migrationBuilder.AddColumn<string>(
-                name: "VerifierFullName",
-                table: "InstitutionContractAmendments",
-                type: "nvarchar(100)",
-                maxLength: 100,
-                nullable: true);
-
-            migrationBuilder.AddColumn<string>(
-                name: "VerifierPhoneNumber",
-                table: "InstitutionContractAmendments",
-                type: "nvarchar(20)",
-                maxLength: 20,
-                nullable: true);
-
-            migrationBuilder.AddColumn<DateTime>(
-                name: "VerifyCodeCreation",
-                table: "InstitutionContractAmendments",
-                type: "datetime2",
-                nullable: false,
-                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "VerifierFullName",
-                table: "InstitutionContracts");
-
-            migrationBuilder.DropColumn(
-                name: "VerifierPhoneNumber",
-                table: "InstitutionContracts");
-
-            migrationBuilder.DropColumn(
-                name: "VerifierFullName",
-                table: "InstitutionContractAmendments");
-
-            migrationBuilder.DropColumn(
-                name: "VerifierPhoneNumber",
-                table: "InstitutionContractAmendments");
-
-            migrationBuilder.DropColumn(
-                name: "VerifyCodeCreation",
-                table: "InstitutionContractAmendments");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20251027125514_hasInsuranceShareTheSameAsList_checkoutTable.cs

@@ -1,29 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class hasInsuranceShareTheSameAsList_checkoutTable : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "HasInsuranceShareTheSameAsList",
-                table: "Checkouts",
-                type: "bit",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "HasInsuranceShareTheSameAsList",
-                table: "Checkouts");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20251028121828_CheckoutWarningMessage.cs

@@ -1,58 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class CheckoutWarningMessage : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "IsUpdateNeeded",
-                table: "Checkouts",
-                type: "bit",
-                nullable: false,
-                defaultValue: false);
-
-            migrationBuilder.CreateTable(
-                name: "CheckoutWarningMessage",
-                columns: table => new
-                {
-                    id = table.Column<long>(type: "bigint", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    WarningMessage = table.Column<string>(type: "nvarchar(150)", maxLength: 150, nullable: true),
-                    CheckoutId = table.Column<long>(type: "bigint", nullable: false),
-                    TypeOfCheckoutWarning = table.Column<string>(type: "nvarchar(30)", maxLength: 30, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_CheckoutWarningMessage", x => x.id);
-                    table.ForeignKey(
-                        name: "FK_CheckoutWarningMessage_Checkouts_CheckoutId",
-                        column: x => x.CheckoutId,
-                        principalTable: "Checkouts",
-                        principalColumn: "id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_CheckoutWarningMessage_CheckoutId",
-                table: "CheckoutWarningMessage",
-                column: "CheckoutId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "CheckoutWarningMessage");
-
-            migrationBuilder.DropColumn(
-                name: "IsUpdateNeeded",
-                table: "Checkouts");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20251112143907_addGateways in transaction .cs

@@ -1,30 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addGatewaysintransaction : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "Gateway",
-                table: "PaymentTransactions",
-                type: "nvarchar(35)",
-                maxLength: 35,
-                nullable: false,
-                defaultValue: "");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "Gateway",
-                table: "PaymentTransactions");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20251112151518_add rrn and digital receipt.cs

@@ -1,40 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addrrnanddigitalreceipt : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "DigitalReceipt",
-                table: "PaymentTransactions",
-                type: "nvarchar(50)",
-                maxLength: 50,
-                nullable: true);
-
-            migrationBuilder.AddColumn<string>(
-                name: "Rrn",
-                table: "PaymentTransactions",
-                type: "nvarchar(50)",
-                maxLength: 50,
-                nullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "DigitalReceipt",
-                table: "PaymentTransactions");
-
-            migrationBuilder.DropColumn(
-                name: "Rrn",
-                table: "PaymentTransactions");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs

@@ -90,38 +90,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("AndroidApkVersions", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.AuthorizedBankDetailsAgg.AuthorizedBankDetails", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<string>("AccountNumber")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
-                    b.Property<string>("BankName")
-                        .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
-
-                    b.Property<string>("CardNumber")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
-                    b.Property<DateTime>("CreationDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("IBan")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
-                    b.HasKey("id");
-
-                    b.ToTable("AuthorizedBankDetails", (string)null);
-                });
-
             modelBuilder.Entity("Company.Domain.AuthorizedPersonAgg.AuthorizedPerson", b =>
                 {
                     b.Property<long>("id")
@@ -415,9 +383,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool>("HasAmountConflict")
                         .HasColumnType("bit");
 
-                    b.Property<bool>("HasInsuranceShareTheSameAsList")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("HasRollCall")
                         .HasColumnType("bit");
 
@@ -434,9 +399,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
 
-                    b.Property<bool>("IsUpdateNeeded")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("LeaveCheckout")
                         .HasColumnType("bit");
 
@@ -549,33 +511,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("Checkouts", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<long>("CheckoutId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("TypeOfCheckoutWarning")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("nvarchar(30)");
-
-                    b.Property<string>("WarningMessage")
-                        .HasMaxLength(150)
-                        .HasColumnType("nvarchar(150)");
-
-                    b.HasKey("id");
-
-                    b.HasIndex("CheckoutId");
-
-                    b.ToTable("CheckoutWarningMessage", (string)null);
-                });
-
             modelBuilder.Entity("Company.Domain.ClassifiedSalaryAgg.ClassifiedSalary", b =>
                 {
                     b.Property<long>("id")
@@ -3238,14 +3173,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(122)
                         .HasColumnType("nvarchar(122)");
 
-                    b.Property<string>("VerifierFullName")
-                        .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
-
-                    b.Property<string>("VerifierPhoneNumber")
-                        .HasMaxLength(20)
-                        .HasColumnType("nvarchar(20)");
-
                     b.Property<string>("VerifyCode")
                         .HasMaxLength(20)
                         .HasColumnType("nvarchar(20)");
@@ -3282,27 +3209,13 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractId")
                         .HasColumnType("bigint");
 
-                    b.Property<long>("LawId")
-                        .HasColumnType("bigint");
-
                     b.Property<DateTime>("VerificationCreation")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("VerifierFullName")
-                        .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
-
-                    b.Property<string>("VerifierPhoneNumber")
-                        .HasMaxLength(20)
-                        .HasColumnType("nvarchar(20)");
-
                     b.Property<string>("VerifyCode")
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
 
-                    b.Property<DateTime>("VerifyCodeCreation")
-                        .HasColumnType("datetime2");
-
                     b.HasKey("id");
 
                     b.HasIndex("InstitutionContractId");
@@ -4990,19 +4903,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("DigitalReceipt")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
-                    b.Property<string>("Gateway")
-                        .IsRequired()
-                        .HasMaxLength(35)
-                        .HasColumnType("nvarchar(35)");
-
-                    b.Property<string>("Rrn")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
                     b.Property<string>("Status")
                         .IsRequired()
                         .HasMaxLength(35)
@@ -6970,48 +6870,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("EmployerWorkshop");
                 });
 
-            modelBuilder.Entity("Company.Domain.AuthorizedBankDetailsAgg.AuthorizedBankDetails", b =>
-                {
-                    b.OwnsMany("Company.Domain.AuthorizedBankDetailsAgg.AuthorizedBankDetailsOwner", "OwnersList", b1 =>
-                        {
-                            b1.Property<int>("Id")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("int");
-
-                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<int>("Id"));
-
-                            b1.Property<long>("AuthorizedBankDetailsId")
-                                .HasColumnType("bigint");
-
-                            b1.Property<string>("CustomerType")
-                                .HasMaxLength(50)
-                                .HasColumnType("nvarchar(50)");
-
-                            b1.Property<string>("FName")
-                                .HasMaxLength(100)
-                                .HasColumnType("nvarchar(100)");
-
-                            b1.Property<string>("LName")
-                                .HasMaxLength(100)
-                                .HasColumnType("nvarchar(100)");
-
-                            b1.Property<string>("NationalIdentifier")
-                                .HasMaxLength(20)
-                                .HasColumnType("nvarchar(20)");
-
-                            b1.HasKey("Id");
-
-                            b1.HasIndex("AuthorizedBankDetailsId");
-
-                            b1.ToTable("AuthorizedBankDetailsOwners", (string)null);
-
-                            b1.WithOwner()
-                                .HasForeignKey("AuthorizedBankDetailsId");
-                        });
-
-                    b.Navigation("OwnersList");
-                });
-
             modelBuilder.Entity("Company.Domain.Board.Board", b =>
                 {
                     b.HasOne("Company.Domain.BoardType.BoardType", "BoardType")
@@ -7257,17 +7115,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("Workshop");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.HasOne("Company.Domain.CheckoutAgg.Checkout", "Checkout")
-                        .WithMany("CheckoutWarningMessageList")
-                        .HasForeignKey("CheckoutId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Checkout");
-                });
-
             modelBuilder.Entity("Company.Domain.ClientEmployeeWorkshopAgg.ClientEmployeeWorkshop", b =>
                 {
                     b.HasOne("Company.Domain.EmployeeAgg.Employee", "Employee")
@@ -10787,11 +10634,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("PetitionsList");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.Checkout", b =>
-                {
-                    b.Navigation("CheckoutWarningMessageList");
-                });
-
             modelBuilder.Entity("Company.Domain.ContarctingPartyAgg.PersonalContractingParty", b =>
                 {
                     b.Navigation("ContractingPartyBankAccounts");

CompanyManagment.EFCore/Repository/AuthorizedBankDetailsRepository.cs

@@ -1,107 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using _0_Framework.Application;
-using _0_Framework_b.InfraStructure;
-using Company.Application.Contracts.AuthorizedBankDetails;
-using Company.Domain.AuthorizedBankDetailsAgg;
-using Microsoft.EntityFrameworkCore;
-
-namespace CompanyManagment.EFCore.Repository
-{
-    public class AuthorizedBankDetailsRepository : RepositoryBase<long, AuthorizedBankDetails>, IAuthorizedBankDetailsRepository
-    {
-        private readonly CompanyContext _context;
-
-        public AuthorizedBankDetailsRepository(CompanyContext context) : base(context)
-        {
-            _context = context;
-        }
-
-        public EditAuthorizedBankDetails GetDetails(long id)
-        {
-            var authorizedBankDetails = _context.AuthorizedBankDetails
-                .Include(x => x.OwnersList)
-                .FirstOrDefault(x => x.id == id);
-
-            if (authorizedBankDetails == null)
-                return new EditAuthorizedBankDetails();
-
-            var result = new EditAuthorizedBankDetails
-            {
-                Id = authorizedBankDetails.id,
-                CardNumber = authorizedBankDetails.CardNumber,
-                AccountNumber = authorizedBankDetails.AccountNumber,
-                IBan = authorizedBankDetails.IBan,
-                BankName = authorizedBankDetails.BankName,
-                OwnersList = authorizedBankDetails.OwnersList.Select(o => new AuthorizedBankDetailsOwnerViewModel
-                {
-                    FName = o.FName,
-                    LName = o.LName,
-                    NationalIdentifier = o.NationalIdentifier,
-                    CustomerType = o.CustomerType
-                }).ToList()
-            };
-
-            return result;
-        }
-
-        public List<AuthorizedBankDetailsViewModel> Search(AuthorizedBankDetailsSearchModel searchModel)
-        {
-            var query = _context.AuthorizedBankDetails
-                .Include(x => x.OwnersList)
-                .Select(x => new AuthorizedBankDetailsViewModel
-                {
-                    Id = x.id,
-                    CardNumber = x.CardNumber,
-                    AccountNumber = x.AccountNumber,
-                    IBan = x.IBan,
-                });
-
-            if (!string.IsNullOrWhiteSpace(searchModel.CardNumber))
-                query = query.Where(x => x.CardNumber.Contains(searchModel.CardNumber));
-
-            if (!string.IsNullOrWhiteSpace(searchModel.AccountNumber))
-                query = query.Where(x => x.AccountNumber.Contains(searchModel.AccountNumber));
-
-            if (!string.IsNullOrWhiteSpace(searchModel.IBan))
-                query = query.Where(x => x.IBan.Contains(searchModel.IBan));
-
-            // if (!string.IsNullOrWhiteSpace(searchModel.BankName))
-            //     query = query.Where(x => x.BankName.Contains(searchModel.BankName));
-
-            if (!string.IsNullOrWhiteSpace(searchModel.NationalIdentifier))
-                query = query.Where(x => 
-                    _context.AuthorizedBankDetails
-                        .Include(a => a.OwnersList)
-                        .Any(a => a.id == x.Id && 
-                                 a.OwnersList.Any(o => o.NationalIdentifier.Contains(searchModel.NationalIdentifier))));
-
-            return query.OrderByDescending(x => x.Id).ToList();
-        }
-
-        public AuthorizedBankDetailsViewModel GetByIban(string iban)
-        {
-            return _context.AuthorizedBankDetails
-                .Include(x => x.OwnersList)
-                .Where(x => x.IBan == iban)
-                .Select(x => new AuthorizedBankDetailsViewModel
-                {
-                    Id = x.id,
-                    CardNumber = x.CardNumber,
-                    AccountNumber = x.AccountNumber,
-                    IBan = x.IBan,
-                    BankName = x.BankName,
-                    NationalIdentifier = x.OwnersList.FirstOrDefault().NationalIdentifier,
-                    Owners = x.OwnersList.Select(o=> new AuthorizedBankDetailsOwnerViewModel()
-                    {
-                        FName = o.FName,
-                        LName = o.LName,
-                        NationalIdentifier = o.NationalIdentifier,
-                        CustomerType = o.CustomerType
-                    }).ToList()
-                })
-                .FirstOrDefault();
-        }
-    }
-}

CompanyManagment.EFCore/Repository/CheckoutRepository.cs

@@ -524,8 +524,6 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
         entity.SetLoanInstallment(command.LoanInstallments, command.InstallmentDeduction);
         entity.SetCheckoutRollCall(command.CheckoutRollCall);
         entity.SetEmployeeMandatoryHours(command.EmployeeMandatoryHours);
-        if(command.HasInsuranceShareTheSameAsList)
-            entity.SetInsuranceShare();
         await _context.SaveChangesAsync();
 
     }
@@ -1691,7 +1689,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
             return new List<CheckoutViewModel>();
         }
         #endregion
-        var query = _context.CheckoutSet.Include(w => w.CheckoutWarningMessageList)
+        var query = _context.CheckoutSet
             .AsSplitQuery().Select(x => new CheckoutViewModel()
             {
                 Id = x.id,
@@ -1726,14 +1724,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                     SalaryAidDateTimeFa = s.SalaryAidDateTimeFa,
                     SalaryAidDateTimeGe = s.SalaryAidDateTime
                 }).ToList(),
-                HasAmountConflict = x.HasAmountConflict,
-                IsUpdateNeeded = x.IsUpdateNeeded,
-                CheckoutWarningMessageList = x.CheckoutWarningMessageList.Select(wm => new CheckoutWarningMessageModel
-                {
-                    WarningMessage = wm.WarningMessage,
-                    TypeOfCheckoutWarning = wm.TypeOfCheckoutWarning,
-
-                }).ToList()
+                HasAmountConflict = x.HasAmountConflict
 
             }).Where(x => x.WorkshopId == searchModel.WorkshopId);
         if (searchModel.EmployeeId > 0)
@@ -2001,7 +1992,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
         //        );
 
         var checkouts =
-            _context.CheckoutSet.Include(w=>w.CheckoutWarningMessageList).Where(x => workshopAcounts.Contains(x.WorkshopId))
+            _context.CheckoutSet.Where(x => workshopAcounts.Contains(x.WorkshopId))
                 .Join(_context.Workshops.AsSplitQuery(),
                     ch => ch.WorkshopId,
                     workshop => workshop.id,
@@ -2270,14 +2261,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                     CreationDate = x.ch.CreationDate,
                     EmployerName = $"{x.workshopEmployer.Employer.FName} {x.workshopEmployer.Employer.LName}",
                     IsBlockCantracingParty = x.contractingParty.IsBlock,
-                    HasSignCheckout = x.option != null ? x.option.SignCheckout : x.workshop.SignCheckout,
-                    IsUpdateNeeded = x.ch.IsUpdateNeeded,
-                    CheckoutWarningMessageList = x.ch.CheckoutWarningMessageList.Select(wm=> new CheckoutWarningMessageModel
-                    {
-                        WarningMessage = wm.WarningMessage,
-                        TypeOfCheckoutWarning = wm.TypeOfCheckoutWarning,
-
-                    }).ToList()
+                    HasSignCheckout = x.option != null ? x.option.SignCheckout : x.workshop.SignCheckout
 
 
                 }).OrderByDescending(x=>x.Id).Take(3000).ToList().DistinctBy(x => x.Id)
@@ -2315,14 +2299,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                 CreationDate = x.ch.CreationDate,
                 EmployerName = $"{x.workshopEmployer.Employer.FName} {x.workshopEmployer.Employer.LName}",
                 IsBlockCantracingParty = x.contractingParty.IsBlock,
-                HasSignCheckout = x.option != null ? x.option.SignCheckout : x.workshop.SignCheckout,
-                IsUpdateNeeded = x.ch.IsUpdateNeeded,
-                CheckoutWarningMessageList = x.ch.CheckoutWarningMessageList.Select(wm => new CheckoutWarningMessageModel
-                {
-                    WarningMessage = wm.WarningMessage,
-                    TypeOfCheckoutWarning = wm.TypeOfCheckoutWarning,
-
-                }).ToList()
+                HasSignCheckout = x.option != null ? x.option.SignCheckout : x.workshop.SignCheckout
 
             }).OrderByDescending(x => x.Id)
            .GroupBy(x => x.Id)
@@ -2388,14 +2365,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                 CreationDate = x.ch.CreationDate,
                 EmployerName = $"{x.workshopEmployer.Employer.FName} {x.workshopEmployer.Employer.LName}",
                 IsBlockCantracingParty = x.contractingParty.IsBlock,
-                HasSignCheckout = x.option != null ? x.option.SignCheckout : x.workshop.SignCheckout,
-                IsUpdateNeeded = x.ch.IsUpdateNeeded,
-                CheckoutWarningMessageList = x.ch.CheckoutWarningMessageList.Select(wm => new CheckoutWarningMessageModel
-                {
-                    WarningMessage = wm.WarningMessage,
-                    TypeOfCheckoutWarning = wm.TypeOfCheckoutWarning,
-
-                }).ToList()
+                HasSignCheckout = x.option != null ? x.option.SignCheckout : x.workshop.SignCheckout
 
             }).GroupBy(x => x.Id).Select(x => x.First()).ToList()
                 .OrderByDescending(x => x.ContractStartGr).ToList();
@@ -2428,14 +2398,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                 CreationDate = x.ch.CreationDate,
                 EmployerName = $"{x.workshopEmployer.Employer.FName} {x.workshopEmployer.Employer.LName}",
                 IsBlockCantracingParty = x.contractingParty.IsBlock,
-                HasSignCheckout =  x.option != null ? x.option.SignCheckout : x.workshop.SignCheckout,
-                IsUpdateNeeded = x.ch.IsUpdateNeeded,
-                CheckoutWarningMessageList = x.ch.CheckoutWarningMessageList.Select(wm => new CheckoutWarningMessageModel
-                {
-                    WarningMessage = wm.WarningMessage,
-                    TypeOfCheckoutWarning = wm.TypeOfCheckoutWarning,
-
-                }).ToList()
+                HasSignCheckout =  x.option != null ? x.option.SignCheckout : x.workshop.SignCheckout
 
             }).GroupBy(x => x.Id)
                 .Select(x => x.First()).ToList()

CompanyManagment.EFCore/Repository/CustomizeWorkshopGroupSettingsRepository.cs

@@ -19,41 +19,39 @@ using Microsoft.EntityFrameworkCore;
 
 namespace CompanyManagment.EFCore.Repository;
 
-public class CustomizeWorkshopGroupSettingsRepository(
-    CompanyContext companyContext,
-    IRollCallEmployeeRepository _rollCallEmployeeRepository)
+public class CustomizeWorkshopGroupSettingsRepository(CompanyContext companyContext, IRollCallEmployeeRepository _rollCallEmployeeRepository)
     : RepositoryBase<long, CustomizeWorkshopGroupSettings>(companyContext),
         ICustomizeWorkshopGroupSettingsRepository
 {
     private readonly CompanyContext _companyContext = companyContext;
     private readonly IRollCallEmployeeRepository _rollCallEmployeeRepository = _rollCallEmployeeRepository;
-
     public CustomizeWorkshopGroupSettings GetIncludeWorkshopSettings(long id)
     {
+
         return _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery().Include(x => x.CustomizeWorkshopSettings)
-            .FirstOrDefault(x => x.id == id);
+             .FirstOrDefault(x => x.id == id);
     }
 
     public CustomizeWorkshopGroupSettings GetWorkshopMainGroup(long workshopId)
     {
-        return _companyContext.CustomizeWorkshopGroupSettings
-            .Include(x => x.CustomizeWorkshopSettings)
-            .Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-            .AsSplitQuery().FirstOrDefault(x => x.MainGroup && x.CustomizeWorkshopSettings.WorkshopId == workshopId);
+	   return _companyContext.CustomizeWorkshopGroupSettings
+		   .Include(x=>x.CustomizeWorkshopSettings)
+		   .Include(x=> x.CustomizeWorkshopEmployeeSettingsCollection)
+		   .AsSplitQuery().FirstOrDefault(x => x.MainGroup && x.CustomizeWorkshopSettings.WorkshopId == workshopId);
     }
 
     public List<EmployeeViewModel> GetEmployeesWithoutGroup(long customizeWorkshopSettingId)
     {
-        var workshopSettings = _companyContext.CustomizeWorkshopSettings.Find(customizeWorkshopSettingId);
+	    var workshopSettings = _companyContext.CustomizeWorkshopSettings.Find(customizeWorkshopSettingId); 
 
         if (workshopSettings == null)
             return new();
 
         var existsEmployees = _companyContext.CustomizeWorkshopEmployeeSettings
-            .AsSplitQuery().Include(x => x.CustomizeWorkshopGroupSettings)
-            .Where(x => x.WorkshopId == workshopSettings.WorkshopId && !x.CustomizeWorkshopGroupSettings.MainGroup)
-            .Select(x => x.EmployeeId).ToList();
-
+	        .AsSplitQuery().Include(x=>x.CustomizeWorkshopGroupSettings)
+	        .Where(x => x.WorkshopId == workshopSettings.WorkshopId && !x.CustomizeWorkshopGroupSettings.MainGroup)
+	        .Select(x=>x.EmployeeId).ToList();
+        
         var workshopId = workshopSettings.WorkshopId;
         var rollCallEmployees = _rollCallEmployeeRepository.GetActivePersonnelByWorkshopId(workshopId);
 
@@ -83,81 +81,79 @@ public class CustomizeWorkshopGroupSettingsRepository(
 
         var dateNow = DateTime.Now.Date;
 
-        //var existsEmployees = _companyContext.CustomizeWorkshopEmployeeSettings
-        //    .AsSplitQuery().Include(x => x.CustomizeWorkshopGroupSettings)
-        //    .Where(x => x.WorkshopId == workshopId && !x.CustomizeWorkshopGroupSettings.MainGroup)
-        //    .Select(x => x.EmployeeId).ToList();
+		//var existsEmployees = _companyContext.CustomizeWorkshopEmployeeSettings
+		//    .AsSplitQuery().Include(x => x.CustomizeWorkshopGroupSettings)
+		//    .Where(x => x.WorkshopId == workshopId && !x.CustomizeWorkshopGroupSettings.MainGroup)
+		//    .Select(x => x.EmployeeId).ToList();
 
-        //var rollCallEmployees = _rollCallEmployeeRepository.GetActivePersonnelByWorkshopId(workshopId);
+		//var rollCallEmployees = _rollCallEmployeeRepository.GetActivePersonnelByWorkshopId(workshopId);
 
-        //var employees = rollCallEmployees
-        //    .Where(x => !existsEmployees.Contains(x.EmployeeId))
-        //    .Select(x => new EmployeeViewModel()
-        //    {
-        //        EmployeeFullName = x.EmployeeFullName,
-        //        Id = x.EmployeeId
-        //    }).ToList();
+		//var employees = rollCallEmployees
+		//    .Where(x => !existsEmployees.Contains(x.EmployeeId))
+		//    .Select(x => new EmployeeViewModel()
+		//    {
+		//        EmployeeFullName = x.EmployeeFullName,
+		//        Id = x.EmployeeId
+		//    }).ToList();
 
-        var employees = _companyContext.RollCallEmployees
-            .Include(x =>
-                x.EmployeesStatus)
-            .Where(x =>
-                x.WorkshopId == workshopId &&
-                x.EmployeesStatus.Any(y => y.StartDate.Date <= dateNow && y.EndDate.Date > dateNow) &&
-                x.HasUploadedImage == "true")
-            .GroupJoin(_companyContext.CustomizeWorkshopEmployeeSettings
-                    .AsSplitQuery()
-                    .Include(x => x.CustomizeWorkshopGroupSettings)
-                    .Where(x => !x.CustomizeWorkshopGroupSettings.MainGroup && x.WorkshopId == workshopId),
-                rollCallEmployee => rollCallEmployee.EmployeeId,
-                cws => cws.EmployeeId,
-                (rollCallEmployee, cws) => new { rollCallEmployee, cws })
-            .SelectMany(x => x.cws.DefaultIfEmpty(), (x, cws) => new { x.rollCallEmployee, cws })
-            .Where(x => x.cws == null).Select(x => new EmployeeViewModel()
-            {
+		var employees = _companyContext.RollCallEmployees
+	        .Include(x =>
+		        x.EmployeesStatus)
+	        .Where(
+		        x =>
+			        x.WorkshopId == workshopId &&
+			        x.EmployeesStatus.Any(y => y.StartDate.Date <= dateNow && y.EndDate.Date > dateNow) &&
+			        x.HasUploadedImage == "true")
+	        .GroupJoin(_companyContext.CustomizeWorkshopEmployeeSettings
+			        .AsSplitQuery()
+			        .Include(x => x.CustomizeWorkshopGroupSettings)
+			        .Where(x => !x.CustomizeWorkshopGroupSettings.MainGroup && x.WorkshopId == workshopId), rollCallEmployee => rollCallEmployee.EmployeeId,
+		        cws => cws.EmployeeId,
+		        (rollCallEmployee, cws) => new { rollCallEmployee, cws })
+	        .SelectMany(x => x.cws.DefaultIfEmpty(), (x, cws) => new { x.rollCallEmployee, cws })
+	        .Where(x => x.cws == null).Select(x=> new EmployeeViewModel()
+	        {
                 EmployeeFullName = x.rollCallEmployee.EmployeeFullName,
                 Id = x.rollCallEmployee.EmployeeId
-            });
+	        });
 
-        return employees.ToList();
+		return employees.ToList();
     }
 
     public bool HasAnyEmployeeWithoutGroup(long workshopId)
     {
-        var dateNow = DateTime.Now.Date;
+	    var dateNow = DateTime.Now.Date;
         var leftWork = _companyContext.LeftWorkList.Where(x =>
             x.WorkshopId == workshopId && x.StartWorkDate <= dateNow && x.LeftWorkDate >= dateNow);
 
         var rollCallEmployeesWithoutCWS = _companyContext.RollCallEmployees
-            .Include(x =>
-                x.EmployeesStatus)
-            .Where(x =>
-                x.WorkshopId == workshopId &&
-                x.EmployeesStatus.Any(y => y.StartDate.Date <= dateNow && y.EndDate.Date > dateNow) &&
-                x.HasUploadedImage == "true" &&
-                leftWork.Any(l => l.EmployeeId == x.EmployeeId && l.WorkshopId == x.WorkshopId))
-            .GroupJoin(_companyContext.CustomizeWorkshopEmployeeSettings
-                    .AsSplitQuery()
-                    .Include(x => x.CustomizeWorkshopGroupSettings)
-                    .Where(x => !x.CustomizeWorkshopGroupSettings.MainGroup && x.WorkshopId == workshopId),
-                rollCallEmployee => rollCallEmployee.EmployeeId,
-                cws => cws.EmployeeId,
-                (rollCallEmployee, cws) => new { rollCallEmployee, cws })
-            .SelectMany(x => x.cws.DefaultIfEmpty(), (x, cws) => new { x.rollCallEmployee, cws })
-            .Any(x => x.cws == null);
+			.Include(x =>
+				x.EmployeesStatus)
+			.Where(
+				x =>
+					x.WorkshopId == workshopId &&
+					x.EmployeesStatus.Any(y => y.StartDate.Date <= dateNow && y.EndDate.Date > dateNow) &&
+					x.HasUploadedImage == "true"&&
+                    leftWork.Any(l => l.EmployeeId == x.EmployeeId && l.WorkshopId == x.WorkshopId))
+			.GroupJoin(_companyContext.CustomizeWorkshopEmployeeSettings
+					.AsSplitQuery()
+					.Include(x => x.CustomizeWorkshopGroupSettings)
+					.Where(x => !x.CustomizeWorkshopGroupSettings.MainGroup && x.WorkshopId == workshopId), rollCallEmployee => rollCallEmployee.EmployeeId,
+				cws => cws.EmployeeId,
+				(rollCallEmployee, cws) => new { rollCallEmployee, cws })
+			.SelectMany(x => x.cws.DefaultIfEmpty(), (x, cws) => new { x.rollCallEmployee, cws })
+			.Any(x => x.cws == null);
+
+		return rollCallEmployeesWithoutCWS;
 
-        return rollCallEmployeesWithoutCWS;
     }
-
     public CustomizeWorkshopGroupSettings GetWithEmployees(long groupId)
     {
-        return _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery()
-            .Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)
+        return _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery().Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)
             .FirstOrDefault(x => x.id == groupId);
     }
 
-    public List<CustomizeWorkshopEmployeeSettingsViewModel> GetShiftChangedEmployeeSettingsByGroupSettingsId(
-        long groupSettingsId)
+    public List<CustomizeWorkshopEmployeeSettingsViewModel> GetShiftChangedEmployeeSettingsByGroupSettingsId(long groupSettingsId)
     {
         var groupEmployeeSettingsList = _companyContext.CustomizeWorkshopGroupSettings
             .AsSplitQuery().Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)
@@ -173,26 +169,23 @@ public class CustomizeWorkshopGroupSettingsRepository(
             x.id
         }).ToList();
 
-        return groupEmployeeSettingsList.Join(employees, x => x.EmployeeId, y => y.id, (x, y) =>
-            new CustomizeWorkshopEmployeeSettingsViewModel()
+        return groupEmployeeSettingsList.Join(employees, x => x.EmployeeId, y => y.id, (x, y) => new CustomizeWorkshopEmployeeSettingsViewModel()
+        {
+            EmployeeId = x.EmployeeId,
+            Id = x.id,
+            IsShiftChanged = x.IsShiftChanged,
+            IsSettingChanged = x.IsSettingChanged,
+            Name = y.FullName,
+            RollCallWorkshopShifts = x.CustomizeWorkshopEmployeeSettingsShifts.Select(z => new CustomizeWorkshopShiftViewModel()
             {
-                EmployeeId = x.EmployeeId,
-                Id = x.id,
-                IsShiftChanged = x.IsShiftChanged,
-                IsSettingChanged = x.IsSettingChanged,
-                Name = y.FullName,
-                RollCallWorkshopShifts = x.CustomizeWorkshopEmployeeSettingsShifts.Select(z =>
-                    new CustomizeWorkshopShiftViewModel()
-                    {
-                        EndTime = z.EndTime.ToString("HH:mm"),
-                        Placement = z.Placement,
-                        StartTime = z.StartTime.ToString("HH:mm")
-                    }).ToList()
-            }).ToList();
+                EndTime = z.EndTime.ToString("HH:mm"),
+                Placement = z.Placement,
+                StartTime = z.StartTime.ToString("HH:mm")
+            }).ToList()
+        }).ToList();
     }
 
-    public List<CustomizeWorkshopEmployeeSettingsViewModel> GetSettingChangedEmployeeSettingsByGroupSettingsId(
-        long groupSettingsId)
+    public List<CustomizeWorkshopEmployeeSettingsViewModel> GetSettingChangedEmployeeSettingsByGroupSettingsId(long groupSettingsId)
     {
         var groupEmployeeSettingsList = _companyContext.CustomizeWorkshopGroupSettings
             .AsSplitQuery().Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)
@@ -208,52 +201,38 @@ public class CustomizeWorkshopGroupSettingsRepository(
             x.id
         }).ToList();
 
-        return groupEmployeeSettingsList.Join(employees, x => x.EmployeeId, y => y.id, (x, y) =>
-            new CustomizeWorkshopEmployeeSettingsViewModel()
+        return groupEmployeeSettingsList.Join(employees, x => x.EmployeeId, y => y.id, (x, y) => new CustomizeWorkshopEmployeeSettingsViewModel()
+        {
+            EmployeeId = x.EmployeeId,
+            Id = x.id,
+            IsSettingChanged = x.IsSettingChanged,
+            IsShiftChanged = x.IsShiftChanged,
+            Name = y.FullName,
+            RollCallWorkshopShifts = x.CustomizeWorkshopEmployeeSettingsShifts.Select(z => new CustomizeWorkshopShiftViewModel()
             {
-                EmployeeId = x.EmployeeId,
-                Id = x.id,
-                IsSettingChanged = x.IsSettingChanged,
-                IsShiftChanged = x.IsShiftChanged,
-                Name = y.FullName,
-                RollCallWorkshopShifts = x.CustomizeWorkshopEmployeeSettingsShifts.Select(z =>
-                    new CustomizeWorkshopShiftViewModel()
-                    {
-                        EndTime = z.EndTime.ToString("HH:mm"),
-                        Placement = z.Placement,
-                        StartTime = z.StartTime.ToString("HH:mm")
-                    }).ToList()
-            }).ToList();
+                EndTime = z.EndTime.ToString("HH:mm"),
+                Placement = z.Placement,
+                StartTime = z.StartTime.ToString("HH:mm")
+            }).ToList()
+        }).ToList();
     }
 
     public List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingsByGroupSettingsId(long groupSettingsId)
     {
-        var entity = _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery()
-            .Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-            .FirstOrDefault(x => x.id == groupSettingsId);
+
+        var entity = _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery().Include(x=>x.CustomizeWorkshopEmployeeSettingsCollection)
+		        .FirstOrDefault(x => x.id == groupSettingsId);
 
         if (entity == null)
             return new();
 
         var employees = entity.CustomizeWorkshopEmployeeSettingsCollection;
-        if (employees.Count == 0)
-            return [];
-
-        var workshopId = employees.FirstOrDefault()?.WorkshopId??0;
-
-        if (workshopId == 0)
-            return [];
-        
-
-        var employeeIds = employees.Select(x => x.EmployeeId).ToList();
 
 
-        var names = _companyContext.Employees.Where(x => employeeIds.Contains(x.id))
-            .Select(x => new { x.id, x.FullName }).ToList();
+        var employeeIds = employees.Select(x => x.EmployeeId);
 
-        var leftWork = _companyContext.LeftWorkList.Where(x =>
-            x.WorkshopId == workshopId &&
-            employeeIds.Contains(x.EmployeeId)).ToList();
+
+        var names = _companyContext.Employees.Where(x => employeeIds.Contains(x.id)).Select(x => new { x.id, x.FullName }).ToList();
 
         var joinedList = employees.Join(names, x => x.EmployeeId, y => y.id, (x, y) =>
             new CustomizeWorkshopEmployeeSettingsViewModel
@@ -264,86 +243,82 @@ public class CustomizeWorkshopGroupSettingsRepository(
                 Salary = x.Salary,
                 IsSettingChanged = x.IsSettingChanged,
                 IsShiftChanged = x.IsShiftChanged,
-                RollCallWorkshopShifts = x.CustomizeWorkshopEmployeeSettingsShifts
-                    .Select(z => new CustomizeWorkshopShiftViewModel()
-                    {
-                        EndTime = z.EndTime.ToString("HH:mm"),
-                        StartTime = z.StartTime.ToString("HH:mm"),
-                        Placement = z.Placement
-                    }).ToList(),
+                RollCallWorkshopShifts = x.CustomizeWorkshopEmployeeSettingsShifts.Select(z => new CustomizeWorkshopShiftViewModel()
+                {
+                    EndTime = z.EndTime.ToString("HH:mm"),
+                    StartTime = z.StartTime.ToString("HH:mm"),
+                    Placement = z.Placement
+                }).ToList(),
                 IrregularShift = x.IrregularShift,
                 WorkshopShiftStatus = x.WorkshopShiftStatus,
                 LeavePermittedDays = x.LeavePermittedDays,
                 CustomizeRotatingShiftsViewModels = x.CustomizeRotatingShifts
-                    .Select(r => new CustomizeRotatingShiftsViewModel
-                    {
-                        StartTime = r.StartTime.ToString("HH:mm"),
-                        EndTime = r.EndTime.ToString("HH:mm")
-                    }).ToList(),
-                HasLeft = leftWork.OrderByDescending(l=>l.StartWorkDate).FirstOrDefault(l => x.EmployeeId == l.EmployeeId)?.HasLeft ?? false
+	                .Select(r=> new CustomizeRotatingShiftsViewModel(){StartTime = r.StartTime.ToString("HH:mm") , EndTime =r.EndTime.ToString("HH:mm") }).ToList()
+                
             });
-        return joinedList.OrderBy(x=>x.HasLeft).ToList();
+        return joinedList.ToList();
     }
 
     public EditCustomizeWorkshopGroupSettings GetCustomizeWorkshopGroupSettingsDetails(long groupId)
     {
+
         var entity = _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery().FirstOrDefault(x => x.id == groupId);
         return new EditCustomizeWorkshopGroupSettings()
         {
             //FridayWork = entity.FridayWork,
-            FridayPay = new() { FridayPayType = entity.FridayPay.FridayPayType, Value = entity.FridayPay.Value },
+            FridayPay = new (){ FridayPayType = entity.FridayPay.FridayPayType, Value = entity.FridayPay.Value },
             LateToWork = new()
-            {
+			{
                 LateToWorkTimeFinesVewModels = entity.LateToWork.LateToWorkTimeFines.Select(x =>
                     new LateToWorkTimeFineVewModel() { FineMoney = x.FineMoney, Minute = x.Minute }).ToList(),
                 Value = entity.LateToWork.Value, LateToWorkType = entity.LateToWork.LateToWorkType
             },
             HolidayWork = entity.HolidayWork,
             FineAbsenceDeduction = new()
-            {
+			{
                 Value = entity.FineAbsenceDeduction.Value,
                 FineAbsenceDayOfWeekViewModels = entity.FineAbsenceDeduction.FineAbsenceDayOfWeekCollection
                     .Select(x => new FineAbsenceDayOfWeekViewModel() { DayOfWeek = x.DayOfWeek }).ToList(),
                 FineAbsenceDeductionType = entity.FineAbsenceDeduction.FineAbsenceDeductionType
             },
             EarlyExit = new()
-            {
+			{
                 EarlyExitTimeFinesViewModels = entity.EarlyExit.EarlyExitTimeFines.Select(x =>
                     new EarlyExitTimeFineViewModel() { FineMoney = x.FineMoney, Minute = x.Minute }).ToList(),
                 Value = entity.EarlyExit.Value, EarlyExitType = entity.EarlyExit.EarlyExitType
             },
             BonusesPay = new()
-            {
+			{
                 Value = entity.BonusesPay.Value, BonusesPayType = entity.BonusesPay.BonusesPayType,
                 PaymentType = entity.BonusesPay.PaymentType
             },
             ShiftPay = new()
-            {
+			{
                 Value = entity.ShiftPay.Value, ShiftPayType = entity.ShiftPay.ShiftPayType,
                 ShiftType = entity.ShiftPay.ShiftType
             },
             InsuranceDeduction = new()
-            {
+			{
                 Value = entity.InsuranceDeduction.Value,
                 InsuranceDeductionType = entity.InsuranceDeduction.InsuranceDeductionType
             },
             OverTimePay = new()
-                { OverTimePayType = entity.OverTimePay.OverTimePayType, Value = entity.OverTimePay.Value },
+			{ OverTimePayType = entity.OverTimePay.OverTimePayType, Value = entity.OverTimePay.Value },
             BaseYearsPay = new()
-            {
+			{
                 BaseYearsPayType = entity.BaseYearsPay.BaseYearsPayType,
                 Value = entity.BaseYearsPay.Value
             },
             NightWorkPay = new()
-                { NightWorkingType = entity.NightWorkPay.NightWorkingType, Value = entity.NightWorkPay.Value },
-            LeavePay = new() { Value = entity.LeavePay.Value, LeavePayType = entity.LeavePay.LeavePayType },
+			{ NightWorkingType = entity.NightWorkPay.NightWorkingType, Value = entity.NightWorkPay.Value },
+            LeavePay =new() { Value = entity.LeavePay.Value, LeavePayType = entity.LeavePay.LeavePayType },
             MarriedAllowance = new()
-            {
+			{
                 Value = entity.MarriedAllowance.Value,
                 MarriedAllowanceType = entity.MarriedAllowance.MarriedAllowanceType
             },
             FamilyAllowance = new()
-            {
+			{
                 FamilyAllowanceType = entity.FamilyAllowance.FamilyAllowanceType,
                 Value = entity.FamilyAllowance.Value
             },
@@ -357,27 +332,23 @@ public class CustomizeWorkshopGroupSettingsRepository(
             IsShiftChanged = entity.IsShiftChange,
             ShiftViewModel = entity.CustomizeWorkshopGroupSettingsShifts.Select(x =>
                 new CustomizeWorkshopShiftViewModel()
-                {
-                    EndTime = x.EndTime.ToString("HH:mm"), Placement = x.Placement,
-                    StartTime = x.StartTime.ToString("HH:mm")
-                }).ToList(),
+                { EndTime = x.EndTime.ToString("HH:mm"), Placement = x.Placement, StartTime = x.StartTime.ToString("HH:mm") }).ToList(),
             LeavePermittedDays = entity.LeavePermittedDays,
-            CustomizeRotatingShiftsViewModels = entity.CustomizeRotatingShifts.Select(x =>
-                new CustomizeRotatingShiftsViewModel()
-                {
-                    EndTime = x.EndTime.ToString("HH:mm"),
-                    StartTime = x.StartTime.ToString("HH:mm")
-                }).ToList(),
-            OffDayOfWeeks = entity.WeeklyOffDays.Select(x => x.DayOfWeek).ToList()
+            CustomizeRotatingShiftsViewModels = entity.CustomizeRotatingShifts.Select(x=> new CustomizeRotatingShiftsViewModel()
+            {
+                EndTime = x.EndTime.ToString("HH:mm"),
+                StartTime = x.StartTime.ToString("HH:mm")
+            }).ToList(),
+            OffDayOfWeeks = entity.WeeklyOffDays.Select(x=>x.DayOfWeek).ToList()
         };
+
     }
 
-    public List<CustomizeWorkshopGroupSettings> GetAllGroupsIncludeEmployeeSettingsByWorkshopSettingsId(
-        long workshopSettingsId)
+    public List<CustomizeWorkshopGroupSettings> GetAllGroupsIncludeEmployeeSettingsByWorkshopSettingsId(long workshopSettingsId)
     {
-        return _companyContext.CustomizeWorkshopGroupSettings
-            .AsSplitQuery().Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-            .Where(x => x.CustomizeWorkshopSettingId == workshopSettingsId).ToList();
+	    return _companyContext.CustomizeWorkshopGroupSettings
+		    .AsSplitQuery().Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)
+		    .Where(x => x.CustomizeWorkshopSettingId == workshopSettingsId).ToList();
     }
 
     public void Remove(long groupId)
@@ -389,8 +360,7 @@ public class CustomizeWorkshopGroupSettingsRepository(
         _companyContext.SaveChanges();
     }
 
-    public CustomizeWorkshopGroupSettingsViewModel GetEmployeesGroupSettingsByEmployeeId(long employeeId,
-        long workshopId)
+    public CustomizeWorkshopGroupSettingsViewModel GetEmployeesGroupSettingsByEmployeeId(long employeeId, long workshopId)
     {
         return _companyContext.CustomizeWorkshopGroupSettings
             .Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)

CompanyManagment.EFCore/Repository/EmployerRepository.cs

@@ -592,7 +592,7 @@ public class EmployerRepository : RepositoryBase<long, Employer>, IEmployerRepos
             var legalTypeValue = legalType == LegalType.Real ? "حقیقی" : "حقوقی";
             query = query.Where(x => x.IsLegal == legalTypeValue);
         }
-
+        
         var viewModelQuery = query.Select(x => new EmployerSelectListViewModel()
         {
             Id = x.id,
@@ -1078,12 +1078,7 @@ public class EmployerRepository : RepositoryBase<long, Employer>, IEmployerRepos
                 PlaceOfIssue = employer.PlaceOfIssue,
                 DateOfIssue = employer.DateOfIssue.ToFarsi(),
                 FatherName = employer.FatherName,
-                Gender = employer.Gender switch
-                {
-                    null => Gender.None,
-                    "مرد" => Gender.Male,
-                    _ => Gender.Female
-                },
+                Gender = employer.Gender == "مرد" ? Gender.Male : Gender.Female,
                 GovernmentSystemInfo = governmentSystemInfo,
                 IsAuth = employer.IsAuth,
                 PhoneNumber = employer.Phone,
@@ -1115,6 +1110,7 @@ public class EmployerRepository : RepositoryBase<long, Employer>, IEmployerRepos
                 CeoIdNumber = employer.IdNumber,
                 IdNumberSeri = employer.IdNumberSeri,
                 TelephoneNumber = employer.IdNumber
+
             };
         }
 
@@ -1127,6 +1123,7 @@ public class EmployerRepository : RepositoryBase<long, Employer>, IEmployerRepos
             InstitutionWorkshopInitialId = contractWorkshopInitial.id,
             RealEmployer = realEmployer,
             LegalEmployer = legalEmployer,
+
         };
         return res;
     }

CompanyManagment.EFCore/Repository/FinancialStatmentRepository.cs

@@ -10,7 +10,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using AccountManagement.Application.Contracts.SubAccount;
-using ZstdSharp.Unsafe;
 using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
 namespace CompanyManagment.EFCore.Repository;
@@ -267,26 +266,16 @@ public class FinancialStatmentRepository : RepositoryBase<long, FinancialStatmen
 
     public async Task<FinancialStatmentDetailsByContractingPartyViewModel> GetDetailsByContractingParty(long contractingPartyId,FinancialStatementSearchModel searchModel)
     {
-        var contractingParty = await _context.PersonalContractingParties
-            .FirstOrDefaultAsync(x=>x.id == contractingPartyId);
 
-        if (contractingParty == null)
-            throw new NotFoundException("طرف حساب یافت نشد");
-        
+
         var financialStatement = await _context.FinancialStatments
             .Include(x=>x.FinancialTransactionList)
             .FirstOrDefaultAsync(x=>x.ContractingPartyId == contractingPartyId);
-        
+
         if (financialStatement == null)
         {
-            financialStatement = new FinancialStatment(contractingPartyId,contractingParty.FName+" "+contractingParty.LName);
-        
-            await _context.AddAsync(financialStatement);
-            await _context.SaveChangesAsync();
+            throw new NotFoundException("وضعیت مالی مورد نظر یافت نشد");
         }
-
-        
-        
         bool searched = false;
         #region Search
         
@@ -334,71 +323,6 @@ public class FinancialStatmentRepository : RepositoryBase<long, FinancialStatmen
         }
         #endregion
         double balance = 0;
-        // var list = financialStatement.FinancialTransactionList.Select(t =>
-        // {
-        //     if (!searched)
-        //     {
-        //         if (t.TypeOfTransaction == "debt")
-        //         {
-        //             balance += t.Deptor;
-        //         }
-        //         else
-        //         {
-        //             balance -= t.Creditor;
-        //         }
-        //     }
-        //     return new FinancialTransactionDetailViewModel()
-        //     {
-        //         Id = t.id,
-        //         DateTimeGr = t.TdateGr,
-        //         DateFa = t.TdateGr.ToFarsi(),
-        //         TimeFa = $"{t.TdateGr:HH:mm}",
-        //         Description = t.DescriptionOption + " " + t.Description,
-        //         Debtor = t.Deptor,
-        //         Creditor = t.Creditor,
-        //         Balance = balance,
-        //         Type = t.TypeOfTransaction == "debt"
-        //             ? FinancialTransactionType.Debt
-        //             : FinancialTransactionType.Credit,
-        //         TypeStr = t.TypeOfTransaction == "debt" ? "ایجاد درآمد" : "دریافت درآمد"
-        //     };
-        // }).OrderByDescending(t => t.DateTimeGr).ToList();
-
-
-        var list = new List<FinancialTransactionDetailViewModel>();
-        foreach (var financialTransaction in financialStatement.FinancialTransactionList.OrderBy(t=>t.TdateGr))
-        {
-            if (!searched)
-            {
-                if (financialTransaction.TypeOfTransaction == "debt")
-                {
-                    balance += financialTransaction.Deptor;
-                }
-                else
-                {
-                    balance -= financialTransaction.Creditor;
-                }
-            }
-            var item = new FinancialTransactionDetailViewModel()
-            {
-                Id = financialTransaction.id,
-                DateTimeGr = financialTransaction.TdateGr,
-                DateFa = financialTransaction.TdateGr.ToFarsi(),
-                TimeFa = $"{financialTransaction.TdateGr:HH:mm}",
-                Description = financialTransaction.DescriptionOption + " " + financialTransaction.Description,
-                Debtor = financialTransaction.Deptor,
-                Creditor = financialTransaction.Creditor,
-                Balance = balance,
-                Type = financialTransaction.TypeOfTransaction == "debt"
-                    ? FinancialTransactionType.Debt
-                    : FinancialTransactionType.Credit,
-                TypeStr = financialTransaction.TypeOfTransaction == "debt" ? "ایجاد درآمد" : "دریافت درآمد"
-            };
-            list.Add(item);
-        }
-
-        list.Reverse();
-        
         var res =  new FinancialStatmentDetailsByContractingPartyViewModel()
         {
             Id = financialStatement.id,
@@ -406,7 +330,35 @@ public class FinancialStatmentRepository : RepositoryBase<long, FinancialStatmen
             TotalCredit = financialStatement.FinancialTransactionList.Sum(x => x.Creditor),
             TotalDebt = financialStatement.FinancialTransactionList.Sum(x => x.Deptor),
             ContractingPartyName = financialStatement.ContractingPartyName,
-            List = list,
+            List = financialStatement.FinancialTransactionList.Select(t =>
+            {
+                if (!searched)
+                {
+                    if (t.TypeOfTransaction == "debt")
+                    {
+                        balance += t.Deptor;
+                    }
+                    else
+                    {
+                        balance -= t.Creditor;
+                    }
+                }
+                return new FinancialTransactionDetailViewModel()
+                {
+                    Id = t.id,
+                    DateTimeGr = t.TdateGr,
+                    DateFa = t.TdateGr.ToFarsi(),
+                    TimeFa = $"{t.TdateGr:HH:mm}",
+                    Description = t.DescriptionOption + " " + t.Description,
+                    Debtor = t.Deptor,
+                    Creditor = t.Creditor,
+                    Balance = balance,
+                    Type = t.TypeOfTransaction == "debt"
+                        ? FinancialTransactionType.Debt
+                        : FinancialTransactionType.Credit,
+                    TypeStr = t.TypeOfTransaction == "debt" ? "ایجاد درآمد" : "دریافت درآمد"
+                };
+            }).OrderByDescending(t => t.DateTimeGr).ToList(),
         };
         return res;
     }

CompanyManagment.EFCore/Repository/FineRepository.cs

@@ -124,7 +124,7 @@ public class FineRepository : RepositoryBase<long, Fine>, IFineRepository
                 }
                 query = query.Where(x => x.EmployeeId == searchModel.EmployeeId);
 
-                var list = query.OrderByDescending(x=>x.FineDate).ToList().Select(x => new FineViewModel()
+                var list = query.ToList().Select(x => new FineViewModel()
                 {
                     Amount = x.Amount.ToMoney(),
                     AmountDouble = x.Amount,

CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Drawing;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using _0_Framework.Application;
@@ -17,19 +16,16 @@ using Company.Domain.empolyerAgg;
 using Company.Domain.FinancialStatmentAgg;
 using Company.Domain.FinancialTransactionAgg;
 using Company.Domain.InstitutionContractAgg;
-using Company.Domain.InstitutionContractAmendmentTempAgg;
 using Company.Domain.InstitutionContractContactInfoAgg;
-using Company.Domain.InstitutionContractExtensionTempAgg;
+using Company.Domain.InstitutionContractInsertTempAgg;
 using Company.Domain.InstitutionPlanAgg;
 using Company.Domain.WorkshopAgg;
 using CompanyManagment.App.Contracts.Employer;
 using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
-using CompanyManagment.App.Contracts.Law;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.App.Contracts.WorkshopPlan;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
@@ -46,20 +42,9 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     private readonly IEmployerRepository _employerRepository;
     private readonly IWorkshopRepository _workshopRepository;
     private readonly IMongoCollection<InstitutionContractExtensionTemp> _institutionExtensionTemp;
-    private readonly IMongoCollection<InstitutionContractAmendmentTemp> _institutionAmendmentTemp;
     private readonly IPlanPercentageRepository _planPercentageRepository;
     private readonly ISmsService _smsService;
 
-    private readonly InstitutionContratVerificationParty _firstParty = new()
-    {
-        Address = "رشت - خیابان حاجی آیاد - کوچه سپهدار - ساختمان داماش - واحد 17",
-        PhoneNumber = "09111485044",
-        CeoName = "سید حسن مصباح",
-        CompanyNameOrFullName = "نور داد مهر گستر کاسپین",
-        NationalCodeOrNationalId = "14009970584",
-        LegalType = LegalType.Legal
-    };
-
     public InstitutionContractRepository(CompanyContext context, IEmployerRepository employerRepository,
         IWorkshopRepository workshopRepository, IMongoDatabase database,
         IPlanPercentageRepository planPercentageRepository, ISmsService smsService) : base(context)
@@ -71,8 +56,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         _smsService = smsService;
         _institutionExtensionTemp =
             database.GetCollection<InstitutionContractExtensionTemp>("InstitutionContractExtensionTemp");
-        _institutionAmendmentTemp =
-            database.GetCollection<InstitutionContractAmendmentTemp>("InstitutionContractAmendmentTemp");
     }
 
     public EditInstitutionContract GetDetails(long id)
@@ -1257,6 +1240,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             TotalCount = await joinedQuery.CountAsync(),
             List = list.Select(x =>
             {
+                Console.WriteLine(x.contractingParty.id);
                 var workshops = x.contractingParty.Employers
                     .SelectMany(e => e.WorkshopEmployers.Select(we => we.Workshop)).DistinctBy(w => w.id).ToList();
 
@@ -1283,6 +1267,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 var workshopDetails = currentStateWorkshops?.Select(w =>
                 {
                     Workshop workshopSelected = null;
+                    Console.WriteLine(w.WorkshopId);
                     if (w.WorkshopId != null && workshops.Select(ww => ww.id).Contains(w.WorkshopId.Value))
                     {
                         workshopSelected = workshops.First(ww => ww.id == w.WorkshopId.Value);
@@ -1304,10 +1289,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                         }
                     };
                 }).ToList() ?? [];
-
-                var employeesCount = _context.LeftWorkList
-                    .Where(l => workshops.Select(w => w.id).Contains(l.WorkshopId))
-                    .Count(l => l.StartWorkDate <= DateTime.Now && l.LeftWorkDate >= DateTime.Now);
                 return new GetInstitutionContractListItemsViewModel()
                 {
                     ContractAmount = x.contract.ContractAmount,
@@ -1322,17 +1303,14 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     Id = x.contract.id,
                     ContractNo = x.contract.ContractNo,
                     ArchiveNo = archiveCode.ToString(),
-                    EmployeesCount = employeesCount,
+                    EmployeesCount = _context.LeftWorkList
+                        .Where(l => workshops.Select(w => w.id).Contains(l.id))
+                        .Count(l => l.StartWorkDate <= DateTime.Now && l.LeftWorkDate >= DateTime.Now),
                     EmployerNames = employers.Select(e => e.FullName).ToList(),
                     ListStatus = status,
                     IsExpired = x.contract.ContractEndGr <= endThisMontGr,
                     ContractingPartyId = x.contractingParty.id,
-                    Workshops = workshopDetails,
-                    IsInPersonContract = x.contract.WorkshopGroup?.CurrentWorkshops
-                        .Any(y=>y.Services.ContractInPerson)??true,
-                    IsOldContract = x.contract.WorkshopGroup?.CurrentWorkshops == null
-                                    || x.contract.WorkshopGroup.CurrentWorkshops.Count == 0
-                                    || x.contract.WorkshopGroup.CurrentWorkshops.Any(y => y.Price == 0)
+                    Workshops = workshopDetails
                 };
             }).ToList()
         };
@@ -1498,11 +1476,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 case InstitutionContractListStatus.Deactive:
                     joinedQuery = joinedQuery.Where(x => x.contract.ContractEndGr < now);
                     break;
-
-                case InstitutionContractListStatus.PendingForVerify:
-                    joinedQuery = joinedQuery.Where(x =>
-                        x.contract.VerificationStatus == InstitutionContractVerificationStatus.PendingForVerify);
-                    break;
             }
         }
         else
@@ -1811,7 +1784,15 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     query.party.IsLegal == "حقیقی" ? query.party.Nationalcode : query.party.NationalId,
                 LegalType = query.party.IsLegal == "حقیقی" ? LegalType.Real : LegalType.Legal,
             },
-            FirstParty =_firstParty
+            FirstParty = new InstitutionContratVerificationParty()
+            {
+                Address = "رشت - خیابان حاجی آیاد - کوچه سپهدار - ساختمان داماش - واحد 17",
+                PhoneNumber = "09111111111",
+                CeoName = "سید حسن مصباح",
+                CompanyNameOrFullName = "نور داد مهر گستر کاسپین",
+                NationalCodeOrNationalId = "1111111111",
+                LegalType = LegalType.Legal
+            }
         };
 
         return res;
@@ -1839,11 +1820,9 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
     public async Task<InstitutionContract> GetByPublicIdAsync(Guid id)
     {
-        return await _context.InstitutionContractSet.Include(x=>x.ContactInfoList).FirstOrDefaultAsync(x => x.PublicId == id);
+        return await _context.InstitutionContractSet.FirstOrDefaultAsync(x => x.PublicId == id);
     }
 
-    #region Extension
-
     public async Task<InstitutionContractExtensionInquiryResult> GetExtensionInquiry(long previousContractId)
     {
         var institutionContracts = await _context.InstitutionContractSet
@@ -2056,7 +2035,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             res.ThreeMonths =
                 CalculateInstitutionPlan(InstitutionContractDuration.ThreeMonths, amount, false, newContractStart);
 
-            res.SixMonths =
+            res.SixMonths = 
                 CalculateInstitutionPlan(InstitutionContractDuration.SixMonths, amount, false, newContractStart);
 
             res.TwelveMonths = CalculateInstitutionPlan(InstitutionContractDuration.TwelveMonths, amount, false,
@@ -2067,7 +2046,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             .Select(x => new InstitutionContractExtensionTempWorkshop(x.WorkshopName, x.CountPerson,
                 x.ContractAndCheckout, x.ContractAndCheckoutInPerson,
                 x.Insurance, x.InsuranceInPerson, x.RollCall, x.RollCall,
-                x.RollCallInPerson, x.WorkshopServicesAmount, x.WorkshopId)).ToList();
+                x.RollCallInPerson, x.WorkshopServicesAmount,x.WorkshopId)).ToList();
 
         institutionTemp.SetWorkshopsAndPlanAmounts(workshops, res.OneMonth, res.ThreeMonths, res.SixMonths,
             res.TwelveMonths, hasInPerson);
@@ -2253,7 +2232,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             extensionNo, workshopsCount, employeeCount,
             previousInstitutionContract.Description,
             "NotOfficial", "JobRelation", hasValueAddedTax,
-            payment.Tax.MoneyToDouble(), [],
+            payment.Tax.MoneyToDouble(),[],
             request.LawId);
 
         await CreateAsync(entity);
@@ -2263,25 +2242,26 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             var workshopDetail = new InstitutionContractWorkshopInitial(
                 workshop.WorkshopName, workshop.RollCall, workshop.RollCallInPerson,
                 workshop.CustomizeCheckout, workshop.ContractAndCheckout,
-                workshop.ContractAndCheckoutInPerson, workshop.Insurance,
+                workshop.ContractAndCheckoutInPerson, workshop.Insurance, 
                 workshop.InsuranceInPerson, workshop.CountPerson, workshop.Price);
-
+    
             workshopDetail.SetWorkshopGroup(entity.WorkshopGroup);
-
+            
             if (workshop.WorkshopId != 0)
             {
                 workshopDetail.SetWorkshopId(workshop.WorkshopId);
             }
             // Set parent reference
-
+    
             // Add to the parent's collection
             entity.WorkshopGroup.InitialWorkshops.Add(workshopDetail);
         }
 
 // Save the changes again
         await SaveChangesAsync();
-
-
+        
+        
+        
         FinancialStatment financialStatement;
         if (_context.FinancialStatments.Any(x => x.ContractingPartyId == contractingParty.id))
         {
@@ -2295,7 +2275,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         }
 
         var today = DateTime.Today;
-        if (request.IsInstallment && payment is InstitutionContractPaymentMonthlyViewModel monthly)
+        if (request.IsInstallment && payment is InstitutionContractExtensionPaymentMonthly monthly)
         {
             var installments = monthly.Installments.Select(x =>
                 new InstitutionContractInstallment(x.InstalmentDate.ToGeorgianDateTime(),
@@ -2342,8 +2322,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
         await SaveChangesAsync();
 
-        await _smsService.SendInstitutionCreationVerificationLink(contractingParty.Phone, contractingPartyFullName,
-            entity.PublicId, contractingParty.id, entity.id);
+        await _smsService.SendInstitutionVerificationLink(contractingParty.Phone, contractingPartyFullName,
+            entity.PublicId);
 
 
         await SaveChangesAsync();
@@ -2351,260 +2331,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         return opration.Succcedded();
     }
 
-    #endregion
-
-    public async Task<InstitutionContractAmendmentWorkshopsResponse> GetAmendmentWorkshops(long institutionContractId)
-    {
-        var institutionContract = await _context.InstitutionContractSet
-            .Include(x => x.WorkshopGroup)
-            .ThenInclude(x => x.CurrentWorkshops)
-            .FirstOrDefaultAsync(x => x.id == institutionContractId);
-        
-        if (institutionContract.WorkshopGroup.CurrentWorkshops.Any(x => x.Price == 0))
-        {
-            throw new BadRequestException(
-                "این قرارداد قابل ارتقا به صورت ظاهری نیست لطفا به صورت دیتابیسی اقدام به ویرایش کنید");
-        }
-
-        var workshops = institutionContract.WorkshopGroup.CurrentWorkshops
-            .Select(x => new InstitutionContractAmendmentTempPrevWorkshop(x.WorkshopName,x.PersonnelCount,
-                x.Services.Contract,x.Services.ContractInPerson,x.Services.Insurance,
-                x.Services.InsuranceInPerson,x.Services.RollCall,x.Services.RollCallInPerson,
-                x.Services.CustomizeCheckout,x.Price,
-                x.WorkshopId??0,x.id)).ToList();
-
-
-        
-        var temp = new InstitutionContractAmendmentTemp(workshops, institutionContractId);
-        
-        await _institutionAmendmentTemp.InsertOneAsync(temp);
-        
-        var prevWorkshops = workshops.Select(x =>
-                new InstitutionContractAmendmentTempWorkshopViewModel()
-                {
-                    WorkshopName = x.WorkshopName,
-                    CountPerson = x.CountPerson,
-                    ContractAndCheckout = x.ContractAndCheckout,
-                    ContractAndCheckoutInPerson = x.ContractAndCheckoutInPerson,
-                    Insurance = x.Insurance,
-                    InsuranceInPerson = x.InsuranceInPerson,
-                    RollCall = x.RollCall,
-                    RollCallInPerson = x.RollCallInPerson,
-                    CustomizeCheckout = x.CustomizeCheckout,
-                    PriceStr = x.Price.ToMoney(),
-                    Price = x.Price,
-                    WorkshopId = x.WorkshopId,
-                    WorkshopTempId = x.Id,
-                    CurrentWorkshopId = x.CurrentWorkshopId,
-                    TempId =temp.Id 
-                })
-            .ToList();
-        var res = new InstitutionContractAmendmentWorkshopsResponse()
-        {
-            Workshops = prevWorkshops,
-            TempId = temp.Id
-        };
-        
-        return res;
-    }
-
-    public async Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(
-        InsitutionContractAmendmentPaymentRequest request)
-    {
-        var institutionContractAmendmentTemp = await _institutionAmendmentTemp
-            .Find(x=>x.Id == request.TempId)
-            .FirstOrDefaultAsync();
-        if (institutionContractAmendmentTemp == null)
-            throw new NotFoundException("دیتای وارد شده نامعتبر است");
-
-        var amendmentStart = DateTime.Now;
-        
-        var institutionContract = await _context.InstitutionContractSet
-            .Include(x=>x.WorkshopGroup)
-            .ThenInclude(x=>x.CurrentWorkshops)
-            .FirstOrDefaultAsync(x => x.id == institutionContractAmendmentTemp.InstitutionContractId);
-
-        if (institutionContract == null)
-            throw new NotFoundException("قرارداد مؤسسه یافت نشد");
-        
-        var amendmentEnd = institutionContract.ContractEndGr;
-
-        var haContractInPerson = institutionContract.WorkshopGroup.CurrentWorkshops
-            .Any(x => x.Services.ContractInPerson);
-        if (!haContractInPerson)
-        {
-            if (institutionContractAmendmentTemp.NewWorkshops.Any(x => x.ContractAndCheckoutInPerson))
-            {
-                throw new BadRequestException("برای قرارداد آنلاین نمیتوان سرویس حضوری انتخاب کرد");
-            }
-        }
-
-        var pc = new PersianCalendar();
-
-        int startYear = pc.GetYear(amendmentStart);
-        int startMonth = pc.GetMonth(amendmentStart);
-        int startDay = pc.GetDayOfMonth(amendmentStart);
-
-        int endYear = pc.GetYear(amendmentEnd);
-        int endMonth = pc.GetMonth(amendmentEnd);
-        int endDay = pc.GetDayOfMonth(amendmentEnd);
-
-        // اختلاف خام ماه‌ها
-        int monthDiff = (endYear - startYear) * 12 + (endMonth - startMonth);
-
-        // اگر حتی چند روز از ماه بعدی هم گذشته بود → رند به بالا
-        if (endDay > startDay)
-            monthDiff++;
-        
-        var sumOneMonth = institutionContractAmendmentTemp.NewWorkshops.Sum(x => x.PriceDifference);
-        
-        var baseAmount = monthDiff * sumOneMonth;
-        var tax = baseAmount*0.10;
-        var totalPayment = tax+baseAmount;
-
-
-        var res = new InsitutionContractAmendmentPaymentResponse()
-        {
-            ContractStart = amendmentStart.ToFarsi(),
-            ContractEnd = amendmentEnd.ToFarsi(),
-            OneMonthAmount = sumOneMonth.ToMoney(),
-            TotalAmount = baseAmount.ToMoney(),
-        };
-        
-        res.OneTime = new InstitutionContractPaymentOneTimeViewModel()
-        {
-            TotalAmount = baseAmount.ToMoney(),
-            PaymentAmount = totalPayment.ToMoney(),
-            Tax = tax.ToMoney()
-        };
-        
-        if (haContractInPerson)
-        {
-            var installment = InstitutionMonthlyInstallmentCaculation(monthDiff,totalPayment, amendmentStart.ToFarsi());
-            
-            var firstPrevInstallment = installment.First();
-            var lastPrevInstallment = installment.Last();
-            
-            var firstInstallment = new MonthlyInstallment()
-            {
-                InstallmentAmountStr = firstPrevInstallment.InstallmentAmountStr,
-                InstallmentCounter = firstPrevInstallment.InstallmentCounter,
-                InstalmentDate = amendmentStart.ToFarsi()
-            };
-            
-            var lastInstallment = new MonthlyInstallment()
-            {
-                InstallmentAmountStr = lastPrevInstallment.InstallmentAmountStr,
-                InstallmentCounter = lastPrevInstallment.InstallmentCounter,
-                InstalmentDate = lastPrevInstallment.InstalmentDate
-            };
-            
-            installment.Remove(firstPrevInstallment);
-            installment.Remove(lastPrevInstallment);
-            
-            installment.Insert(0, firstInstallment);
-            installment.Add(lastInstallment);
-            
-            res.Monthly = new InstitutionContractPaymentMonthlyViewModel()
-            {
-                Installments = installment,
-                TotalAmount = baseAmount.ToMoney(),
-                PaymentAmount = totalPayment.ToMoney(),
-                Tax = tax.ToMoney()
-
-            };
-
-        }
-        return res;
-    }
-
-    public async Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(
-        InstitutionContractAmendmentTempWorkshopViewModel request)
-    {
-        var amendmentTemp =await _institutionAmendmentTemp
-            .Find(x=> x.Id == request.TempId).FirstOrDefaultAsync();
-        
-        if (amendmentTemp == null)
-            throw new BadRequestException("دیتای وارد شده نامعتبر است");
-        
-        var workshopTemp = amendmentTemp.NewWorkshops
-            .FirstOrDefault(x => x.Id == request.WorkshopTempId);
-        
-        var planForWorkshop = new WorkshopTempViewModel()
-        {
-            WorkshopName = request.WorkshopName,
-            CountPerson = request.CountPerson,
-            ContractAndCheckout = request.ContractAndCheckout,
-            ContractAndCheckoutInPerson = request.ContractAndCheckoutInPerson,
-            Insurance = request.Insurance,
-            InsuranceInPerson = request.InsuranceInPerson,
-            RollCall = request.RollCall,
-            RollCallInPerson = request.RollCallInPerson,
-            CustomizeCheckout = request.CustomizeCheckout
-        };
-        var price = _planPercentageRepository.GetInstitutionPlanForWorkshop(planForWorkshop)
-            .OnlineAndInPersonSumAmountDouble;
-        
-        if (workshopTemp == null)
-        {
-            var newWorkshopTemp = new InstitutionContractAmendmentTempNewWorkshop(request.WorkshopName,
-                request.CountPerson,
-                request.ContractAndCheckout, request.ContractAndCheckoutInPerson,
-                request.Insurance, request.InsuranceInPerson,
-                request.RollCall, request.RollCallInPerson,
-                request.CustomizeCheckout, price,
-                request.WorkshopId,0,price);
-
-            workshopTemp = newWorkshopTemp;
-            
-
-            amendmentTemp.NewWorkshops.Add(newWorkshopTemp);
-            
-            await _institutionAmendmentTemp
-                .ReplaceOneAsync(x => x.Id == amendmentTemp.Id, amendmentTemp);
-        }
-        else
-        {
-            amendmentTemp.NewWorkshops.Remove(workshopTemp);
-        
-            var differencePrice = price - workshopTemp.Price;
-            workshopTemp.Edit(request.WorkshopName, request.CountPerson,
-                request.ContractAndCheckout, request.ContractAndCheckoutInPerson,
-                request.Insurance, request.InsuranceInPerson,
-                request.RollCall,
-                request.CustomizeCheckout, price,differencePrice);
-        
-            amendmentTemp.NewWorkshops.Add(workshopTemp);
-        
-            await _institutionAmendmentTemp
-                .ReplaceOneAsync(x => x.Id == amendmentTemp.Id, amendmentTemp);
-        }
-        
-        return new InsertAmendmentTempWorkshopResponse()
-        {
-            WorkshopTempId = workshopTemp.Id,
-            Amount = workshopTemp.PriceDifference.ToMoney()
-        };
-    }
-
-    public async Task RemoveAmendmentWorkshops(Guid workshopTempId)
-    {
-        var amendmentTemp = await _institutionAmendmentTemp.Find(x => x.NewWorkshops.Any(w => w.Id == workshopTempId))
-            .FirstOrDefaultAsync();
-        if (amendmentTemp == null)
-            throw new BadRequestException("دیتای وارد شده نامعتبر است");
-        var workshopTemp = amendmentTemp.NewWorkshops.FirstOrDefault(x => x.Id == workshopTempId);
-        if (workshopTemp == null)  
-            throw new BadRequestException("دیتای وارد شده نامعتبر است");
-
-        if (workshopTemp.CurrentWorkshopId!=0)
-            throw new BadRequestException("شما نمی توانید این کارگاه را حذف کنید زیرا در قرارداد اصلی وجود دارد");
-        
-        amendmentTemp.NewWorkshops.Remove(workshopTemp);
-        
-        await _institutionAmendmentTemp.ReplaceOneAsync(x => x.Id == amendmentTemp.Id, amendmentTemp);
-        
-    }
     public async Task<List<InstitutionContractSelectListViewModel>> GetInstitutionContractSelectList(string search,
         string selected)
     {
@@ -2623,12 +2349,10 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             Id = x.id,
             Text = x.WorkshopFullName
         });
-        //کارفرما ها به غیر از آن هایی که به طرف حساب ---- وصل هستند
-        var employers = _context.Employers.Where(x=>x.ContractingPartyId != 30428)
-            .Select(x => new InstitutionContractSelectListViewModel()
+        var employers = _context.Employers.Select(x => new InstitutionContractSelectListViewModel()
         {
             Id = x.id,
-            Text = x.FullName
+            Text = x.FName + " " + x.LName
         });
         var representatives = _context.RepresentativeSet.Select(x => new InstitutionContractSelectListViewModel()
         {
@@ -2661,113 +2385,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         
     }
 
-    public async Task<List<InstitutionContractPrintViewModel>> PrintAllAsync(List<long> ids)
-    {
-        var query =_context.InstitutionContractSet
-            .Include(x=>x.WorkshopGroup)
-            .ThenInclude(x=>x.InitialWorkshops)
-            .Include(x=>x.WorkshopGroup)
-            .ThenInclude(x=>x.CurrentWorkshops)
-            .Where(x=>ids.Contains(x.id));
-
-        var contractingPartyIds = query.Select(x => x.ContractingPartyId).ToList();
-        var contractingParties = await _context.PersonalContractingParties
-            .Where(x => contractingPartyIds.Contains(x.id))
-            .ToListAsync();
-
-        var list = query.ToList();
-        
-        if (list.Count == 0)
-            throw new NotFoundException("قرارداد مؤسسه یافت نشد");
-
-        var res = new List<InstitutionContractPrintViewModel>();
-        foreach (var institution in list)
-        {
-            var contractingParty = contractingParties.FirstOrDefault(x => x.id == institution.ContractingPartyId);
-
-            if (contractingParty == null)
-            {
-                throw new NotFoundException("طرف حساب یافت نشد");
-            }
-            
-            var law = await _context.Laws
-                .FirstOrDefaultAsync(x => x.id == institution.LawId);
-
-
-            var secondParty = new InstitutionContratVerificationParty()
-            {
-                Address = contractingParty.Address,
-                PhoneNumber = contractingParty.Phone,
-                CeoName = contractingParty.IsLegal == "حقیقی"
-                    ? $"{contractingParty.FName} {contractingParty.LName}"
-                    : $"{contractingParty.CeoFName} {contractingParty.CeoLName}",
-                CompanyNameOrFullName = contractingParty.IsLegal == "حقیقی"
-                    ? $"{contractingParty.FName} {contractingParty.LName}"
-                    : contractingParty.LName,
-                NationalCodeOrNationalId =
-                    contractingParty.IsLegal == "حقیقی" ? contractingParty.Nationalcode : contractingParty.NationalId,
-                LegalType = contractingParty.IsLegal == "حقیقی" ? LegalType.Real : LegalType.Legal,
-            };
-
-            var lawViewModel = new LawViewModel()
-            {
-                Id = law.id,
-                CreatedAt = law.CreationDate,
-                HeadTitle = law.HeadTitle,
-                IsActive = law.IsActive,
-                Items = law.Items.Select(x => new LawItemViewModel()
-                {
-                    Details = x.Details,
-                    Header = x.Header
-                }).ToList(),
-                Notifications = law.Notifications,
-                Title = law.Title,
-                Type = law.Type,
-                Version = law.Version
-            };
-
-            var item = new InstitutionContractPrintViewModel()
-            {
-                ContractStart = institution.ContractStartFa,
-                ContractEnd = institution.ContractEndFa,
-                ContractNo = institution.ContractNo,
-                CreationDate = institution.CreationDate.ToFarsi(),
-                FirstParty = _firstParty,
-                SecondParty = secondParty,
-                LawViewModel = lawViewModel,
-                Obligation = institution.Obligation.ToMoney(),
-                PaymentPrice = institution.TotalAmount.ToMoney(),
-                TotalPrice = (institution.TotalAmount - institution.ValueAddedTax).ToMoney(),
-                TaxPrice = institution.ValueAddedTax.ToMoney(),
-                VerifierFullName = institution.VerifierFullName,
-                VerifierPhoneNumber = institution.VerifierPhoneNumber,
-                VerifyCode = institution.VerifyCode,
-                VerifyDate = institution.VerifyCodeCreation.ToFarsi(),
-                VerifyTime = institution.VerifyCodeCreation.ToString("HH:mm:ss"),
-                Workshops = institution.WorkshopGroup.CurrentWorkshops
-                    .Select(x => new GetInstitutionVerificationDetailsWorkshopsViewModel()
-                    {
-                        Name = x.WorkshopName,
-                        PersonnelCount = x.PersonnelCount,
-                        Services = new WorkshopServicesViewModel()
-                        {
-                            Contract = x.Services.Contract,
-                            ContractInPerson = x.Services.ContractInPerson,
-                            CustomizeCheckout = x.Services.CustomizeCheckout,
-                            Insurance = x.Services.Insurance,
-                            InsuranceInPerson = x.Services.InsuranceInPerson,
-                            RollCall = x.Services.RollCall,
-                            RollCallInPerson = x.Services.RollCallInPerson
-                        },
-                        Price = x.Price.ToMoney()
-                    }).ToList()
-            };
-            res.Add(item);
-        }
-
-        return res;
-    }
-
 
     private InstitutionContractExtensionPaymentResponse CalculateInPersonPayment(
         InstitutionContractExtensionPlanDetail selectedPlan, double baseAmount, double tenPercent,
@@ -2791,7 +2408,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         // حالت پرداخت اقساطی
         var monthlyTax = baseAmount * 0.10;
         var monthlyTotal = baseAmount + monthlyTax;
-        var installments = InstitutionMonthlyInstallmentCaculation((int)duration, monthlyTotal, selectedPlan.ContractStart);
+        var installments = InstitutionMonthlyInstallmentCaculation(duration, monthlyTotal, selectedPlan.ContractStart);
 
         res.Monthly = new()
         {
@@ -2873,7 +2490,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         return result;
     }
 
-    public static List<MonthlyInstallment> InstitutionMonthlyInstallmentCaculation(int duration,
+    public static List<MonthlyInstallment> InstitutionMonthlyInstallmentCaculation(InstitutionContractDuration duration,
         double monthlyTotalPaymentDouble,
         string installmentstart)
     {
@@ -2881,7 +2498,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         var installmentList = new List<MonthlyInstallment>();
 
 
-        int instalmentCount = duration;
+        int instalmentCount = (int)duration;
         var instalmentAmount = monthlyTotalPaymentDouble / instalmentCount;
         int currentInstallmentStartDay = int.Parse(installmentstart.Substring(8, 2));
         bool endOfMonth = currentInstallmentStartDay == 31;
@@ -2941,7 +2558,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
     #endregion
 
-    
 
     #region CustomViewModels
 

CompanyManagment.EFCore/Repository/InsuranceListRepository.cs

@@ -7,14 +7,11 @@ using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using _0_Framework.Application;
-using _0_Framework.Application.Enums;
 using _0_Framework.InfraStructure;
 using AccountMangement.Infrastructure.EFCore;
-using Company.Domain.CheckoutAgg;
 using Company.Domain.EmployeeAgg;
 using Company.Domain.EmployeeChildrenAgg;
 using Company.Domain.EmployeeInsurancListDataAgg;
-using Company.Domain.empolyerAgg;
 using Company.Domain.InsuranceListAgg;
 using Company.Domain.InsuranceWorkshopAgg;
 using Company.Domain.InsuranceYearlySalaryAgg;
@@ -135,11 +132,6 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
                 var id = insuranceListObj.id;
                 if (command.EmployeeInsurancListDataList != null && command.EmployeeInsurancListDataList.Count > 0)
                 {
-                    var farisMonthName = Tools.ToFarsiMonthByNumber(command.Month);
-
-                    var checkouts = _context.CheckoutSet.Where(x =>
-                        x.WorkshopId == command.WorkshopId && x.Year == command.Year && x.Month == farisMonthName &&
-                        x.IsActiveString == "true");
                     foreach (var item in command.EmployeeInsurancListDataList)
                     {
                         if (item.EmployeeInsurancListDataId == 0)
@@ -166,29 +158,6 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
                                 item.LeftWorkDate, item.JobId, item.IncludeStatus, item.BaseYears,
                                 item.MarriedAllowance, item.OverTimePay, item.FamilyAllowance);
                         }
-
-
-                        if (checkouts.Any())
-                        {
-                            var checkout = checkouts.FirstOrDefault(x => x.EmployeeId == item.EmployeeId);
-                            if (checkout != null)
-                            {
-                                if (item.InsuranceShare.ToMoney() != checkout.InsuranceDeduction.ToMoney())
-                                {
-                                    checkout.SetUpdateNeeded();
-                                    if (!_context.CheckoutWarningMessages.Any(x => x.CheckoutId == checkout.id && x.TypeOfCheckoutWarning != TypeOfCheckoutWarning.InsuranceEmployeeShare))
-                                    {
-                                        var createWarrning =
-                                            new CheckoutWarningMessage(
-                                                "مبلغ بیمه سهم کارگر با مبلغ محاسبه شده در لیست بیمه مغایرت دارد", checkout.id, TypeOfCheckoutWarning.InsuranceEmployeeShare);
-                                        _context.CheckoutWarningMessages.Add(createWarrning);
-                                    }
-
-                                    _context.SaveChanges();
-                                }
-                            }
-
-                        }
                     }
 
                     _employeeInsurancListDataRepository.SaveChanges();
@@ -729,11 +698,6 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
                 var id = insuranceListObj.id;
                 if (command.EmployeeInsurancListDataList != null && command.EmployeeInsurancListDataList.Count > 0)
                 {
-                     var farisMonthName = Tools.ToFarsiMonthByNumber(command.Month);
-
-                    var checkouts = _context.CheckoutSet.Where(x =>
-                        x.WorkshopId == command.WorkshopId && x.Year == command.Year && x.Month == farisMonthName &&
-                        x.IsActiveString == "true");
                     foreach (var item in command.EmployeeInsurancListDataList)
                     {
                         var employeeInsurancListData = new EmployeeInsurancListData(id,
@@ -747,28 +711,6 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
                             item.LeftWorkDate, item.JobId, item.IncludeStatus, item.BaseYears, item.MarriedAllowance,
                             item.OverTimePay, item.FamilyAllowance);
                         _employeeInsurancListDataRepository.Create(employeeInsurancListData);
-                        if (checkouts.Any())
-                        {
-                            var checkout = checkouts.FirstOrDefault(x => x.EmployeeId == item.EmployeeId);
-                            if (checkout != null)
-                            {
-                                if (item.InsuranceShare.ToMoney() != checkout.InsuranceDeduction.ToMoney())
-                                {
-                                    checkout.SetUpdateNeeded();
-                                    if (!_context.CheckoutWarningMessages.Any(x => x.CheckoutId == checkout.id && x.TypeOfCheckoutWarning != TypeOfCheckoutWarning.InsuranceEmployeeShare))
-                                    {
-                                        var createWarrning =
-                                            new CheckoutWarningMessage(
-                                                "مبلغ بیمه سهم کارگر با مبلغ محاسبه شده در لیست بیمه مغایرت دارد", checkout.id, TypeOfCheckoutWarning.InsuranceEmployeeShare);
-                                        _context.CheckoutWarningMessages.Add(createWarrning);
-                                    }
-                    
-                                    _context.SaveChanges();
-                                }
-                            }
-                        
-                        }
-
                     }
 
                     _employeeInsurancListDataRepository.SaveChanges();
@@ -1469,27 +1411,6 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
     }
 
 
-    public List<EmployeeInsurancListDataViewModel> EmployeeInsuranceDataBy(DateTime startDate, long workshopId)
-    {
-        var res = _context.InsuranceListSet
-            .Where(x => x.StartDate <= startDate && x.EndDate >= startDate &&
-                        x.WorkshopId == workshopId)
-            .Join(_context.EmployeeInsurancListDataSet,
-                insuranceList => insuranceList.id,
-                employeeInsurancListData => employeeInsurancListData.InsuranceListId,
-                (insuranceList, employeeInsurancListData) => new EmployeeInsurancListDataViewModel
-                {
-                    InsuranceListId = insuranceList.id,
-                    EmployeeId = employeeInsurancListData.EmployeeId,
-                    WorkingDays = employeeInsurancListData.WorkingDays,
-                    BenefitsIncludedNonContinuous = employeeInsurancListData.BenefitsIncludedNonContinuous,
-                    InsuranceShare = employeeInsurancListData.InsuranceShare,
-                });
-
-        return res.ToList();
-    }
-
-
     public List<EmployeeDetailsForInsuranceListViewModel> GetEmployeeInsuranceDataForEdit(long insuranceListId,
         DateTime startDate, DateTime endDate)
     {
@@ -1803,86 +1724,9 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
             .Include(x => x.LeftWorkInsurances)
             .Where(x => x.LeftWorkInsurances.Any(l => l.StartWorkDate <= firstDayOfMonth &&
                                                       (l.LeftWorkDate == null || l.LeftWorkDate >= firstDayOfMonth)));
-        
-        
-        var query = notCreatedWorkshop.Select(result=>new InsuranceListViewModel
-            {
-                Year = searchModel.Year,
-                Month = searchModel.Month,
-                WorkShopId = result.id,
-                WorkShopCode = result.InsuranceWorkshopInfo != null
-                    ? result.InsuranceWorkshopInfo.InsuranceCode
-                    : result.InsuranceCode,
-                WorkShopName = result.InsuranceWorkshopInfo != null
-                    ? result.InsuranceWorkshopInfo.WorkshopName
-                    : result.WorkshopFullName,
-                TypeOfInsuranceSend = result.TypeOfInsuranceSend == "NormalList" ? "عادی" :
-                    result.TypeOfInsuranceSend == "Govermentlist" ? "کمک دولت" :
-                    result.TypeOfInsuranceSend == "Familylist" ? "خانوادگی" : "",
-                FixedSalary = result.FixedSalary,
-                StrFixedSalary = result.FixedSalary ? "دارد" : "ندارد",
-                EmployerName = result.InsuranceWorkshopInfo != null
-                    ? result.InsuranceWorkshopInfo.EmployerName
-                    : result.WorkshopFullName,
-                Branch = "",
-                City = "",
-                ArchiveCode = result.ArchiveCode,
-            });
-        
-    
-            if (!string.IsNullOrEmpty(searchModel.Month) && searchModel.Month != "0")
-                query = query.Where(x => x.Month == searchModel.Month).OrderByDescending(x => x.WorkShopName)
-                    .ThenByDescending(x => x.EmployerName).ThenByDescending(x => x.Year);
 
-            if (!string.IsNullOrEmpty(searchModel.Year) && searchModel.Year != "0")
-                query = query.Where(x => x.Year == searchModel.Year).OrderByDescending(x => x.EmployerName)
-                    .ThenByDescending(x => x.WorkShopName).ThenByDescending(x => x.Month);
-        
-
-        if (!string.IsNullOrEmpty(searchModel.WorkShopCode))
-            query = query.Where(x => x.WorkShopCode == searchModel.WorkShopCode).OrderByDescending(x => x.Year)
-                .ThenByDescending(x => x.Month).ThenByDescending(x => x.EmployerName);
-
-        if (!string.IsNullOrEmpty(searchModel.WorkShopName))
-            query = query.Where(x => x.WorkShopName.Contains(searchModel.WorkShopName))
-                .OrderByDescending(x => x.EmployerName).ThenByDescending(x => x.Year).OrderByDescending(x => x.Month);
-
-
-        if (searchModel.WorkshopId > 0)
-        {
-            var workshopName = query.FirstOrDefault(u => u.WorkShopId == searchModel.WorkshopId)?.WorkShopName;
-
-            query = query.Where(x => x.WorkShopName.Contains(workshopName)).OrderByDescending(x => x.EmployerName)
-                .ThenByDescending(x => x.Year).ThenByDescending(x => x.Month);
-        }
-
-        if (searchModel.EmployerId > 0)
-        {
-            var employerName = query.FirstOrDefault(u => u.EmployerId == searchModel.EmployerId)?.EmployerName;
-            query = query.Where(x => x.EmployerName.Contains(employerName)).OrderByDescending(x => x.EmployerName)
-                .ThenByDescending(x => x.Year).ThenByDescending(x => x.Month);
-        }
-
-        if (!string.IsNullOrEmpty(searchModel.EmployerName))
-            query = query.Where(x => x.EmployerName.Contains(searchModel.EmployerName))
-                .OrderByDescending(x => x.EmployerName).ThenByDescending(x => x.Year).OrderByDescending(x => x.Month);
-
-
-        if (searchModel.FixedSalary != null)
-            query = query.Where(x => x.FixedSalary == searchModel.FixedSalary);
-
-        if (!string.IsNullOrEmpty(searchModel.TypeOfInsuranceSend) && searchModel.TypeOfInsuranceSend != "0")
-            query = query.Where(x => x.TypeOfInsuranceSend == searchModel.TypeOfInsuranceSend);
-
-        if (!string.IsNullOrEmpty(searchModel.City) && searchModel.City != "0")
-            query = query.Where(x => x.City == searchModel.City);
-
-        if (!string.IsNullOrEmpty(searchModel.Branch))
-            query = query.Where(x => x.Branch.Contains(searchModel.Branch));
-
-
-        var workshopList = await query.Skip(searchModel.PageIndex).Take(30).ToListAsync();
-            var workshopIds = workshopList.Select(x=>x.WorkShopId);
+        var workshopList = await notCreatedWorkshop.Skip(searchModel.PageIndex).Take(30).ToListAsync();
+            var workshopIds = workshopList.Select(x=>x.id);
             
               var employers =await _context.WorkshopEmployers
                       .Where(x=>workshopIds.Contains(x.WorkshopId))
@@ -1891,16 +1735,20 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
               
               var res = workshopList.Select(x =>
               {
-                  var employer = employers.FirstOrDefault(e => e.WorkshopId ==x.WorkShopId)?.Employer;
+                  var employer = employers.FirstOrDefault(e => e.WorkshopId ==x.id)?.Employer;
                   
                   return new InsuranceListViewModel
                   {
-                      WorkShopId = x.WorkShopId,
-                      WorkShopCode = x.WorkShopCode,
-                      WorkShopName = x.WorkShopName,
+                      WorkShopId = x.id,
+                      WorkShopCode = x.InsuranceCode,
+                      WorkShopName = x.InsuranceWorkshopInfo != null
+                          ? x.InsuranceWorkshopInfo.WorkshopName
+                          : x.WorkshopFullName,
                       EmployerName = employer != null
                           ? employer.FullName
-                          : (x.EmployerName),
+                          : (x.InsuranceWorkshopInfo != null
+                              ? x.InsuranceWorkshopInfo.EmployerName
+                              : x.WorkshopFullName),
                       Year = searchModel.Year,
                       Month = searchModel.Month,
                       TypeOfInsuranceSend = x.TypeOfInsuranceSend == "NormalList" ? "عادی" :