Add Excel export for institution contract and contracting party details

- Implement InstitutionContractDetailExcelGenerator and InstitutionContractLegalExcelGenerator for generating Excel files of contract parties (individual and legal)
- Add methods to Index.cshtml.cs to fetch and export contract party details within 6 months of contract end
- Update OnPostShiftDateNew to return contracting party Excel export
- Refactor usings to include new Excel generators

.github/workflows/dotnet-developPublish.yml

@@ -5,6 +5,8 @@ on:
     branches:
       - Main
 
+env:
+  DOTNET_ENVIRONMENT: Development
 
 jobs:
   build-and-deploy:
@@ -35,11 +37,12 @@ jobs:
         & "C:\Program Files\IIS\Microsoft Web Deploy V3\msdeploy.exe" `
           -verb:sync `
           -source:contentPath="$publishFolder" `
-          -dest:contentPath="dadmehrg",computerName="https://$env:SERVER_HOST:8172/msdeploy.axd?site=gozareshgir",userName="$env:DEPLOY_USER",password="$env:DEPLOY_PASSWORD",authType="Basic" `
+          -dest:contentPath="dadmehrg",computerName="https://171.22.24.15:8172/msdeploy.axd?site=dadmehrg",userName="Administrator",password="R2rNpdnetP3j>q5b18",authType="Basic" `
           -allowUntrusted `
           -enableRule:AppOffline
-          
+
+
       env:
-        SERVER_HOST: 171.22.24.15
+        SERVER_HOST: your-server-ip-or-domain
         DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
         DEPLOY_PASSWORD: ${{ secrets.DEPLOY_PASSWORD }}

.gitignore

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

0_Framework/0_Framework.csproj

@@ -1,26 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>_0_Framework</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="12.1.1" />
-    <PackageReference Include="IPE.SmsIR" Version="1.2.7" />
-    <PackageReference Include="EPPlus" Version="8.4.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
-    <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.3" />
+    <PackageReference Include="IPE.SmsIR" Version="1.0.5" />
+    <PackageReference Include="EPPlus" Version="7.5.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.1.34" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
     <PackageReference Include="PersianTools.Core" Version="2.0.4" />
-    <PackageReference Include="System.Drawing.Common" Version="10.0.1" />
-    <PackageReference Include="MD.PersianDateTime.Standard" Version="2.6.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="10.0.1" />
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.1" />
+    <PackageReference Include="System.Drawing.Common" Version="9.0.0" />
+    <PackageReference Include="MD.PersianDateTime.Standard" Version="2.5.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="7.2.0" />
 
 
 

0_Framework/Application/AuthHelper.cs

@@ -56,11 +56,6 @@ public class AuthHelper : IAuthHelper
 		return Tools.DeserializeFromBsonList<int>(permissions); //Mahan
 	}
 
-	public bool HasPermission(int permission)
-	{
-		return GetPermissions().Any(x => x == permission);
-	}
-
 	public long CurrentAccountId()
 	{
 		return IsAuthenticated()
@@ -203,8 +198,7 @@ public class AuthHelper : IAuthHelper
             new("workshopList",workshopBson),
 			new("WorkshopSlug",slug),
 			new("WorkshopId", account.WorkshopId.ToString()),
-			new("WorkshopName",account.WorkshopName??""),
-			new("pm.userId", account.PmUserId.ToString()),
+			new("WorkshopName",account.WorkshopName??"")
 
 		};
 

0_Framework/Application/AuthViewModel.cs

@@ -27,12 +27,10 @@ public class AuthViewModel
     #endregion
 
     public long SubAccountId { get; set; }
-    public long? PmUserId { get; set; }
 
 
     public AuthViewModel(long id, long roleId, string fullname, string username, string mobile,string profilePhoto,
-        List<int> permissions, string roleName, string adminAreaPermission, string clientAriaPermission, int? positionValue, 
-        long subAccountId = 0,long? pmUserId = null)
+        List<int> permissions, string roleName, string adminAreaPermission, string clientAriaPermission, int? positionValue, long subAccountId = 0)
     {
         Id = id;
         RoleId = roleId;
@@ -46,7 +44,6 @@ public class AuthViewModel
         ClientAriaPermission = clientAriaPermission;
         PositionValue = positionValue;
         SubAccountId = subAccountId;
-        PmUserId = pmUserId;
     }
 
     public AuthViewModel()

0_Framework/Application/Enums/TypeOfSmsSetting.cs

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

0_Framework/Application/FaceEmbedding/IFaceEmbeddingService.cs

@@ -11,7 +11,6 @@ public interface IFaceEmbeddingService
     Task<OperationResult> RefineEmbeddingAsync(long employeeId, long workshopId, float[] embedding, float confidence, Dictionary<string, object> metadata = null);
     Task<OperationResult> DeleteEmbeddingAsync(long employeeId, long workshopId);
     Task<OperationResult<FaceEmbeddingResponse>> GetEmbeddingAsync(long employeeId, long workshopId);
-    Task<OperationResult> UpdateEmbeddingFullNameAsync(long employeeId, long workshopId, string newFullName);
 }
 
 public class FaceEmbeddingResponse

0_Framework/Application/IAuthHelper.cs

@@ -12,7 +12,6 @@ public interface IAuthHelper
     string CurrentAccountRole();
     AuthViewModel CurrentAccountInfo();
     List<int> GetPermissions();
-    bool HasPermission(int permission);
     long CurrentAccountId();
     string CurrentAccountMobile();
 

0_Framework/Application/PaymentGateway/SepehrPaymentGateway.cs

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

0_Framework/Application/SecretKeys.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace _0_Framework.Application;
-
-public static class SecretKeys
-{
-
-    public static string ProgramManagerInternalApi => "JOb09$Ic3NJd0siLCJtYWMiOiI2%dmODJmNDV";
-}

0_Framework/Application/Sms/ApiResultViewModel.cs

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

0_Framework/Application/Sms/ISmsService.cs

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

0_Framework/Application/StaticWorkshopAccounts.cs

@@ -31,24 +31,12 @@ public static class StaticWorkshopAccounts
     /// 381 - مهدی قربانی
     /// 392 - عمار حسن دوست
     /// 20 - سمیرا الهی نیا
-    /// 322 - ماهان چمنی
     /// </summary>
-    public static List<long> StaticAccountIds = [2, 3, 380, 381, 392, 20, 476,322];
+    public static List<long> StaticAccountIds = [2, 3, 380, 381, 392, 20];
 
     /// <summary>
     /// این تاریخ در جدول اکانت لفت ورک به این معنیست
     /// که کاربر همچنان به کارگاه دسترسی دارد
     /// </summary>
     public static DateTime ContinuesWorkingDate = new DateTime(2150, 1, 1);
-
-
-    /// <summary>
-    /// لیستی آی دی نقش هایی که مسئول بیمه کارگاه هستند
-    /// 7 : بیمه ارشد
-    /// 8 : بیمه ساده
-    /// </summary>
-    public static List<long> InsuranceAccountsRoleIds = [7, 8];
-
-
-
 }

0_Framework/Excel/ExcelGenerator.cs

@@ -17,7 +17,7 @@ public class ExcelGenerator
 {
     public ExcelGenerator()
     {
-        OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
     }
     public static byte[] GenerateExcel<T>(List<T> obj, string date = "") where T : class
     {

0_Framework/Exceptions/Handler/CustomExceptionHandler.cs

@@ -1,10 +1,7 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using FluentValidation;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -24,24 +21,12 @@ public class CustomExceptionHandler : IExceptionHandler
 
     public async ValueTask<bool> TryHandleAsync(HttpContext context, Exception exception, CancellationToken cancellationToken)
     {
-        _logger.LogError(exception,
-            "Error Message: {exceptionMessage}, Type: {exceptionType}, Time: {time}, Path: {path}, TraceId: {traceId}",
-            exception.Message, 
-            exception.GetType().FullName, 
-            DateTime.UtcNow,
-            context.Request.Path,
-            context.TraceIdentifier);
+        _logger.LogError(
+            "Error Message: {exceptionMessage}, Time of occurrence {time}",
+            exception.Message, DateTime.UtcNow);
 
         (string Detail, string Title, int StatusCode, Dictionary<string, object>? Extra) details = exception switch
         {
-            ValidationException validationException =>
-            (
-                validationException.Errors.FirstOrDefault()?.ErrorMessage ?? "One or more validation errors occurred.",
-                "Validation Error",
-                context.Response.StatusCode = StatusCodes.Status400BadRequest,
-                null
-            ),
-            
             InternalServerException =>
             (
                 exception.Message,
@@ -49,7 +34,6 @@ public class CustomExceptionHandler : IExceptionHandler
                 context.Response.StatusCode = StatusCodes.Status500InternalServerError,
                 null
             ),
-
             BadRequestException bre =>
             (
                 exception.Message,
@@ -57,7 +41,6 @@ public class CustomExceptionHandler : IExceptionHandler
                 context.Response.StatusCode = StatusCodes.Status400BadRequest,
                 bre.Extra
             ),
-            
             NotFoundException =>
             (
                 exception.Message,
@@ -65,7 +48,6 @@ public class CustomExceptionHandler : IExceptionHandler
                 context.Response.StatusCode = StatusCodes.Status404NotFound,
                 null
             ),
-            
             UnAuthorizeException =>
             (
                 exception.Message,
@@ -73,7 +55,6 @@ public class CustomExceptionHandler : IExceptionHandler
                 context.Response.StatusCode = StatusCodes.Status401Unauthorized,
                 null
             ),
-            
             _ =>
             (
                 exception.Message,
@@ -92,6 +73,8 @@ public class CustomExceptionHandler : IExceptionHandler
             Extensions = details.Extra ?? new Dictionary<string, object>()
         };
         
+
+        
         problemDetails.Extensions.Add("traceId", context.TraceIdentifier);
 
         await context.Response.WriteAsJsonAsync(problemDetails, cancellationToken: cancellationToken);

0_Framework/InfraStructure/FaceEmbeddingService.cs

@@ -18,387 +18,329 @@ namespace _0_Framework.Infrastructure;
 /// </summary>
 public class FaceEmbeddingService : IFaceEmbeddingService
 {
-    private readonly IHttpClientFactory _httpClientFactory;
-    private readonly ILogger<FaceEmbeddingService> _logger;
-    private readonly IFaceEmbeddingNotificationService _notificationService;
-    private readonly string _apiBaseUrl;
+	private readonly IHttpClientFactory _httpClientFactory;
+	private readonly ILogger<FaceEmbeddingService> _logger;
+	private readonly IFaceEmbeddingNotificationService _notificationService;
+	private readonly string _apiBaseUrl;
 
-    public FaceEmbeddingService(IHttpClientFactory httpClientFactory, ILogger<FaceEmbeddingService> logger,
-        IFaceEmbeddingNotificationService notificationService = null)
-    {
-        _httpClientFactory = httpClientFactory;
-        _logger = logger;
-        _notificationService = notificationService;
-        _apiBaseUrl = "http://localhost:8000";
-    }
+	public FaceEmbeddingService(IHttpClientFactory httpClientFactory, ILogger<FaceEmbeddingService> logger, 
+		IFaceEmbeddingNotificationService notificationService = null)
+	{
+		_httpClientFactory = httpClientFactory;
+		_logger = logger;
+		_notificationService = notificationService;
+		_apiBaseUrl = "http://localhost:8000";
+	}
 
-    public async Task<OperationResult> GenerateEmbeddingsAsync(long employeeId, long workshopId,
-        string employeeFullName, string picture1Path, string picture2Path)
-    {
-        try
-        {
-            var httpClient = _httpClientFactory.CreateClient();
-            httpClient.BaseAddress = new Uri(_apiBaseUrl);
-            httpClient.Timeout = TimeSpan.FromSeconds(30);
+	public async Task<OperationResult> GenerateEmbeddingsAsync(long employeeId, long workshopId,
+		string employeeFullName, string picture1Path, string picture2Path)
+	{
+		try
+		{
+			var httpClient = _httpClientFactory.CreateClient();
+			httpClient.BaseAddress = new Uri(_apiBaseUrl);
+			httpClient.Timeout = TimeSpan.FromSeconds(30);
 
-            using var content = new MultipartFormDataContent();
+			using var content = new MultipartFormDataContent();
 
-            // Add form fields
-            content.Add(new StringContent(employeeId.ToString()), "employee_id");
-            content.Add(new StringContent(workshopId.ToString()), "workshop_id");
-            content.Add(new StringContent(employeeFullName ?? ""), "employee_full_name");
+			// Add form fields
+			content.Add(new StringContent(employeeId.ToString()), "employee_id");
+			content.Add(new StringContent(workshopId.ToString()), "workshop_id");
+			content.Add(new StringContent(employeeFullName ?? ""), "employee_full_name");
 
-            // Add picture files
-            if (File.Exists(picture1Path))
-            {
-                var picture1Bytes = await File.ReadAllBytesAsync(picture1Path);
-                var picture1Content = new ByteArrayContent(picture1Bytes);
-                picture1Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
-                content.Add(picture1Content, "picture1", "1.jpg");
-            }
-            else
-            {
-                _logger.LogWarning("Picture1 not found at path: {Path}", picture1Path);
-                return new OperationResult { IsSuccedded = false, Message = "تصویر اول یافت نشد" };
-            }
+			// Add picture files
+			if (File.Exists(picture1Path))
+			{
+				var picture1Bytes = await File.ReadAllBytesAsync(picture1Path);
+				var picture1Content = new ByteArrayContent(picture1Bytes);
+				picture1Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
+				content.Add(picture1Content, "picture1", "1.jpg");
+			}
+			else
+			{
+				_logger.LogWarning("Picture1 not found at path: {Path}", picture1Path);
+				return new OperationResult { IsSuccedded = false, Message = "تصویر اول یافت نشد" };
+			}
 
-            if (File.Exists(picture2Path))
-            {
-                var picture2Bytes = await File.ReadAllBytesAsync(picture2Path);
-                var picture2Content = new ByteArrayContent(picture2Bytes);
-                picture2Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
-                content.Add(picture2Content, "picture2", "2.jpg");
-            }
-            else
-            {
-                _logger.LogWarning("Picture2 not found at path: {Path}", picture2Path);
-                return new OperationResult { IsSuccedded = false, Message = "تصویر دوم یافت نشد" };
-            }
+			if (File.Exists(picture2Path))
+			{
+				var picture2Bytes = await File.ReadAllBytesAsync(picture2Path);
+				var picture2Content = new ByteArrayContent(picture2Bytes);
+				picture2Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
+				content.Add(picture2Content, "picture2", "2.jpg");
+			}
+			else
+			{
+				_logger.LogWarning("Picture2 not found at path: {Path}", picture2Path);
+				return new OperationResult { IsSuccedded = false, Message = "تصویر دوم یافت نشد" };
+			}
 
-            // Send request to Python API
-            var response = await httpClient.PostAsync("embeddings", content);
+			// Send request to Python API
+			var response = await httpClient.PostAsync("embeddings", content);
 
-            if (response.IsSuccessStatusCode)
-            {
-                var responseContent = await response.Content.ReadAsStringAsync();
-                _logger.LogInformation(
-                    "Embeddings generated successfully for Employee {EmployeeId}, Workshop {WorkshopId}",
-                    employeeId, workshopId);
+			if (response.IsSuccessStatusCode)
+			{
+				var responseContent = await response.Content.ReadAsStringAsync();
+				_logger.LogInformation("Embeddings generated successfully for Employee {EmployeeId}, Workshop {WorkshopId}",
+	employeeId, workshopId);
 
-                // ارسال اطلاع‌رسانی به سایر سیستم‌ها
-                if (_notificationService != null)
-                {
-                    await _notificationService.NotifyEmbeddingCreatedAsync(workshopId, employeeId, employeeFullName);
-                }
+				// ارسال اطلاع‌رسانی به سایر سیستم‌ها
+				if (_notificationService != null)
+				{
+					await _notificationService.NotifyEmbeddingCreatedAsync(workshopId, employeeId, employeeFullName);
+				}
 
-                return new OperationResult
-                {
-                    IsSuccedded = true,
-                    Message = "Embedding با موفقیت ایجاد شد"
-                };
-            }
-            else
-            {
-                var errorContent = await response.Content.ReadAsStringAsync();
-                _logger.LogError("Failed to generate embeddings. Status: {StatusCode}, Error: {Error}",
-                    response.StatusCode, errorContent);
+				return new OperationResult
+				{
+					IsSuccedded = true,
+					Message = "Embedding با موفقیت ایجاد شد"
+				};
+			}
+			else
+			{
+				var errorContent = await response.Content.ReadAsStringAsync();
+				_logger.LogError("Failed to generate embeddings. Status: {StatusCode}, Error: {Error}",
+				  response.StatusCode, errorContent);
 
-                return new OperationResult
-                {
-                    IsSuccedded = false,
-                    Message = $"خطا در تولید Embedding: {response.StatusCode}"
-                };
-            }
-        }
-        catch (HttpRequestException ex)
-        {
-            _logger.LogError(ex, "HTTP error while calling embeddings API for Employee {EmployeeId}", employeeId);
-            return new OperationResult
-            {
-                IsSuccedded = false,
-                Message = "خطا در ارتباط با سرور Embedding"
-            };
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error while calling embeddings API for Employee {EmployeeId}", employeeId);
-            return new OperationResult
-            {
-                IsSuccedded = false,
-                Message = "خطای غیرمنتظره در تولید Embedding"
-            };
-        }
-    }
+				return new OperationResult
+				{
+					IsSuccedded = false,
+					Message = $"خطا در تولید Embedding: {response.StatusCode}"
+				};
+			}
+		}
+		catch (HttpRequestException ex)
+		{
+			_logger.LogError(ex, "HTTP error while calling embeddings API for Employee {EmployeeId}", employeeId);
+			return new OperationResult
+			{
+				IsSuccedded = false,
+				Message = "خطا در ارتباط با سرور Embedding"
+			};
+		}
+		catch (Exception ex)
+		{
+			_logger.LogError(ex, "Error while calling embeddings API for Employee {EmployeeId}", employeeId);
+			return new OperationResult
+			{
+				IsSuccedded = false,
+				Message = "خطای غیرمنتظره در تولید Embedding"
+			};
+		}
+	}
 
-    public async Task<OperationResult> GenerateEmbeddingsFromStreamAsync(long employeeId, long workshopId,
-        string employeeFullName, Stream picture1Stream, Stream picture2Stream)
-    {
-        try
-        {
-            var httpClient = _httpClientFactory.CreateClient();
-            httpClient.BaseAddress = new Uri(_apiBaseUrl);
-            httpClient.Timeout = TimeSpan.FromSeconds(30);
+	public async Task<OperationResult> GenerateEmbeddingsFromStreamAsync(long employeeId, long workshopId,
+		string employeeFullName, Stream picture1Stream, Stream picture2Stream)
+	{
+		try
+		{
+			var httpClient = _httpClientFactory.CreateClient();
+			httpClient.BaseAddress = new Uri(_apiBaseUrl);
+			httpClient.Timeout = TimeSpan.FromSeconds(30);
 
-            using var content = new MultipartFormDataContent();
+			using var content = new MultipartFormDataContent();
 
-            // Add form fields
-            content.Add(new StringContent(employeeId.ToString()), "employee_id");
-            content.Add(new StringContent(workshopId.ToString()), "workshop_id");
-            content.Add(new StringContent(employeeFullName ?? ""), "employee_full_name");
+			// Add form fields
+			content.Add(new StringContent(employeeId.ToString()), "employee_id");
+			content.Add(new StringContent(workshopId.ToString()), "workshop_id");
+			content.Add(new StringContent(employeeFullName ?? ""), "employee_full_name");
 
-            // Add picture streams
-            var picture1Content = new StreamContent(picture1Stream);
-            picture1Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
-            content.Add(picture1Content, "picture1", "1.jpg");
+			// Add picture streams
+			var picture1Content = new StreamContent(picture1Stream);
+			picture1Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
+			content.Add(picture1Content, "picture1", "1.jpg");
 
-            var picture2Content = new StreamContent(picture2Stream);
-            picture2Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
-            content.Add(picture2Content, "picture2", "2.jpg");
+			var picture2Content = new StreamContent(picture2Stream);
+			picture2Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
+			content.Add(picture2Content, "picture2", "2.jpg");
 
-            // Send request to Python API
-            var response = await httpClient.PostAsync("embeddings", content);
+			// Send request to Python API
+			var response = await httpClient.PostAsync("embeddings", content);
 
-            if (response.IsSuccessStatusCode)
-            {
-                _logger.LogInformation("Embeddings generated successfully from streams for Employee {EmployeeId}",
-                    employeeId);
+			if (response.IsSuccessStatusCode)
+			{
+				_logger.LogInformation("Embeddings generated successfully from streams for Employee {EmployeeId}", employeeId);
+				
+				// ارسال اطلاع‌رسانی به سایر سیستم‌ها
+				if (_notificationService != null)
+				{
+					await _notificationService.NotifyEmbeddingCreatedAsync(workshopId, employeeId, employeeFullName);
+				}
+				
+				return new OperationResult { IsSuccedded = true, Message = "Embedding با موفقیت ایجاد شد" };
+			}
+			else
+			{
+				var errorContent = await response.Content.ReadAsStringAsync();
+				_logger.LogError("Failed to generate embeddings from streams. Status: {StatusCode}, Error: {Error}",
+						 response.StatusCode, errorContent);
 
-                // ارسال اطلاع‌رسانی به سایر سیستم‌ها
-                if (_notificationService != null)
-                {
-                    await _notificationService.NotifyEmbeddingCreatedAsync(workshopId, employeeId, employeeFullName);
-                }
+				return new OperationResult
+				{
+					IsSuccedded = false,
+					Message = $"خطا در تولید Embedding: {response.StatusCode}"
+				};
+			}
+		}
+		catch (Exception ex)
+		{
+			_logger.LogError(ex, "Error while generating embeddings from streams for Employee {EmployeeId}", employeeId);
+			return new OperationResult
+			{
+				IsSuccedded = false,
+				Message = "خطا در تولید Embedding"
+			};
+		}
+	}
 
-                return new OperationResult { IsSuccedded = true, Message = "Embedding با موفقیت ایجاد شد" };
-            }
-            else
-            {
-                var errorContent = await response.Content.ReadAsStringAsync();
-                _logger.LogError("Failed to generate embeddings from streams. Status: {StatusCode}, Error: {Error}",
-                    response.StatusCode, errorContent);
+	public async Task<OperationResult> RefineEmbeddingAsync(long employeeId, long workshopId, float[] embedding,
+		float confidence, Dictionary<string, object> metadata = null)
+	{
+		try
+		{
+			var httpClient = _httpClientFactory.CreateClient();
+			httpClient.BaseAddress = new Uri(_apiBaseUrl);
+			httpClient.Timeout = TimeSpan.FromSeconds(30);
 
-                return new OperationResult
-                {
-                    IsSuccedded = false,
-                    Message = $"خطا در تولید Embedding: {response.StatusCode}"
-                };
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error while generating embeddings from streams for Employee {EmployeeId}",
-                employeeId);
-            return new OperationResult
-            {
-                IsSuccedded = false,
-                Message = "خطا در تولید Embedding"
-            };
-        }
-    }
+			var requestBody = new
+			{
+				employeeId,
+				workshopId,
+				embedding,
+				confidence,
+				metadata = metadata ?? new Dictionary<string, object>()
+			};
 
-    public async Task<OperationResult> RefineEmbeddingAsync(long employeeId, long workshopId, float[] embedding,
-        float confidence, Dictionary<string, object> metadata = null)
-    {
-        try
-        {
-            var httpClient = _httpClientFactory.CreateClient();
-            httpClient.BaseAddress = new Uri(_apiBaseUrl);
-            httpClient.Timeout = TimeSpan.FromSeconds(30);
+			var response = await httpClient.PostAsJsonAsync("embeddings/refine", requestBody);
 
-            var requestBody = new
-            {
-                employeeId,
-                workshopId,
-                embedding,
-                confidence,
-                metadata = metadata ?? new Dictionary<string, object>()
-            };
+			if (response.IsSuccessStatusCode)
+			{
+				_logger.LogInformation("Embedding refined successfully for Employee {EmployeeId}", employeeId);
+				
+				// ارسال اطلاع‌رسانی به سایر سیستم‌ها
+				if (_notificationService != null)
+				{
+					await _notificationService.NotifyEmbeddingRefinedAsync(workshopId, employeeId);
+				}
+				
+				return new OperationResult { IsSuccedded = true, Message = "Embedding بهبود یافت" };
+			}
+			else
+			{
+				var errorContent = await response.Content.ReadAsStringAsync();
+				_logger.LogError("Failed to refine embedding. Status: {StatusCode}, Error: {Error}",
+				response.StatusCode, errorContent);
 
-            var response = await httpClient.PostAsJsonAsync("embeddings/refine", requestBody);
+				return new OperationResult
+				{
+					IsSuccedded = false,
+					Message = $"خطا در بهبود Embedding: {response.StatusCode}"
+				};
+			}
+		}
+		catch (Exception ex)
+		{
+			_logger.LogError(ex, "Error while refining embedding for Employee {EmployeeId}", employeeId);
+			return new OperationResult
+			{
+				IsSuccedded = false,
+				Message = "خطا در بهبود Embedding"
+			};
+		}
+	}
 
-            if (response.IsSuccessStatusCode)
-            {
-                _logger.LogInformation("Embedding refined successfully for Employee {EmployeeId}", employeeId);
+	public async Task<OperationResult> DeleteEmbeddingAsync(long employeeId, long workshopId)
+	{
+		try
+		{
+			var httpClient = _httpClientFactory.CreateClient();
+			httpClient.BaseAddress = new Uri(_apiBaseUrl);
+			httpClient.Timeout = TimeSpan.FromSeconds(30);
 
-                // ارسال اطلاع‌رسانی به سایر سیستم‌ها
-                if (_notificationService != null)
-                {
-                    await _notificationService.NotifyEmbeddingRefinedAsync(workshopId, employeeId);
-                }
+			var response = await httpClient.DeleteAsync($"embeddings/{workshopId}/{employeeId}");
 
-                return new OperationResult { IsSuccedded = true, Message = "Embedding بهبود یافت" };
-            }
-            else
-            {
-                var errorContent = await response.Content.ReadAsStringAsync();
-                _logger.LogError("Failed to refine embedding. Status: {StatusCode}, Error: {Error}",
-                    response.StatusCode, errorContent);
+			if (response.IsSuccessStatusCode)
+			{
+				_logger.LogInformation("Embedding deleted successfully for Employee {EmployeeId}", employeeId);
+				
+				// ارسال اطلاع‌رسانی به سایر سیستم‌ها
+				if (_notificationService != null)
+				{
+					await _notificationService.NotifyEmbeddingDeletedAsync(workshopId, employeeId);
+				}
+				
+				return new OperationResult { IsSuccedded = true, Message = "Embedding حذف شد" };
+			}
+			else
+			{
+				var errorContent = await response.Content.ReadAsStringAsync();
+				_logger.LogError("Failed to delete embedding. Status: {StatusCode}, Error: {Error}",
+								response.StatusCode, errorContent);
 
-                return new OperationResult
-                {
-                    IsSuccedded = false,
-                    Message = $"خطا در بهبود Embedding: {response.StatusCode}"
-                };
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error while refining embedding for Employee {EmployeeId}", employeeId);
-            return new OperationResult
-            {
-                IsSuccedded = false,
-                Message = "خطا در بهبود Embedding"
-            };
-        }
-    }
+				return new OperationResult
+				{
+					IsSuccedded = false,
+					Message = $"خطا در حذف Embedding: {response.StatusCode}"
+				};
+			}
+		}
+		catch (Exception ex)
+		{
+			_logger.LogError(ex, "Error while deleting embedding for Employee {EmployeeId}", employeeId);
+			return new OperationResult
+			{
+				IsSuccedded = false,
+				Message = "خطا در حذف Embedding"
+			};
+		}
+	}
 
-    public async Task<OperationResult> DeleteEmbeddingAsync(long employeeId, long workshopId)
-    {
-        try
-        {
-            var httpClient = _httpClientFactory.CreateClient();
-            httpClient.BaseAddress = new Uri(_apiBaseUrl);
-            httpClient.Timeout = TimeSpan.FromSeconds(30);
+	public async Task<OperationResult<FaceEmbeddingResponse>> GetEmbeddingAsync(long employeeId, long workshopId)
+	{
+		try
+		{
+			var httpClient = _httpClientFactory.CreateClient();
+			httpClient.BaseAddress = new Uri(_apiBaseUrl);
+			httpClient.Timeout = TimeSpan.FromSeconds(30);
 
-            var response = await httpClient.DeleteAsync($"embeddings/{workshopId}/{employeeId}");
+			var response = await httpClient.GetAsync($"embeddings/{workshopId}/{employeeId}");
 
-            if (response.IsSuccessStatusCode)
-            {
-                _logger.LogInformation("Embedding deleted successfully for Employee {EmployeeId}", employeeId);
+			if (response.IsSuccessStatusCode)
+			{
+				var content = await response.Content.ReadAsStringAsync();
+				var embeddingData = JsonSerializer.Deserialize<FaceEmbeddingResponse>(content,
+		   new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
 
-                // ارسال اطلاع‌رسانی به سایر سیستم‌ها
-                if (_notificationService != null)
-                {
-                    await _notificationService.NotifyEmbeddingDeletedAsync(workshopId, employeeId);
-                }
+				_logger.LogInformation("Embedding retrieved successfully for Employee {EmployeeId}", employeeId);
 
-                return new OperationResult { IsSuccedded = true, Message = "Embedding حذف شد" };
-            }
-            else
-            {
-                var errorContent = await response.Content.ReadAsStringAsync();
-                _logger.LogError("Failed to delete embedding. Status: {StatusCode}, Error: {Error}",
-                    response.StatusCode, errorContent);
-
-                return new OperationResult
-                {
-                    IsSuccedded = false,
-                    Message = $"خطا در حذف Embedding: {response.StatusCode}"
-                };
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error while deleting embedding for Employee {EmployeeId}", employeeId);
-            return new OperationResult
-            {
-                IsSuccedded = false,
-                Message = "خطا در حذف Embedding"
-            };
-        }
-    }
-
-    public async Task<OperationResult<FaceEmbeddingResponse>> GetEmbeddingAsync(long employeeId, long workshopId)
-    {
-        try
-        {
-            var httpClient = _httpClientFactory.CreateClient();
-            httpClient.BaseAddress = new Uri(_apiBaseUrl);
-            httpClient.Timeout = TimeSpan.FromSeconds(30);
-
-            var response = await httpClient.GetAsync($"embeddings/{workshopId}/{employeeId}");
-
-            if (response.IsSuccessStatusCode)
-            {
-                var content = await response.Content.ReadAsStringAsync();
-                var embeddingData = JsonSerializer.Deserialize<FaceEmbeddingResponse>(content,
-                    new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
-
-                _logger.LogInformation("Embedding retrieved successfully for Employee {EmployeeId}", employeeId);
-
-                return new OperationResult<FaceEmbeddingResponse>
-                {
-                    IsSuccedded = true,
-                    Message = "Embedding دریافت شد",
-                    Data = embeddingData
-                };
-            }
-            else
-            {
-                var errorContent = await response.Content.ReadAsStringAsync();
-                _logger.LogError("Failed to get embedding. Status: {StatusCode}, Error: {Error}",
-                    response.StatusCode, errorContent);
-
-                return new OperationResult<FaceEmbeddingResponse>
-                {
-                    IsSuccedded = false,
-                    Message = $"خطا در دریافت Embedding: {response.StatusCode}"
-                };
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error while getting embedding for Employee {EmployeeId}", employeeId);
-            return new OperationResult<FaceEmbeddingResponse>
-            {
-                IsSuccedded = false,
-                Message = "خطا در دریافت Embedding"
-            };
-        }
-    }
-
-    public async Task<OperationResult> UpdateEmbeddingFullNameAsync(long employeeId, long workshopId,
-        string newFullName)
-    {
-        try
-        {
-            var httpClient = _httpClientFactory.CreateClient();
-            httpClient.BaseAddress = new Uri(_apiBaseUrl);
-            httpClient.Timeout = TimeSpan.FromSeconds(30);
-
-            var requestBody = new
-            {
-                employee_id = employeeId,
-                workshop_id = workshopId,
-                employee_full_name = newFullName
-            };
-
-            var response = await httpClient.PutAsJsonAsync("embeddings/update-name", requestBody);
-
-            if (response.IsSuccessStatusCode)
-            {
-                _logger.LogInformation("Employee Name Changed For {EmployeeId} In workshop ={WorkshopId}", employeeId,
-                    workshopId);
-
-                // ارسال اطلاع‌رسانی به سایر سیستم‌ها
-                if (_notificationService != null)
-                {
-                    //await _notificationService.NotifyEmbeddingRefinedAsync(workshopId, employeeId);
-                }
-
-                return new OperationResult { IsSuccedded = true, Message = "عملیات با موفقیت انجام شد" };
-            }
-            else
-            {
-                var errorContent = await response.Content.ReadAsStringAsync();
-                _logger.LogError("Failed to refine embedding. Status: {StatusCode}, Error: {Error}",
-                    response.StatusCode, errorContent);
-
-                return new OperationResult
-                {
-                    IsSuccedded = false,
-                    Message = $"خطا در بهبود Embedding: {response.StatusCode}"
-                };
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error while Changing EmployeeFullName for Employee {EmployeeId}", employeeId);
-            return new OperationResult
-            {
-                IsSuccedded = false,
-                Message = "خطا در بهبود Embedding"
-            };
-        }
-    }
-}
+				return new OperationResult<FaceEmbeddingResponse>
+				{
+					IsSuccedded = true,
+					Message = "Embedding دریافت شد",
+					Data = embeddingData
+				};
+			}
+			else
+			{
+				var errorContent = await response.Content.ReadAsStringAsync();
+				_logger.LogError("Failed to get embedding. Status: {StatusCode}, Error: {Error}",
+						response.StatusCode, errorContent);
+					
+				return new OperationResult<FaceEmbeddingResponse>
+				{
+					IsSuccedded = false,
+					Message = $"خطا در دریافت Embedding: {response.StatusCode}"
+				};
+			}
+		}
+		catch (Exception ex)
+		{
+			_logger.LogError(ex, "Error while getting embedding for Employee {EmployeeId}", employeeId);
+			return new OperationResult<FaceEmbeddingResponse>
+			{
+				IsSuccedded = false,
+				Message = "خطا در دریافت Embedding"
+			};
+		}
+	}
+}

AccountManagement.Application.Contracts/Account/CreateAccount.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using AccountManagement.Application.Contracts.Role;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.Rendering;
 
 namespace AccountManagement.Application.Contracts.Account;
 
@@ -36,20 +35,4 @@ public class CreateAccount
     public string Email { get; set; }
     public string VerifyCode { get; set; }
     public string IsActiveString { get; set; }
-
-    /// <summary>
-    /// آیا کاربر در پروگرام منیجر فعالیت مبکند؟
-    /// </summary>
-    public bool IsProgramManagerUser { get; set; }
-    /// <summary>
-    /// لیست نقش های پروگرام منیجر
-    /// </summary>
-    public List<long> UserRoles { get; set; }
-
-    /// <summary>
-    /// لیست نقشهای موجود در پروگرام منیجر
-    /// </summary>
-    public SelectList RoleList { get; set; }
-
-
 }

AccountManagement.Application.Contracts/Account/EditAccount.cs

@@ -3,5 +3,4 @@
 public class EditAccount : CreateAccount
 {
     public long Id { get; set; }
-
 }

AccountManagement.Application.Contracts/Account/EditClientAccount.cs

@@ -1,4 +1,10 @@
-namespace AccountManagement.Application.Contracts.Account;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AccountManagement.Application.Contracts.Account;
 
 public class EditClientAccount : RegisterAccount
 {

AccountManagement.Application.Contracts/Account/IAccountApplication.cs

@@ -2,21 +2,15 @@
 
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Shared.Contracts.PmUser.Queries;
 
 namespace AccountManagement.Application.Contracts.Account;
 
 public interface IAccountApplication
 {
     AccountViewModel GetAccountBy(long id);
-    /// <summary>
-    /// ایجاد کاربر گزارشگیر و پروگرام منیجر
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    Task<OperationResult> Create(CreateAccount command);
+    OperationResult Create(CreateAccount command);
     OperationResult RegisterClient(RegisterAccount command);
-    Task<OperationResult> Edit(EditAccount command);
+    OperationResult Edit(EditAccount command);
     OperationResult EditClient(EditClientAccount command);
     OperationResult ChangePassword(ChangePassword command);
     OperationResult Login(Login command);
@@ -34,7 +28,7 @@ public interface IAccountApplication
     OperationResult DeActive(long id);
     OperationResult DirectLogin(long id);
 
-    // AccountLeftWorkViewModel WorkshopList(long accountId);
+    AccountLeftWorkViewModel WorkshopList(long accountId);
     OperationResult SaveWorkshopAccount(
         List<WorkshopAccountlistViewModel> workshopAccountList,
         string startDate,
@@ -73,8 +67,6 @@ public interface IAccountApplication
     List<AccountViewModel> GetAdminAccountsNew();
 
     void CameraLogin(CameraLoginRequest request);
-
-    Task<GetPmUserDto> GetPmUserAsync(long accountId);
 }
 
 public class CameraLoginRequest

AccountManagement.Application.Contracts/Account/RegisterAccount.cs

@@ -1,4 +1,10 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using _0_Framework.Application;
 using Microsoft.AspNetCore.Http;
 
 namespace AccountManagement.Application.Contracts.Account;

AccountManagement.Application.Contracts/Account/WorkshopSelectList.cs

@@ -1,4 +1,10 @@
-namespace AccountManagement.Application.Contracts.Account;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AccountManagement.Application.Contracts.Account;
 
 public class WorkshopSelectList
 {

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

@@ -1,21 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-	  <NuGetAudit>false</NuGetAudit>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.3.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.1" />
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\0_Framework\0_Framework.csproj" />
-    <ProjectReference Include="..\Shared.Contracts\Shared.Contracts.csproj" />
   </ItemGroup>
 
 </Project>

AccountManagement.Application.Contracts/ProgramManagerApiResult/ApiResponse.cs

@@ -1,11 +0,0 @@
-namespace AccountManagement.Application.Contracts.ProgramManagerApiResult;
-
-public record ApiResponse
-{
-    public bool isSuccess { get; set; }
-    public string errorMessage { get; set; }
-
-
-
-    public ErrorType ErrorType { get; set; }
-}

AccountManagement.Application.Contracts/ProgramManagerApiResult/CreateProgramManagerRole.cs

@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-
-namespace AccountManagement.Application.Contracts.ProgramManagerApiResult;
-
-
-public record CreateProgramManagerRole
-{
-    /// <summary>
-    /// نام نقش
-    /// </summary>
-    public string RoleName { get; set; }
-
-    /// <summary>
-    /// کدهای دسترسی
-    /// </summary>
-    public List<int> Permissions { get; set; }
-
-    /// <summary>
-    /// آی دی اکانت گزارشگیر
-    /// </summary>
-    public long? GozareshgirRoleId { get; set; }
-};

AccountManagement.Application.Contracts/ProgramManagerApiResult/CreateProgramManagerUser.cs

@@ -1,7 +0,0 @@
-using System.Collections.Generic;
-
-namespace AccountManagement.Application.Contracts.ProgramManagerApiResult;
-
-public record CreateProgramManagerUser(string FullName, string UserName, string Password, string Mobile, string Email, long? AccountId, List<long> Roles);
-
-public record EditUserCommand(string FullName, string UserName, string Mobile, long AccountId, List<long> Roles, bool IsActive);

AccountManagement.Application.Contracts/ProgramManagerApiResult/ErrorType.cs

@@ -1,11 +0,0 @@
-namespace AccountManagement.Application.Contracts.ProgramManagerApiResult;
-
-public enum ErrorType
-{
-    None,
-    BadRequest,
-    NotFound,
-    Unauthorized,
-    Validation,
-    InternalServerError
-}

AccountManagement.Application.Contracts/ProgramManagerApiResult/RoleResponse.cs

@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-
-namespace AccountManagement.Application.Contracts.ProgramManagerApiResult;
-
-public class RoleResponse
-{
-    public bool isSuccess { get; set; }
-    public RolesData data { get; set; }
-}
-
-public class RolesData
-{
-    public List<RoleList> role { get; set; }
-}
-
-public class RoleList
-{
-    public int id { get; set; }
-    public string roleName { get; set; }
-    public int gozareshgirRoleId { get; set; }
-    public List<int> permissions { get; set; }
-}

AccountManagement.Application.Contracts/ProgramManagerApiResult/SingleUserResponseResult.cs

@@ -1,55 +0,0 @@
-using System.Collections.Generic;
-using static System.Runtime.InteropServices.JavaScript.JSType;
-
-namespace AccountManagement.Application.Contracts.ProgramManagerApiResult;
-
-public record SingleUserResponseResult
-{
-    public bool isSuccess { get; set; }
-    public SingleUserData Data { get; set; }
-};
-
-public record SingleUserData
-
-{
-    public long id { get; set; }
-    /// <summary>
-    /// نام و نام خانوادگی 
-    /// </summary>
-    public string fullName { get; set; }
-
-    /// <summary>
-    /// نام کاربری
-    /// </summary>
-    public string userName { get; set; }
-
-
-
-    /// <summary>
-    /// مسیر عکس پروفایل
-    /// </summary>
-    public string profilePhotoPath { get; set; }
-
-    /// <summary>
-    /// شماره موبایل
-    /// </summary>
-    public string mobile { get; set; }
-
-
-    /// <summary>
-    /// فعال/غیر فعال بودن یوزر
-    /// </summary>
-    public bool isActive { get; set; }
-
-    /// <summary>
-    /// گذرواژه 
-    /// </summary>
-    public string password { get; set; }
-
-    /// <summary>
-    /// ای دی اکانت کاربر در گزارشگیر
-    /// </summary>
-    public long? accountId { get; set; }
-
-    public List<long> Roles { get; set; }
-}

AccountManagement.Application.Contracts/Role/CreateRole.cs

@@ -9,10 +9,6 @@ namespace AccountManagement.Application.Contracts.Role
         [Required(ErrorMessage = ValidationMessages.IsRequired)]
         public string Name { get; set; }
         public List<int> Permissions { get; set; }
-        /// <summary>
-        /// لیست پرمیشن های پروگرام منیجر
-        /// </summary>
-        public List<int> PmPermissions { get; set; }
     }
 
 }

AccountManagement.Application.Contracts/Role/IRoleApplication.cs

@@ -1,26 +1,13 @@
 using _0_Framework.Application;
-
-using Microsoft.AspNetCore.Mvc.Rendering;
 using System.Collections.Generic;
-using System.Threading.Tasks;
-using Shared.Contracts.PmRole.Queries;
 
 namespace AccountManagement.Application.Contracts.Role
 {
     public interface IRoleApplication
     {
-        Task<OperationResult> Create(CreateRole command);
-        Task<OperationResult> Edit(EditRole command);
+        OperationResult Create(CreateRole command);
+        OperationResult Edit(EditRole command);
         List<RoleViewModel> List();
         EditRole GetDetails(long id);
-
-        #region ProgramManager
-
-        Task<SelectList> GetPmRoleList(long? gozareshgirRoleId);
-        Task<List<GetPmRolesDto>> GetPmRoleListToEdit(long? gozareshgirRoleId);
-
-
-        #endregion
-
     }
 }

AccountManagement.Application/AccountApplication.cs

@@ -1,25 +1,29 @@
-using _0_Framework.Application;
-using _0_Framework.Application.Sms;
-using _0_Framework.Exceptions;
+using System;
+using System.Collections;
+using _0_Framework.Application;
 using AccountManagement.Application.Contracts.Account;
 using AccountManagement.Domain.AccountAgg;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+using _0_Framework.Application.Sms;
 using AccountManagement.Domain.AccountLeftWorkAgg;
 using AccountManagement.Domain.CameraAccountAgg;
-using AccountManagement.Domain.PositionAgg;
 using AccountManagement.Domain.RoleAgg;
+using CompanyManagment.App.Contracts.Workshop;
+using Microsoft.AspNetCore.Http;
+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;
 using AccountManagement.Domain.SubAccountRoleAgg;
-using Company.Domain._common;
-using Company.Domain.WorkshopAgg;
 using Company.Domain.WorkshopSubAccountAgg;
-using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Shared.Contracts.PmUser.Commands;
-using Shared.Contracts.PmUser.Queries;
 
 //using AccountManagement.Domain.RoleAgg;
 
@@ -35,25 +39,15 @@ public class AccountApplication : IAccountApplication
     private readonly ISmsService _smsService;
     private readonly ICameraAccountRepository _cameraAccountRepository;
     private readonly IPositionRepository _positionRepository;
-    private readonly IAccountLeftworkRepository _accountLeftworkRepository;
+    private readonly IAccountLeftworkRepository _accountLeftworkRepository; 
     private readonly IWorkshopRepository _workshopRepository;
     private readonly ISubAccountRepository _subAccountRepository;
     private readonly ISubAccountRoleRepository _subAccountRoleRepository;
     private readonly IWorkshopSubAccountRepository _workshopSubAccountRepository;
     private readonly ISubAccountPermissionSubtitle1Repository _accountPermissionSubtitle1Repository;
 
-    private readonly IUnitOfWork _unitOfWork;
-    private readonly IPmUserQueryService _pmUserQueryService;
-    private readonly IPmUserCommandService _pmUserCommandService;
-
-    public AccountApplication(IAccountRepository accountRepository, IPasswordHasher passwordHasher,
-        IFileUploader fileUploader, IAuthHelper authHelper, IRoleRepository roleRepository, IWorker worker,
-        ISmsService smsService, ICameraAccountRepository cameraAccountRepository,
-        IPositionRepository positionRepository, IAccountLeftworkRepository accountLeftworkRepository,
-        IWorkshopRepository workshopRepository, ISubAccountRepository subAccountRepository,
-        ISubAccountRoleRepository subAccountRoleRepository, IWorkshopSubAccountRepository workshopSubAccountRepository,
-        ISubAccountPermissionSubtitle1Repository accountPermissionSubtitle1Repository, IUnitOfWork unitOfWork,
-        IPmUserQueryService pmUserQueryService, IPmUserCommandService pmUserCommandService)
+	public AccountApplication(IAccountRepository accountRepository, IPasswordHasher passwordHasher,
+        IFileUploader fileUploader, IAuthHelper authHelper, IRoleRepository roleRepository, IWorker worker, ISmsService smsService, ICameraAccountRepository cameraAccountRepository, IPositionRepository positionRepository, IAccountLeftworkRepository accountLeftworkRepository, IWorkshopRepository workshopRepository, ISubAccountRepository subAccountRepository, ISubAccountRoleRepository subAccountRoleRepository, IWorkshopSubAccountRepository workshopSubAccountRepository, ISubAccountPermissionSubtitle1Repository accountPermissionSubtitle1Repository)
     {
         _authHelper = authHelper;
         _roleRepository = roleRepository;
@@ -66,13 +60,10 @@ public class AccountApplication : IAccountApplication
         _subAccountRoleRepository = subAccountRoleRepository;
         _workshopSubAccountRepository = workshopSubAccountRepository;
         _accountPermissionSubtitle1Repository = accountPermissionSubtitle1Repository;
-        _unitOfWork = unitOfWork;
-
-        _pmUserQueryService = pmUserQueryService;
-        _pmUserCommandService = pmUserCommandService;
         _fileUploader = fileUploader;
         _passwordHasher = passwordHasher;
         _accountRepository = accountRepository;
+            
     }
 
     public OperationResult EditClient(EditClientAccount command)
@@ -93,8 +84,7 @@ public class AccountApplication : IAccountApplication
                 (x.Mobile == command.Mobile && x.id != command.Id)))
             return opreation.Failed("شماره موبایل تکراری است");
         if (_accountRepository.Exists(x =>
-                (x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(x.NationalCode) &&
-                 x.id != command.Id)))
+                (x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(x.NationalCode) && x.id != command.Id)))
             return opreation.Failed("کد ملی تکراری است");
         if (_accountRepository.Exists(x =>
                 (x.Email == command.Email && !string.IsNullOrWhiteSpace(x.Email) && x.id != command.Id)))
@@ -102,8 +92,7 @@ public class AccountApplication : IAccountApplication
 
         var path = $"profilePhotos";
         var picturePath = _fileUploader.Upload(command.ProfilePhoto, path);
-        editAccount.EditClient(command.Fullname, command.Username, command.Mobile, picturePath, command.Email,
-            command.NationalCode);
+        editAccount.EditClient(command.Fullname,command.Username,command.Mobile,picturePath,command.Email,command.NationalCode);
         _accountRepository.SaveChanges();
         return opreation.Succcedded();
     }
@@ -134,7 +123,7 @@ public class AccountApplication : IAccountApplication
         };
     }
 
-    public async Task<OperationResult> Create(CreateAccount command)
+    public OperationResult Create(CreateAccount command)
     {
         var operation = new OperationResult();
 
@@ -144,59 +133,15 @@ public class AccountApplication : IAccountApplication
         var password = _passwordHasher.Hash(command.Password);
         var roleName = _roleRepository.GetDetails(command.RoleId);
         var path = $"profilePhotos";
-        var picturePath = "";
         if (_fileUploader != null)
         {
-            picturePath = _fileUploader.Upload(command.ProfilePhoto, path);
+            var picturePath = _fileUploader.Upload(command.ProfilePhoto, path);
+            var account = new Account(command.Fullname, command.Username, password, command.Mobile, command.RoleId,
+                picturePath, roleName.Name,"true","false");
+            _accountRepository.Create(account);
         }
 
-        var account = new Account(command.Fullname, command.Username, password, command.Mobile, command.RoleId,
-            picturePath, roleName.Name, "true", "false");
-
-        _unitOfWork.BeginAccountContext();
-
-
-        _accountRepository.Create(account);
         _accountRepository.SaveChanges();
-
-        if (command.IsProgramManagerUser)
-        {
-            if (command.UserRoles == null)
-                return operation.Failed("حداقل یک نقش برای کاربر مدیریت پروژه لازم است");
-            var pmUserRoles = command.UserRoles.Where(x => x > 0).ToList();
-            var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname, command.Username,
-                account.Password, command.Mobile,
-                null, account.id, pmUserRoles));
-            if (!createPm.isSuccess)
-            {
-                _unitOfWork.RollbackAccountContext();
-                return operation.Failed("خطا در ویرایش کاربر پروگرام منیجر");
-            }
-
-
-            //var url = "api/user/create";
-            //var key = SecretKeys.ProgramManagerInternalApi;
-
-            //var response = InternalApiCaller.PostAsync<CreateProgramManagerUser, ApiResponse>(
-            //    url,
-            //    key,
-            //    parameters
-            //);
-
-            //if (!response.Success)
-            //{
-            //    _unitOfWork.RollbackAccountContext();
-            //    return operation.Failed(response.Error);
-            //}
-
-            //if (!response.Result.isSuccess)
-            //{
-            //    _unitOfWork.RollbackAccountContext();
-            //    return operation.Failed(response.Result.errorMessage);
-            //}
-        }
-
-        _unitOfWork.CommitAccountContext();
         return operation.Succcedded();
     }
 
@@ -210,8 +155,8 @@ public class AccountApplication : IAccountApplication
             return opreation.Failed("پر کردن تمامی فیلدها الزامی است");
         if (_accountRepository.Exists(x => x.Username == command.Username))
             return opreation.Failed("نام کاربری تکراری است");
-        if (_accountRepository.Exists(x => x.Mobile == command.Mobile && x.IsActiveString == "true"))
-
+        if (_accountRepository.Exists(x => x.Mobile == command.Mobile && x.IsActiveString =="true"))
+                                          
             return opreation.Failed("مقادیر وارد شده تکراری است");
 
         //var nationalCodeValidation = command.NationalCode.NationalCodeValid();
@@ -228,14 +173,14 @@ public class AccountApplication : IAccountApplication
         //        break;
         //}
         var password = _passwordHasher.Hash(command.Password);
-        var register = new Account(command.Fullname, command.Username, password, command.Mobile, command.NationalCode);
+        var register =new Account(command.Fullname,command.Username, password, command.Mobile, command.NationalCode);
         _accountRepository.Create(register);
         _accountRepository.SaveChanges();
 
-        return opreation.Succcedded(register.id, message: "ثبت نام شما با موفقیت انجام شد");
+        return opreation.Succcedded(register.id,message: "ثبت نام شما با موفقیت انجام شد");
     }
 
-    public async Task<OperationResult> Edit(EditAccount command)
+    public OperationResult Edit(EditAccount command)
     {
         var operation = new OperationResult();
         var account = _accountRepository.Get(command.Id);
@@ -249,124 +194,8 @@ public class AccountApplication : IAccountApplication
         var roleName = _roleRepository.GetDetails(command.RoleId);
         var path = $"profilePhotos";
         var picturePath = _fileUploader.Upload(command.ProfilePhoto, path);
-        _unitOfWork.BeginAccountContext();
         account.Edit(command.Fullname, command.Username, command.Mobile, command.RoleId, picturePath, roleName.Name);
         _accountRepository.SaveChanges();
-        var key = SecretKeys.ProgramManagerInternalApi;
-
-        //var apiResult = InternalApiCaller.GetAsync<SingleUserResponseResult>(
-        //    $"api/user/{account.id}",
-        //    key
-        //);
-        var userResult = await _pmUserQueryService.GetPmUserDataByAccountId(account.id);
-
-        if (command.UserRoles == null)
-            return operation.Failed("حداقل یک نقش برای کاربر مدیریت پروژه لازم است");
-        var pmUserRoles = command.UserRoles.Where(x => x > 0).ToList();
-
-        //اگر کاربر در پروگرام منیجر قبلا ایجاد شده
-        if (userResult.Id > 0)
-        {
-            if (!command.UserRoles.Any())
-            {
-                _unitOfWork.RollbackAccountContext();
-                return operation.Failed("حداقل یک نقش باید انتخاب شود");
-            }
-
-            var editPm = await _pmUserCommandService.Edit(new EditPmUserDto(command.Fullname, command.Username,
-                command.Mobile, account.id, pmUserRoles,
-                command.IsProgramManagerUser));
-            if (!editPm.isSuccess)
-            {
-                _unitOfWork.RollbackAccountContext();
-                return operation.Failed("خطا در ویرایش کاربر پروگرام منیجر");
-            }
-
-            //var parameters = new EditUserCommand(
-            //    command.Fullname,
-            //    command.Username,
-            //    command.Mobile,
-            //    account.id,
-            //    command.UserRoles,
-            //    command.IsProgramManagerUser
-            //);
-            //var url = "api/user/edit";
-            //var response = InternalApiCaller.PostAsync<EditUserCommand, ApiResponse>(
-            //    url,
-            //    key,
-            //    parameters
-            //);
-
-            //if (!response.Success)
-            //{
-            //    _unitOfWork.RollbackAccountContext();
-            //    return operation.Failed(response.Error);
-
-            //}
-
-            //if (!response.Result.isSuccess)
-            //{
-            //    _unitOfWork.RollbackAccountContext();
-            //    return operation.Failed(response.Error);
-            //}
-        }
-        else //اگر کاربر قبلا ایجاد نشده
-        {
-            //اگر تیک فعالیت در پروگرام منیجر روشن بود
-            if (command.IsProgramManagerUser)
-            {
-                if (!command.UserRoles.Any())
-                {
-                    _unitOfWork.RollbackAccountContext();
-                    return operation.Failed("حداقل یک نقش باید انتخاب شود");
-                }
-
-
-                var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname,
-                    command.Username, account.Password, command.Mobile,
-                    null, account.id, pmUserRoles));
-                if (!createPm.isSuccess)
-                {
-                    _unitOfWork.RollbackAccountContext();
-                    return operation.Failed("خطا در ویرایش کاربر پروگرام منیجر");
-                }
-
-
-                //var parameters = new CreateProgramManagerUser(
-                //    command.Fullname,
-                //    command.Username,
-                //    account.Password,
-                //    command.Mobile,
-                //    command.Email,
-                //    account.id,
-                //    command.UserRoles
-                //);
-
-                //var url = "api/user/Create";
-
-
-                //var response = InternalApiCaller.PostAsync<CreateProgramManagerUser, ApiResponse>(
-                //    url,
-                //    key,
-                //    parameters
-                //);
-
-                //if (!response.Success)
-                //{
-                //    _unitOfWork.RollbackAccountContext();
-                //    return operation.Failed(response.Error);
-
-                //}
-
-                //if (!response.Result.isSuccess)
-                //{
-                //    _unitOfWork.RollbackAccountContext();
-                //    return operation.Failed(response.Error);
-                //}
-            }
-        }
-
-        _unitOfWork.CommitAccountContext();
         return operation.Succcedded();
     }
 
@@ -377,21 +206,22 @@ public class AccountApplication : IAccountApplication
 
     public OperationResult Login(Login command)
     {
+
         long idAutoriz = 0;
         var operation = new OperationResult();
         if (string.IsNullOrWhiteSpace(command.Password))
-            return operation.Failed(ApplicationMessages.EmptyPassword);
+	        return operation.Failed(ApplicationMessages.EmptyPassword);
 
         if (string.IsNullOrWhiteSpace(command.Username))
-            return operation.Failed(ApplicationMessages.EmptyUsername);
+	        return operation.Failed(ApplicationMessages.EmptyUsername);
 
-        var account = _accountRepository.GetBy(command.Username);
+		var account = _accountRepository.GetBy(command.Username);
         var cameraAccount = _cameraAccountRepository.GetBy(command.Username);
-        SubAccount subAccount = _subAccountRepository.GetBy(command.Username);
-        if (account == null && cameraAccount == null && subAccount == null)
-            return operation.Failed(ApplicationMessages.WrongUserPass);
+		SubAccount subAccount = _subAccountRepository.GetBy(command.Username);
+		if (account == null && cameraAccount == null && subAccount == null)
+			return operation.Failed(ApplicationMessages.WrongUserPass);
 
-        if (account != null)
+		if (account != null)
         {
             (bool Verified, bool NeedUpgrade) result = _passwordHasher.Check(account.Password, command.Password);
             if (!result.Verified)
@@ -400,29 +230,6 @@ public class AccountApplication : IAccountApplication
                 .Permissions
                 .Select(x => x.Code)
                 .ToList();
-            //PmPermission
-            var PmUserData = _pmUserQueryService.GetPmUserDataByAccountId(account.id)
-                .GetAwaiter().GetResult();
-            long? pmUserId = null;
-            if (PmUserData != null)
-            {
-                if (PmUserData.AccountId > 0 && PmUserData.IsActive)
-                {
-                    var pmUserPermissions =
-                        PmUserData.RoleListDto != null
-                            ? PmUserData.RoleListDto
-                                .SelectMany(x => x.Permissions)
-                                .Where(p => p != 99)
-                                .Distinct()
-                                .ToList()
-                            : new List<int>();
-                    permissions.AddRange(pmUserPermissions);
-                }
-
-                pmUserId = PmUserData.Id > 0 ? PmUserData.Id : null;
-            }
-
-
             int? positionValue;
             if (account.PositionId != null)
             {
@@ -432,45 +239,37 @@ public class AccountApplication : IAccountApplication
             {
                 positionValue = null;
             }
-
             var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
-                , account.Username, account.Mobile, account.ProfilePhoto,
-                permissions, account.RoleName, account.AdminAreaPermission,
-                account.ClientAriaPermission, positionValue, 0, pmUserId);
+                , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, account.AdminAreaPermission, account.ClientAriaPermission, positionValue);
 
             if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" &&
                 account.IsActiveString == "true")
             {
-                var clientPermissions = _accountPermissionSubtitle1Repository.GetAllPermissionCodes();
-                authViewModel.Permissions = clientPermissions;
-                var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x =>
-                    new WorkshopClaim
-                    {
-                        PersonnelCount = x.PersonnelCount,
-                        Id = x.Id,
-                        Name = x.WorkshopFullName,
-                        Slug = _passwordHasher.SlugHasher(x.Id)
-                    }).OrderByDescending(x => x.PersonnelCount).ToList();
-                authViewModel.WorkshopList = workshopList;
-                if (workshopList.Any())
+	            var clientPermissions = _accountPermissionSubtitle1Repository.GetAllPermissionCodes();
+	            authViewModel.Permissions = clientPermissions;
+                var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x => new WorkshopClaim
                 {
-                    var workshop = workshopList.First();
-                    authViewModel.WorkshopName = workshop.Name;
-                    authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
+                    PersonnelCount = x.PersonnelCount,
+                    Id = x.Id,
+                    Name = x.WorkshopFullName,
+                    Slug = _passwordHasher.SlugHasher(x.Id)
+                }).OrderByDescending(x => x.PersonnelCount).ToList();
+                authViewModel.WorkshopList = workshopList;
+				if (workshopList.Any())
+				{
+					var workshop = workshopList.First();
+					authViewModel.WorkshopName = workshop.Name;
+					authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
                     authViewModel.WorkshopId = workshop.Id;
                 }
-            }
+			}
 
             _authHelper.Signin(authViewModel);
 
-            if ((account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" &&
-                 account.IsActiveString == "true") || (account.AdminAreaPermission == "true" &&
-                                                       account.ClientAriaPermission == "false" &&
-                                                       account.IsActiveString == "true"))
+            if ((account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" && account.IsActiveString == "true") || (account.AdminAreaPermission == "true" && account.ClientAriaPermission == "false" && account.IsActiveString == "true"))
                 idAutoriz = 1;
 
-            if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" &&
-                account.IsActiveString == "true")
+            if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" && account.IsActiveString == "true")
                 idAutoriz = 2;
         }
 
@@ -482,8 +281,7 @@ public class AccountApplication : IAccountApplication
 
             var mobile = string.IsNullOrWhiteSpace(cameraAccount.Mobile) ? " " : cameraAccount.Mobile;
             var authViewModel = new CameraAuthViewModel(cameraAccount.id, cameraAccount.WorkshopId,
-                cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId,
-                cameraAccount.IsActiveSting);
+                cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId,cameraAccount.IsActiveSting);
             if (cameraAccount.IsActiveSting == "true")
             {
                 _authHelper.CameraSignIn(authViewModel);
@@ -493,43 +291,42 @@ public class AccountApplication : IAccountApplication
             {
                 idAutoriz = 0;
             }
+          
         }
 
-        if (subAccount != null)
-        {
-            (bool Verified, bool NeedUpgrade) result = _passwordHasher.Check(subAccount.Password, command.Password);
-            if (!result.Verified)
-                return operation.Failed(ApplicationMessages.WrongUserPass);
-            var role = _subAccountRoleRepository.Get(subAccount.SubAccountRoleId);
+		if (subAccount != null)
+		{
+			(bool Verified, bool NeedUpgrade) result = _passwordHasher.Check(subAccount.Password, command.Password);
+			if (!result.Verified)
+				return operation.Failed(ApplicationMessages.WrongUserPass);
+			var role = _subAccountRoleRepository.Get(subAccount.SubAccountRoleId);
 
-            var permissions = role.RolePermissions.Select(x => x.PermissionCode).ToList();
-            var authViewModel = new AuthViewModel(subAccount.AccountId, subAccount.SubAccountRoleId, subAccount.FullName
-                , subAccount.Username, subAccount.PhoneNumber, "", permissions, role.Title, "false",
-                "true", 0, subAccount.id);
-            var workshopList = _workshopSubAccountRepository.GetWorkshopsBySubAccountId(subAccount.id);
-            authViewModel.WorkshopList = workshopList.Select(x => new WorkshopClaim()
-            {
-                Slug = _passwordHasher.SlugHasher(x.WorkshopId),
-                Name = x.WorkshopName,
-                PersonnelCount = x.PersonnelCount,
-                Id = x.WorkshopId
-            }).ToList();
+			var permissions = role.RolePermissions.Select(x => x.PermissionCode).ToList();
+			var authViewModel = new AuthViewModel(subAccount.AccountId, subAccount.SubAccountRoleId, subAccount.FullName
+				, subAccount.Username, subAccount.PhoneNumber, "", permissions, role.Title, "false",
+				"true", 0, subAccount.id);
+			var workshopList = _workshopSubAccountRepository.GetWorkshopsBySubAccountId(subAccount.id);
+			authViewModel.WorkshopList = workshopList.Select(x => new WorkshopClaim()
+			{
+				Slug = _passwordHasher.SlugHasher(x.WorkshopId),
+				Name = x.WorkshopName,
+				PersonnelCount = x.PersonnelCount,
+				Id = x.WorkshopId
+			}).ToList();
 
-            if (workshopList.Any())
-            {
-                var workshop = workshopList.First();
-                authViewModel.WorkshopName = workshop.WorkshopName;
-                authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.WorkshopId);
+			if (workshopList.Any())
+			{
+				var workshop = workshopList.First();
+				authViewModel.WorkshopName = workshop.WorkshopName;
+				authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.WorkshopId);
                 authViewModel.WorkshopId = workshop.WorkshopId;
-            }
+			}
+			_authHelper.Signin(authViewModel);
+			idAutoriz = 2;
+		}
 
-            _authHelper.Signin(authViewModel);
-            idAutoriz = 2;
-        }
-
-        return operation.Succcedded(idAutoriz);
+		return operation.Succcedded(idAutoriz);
     }
-
     public OperationResult LoginWithMobile(long id)
     {
         var operation = new OperationResult();
@@ -538,6 +335,7 @@ public class AccountApplication : IAccountApplication
             return operation.Failed(ApplicationMessages.WrongUserPass);
 
 
+
         var permissions = _roleRepository.Get(account.RoleId)
             .Permissions
             .Select(x => x.Code)
@@ -553,43 +351,39 @@ public class AccountApplication : IAccountApplication
         }
 
         var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
-            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName,
-            account.AdminAreaPermission, account.ClientAriaPermission, positionValue);
+            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, account.AdminAreaPermission, account.ClientAriaPermission, positionValue);
 
         if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" &&
             account.IsActiveString == "true")
         {
-            var clientPermissions = _accountPermissionSubtitle1Repository.GetAllPermissionCodes();
-            authViewModel.Permissions = clientPermissions;
-            var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x =>
-                new WorkshopClaim
-                {
-                    PersonnelCount = x.PersonnelCount,
-                    Id = x.Id,
-                    Name = x.WorkshopFullName,
-                    Slug = _passwordHasher.SlugHasher(x.Id)
-                }).OrderByDescending(x => x.PersonnelCount).ToList();
-            authViewModel.WorkshopList = workshopList;
-            if (workshopList.Any())
-            {
-                var workshop = workshopList.First();
-                authViewModel.WorkshopName = workshop.Name;
-                authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
+	        var clientPermissions = _accountPermissionSubtitle1Repository.GetAllPermissionCodes();
+	        authViewModel.Permissions = clientPermissions;
+	        var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x => new WorkshopClaim
+	        {
+		        PersonnelCount = x.PersonnelCount,
+		        Id = x.Id,
+		        Name = x.WorkshopFullName,
+		        Slug = _passwordHasher.SlugHasher(x.Id)
+	        }).OrderByDescending(x => x.PersonnelCount).ToList();
+			authViewModel.WorkshopList = workshopList;
+			if (workshopList.Any())
+			{
+				var workshop = workshopList.First();
+				authViewModel.WorkshopName = workshop.Name;
+				authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
                 authViewModel.WorkshopId = workshop.Id;
-            }
-        }
+			}
+		}
 
         _authHelper.Signin(authViewModel);
         long idAutoriz = 0;
-        if (account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" ||
-            account.AdminAreaPermission == "true" && account.ClientAriaPermission == "false")
+        if (account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" || account.AdminAreaPermission == "true" && account.ClientAriaPermission == "false")
             idAutoriz = 1;
 
         if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false")
             idAutoriz = 2;
         return operation.Succcedded(idAutoriz);
     }
-
     public void Logout()
     {
         _authHelper.SignOut();
@@ -625,7 +419,6 @@ public class AccountApplication : IAccountApplication
         _accountRepository.SaveChanges();
         return operation.Succcedded();
     }
-
     public EditAccount GetByVerifyCode(string code, string phone)
     {
         return _accountRepository.GetByVerifyCode(code, phone);
@@ -636,7 +429,7 @@ public class AccountApplication : IAccountApplication
         return _accountRepository.GetByUserNameAndId(id, username);
     }
 
-    public async Task<OperationResult> SetVerifyCode(string phone, long id)
+    public async Task <OperationResult> SetVerifyCode(string phone, long id)
     {
         var operation = new OperationResult();
         var account = _accountRepository.Get(id);
@@ -650,10 +443,11 @@ public class AccountApplication : IAccountApplication
         _smsService.LoginSend(phone, r);
 
         //TimeSpan delay = TimeSpan.FromSeconds(30);
-
+       
         await _accountRepository.RemoveCode(id);
-
+       
         return operation.Succcedded();
+           
     }
 
 
@@ -698,88 +492,88 @@ public class AccountApplication : IAccountApplication
             return operation.Failed("این اکانت وجود ندارد");
 
 
+
         var permissions = _roleRepository.Get(account.RoleId)
             .Permissions
             .Select(x => x.Code)
             .ToList();
 
-
+    
         _authHelper.SignOut();
         var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
-            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, "false", "true",
-            null);
-        var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x => new WorkshopClaim
-        {
-            PersonnelCount = x.PersonnelCount,
-            Id = x.Id,
-            Name = x.WorkshopFullName,
-            Slug = _passwordHasher.SlugHasher(x.Id)
-        }).OrderByDescending(x => x.PersonnelCount).ToList();
+            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, "false", "true",null);
+		var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x => new WorkshopClaim
+		{
+			PersonnelCount = x.PersonnelCount,
+			Id = x.Id,
+			Name = x.WorkshopFullName,
+			Slug = _passwordHasher.SlugHasher(x.Id)
+		}).OrderByDescending(x => x.PersonnelCount).ToList();
 
-        authViewModel.WorkshopList = workshopList;
+		authViewModel.WorkshopList = workshopList;
 
-        var clientPermissions = _accountPermissionSubtitle1Repository.GetAllPermissionCodes();
+		var clientPermissions = _accountPermissionSubtitle1Repository.GetAllPermissionCodes();
         authViewModel.Permissions = clientPermissions;
-        if (authViewModel.WorkshopList.Any())
-        {
-            var workshop = authViewModel.WorkshopList.First();
-            authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
-            authViewModel.WorkshopName = workshop.Name;
+		if (authViewModel.WorkshopList.Any())
+		{
+			var workshop = authViewModel.WorkshopList.First();
+			authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
+			authViewModel.WorkshopName = workshop.Name;
             authViewModel.WorkshopId = workshop.Id;
-        }
-
-        _authHelper.Signin(authViewModel);
+		}
+		_authHelper.Signin(authViewModel);
         return operation.Succcedded(2);
     }
-
     public OperationResult DirectCameraLogin(long cameraAccountId)
     {
-        var prAcc = _authHelper.CurrentAccountInfo();
-        var operation = new OperationResult();
-        var cameraAccount = _cameraAccountRepository.GetById(cameraAccountId);
-        if (cameraAccount == null)
-            return operation.Failed("این اکانت وجود ندارد");
+	    var prAcc = _authHelper.CurrentAccountInfo();
+	    var operation = new OperationResult();
+	    var cameraAccount = _cameraAccountRepository.GetById(cameraAccountId);
+	    if (cameraAccount == null)
+		    return operation.Failed("این اکانت وجود ندارد");
 
 
-        _authHelper.SignOut();
 
 
-        var mobile = string.IsNullOrWhiteSpace(cameraAccount.Mobile) ? " " : cameraAccount.Mobile;
-        var authViewModel = new CameraAuthViewModel(cameraAccount.id, cameraAccount.WorkshopId,
-            cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId,
-            cameraAccount.IsActiveSting);
-        if (cameraAccount.IsActiveSting == "true")
-        {
-            _authHelper.CameraSignIn(authViewModel);
-        }
-        else
-        {
-            return operation.Failed("این اکانت غیر فعال شده است");
-        }
 
-        return operation.Succcedded(2);
+	    _authHelper.SignOut();
+
+
+	    var mobile = string.IsNullOrWhiteSpace(cameraAccount.Mobile) ? " " : cameraAccount.Mobile;
+	    var authViewModel = new CameraAuthViewModel(cameraAccount.id, cameraAccount.WorkshopId,
+		    cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId, cameraAccount.IsActiveSting);
+	    if (cameraAccount.IsActiveSting == "true")
+	    {
+		    _authHelper.CameraSignIn(authViewModel);
+		
+	    }
+	    else
+	    {
+		    return operation.Failed("این اکانت غیر فعال شده است");
+		}
+		return operation.Succcedded(2);
     }
 
-
-    // public AccountLeftWorkViewModel WorkshopList(long accountId)
-    // {
-    //     string fullname = this._accountRepository.GetById(accountId).Fullname;
-    //     List<WorkshopAccountlistViewModel> source = _accountLeftworkRepository.WorkshopList(accountId);
-    //     List<long> userWorkshopIds = source.Select(x => x.WorkshopId).ToList();
-    //     List<WorkshopSelectList> allWorkshops = this._accountLeftworkRepository.GetAllWorkshops();
-    //     List<AccountViewModel> accountSelectList = this._accountRepository.GetAdminAccountSelectList();
-    //     (string StartWorkFa, string LeftWorkFa) byAccountId = this._accountLeftworkRepository.GetByAccountId(accountId);
-    //     return new AccountLeftWorkViewModel()
-    //     {
-    //         AccountId = accountId,
-    //         AccountFullName = fullname,
-    //         StartDateFa = byAccountId.StartWorkFa,
-    //         LeftDateFa = byAccountId.LeftWorkFa,
-    //         WorkshopAccountlist = source,
-    //         WorkshopSelectList = new SelectList(allWorkshops.Where(x => !userWorkshopIds.Contains(x.Id)), "Id", "WorkshopFullName"),
-    //         AccountSelectList = new SelectList(accountSelectList, "Id", "Fullname")
-    //     };
-    // }
+  
+    public AccountLeftWorkViewModel WorkshopList(long accountId)
+    {
+        string fullname = this._accountRepository.GetById(accountId).Fullname;
+        List<WorkshopAccountlistViewModel> source =_accountLeftworkRepository.WorkshopList(accountId);
+        List<long> userWorkshopIds = source.Select(x => x.WorkshopId).ToList();
+        List<WorkshopSelectList> allWorkshops = this._accountLeftworkRepository.GetAllWorkshops();
+        List<AccountViewModel> accountSelectList = this._accountRepository.GetAdminAccountSelectList();
+        (string StartWorkFa, string LeftWorkFa) byAccountId = this._accountLeftworkRepository.GetByAccountId(accountId);
+        return new AccountLeftWorkViewModel()
+        {
+            AccountId = accountId,
+            AccountFullName = fullname,
+            StartDateFa = byAccountId.StartWorkFa,
+            LeftDateFa = byAccountId.LeftWorkFa,
+            WorkshopAccountlist = source,
+            WorkshopSelectList = new SelectList(allWorkshops.Where(x => !userWorkshopIds.Contains(x.Id)), "Id", "WorkshopFullName"),
+            AccountSelectList = new SelectList(accountSelectList, "Id", "Fullname")
+        };
+    }
 
     public OperationResult SaveWorkshopAccount(
         List<WorkshopAccountlistViewModel> workshopAccountList,
@@ -789,12 +583,10 @@ public class AccountApplication : IAccountApplication
     {
         return this._accountLeftworkRepository.SaveWorkshopAccount(workshopAccountList, startDate, leftDate, accountId);
     }
-
     public OperationResult CreateNewWorkshopAccount(long currentAccountId, long newAccountId)
     {
         return this._accountLeftworkRepository.CopyWorkshopToNewAccount(currentAccountId, newAccountId);
     }
-
     #region Mahan
 
     public List<AccountViewModel> AccountsForAssign(long taskId)
@@ -808,7 +600,6 @@ public class AccountApplication : IAccountApplication
         {
             return new List<AccountViewModel>();
         }
-
         return _accountRepository.GetAccountsByPositionId(positionId);
     }
 
@@ -826,6 +617,7 @@ public class AccountApplication : IAccountApplication
             return operation.Failed("این اکانت وجود ندارد");
 
 
+
         var permissions = _roleRepository.Get(account.RoleId)
             .Permissions
             .Select(x => x.Code)
@@ -834,10 +626,10 @@ public class AccountApplication : IAccountApplication
 
         _authHelper.SignOut();
         var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
-            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName,
-            account.AdminAreaPermission, account.ClientAriaPermission, account.Position.PositionValue);
+            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, account.AdminAreaPermission, account.ClientAriaPermission, account.Position.PositionValue);
         _authHelper.Signin(authViewModel);
         return operation.Succcedded(2);
+
     }
 
     public async Task<List<AccountSelectListViewModel>> GetAdminSelectList()
@@ -846,74 +638,68 @@ public class AccountApplication : IAccountApplication
     }
 
     #endregion
-
     #region Pooya
-
-    public OperationResult IsPhoneNumberAndPasswordValid(long accountId, string phoneNumber, string password,
-        string rePassword)
+    public OperationResult IsPhoneNumberAndPasswordValid(long accountId, string phoneNumber, string password, string rePassword)
     {
-        OperationResult op = new();
+	    OperationResult op = new();
 
-        var entity = _accountRepository.Get(accountId);
+	    var entity = _accountRepository.Get(accountId);
 
-        if (entity == null)
-            return op.Failed(ApplicationMessages.RecordNotFound);
+	    if (entity == null)
+		    return op.Failed(ApplicationMessages.RecordNotFound);
 
-        if (!string.IsNullOrWhiteSpace(rePassword) || !string.IsNullOrWhiteSpace(password))
-        {
-            if (rePassword != password)
-                return op.Failed("تکرار رمز عبور با رمز عبور مطابقت ندارد");
+	    if (!string.IsNullOrWhiteSpace(rePassword) || !string.IsNullOrWhiteSpace(password))
+	    {
+		    if (rePassword != password)
+			    return op.Failed("تکرار رمز عبور با رمز عبور مطابقت ندارد");
 
-            if (password.Length < 8)
-                return op.Failed("رمز عبور نمی تواند کمتر از 8 کاراکتر باشد");
-        }
+		    if (password.Length < 8)
+			    return op.Failed("رمز عبور نمی تواند کمتر از 8 کاراکتر باشد");
+	    }
 
-        if ((string.IsNullOrWhiteSpace(phoneNumber) || entity.Mobile == phoneNumber) &&
-            string.IsNullOrWhiteSpace(rePassword))
-            return op.Failed("چیزی برای تغییر وجود ندارد");
+	    if ((string.IsNullOrWhiteSpace(phoneNumber) || entity.Mobile == phoneNumber) && string.IsNullOrWhiteSpace(rePassword))
+		    return op.Failed("چیزی برای تغییر وجود ندارد");
 
 
-        if (!string.IsNullOrWhiteSpace(phoneNumber) && entity.Mobile != phoneNumber)
-        {
-            phoneNumber = phoneNumber.Trim();
-            if (phoneNumber.Length != 11)
-                return op.Failed("شماره تلفن همراه به درستی وارد نشده است");
-            if (_accountRepository.Exists(x => x.Mobile == phoneNumber && x.id != accountId) ||
-                _subAccountRepository.Exists(x => x.PhoneNumber == phoneNumber) ||
-                _cameraAccountRepository.Exists(x => x.Mobile == phoneNumber))
-                return op.Failed("قبلا یک حساب با این شماره ثبت شده است");
-        }
+	    if (!string.IsNullOrWhiteSpace(phoneNumber) && entity.Mobile != phoneNumber)
+	    {
+		    phoneNumber = phoneNumber.Trim();
+		    if (phoneNumber.Length != 11)
+			    return op.Failed("شماره تلفن همراه به درستی وارد نشده است");
+		    if (_accountRepository.Exists(x => x.Mobile == phoneNumber && x.id != accountId) ||
+		        _subAccountRepository.Exists(x => x.PhoneNumber == phoneNumber) ||
+		        _cameraAccountRepository.Exists(x => x.Mobile == phoneNumber))
+			    return op.Failed("قبلا یک حساب با این شماره ثبت شده است");
+	    }
 
 
-        return op.Succcedded();
-    }
+	    return op.Succcedded();
+	}
 
     public OperationResult ChangePasswordAndPhoneNumber(AccountChangePasswordAndPhoneNumber command)
     {
-        OperationResult op = new();
-        command.PhoneNumber = command.PhoneNumber.Trim();
-        var entity = _accountRepository.Get(command.AccountId);
-        if (entity == null)
-            return op.Failed(ApplicationMessages.RecordNotFound);
-        var validationResult = IsPhoneNumberAndPasswordValid(command.AccountId, command.PhoneNumber, command.Password,
-            command.RePassword);
-        if (validationResult.IsSuccedded == false)
-            return validationResult;
+	    OperationResult op = new();
+	    command.PhoneNumber = command.PhoneNumber.Trim();
+	    var entity = _accountRepository.Get(command.AccountId);
+	    if (entity == null)
+		    return op.Failed(ApplicationMessages.RecordNotFound);
+	    var validationResult = IsPhoneNumberAndPasswordValid(command.AccountId, command.PhoneNumber, command.Password, command.RePassword);
+	    if (validationResult.IsSuccedded == false)
+		    return validationResult;
 
-        if (!string.IsNullOrWhiteSpace(command.RePassword))
-        {
-            entity.ChangePassword(_passwordHasher.Hash(command.Password));
-        }
+	    if (!string.IsNullOrWhiteSpace(command.RePassword))
+	    {
 
-        if (!string.IsNullOrWhiteSpace(command.PhoneNumber))
-        {
-            entity.Edit(entity.Fullname, entity.Username, command.PhoneNumber, entity.RoleId, entity.ProfilePhoto,
-                entity.RoleName);
-        }
+		    entity.ChangePassword(_passwordHasher.Hash(command.Password));
+	    }
 
-        _accountRepository.SaveChanges();
-        return op.Succcedded();
-    }
+	    if (!string.IsNullOrWhiteSpace(command.PhoneNumber))
+	    {
+		    entity.Edit(entity.Fullname, entity.Username, command.PhoneNumber, entity.RoleId, entity.ProfilePhoto, entity.RoleName);
+	    }
+	    _accountRepository.SaveChanges();
+	    return op.Succcedded();
+	}
     //public UserClaimsResponseDTO GetClaimsForSignIn(Login command)
     //{
     //    var operation = new OperationResult();
@@ -1006,7 +792,6 @@ public class AccountApplication : IAccountApplication
 
     //    return claimsResponse.Failed(ApplicationMessages.WrongUserPass);
     //}
-
     #endregion
 
 
@@ -1030,12 +815,12 @@ public class AccountApplication : IAccountApplication
         }
 
         (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);
@@ -1044,9 +829,4 @@ public class AccountApplication : IAccountApplication
 
         _authHelper.CameraSignIn(authViewModel);
     }
-
-    public async Task<GetPmUserDto> GetPmUserAsync(long accountId)
-    {
-        return await _pmUserQueryService.GetPmUserDataByAccountId(accountId);
-    }
 }

AccountManagement.Application/AccountManagement.Application.csproj

@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\AccountManagement.Application.Contracts\AccountManagement.Application.Contracts.csproj" />
     <ProjectReference Include="..\AccountManagement.Domain\AccountManagement.Domain.csproj" />
     <ProjectReference Include="..\Company.Domain\Company.Domain.csproj" />
-    <ProjectReference Include="..\Shared.Contracts\Shared.Contracts.csproj" />
 
   </ItemGroup>
 

AccountManagement.Application/CameraAccountApplication.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using AccountManagement.Application.Contracts.Account;
 using AccountManagement.Application.Contracts.CameraAccount;

AccountManagement.Application/MediaApplication.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using _0_Framework.Application;

AccountManagement.Application/RoleApplication.cs

@@ -2,14 +2,6 @@
 using AccountManagement.Application.Contracts.Role;
 using AccountManagement.Domain.RoleAgg;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Company.Domain._common;
-using Microsoft.AspNetCore.Mvc.Rendering;
-using Shared.Contracts.PmRole.Commands;
-using GetPmRolesDto = Shared.Contracts.PmRole.Queries.GetPmRolesDto;
-using Role = AccountManagement.Domain.RoleAgg.Role;
-using Shared.Contracts.PmRole.Queries;
 
 namespace AccountManagement.Application;
 
@@ -17,82 +9,32 @@ public class RoleApplication : IRoleApplication
 {
     private readonly IRoleRepository _roleRepository;
 
-    private readonly IPmRoleQueryService _pmRoleQueryService;
-    private readonly IPmRoleCommandService _pmRoleCommandService;
-    private readonly IUnitOfWork _unitOfWork;
-
-    public RoleApplication(IRoleRepository roleRepository, IUnitOfWork unitOfWork, IPmRoleQueryService pmRoleQueryService, IPmRoleCommandService pmRoleCommandService)
+    public RoleApplication(IRoleRepository roleRepository)
     {
         _roleRepository = roleRepository;
-        _unitOfWork = unitOfWork;
-        _pmRoleQueryService = pmRoleQueryService;
-        _pmRoleCommandService = pmRoleCommandService;
     }
 
-    public async Task<OperationResult> Create(CreateRole command)
+    public OperationResult Create(CreateRole command)
     {
         var operation = new OperationResult();
         if (_roleRepository.Exists(x => x.Name == command.Name))
             return operation.Failed(ApplicationMessages.DuplicatedRecord);
-        var permissions = command.Permissions.Where(x => x > 0).Select(x => new Permission(x)).ToList();
+        var permissions = new List<Permission>();
+        foreach (var code in command.Permissions)
+        {
+            if (code > 0)
+            {
+                permissions.Add(new Permission(code));
+            }
+        }
+        //command.Permissions.ForEach(code => permissions.Add(new Permission(code)));
         var role = new Role(command.Name, permissions);
-        _unitOfWork.BeginAccountContext();
-
         _roleRepository.Create(role);
         _roleRepository.SaveChanges();
-
-        var pmPermissions = command.PmPermissions.Where(x => x > 0).ToList();
-        if (pmPermissions.Any())
-        {
-         
-            var pmRole = new CreatePmRoleDto{ RoleName = command.Name, Permissions = pmPermissions, GozareshgirRoleId = role.id};
-            var res =await _pmRoleCommandService.Create(pmRole);
-            if (!res.Item1)
-            {
-                _unitOfWork.RollbackAccountContext();
-                return operation.Failed("خطا در ویرایش دسترسی ها در پروگرام منیجر");
-            }
- 
-
-            //var parameters = new CreateProgramManagerRole
-            //{
-            //    RoleName = command.Name,
-            //    Permissions = pmPermissions,
-            //    GozareshgirRoleId = role.id
-
-            //};
-
-            //var url = "api/role";
-            //var key = SecretKeys.ProgramManagerInternalApi;
-
-            //var response = InternalApiCaller.PostAsync<CreateProgramManagerRole, ApiResponse>(
-            //    url,
-            //    key,
-            //    parameters
-            //);
-
-
-            //if (!response.Success)
-            //{
-            //    _unitOfWork.RollbackAccountContext();
-            //    return operation.Failed("ارتباط با اپلیکیش پروگرام منیجر برقرار نشد");
-            //}
-
-            //if (!response.Result.isSuccess)
-            //{
-            //    _unitOfWork.RollbackAccountContext();
-            //    return operation.Failed(response.Result.errorMessage);
-            //}
-        }
-
-
-
-        //command.Permissions.ForEach(code => permissions.Add(new Permission(code)));
-        _unitOfWork.CommitAccountContext();
         return operation.Succcedded();
     }
 
-    public async Task<OperationResult> Edit(EditRole command)
+    public OperationResult Edit(EditRole command)
     {
         var operation = new OperationResult();
         var role = _roleRepository.Get(command.Id);
@@ -105,134 +47,17 @@ public class RoleApplication : IRoleApplication
         //var permissions = new List<Permission>();
         //command.Permissions.ForEach(code => permissions.Add(new Permission(code)));
 
-        var permissions = command.Permissions.Where(x => x > 0).Select(x => new Permission(x)).ToList();
+        var permissions = new List<Permission>();
+        foreach (var code in command.Permissions)
+        {
+            if (code > 0)
+            {
+                permissions.Add(new Permission(code));
+            }
+        }
 
-
-
-        _unitOfWork.BeginAccountContext();
         role.Edit(command.Name, permissions);
         _roleRepository.SaveChanges();
-        var key = SecretKeys.ProgramManagerInternalApi;
-        var pmPermissions = command.PmPermissions.Where(x => x > 0).ToList();
-
-
-        //یافتن نقش در پروگرام منیجر
-        //var apiResult = InternalApiCaller.GetAsync<RoleResponse>(
-        //    "api/role",
-        //    key,
-        //    new Dictionary<string, object>
-        //    {
-        //        { "RoleName", "" },
-
-        //        { "GozareshgirRoleId", command.Id}
-        //    }
-        //);
-
-
-        var pmRoleListResult = await _pmRoleQueryService.GetPmRoleList(command.Id);
-        var pmRoleResult = pmRoleListResult.FirstOrDefault();
-
-        //اگر این نقش در پروگرام منیجر وجود داشت ویرایش کن
-        if (pmRoleResult != null)
-        {
-            var edit = new CreatePmRoleDto { RoleName = command.Name, Permissions = pmPermissions, GozareshgirRoleId = role.id };
-            var res = await _pmRoleCommandService.Edit(edit);
-            if (!res.Item1)
-            {
-                _unitOfWork.RollbackAccountContext();
-                return operation.Failed("خطا در ویرایش دسترسی ها در پروگرام منیجر");
-            }
-          
-
-
-            //var parameters = new CreateProgramManagerRole
-            //{
-            //    RoleName = command.Name,
-            //    Permissions = pmPermissions,
-            //    GozareshgirRoleId = role.id
-
-            //};
-            //var url = "api/role/edit";
-            //var response = InternalApiCaller.PostAsync<CreateProgramManagerRole, ApiResponse>(
-            //    url,
-            //    key,
-            //    parameters
-            //);
-
-
-            //if (!response.Success)
-            //{
-            //    _unitOfWork.RollbackAccountContext();
-            //    return operation.Failed("ارتباط با اپلیکیش پروگرام منیجر برقرار نشد");
-            //}
-
-            //if (!response.Result.isSuccess)
-            //{
-            //    _unitOfWork.RollbackAccountContext();
-            //    return operation.Failed(response.Result.errorMessage);
-            //}
-        }
-        else //اگر نقش در پروگرام منیجر وجود نداشت
-        {
-
-            //اگر تیک پرمیشن های پروگرام منیجر زده شده 
-            //این نقش را سمت پروگرام منیجر بساز
-            if (pmPermissions.Any())
-            {
-                var pmRole = new CreatePmRoleDto { RoleName = command.Name, Permissions = pmPermissions, GozareshgirRoleId = role.id };
-                var res = await _pmRoleCommandService.Create(pmRole);
-                if (!res.Item1)
-                {
-                    _unitOfWork.RollbackAccountContext();
-                    return operation.Failed("خطا در ویرایش دسترسی ها در پروگرام منیجر");
-                }
-
-                //try
-                //{
-                //    var pmPermissionsData = pmPermissions.Where(x => x > 0).Select(x => new PmPermission(x)).ToList();
-                //    var pmRole = new PmRole(command.Name, command.Id, pmPermissionsData);
-                //    await _pmRoleRepository.CreateAsync(pmRole);
-                //    await _pmRoleRepository.SaveChangesAsync();
-               
-                //}
-                //catch (System.Exception)
-                //{
-                //    _unitOfWork.RollbackAccountContext();
-                //    return operation.Failed("خطا در ویرایش دسترسی ها در پروگرام منیجر");
-                //}
-
-                //var parameters = new CreateProgramManagerRole
-                //{
-                //    RoleName = command.Name,
-                //    Permissions = pmPermissions,
-                //    GozareshgirRoleId = role.id
-
-                //};
-
-                //var url = "api/role";
-
-
-                //var response = InternalApiCaller.PostAsync<CreateProgramManagerRole, ApiResponse>(
-                //    url,
-                //    key,
-                //    parameters
-                //);
-
-
-                //if (!response.Success)
-                //{
-                //    _unitOfWork.RollbackAccountContext();
-                //    return operation.Failed("ارتباط با اپلیکیش پروگرام منیجر برقرار نشد");
-                //}
-
-                //if (!response.Result.isSuccess)
-                //{
-                //    _unitOfWork.RollbackAccountContext();
-                //    return operation.Failed(response.Result.errorMessage);
-                //}
-            }
-        }
-        _unitOfWork.CommitAccountContext();
         return operation.Succcedded();
     }
 
@@ -245,23 +70,4 @@ public class RoleApplication : IRoleApplication
     {
         return _roleRepository.List();
     }
-
-
-    public async Task<SelectList> GetPmRoleList(long? gozareshgirRoleId)
-    {
-        var rolse = await _pmRoleQueryService.GetPmRoleList(gozareshgirRoleId);
-        return new SelectList(rolse, "Id", "RoleName");
-
-
-    }
-
-    public async Task<List<GetPmRolesDto>> GetPmRoleListToEdit(long? gozareshgirRoleId)
-    {
-        return await _pmRoleQueryService.GetPmRoleList(gozareshgirRoleId);
-
-    }
-
-
-
-
 }

AccountManagement.Application/SubAccountApplication.cs

@@ -5,11 +5,14 @@ using AccountManagement.Domain.AccountAgg;
 using AccountManagement.Domain.CameraAccountAgg;
 using AccountManagement.Domain.SubAccountAgg;
 using AccountManagement.Domain.SubAccountRoleAgg;
+using Company.Domain.WorkshopAccountAgg;
 using Company.Domain.WorkshopSubAccountAgg;
+using CompanyManagment.App.Contracts.Workshop;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 
 
 namespace AccountManagement.Application

AccountManagement.Application/TaskSubjectApplication.cs

@@ -1,7 +1,9 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using _0_Framework.Application;
 using AccountManagement.Application.Contracts.TaskSubject;
 using AccountManagement.Domain.TaskSubjectAgg;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 
 namespace AccountManagement.Application;
 

AccountManagement.Configuration/AccountManagement.Configuration.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.1" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.1">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

AccountManagement.Domain/AccountLeftWorkAgg/IAccountLeftworkRepository.cs

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

AccountManagement.Domain/AccountManagement.Domain.csproj

@@ -1,16 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.1" />
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\0_Framework\0_Framework.csproj" />
     <ProjectReference Include="..\AccountManagement.Application.Contracts\AccountManagement.Application.Contracts.csproj" />

AccountManagement.Domain/InternalApiCaller/InternalApiCaller.cs

@@ -1,155 +0,0 @@
-using Newtonsoft.Json;
-using System.Net.Http;
-using System.Text;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.Extensions.Configuration;
-
-namespace AccountManagement.Domain.InternalApiCaller;
-
-public class ApiResult<T>
-{
-    public bool Success { get; set; }
-    public T Result { get; set; }
-    public string Error { get; set; }
-}
-
-public static class InternalApiCaller
-{
-    private static string _baseUrl = "";
-
-    public static void SetBaseUrl(string baseUrl)
-    {
-        _baseUrl = baseUrl.TrimEnd('/'); // حذف / اضافی
-    }
-    /// <summary>
-    ///api post  متد
-    /// </summary>
-    /// <typeparam name="TRequest"></typeparam>
-    /// <typeparam name="TResponse"></typeparam>
-    /// <param name="url"></param>
-    /// <param name="internalKey"></param>
-    /// <param name="body"></param>
-    /// <returns></returns>
-    public static ApiResult<TResponse> PostAsync<TRequest, TResponse>(
-        string url,
-        string internalKey,
-        TRequest body
-    )
-    {
-        try
-        {
-            var client = new HttpClient();
-
-            // ساخت URL نهایی
-            var finalUrl = $"{_baseUrl}/{url.TrimStart('/')}";
-
-            var request = new HttpRequestMessage(HttpMethod.Post, finalUrl);
-
-            request.Headers.Add("X-INTERNAL-KEY", internalKey);
-
-            var json = JsonConvert.SerializeObject(body);
-            request.Content = new StringContent(json, Encoding.UTF8, "application/json");
-
-            var response = client.SendAsync(request).GetAwaiter().GetResult();
-
-            if (!response.IsSuccessStatusCode)
-            {
-                return new ApiResult<TResponse>
-                {
-                    Success = false,
-                    Error = $"HTTP Error: {response.StatusCode}"
-                };
-            }
-
-            var text = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
-            var deserialized = JsonConvert.DeserializeObject<TResponse>(text);
-
-            return new ApiResult<TResponse>
-            {
-                Success = true,
-                Result = deserialized
-            };
-        }
-        catch (Exception ex)
-        {
-            return new ApiResult<TResponse>
-            {
-                Success = false,
-                Error = ex.Message
-            };
-        }
-    }
-
-
-
-
-    /// <summary>
-    /// Api Get  متد
-    /// </summary>
-    /// <typeparam name="TResponse"></typeparam>
-    /// <param name="url"></param>
-    /// <param name="internalKey"></param>
-    /// <param name="parameters"></param>
-    /// <returns></returns>
-    public static ApiResult<TResponse> GetAsync<TResponse>(
-        string url,
-        string internalKey,
-        Dictionary<string, object> parameters = null
-    )
-    {
-        try
-        {
-            if (parameters != null && parameters.Any())
-            {
-                var query = string.Join("&",
-                    parameters
-                        .Where(p => p.Value != null)
-                        .Select(p => $"{p.Key}={p.Value}")
-                );
-
-                url += url.Contains("?") ? "&" + query : "?" + query;
-            }
-
-            // ساخت URL نهایی
-            var finalUrl = $"{_baseUrl}/{url.TrimStart('/')}";
-
-            var client = new HttpClient();
-            var request = new HttpRequestMessage(HttpMethod.Get, finalUrl);
-
-            request.Headers.Add("X-INTERNAL-KEY", internalKey);
-
-            var response = client.SendAsync(request).GetAwaiter().GetResult();
-
-            if (!response.IsSuccessStatusCode)
-            {
-                return new ApiResult<TResponse>
-                {
-                    Success = false,
-                    Error = $"HTTP Error: {response.StatusCode}"
-                };
-            }
-
-            var text = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
-            var deserialized = JsonConvert.DeserializeObject<TResponse>(text);
-
-            return new ApiResult<TResponse>
-            {
-                Success = true,
-                Result = deserialized
-            };
-        }
-        catch (Exception ex)
-        {
-            return new ApiResult<TResponse>
-            {
-                Success = false,
-                Error = ex.Message
-            };
-        }
-    }
-
-
-
-}

AccountMangement.Infrastructure.EFCore/AccountContext.cs

@@ -1,4 +1,4 @@
-using AccountManagement.Domain.AccountAgg;
+using AccountManagement.Domain.AccountAgg;
 using AccountMangement.Infrastructure.EFCore.Mappings;
 using Microsoft.EntityFrameworkCore;
 using System;
@@ -26,6 +26,7 @@ using AccountManagement.Domain.SubAccountPermissionSubtitle2Agg;
 using AccountManagement.Domain.SubAccountPermissionSubtitle3Agg;
 using AccountManagement.Domain.SubAccountPermissionSubtitle4Agg;
 using AccountManagement.Domain.SubAccountRoleAgg;
+using AccountMangement.Infrastructure.EFCore.Seed;
 using AccountManagement.Domain.TaskScheduleAgg;
 
 namespace AccountMangement.Infrastructure.EFCore
@@ -59,10 +60,9 @@ namespace AccountMangement.Infrastructure.EFCore
 
         public DbSet<TaskSchedule> TaskSchedules { get; set; }
 
+
         #endregion
 
-
-
         #region Pooya
         public DbSet<SubAccount> SubAccounts { get; set; }
         public DbSet<SubAccountRole> SubAccountRoles { get; set; }

AccountMangement.Infrastructure.EFCore/AccountMangement.Infrastructure.EFCore.csproj

@@ -1,15 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Azure.Identity" Version="1.17.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.1" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.1">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
@@ -20,12 +18,4 @@
 	  <ProjectReference Include="..\Company.Domain\Company.Domain.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Folder Include="Services\" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <Compile Remove="Mappings\BugReportMapping.cs" />
-	</ItemGroup>
-
 </Project>

AccountMangement.Infrastructure.EFCore/Migrations/20251213112030_add programmanger boo in account.cs

@@ -1,31 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace AccountMangement.Infrastructure.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addprogrammangerbooinaccount : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "IsProgramManagerUser",
-                table: "Accounts",
-                type: "bit",
-                nullable: false,
-                defaultValue: false);
-
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "IsProgramManagerUser",
-                table: "Accounts");
-        }
-    }
-}

AccountMangement.Infrastructure.EFCore/Migrations/20251213143102_romoveIsProgramManagerUserFromAccount.cs

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

AccountMangement.Infrastructure.EFCore/Migrations/AccountContextModelSnapshot.cs

@@ -17,7 +17,7 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.1")
+                .HasAnnotation("ProductVersion", "8.0.10")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@@ -377,87 +377,6 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations
                     b.ToTable("Medias", (string)null);
                 });
 
-            modelBuilder.Entity("AccountManagement.Domain.PmDomains.PmRoleAgg.PmRole", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<DateTime>("CreationDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<long?>("GozareshgirRoleId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("RoleName")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
-
-                    b.HasKey("id");
-
-                    b.ToTable("PmRoles", null, t =>
-                        {
-                            t.ExcludeFromMigrations();
-                        });
-                });
-
-            modelBuilder.Entity("AccountManagement.Domain.PmDomains.PmUserAgg.PmUser", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<long?>("AccountId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime>("CreationDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("Email")
-                        .HasMaxLength(150)
-                        .HasColumnType("nvarchar(150)");
-
-                    b.Property<string>("FullName")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Mobile")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("nvarchar(20)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasMaxLength(1000)
-                        .HasColumnType("nvarchar(1000)");
-
-                    b.Property<string>("ProfilePhotoPath")
-                        .HasMaxLength(500)
-                        .HasColumnType("nvarchar(500)");
-
-                    b.Property<string>("UserName")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
-
-                    b.Property<string>("VerifyCode")
-                        .HasMaxLength(10)
-                        .HasColumnType("nvarchar(10)");
-
-                    b.HasKey("id");
-
-                    b.ToTable("Users", (string)null);
-                });
-
             modelBuilder.Entity("AccountManagement.Domain.PositionAgg.Position", b =>
                 {
                     b.Property<long>("id")
@@ -1082,71 +1001,6 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations
                     b.Navigation("Media");
                 });
 
-            modelBuilder.Entity("AccountManagement.Domain.PmDomains.PmRoleAgg.PmRole", b =>
-                {
-                    b.OwnsMany("AccountManagement.Domain.PmDomains.PmPermissionAgg.PmPermission", "PmPermission", b1 =>
-                        {
-                            b1.Property<long>("Id")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("bigint");
-
-                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("Id"));
-
-                            b1.Property<int>("Code")
-                                .HasColumnType("int");
-
-                            b1.Property<long>("Roleid")
-                                .HasColumnType("bigint");
-
-                            b1.HasKey("Id");
-
-                            b1.HasIndex("Roleid");
-
-                            b1.ToTable("PmRolePermissions", null, t =>
-                                {
-                                    t.ExcludeFromMigrations();
-                                });
-
-                            b1.WithOwner("Role")
-                                .HasForeignKey("Roleid");
-
-                            b1.Navigation("Role");
-                        });
-
-                    b.Navigation("PmPermission");
-                });
-
-            modelBuilder.Entity("AccountManagement.Domain.PmDomains.PmUserAgg.PmUser", b =>
-                {
-                    b.OwnsMany("AccountManagement.Domain.PmDomains.PmRoleUserAgg.PmRoleUser", "RoleUser", b1 =>
-                        {
-                            b1.Property<long>("Id")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("bigint");
-
-                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("Id"));
-
-                            b1.Property<long>("RoleId")
-                                .HasColumnType("bigint");
-
-                            b1.Property<long>("Userid")
-                                .HasColumnType("bigint");
-
-                            b1.HasKey("Id");
-
-                            b1.HasIndex("Userid");
-
-                            b1.ToTable("RoleUsers", (string)null);
-
-                            b1.WithOwner("User")
-                                .HasForeignKey("Userid");
-
-                            b1.Navigation("User");
-                        });
-
-                    b.Navigation("RoleUser");
-                });
-
             modelBuilder.Entity("AccountManagement.Domain.RoleAgg.Role", b =>
                 {
                     b.OwnsMany("AccountManagement.Domain.RoleAgg.Permission", "Permissions", b1 =>

AccountMangement.Infrastructure.EFCore/Repository/AccountLeftworkRepository.cs

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

BUG_REPORT_SYSTEM.md

@@ -1,175 +0,0 @@
-# سیستم گزارش خرابی (Bug Report System)
-
-## نمای کلی
-
-این سیستم برای جمع‌آوری، ذخیره و مدیریت گزارش‌های خرابی از تطبیق موبایلی طراحی شده است.
-
-## ساختار فایل‌ها
-
-### Domain Layer
-- `AccountManagement.Domain/BugReportAgg/`
-  - `BugReport.cs` - موجودیت اصلی
-  - `BugReportLog.cs` - لاگ‌های گزارش
-  - `BugReportScreenshot.cs` - تصاویر ضمیمه شده
-
-### Application Contracts
-- `AccountManagement.Application.Contracts/BugReport/`
-  - `IBugReportApplication.cs` - اینترفیس سرویس
-  - `CreateBugReportCommand.cs` - درخواست ایجاد
-  - `EditBugReportCommand.cs` - درخواست ویرایش
-  - `BugReportViewModel.cs` - نمایش لیست
-  - `BugReportDetailViewModel.cs` - نمایش جزئیات
-  - `IBugReportRepository.cs` - اینترفیس Repository
-
-### Application Service
-- `AccountManagement.Application/BugReportApplication.cs` - پیاده‌سازی سرویس
-
-### Infrastructure
-- `AccountMangement.Infrastructure.EFCore/`
-  - `Mappings/BugReportMapping.cs`
-  - `Mappings/BugReportLogMapping.cs`
-  - `Mappings/BugReportScreenshotMapping.cs`
-  - `Repository/BugReportRepository.cs`
-
-### API Controller
-- `ServiceHost/Controllers/BugReportController.cs`
-
-### Admin Pages
-- `ServiceHost/Areas/AdminNew/Pages/BugReport/`
-  - `BugReportPageModel.cs` - base model
-  - `Index.cshtml.cs / Index.cshtml` - لیست گزارش‌ها
-  - `Details.cshtml.cs / Details.cshtml` - جزئیات کامل
-  - `Edit.cshtml.cs / Edit.cshtml` - ویرایش وضعیت/اولویت
-  - `Delete.cshtml.cs / Delete.cshtml` - حذف
-
-## روش استفاده
-
-### 1. ثبت گزارش از موبایل
-
-```csharp
-POST /api/bugreport/submit
-
-{
-  "title": "برنامه هنگام ورود خراب می‌شود",
-  "description": "هنگام وارد کردن نام کاربری، برنامه کرش می‌کند",
-  "userEmail": "user@example.com",
-  "deviceModel": "Samsung Galaxy S21",
-  "osVersion": "Android 12",
-  "platform": "Android",
-  "manufacturer": "Samsung",
-  "deviceId": "device-unique-id",
-  "screenResolution": "1440x3200",
-  "memoryInMB": 8000,
-  "storageInMB": 256000,
-  "batteryLevel": 75,
-  "isCharging": false,
-  "networkType": "4G",
-  "appVersion": "1.0.0",
-  "buildNumber": "100",
-  "packageName": "com.example.app",
-  "installTime": "2024-01-01T10:00:00Z",
-  "lastUpdateTime": "2024-12-01T14:30:00Z",
-  "flavor": "production",
-  "type": 1,           // Crash = 1
-  "priority": 2,       // High = 2
-  "stackTrace": "...",
-  "logs": ["log1", "log2"],
-  "screenshots": ["base64-encoded-image-1"]
-}
-```
-
-### 2. دسترسی به Admin Panel
-
-```
-https://yourdomain.com/AdminNew/BugReport
-```
-
-**صفحات موجود:**
-- **Index** - لیست تمام گزارش‌ها با فیلترها
-- **Details** - نمایش جزئیات کامل شامل:
-  - معلومات کاربر و گزارش
-  - معلومات دستگاه
-  - معلومات برنامه
-  - لاگ‌ها
-  - تصاویر
-  - Stack Trace
-- **Edit** - تغییر وضعیت و اولویت
-- **Delete** - حذف گزارش
-
-### 3. درخواست‌های API
-
-#### دریافت لیست
-```
-GET /api/bugreport/list?type=1&priority=2&status=1&searchTerm=crash&pageNumber=1&pageSize=10
-```
-
-#### دریافت جزئیات
-```
-GET /api/bugreport/{id}
-```
-
-#### ویرایش
-```
-PUT /api/bugreport/{id}
-
-{
-  "id": 1,
-  "priority": 2,
-  "status": 3
-}
-```
-
-#### حذف
-```
-DELETE /api/bugreport/{id}
-```
-
-## انواع (Enums)
-
-### BugReportType
-- `1` - Crash (کرش)
-- `2` - UI (مشکل رابط)
-- `3` - Performance (عملکرد)
-- `4` - Feature (فیچر)
-- `5` - Network (شبکه)
-- `6` - Camera (دوربین)
-- `7` - FaceRecognition (تشخیص چهره)
-- `8` - Database (دیتابیس)
-- `9` - Login (ورود)
-- `10` - Other (سایر)
-
-### BugPriority
-- `1` - Critical (بحرانی)
-- `2` - High (بالا)
-- `3` - Medium (متوسط)
-- `4` - Low (پایین)
-
-### BugReportStatus
-- `1` - Open (باز)
-- `2` - InProgress (در حال بررسی)
-- `3` - Fixed (رفع شده)
-- `4` - Closed (بسته شده)
-- `5` - Reopened (مجدداً باز)
-
-## Migration
-
-برای اعمال تغییرات دیتابیس:
-
-```powershell
-Add-Migration AddBugReportTables
-Update-Database
-```
-
-## نکات مهم
-
-1. **تصاویر**: تصاویر به صورت Base64 encoded ذخیره می‌شوند
-2. **لاگ‌ها**: تمام لاگ‌ها به صورت جدا ذخیره می‌شوند
-3. **وضعیت پیش‌فرض**: وقتی گزارش ثبت می‌شود، وضعیت آن "Open" است
-4. **تاریخ**: تاریخ ایجاد و بروزرسانی خودکار ثبت می‌شود
-
-## Security
-
-- API endpoints از `authentication` محافظت می‌شوند
-- Admin pages تنها برای کاربرانی با دسترسی AdminArea قابل دسترس هستند
-- حذف و ویرایش نیاز به تأیید دارد
-

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/BackgroundInstitutionContract.Task.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <AssemblyName>BackgroundInstitutionContract.Task</AssemblyName>
@@ -12,14 +12,8 @@
       <ProjectReference Include="..\..\0_Framework\0_Framework.csproj" />
       <ProjectReference Include="..\..\AccountManagement.Configuration\AccountManagement.Configuration.csproj" />
       <ProjectReference Include="..\..\PersonalContractingParty.Config\PersonalContractingParty.Config.csproj" />
-      <ProjectReference Include="..\..\ProgramManager\src\Infrastructure\GozareshgirProgramManager.Infrastructure\GozareshgirProgramManager.Infrastructure.csproj" />
       <ProjectReference Include="..\..\Query.Bootstrapper\Query.Bootstrapper.csproj" />
       <ProjectReference Include="..\..\WorkFlow\Infrastructure\WorkFlow.Infrastructure.Config\WorkFlow.Infrastructure.Config.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
-      <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
-    </ItemGroup>
-
 </Project>

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Jobs/JobSchedulerRegistrator.cs

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

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/NullBoardNotificationPublisher.cs

@@ -1,10 +0,0 @@
-using GozareshgirProgramManager.Application.Interfaces;
-using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
-
-public class NullBoardNotificationPublisher:IBoardNotificationPublisher
-{
-    public Task SendProjectStatusChanged(long userId, TaskSectionStatus oldStatus, TaskSectionStatus newStatus, Guid sectionId)
-    {
-        throw new NotImplementedException();
-    }
-}

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Program.cs

@@ -7,47 +7,13 @@ using BackgroundInstitutionContract.Task;
 using BackgroundInstitutionContract.Task.Jobs;
 using CompanyManagment.App.Contracts.Hubs;
 using CompanyManagment.EFCore.Services;
-using GozareshgirProgramManager.Application._Bootstrapper;
-using GozareshgirProgramManager.Application.Interfaces;
-using GozareshgirProgramManager.Application.Modules.Users.Commands.CreateUser;
-using GozareshgirProgramManager.Infrastructure;
-using GozareshgirProgramManager.Infrastructure.Persistence.Seed;
 using Hangfire;
 using Microsoft.AspNetCore.Identity;
 using MongoDB.Driver;
 using PersonalContractingParty.Config;
 using Query.Bootstrapper;
-using Serilog;
-using Serilog.Events;
-using Shared.Contracts.PmUser.Queries;
 using WorkFlow.Infrastructure.Config;
 
-var logDirectory = @"C:\Logs\Hangfire\BackgroundInstitutionContract\";
-
-if (!Directory.Exists(logDirectory))
-{
-    Directory.CreateDirectory(logDirectory);
-}
-
-Log.Logger = new LoggerConfiguration()
-    //NO EF Core log
-    .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning)
-
-    //NO DbCommand log
-    .MinimumLevel.Override("Microsoft.EntityFrameworkCore.Database.Command", LogEventLevel.Warning)
-
-    //NO Microsoft Public log
-    .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
-    //.MinimumLevel.Information()
-    .WriteTo.File(
-        path: Path.Combine(logDirectory, "institution-contract-log-.txt"),
-        rollingInterval: RollingInterval.Day,
-        retainedFileCountLimit: 30,
-        shared: true,
-        outputTemplate:
-        "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level}] {Message}{NewLine}{Exception}"
-    ).CreateLogger();
-
 var builder = WebApplication.CreateBuilder(args);
 var hangfireConnectionString = builder.Configuration.GetConnectionString("HangfireDb");
 builder.Services.AddHangfire(x => x.UseSqlServerStorage(hangfireConnectionString));
@@ -60,7 +26,7 @@ builder.Services.AddTransient<ISmsService, SmsService>();
 builder.Services.AddTransient<IUidService, UidService>();
 builder.Services.AddTransient<IFileUploader, FileUploader>();
 builder.Services.Configure<AppSettingConfiguration>(builder.Configuration);
-builder.Services.AddScoped<IBoardNotificationPublisher, NullBoardNotificationPublisher>();
+
 #region MongoDb
 
 var mongoConnectionSection = builder.Configuration.GetSection("MongoDb");
@@ -72,28 +38,17 @@ builder.Services.AddSingleton<IMongoDatabase>(mongoDatabase);
 
 #endregion
 
-builder.Services.AddProgramManagerApplication();
-builder.Services.AddProgramManagerInfrastructure(builder.Configuration);
-
-
 PersonalBootstrapper.Configure(builder.Services, connectionString);
 TestDbBootStrapper.Configure(builder.Services, connectionStringTestDb);
 AccountManagementBootstrapper.Configure(builder.Services, connectionString);
 WorkFlowBootstrapper.Configure(builder.Services, connectionString);
-
 QueryBootstrapper.Configure(builder.Services);
 JobsBootstrapper.Configure(builder.Services);
 builder.Services.AddHttpClient();
 builder.Services.AddHttpContextAccessor();
 builder.Services.AddSignalR();
 
-
-builder.Host.UseSerilog();
-Log.Information("SERILOG STARTED SUCCESSFULLY");
-
-
 var app = builder.Build();
-
 app.MapHub<SendSmsHub>("/sendSmsHub");
 
 app.MapHangfireDashboard();

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/appsettings.Development.json

@@ -25,8 +25,8 @@
 
     //mahan Docker
     //"MesbahDb": "Data Source=localhost,5069;Initial Catalog=mesbah_db;User ID=sa;Password=YourPassword123;TrustServerCertificate=True;",
-    "HangfireDb": "Data Source=.;Initial Catalog=hangfire_db;Integrated Security=True;TrustServerCertificate=true;",
-    //"HangfireDb": "Data Source=185.208.175.186;Initial Catalog=hangfire_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]18[3019]#@ATt;TrustServerCertificate=true;"
+    //"HangfireDb": "Data Source=.;Initial Catalog=hangfire_db;Integrated Security=True;TrustServerCertificate=true;",
+    "HangfireDb": "Data Source=185.208.175.186;Initial Catalog=hangfire_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]18[3019]#@ATt;TrustServerCertificate=true;"
   },
 
   "GoogleRecaptchaV3": {

BackgroundJobs/BackgroundJobs.Task/BackgroundJobs.Task.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net10.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>

CHANGELOG.md

@@ -1,314 +0,0 @@
-# خلاصه تغییرات سیستم گزارش خرابی
-
-## 📝 فایل‌های اضافه شده (23 فایل)
-
-### 1️⃣ Domain Layer (3 فایل)
-```
-✓ AccountManagement.Domain/BugReportAgg/
-  ├── BugReport.cs
-  ├── BugReportLog.cs
-  └── BugReportScreenshot.cs
-```
-
-### 2️⃣ Application Contracts (6 فایل)
-```
-✓ AccountManagement.Application.Contracts/BugReport/
-  ├── IBugReportRepository.cs
-  ├── IBugReportApplication.cs
-  ├── CreateBugReportCommand.cs
-  ├── EditBugReportCommand.cs
-  ├── BugReportViewModel.cs
-  └── BugReportDetailViewModel.cs
-```
-
-### 3️⃣ Application Service (1 فایل)
-```
-✓ AccountManagement.Application/
-  └── BugReportApplication.cs
-```
-
-### 4️⃣ Infrastructure EFCore (4 فایل)
-```
-✓ AccountMangement.Infrastructure.EFCore/
-  ├── Mappings/
-  │   ├── BugReportMapping.cs
-  │   ├── BugReportLogMapping.cs
-  │   └── BugReportScreenshotMapping.cs
-  └── Repository/
-      └── BugReportRepository.cs
-```
-
-### 5️⃣ API Controller (1 فایل)
-```
-✓ ServiceHost/Controllers/
-  └── BugReportController.cs
-```
-
-### 6️⃣ Admin Pages (8 فایل)
-```
-✓ ServiceHost/Areas/AdminNew/Pages/BugReport/
-  ├── BugReportPageModel.cs
-  ├── Index.cshtml.cs
-  ├── Index.cshtml
-  ├── Details.cshtml.cs
-  ├── Details.cshtml
-  ├── Edit.cshtml.cs
-  ├── Edit.cshtml
-  ├── Delete.cshtml.cs
-  └── Delete.cshtml
-```
-
-### 7️⃣ Documentation (2 فایل)
-```
-✓ BUG_REPORT_SYSTEM.md
-✓ FLUTTER_BUG_REPORT_EXAMPLE.dart
-```
-
----
-
-## ✏️ فایل‌های اصلاح شده (2 فایل)
-
-### 1. AccountManagement.Configuration/AccountManagementBootstrapper.cs
-**تغییر:** اضافه کردن using برای BugReport
-```csharp
-using AccountManagement.Application.Contracts.BugReport;
-```
-
-**تغییر:** رجیستریشن سرویس‌ها
-```csharp
-services.AddTransient<IBugReportApplication, BugReportApplication>();
-services.AddTransient<IBugReportRepository, BugReportRepository>();
-```
-
-### 2. AccountMangement.Infrastructure.EFCore/AccountContext.cs
-**تغییر:** اضافه کردن using
-```csharp
-using AccountManagement.Domain.BugReportAgg;
-```
-
-**تغییر:** اضافه کردن DbSets
-```csharp
-#region BugReport
-public DbSet<BugReport> BugReports { get; set; }
-public DbSet<BugReportLog> BugReportLogs { get; set; }
-public DbSet<BugReportScreenshot> BugReportScreenshots { get; set; }
-#endregion
-```
-
----
-
-## 🔧 موارد مورد نیاز قبل از استفاده
-
-### 1. Database Migration
-```powershell
-# در Package Manager Console
-cd AccountMangement.Infrastructure.EFCore
-
-Add-Migration AddBugReportSystem
-Update-Database
-```
-
-### 2. الگوی Enum برای Flutter
-```dart
-enum BugReportType {
-  crash, // 1
-  ui, // 2
-  performance, // 3
-  feature, // 4
-  network, // 5
-  camera, // 6
-  faceRecognition, // 7
-  database, // 8
-  login, // 9
-  other, // 10
-}
-
-enum BugPriority {
-  critical, // 1
-  high, // 2
-  medium, // 3
-  low, // 4
-}
-```
-
----
-
-## 🚀 نقاط ورود
-
-### API Endpoints
-```
-POST   /api/bugreport/submit          - ثبت گزارش جدید
-GET    /api/bugreport/list            - دریافت لیست
-GET    /api/bugreport/{id}            - دریافت جزئیات
-PUT    /api/bugreport/{id}            - ویرایش وضعیت/اولویت
-DELETE /api/bugreport/{id}            - حذف گزارش
-```
-
-### Admin Pages
-```
-/AdminNew/BugReport                   - لیست گزارش‌ها
-/AdminNew/BugReport/Details/{id}      - جزئیات کامل
-/AdminNew/BugReport/Edit/{id}         - ویرایش
-/AdminNew/BugReport/Delete/{id}       - حذف
-```
-
----
-
-## 📊 Database Schema
-
-### BugReports جدول
-```sql
-- id (bigint, PK)
-- Title (nvarchar(200))
-- Description (ntext)
-- UserEmail (nvarchar(150))
-- AccountId (bigint, nullable)
-- DeviceModel (nvarchar(100))
-- OsVersion (nvarchar(50))
-- Platform (nvarchar(50))
-- Manufacturer (nvarchar(100))
-- DeviceId (nvarchar(200))
-- ScreenResolution (nvarchar(50))
-- MemoryInMB (int)
-- StorageInMB (int)
-- BatteryLevel (int)
-- IsCharging (bit)
-- NetworkType (nvarchar(50))
-- AppVersion (nvarchar(50))
-- BuildNumber (nvarchar(50))
-- PackageName (nvarchar(150))
-- InstallTime (datetime2)
-- LastUpdateTime (datetime2)
-- Flavor (nvarchar(50))
-- Type (int)
-- Priority (int)
-- Status (int)
-- StackTrace (ntext, nullable)
-- CreationDate (datetime2)
-- UpdateDate (datetime2, nullable)
-```
-
-### BugReportLogs جدول
-```sql
-- id (bigint, PK)
-- BugReportId (bigint, FK)
-- Message (ntext)
-- Timestamp (datetime2)
-```
-
-### BugReportScreenshots جدول
-```sql
-- id (bigint, PK)
-- BugReportId (bigint, FK)
-- Base64Data (ntext)
-- FileName (nvarchar(255))
-- UploadDate (datetime2)
-```
-
----
-
-## ✨ مثال درخواست API
-
-```json
-POST /api/bugreport/submit
-Content-Type: application/json
-
-{
-  "title": "برنامه هنگام ورود خراب می‌شود",
-  "description": "هنگام فشار دادن دکمه ورود، برنامه کرش می‌کند",
-  "userEmail": "user@example.com",
-  "accountId": 123,
-  "deviceModel": "Samsung Galaxy S21",
-  "osVersion": "Android 12",
-  "platform": "Android",
-  "manufacturer": "Samsung",
-  "deviceId": "device-12345",
-  "screenResolution": "1440x3200",
-  "memoryInMB": 8000,
-  "storageInMB": 256000,
-  "batteryLevel": 75,
-  "isCharging": false,
-  "networkType": "4G",
-  "appVersion": "1.0.0",
-  "buildNumber": "100",
-  "packageName": "com.example.app",
-  "installTime": "2024-01-01T10:00:00Z",
-  "lastUpdateTime": "2024-12-07T14:30:00Z",
-  "flavor": "production",
-  "type": 1,
-  "priority": 2,
-  "stackTrace": "...",
-  "logs": ["log line 1", "log line 2"],
-  "screenshots": ["base64-string"]
-}
-```
-
----
-
-## 🔐 Security Features
-
-- ✅ Authorization برای Admin Pages (AdminAreaPermission required)
-- ✅ API Authentication
-- ✅ XSS Protection (Html.Raw محدود)
-- ✅ CSRF Protection (ASP.NET Core default)
-- ✅ Input Validation
-- ✅ Safe Delete with Confirmation
-
----
-
-## 📚 Documentation Files
-
-1. **BUG_REPORT_SYSTEM.md** - راهنمای کامل سیستم
-2. **FLUTTER_BUG_REPORT_EXAMPLE.dart** - مثال پیاده‌سازی Flutter
-3. **CHANGELOG.md** (این فایل) - خلاصه تغییرات
-
----
-
-## ✅ Checklist پیاده‌سازی
-
-- [x] Domain Models
-- [x] Database Mappings
-- [x] Repository Pattern
-- [x] Application Services
-- [x] API Endpoints
-- [x] Admin UI Pages
-- [x] Dependency Injection
-- [x] Error Handling
-- [x] Documentation
-- [x] Flutter Example
-- [ ] Database Migration (باید دستی اجرا شود)
-- [ ] Testing
-
----
-
-## 🎯 مراحل بعدی
-
-1. **اجرای Migration:**
-   ```powershell
-   Add-Migration AddBugReportSystem
-   Update-Database
-   ```
-
-2. **تست API:**
-   - استفاده از Postman/Thunder Client
-   - تست تمام endpoints
-
-3. **تست Admin Panel:**
-   - دسترسی به /AdminNew/BugReport
-   - تست فیلترها و جستجو
-   - تست ویرایش و حذف
-
-4. **Integration Flutter:**
-   - کپی کردن `FLUTTER_BUG_REPORT_EXAMPLE.dart`
-   - سازگار کردن با پروژه Flutter
-   - تست ثبت گزارش‌ها
-
----
-
-## 📞 پشتیبانی
-
-برای هر سوال یا مشکل:
-1. بررسی کنید `BUG_REPORT_SYSTEM.md`
-2. بررسی کنید logs و error messages
-3. مطمئن شوید Migration اجرا شده است
-

Company.Domain/CameraBugReportAgg/CameraBugReport.cs

@@ -1,195 +0,0 @@
-using System;
-using System.Collections.Generic;
-using _0_Framework.Domain;
-using MongoDB.Bson.Serialization.Attributes;
-
-namespace Company.Domain.CameraBugReportAgg;
-
-/// <summary>
-/// مدل دامنه برای گزارش خرابی دوربین
-/// </summary>
-public class CameraBugReport 
-{
-    [BsonId]
-    [BsonRepresentation(MongoDB.Bson.BsonType.String)]
-    public Guid Id { get; set; }
-
-    public CameraBugReport()
-    {
-        Id = Guid.NewGuid();
-        CreationDate = DateTime.Now;
-        Status = CameraBugReportStatus.Open;
-        Screenshots = new List<CameraBugReportScreenshot>();
-        Logs = new List<CameraBugReportLog>();
-    }
-
-    public CameraBugReport(
-        string title,
-        string description,
-        string userEmail,
-        string deviceModel,
-        string osVersion,
-        string manufacturer,
-        string buildNumber,
-        string appVersion,
-        string screenResolution,
-        bool isCharging,
-        int batteryLevel,
-        int storageInMB,
-        int memoryInMB,
-        string networkType,
-        string platform,
-        string deviceId,
-        string packageName,
-        DateTime installTime,
-        DateTime lastUpdateTime,
-        string flavor,
-        CameraBugReportType type,
-        CameraBugPriority priority,
-        long? accountId = null,
-        string stackTrace = null) : this()
-
-    {
-        Priority = priority;
-        Type = type;
-        Flavor = flavor;
-        LastUpdateTime = lastUpdateTime;
-        InstallTime = installTime;
-        PackageName = packageName;
-        BuildNumber = buildNumber;
-        AppVersion = appVersion;
-        NetworkType = networkType;
-        IsCharging = isCharging;
-        BatteryLevel = batteryLevel;
-        StorageInMB = storageInMB;
-        MemoryInMB = memoryInMB;
-        ScreenResolution = screenResolution;
-        DeviceId = deviceId;
-        Manufacturer = manufacturer;
-        Platform = platform;
-        OsVersion = osVersion;
-        DeviceModel = deviceModel;
-        AccountId = accountId;
-        UserEmail = userEmail;
-        Description = description;
-        Title = title;
-        StackTrace = stackTrace;
-    }
-
-    [BsonElement("screenshots")]
-    public List<CameraBugReportScreenshot> Screenshots { get; private set; }
-    
-    [BsonElement("logs")]
-    public List<CameraBugReportLog> Logs { get; private set; }
-    
-    [BsonElement("updateDate")]
-    public DateTime? UpdateDate { get; private set; }
-    
-    [BsonElement("creationDate")]
-    public DateTime CreationDate { get; private set; }
-    
-    [BsonElement("stackTrace")]
-    public string StackTrace { get; private set; }
-    
-    [BsonElement("status")]
-    [BsonRepresentation(MongoDB.Bson.BsonType.String)]
-    public CameraBugReportStatus Status { get; private set; }
-    
-    [BsonElement("priority")]
-    [BsonRepresentation(MongoDB.Bson.BsonType.String)]
-    
-    public CameraBugPriority Priority { get; private set; }
-    
-    [BsonElement("type")]
-    [BsonRepresentation(MongoDB.Bson.BsonType.String)]
-    
-    public CameraBugReportType Type { get; private set; }
-    
-    [BsonElement("flavor")]
-    public string Flavor { get; private set; }
-    
-    [BsonElement("lastUpdateTime")]
-    public DateTime LastUpdateTime { get; private set; }
-    
-    [BsonElement("installTime")]
-    public DateTime InstallTime { get; private set; }
-    
-    [BsonElement("packageName")]
-    public string PackageName { get; private set; }
-    
-    [BsonElement("buildNumber")]
-    public string BuildNumber { get; private set; }
-    
-    [BsonElement("appVersion")]
-    public string AppVersion { get; private set; }
-    
-    [BsonElement("networkType")]
-    public string NetworkType { get; private set; }
-    
-    [BsonElement("isCharging")]
-    public bool IsCharging { get; private set; }
-    
-    [BsonElement("batteryLevel")]
-    public int BatteryLevel { get; private set; }
-    
-    [BsonElement("storageInMB")]
-    public int StorageInMB { get; private set; }
-    
-    [BsonElement("memoryInMB")]
-    public int MemoryInMB { get; private set; }
-    
-    [BsonElement("screenResolution")]
-    public string ScreenResolution { get; private set; }
-    
-    [BsonElement("deviceId")]
-    public string DeviceId { get; private set; }
-    
-    [BsonElement("manufacturer")]
-    public string Manufacturer { get; private set; }
-    
-    [BsonElement("platform")]
-    public string Platform { get; private set; }
-    
-    [BsonElement("osVersion")]
-    public string OsVersion { get; private set; }
-    
-    [BsonElement("deviceModel")]
-    public string DeviceModel { get; private set; }
-    
-    [BsonElement("accountId")]
-    public long? AccountId { get; private set; }
-    
-    [BsonElement("userEmail")]
-    public string UserEmail { get; private set; }
-    
-    [BsonElement("description")]
-    public string Description { get; private set; }
-    
-    [BsonElement("title")]
-    public string Title { get; private set; }
-
-
-    public void ChangeStatus(CameraBugReportStatus newStatus)
-    {
-        UpdateDate = DateTime.Now;
-        Status = newStatus;
-    }
-
-    public void ChangePriority(CameraBugPriority newPriority)
-    {
-        Priority = newPriority;
-        UpdateDate = DateTime.Now;
-    }
-
-    public void AddScreenshot(string base64Data, string fileName)
-    {
-        Screenshots.Add(new CameraBugReportScreenshot
-            { Base64Data = base64Data, FileName = fileName, UploadDate = DateTime.Now });
-    }
-
-    public void AddLog(string logMessage)
-    {
-        Logs.Add(new CameraBugReportLog { Message = logMessage, Timestamp = DateTime.Now });
-    }
-}
-

Company.Domain/CameraBugReportAgg/CameraBugReportLog.cs

@@ -1,20 +0,0 @@
-using System;
-using _0_Framework.Domain;
-using MongoDB.Bson.Serialization.Attributes;
-
-namespace Company.Domain.CameraBugReportAgg
-{
-    /// <summary>
-    /// لاگ‌های گزارش خرابی دوربین
-    /// </summary>
-    public class CameraBugReportLog : EntityBase
-    {
-        // FK و navigation property حذف شد برای MongoDB
-        [BsonElement("message")]
-        public string Message { get; set; }
-        
-        [BsonElement("timestamp")]
-        public DateTime Timestamp { get; set; }
-    }
-}
-

Company.Domain/CameraBugReportAgg/CameraBugReportScreenshot.cs

@@ -1,23 +0,0 @@
-using System;
-using _0_Framework.Domain;
-using MongoDB.Bson.Serialization.Attributes;
-
-namespace Company.Domain.CameraBugReportAgg
-{
-    /// <summary>
-    /// عکس‌های ضمیمه شده به گزارش خرابی دوربین (Base64 encoded)
-    /// </summary>
-    public class CameraBugReportScreenshot : EntityBase
-    {
-        // FK و navigation property حذف شد برای MongoDB
-        [BsonElement("base64Data")]
-        public string Base64Data { get; set; }
-        
-        [BsonElement("fileName")]
-        public string FileName { get; set; }
-        
-        [BsonElement("uploadDate")]
-        public DateTime UploadDate { get; set; }
-    }
-}
-

Company.Domain/CameraBugReportAgg/ICameraBugReportRepository.cs

@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using _0_Framework.InfraStructure;
-
-namespace Company.Domain.CameraBugReportAgg;
-
-/// <summary>
-/// رابط انبار گزارش خرابی دوربین برای MongoDB
-/// </summary>
-public interface ICameraBugReportRepository
-{
-    // Async methods for MongoDB operations
-    Task CreateAsync(CameraBugReport bugReport);
-    Task UpdateAsync(CameraBugReport bugReport);
-    Task<CameraBugReport> GetByIdAsync(Guid id);
-    Task<List<CameraBugReport>> GetAllAsync();
-    Task<List<CameraBugReport>> GetAllAsync(int skip, int take);
-    Task DeleteAsync(Guid id);
-    Task<bool> IsExistAsync(Guid id);
-    Task<List<CameraBugReport>> FilterAsync(
-        CameraBugReportType? type = null,
-        CameraBugPriority? priority = null,
-        CameraBugReportStatus? status = null,
-        string searchTerm = null,
-        int skip = 0,
-        int take = 10);
-    Task<int> CountAsync(
-        CameraBugReportType? type = null,
-        CameraBugPriority? priority = null,
-        CameraBugReportStatus? status = null,
-        string searchTerm = null);
-}

Company.Domain/CheckoutAgg/Checkout.cs

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

Company.Domain/CheckoutAgg/ValueObjects/CheckoutReward.cs

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

Company.Domain/Company.Domain.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,15 +16,10 @@
 
   <ItemGroup>
     <Folder Include="CheckoutAgg\ValueObjects\" />
-    <Folder Include="_common\" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.1" />
-    <PackageReference Include="MongoDB.Bson" Version="3.5.2" />
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.1" />
+    <PackageReference Include="MongoDB.Bson" Version="3.5.0" />
   </ItemGroup>
 
 </Project>

Company.Domain/ContarctingPartyAgg/IPersonalContractingPartyRepository.cs

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

Company.Domain/ContarctingPartyAgg/PersonalContractingParty.cs

@@ -290,13 +290,4 @@ public class PersonalContractingParty : EntityBase
         this.Gender = gender;
         this.IsAuthenticated = true;
     }
-
-    public void EditLegalPartyFromInstitution(string legalPosition, string companyName,
-        string registerId,string nationalId)
-    {
-        LegalPosition = legalPosition;
-        LName = companyName;
-        RegisterId = registerId;
-        NationalId = nationalId;
-    }
 }

Company.Domain/ContractAgg/IContractRepository.cs

@@ -48,10 +48,6 @@ public interface IContractRepository : IRepository<long, Contract>
     bool Remove(long id);
 
     List<ContractViweModel> SearchForClient(ContractSearchModel searchModel);
-    
-    Task<PagedResult<GetContractListForClientResponse>> GetContractListForClient(GetContractListForClientRequest searchModel);
-    
-    Task<List<ContractPrintViewModel>> PrintAllAsync(List<long> ids);
     #endregion
     #region NewChangeByHeydari
 
@@ -67,8 +63,4 @@ public interface IContractRepository : IRepository<long, Contract>
     ContractViweModel GetByWorkshopIdEmployeeIdInDates(long workshopId, long employeeId, DateTime startOfMonth, DateTime endOfMonth);
     List<ContractViweModel> GetByWorkshopIdInDates(long workshopId, DateTime contractStart, DateTime contractEnd);
     #endregion
-
-}
-
-
-
+}

Company.Domain/EmployeeAgg/IEmployeeRepository.cs

@@ -76,7 +76,6 @@ public interface IEmployeeRepository : IRepository<long, Employee>
 	#region Api
 	Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText,long id);
 	Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel);
-	Task<List<GetClientEmployeeListViewModel>> GetClientEmployeeList(GetClientEmployeeListSearchModel searchModel, long workshopId);
 	#endregion
 
 

Company.Domain/EmployeeDocumentsAgg/EmployeeDocuments.cs

@@ -37,7 +37,7 @@ namespace Company.Domain.EmployeeDocumentsAgg
         {
             WorkshopId = workshopId;
             EmployeeId = employeeId;
-            Gender = gender??string.Empty;
+            Gender = gender;
         }
 
         private EmployeeDocuments()

Company.Domain/File1/File1.cs

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

Company.Domain/FinancialInvoiceAgg/IFinancialInvoiceRepository.cs

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

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -13,7 +13,7 @@ namespace Company.Domain.InstitutionContractAgg;
 
 public interface IInstitutionContractRepository : IRepository<long, InstitutionContract>
 {
-
+    
     EditInstitutionContract GetDetails(long id);
     EditInstitutionContract GetFirstContract(long contractingPartyId, string typeOfContract);
     List<InstitutionContractViewModel> InstitutionContractsWithoutAccount();
@@ -56,13 +56,9 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     void UpdateStatusIfNeeded(long institutionContractId);
     Task<GetInstitutionVerificationDetailsViewModel> GetVerificationDetails(Guid id);
     Task<InstitutionContract> GetByPublicIdAsync(Guid id);
-    InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request, string contractStart = null);
+    InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request);
     InstitutionContractDiscountResponse ResetDiscountCreate(InstitutionContractResetDiscountForCreateRequest request);
-
-    #region Creation
-
-
-    #endregion
+    
 
     #region Extension
 
@@ -73,25 +69,78 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     Task<InstitutionContractDiscountResponse> SetDiscountForExtension(
         InstitutionContractSetDiscountForExtensionRequest request);
     Task<InstitutionContractDiscountResponse> ResetDiscountForExtension(InstitutionContractResetDiscountForExtensionRequest request);
-
+    
     Task<OperationResult> ExtensionComplete(InstitutionContractExtensionCompleteRequest request);
 
     #endregion
 
     #region Upgrade(Amendment)
 
-    Task<InstitutionContractAmendmentWorkshopsResponse> GetAmendmentWorkshops(long institutionContractId);
-    Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(InsitutionContractAmendmentPaymentRequest request);
+        Task<InstitutionContractAmendmentWorkshopsResponse> GetAmendmentWorkshops(long institutionContractId);
+        Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(InsitutionContractAmendmentPaymentRequest request);
 
-    Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request);
-    Task RemoveAmendmentWorkshops(Guid workshopTempId);
-    #endregion
+        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);
 
 
-  
+    #region ReminderSMS
+    /// <summary>
+    /// دریافت لیست - ارسال پیامک
+    /// فراخوانی از سمت بک گراند سرویس
+    /// </summary>
+    /// <returns></returns>
+    Task<bool> SendReminderSmsForBackgroundTask();
+
+    /// <summary>
+    /// ارسال پیامک صورت حساب ماهانه
+    /// </summary>
+    /// <param name="now"></param>
+    /// <returns></returns>
+    Task SendMonthlySms(DateTime now);
+
+    /// <summary>
+    /// ارسال پیامک مسدودی از طرف بک گراند سرویس
+    /// </summary>
+    /// <returns></returns>
+    Task SendBlockSmsForBackgroundTask();
+
+    /// <summary>
+    /// دریافت لیست واجد شرایط بلاک
+    /// جهت ارسال پیامک مسدودی
+    /// </summary>
+    /// <param name="checkDate"></param>
+    /// <returns></returns>
+    Task<List<BlockSmsListData>> GetBlockListData(DateTime checkDate);
+
+    /// <summary>
+    /// ارسال پیامک مسدودی
+    /// </summary>
+    /// <param name="smsListData"></param>
+    /// <param name="typeOfSms"></param>
+    /// <param name="sendMessStart"></param>
+    /// <param name="sendMessEnd"></param>
+    /// <returns></returns>
+    Task SendBlockSmsToContractingParties(List<BlockSmsListData> smsListData, string typeOfSms,
+        string sendMessStart, string sendMessEnd);
+
+    /// <summary>
+    ///دریافت لیست بدهکارن
+    /// جهت ارسال پیامک
+    /// </summary>
+    /// <returns></returns>
+    Task<List<SmsListData>> GetSmsListData(DateTime checkDate, TypeOfSmsSetting typeOfSmsSetting);
+
+    /// <summary>
+    /// ارسال پیامک های یاد آور بدهی
+    /// </summary>
+    /// <returns></returns>
+    Task SendReminderSmsToContractingParties(List<SmsListData> smsListData, string typeOfSms, string sendMessStart, string sendMessEnd);
+
+    #endregion
 
     #region CreateMontlyTransaction
 
@@ -104,21 +153,5 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
 
     #endregion
 
-
-
-
-
-   
-
-
     Task<long> GetIdByInstallmentId(long installmentId);
-    Task<InstitutionContract> GetPreviousContract(long currentInstitutionContractId);
-    Task<InstitutionContractCreationInquiryResult> CreationInquiry(InstitutionContractCreationInquiryRequest request);
-    Task<InstitutionContractCreationWorkshopsResponse> GetCreationWorkshops(InstitutionContractCreationWorkshopsRequest request);
-    Task<InstitutionContractCreationPlanResponse> GetCreationInstitutionPlan(InstitutionContractCreationPlanRequest request);
-    Task<InstitutionContractCreationPaymentResponse> GetCreationPaymentMethod(InstitutionContractCreationPaymentRequest request);
-    Task<InstitutionContractDiscountResponse> SetDiscountForCreation(InstitutionContractSetDiscountForCreationRequest request);
-    Task<InstitutionContractDiscountResponse> ResetDiscountForCreation(InstitutionContractResetDiscountForExtensionRequest request);
-    Task<OperationResult> CreationComplete(InstitutionContractExtensionCompleteRequest request);
-    Task<InstitutionContract> GetIncludeInstallments(long id);
 }

Company.Domain/InstitutionContractAgg/IInstitutionContractSmsServiceRepository.cs

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

Company.Domain/InstitutionContractAgg/InstitutionContract.cs

@@ -98,11 +98,6 @@ public class InstitutionContract : EntityBase
     // مبلغ قرارداد
     public double ContractAmount { get; private set; }
 
-    public double ContractAmountWithTax => !IsOldContract  ? ContractAmount + ContractAmountTax
-        : ContractAmount;
-    
-    public double ContractAmountTax => ContractAmount*0.10;
-
     //خسارت روزانه
     public double DailyCompenseation { get; private set; }
 
@@ -164,10 +159,6 @@ public class InstitutionContract : EntityBase
 
     public List<InstitutionContractAmendment> Amendments { get; private set; }
 
-    public InstitutionContractSigningType? SigningType { get; private set; }
-
-    public bool IsOldContract => LawId== 0;
-
     public InstitutionContract()
     {
         ContactInfoList = [];
@@ -271,10 +262,6 @@ public class InstitutionContract : EntityBase
     {
         WorkshopGroup = null;
     }
-    public void SetSigningType(InstitutionContractSigningType signingType)
-    {
-        SigningType = signingType;
-    }
 }
 
 public class InstitutionContractAmendment : EntityBase

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs

@@ -10,15 +10,13 @@ public class InstitutionContractWorkshopCurrent:InstitutionContractWorkshopBase
     public InstitutionContractWorkshopCurrent(string workshopName, bool hasRollCallPlan,
         bool hasRollCallPlanInPerson, bool hasCustomizeCheckoutPlan, bool hasContractPlan,
         bool hasContractPlanInPerson, bool hasInsurancePlan, bool hasInsurancePlanInPerson,
-        int personnelCount, double price,long institutionContractWorkshopGroupId,
-        InstitutionContractWorkshopGroup workshopGroup,long workshopId,long initialWorkshopId) : base(workshopName, hasRollCallPlan, 
+        int personnelCount, double price,long institutionContractWorkshopGroupId,InstitutionContractWorkshopGroup workshopGroup,long workshopId) : base(workshopName, hasRollCallPlan, 
         hasRollCallPlanInPerson, hasCustomizeCheckoutPlan, hasContractPlan,
         hasContractPlanInPerson, hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price)
     {
         InstitutionContractWorkshopGroupId = institutionContractWorkshopGroupId;
         WorkshopGroup = workshopGroup;
         WorkshopId = workshopId;
-        InitialWorkshopId = initialWorkshopId;
     }
     public long InstitutionContractWorkshopGroupId { get; private set; }
     public InstitutionContractWorkshopGroup WorkshopGroup { get; private set; }

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopGroup.cs

@@ -23,8 +23,6 @@ public class InstitutionContractWorkshopGroup : EntityBase
         !InitialWorkshops.Cast<InstitutionContractWorkshopBase>()
             .SequenceEqual(CurrentWorkshops.Cast<InstitutionContractWorkshopBase>());
 
-    public bool IsInPersonContract => InitialWorkshops.Any(x => x.Services.ContractInPerson);
-
     public InstitutionContractWorkshopGroup(long institutionContractId,
         List<InstitutionContractWorkshopInitial> initialDetails)
     {
@@ -39,10 +37,4 @@ public class InstitutionContractWorkshopGroup : EntityBase
         CurrentWorkshops = updatedDetails.ToList();
         LastModifiedDate = DateTime.Now;
     }
-
-    public void AddCurrentWorkshop(InstitutionContractWorkshopCurrent currentWorkshop)
-    {
-        CurrentWorkshops.Add(currentWorkshop);
-        LastModifiedDate = DateTime.Now;
-    }
 }

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopInitial.cs

@@ -31,7 +31,7 @@ public class InstitutionContractWorkshopInitial:InstitutionContractWorkshopBase
         WorkshopCreated = true;
         WorkshopCurrent = new InstitutionContractWorkshopCurrent(WorkshopName,Services.RollCall,Services.RollCallInPerson,
             Services.CustomizeCheckout,Services.Contract,Services.ContractInPerson,Services.Insurance,
-            Services.InsuranceInPerson,PersonnelCount,Price,InstitutionContractWorkshopGroupId,WorkshopGroup,workshopId,id);
+            Services.InsuranceInPerson,PersonnelCount,Price,InstitutionContractWorkshopGroupId,WorkshopGroup,workshopId);
         WorkshopCurrent.SetEmployers(Employers.Select(x=>x.EmployerId).ToList());
     }
 

Company.Domain/InstitutionContractCreationTempAgg/InstitutionContractCreationTemp.cs

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

Company.Domain/InstitutionContractSendFlagAgg/IInstitutionContractSendFlagRepository.cs

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

Company.Domain/InstitutionContractSendFlagAgg/InstitutionContractSendFlag.cs

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

Company.Domain/InstitutionPlanAgg/IPlanPercentageRepository.cs

@@ -1,9 +1,7 @@
-using _0_Framework.Application;
-using _0_Framework.Domain;
+using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InstitutionPlan;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace Company.Domain.InstitutionPlanAgg;
 
@@ -28,18 +26,4 @@ public interface IPlanPercentageRepository : IRepository<long, PlanPercentage>
     /// <param name="command"></param>
     /// <returns></returns>
     InstitutionPlanViewModel GetInstitutionPlanForWorkshop(WorkshopTempViewModel command);
-
-    /// <summary>
-    /// دریافت دیتای مودال ایجاد
-    /// </summary>
-    /// <returns></returns>
-    Task<CreateServiceAmountDto> GetCreateModalData();
-
-    /// <summary>
-    /// دریافت لیست مبالغ سرویس ها
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<PagedResult<InstitutionPlanListDto>> GetList(
-        InstitutionPlanSearchModel searchModel);
 }

Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs

@@ -73,12 +73,10 @@ public interface IInsuranceListRepository:IRepository<long, InsuranceList>
     Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
 
 	Task<InsuranceListTabsCountViewModel> GetTabCounts(InsuranceListSearchModel searchModel);
-	Task<PagedResult<InsuranceClientListViewModel>> GetInsuranceClientList(InsuranceClientSearchModel searchModel);
 
 	#endregion
 
 	Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel);
-	Task<InsuranceClientPrintViewModel> ClientPrintOne(long id);
 }
 
 

Company.Domain/LeaveAgg/ILeaveRepository.cs

@@ -1,10 +1,8 @@
-using _0_Framework.Application;
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.InstitutionPlan;
-using CompanyManagment.App.Contracts.Leave;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
+using _0_Framework.Application;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.Leave;
 
 namespace Company.Domain.LeaveAgg;
 
@@ -12,7 +10,7 @@ public interface ILeaveRepository : IRepository<long, Leave>
 {
     EditLeave GetDetails(long id);
     List<LeaveViewModel> search(LeaveSearchModel searchModel);
-    Task<OperationResult> RemoveLeave(long id);
+    OperationResult RemoveLeave(long id);
 
     #region Pooya
     List<LeaveViewModel> GetByWorkshopIdEmployeeIdInDates(long workshopId, long employeeId, DateTime start, DateTime end);
@@ -29,8 +27,6 @@ public interface ILeaveRepository : IRepository<long, Leave>
     List<LeaveMainViewModel> searchClient(LeaveSearchModel searchModel);
     LeavePrintViewModel PrintOne(long id);
     List<LeavePrintViewModel> PrintAll(List<long> id);
-    
-    Task<List<LeavePrintResponseViewModel>> PrintAllAsync(List<long> ids, long workshopId);
 
     #region Vafa
 
@@ -38,27 +34,4 @@ public interface ILeaveRepository : IRepository<long, Leave>
 
     #endregion
     bool CheckIfValidToEdit(long id);
-
-    /// <summary>
-    /// دریافت لیست مرخصی ها در کلاینت
-    /// Api
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<PagedResult<leaveListDto>> GetList(
-        LeaveListSearchModel searchModel);
-
-    /// <summary>
-    /// دریافت لیست گروه بندی شده
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<List<GroupLeaveListDto>> GetGroupList(LeaveListSearchModel searchModel);
-
-    /// <summary>
-    /// پرینت لیستی
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <returns></returns>
-    Task<LeaveListPrintDto> ListPrint(List<long> ids);
 }

Company.Domain/RollCallAgg/IRollCallMandatoryRepository.cs

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

Company.Domain/RollCallAgg/RollCall.cs

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

Company.Domain/SmsResultAgg/ISmsResultRepository.cs

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

Company.Domain/WorkshopAgg/Workshop.cs

@@ -316,10 +316,7 @@ public class Workshop : EntityBase
         IsStaticCheckout = isStaticCheckout;
     }
 
-    public void AddContractingPartyId(long contractingPartyId)
-    {
-        ContractingPartyId = contractingPartyId;
-    }
+
     public void Active(string archiveCode)
     {
         this.IsActive = true;

Company.Domain/_common/IUnitOfWork.cs

@@ -1,8 +0,0 @@
-namespace Company.Domain._common;
-
-public interface IUnitOfWork
-{
-    void BeginAccountContext();
-    void CommitAccountContext();
-    void RollbackAccountContext();
-}

CompanyManagement.Infrastructure.Excel/CWS/CustomizeWorkshopGroupSettingExcelGenerator.cs

@@ -26,7 +26,7 @@ public class CustomizeWorkshopGroupSettingExcelGenerator
 {
     public static byte[] Generate(List<CustomizeWorkshopGroupExcelViewModel> groups)
     {
-        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using (var package = new ExcelPackage())
         {
             var worksheet = package.Workbook.Worksheets.Add("GroupsAndEmployees");

CompanyManagement.Infrastructure.Excel/CaseManagement/CaseManagementExcelGenerator.cs

@@ -24,7 +24,7 @@ public class CaseManagementExcelGenerator
     };
     public static byte[] GenerateCheckoutTempExcelInfo(List<FileExcelViewModel> data)
     {
-        OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using var package = new ExcelPackage();
         CreateSheet(data, package,"همه");
         CreateSheet(data.Where(x=>x.Status ==2).ToList(), package,"فعال");

CompanyManagement.Infrastructure.Excel/Checkout/CustomizeCheckoutExcelGenerator.cs

@@ -46,7 +46,7 @@ public class CustomizeCheckoutExcelGenerator
     };
     public static byte[] GenerateCheckoutTempExcelInfo(List<CustomizeCheckoutTempExcelViewModel> data, List<string> selectedParameters)
     {
-        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using var package = new ExcelPackage();
         var worksheet = package.Workbook.Worksheets.Add("Sheet1");
 

CompanyManagement.Infrastructure.Excel/CompanyManagement.Infrastructure.Excel.csproj

@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Azure.Identity" Version="1.17.1" />
-		<PackageReference Include="EPPlus" Version="8.4.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.0" />
+		<PackageReference Include="EPPlus" Version="7.5.2" />
+		<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
 	</ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AccountMangement.Infrastructure.EFCore\AccountMangement.Infrastructure.EFCore.csproj" />

CompanyManagement.Infrastructure.Excel/ContractingParty/InstitutionContractDetailExcelGenerator.cs

@@ -0,0 +1,86 @@
+using System.Collections.Generic;
+using OfficeOpenXml;
+using OfficeOpenXml.Style;
+using System.Drawing;
+
+namespace CompanyManagement.Infrastructure.Excel.ContractingParty;
+public static class InstitutionContractDetailExcelGenerator
+{
+    public static byte[] Generate(List<InstitutionContractDetailExcelViewModel> items)
+    {
+        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        using var package = new ExcelPackage();
+        var worksheet = package.Workbook.Worksheets.Add("جزئیات طرف قرارداد");
+
+        // Headers (فارسی)
+        worksheet.Cells[1, 1].Value = "نام";
+        worksheet.Cells[1, 2].Value = "نام خانوادگی";
+        worksheet.Cells[1, 3].Value = "کد ملی";
+        worksheet.Cells[1, 4].Value = "تاریخ تولد";
+        worksheet.Cells[1, 5].Value = "شماره تماس";
+        worksheet.Cells[1, 6].Value = "شماره ملی";
+
+        // Header style
+        using (var headerRange = worksheet.Cells[1, 1, 1, 6])
+        {
+            headerRange.Style.Font.Bold = true;
+            headerRange.Style.Fill.PatternType = ExcelFillStyle.Solid;
+            headerRange.Style.Fill.BackgroundColor.SetColor(Color.LightGray);
+            headerRange.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
+            headerRange.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
+            headerRange.Style.Border.Top.Style = ExcelBorderStyle.Thin;
+            headerRange.Style.Border.Bottom.Style = ExcelBorderStyle.Thin;
+            headerRange.Style.Border.Left.Style = ExcelBorderStyle.Thin;
+            headerRange.Style.Border.Right.Style = ExcelBorderStyle.Thin;
+        }
+
+        // Data rows
+        int row = 2;
+        if (items != null)
+        {
+            foreach (var it in items)
+            {
+                worksheet.Cells[row, 1].Value = it.FirstName;
+                worksheet.Cells[row, 2].Value = it.LastName;
+                worksheet.Cells[row, 3].Value = it.NationalCode;
+                worksheet.Cells[row, 4].Value = it.BirthDate;
+                worksheet.Cells[row, 5].Value = it.PhoneNumber;
+                worksheet.Cells[row, 6].Value = it.NationalNumber;
+
+                using (var dataRange = worksheet.Cells[row, 1, row, 6])
+                {
+                    dataRange.Style.Border.Top.Style = ExcelBorderStyle.Thin;
+                    dataRange.Style.Border.Bottom.Style = ExcelBorderStyle.Thin;
+                    dataRange.Style.Border.Left.Style = ExcelBorderStyle.Thin;
+                    dataRange.Style.Border.Right.Style = ExcelBorderStyle.Thin;
+                    dataRange.Style.HorizontalAlignment = ExcelHorizontalAlignment.Right; // راست‌چین
+                    dataRange.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
+                    dataRange.Style.WrapText = true;
+                }
+
+                row++;
+            }
+        }
+
+        // Auto-fit columns to largest content
+        if (worksheet.Dimension != null)
+        {
+            worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();
+        }
+
+        // Set sheet to RTL for Persian
+        worksheet.View.RightToLeft = true;
+
+        return package.GetAsByteArray();
+    }
+}
+
+public class InstitutionContractDetailExcelViewModel
+{
+    public string FirstName { get; set; }
+    public string LastName { get; set; }
+    public string NationalCode { get; set; }
+    public string BirthDate { get; set; } // accept Persian date strings
+    public string PhoneNumber { get; set; }
+    public string NationalNumber { get; set; }
+}

CompanyManagement.Infrastructure.Excel/ContractingParty/InstitutionContractLegalExcelGenerator.cs

@@ -0,0 +1,93 @@
+using System.Collections.Generic;
+using OfficeOpenXml;
+using OfficeOpenXml.Style;
+using System.Drawing;
+
+namespace CompanyManagement.Infrastructure.Excel.ContractingParty;
+public static class InstitutionContractLegalExcelGenerator
+{
+    public static byte[] Generate(List<InstitutionContractLegalExcelViewModel> items)
+    {
+        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        using var package = new ExcelPackage();
+        var worksheet = package.Workbook.Worksheets.Add("جزئیات حقوقی طرف قرارداد");
+
+        // Headers (فارسی)
+        worksheet.Cells[1, 1].Value = "نام شرکت";
+        worksheet.Cells[1, 2].Value = "نام";
+        worksheet.Cells[1, 3].Value = "نام خانوادگی";
+        worksheet.Cells[1, 4].Value = "کد ملی";
+        worksheet.Cells[1, 5].Value = "شماره ثبت";
+        worksheet.Cells[1, 6].Value = "تاریخ تولد";
+        worksheet.Cells[1, 7].Value = "شماره تماس";
+        worksheet.Cells[1, 8].Value = "شماره ملی";
+
+        // Header style
+        using (var headerRange = worksheet.Cells[1, 1, 1, 8])
+        {
+            headerRange.Style.Font.Bold = true;
+            headerRange.Style.Fill.PatternType = ExcelFillStyle.Solid;
+            headerRange.Style.Fill.BackgroundColor.SetColor(Color.LightGray);
+            headerRange.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
+            headerRange.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
+            headerRange.Style.Border.Top.Style = ExcelBorderStyle.Thin;
+            headerRange.Style.Border.Bottom.Style = ExcelBorderStyle.Thin;
+            headerRange.Style.Border.Left.Style = ExcelBorderStyle.Thin;
+            headerRange.Style.Border.Right.Style = ExcelBorderStyle.Thin;
+        }
+
+        // Data rows
+        int row = 2;
+        if (items != null)
+        {
+            foreach (var it in items)
+            {
+                worksheet.Cells[row, 1].Value = it.CompanyName;
+                worksheet.Cells[row, 2].Value = it.FirstName;
+                worksheet.Cells[row, 3].Value = it.LastName;
+                worksheet.Cells[row, 4].Value = it.NationalCode;
+                worksheet.Cells[row, 5].Value = it.RegistrationNumber;
+                worksheet.Cells[row, 6].Value = it.BirthDate;
+                worksheet.Cells[row, 7].Value = it.PhoneNumber;
+                worksheet.Cells[row, 8].Value = it.NationalNumber;
+
+                using (var dataRange = worksheet.Cells[row, 1, row, 8])
+                {
+                    dataRange.Style.Border.Top.Style = ExcelBorderStyle.Thin;
+                    dataRange.Style.Border.Bottom.Style = ExcelBorderStyle.Thin;
+                    dataRange.Style.Border.Left.Style = ExcelBorderStyle.Thin;
+                    dataRange.Style.Border.Right.Style = ExcelBorderStyle.Thin;
+                    dataRange.Style.HorizontalAlignment = ExcelHorizontalAlignment.Right; // راست‌چین
+                    dataRange.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
+                    dataRange.Style.WrapText = true;
+                }
+
+                row++;
+            }
+        }
+
+        // Auto-fit columns to largest content
+        if (worksheet.Dimension != null)
+        {
+            worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();
+        }
+
+        // Set sheet to RTL for Persian
+        worksheet.View.RightToLeft = true;
+
+        return package.GetAsByteArray();
+    }
+}
+
+public class InstitutionContractLegalExcelViewModel
+{
+    public string CompanyName { get; set; }
+    public string FirstName { get; set; }
+    public string LastName { get; set; }
+    public string NationalCode { get; set; }
+    public string RegistrationNumber { get; set; }
+    public string BirthDate { get; set; }
+    public string PhoneNumber { get; set; }
+    public string NationalNumber { get; set; }
+}
+

CompanyManagement.Infrastructure.Excel/EmployeeBankInfo/EmployeeBankInfoExcelGenerator.cs

@@ -7,7 +7,7 @@ public class EmployeeBankInfoExcelGenerator
 {
     public static byte[] Generate(List<EmployeeBankInfoExcelViewModel> list)
     {
-        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using var package = new ExcelPackage();
         var worksheet = package.Workbook.Worksheets.Add("EmployeeBankInfo");
 
@@ -166,7 +166,7 @@ public class EmployeeBankInfoExcelGenerator
 
     public static byte[] Generate2(List<EmployeeBankInfoExcelViewModel> list)
     {
-        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using var package = new ExcelPackage();
         foreach (var employee in list)
         {
@@ -220,4 +220,4 @@ public class EmployeeBankInfoExcelGenerator
         cell.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
         cell.Style.Fill.PatternType = ExcelFillStyle.Solid;
     }
-}
+}

CompanyManagement.Infrastructure.Excel/InstitutionContract/InstitutionContractExcelGenerator.cs

@@ -8,129 +8,86 @@ using System.Text.RegularExpressions;
 
 namespace CompanyManagement.Infrastructure.Excel.InstitutionContract;
 
-// Enum برای تعریف ستون‌های موجود
-public enum ExcelColumnType
-{
-    RowNumber,                  // ردیف
-    PhysicalContract,          // قرارداد فیزیکی
-    ContractNo,                 // شماره قرارداد
-    Representative,             // معرف
-    ContractingPartyName,       // طرف حساب
-    ArchiveCode,                // شماره کارفرما
-    EmployerName,               // کارفرما
-    WorkshopName,               // کارگاه‌ها (چندخطی)
-    WorkshopCount,              // تعداد کارگاه
-    EmployeeCount,              // مجموع پرسنل
-    ContractStartDate,          // شروع قرارداد
-    ContractEndDate,            // پایان قرارداد
-    InstallmentAmount,          // مبلغ قسط
-    ContractAmount,             // مبلغ قرارداد
-    FinancialStatus             // وضعیت مالی
-}
-
-// کلاس کانفیگ برای تنظیم ستون‌های نمایشی
-public class ExcelColumnConfig
-{
-    public List<ExcelColumnType> VisibleColumns { get; set; }
-    
-    public ExcelColumnConfig()
-    {
-        // فعلاً تمام ستون‌ها فعال هستند
-        VisibleColumns = new List<ExcelColumnType>
-        {
-            ExcelColumnType.PhysicalContract,
-            ExcelColumnType.ContractNo,
-            ExcelColumnType.Representative,
-            ExcelColumnType.ContractingPartyName,
-            ExcelColumnType.ArchiveCode,
-            ExcelColumnType.EmployerName,
-            ExcelColumnType.WorkshopName,
-            ExcelColumnType.WorkshopCount,
-            ExcelColumnType.EmployeeCount,
-            ExcelColumnType.ContractStartDate,
-            ExcelColumnType.ContractEndDate,
-            ExcelColumnType.InstallmentAmount,
-            ExcelColumnType.ContractAmount,
-            ExcelColumnType.FinancialStatus
-        };
-    }
-}
-
 public class InstitutionContractExcelGenerator
 {
-    private static ExcelColumnConfig _columnConfig = new ExcelColumnConfig();
 
-    public static byte[] GenerateExcel(List<InstitutionContractExcelViewModel> contractViewModels)
+    public static byte[] GenerateExcel(List<InstitutionContractViewModel> institutionContractViewModels)
     {
-        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using var package = new ExcelPackage();
+        var allWorksheet = package.Workbook.Worksheets.Add("همه");
+
+        var blueWorksheet = package.Workbook.Worksheets.Add("آبی");
+        blueWorksheet.TabColor = Color.LightBlue;
+
+        var grayWorksheet = package.Workbook.Worksheets.Add("خاکستری");
+        grayWorksheet.TabColor = Color.LightGray;
+
+        var redWorksheet = package.Workbook.Worksheets.Add("قرمز");
+        redWorksheet.TabColor = Color.LightCoral;
+
+        var purpleWorksheet = package.Workbook.Worksheets.Add("بنفش");
+        purpleWorksheet.TabColor = Color.MediumPurple;
+
+        var blackWorksheet = package.Workbook.Worksheets.Add("مشکی");
+        blackWorksheet.TabColor = Color.DimGray;
+
+        var yellowWorksheet = package.Workbook.Worksheets.Add("زرد");
+        yellowWorksheet.TabColor = Color.Yellow;
+            
+        var whiteWorksheet = package.Workbook.Worksheets.Add("سفید");
+        whiteWorksheet.TabColor = Color.White;
+
+
+        CreateExcelSheet(institutionContractViewModels, allWorksheet);
+
+        var blueContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "blue").ToList();
+        CreateExcelSheet(blueContracts, blueWorksheet);
+        institutionContractViewModels = institutionContractViewModels.Except(blueContracts).ToList();
+
+        var grayContracts = institutionContractViewModels.Where(x => x.IsContractingPartyBlock == "true").ToList();
+        CreateExcelSheet(grayContracts, grayWorksheet);
+        institutionContractViewModels = institutionContractViewModels.Except(grayContracts).ToList();
+
+        var redContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "red").ToList();
+        CreateExcelSheet(redContracts, redWorksheet);
+        institutionContractViewModels = institutionContractViewModels.Except(redContracts).ToList();
+
+        var purpleContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "purple").ToList();
+        CreateExcelSheet(purpleContracts, purpleWorksheet);
+        institutionContractViewModels = institutionContractViewModels.Except(purpleContracts).ToList();
         
-        // ایجاد شیت برای هر تب با داده‌های مربوطه
-        foreach (var viewModel in contractViewModels)
-        {
-            var worksheet = CreateWorksheet(package, viewModel.Tab);
-            CreateExcelSheet(viewModel.GetInstitutionContractListItemsViewModels ?? new List<GetInstitutionContractListItemsViewModel>(), worksheet);
-        }
+        var blackContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "black").ToList();
+        CreateExcelSheet(blackContracts, blackWorksheet);
+        institutionContractViewModels = institutionContractViewModels.Except(blackContracts).ToList();
+
+        var yellowContracts = institutionContractViewModels
+            .Where(x => string.IsNullOrWhiteSpace(x.ExpireColor) && x.WorkshopCount == "0").ToList();
+        CreateExcelSheet(yellowContracts, yellowWorksheet);
+        institutionContractViewModels = institutionContractViewModels.Except(yellowContracts).ToList();
+
+        var otherContracts = institutionContractViewModels;
+        CreateExcelSheet(otherContracts, whiteWorksheet);
 
         return package.GetAsByteArray();
     }
 
-    /// <summary>
-    /// ایجاد شیت بر اساس نوع تب
-    /// </summary>
-    private static ExcelWorksheet CreateWorksheet(ExcelPackage package, InstitutionContractListStatus? status)
+    private static void CreateExcelSheet(List<InstitutionContractViewModel> institutionContractViewModels, ExcelWorksheet worksheet)
     {
-        return status switch
-        {
-            InstitutionContractListStatus.DeactiveWithDebt =>
-                CreateColoredWorksheet(package, "غیرفعال دارای بدهی", Color.LightBlue),
-            
-            InstitutionContractListStatus.Deactive =>
-                CreateColoredWorksheet(package, "غیرفعال", Color.LightGray),
-            
-            InstitutionContractListStatus.PendingForRenewal =>
-                CreateColoredWorksheet(package, "در انتظار تمدید", Color.LightCoral),
-            
-            InstitutionContractListStatus.Free =>
-                CreateColoredWorksheet(package, "بنفش", Color.MediumPurple),
-            
-            InstitutionContractListStatus.Block =>
-                CreateColoredWorksheet(package, "بلاک", Color.DimGray),
-            
-            InstitutionContractListStatus.WithoutWorkshop =>
-                CreateColoredWorksheet(package, "بدون کارگاه", Color.Yellow),
-            
-            InstitutionContractListStatus.Active =>
-                CreateColoredWorksheet(package, "فعال", Color.White),
-            
-            InstitutionContractListStatus.PendingForVerify => 
-            CreateColoredWorksheet(package, "در انتظار تایید", Color.OrangeRed),
-            
-            null => CreateColoredWorksheet(package, "کل قرارداد ها", Color.White),
-            _ => throw new ArgumentOutOfRangeException(nameof(status), status, null)
-        };
-    }
+        // Headers
+        worksheet.Cells[1, 1].Value = "شماره قرارداد";
+        worksheet.Cells[1, 2].Value = "طرف حساب";
+        worksheet.Cells[1, 3].Value = "شماره کارفرما";
+        worksheet.Cells[1, 4].Value = "کارفرما ها";
+        worksheet.Cells[1, 5].Value = "کارگاه ها";
+        worksheet.Cells[1, 6].Value = "مجبوع پرسنل";
+        worksheet.Cells[1, 7].Value = "شروع قرارداد";
+        worksheet.Cells[1, 8].Value = "پایان قرارداد";
+        worksheet.Cells[1, 9].Value = "مبلغ قرارداد (بدون کارگاه)";
+        worksheet.Cells[1, 10].Value = "مبلغ قرارداد";
+        worksheet.Cells[1, 11].Value = "وضعیت مالی";
 
-    /// <summary>
-    /// ایجاد شیت با رنگ تب
-    /// </summary>
-    private static ExcelWorksheet CreateColoredWorksheet(ExcelPackage package, string sheetName, Color tabColor)
-    {
-        var worksheet = package.Workbook.Worksheets.Add(sheetName);
-        worksheet.TabColor = tabColor;
-        return worksheet;
-    }
-
-    private static void CreateExcelSheet(List<GetInstitutionContractListItemsViewModel> contractItems, ExcelWorksheet worksheet)
-    {
-        // دریافت نقشه ستون‌های مرئی
-        var visibleColumnIndices = GetVisibleColumnIndices();
-        int columnCount = visibleColumnIndices.Count;
-
-        // تنظیم Headers
-        SetupHeaders(worksheet, visibleColumnIndices, columnCount);
-
-        using (var range = worksheet.Cells[1, 1, 1, columnCount])
+        using (var range = worksheet.Cells[1, 1, 1, 11])
         {
             range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
             range.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
@@ -153,35 +110,30 @@ public class InstitutionContractExcelGenerator
 
         int row = 2;
 
-        for (int i = 0; i < contractItems.Count; i++)
+        for (int i = 0; i < institutionContractViewModels.Count; i++)
         {
-            var contract = contractItems[i];
-            var employers = contract.EmployerNames?.ToList() ?? new();
-            var workshops = contract.WorkshopNames?.ToList() ?? new();
+            var contract = institutionContractViewModels[i];
+            var employers = contract.EmployerViewModels?.ToList() ?? new();
+            var workshops = contract.WorkshopViewModels?.ToList() ?? new();
 
-            int maxRows = 1; // هر قرارداد فقط یک ردیف؛ نیازی به مرج عمودی نیست
+            int maxRows = Math.Max(employers.Count, workshops.Count);
+            maxRows = Math.Max(1, maxRows);
 
             int startRow = row;
             int endRow = row + maxRows - 1;
 
-            // 🎨 دریافت رنگ پس‌زمینه بر اساس وضعیت قرارداد
-            var fillColor = GetColorByStatus(contract.ListStatus, contract.WorkshopsCount);
+            // 🎨 دریافت رنگ پس‌زمینه از مقدار رنگ موجود در داده
+            string colorName = contract.ExpireColor.ToLower();
+            var fillColor = GetColorByName(colorName, contract.WorkshopCount, contract.IsContractingPartyBlock);
 
             for (int j = 0; j < maxRows; j++)
             {
                 int currentRow = row + j;
 
-                // پر کردن ستون‌های employer و workshop
-                var employerColIndex = GetColumnIndexForType(ExcelColumnType.EmployerName, visibleColumnIndices);
-                var workshopColIndex = GetColumnIndexForType(ExcelColumnType.WorkshopName, visibleColumnIndices);
+                worksheet.Cells[currentRow, 4].Value = j < employers.Count ? employers[j].FullName : null;
+                worksheet.Cells[currentRow, 5].Value = j < workshops.Count ? workshops[j].WorkshopFullName : null;
 
-                if (employerColIndex > 0)
-                    worksheet.Cells[currentRow, employerColIndex].Value = j < employers.Count ? employers[j] : null;
-
-                if (workshopColIndex > 0)
-                    worksheet.Cells[currentRow, workshopColIndex].Value = j < workshops.Count ? workshops[j] : null;
-
-                for (int col = 1; col <= columnCount; col++)
+                for (int col = 1; col <= 11; col++)
                 {
                     var cell = worksheet.Cells[currentRow, col];
 
@@ -202,235 +154,109 @@ public class InstitutionContractExcelGenerator
             }
 
             // 🧱 مرج و مقداردهی ستون‌های اصلی
-            FillColumnData(worksheet, contract, startRow, endRow, visibleColumnIndices);
+            worksheet.Cells[startRow, 1, endRow, 1].Merge = true;
+            worksheet.Cells[startRow, 1].Value = contract.ContractNo;
+
+            worksheet.Cells[startRow, 2, endRow, 2].Merge = true;
+            worksheet.Cells[startRow, 2].Value = contract.ContractingPartyName;
+
+            worksheet.Cells[startRow, 3, endRow, 3].Merge = true;
+            worksheet.Cells[startRow, 3].Value = contract.ArchiveCode;
+
+            worksheet.Cells[startRow, 6, endRow, 6].Merge = true;
+            worksheet.Cells[startRow, 6].Value = contract.EmployeeCount;
+
+            worksheet.Cells[startRow, 7, endRow, 7].Merge = true;
+            worksheet.Cells[startRow, 7].Value = contract.ContractStartFa;
+
+            worksheet.Cells[startRow, 8, endRow, 8].Merge = true;
+            worksheet.Cells[startRow, 8].Value = contract.ContractEndFa;
+
+            worksheet.Cells[startRow, 9, endRow, 9].Merge = true;
+            var contractWithoutWorkshopAmountCell = worksheet.Cells[startRow, 9];
+            contractWithoutWorkshopAmountCell.Value = contract.WorkshopCount == "0" ? MoneyToDouble(contract.ContractAmount) : "";
+            contractWithoutWorkshopAmountCell.Style.Numberformat.Format = "#,##0";
+
+
+            worksheet.Cells[startRow, 10, endRow, 10].Merge = true;
+            var contractAmountCell = worksheet.Cells[startRow, 10];
+            contractAmountCell.Value = contract.WorkshopCount != "0" ? MoneyToDouble(contract.ContractAmount) : "";
+            contractAmountCell.Style.Numberformat.Format = "#,##0";
+
+
+            worksheet.Cells[startRow, 11, endRow, 11].Merge = true;
+            var balance = MoneyToDouble(contract.BalanceStr);
+            var balanceCell = worksheet.Cells[startRow, 11];
+            balanceCell.Value = balance;
+            balanceCell.Style.Numberformat.Format = "#,##0";
+
+            if (balance > 0)
+                balanceCell.Style.Font.Color.SetColor(Color.Red);
+            else if (balance < 0)
+                balanceCell.Style.Font.Color.SetColor(Color.Green);
 
             // 📦 بوردر ضخیم خارجی برای هر سطر
-            var boldRange = worksheet.Cells[startRow, 1, endRow, columnCount];
+            var boldRange = worksheet.Cells[startRow, 1, endRow, 11];
             boldRange.Style.Border.BorderAround(ExcelBorderStyle.Medium);
 
             row += maxRows;
         }
 
-        SetupPrintSettings(worksheet, visibleColumnIndices, columnCount);
-    }
 
-    /// <summary>
-    /// دریافت فهرست ستون‌های مرئی بر اساس کانفیگ
-    /// </summary>
-    private static List<ExcelColumnType> GetVisibleColumnIndices()
-    {
-        return _columnConfig.VisibleColumns;
-    }
 
-    /// <summary>
-    /// دریافت شماره ستون برای یک نوع ستون خاص
-    /// </summary>
-    private static int GetColumnIndexForType(ExcelColumnType columnType, List<ExcelColumnType> visibleColumns)
-    {
-        var index = visibleColumns.IndexOf(columnType);
-        return index >= 0 ? index + 1 : 0; // 1-based indexing
-    }
-
-    /// <summary>
-    /// دریافت متن header برای یک نوع ستون
-    /// </summary>
-    private static string GetColumnHeader(ExcelColumnType columnType)
-    {
-        return columnType switch
-        {
-            ExcelColumnType.RowNumber => "ردیف",
-            ExcelColumnType.PhysicalContract => "قرارداد فیزیکی",
-            ExcelColumnType.ContractNo => "شماره قرارداد",
-            ExcelColumnType.Representative => "معرف",
-            ExcelColumnType.ContractingPartyName => "طرف حساب",
-            ExcelColumnType.ArchiveCode => "شماره کارفرما",
-            ExcelColumnType.EmployerName => "کارفرما",
-            ExcelColumnType.WorkshopName => "کارگاه‌ها",
-            ExcelColumnType.WorkshopCount => "تعداد کارگاه",
-            ExcelColumnType.EmployeeCount => "مجموع پرسنل",
-            ExcelColumnType.ContractStartDate => "شروع قرارداد",
-            ExcelColumnType.ContractEndDate => "پایان قرارداد",
-            ExcelColumnType.InstallmentAmount => "مبلغ قسط",
-            ExcelColumnType.ContractAmount => "مبلغ قرارداد",
-            ExcelColumnType.FinancialStatus => "وضعیت مالی",
-            _ => ""
-        };
-    }
-
-    /// <summary>
-    /// تنظیم Header‌های ستون‌ها
-    /// </summary>
-    private static void SetupHeaders(ExcelWorksheet worksheet, List<ExcelColumnType> visibleColumns, int columnCount)
-    {
-        for (int i = 0; i < visibleColumns.Count; i++)
-        {
-            worksheet.Cells[1, i + 1].Value = GetColumnHeader(visibleColumns[i]);
-        }
-    }
-
-    /// <summary>
-    /// پر کردن داده‌های ستون‌ها برای یک قرارداد
-    /// </summary>
-    private static void FillColumnData(ExcelWorksheet worksheet, GetInstitutionContractListItemsViewModel contract, int startRow, int endRow, List<ExcelColumnType> visibleColumns)
-    {
-        for (int i = 0; i < visibleColumns.Count; i++)
-        {
-            int columnIndex = i + 1; // 1-based indexing
-            var columnType = visibleColumns[i];
-
-            // Merge cells for non-repeating columns
-            worksheet.Cells[startRow, columnIndex, endRow, columnIndex].Merge = true;
-
-            var cell = worksheet.Cells[startRow, columnIndex];
-
-            switch (columnType)
-            {
-                case ExcelColumnType.PhysicalContract:
-                    var physicalText = contract.IsOldContract
-                        ? (contract.HasSigniture ? "موجود" : "ناموجود")
-                        : (contract.IsInPersonContract ? "الکترونیکی حضوری" : "الکترونیکی غیر حضوری");
-
-                    cell.Value = physicalText;
-                    cell.Style.Font.Bold = true;
-                    cell.Style.Font.Color.SetColor(physicalText switch
-                    {
-                        "موجود" => Color.Green,
-                        "ناموجود" => Color.Red,
-                        "الکترونیکی حضوری" => Color.Purple,
-                        _ => Color.Blue
-                    });
-                    break;
-                case ExcelColumnType.ContractNo:
-                    cell.Value = contract.ContractNo;
-                    break;
-                case ExcelColumnType.Representative:
-                    cell.Value = contract.RepresentativeName;
-                    break;
-                case ExcelColumnType.ContractingPartyName:
-                    cell.Value = contract.ContractingPartyName;
-                    break;
-                case ExcelColumnType.ArchiveCode:
-                    cell.Value = contract.ArchiveNo;
-                    break;
-                case ExcelColumnType.EmployerName:
-                    // این ستون چندخطی است و داخل loop پر می‌شود
-                    break;
-                case ExcelColumnType.WorkshopName:
-                    // این ستون چندخطی است و داخل loop پر می‌شود
-                    break;
-                case ExcelColumnType.WorkshopCount:
-                    cell.Value = contract.WorkshopsCount;
-                    break;
-                case ExcelColumnType.EmployeeCount:
-                    cell.Value = contract.EmployeesCount;
-                    break;
-                case ExcelColumnType.ContractStartDate:
-                    cell.Value = contract.ContractStartFa;
-                    break;
-                case ExcelColumnType.ContractEndDate:
-                    cell.Value = contract.ContractEndFa;
-                    break;
-                case ExcelColumnType.InstallmentAmount:
-                    cell.Value = contract.InstallmentAmount;
-                    cell.Style.Numberformat.Format = "#,##0";
-                    break;
-                case ExcelColumnType.ContractAmount:
-                    cell.Value = contract.ContractAmount;
-                    cell.Style.Numberformat.Format = "#,##0";
-                    break;
-                case ExcelColumnType.FinancialStatus:
-                    cell.Value = contract.Balance;
-                    cell.Style.Numberformat.Format = "#,##0";
-
-                    if (contract.Balance > 0)
-                        cell.Style.Font.Color.SetColor(Color.Red);
-                    else if (contract.Balance < 0)
-                        cell.Style.Font.Color.SetColor(Color.Green);
-                    break;
-            }
-        }
-    }
-
-    /// <summary>
-    /// تنظیم تنظیمات چاپ و عرض ستون‌ها
-    /// </summary>
-    private static void SetupPrintSettings(ExcelWorksheet worksheet, List<ExcelColumnType> visibleColumns, int columnCount)
-    {
         worksheet.PrinterSettings.PaperSize = ePaperSize.A4;
         worksheet.PrinterSettings.Orientation = eOrientation.Landscape;
         worksheet.PrinterSettings.FitToPage = true;
         worksheet.PrinterSettings.FitToWidth = 1;
         worksheet.PrinterSettings.FitToHeight = 0;
         worksheet.PrinterSettings.Scale = 85;
-
-        // تنظیم عرض ستون‌ها بر اساس نوع ستون
-        for (int i = 0; i < visibleColumns.Count; i++)
-        {
-            int columnIndex = i + 1;
-            worksheet.Columns[columnIndex].Width = GetColumnWidth(visibleColumns[i]);
-        }
-
+        int contractNoCol = 1;
+        int contractingPartyNameCol = 2;
+        int archiveNoCol = 3;
+        int employersCol = 4;
+        int workshopsCol = 5;
+        int employeeCountCol = 6;
+        int startContractCol = 7;
+        int endContractCol = 8;
+        int contractWithoutWorkshopAmountCol = 9;
+        int contractAmountCol = 10;
+        int balanceCol = 11;
+        worksheet.Columns[contractNoCol].Width = 17;
+        worksheet.Columns[contractingPartyNameCol].Width = 40;
+        worksheet.Columns[archiveNoCol].Width = 10;
+        worksheet.Columns[employersCol].Width = 40;
+        worksheet.Columns[workshopsCol].Width = 45;
+        worksheet.Columns[employeeCountCol].Width = 12;
+        worksheet.Columns[startContractCol].Width = 12;
+        worksheet.Columns[endContractCol].Width = 12;
+        worksheet.Columns[contractWithoutWorkshopAmountCol].Width = 18;
+        worksheet.Columns[contractAmountCol].Width = 12;
+        worksheet.Columns[balanceCol].Width = 12;
         worksheet.View.RightToLeft = true; // فارسی
-    }
-
-    /// <summary>
-    /// دریافت عرض ستون پیش‌فرض برای هر نوع ستون
-    /// </summary>
-    private static double GetColumnWidth(ExcelColumnType columnType)
-    {
-        return columnType switch
-        {
-            ExcelColumnType.RowNumber => 8,
-            ExcelColumnType.PhysicalContract => 15,
-            ExcelColumnType.ContractNo => 17,
-            ExcelColumnType.Representative => 15,
-            ExcelColumnType.ContractingPartyName => 40,
-            ExcelColumnType.ArchiveCode => 10,
-            ExcelColumnType.EmployerName => 40,
-            ExcelColumnType.WorkshopName => 45,
-            ExcelColumnType.WorkshopCount => 12,
-            ExcelColumnType.EmployeeCount => 12,
-            ExcelColumnType.ContractStartDate => 12,
-            ExcelColumnType.ContractEndDate => 12,
-            ExcelColumnType.InstallmentAmount => 15,
-            ExcelColumnType.ContractAmount => 15,
-            ExcelColumnType.FinancialStatus => 12,
-            _ => 12
-        };
+        //worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();
     }
 
     private static double MoneyToDouble(string value)
     {
-        if (string.IsNullOrEmpty(value))
-            return 0;
-
+        Console.WriteLine(value);
         var min = value.Length > 1 ? value.Substring(0, 2) : "";
         var test = min == "\u200e\u2212" ? value.MoneyToDouble() * -1 : value.MoneyToDouble();
+
+        Console.WriteLine(test);
         return test;
     }
-
-    /// <summary>
-    /// دریافت رنگ بر اساس وضعیت قرارداد
-    /// </summary>
-    private static Color GetColorByStatus(InstitutionContractListStatus status, int workshopsCount)
+    private static Color GetColorByName(string name, string workshopCount, string IsContractingPartyBlock)
     {
-        return status switch
+        return name switch
         {
-            InstitutionContractListStatus.DeactiveWithDebt => Color.LightBlue,
-            InstitutionContractListStatus.Deactive => Color.LightGray,
-            InstitutionContractListStatus.PendingForRenewal => Color.LightCoral,
-            InstitutionContractListStatus.Free => Color.MediumPurple,
-            InstitutionContractListStatus.Block => Color.DimGray,
-            InstitutionContractListStatus.WithoutWorkshop => Color.Yellow,
-            InstitutionContractListStatus.Active => Color.White,
+            "blue" => Color.LightBlue,
+            _ when IsContractingPartyBlock == "true" => Color.LightGray,
+            "red" => Color.LightCoral,
+            "purple" => Color.MediumPurple,
+            "black" => Color.DimGray,
+            var n when string.IsNullOrWhiteSpace(n) && workshopCount == "0" => Color.Yellow,
             _ => Color.White
         };
     }
 
-}
-
-public class InstitutionContractExcelViewModel
-{
-    public InstitutionContractListStatus? Tab { get; set; }
-    public List<GetInstitutionContractListItemsViewModel> GetInstitutionContractListItemsViewModels { get; set; }
-}
+}

CompanyManagement.Infrastructure.Excel/RollCall/RollCallExcelGenerator.cs

@@ -8,7 +8,7 @@ public class RollCallExcelGenerator : ExcelGenerator
 {
     public static byte[] CaseHistoryExcelForEmployee(CaseHistoryRollCallExcelForEmployeeViewModel data)
     {
-        OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using var package = new OfficeOpenXml.ExcelPackage();
         var worksheet = package.Workbook.Worksheets.Add("Sheet1");
         var rollCalls = data.RollCalls;
@@ -181,7 +181,7 @@ public class RollCallExcelGenerator : ExcelGenerator
 
     public static byte[] CaseHistoryExcelForOneDay(CaseHistoryRollCallForOneDayViewModel data)
     {
-        OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using var package = new OfficeOpenXml.ExcelPackage();
         var worksheet = package.Workbook.Worksheets.Add("Sheet1");
         var rollCalls = data.RollCalls;

CompanyManagement.Infrastructure.Excel/SalaryAid/SalaryAidImportExcel.cs

@@ -43,7 +43,7 @@ public class SalaryAidImportExcel
             ValidData = []
         };
 
-        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
 
         if (file == null || file.Length == 0)
         {

CompanyManagement.Infrastructure.Excel/WorkshopsRollCall/WorkshopRollCallExcelExporter.cs

@@ -9,7 +9,7 @@ public class WorkshopRollCallExcelExporter
 {
     public static byte[] Export(List<WorkshopRollCallExcelViewModel> workshops)
     {
-        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using (var package = new ExcelPackage())
         {
             var ws = package.Workbook.Worksheets.Add("Workshops");