feat: enhance IBoardNotificationPublisher with task notification methods

.env.example

@@ -1,57 +0,0 @@
-# ===== SQL CONNECTION STRINGS (با کوتیشن) =====
-#ConnectionStrings__MesbahDb=Data Source=192.168.0.117,1434;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=sa;Password=testPassword123!;TrustServerCertificate=True;
-#ConnectionStrings__TestDb=Data Source=192.168.0.117,1434;Initial Catalog=TestDb;Persist Security Info=False;User ID=sa;Password=testPassword123!;TrustServerCertificate=True;
-#ConnectionStrings__ProgramManagerDb=Data Source=192.168.0.117,1434;Initial Catalog=program_manager_db;Persist Security Info=False;User ID=sa;Password=testPassword123!;TrustServerCertificate=True;
-
-ConnectionStrings__MesbahDb=Data Source=mssql_server;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=sa;Password=testPassword123!;TrustServerCertificate=True;
-ConnectionStrings__TestDb=Data Source=mssql_server;Initial Catalog=TestDb;Persist Security Info=False;User ID=sa;Password=testPassword123!;TrustServerCertificate=True;
-ConnectionStrings__ProgramManagerDb=Data Source=mssql_server;Initial Catalog=program_manager_db;Persist Security Info=False;User ID=sa;Password=testPassword123!;TrustServerCertificate=True;
-
-# ===== MONGO (بدون کوتیشن ❗) =====
-MongoDb__ConnectionString=mongodb://mongodb:27017
-MongoDb__DatabaseName=Gozareshgir
-
-# ===== بقیه تنظیمات (بدون کوتیشن) =====
-GoogleRecaptchaV3__SiteKey=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
-GoogleRecaptchaV3__SecretKey=6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe
-SmsSecrets__ApiKey=testApiKey123456789
-SmsSecrets__SecretKey=testSecret
-Domain=.test.local
-SmsSettings__IsTestMode=true
-SmsSettings__TestNumbers__0=09999999999
-InternalApi__Local=https://host.docker.internal:7032
-InternalApi__Dadmehrg=https://api.test.local
-InternalApi__Gozareshgir=https://api.test.local
-SepehrGateWayTerminalId=99999999
-JwtSettings__SecretKey=testSecretKeyFor123JwtTokenGeneration456
-JwtSettings__Issuer=TestApp
-JwtSettings__Audience=TestUsers
-JwtSettings__ExpirationMinutes=30
-FileStorage__BaseUrl=https://host.docker.internal:7032/uploads
-FileStorage__MaxFileSizeBytes=104857600
-
-# ===== CLARITY ANALYTICS =====
-Clarity__TagId=YOURCLARITY_VALUE
-
-# ===== DOCKER & APPLICATION SETTINGS =====
-# ⚠️ IMPORTANT: Docker containers should ALWAYS run in Production mode
-ASPNETCORE_ENVIRONMENT=Production
-ASPNETCORE_URLS=https://+:443;http://+:80
-
-# ===== HTTPS CERTIFICATE =====
-ASPNETCORE_Kestrel__Certificates__Default__Password=testPassword123!
-ASPNETCORE_Kestrel__Certificates__Default__Path=/app/certs/aspnetcore.pfx
-CERT_PASSWORD=testPassword123!
-
-# ===== FILE STORAGE =====
-FileStorage__LocalPath=/app/Storage
-
-# ===== PORTS CONFIGURATION =====
-HTTP_PORT=5003
-HTTPS_PORT=5004
-
-# Logging
-Logging__LogLevel__Default=Information
-Logging__LogLevel__Microsoft=Warning
-Logging__LogLevel__Microsoft.AspNetCore=Warning
-DetailedErrors=true

.gitea/workflows/deploy-dev.yml

@@ -1,64 +0,0 @@
-name: Deploy Dev (Branch Trigger)
-
-on:
-  push:
-    branches:
-      - Main
-
-env:
-  IMAGE_NAME: gozareshgir-api
-  # مسیری که فایل docker-compose.yml مخصوص تست در سرور قرار دارد
-  SERVER_PATH: ~/apps/test-dev/backend-api
-
-jobs:
-  build-and-deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      # 1. لاگین به داکر هاب/رجیستری شخصی
-      - name: Login to Docker Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ secrets.DOCKER_REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      # 2. بیلد و پوش کردن ایمیج با تگ :dev
-      - name: Build and Push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:dev
-
-      # 3. اتصال به سرور و آپدیت سرویس
-      - name: Update Service on Test Server
-        uses: appleboy/ssh-action@v1.0.3
-        env:
-          DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-          APP_VERSION: dev   # ورژن تست همیشه dev است
-        with:
-          host: ${{ secrets.SSH_HOST_TEST }}
-          username: ${{ secrets.SSH_USERNAME_TEST }}
-          key: ${{ secrets.SSH_KEY_TEST }}
-          port: 22
-          envs: DOCKER_REGISTRY,DOCKER_USERNAME,DOCKER_PASSWORD,APP_VERSION
-          script: |
-            cd ${{ env.SERVER_PATH }}
-            
-            # لاگین مجدد در سرور برای اطمینان
-            echo "$DOCKER_PASSWORD" | docker login $DOCKER_REGISTRY -u $DOCKER_USERNAME --password-stdin
-            
-            # اکسپورت کردن ورژن برای اینکه فایل داکر-کمپوز سرور آن را بشناسد
-            export APP_VERSION=$APP_VERSION
-            
-            # دانلود ایمیج جدید و آپدیت کانتینر
-            docker compose pull
-            docker compose up -d --remove-orphans
-            
-            # پاک کردن ایمیج‌های قدیمی برای پر نشدن فضای سرور
-            docker image prune -f

.github/workflows/dotnet-developPublish.yml

@@ -19,36 +19,30 @@ jobs:
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '10.0.x'
+        dotnet-version: '8.0.x' # یا نسخه پروژه‌ت
 
     - name: Restore dependencies
-      run: dotnet restore ServiceHost/ServiceHost.csproj
+      run: dotnet restore
+
     - name: Build
-      run: dotnet build ServiceHost/ServiceHost.csproj --configuration Release
+      run: dotnet build --configuration Release 
 
     - name: Publish
-      run: dotnet publish ServiceHost/ServiceHost.csproj --configuration Release --output ./publish /p:EnvironmentName=Development --no-build
+      run: dotnet publish --configuration Release --output ./publish /p:EnvironmentName=Development --no-build
 
-    - name: Deploy to IIS via Web Deploy 
+    - name: Deploy to IIS via Web Deploy
       shell: powershell
       run: |
         $publishFolder = Resolve-Path ./publish
-        $server = $env:SERVER_HOST
-        $user = $env:DEPLOY_USER
-        $pass = $env:DEPLOY_PASSWORD
-
         & "C:\Program Files\IIS\Microsoft Web Deploy V3\msdeploy.exe" `
           -verb:sync `
           -source:contentPath="$publishFolder" `
-          -dest:contentPath="dadmehrg",computerName="https://${server}:8172/msdeploy.axd?site=dadmehrg",userName="$user",password="$pass",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
-          -disableRule:DeleteRule `
-          -useChecksum `
-          -retryAttempts:3 `
-          -retryInterval:2000
-          
-    env:
-        SERVER_HOST: ${{ secrets.DEV_HOST }}
-        DEPLOY_USER: ${{ secrets.DEV_USER }}
-        DEPLOY_PASSWORD: ${{ secrets.DEV_PASS }}
+
+
+      env:
+        SERVER_HOST: your-server-ip-or-domain
+        DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+        DEPLOY_PASSWORD: ${{ secrets.DEPLOY_PASSWORD }}

.gitignore

@@ -1,14 +1,3 @@
-
-certs/*.pfx
-certs/*.pem
-certs/*.key
-certs/*.crt
-Storage/
-Logs/
-*.user
-*.suo
-bin/
-obj/
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
@@ -373,16 +362,3 @@ MigrationBackup/
 # # Fody - auto-generated XML schema
 # FodyWeavers.xsd
 .idea
-/ServiceHost/appsettings.Development.json
-/ServiceHost/appsettings.json
-/ServiceHost/web.config
-
-# Storage folder - ignore all uploaded files, thumbnails, and temporary files
-ServiceHost/Storage
-# Environment files - ignore all except .env.example
-.env*
-!.env.example
-
-keys/
-dataprotection-keys/
-

0_Framework/0_Framework.csproj

@@ -6,7 +6,6 @@
   </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" />
@@ -17,12 +16,10 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.3" />
     <PackageReference Include="PersianTools.Core" Version="2.0.4" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
     <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="DNTPersianUtils.Core" Version="6.7.1" />-->
 
 
 

0_Framework/Application/ClassificationRangeOfGroupRate.cs

@@ -1,237 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace _0_Framework.Application;
-
-/// <summary>
-/// دامنه امتیازات گروه های طبقه بندی مشاغل
-/// </summary>
-public static class ClassificationRangeOfGroupRate
-{
-
-    /// <summary>
-    /// دریافت فاصله امتیاز گروه
-    /// </summary>
-    /// <param name="groupNo"></param>
-    /// <returns></returns>
-    public static ClassificationGroupRate GetGroupDistanceRate(string groupNo)
-    {
-    
-        switch (groupNo)
-        {
-            case "1":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 0,
-                    HighRate = 80,
-                    DistanceRate = 0,
-                }; 
-                break;
-            case "2":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 81,
-                    HighRate = 95,
-                    DistanceRate = 15,
-                }; 
-                break;
-            case "3":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 96,
-                    HighRate = 110,
-                    DistanceRate = 30, //فاصله سقف این گروه تا سقف گروه یک
-                };
-                break;
-            case "4":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 111,
-                    HighRate = 125,
-                    DistanceRate = 45, //فاصله سقف این گروه تا سقف گروه یک
-                };
-                break;
-            case "5":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 126,
-                    HighRate = 145,
-                    DistanceRate = 65, //فاصله سقف این گروه تا سقف گروه یک
-                };
-                break;
-            case "6":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 146,
-                    HighRate = 165,
-                    DistanceRate = 85, 
-                };
-                break;
-            case "7":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 166,
-                    HighRate = 185,
-                    DistanceRate = 105,
-                };
-                break;
-            case "8":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 186,
-                    HighRate = 210,
-                    DistanceRate = 130,
-                };
-                break;
-            case "9":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 211,
-                    HighRate = 235,
-                    DistanceRate = 155,
-                };
-                break;
-            case "10":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 236,
-                    HighRate = 265,
-                    DistanceRate = 185,
-                };
-                break;
-            case "11":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 266,
-                    HighRate = 295,
-                    DistanceRate = 215,
-                };
-                break;
-            case "12":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 296,
-                    HighRate = 325,
-                    DistanceRate = 245,
-                };
-                break;
-            case "13":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 326,
-                    HighRate = 365,
-                    DistanceRate = 285,
-                };
-                break;
-            case "14":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 366,
-                    HighRate = 405,
-                    DistanceRate = 325,
-                };
-                break;
-            case "15":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 406,
-                    HighRate = 445,
-                    DistanceRate = 365,
-                };
-                break;
-            case "16":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 446,
-                    HighRate = 495,
-                    DistanceRate = 415,
-                };
-                break;
-            case "17":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 496,
-                    HighRate = 545,
-                    DistanceRate = 465,
-                };
-                break;
-            case "18":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 546,
-                    HighRate = 605,
-                    DistanceRate = 525,
-                };
-                break;
-            case "19":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 606,
-                    HighRate = 665,
-                    DistanceRate = 585,
-                };
-                break;
-            case "20":
-                return new ClassificationGroupRate()
-                {
-                    GroupNo = groupNo,
-                    LowRate = 666,
-                    HighRate = 740,
-                    DistanceRate = 660,
-                };
-                break;
-        }
-
-
-        return new ClassificationGroupRate();
-    }
-}
-
-/// <summary>
-/// دیتای امتیازات هر گرو
-/// </summary>
-public class ClassificationGroupRate
-{
-
-    /// <summary>
-    /// شمازه گروه
-    /// </summary>
-    public string GroupNo { get; set; }
-
-    /// <summary>
-    /// امتیاز کف
-    /// </summary>
-    public int LowRate { get; set; }
-
-    /// <summary>
-    /// امتیاز سقف
-    /// </summary>
-    public int HighRate { get; set; }
-
-    /// <summary>
-    /// فاصله امتیاز
-    /// </summary>
-    public int DistanceRate { get; set; }
-}

0_Framework/Application/Enums/TypeOfCoefficient.cs

@@ -1,14 +0,0 @@
-namespace _0_Framework.Application.Enums;
-
-public enum TypeOfCoefficient
-{
-    /// <summary>
-    /// ضریب ریالی طرح
-    /// </summary>
-    RialCoefficient,
-
-    /// <summary>
-    /// ضریب ریالی اداره کار
-    /// </summary>
-    JobOrganization,
-}

0_Framework/Application/Enums/TypeOfSmsSetting.cs

@@ -2,8 +2,6 @@
 
 public enum TypeOfSmsSetting
 {
-    //همه انواع پیامک
-    All = 0,
 
     /// <summary>
     /// پیامک
@@ -25,7 +23,7 @@ public enum TypeOfSmsSetting
 
     /// <summary>
     /// پیامک
-    /// هشدار بدهی
+    /// هشدار اول
     /// </summary>
     Warning,
 
@@ -40,19 +38,4 @@ public enum TypeOfSmsSetting
     /// </summary>
     InstitutionContractConfirm,
 
-    /// <summary>
-    /// ارسال کد تاییدیه قرارداد مالی
-    /// </summary>
-    SendInstitutionContractConfirmationCode,
-
-    /// <summary>
-    /// لینک تاییدیه ایجاد قرارداد مالی
-    /// </summary>
-    SendInstitutionContractConfirmationLink,
-
-    /// <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/PagedResult.cs

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

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/Sms/ApiResultViewModel.cs

@@ -17,35 +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; }
-    public string FullName { get; set; }
-
-}
-
-public class SmsDetailsDto
-{
-
-
-    public string MessageText { 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; }
-    public string FullName { get; set; }
-
 }

0_Framework/Application/Sms/ISmsService.cs

@@ -16,22 +16,9 @@ public interface ISmsService
     /// <param name="code"></param>
     /// <returns></returns>
     Task<SentSmsViewModel> SendVerifyCodeToClient(string number, string code);
-    bool SendAccountsInfo(string number, string fullName, string userName);
+    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);
-    /// <summary>
-    /// دریافت جزئیات پیامک
-    /// </summary>
-    /// <param name="messId"></param>
-    /// <param name="fullName"></param>
-    /// <returns></returns>
-    Task<SmsDetailsDto> GetSmsDetailsByMessageId(int messId, string fullName);
-    #endregion
-
     string DeliveryStatus(byte? dv);
     string DeliveryColorStatus(byte? dv);
     string UnixTimeStampToDateTime(int? unixTimeStamp);
@@ -39,9 +26,9 @@ public interface ISmsService
     #region Mahan
 
     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);
 
@@ -74,10 +61,9 @@ public interface ISmsService
     /// <param name="aprove"></param>
     /// <returns></returns>
     Task<(byte status, string message, int messaeId, bool isSucceded)> MonthlyBill(string number, int tamplateId, string fullname, string amount, string id, string aprove);
-
+   
     /// <summary>
     /// پیامک مسدودی طرف حساب
-    /// قراردادهای قدیم
     /// </summary>
     /// <param name="number"></param>
     /// <param name="fullname"></param>
@@ -88,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, 476];
 
     /// <summary>
     /// این تاریخ در جدول اکانت لفت ورک به این معنیست
     /// که کاربر همچنان به کارگاه دسترسی دارد
     /// </summary>
     public static DateTime ContinuesWorkingDate = new DateTime(2150, 1, 1);
-
-
-    /// <summary>
-    /// لیستی آی دی نقش هایی که مسئول بیمه کارگاه هستند
-    /// 7 : بیمه ارشد
-    /// 8 : بیمه ساده
-    /// </summary>
-    public static List<long> InsuranceAccountsRoleIds = [7, 8];
-
-
-
 }

0_Framework/Application/Tools.cs

@@ -1,16 +1,25 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
 using System.Globalization;
 using System.IO;
 using System.Text.RegularExpressions;
+using _0_Framework.Infrastructure;
+using Microsoft.Extensions.WebEncoders.Testing;
 using PersianTools.Core;
+using static System.Net.Mime.MediaTypeNames;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
+using Image = System.Drawing.Image;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Bson;
+using Microsoft.Extensions.Logging;
+using System.IO.Compression;
 using System.Linq;
 using _0_Framework.Domain.CustomizeCheckoutShared.Base;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Processing;
-using Size = SixLabors.ImageSharp.Size;
+using System.ComponentModel.DataAnnotations;
 
 
 namespace _0_Framework.Application;
@@ -24,35 +33,6 @@ public static class Tools
     public static string[] DayNames = { "شنبه", "یکشنبه", "دو شنبه", "سه شنبه", "چهار شنبه", "پنج شنبه", "جمعه" };
     public static string[] DayNamesG = { "یکشنبه", "دو شنبه", "سه شنبه", "چهار شنبه", "پنج شنبه", "جمعه", "شنبه" };
 
-    /// <summary>
-    /// نام ستون از جدول  مزد سنوات طبثه بندی را میگیرد و دیتای داخل آن ستون را برمیگرداند
-    /// </summary>
-    /// <param name="obj"></param>
-    /// <param name="propertyName"></param>
-    /// <returns></returns>
-    public static double? GetDynamicDouble(object obj, string propertyName)
-    {
-        if (obj == null || string.IsNullOrWhiteSpace(propertyName))
-            return null;
-
-        var propertyInfo = obj.GetType().GetProperty(propertyName);
-        if (propertyInfo == null)
-            return null;
-
-        var value = propertyInfo.GetValue(obj);
-        if (value == null)
-            return null;
-
-        try
-        {
-            return Convert.ToDouble(value);
-        }
-        catch
-        {
-            return null;
-        }
-    }
-
 
     public static bool IsMobileValid(this string mobileNo)
     {
@@ -61,33 +41,6 @@ public static class Tools
         return Regex.IsMatch(mobileNo, "^((09))(\\d{9})$");
     }
 
-    /// <summary>
-    /// متد رند کننده مبلغ
-    /// استفاده شده در بیمه
-    /// </summary>
-    /// <param name="value"></param>
-    /// <returns></returns>
-    public static double GetRoundDoubleValue(double value)
-    {
-        string strValue = value.ToString();
-        if (strValue.IndexOf('.') > -1)
-        {
-
-
-            string a = strValue.Substring(strValue.IndexOf('.') + 1, 1);
-            if (int.Parse(a) > 5)
-            {
-                return (Math.Round(value, MidpointRounding.ToPositiveInfinity));
-            }
-            else
-            {
-                return (Math.Round(value, MidpointRounding.ToNegativeInfinity));
-            }
-        }
-
-        return value;
-    }
-
     /// <summary>
     /// تاریخ شروع و تعداد ماه را میگیرد و تاریخ پایان قراردا را بر میگرداند
     /// </summary>
@@ -492,30 +445,6 @@ public static class Tools
 
         return myMoney.ToString("N0", CultureInfo.CreateSpecificCulture("fa-ir"));
     }
-
-    /// <summary>
-    /// اگر مبلغ صفر باشد خط تیره برمیگرداند
-    /// </summary>
-    /// <param name="myMoney"></param>
-    /// <returns></returns>
-    public static string ToMoneyCheckZero(this double myMoney)
-    {
-        if (myMoney == 0)
-            return "-";
-        return myMoney.ToString("N0", CultureInfo.CreateSpecificCulture("fa-ir"));
-    }
-
-    /// <summary>
-    /// اگر مبلغ صفر یا نال باشد خط تیره برمیگرداند
-    /// </summary>
-    /// <param name="myMoney"></param>
-    /// <returns></returns>
-    public static string ToMoneyCheckZeroNullable(this double? myMoney)
-    {
-        if (myMoney == 0 || myMoney == null)
-            return "-";
-        return myMoney?.ToString("N0", CultureInfo.CreateSpecificCulture("fa-ir"));
-    }
     public static string ToMoneyNullable(this double? myMoney)
     {
 
@@ -697,115 +626,7 @@ public static class Tools
         return y2;
     }
 
-    /// <summary>
-    /// تاریخ شمسی میگیرد و پایان ماه را به میلادی برمیگرداند
-    /// </summary>
-    /// <param name="date"></param>
-    /// <returns></returns>
-    public static DateTime FindeEndOfMonthReturnGr(this string date)
-    {
-        string y2 = string.Empty;
-        var year = Convert.ToInt32(date.Substring(0, 4));
-        var month = Convert.ToInt32(date.Substring(5, 2));
-        var YearD = date.Substring(0, 4);
-        var MonthD = date.Substring(5, 2);
-        if (month <= 6)
-        {
-            y2 = $"{YearD}/{MonthD}/31";
-        }
-        else if (month > 6 && month < 12)
-        {
-            y2 = $"{YearD}/{MonthD}/30";
-        }
-        else if (month == 12)
-        {
-            switch (year)
-            {
-                case 1346:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1350:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1354:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1358:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1362:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1366:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1370:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1375:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1379:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1383:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1387:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1391:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1395:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1399:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1403:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1408:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1412:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1416:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1420:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1424:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1428:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1432:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1436:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1441:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
-                case 1445:
-                    y2 = $"{YearD}/{MonthD}/30";
-                    break;
 
-                default:
-                    y2 = $"{YearD}/{MonthD}/29";
-                    break;
-
-            }
-        }
-
-        return y2.ToGeorgianDateTime();
-    }
     /// <summary>
     /// تعداد روزهای سال را برمیگرداند
     /// اگر کبیسهد بود سال 366 روزه برمیگرداند
@@ -1372,28 +1193,20 @@ public static class Tools
 
     public static string ResizeImage(string imagePath, int width, int height)
     {
-        // 1. بارگذاری تصویر از فایل
-        using (var image = SixLabors.ImageSharp.Image.Load(imagePath))
+        using (var srcImage = Image.FromFile(imagePath))
         {
-            // 2. تنظیمات تغییر سایز
-            var resizeOptions = new ResizeOptions
+            var newImage = new Bitmap(width, height);
+            using (var graphics = Graphics.FromImage(newImage))
             {
-                Size = new Size(width, height),
-                // در کد قبلی شما عکس کشیده می‌شد تا دقیقا عرض و ارتفاع را پر کند
-                // معادل آن در ImageSharp حالت Stretch است
-                Mode = ResizeMode.Stretch, 
-            
-                // معادل InterpolationMode.Bicubic
-                Sampler = KnownResamplers.Bicubic 
-            };
+                graphics.CompositingQuality = CompositingQuality.HighSpeed;
+                graphics.InterpolationMode = InterpolationMode.Bicubic;
+                graphics.SmoothingMode = SmoothingMode.HighSpeed;
+                graphics.DrawImage(srcImage, 0, 0, width, height);
+            }
 
-            // 3. اعمال تغییر سایز
-            image.Mutate(x => x.Resize(resizeOptions));
-
-            // 4. ذخیره در حافظه به فرمت Jpeg و تبدیل به Base64
             using (var memoryStream = new MemoryStream())
             {
-                image.SaveAsJpeg(memoryStream);
+                newImage.Save(memoryStream, ImageFormat.Jpeg);
                 return Convert.ToBase64String(memoryStream.ToArray());
             }
         }

0_Framework/Domain/IRepository.cs

@@ -11,8 +11,7 @@ namespace _0_Framework.Domain;
 public interface IRepository<TKey, T> where  T:class
 {
     T Get(TKey id);
-    List<T> Get();
-    Task<List<T>> GetListByIdList(List<TKey> ids);
+    List<T> Get();  
     void Create(T entity);
     Task CreateAsync(T entity);
     bool ExistsIgnoreQueryFilter(Expression<Func<T, bool>> expression);

0_Framework/Excel/ExcelApiDto.cs

@@ -1,8 +0,0 @@
-namespace _0_Framework.Excel;
-
-public class ExcelApiDto
-{
-    public byte[] Bytes { get; set; }
-    public string FileName { get; set; }
-    public string MimeType { get; set; } = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-}

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

@@ -9,7 +9,6 @@ using _0_Framework.Application;
 using _0_Framework.Application.FaceEmbedding;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Http;
-using Microsoft.Extensions.Configuration;
 using System.Threading.Tasks;
 
 namespace _0_Framework.Infrastructure;
@@ -19,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,
-        IConfiguration configuration, IFaceEmbeddingNotificationService notificationService = null)
-    {
-        _httpClientFactory = httpClientFactory;
-        _logger = logger;
-        _notificationService = notificationService;
-        _apiBaseUrl = configuration["FaceEmbeddingApi:BaseUrl"] ?? "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"
+			};
+		}
+	}
+}

0_Framework/InfraStructure/RepositoryBase.cs

@@ -53,11 +53,6 @@ namespace _0_Framework.InfraStructure
         {
             return _context.Set<T>().ToList();
         }
-
-        public async Task<List<T>> GetListByIdList(List<TKey> ids)
-        {
-            return await _context.Set<T>().Where(e => ids.Contains(EF.Property<TKey>(e, "id"))).ToListAsync();
-        }
         public void Remove(T entity)
         {
             _context.Set<T>().Remove(entity);

ANDROID_SIGNALR_GUIDE.md

@@ -0,0 +1,624 @@
+# راهنمای اتصال اپلیکیشن Android به SignalR برای Face Embedding
+
+## 1. افزودن کتابخانه SignalR به پروژه Android
+
+در فایل `build.gradle` (Module: app) خود، dependency زیر را اضافه کنید:
+
+```gradle
+dependencies {
+    // SignalR for Android
+    implementation 'com.microsoft.signalr:signalr:7.0.0'
+    
+    // اگر از Kotlin استفاده می‌کنید:
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
+    
+    // برای JSON پردازش:
+    implementation 'com.google.code.gson:gson:2.10.1'
+}
+```
+
+## 2. اضافه کردن Permission در AndroidManifest.xml
+
+```xml
+<uses-permission android:name="android.permission.INTERNET" />
+<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+```
+
+## 3. کد Java/Kotlin برای اتصال به SignalR
+
+### نسخه Java:
+
+```java
+import com.microsoft.signalr.HubConnection;
+import com.microsoft.signalr.HubConnectionBuilder;
+import com.microsoft.signalr.HubConnectionState;
+import com.google.gson.JsonObject;
+import android.util.Log;
+
+public class FaceEmbeddingSignalRClient {
+    private static final String TAG = "FaceEmbeddingHub";
+    private HubConnection hubConnection;
+    private String serverUrl = "http://YOUR_SERVER_IP:PORT/trackingFaceEmbeddingHub"; // آدرس سرور خود را وارد کنید
+    private long workshopId;
+
+    public FaceEmbeddingSignalRClient(long workshopId) {
+        this.workshopId = workshopId;
+        initializeSignalR();
+    }
+
+    private void initializeSignalR() {
+        // ایجاد اتصال SignalR
+        hubConnection = HubConnectionBuilder
+                .create(serverUrl)
+                .build();
+
+        // دریافت رویداد ایجاد Embedding
+        hubConnection.on("EmbeddingCreated", (data) -> {
+            JsonObject jsonData = (JsonObject) data;
+            long employeeId = jsonData.get("employeeId").getAsLong();
+            String employeeFullName = jsonData.get("employeeFullName").getAsString();
+            String timestamp = jsonData.get("timestamp").getAsString();
+            
+            Log.d(TAG, "Embedding Created - Employee: " + employeeFullName + " (ID: " + employeeId + ")");
+            
+            // اینجا می‌توانید داده‌های جدید را از سرور بگیرید یا UI را بروزرسانی کنید
+            onEmbeddingCreated(employeeId, employeeFullName, timestamp);
+            
+        }, JsonObject.class);
+
+        // دریافت رویداد حذف Embedding
+        hubConnection.on("EmbeddingDeleted", (data) -> {
+            JsonObject jsonData = (JsonObject) data;
+            long employeeId = jsonData.get("employeeId").getAsLong();
+            String timestamp = jsonData.get("timestamp").getAsString();
+            
+            Log.d(TAG, "Embedding Deleted - Employee ID: " + employeeId);
+            onEmbeddingDeleted(employeeId, timestamp);
+            
+        }, JsonObject.class);
+
+        // دریافت رویداد بهبود Embedding
+        hubConnection.on("EmbeddingRefined", (data) -> {
+            JsonObject jsonData = (JsonObject) data;
+            long employeeId = jsonData.get("employeeId").getAsLong();
+            String timestamp = jsonData.get("timestamp").getAsString();
+            
+            Log.d(TAG, "Embedding Refined - Employee ID: " + employeeId);
+            onEmbeddingRefined(employeeId, timestamp);
+            
+        }, JsonObject.class);
+    }
+
+    public void connect() {
+        if (hubConnection.getConnectionState() == HubConnectionState.DISCONNECTED) {
+            hubConnection.start()
+                .doOnComplete(() -> {
+                    Log.d(TAG, "Connected to SignalR Hub");
+                    joinWorkshopGroup();
+                })
+                .doOnError(error -> {
+                    Log.e(TAG, "Error connecting to SignalR: " + error.getMessage());
+                })
+                .subscribe();
+        }
+    }
+
+    private void joinWorkshopGroup() {
+        // عضویت در گروه مخصوص این کارگاه
+        hubConnection.send("JoinWorkshopGroup", workshopId);
+        Log.d(TAG, "Joined workshop group: " + workshopId);
+    }
+
+    public void disconnect() {
+        if (hubConnection.getConnectionState() == HubConnectionState.CONNECTED) {
+            // خروج از گروه
+            hubConnection.send("LeaveWorkshopGroup", workshopId);
+            
+            hubConnection.stop();
+            Log.d(TAG, "Disconnected from SignalR Hub");
+        }
+    }
+
+    // این متدها را در Activity/Fragment خود override کنید
+    protected void onEmbeddingCreated(long employeeId, String employeeFullName, String timestamp) {
+        // اینجا UI را بروزرسانی کنید یا داده جدید را بگیرید
+    }
+
+    protected void onEmbeddingDeleted(long employeeId, String timestamp) {
+        // اینجا UI را بروزرسانی کنید
+    }
+
+    protected void onEmbeddingRefined(long employeeId, String timestamp) {
+        // اینجا UI را بروزرسانی کنید
+    }
+}
+```
+
+### نسخه Kotlin:
+
+```kotlin
+import com.microsoft.signalr.HubConnection
+import com.microsoft.signalr.HubConnectionBuilder
+import com.microsoft.signalr.HubConnectionState
+import com.google.gson.JsonObject
+import android.util.Log
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+class FaceEmbeddingSignalRClient(private val workshopId: Long) {
+    
+    companion object {
+        private const val TAG = "FaceEmbeddingHub"
+    }
+    
+    private lateinit var hubConnection: HubConnection
+    private val serverUrl = "http://YOUR_SERVER_IP:PORT/trackingFaceEmbeddingHub" // آدرس سرور خود را وارد کنید
+    
+    init {
+        initializeSignalR()
+    }
+    
+    private fun initializeSignalR() {
+        hubConnection = HubConnectionBuilder
+            .create(serverUrl)
+            .build()
+            
+        // دریافت رویداد ایجاد Embedding
+        hubConnection.on("EmbeddingCreated", { data: JsonObject ->
+            val employeeId = data.get("employeeId").asLong
+            val employeeFullName = data.get("employeeFullName").asString
+            val timestamp = data.get("timestamp").asString
+            
+            Log.d(TAG, "Embedding Created - Employee: $employeeFullName (ID: $employeeId)")
+            onEmbeddingCreated(employeeId, employeeFullName, timestamp)
+        }, JsonObject::class.java)
+        
+        // دریافت رویداد حذف Embedding
+        hubConnection.on("EmbeddingDeleted", { data: JsonObject ->
+            val employeeId = data.get("employeeId").asLong
+            val timestamp = data.get("timestamp").asString
+            
+            Log.d(TAG, "Embedding Deleted - Employee ID: $employeeId")
+            onEmbeddingDeleted(employeeId, timestamp)
+        }, JsonObject::class.java)
+        
+        // دریافت رویداد بهبود Embedding
+        hubConnection.on("EmbeddingRefined", { data: JsonObject ->
+            val employeeId = data.get("employeeId").asLong
+            val timestamp = data.get("timestamp").asString
+            
+            Log.d(TAG, "Embedding Refined - Employee ID: $employeeId")
+            onEmbeddingRefined(employeeId, timestamp)
+        }, JsonObject::class.java)
+    }
+    
+    fun connect() {
+        if (hubConnection.connectionState == HubConnectionState.DISCONNECTED) {
+            CoroutineScope(Dispatchers.IO).launch {
+                try {
+                    hubConnection.start().blockingAwait()
+                    Log.d(TAG, "Connected to SignalR Hub")
+                    joinWorkshopGroup()
+                } catch (e: Exception) {
+                    Log.e(TAG, "Error connecting to SignalR: ${e.message}")
+                }
+            }
+        }
+    }
+    
+    private fun joinWorkshopGroup() {
+        hubConnection.send("JoinWorkshopGroup", workshopId)
+        Log.d(TAG, "Joined workshop group: $workshopId")
+    }
+    
+    fun disconnect() {
+        if (hubConnection.connectionState == HubConnectionState.CONNECTED) {
+            hubConnection.send("LeaveWorkshopGroup", workshopId)
+            hubConnection.stop()
+            Log.d(TAG, "Disconnected from SignalR Hub")
+        }
+    }
+    
+    // این متدها را override کنید
+    open fun onEmbeddingCreated(employeeId: Long, employeeFullName: String, timestamp: String) {
+        // اینجا UI را بروزرسانی کنید یا داده جدید را بگیرید
+    }
+    
+    open fun onEmbeddingDeleted(employeeId: Long, timestamp: String) {
+        // اینجا UI را بروزرسانی کنید
+    }
+    
+    open fun onEmbeddingRefined(employeeId: Long, timestamp: String) {
+        // اینجا UI را بروزرسانی کنید
+    }
+}
+```
+
+## 4. استفاده در Activity یا Fragment
+
+### مثال با Login و دریافت WorkshopId
+
+#### Java:
+```java
+public class LoginActivity extends AppCompatActivity {
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_login);
+        
+        Button btnLogin = findViewById(R.id.btnLogin);
+        btnLogin.setOnClickListener(v -> performLogin());
+    }
+    
+    private void performLogin() {
+        // فراخوانی API لاگین
+        // فرض کنید response شامل workshopId است
+        
+        // مثال ساده (باید از Retrofit یا کتابخانه مشابه استفاده کنید):
+        // LoginResponse response = apiService.login(username, password);
+        // long workshopId = response.getWorkshopId();
+        
+        long workshopId = 123; // این را از response دریافت کنید
+        
+        // ذخیره workshopId
+        SharedPreferences prefs = getSharedPreferences("AppPrefs", MODE_PRIVATE);
+        prefs.edit().putLong("workshopId", workshopId).apply();
+        
+        // رفتن به صفحه اصلی
+        Intent intent = new Intent(this, MainActivity.class);
+        startActivity(intent);
+        finish();
+    }
+}
+
+public class MainActivity extends AppCompatActivity {
+    private FaceEmbeddingSignalRClient signalRClient;
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        
+        // دریافت workshopId از SharedPreferences
+        SharedPreferences prefs = getSharedPreferences("AppPrefs", MODE_PRIVATE);
+        long workshopId = prefs.getLong("workshopId", 0);
+        
+        if (workshopId == 0) {
+            // اگر workshopId وجود نداره، برگرد به صفحه لاگین
+            Intent intent = new Intent(this, LoginActivity.class);
+            startActivity(intent);
+            finish();
+            return;
+        }
+        
+        // ایجاد و اتصال SignalR
+        signalRClient = new FaceEmbeddingSignalRClient(workshopId) {
+            @Override
+            protected void onEmbeddingCreated(long employeeId, String employeeFullName, String timestamp) {
+                runOnUiThread(() -> {
+                    // بروزرسانی UI
+                    Toast.makeText(MainActivity.this, 
+                        "Embedding ایجاد شد برای: " + employeeFullName, 
+                        Toast.LENGTH_SHORT).show();
+                    
+                    // دریافت داده‌های جدید از API
+                    refreshEmployeeList();
+                });
+            }
+            
+            @Override
+            protected void onEmbeddingDeleted(long employeeId, String timestamp) {
+                runOnUiThread(() -> {
+                    // بروزرسانی UI
+                    refreshEmployeeList();
+                });
+            }
+            
+            @Override
+            protected void onEmbeddingRefined(long employeeId, String timestamp) {
+                runOnUiThread(() -> {
+                    // بروزرسانی UI
+                    refreshEmployeeList();
+                });
+            }
+        };
+        
+        signalRClient.connect();
+    }
+    
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (signalRClient != null) {
+            signalRClient.disconnect();
+        }
+    }
+    
+    private void refreshEmployeeList() {
+        // دریافت لیست جدید کارمندان از API
+    }
+}
+```
+
+#### Kotlin:
+```kotlin
+class LoginActivity : AppCompatActivity() {
+    
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_login)
+        
+        val btnLogin = findViewById<Button>(R.id.btnLogin)
+        btnLogin.setOnClickListener { performLogin() }
+    }
+    
+    private fun performLogin() {
+        // فراخوانی API لاگین
+        // فرض کنید response شامل workshopId است
+        
+        // مثال ساده (باید از Retrofit یا کتابخانه مشابه استفاده کنید):
+        // val response = apiService.login(username, password)
+        // val workshopId = response.workshopId
+        
+        val workshopId = 123L // این را از response دریافت کنید
+        
+        // ذخیره workshopId
+        val prefs = getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
+        prefs.edit().putLong("workshopId", workshopId).apply()
+        
+        // رفتن به صفحه اصلی
+        val intent = Intent(this, MainActivity::class.java)
+        startActivity(intent)
+        finish()
+    }
+}
+
+class MainActivity : AppCompatActivity() {
+    private lateinit var signalRClient: FaceEmbeddingSignalRClient
+    
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+        
+        // دریافت workshopId از SharedPreferences
+        val prefs = getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
+        val workshopId = prefs.getLong("workshopId", 0L)
+        
+        if (workshopId == 0L) {
+            // اگر workshopId وجود نداره، برگرد به صفحه لاگین
+            val intent = Intent(this, LoginActivity::class.java)
+            startActivity(intent)
+            finish()
+            return
+        }
+        
+        // ایجاد و اتصال SignalR
+        signalRClient = object : FaceEmbeddingSignalRClient(workshopId) {
+            override fun onEmbeddingCreated(employeeId: Long, employeeFullName: String, timestamp: String) {
+                runOnUiThread {
+                    // بروزرسانی UI
+                    Toast.makeText(this@MainActivity, 
+                        "Embedding ایجاد شد برای: $employeeFullName", 
+                        Toast.LENGTH_SHORT).show()
+                    
+                    // دریافت داده‌های جدید از API
+                    refreshEmployeeList()
+                }
+            }
+            
+            override fun onEmbeddingDeleted(employeeId: Long, timestamp: String) {
+                runOnUiThread {
+                    // بروزرسانی UI
+                    refreshEmployeeList()
+                }
+            }
+            
+            override fun onEmbeddingRefined(employeeId: Long, timestamp: String) {
+                runOnUiThread {
+                    // بروزرسانی UI
+                    refreshEmployeeList()
+                }
+            }
+        }
+        
+        signalRClient.connect()
+    }
+    
+    override fun onDestroy() {
+        super.onDestroy()
+        signalRClient.disconnect()
+    }
+    
+    private fun refreshEmployeeList() {
+        // دریافت لیست جدید کارمندان از API
+    }
+}
+```
+
+### مثال ساده بدون Login:
+اگر workshopId را از قبل می‌دانید:
+
+#### Java:
+```java
+public class MainActivity extends AppCompatActivity {
+    private FaceEmbeddingSignalRClient signalRClient;
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        
+        long workshopId = 123; // شناسه کارگاه خود را وارد کنید
+        
+        signalRClient = new FaceEmbeddingSignalRClient(workshopId) {
+            @Override
+            protected void onEmbeddingCreated(long employeeId, String employeeFullName, String timestamp) {
+                runOnUiThread(() -> {
+                    // بروزرسانی UI
+                    Toast.makeText(MainActivity.this, 
+                        "Embedding ایجاد شد برای: " + employeeFullName, 
+                        Toast.LENGTH_SHORT).show();
+                    
+                    // دریافت داده‌های جدید از API
+                    refreshEmployeeList();
+                });
+            }
+            
+            @Override
+            protected void onEmbeddingDeleted(long employeeId, String timestamp) {
+                runOnUiThread(() -> {
+                    // بروزرسانی UI
+                    refreshEmployeeList();
+                });
+            }
+        };
+        
+        signalRClient.connect();
+    }
+    
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (signalRClient != null) {
+            signalRClient.disconnect();
+        }
+    }
+    
+    private void refreshEmployeeList() {
+        // دریافت لیست جدید کارمندان از API
+    }
+}
+```
+
+#### Kotlin:
+```kotlin
+class MainActivity : AppCompatActivity() {
+    private lateinit var signalRClient: FaceEmbeddingSignalRClient
+    
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+        
+        val workshopId = 123L // شناسه کارگاه خود را وارد کنید
+        
+        signalRClient = object : FaceEmbeddingSignalRClient(workshopId) {
+            override fun onEmbeddingCreated(employeeId: Long, employeeFullName: String, timestamp: String) {
+                runOnUiThread {
+                    // بروزرسانی UI
+                    Toast.makeText(this@MainActivity, 
+                        "Embedding ایجاد شد برای: $employeeFullName", 
+                        Toast.LENGTH_SHORT).show()
+                    
+                    // دریافت داده‌های جدید از API
+                    refreshEmployeeList()
+                }
+            }
+            
+            override fun onEmbeddingDeleted(employeeId: Long, timestamp: String) {
+                runOnUiThread {
+                    // بروزرسانی UI
+                    refreshEmployeeList()
+                }
+            }
+        }
+        
+        signalRClient.connect()
+    }
+    
+    override fun onDestroy() {
+        super.onDestroy()
+        signalRClient.disconnect()
+    }
+    
+    private fun refreshEmployeeList() {
+        // دریافت لیست جدید کارمندان از API
+    }
+}
+```
+
+## 5. نکات مهم
+
+### آدرس سرور
+- اگر روی شبیه‌ساز اندروید تست می‌کنید و سرور روی localhost اجرا می‌شود، از آدرس `http://10.0.2.2:PORT` استفاده کنید
+- اگر روی دستگاه فیزیکی تست می‌کنید، از آدرس IP شبکه محلی سرور استفاده کنید (مثل `http://192.168.1.100:PORT`)
+- PORT پیش‌فرض معمولاً 5000 یا 5001 است (بسته به کانفیگ پروژه شما)
+
+### دریافت WorkshopId از Login
+بعد از login موفق، workshopId را از سرور دریافت کنید و در SharedPreferences یا یک Singleton ذخیره کنید:
+
+```java
+// بعد از login موفق
+SharedPreferences prefs = getSharedPreferences("AppPrefs", MODE_PRIVATE);
+prefs.edit().putLong("workshopId", workshopId).apply();
+
+// استفاده در Activity
+long workshopId = prefs.getLong("workshopId", 0);
+```
+
+یا در Kotlin:
+
+```kotlin
+// بعد از login موفق
+val prefs = getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
+prefs.edit().putLong("workshopId", workshopId).apply()
+
+// استفاده در Activity
+val workshopId = prefs.getLong("workshopId", 0L)
+```
+
+### مدیریت اتصال
+برای reconnection خودکار:
+
+```java
+hubConnection.onClosed(exception -> {
+    Log.e(TAG, "Connection closed. Attempting to reconnect...");
+    new Handler().postDelayed(() -> connect(), 5000); // تلاش مجدد بعد از 5 ثانیه
+});
+```
+
+### Thread Safety
+همیشه UI updates را در main thread انجام دهید:
+
+```java
+runOnUiThread(() -> {
+    // UI updates here
+});
+```
+
+## 6. تست اتصال
+
+برای تست می‌توانید:
+1. اپلیکیشن را اجرا کنید
+2. از طریق Postman یا Swagger یک Embedding ایجاد کنید
+3. باید در Logcat پیام "Embedding Created" را ببینید
+
+## 7. خطایابی (Debugging)
+
+برای دیدن جزئیات بیشتر:
+
+```java
+hubConnection = HubConnectionBuilder
+    .create(serverUrl)
+    .withHttpConnectionOptions(options -> {
+        options.setLogging(LogLevel.TRACE);
+    })
+    .build();
+```
+
+---
+
+## خلاصه Endpoints
+
+| نوع رویداد | متد SignalR | پارامترهای دریافتی |
+|-----------|-------------|---------------------|
+| ایجاد Embedding | `EmbeddingCreated` | workshopId, employeeId, employeeFullName, timestamp |
+| حذف Embedding | `EmbeddingDeleted` | workshopId, employeeId, timestamp |
+| بهبود Embedding | `EmbeddingRefined` | workshopId, employeeId, timestamp |
+
+| متد ارسالی | پارامتر | توضیحات |
+|-----------|---------|---------|
+| `JoinWorkshopGroup` | workshopId | عضویت در گروه کارگاه |
+| `LeaveWorkshopGroup` | workshopId | خروج از گروه کارگاه |
+

AccountManagement.Application.Contracts/Account/IAccountApplication.cs

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

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

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

AccountManagement.Application/AccountApplication.cs

@@ -18,6 +18,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Shared.Contracts.PmUser.Commands;
 using Shared.Contracts.PmUser.Queries;
 
@@ -47,13 +48,7 @@ public class AccountApplication : IAccountApplication
     private readonly IPmUserCommandService _pmUserCommandService;
 
     public AccountApplication(IAccountRepository accountRepository, IPasswordHasher passwordHasher,
-        IFileUploader fileUploader, IAuthHelper authHelper, IRoleRepository roleRepository, IWorker worker,
-        ISmsService smsService, ICameraAccountRepository cameraAccountRepository,
-        IPositionRepository positionRepository, IAccountLeftworkRepository accountLeftworkRepository,
-        IWorkshopRepository workshopRepository, ISubAccountRepository subAccountRepository,
-        ISubAccountRoleRepository subAccountRoleRepository, IWorkshopSubAccountRepository workshopSubAccountRepository,
-        ISubAccountPermissionSubtitle1Repository accountPermissionSubtitle1Repository, IUnitOfWork unitOfWork,
-        IPmUserQueryService pmUserQueryService, IPmUserCommandService pmUserCommandService)
+        IFileUploader fileUploader, IAuthHelper authHelper, IRoleRepository roleRepository, IWorker worker, ISmsService smsService, ICameraAccountRepository cameraAccountRepository, IPositionRepository positionRepository, IAccountLeftworkRepository accountLeftworkRepository, IWorkshopRepository workshopRepository, ISubAccountRepository subAccountRepository, ISubAccountRoleRepository subAccountRoleRepository, IWorkshopSubAccountRepository workshopSubAccountRepository, ISubAccountPermissionSubtitle1Repository accountPermissionSubtitle1Repository, IUnitOfWork unitOfWork, IPmUserQueryService pmUserQueryService, IPmUserCommandService pmUserCommandService)
     {
         _authHelper = authHelper;
         _roleRepository = roleRepository;
@@ -73,6 +68,7 @@ public class AccountApplication : IAccountApplication
         _fileUploader = fileUploader;
         _passwordHasher = passwordHasher;
         _accountRepository = accountRepository;
+
     }
 
     public OperationResult EditClient(EditClientAccount command)
@@ -93,8 +89,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 +97,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();
     }
@@ -148,8 +142,8 @@ public class AccountApplication : IAccountApplication
         if (_fileUploader != null)
         {
             picturePath = _fileUploader.Upload(command.ProfilePhoto, path);
-        }
 
+        }
         var account = new Account(command.Fullname, command.Username, password, command.Mobile, command.RoleId,
             picturePath, roleName.Name, "true", "false");
 
@@ -161,11 +155,8 @@ public class AccountApplication : IAccountApplication
 
         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,
+            var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname, command.Username, account.Password, command.Mobile,
                 null, account.id, pmUserRoles));
             if (!createPm.isSuccess)
             {
@@ -174,6 +165,7 @@ public class AccountApplication : IAccountApplication
             }
 
 
+
             //var url = "api/user/create";
             //var key = SecretKeys.ProgramManagerInternalApi;
 
@@ -258,30 +250,27 @@ public class AccountApplication : IAccountApplication
         //    $"api/user/{account.id}",
         //    key
         //);
-        var userResult = await _pmUserQueryService.GetPmUserDataByAccountId(account.id);
+        var userResult =await _pmUserQueryService.GetPmUserDataByAccountId(account.id);
 
-        if (command.UserRoles == null)
-            return operation.Failed("حداقل یک نقش برای کاربر مدیریت پروژه لازم است");
         var pmUserRoles = command.UserRoles.Where(x => x > 0).ToList();
 
         //اگر کاربر در پروگرام منیجر قبلا ایجاد شده
-        if (userResult.Id > 0)
+        if (userResult.Id >0)
         {
             if (!command.UserRoles.Any())
             {
                 _unitOfWork.RollbackAccountContext();
                 return operation.Failed("حداقل یک نقش باید انتخاب شود");
             }
-
-            var editPm = await _pmUserCommandService.Edit(new EditPmUserDto(command.Fullname, command.Username,
-                command.Mobile, account.id, pmUserRoles,
+           
+            var editPm =await _pmUserCommandService.Edit(new EditPmUserDto(command.Fullname, command.Username, command.Mobile, account.id, pmUserRoles,
                 command.IsProgramManagerUser));
             if (!editPm.isSuccess)
             {
                 _unitOfWork.RollbackAccountContext();
                 return operation.Failed("خطا در ویرایش کاربر پروگرام منیجر");
             }
-
+ 
             //var parameters = new EditUserCommand(
             //    command.Fullname,
             //    command.Username,
@@ -309,6 +298,7 @@ public class AccountApplication : IAccountApplication
             //    _unitOfWork.RollbackAccountContext();
             //    return operation.Failed(response.Error);
             //}
+
         }
         else //اگر کاربر قبلا ایجاد نشده
         {
@@ -321,15 +311,19 @@ public class AccountApplication : IAccountApplication
                     return operation.Failed("حداقل یک نقش باید انتخاب شود");
                 }
 
+             
 
-                var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname,
-                    command.Username, account.Password, command.Mobile,
+                
+
+               
+                var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname, command.Username, account.Password, command.Mobile,
                     null, account.id, pmUserRoles));
                 if (!createPm.isSuccess)
                 {
                     _unitOfWork.RollbackAccountContext();
                     return operation.Failed("خطا در ویرایش کاربر پروگرام منیجر");
                 }
+              
 
 
                 //var parameters = new CreateProgramManagerUser(
@@ -364,6 +358,7 @@ public class AccountApplication : IAccountApplication
                 //    return operation.Failed(response.Error);
                 //}
             }
+
         }
 
         _unitOfWork.CommitAccountContext();
@@ -377,6 +372,7 @@ public class AccountApplication : IAccountApplication
 
     public OperationResult Login(Login command)
     {
+
         long idAutoriz = 0;
         var operation = new OperationResult();
         if (string.IsNullOrWhiteSpace(command.Password))
@@ -400,29 +396,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,25 +405,24 @@ public class AccountApplication : IAccountApplication
             {
                 positionValue = null;
             }
-
+            var pmUserId = _pmUserQueryService.GetCurrentPmUserIdFromAccountId(account.id).GetAwaiter().GetResult();
             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);
+                permissions, account.RoleName, account.AdminAreaPermission, 
+                account.ClientAriaPermission, positionValue,0,pmUserId);
 
             if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" &&
                 account.IsActiveString == "true")
             {
                 var clientPermissions = _accountPermissionSubtitle1Repository.GetAllPermissionCodes();
                 authViewModel.Permissions = clientPermissions;
-                var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x =>
-                    new WorkshopClaim
-                    {
-                        PersonnelCount = x.PersonnelCount,
-                        Id = x.Id,
-                        Name = x.WorkshopFullName,
-                        Slug = _passwordHasher.SlugHasher(x.Id)
-                    }).OrderByDescending(x => x.PersonnelCount).ToList();
+                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())
                 {
@@ -463,14 +435,10 @@ public class AccountApplication : IAccountApplication
 
             _authHelper.Signin(authViewModel);
 
-            if ((account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" &&
-                 account.IsActiveString == "true") || (account.AdminAreaPermission == "true" &&
-                                                       account.ClientAriaPermission == "false" &&
-                                                       account.IsActiveString == "true"))
+            if ((account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" && account.IsActiveString == "true") || (account.AdminAreaPermission == "true" && account.ClientAriaPermission == "false" && account.IsActiveString == "true"))
                 idAutoriz = 1;
 
-            if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" &&
-                account.IsActiveString == "true")
+            if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" && account.IsActiveString == "true")
                 idAutoriz = 2;
         }
 
@@ -482,8 +450,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,6 +460,7 @@ public class AccountApplication : IAccountApplication
             {
                 idAutoriz = 0;
             }
+
         }
 
         if (subAccount != null)
@@ -522,14 +490,12 @@ public class AccountApplication : IAccountApplication
                 authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.WorkshopId);
                 authViewModel.WorkshopId = workshop.WorkshopId;
             }
-
             _authHelper.Signin(authViewModel);
             idAutoriz = 2;
         }
 
         return operation.Succcedded(idAutoriz);
     }
-
     public OperationResult LoginWithMobile(long id)
     {
         var operation = new OperationResult();
@@ -538,6 +504,7 @@ public class AccountApplication : IAccountApplication
             return operation.Failed(ApplicationMessages.WrongUserPass);
 
 
+
         var permissions = _roleRepository.Get(account.RoleId)
             .Permissions
             .Select(x => x.Code)
@@ -553,22 +520,20 @@ 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();
+            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())
             {
@@ -581,15 +546,13 @@ public class AccountApplication : IAccountApplication
 
         _authHelper.Signin(authViewModel);
         long idAutoriz = 0;
-        if (account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" ||
-            account.AdminAreaPermission == "true" && account.ClientAriaPermission == "false")
+        if (account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" || account.AdminAreaPermission == "true" && account.ClientAriaPermission == "false")
             idAutoriz = 1;
 
         if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false")
             idAutoriz = 2;
         return operation.Succcedded(idAutoriz);
     }
-
     public void Logout()
     {
         _authHelper.SignOut();
@@ -625,7 +588,6 @@ public class AccountApplication : IAccountApplication
         _accountRepository.SaveChanges();
         return operation.Succcedded();
     }
-
     public EditAccount GetByVerifyCode(string code, string phone)
     {
         return _accountRepository.GetByVerifyCode(code, phone);
@@ -654,6 +616,7 @@ public class AccountApplication : IAccountApplication
         await _accountRepository.RemoveCode(id);
 
         return operation.Succcedded();
+
     }
 
 
@@ -698,6 +661,7 @@ public class AccountApplication : IAccountApplication
             return operation.Failed("این اکانت وجود ندارد");
 
 
+
         var permissions = _roleRepository.Get(account.RoleId)
             .Permissions
             .Select(x => x.Code)
@@ -706,8 +670,7 @@ public class AccountApplication : IAccountApplication
 
         _authHelper.SignOut();
         var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
-            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, "false", "true",
-            null);
+            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, "false", "true", null);
         var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x => new WorkshopClaim
         {
             PersonnelCount = x.PersonnelCount,
@@ -727,11 +690,9 @@ public class AccountApplication : IAccountApplication
             authViewModel.WorkshopName = workshop.Name;
             authViewModel.WorkshopId = workshop.Id;
         }
-
         _authHelper.Signin(authViewModel);
         return operation.Succcedded(2);
     }
-
     public OperationResult DirectCameraLogin(long cameraAccountId)
     {
         var prAcc = _authHelper.CurrentAccountInfo();
@@ -741,45 +702,47 @@ public class AccountApplication : IAccountApplication
             return operation.Failed("این اکانت وجود ندارد");
 
 
+
+
+
         _authHelper.SignOut();
 
 
         var mobile = string.IsNullOrWhiteSpace(cameraAccount.Mobile) ? " " : cameraAccount.Mobile;
         var authViewModel = new CameraAuthViewModel(cameraAccount.id, cameraAccount.WorkshopId,
-            cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId,
-            cameraAccount.IsActiveSting);
+            cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId, cameraAccount.IsActiveSting);
         if (cameraAccount.IsActiveSting == "true")
         {
             _authHelper.CameraSignIn(authViewModel);
+
         }
         else
         {
             return operation.Failed("این اکانت غیر فعال شده است");
         }
-
         return operation.Succcedded(2);
     }
 
 
-    // public AccountLeftWorkViewModel WorkshopList(long accountId)
-    // {
-    //     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 +752,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 +769,6 @@ public class AccountApplication : IAccountApplication
         {
             return new List<AccountViewModel>();
         }
-
         return _accountRepository.GetAccountsByPositionId(positionId);
     }
 
@@ -826,6 +786,7 @@ public class AccountApplication : IAccountApplication
             return operation.Failed("این اکانت وجود ندارد");
 
 
+
         var permissions = _roleRepository.Get(account.RoleId)
             .Permissions
             .Select(x => x.Code)
@@ -834,10 +795,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,11 +807,8 @@ 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();
 
@@ -868,8 +826,7 @@ public class AccountApplication : IAccountApplication
                 return op.Failed("رمز عبور نمی تواند کمتر از 8 کاراکتر باشد");
         }
 
-        if ((string.IsNullOrWhiteSpace(phoneNumber) || entity.Mobile == phoneNumber) &&
-            string.IsNullOrWhiteSpace(rePassword))
+        if ((string.IsNullOrWhiteSpace(phoneNumber) || entity.Mobile == phoneNumber) && string.IsNullOrWhiteSpace(rePassword))
             return op.Failed("چیزی برای تغییر وجود ندارد");
 
 
@@ -895,22 +852,20 @@ public class AccountApplication : IAccountApplication
         var entity = _accountRepository.Get(command.AccountId);
         if (entity == null)
             return op.Failed(ApplicationMessages.RecordNotFound);
-        var validationResult = IsPhoneNumberAndPasswordValid(command.AccountId, command.PhoneNumber, command.Password,
-            command.RePassword);
+        var validationResult = IsPhoneNumberAndPasswordValid(command.AccountId, command.PhoneNumber, command.Password, command.RePassword);
         if (validationResult.IsSuccedded == false)
             return validationResult;
 
         if (!string.IsNullOrWhiteSpace(command.RePassword))
         {
+
             entity.ChangePassword(_passwordHasher.Hash(command.Password));
         }
 
         if (!string.IsNullOrWhiteSpace(command.PhoneNumber))
         {
-            entity.Edit(entity.Fullname, entity.Username, command.PhoneNumber, entity.RoleId, entity.ProfilePhoto,
-                entity.RoleName);
+            entity.Edit(entity.Fullname, entity.Username, command.PhoneNumber, entity.RoleId, entity.ProfilePhoto, entity.RoleName);
         }
-
         _accountRepository.SaveChanges();
         return op.Succcedded();
     }
@@ -1006,7 +961,6 @@ public class AccountApplication : IAccountApplication
 
     //    return claimsResponse.Failed(ApplicationMessages.WrongUserPass);
     //}
-
     #endregion
 
 

AccountManagement.Application/TaskApplication.cs

@@ -940,7 +940,7 @@ public class TaskApplication : ITaskApplication
         var operation = new OperationResult();
         if ((mediaFile.Length > 50000000))
             return operation.Failed("حجم فایل نمیتواند از 50 مگابایت بیشتر باشد");
-        var path = Path.Combine("Storage",
+        var path = Path.Combine($"{_taskRepository.GetWebEnvironmentPath()}", "Storage",
             "temp", $"{senderId}");
         Directory.CreateDirectory(path);
 

AccountManagement.Application/TicketApplication.cs

@@ -448,7 +448,7 @@ public class TicketApplication : ITicketApplication
         var operation = new OperationResult();
         if ((mediaFile.Length > 50000000) || (mediaFile.Length > 50000000) || (mediaFile.Length > 50000000))
             return operation.Failed("حجم فایل نمیتواند از 50 مگابایت بیشتر باشد");
-        var path = Path.Combine("Storage",
+        var path = Path.Combine($"{_taskRepository.GetWebEnvironmentPath()}", "Storage",
             "temp", $"{senderId}");
         Directory.CreateDirectory(path);
 

AccountManagement.Domain/AccountLeftWorkAgg/IAccountLeftworkRepository.cs

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

AccountMangement.Infrastructure.EFCore/Repository/AccountLeftworkRepository.cs

@@ -18,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)
     {

AccountMangement.Infrastructure.EFCore/Repository/MediaRepository.cs

@@ -26,7 +26,7 @@ public class MediaRepository : RepositoryBase<long, Media>, IMediaRepository
     public MediaRepository(AccountContext taskManagerContext, IWebHostEnvironment webHostEnvironment) : base(taskManagerContext)
     {
         _accountContext = taskManagerContext;
-        BasePath = "Storage";
+        BasePath = webHostEnvironment.ContentRootPath + "/Storage";
     }
     //ساخت جدول واسط بین مدیا و نسک
     //نکته: این متد ذخیره انجام نمیدهد

BUG_REPORT_SYSTEM.md

@@ -0,0 +1,175 @@
+# سیستم گزارش خرابی (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

@@ -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": {

CHANGELOG.md

@@ -0,0 +1,314 @@
+# خلاصه تغییرات سیستم گزارش خرابی
+
+## 📝 فایل‌های اضافه شده (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 اجرا شده است
+

CONFIGURATION_SUMMARY.md

@@ -1,248 +0,0 @@
-# ✅ Docker Bind Mounts Configuration - Summary
-
-## What Was Changed
-
-### 1. docker-compose.yml
-**Before:**
-```yaml
-volumes:
-  - ./ServiceHost/certs:/app/certs:ro
-  - app_storage:/app/Storage      # ❌ Docker volume
-  - app_logs:/app/Logs             # ❌ Docker volume
-
-volumes:
-  app_storage:
-    driver: local
-  app_logs:
-    driver: local
-```
-
-**After:**
-```yaml
-volumes:
-  # ✅ Bind mounts for production-critical data on Windows host
-  - ./ServiceHost/certs:/app/certs:ro
-  - D:/AppData/Faces:/app/Faces
-  - D:/AppData/Storage:/app/Storage
-  - D:/AppData/Logs:/app/Logs
-
-# ✅ No volumes section needed
-```
-
-### 2. New Files Created
-- `DOCKER_BIND_MOUNTS_SETUP.md` - Complete documentation
-- `setup-bind-mounts.ps1` - Automated setup script
-- `QUICK_REFERENCE.md` - Quick command reference
-
-## Path Mapping
-
-| Container (Linux paths) | Windows Host (forward slash) | Actual Windows Path |
-|-------------------------|------------------------------|---------------------|
-| `/app/Faces`            | `D:/AppData/Faces`           | `D:\AppData\Faces`  |
-| `/app/Storage`          | `D:/AppData/Storage`         | `D:\AppData\Storage`|
-| `/app/Logs`             | `D:/AppData/Logs`            | `D:\AppData\Logs`   |
-
-**Note:** Docker Compose on Windows accepts both `D:/` and `D:\` but prefers forward slashes.
-
-## Application Code Compatibility
-
-Your application uses:
-```csharp
-Path.Combine(env.ContentRootPath, "Faces");    // → /app/Faces
-Path.Combine(env.ContentRootPath, "Storage");  // → /app/Storage
-```
-
-Where `env.ContentRootPath` = `/app` in the container.
-
-✅ **No code changes required!** The bind mounts map directly to these paths.
-
-## Setup Instructions
-
-### Option 1: Automated Setup (Recommended)
-```powershell
-# Navigate to project directory
-cd D:\GozareshgirOrginal\OriginalGozareshgir
-
-# Run setup script with permissions
-.\setup-bind-mounts.ps1 -GrantFullPermissions
-
-# Start the application
-docker-compose up -d
-```
-
-### Option 2: Manual Setup
-```powershell
-# 1. Create directories
-New-Item -ItemType Directory -Force -Path "D:\AppData\Faces"
-New-Item -ItemType Directory -Force -Path "D:\AppData\Storage"
-New-Item -ItemType Directory -Force -Path "D:\AppData\Logs"
-
-# 2. Grant permissions
-icacls "D:\AppData\Faces" /grant Everyone:F /T
-icacls "D:\AppData\Storage" /grant Everyone:F /T
-icacls "D:\AppData\Logs" /grant Everyone:F /T
-
-# 3. Start the application
-docker-compose up -d
-```
-
-## Verification Checklist
-
-After starting the container:
-
-1. **Check if directories are mounted:**
-   ```powershell
-   docker exec gozareshgir-servicehost ls -la /app
-   ```
-   Should show: `Faces/`, `Storage/`, `Logs/`
-
-2. **Test write access from container:**
-   ```powershell
-   docker exec gozareshgir-servicehost sh -c "echo 'test' > /app/Storage/test.txt"
-   Get-Content D:\AppData\Storage\test.txt  # Should display: test
-   Remove-Item D:\AppData\Storage\test.txt
-   ```
-
-3. **Test write access from host:**
-   ```powershell
-   "test from host" | Out-File "D:\AppData\Storage\host-test.txt"
-   docker exec gozareshgir-servicehost cat /app/Storage/host-test.txt
-   Remove-Item D:\AppData\Storage\host-test.txt
-   ```
-
-4. **Check application logs:**
-   ```powershell
-   docker logs gozareshgir-servicehost --tail 50
-   # Or directly on host:
-   Get-Content D:\AppData\Logs\gozareshgir_log.txt -Tail 50
-   ```
-
-## Data Persistence Guarantees
-
-✅ **Files persist through:**
-- `docker-compose down`
-- `docker-compose restart`
-- Container removal (`docker rm`)
-- Image rebuilds (`docker-compose build`)
-- Server reboots (with `restart: unless-stopped`)
-
-✅ **Direct access:**
-- Files can be accessed from Windows Explorer at `D:\AppData\*`
-- Can be backed up using Windows Backup, robocopy, or any backup software
-- Can be edited directly on the host (changes visible in container immediately)
-
-⚠️ **Data does NOT survive:**
-- Deleting the host directories (`D:\AppData\*`)
-- Formatting the D: drive
-- Without regular backups, hardware failures
-
-## Production Checklist
-
-Before deploying to production:
-
-- [ ] Run `setup-bind-mounts.ps1 -GrantFullPermissions`
-- [ ] Verify disk space on D: drive (at least 50 GB recommended)
-- [ ] Set up scheduled backups (see `DOCKER_BIND_MOUNTS_SETUP.md`)
-- [ ] Replace `Everyone` with specific service account for permissions
-- [ ] Enable NTFS encryption for sensitive data (optional)
-- [ ] Test container restart: `docker-compose restart`
-- [ ] Test data persistence: Create a test file, restart container, verify file exists
-- [ ] Configure monitoring for disk space usage
-
-## Security Recommendations
-
-1. **Restrict permissions** (production):
-   ```powershell
-   # Replace Everyone with specific account
-   icacls "D:\AppData\Faces" /grant "DOMAIN\ServiceAccount:(OI)(CI)F" /T
-   icacls "D:\AppData\Storage" /grant "DOMAIN\ServiceAccount:(OI)(CI)F" /T
-   icacls "D:\AppData\Logs" /grant "DOMAIN\ServiceAccount:(OI)(CI)F" /T
-   ```
-
-2. **Enable encryption** for sensitive data:
-   ```powershell
-   cipher /e "D:\AppData\Faces"
-   cipher /e "D:\AppData\Storage"
-   ```
-
-3. **Set up audit logging:**
-   ```powershell
-   auditpol /set /subcategory:"File System" /success:enable /failure:enable
-   ```
-
-## Backup Strategy
-
-### Scheduled Backup (Recommended)
-```powershell
-# Create daily backup at 2 AM
-$action = New-ScheduledTaskAction -Execute "robocopy" -Argument '"D:\AppData" "D:\Backups\AppData" /MIR /Z /LOG:"D:\Backups\backup.log"'
-$trigger = New-ScheduledTaskTrigger -Daily -At 2am
-Register-ScheduledTask -Action $action -Trigger $trigger -TaskName "GozareshgirBackup" -Description "Daily backup of Gozareshgir data"
-```
-
-### Manual Backup
-```powershell
-$timestamp = Get-Date -Format "yyyyMMdd_HHmmss"
-robocopy "D:\AppData" "D:\Backups\AppData_$timestamp" /MIR /Z
-```
-
-## Troubleshooting
-
-### Issue: Container starts but files not appearing
-**Solution:**
-```powershell
-# Check mount points
-docker inspect gozareshgir-servicehost --format='{{json .Mounts}}' | ConvertFrom-Json
-
-# Verify directories exist
-Test-Path D:\AppData\Faces
-Test-Path D:\AppData\Storage
-Test-Path D:\AppData\Logs
-```
-
-### Issue: Permission denied errors
-**Solution:**
-```powershell
-# Re-grant permissions
-icacls "D:\AppData\Faces" /grant Everyone:F /T
-icacls "D:\AppData\Storage" /grant Everyone:F /T
-icacls "D:\AppData\Logs" /grant Everyone:F /T
-```
-
-### Issue: Out of disk space
-**Solution:**
-```powershell
-# Check disk usage
-Get-ChildItem D:\AppData -Recurse | Measure-Object -Property Length -Sum
-
-# Clean old log files (example: older than 30 days)
-Get-ChildItem D:\AppData\Logs -Recurse -File | Where-Object {$_.LastWriteTime -lt (Get-Date).AddDays(-30)} | Remove-Item
-```
-
-## Support & Documentation
-
-- **Full Documentation:** `DOCKER_BIND_MOUNTS_SETUP.md`
-- **Quick Reference:** `QUICK_REFERENCE.md`
-- **Setup Script:** `setup-bind-mounts.ps1`
-
-## Migration from Docker Volumes (If applicable)
-
-If you previously used Docker volumes, migrate the data:
-
-```powershell
-# 1. Stop the container
-docker-compose down
-
-# 2. Copy data from old volumes to host
-docker run --rm -v old_volume_name:/source -v D:/AppData/Storage:/dest alpine cp -av /source/. /dest/
-
-# 3. Start with new bind mounts
-docker-compose up -d
-```
-
----
-
-**Configuration Date:** January 2026  
-**Tested On:** Windows Server 2019/2022 with Docker Desktop  
-**Status:** ✅ Production Ready
-

Company.Domain/BankAgg/IBankRepository.cs

@@ -8,6 +8,5 @@ namespace Company.Domain.BankAgg
 	{
 		public void Remove(Bank entity);
 		List<BankViewModel> Search(string name);
-		List<BankSelectList> GetBanksForSelectList();
 	}
 }

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/ICheckoutRepository.cs

@@ -1,12 +1,9 @@
-using _0_Framework.Application;
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.Checkout;
-using CompanyManagment.App.Contracts.Checkout.Dto;
-using CompanyManagment.App.Contracts.Leave;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using CompanyManagment.App.Contracts.Checkout.ClientDto;
+using _0_Framework.Application;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.Checkout;
 
 
 namespace Company.Domain.CheckoutAgg;
@@ -25,7 +22,7 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
         string year, string month);
     EditCheckout GetDetails(long id);
 
-    Task<bool> CreateCheckout(Checkout command);
+    Task CreateCkeckout(Checkout command);
     /// <summary>
     /// لود لیست اولیه جهت ایجاد فیش حقوقی
     /// </summary>
@@ -83,82 +80,4 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
     #endregion
 
     Task<Checkout> GetByWorkshopIdEmployeeIdInDate(long workshopId, long employeeId, DateTime inDate);
-
-
-
-    #region ForApi
-    /// <summary>
-    /// دریافت سلکت لیست پرسنل کارگاه
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    Task<List<EmployeeSelectListDto>> GetEmployeeSelectListByWorkshopId(long id);
-
-    /// <summary>
-    /// دریافت لیست فیش حقوقی
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<PagedResult<CheckoutDto>> GetList(CheckoutSearchModelDto searchModel);
-
-
-    /// <summary>
-    /// پرینت فیش حقوقی
-    /// Api
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <returns></returns>
-    Task<List<CheckoutPrintDto>> CheckoutPrint(List<long> ids);
-
-    /// <summary>
-    /// دریافت قردادها و جداول وابسته برای ایجاد فیش
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <param name="year"></param>
-    /// <param name="month"></param>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    Task<OperationResult<GetContractAndIncludesDataToCreateDto>> GetContractsAndIncludeDataDataToCreateCheckout(
-        List<long> ids, string year, string month, long workshopId);
-
-    /// <summary>
-    /// حذف گروهی یا تکی فیش حقوقی
-    /// Api
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <returns></returns>
-    Task<OperationResult> GroupDeleteCheckoutApi(List<long> ids);
-
-    /// <summary>
-    /// امضاء تکی یا گروهی فیش حقوقی
-    /// Api
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <returns></returns>
-    Task<OperationResult> SignCheckoutApi(List<long> ids);
-
-
-    /// <summary>
-    /// حذف امضاء تکی یا گروهی فیش حقوقی
-    /// Api
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <returns></returns>
-    Task<OperationResult> UnSignCheckoutApi(List<long> ids);
-
-    /// <summary>
-    /// پرینت مرخصی برای فیش حقوقی
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    Task<OperationResult<List<LeavePrintForCheckoutDto>>> LeavePrintForCheckout(long id);
-
-    #endregion
-
-
-    #region ClientApi
-
-    Task<PagedResult<CheckoutListClientDto>> GetListForClient(long workshopId, CheckoutListClientSearchModel searchModel);
-
-    #endregion
 }

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/ClassificationSchemeAgg/ClassificationEmployee.cs

@@ -1,93 +0,0 @@
-using _0_Framework.Domain;
-using System;
-
-namespace Company.Domain.ClassificationSchemeAgg;
-
-public class ClassificationEmployee : EntityBase
-{
-    /// <summary>
-    /// ایجاد پرسنل طرح
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="classificationSchemeId"></param>
-    /// <param name="classificationGroupId"></param>
-    /// <param name="classificationGroupJobId"></param>
-    /// <param name="startGroupDate"></param>
-    /// <param name="endGroupDate"></param>
-    public ClassificationEmployee(long workshopId, long employeeId, long classificationSchemeId, long classificationGroupId, long classificationGroupJobId, DateTime? startGroupDate)
-    {
-        WorkshopId = workshopId;
-        EmployeeId = employeeId;
-        ClassificationSchemeId = classificationSchemeId;
-        ClassificationGroupId = classificationGroupId;
-        ClassificationGroupJobId = classificationGroupJobId;
-        StartGroupDate = startGroupDate;
-
-    }
-
-    /// <summary>
-    /// آی دی کارگاه
-    /// </summary>
-    public long WorkshopId { get; private set; }
-
-    /// <summary>
-    /// آی دی پرسنل
-    /// </summary>
-    public long EmployeeId { get; private set; }
-
-    /// <summary>
-    /// آی دی طرح
-    /// </summary>
-    public long ClassificationSchemeId { get; private set; }
-
-    /// <summary>
-    /// آی دی گروه
-    /// </summary>
-    public long ClassificationGroupId { get; private set; }
-
-    /// <summary>
-    /// آی دی شغل
-    /// </summary>
-    public long ClassificationGroupJobId { get; private set; }
-
-
-    /// <summary>
-    ///  تاریخ شروع استفاده از گروه
-    /// </summary>
-    public DateTime? StartGroupDate{ get; private set; }
-
-    /// <summary>
-    /// تاریخ پایان استفاده از گروه
-    /// </summary>
-    public DateTime? EndGroupDate { get; private set; }
-
-    public ClassificationGroup ClassificationGroup { get; set; }
-
-    /// <summary>
-    /// ویرایش پرسنل طرح
-    /// </summary>
-    /// <param name="classificationGroupId"></param>
-    /// <param name="classificationGroupJobId"></param>
-    public void Edit(long classificationGroupId, long classificationGroupJobId)
-    {
-        ClassificationGroupId = classificationGroupId;
-        ClassificationGroupJobId = classificationGroupJobId;
-    }
-
-    /// <summary>
-    /// ویرایش گروه های چندگانه پرسنل طرح
-    /// </summary>
-    /// <param name="classificationGroupId"></param>
-    /// <param name="classificationGroupJobId"></param>
-    /// <param name="startGroupDate"></param>
-    /// <param name="endGroupDate"></param>
-    public void EditMultipleGroupMember(long classificationGroupId, long classificationGroupJobId, DateTime startGroupDate)
-    {
-        ClassificationGroupId = classificationGroupId;
-        ClassificationGroupJobId = classificationGroupJobId;
-        StartGroupDate = startGroupDate;
-     
-    }
-
-}

Company.Domain/ClassificationSchemeAgg/ClassificationGroup.cs

@@ -1,43 +0,0 @@
-using System.Collections.Generic;
-using _0_Framework.Domain;
-
-namespace Company.Domain.ClassificationSchemeAgg;
-
-
-public class ClassificationGroup : EntityBase
-{
-    /// <summary>
-    /// ایجاد گروه های بیست گانه طرح طبقه بندی 
-    /// </summary>
-    /// <param name="groupNo"></param>
-    /// <param name="workshopId"></param>
-    /// <param name="classificationSchemeId"></param>
-    public ClassificationGroup(string groupNo, long workshopId, long classificationSchemeId)
-    {
-        GroupNo = groupNo;
-        WorkshopId = workshopId;
-        ClassificationSchemeId = classificationSchemeId;
-    }
-
-    /// <summary>
-    /// شماره گروه
-    /// </summary>
-    public string GroupNo { get; private set; }
-
-    /// <summary>
-    /// آی دی کارگاه
-    /// </summary>
-    public long WorkshopId { get; private set; }
-    /// <summary>
-    /// آی دی طرح
-    /// </summary>
-    public long ClassificationSchemeId { get; private set; }
-
-    public ClassificationScheme ClassificationScheme { get; set; }
-
-
-    public List<ClassificationGroupJob> ClassificationGroupJobs { get; set; }
-    public List<ClassificationGroupSalary> ClassificationGroupSalaries { get; set; }
-
-    public List<ClassificationEmployee> ClassificationEmployees { get; set; }
-}

Company.Domain/ClassificationSchemeAgg/ClassificationGroupJob.cs

@@ -1,55 +0,0 @@
-using _0_Framework.Domain;
-using _0_Framework_b.Domain;
-
-namespace Company.Domain.ClassificationSchemeAgg;
-
-public class ClassificationGroupJob : EntityBaseWithoutCreationDate
-{
-    /// <summary>
-    /// ایجاد لیست مشغال برای گروه های طرح طبقه بندی
-    /// </summary>
-    /// <param name="jobId"></param>
-    /// <param name="jobName"></param>
-    /// <param name="jobCode"></param>
-    /// <param name="classificationGroupId"></param>
-    /// <param name="groupNo"></param>
-    public ClassificationGroupJob(long jobId, string jobName, string jobCode, long classificationGroupId, string groupNo)
-    {
-        JobId = jobId;
-        JobName = jobName;
-        JobCode = jobCode;
-        ClassificationGroupId = classificationGroupId;
-        GroupNo = groupNo;
-
-    }
-
-    /// <summary>
-    /// آی دی شغل
-    /// </summary>
-    public long JobId { get; private set; }
-
-    /// <summary>
-    /// نام شغل
-    /// </summary>
-    public string JobName { get; private set; }
-  
-    /// <summary>
-    /// کد شغل
-    /// </summary>
-    public string JobCode { get; private set; }
-
-    /// <summary>
-    /// آی دی گروه
-    /// </summary>
-    public long ClassificationGroupId { get; private set; }
-
-    /// <summary>
-    /// شماره گروه
-    /// </summary>
-    public string GroupNo { get; private set; }
-
-
-    public ClassificationGroup ClassificationGroup { get; set; }
-
-
-}

Company.Domain/ClassificationSchemeAgg/ClassificationGroupSalary.cs

@@ -1,82 +0,0 @@
-using _0_Framework.Domain;
-using System;
-
-namespace Company.Domain.ClassificationSchemeAgg;
-
-public class ClassificationGroupSalary : EntityBase
-{
-   
-
-    /// <summary>
-    /// ایجاد دستمزد برای گروه
-    /// </summary>
-    /// <param name="classificationGroupId"></param>
-    /// <param name="groupNo"></param>
-    /// <param name="groupSalary"></param>
-    /// <param name="startDate"></param>
-    /// <param name="endDate"></param>
-    /// <param name="year"></param>
-    public ClassificationGroupSalary(long classificationGroupId, string groupNo, double groupSalary, DateTime startDate, DateTime endDate, int year, long schemeId)
-    {
-        ClassificationGroupId = classificationGroupId;
-        GroupNo = groupNo;
-        GroupSalary = groupSalary;
-        StartDate = startDate;
-        EndDate = endDate;
-        Year = year;
-        SchemeId = schemeId;
-    }
-
-    /// <summary>
-    /// آی دی گروه
-    /// </summary>
-    public long ClassificationGroupId { get; private set; }
-
-    /// <summary>
-    /// شماره گروه
-    /// </summary>
-    public string GroupNo { get; private set; }
-
-    /// <summary>
-    /// دستمزد گروه
-    /// </summary>
-    public double GroupSalary { get; private set; }
-
-
-    /// <summary>
-    /// تاریخ شروع
-    /// </summary>
-    public DateTime StartDate { get; private set; }
-
-    /// <summary>
-    /// تاریخ پایان
-    /// </summary>
-    public DateTime EndDate { get; private set; }
-
-    /// <summary>
-    /// سال
-    /// </summary>
-    public int Year { get; private set; }
-
-    public long SchemeId { get; private set; }
-
-
-    public ClassificationGroup ClassificationGroup { get; set; }
-
-    /// <summary>
-    /// ویرایش دستمزد گروه
-    /// </summary>
-
-    /// <param name="groupSalary"></param>
-    /// <param name="startDate"></param>
-    /// <param name="endDate"></param>
-    /// <param name="year"></param>
-    public void Edit(double groupSalary, DateTime startDate, DateTime endDate, int year)
-    {
-
-        GroupSalary = groupSalary;
-        StartDate = startDate;
-        EndDate = endDate;
-        Year = year;
-    }
-}

Company.Domain/ClassificationSchemeAgg/ClassificationRialCoefficient.cs

@@ -1,68 +0,0 @@
-using System;
-using _0_Framework.Domain;
-
-namespace Company.Domain.ClassificationSchemeAgg;
-
-public class ClassificationRialCoefficient : EntityBaseWithoutCreationDate
-{
-    /// <summary>
-    /// ایچاد ضریب ریالی
-    /// </summary>
-    /// <param name="classificationSchemeId"></param>
-    /// <param name="rialCoefficient"></param>
-    /// <param name="startDate"></param>
-    /// <param name="endDate"></param>
-    /// <param name="year"></param>
-    public ClassificationRialCoefficient(long classificationSchemeId, double rialCoefficient, DateTime startDate, DateTime endDate, int year)
-    {
-        ClassificationSchemeId = classificationSchemeId;
-        RialCoefficient = rialCoefficient;
-        StartDate = startDate;
-        EndDate = endDate;
-        Year = year;
-    }
-
-    //آی دی طرح
-    public long ClassificationSchemeId { get; private set; }
-
-    /// <summary>
-    /// ضریب ریالی
-    /// </summary>
-    public double RialCoefficient { get; private set; }
-
-    /// <summary>
-    /// تاریخ شروع
-    /// </summary>
-    public DateTime StartDate { get; private set; }
-
-    /// <summary>
-    /// تاریخ پایان
-    /// </summary>
-    public DateTime EndDate { get; private set; }
-
-    /// <summary>
-    /// سال
-    /// </summary>
-    public int Year { get; private set; }
-
-
-    public ClassificationScheme ClassificationScheme { get; set; }
-
-    /// <summary>
-    /// ویرایش ضریب ریالی
-    /// </summary>
-    /// <param name="classificationSchemeId"></param>
-    /// <param name="rialCoefficient"></param>
-    /// <param name="startDate"></param>
-    /// <param name="endDate"></param>
-    /// <param name="year"></param>
-    public void Edit(double rialCoefficient, DateTime startDate, DateTime endDate, int year)
-    {
-
-        RialCoefficient = rialCoefficient;
-        StartDate = startDate;
-        EndDate = endDate;
-        Year = year;
-    }
-
-}

Company.Domain/ClassificationSchemeAgg/ClassificationScheme.cs

@@ -1,88 +0,0 @@
-using System;
-using System.Collections.Generic;
-using _0_Framework.Application.Enums;
-using _0_Framework.Domain;
-
-namespace Company.Domain.ClassificationSchemeAgg;
-
-public class ClassificationScheme : EntityBase
-{
-    ///  <summary>
-    /// ایجاد طرح طبقه بندی مشاغل 
-    ///  </summary>
-    ///  <param name="includingDateGr"></param>
-    ///  <param name="executionDateGr"></param>
-    ///  <param name="designerFullName"></param>
-    ///  <param name="designerPhone"></param>
-    ///  <param name="workshopId"></param>
-    ///  <param name="typeOfCoefficient"></param>
-    public ClassificationScheme(DateTime includingDateGr, DateTime executionDateGr, string designerFullName, string designerPhone, long workshopId, TypeOfCoefficient typeOfCoefficient)
-    {
-        IncludingDateGr = includingDateGr;
-        ExecutionDateGr = executionDateGr;
-        DesignerFullName = designerFullName;
-        DesignerPhone = designerPhone;
-        WorkshopId = workshopId;
-        TypeOfCoefficient = typeOfCoefficient;
-    }
-
-    /// <summary>
-    /// تاریخ شمول طرح
-    /// </summary>
-    public DateTime IncludingDateGr { get; private set; }
-
-    /// <summary>
-    /// تاریخ اجرای طرح
-    /// </summary>
-    public DateTime ExecutionDateGr { get; private set; }
-
-    /// <summary>
-    /// تاریخ پایان طرح
-    /// </summary>
-    public DateTime? EndSchemeDateGr { get; private set; }
-
-
-    /// <summary>
-    /// نام کامل طراح
-    /// </summary>
-    public string DesignerFullName { get; private set; }
-
-    /// <summary>
-    /// شماره همراه طراح
-    /// </summary>
-    public string DesignerPhone { get; private set; }
-
-    /// <summary>
-    /// آی دی کارگاه
-    /// </summary>
-    public long WorkshopId { get; private set; }
-
-
-    /// <summary>
-    /// نوع ضریب
-    /// </summary>
-    public TypeOfCoefficient TypeOfCoefficient { get; private set; }
-
-
-    public List<ClassificationGroup> ClassificationGroups { get; set; }
-
-    public List<ClassificationRialCoefficient> ClassificationRialCoefficients { get; set; }
-
-    /// <summary>
-    /// ویرایش طرح
-    /// </summary>
-    /// <param name="includingDateGr"></param>
-    /// <param name="executionDateGr"></param>
-    /// <param name="designerFullName"></param>
-    /// <param name="designerPhone"></param>
-    /// <param name="workshopId"></param>
-    public void Edit(DateTime includingDateGr, DateTime executionDateGr,string designerFullName, string designerPhone, TypeOfCoefficient typeOfCoefficient)
-    {
-        IncludingDateGr = includingDateGr;
-        ExecutionDateGr = executionDateGr;
-        DesignerFullName = designerFullName;
-        DesignerPhone = designerPhone;
-        TypeOfCoefficient = typeOfCoefficient;
-
-    }
-}

Company.Domain/ClassificationSchemeAgg/IClassificationEmployeeRepository.cs

@@ -1,42 +0,0 @@
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.ClassificationScheme;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Company.Domain.ClassificationSchemeAgg;
-
-public interface IClassificationEmployeeRepository : IRepository<long, ClassificationEmployee>
-{
-    /// <summary>
-    /// دریافت لیست پرسنل کارگاه
-    /// تب افزودن پرسنل
-    /// </summary>
-    /// <param name="schemeId"></param>
-    /// <returns></returns>
-    Task<List<EmployeeInfoList>> GetEmployeeListData(long schemeId);
-
-
-    /// <summary>
-    ///  دریافت اطلاعات عضویتی پرسنل در گروه
-    /// </summary>
-    /// <param name="employeeId"></param>
-    /// <returns></returns>
-    Task<List<EditEmployeeGroupList>> GetEmployeeMemberizeData(long employeeId);
-
-    /// <summary>
-    /// ذخیره انتقال پرسنل به گره های دیگر
-    ///بصورت گروهی
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    Task CreateTransferRange(List<ClassificationEmployee> command);
-
-
-    /// <summary>
-    /// حذف پرسنل از گروه از سمت ویرایش
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    Task RemoveRangeByEdit(List<ClassificationEmployee> command);
-
-}

Company.Domain/ClassificationSchemeAgg/IClassificationGroupRepository.cs

@@ -1,89 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.ClassificationScheme;
-
-namespace Company.Domain.ClassificationSchemeAgg;
-
-public interface IClassificationGroupRepository : IRepository<long, ClassificationGroup>
-{
-    /// <summary>
-    /// دریافت گروه های طرح
-    /// </summary>
-    /// <param name="schemeId"></param>
-    /// <returns></returns>
-    Task<List<ClassificationGroupList>> GetGroups(long schemeId);
-
-    /// <summary>
-    /// دریافت گروه ها و مشاغلشان برای تب تعیین مشاغل
-    /// </summary>
-    /// <param name="schemeId"></param>
-    /// <returns></returns>
-    Task<List<ClassificationGroupAndJobModel>> GetGroupAndJobs(long schemeId);
-
-    /// <summary>
-    /// دریافت لیست گروه ها
-    /// </summary>
-    /// <param name="schemeId"></param>
-    /// <returns></returns>
-    Task<List<GetGroupAndJobSchemeListDto>> GetGroupList(long schemeId);
-
-    /// <summary>
-    /// دریافت لیست مشاغل برای مودال ایجاد و ویرایش
-    /// </summary>
-    /// <param name="groupId"></param>
-    /// <returns></returns>
-    Task<AddOrEditJobInGroupDto> GetCreateOrEditJobsData(long groupId);
-
-    /// <summary>
-    /// چک میکند که آی پرسنلی وجود دارد که این شغل به او نسبت داده شده
-    /// </summary>
-    /// <param name="jobId"></param>
-    /// <param name="groupId"></param>
-    /// <returns></returns>
-    Task<bool> CheckIfEmployeeHasThisJob(long jobId, long groupId);
-
-    /// <summary>
-    /// ذخیر ایجاد یا ویرایش مشاغل در گروه
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    Task<bool> SaveJobsToGroup(AddOrEditJobInGroupDto command);
-
-        /// <summary>
-        /// دریافت مشاغل گروه توسط آی دی گروه
-        /// </summary>
-        /// <param name="groupId"></param>
-        /// <returns></returns>
-        Task<List<EditClassificationGroupJob>> GetGroupJobs(long groupId);
-
-    /// <summary>
-    /// چک میکند که آی پرسنلی وجود دارد که این شغل به او نسبت داده شده
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="groupId"></param>
-    /// <returns></returns>
-    Task<bool> CheckEmployeeHasThisJob(long id, long groupId);
-
-    /// <summary>
-    /// ایجاد مشاغل
-    /// </summary>
-    /// <param name="createClassificationGroupJob"></param>
-    /// <param name="deleteJobList"></param>
-    /// <returns></returns>
-    Task<bool> CreateJobs(List<ClassificationGroupJob> createClassificationGroupJob, List<long> deleteJobList);
-
-
-    /// <summary>
-    /// در یافت اطلاعات گروه برای لود مودال ایجاد دستمزد های
-    /// </summary>
-    /// <returns></returns>
-    Task<SalaryAndRialCoefficientModel> GetGroupToCreateSalariesModal(long schemeId);
-
-    /// <summary>
-    /// ایجاد گروه های بیست گانه
-    /// </summary>
-    /// <param name="groupList"></param>
-    /// <returns></returns>
-    Task CreateGroups(List<ClassificationGroup> groupList);
-}

Company.Domain/ClassificationSchemeAgg/IClassificationGroupSalariesRepository.cs

@@ -1,45 +0,0 @@
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.ClassificationScheme;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Company.Domain.ClassificationSchemeAgg;
-
-public interface IClassificationGroupSalariesRepository : IRepository<long, ClassificationGroupSalary>
-{
-    /// <summary>
-    /// ایجاد دستمزدهای گروه ها
-    /// </summary>
-    /// <param name="createClassificationGroupSalary"></param>
-    /// <returns></returns>
-    Task CreateSalaries(List<ClassificationGroupSalary> createClassificationGroupSalary);
-
-
-    /// <summary>
-    /// دریافت دستمزدها و ضریب ریالی برای مودال ویرایش
-    /// </summary>
-    /// <param name="schemeId"></param>
-    /// <param name="startDate"></param>
-    /// <param name="endDate"></param>
-    /// <returns></returns>
-    Task<SalaryAndRialCoefficientModel> GetEditSalariesData(long schemeId, string startDate, string endDate);
-
-    /// <summary>
-    /// لیست دستمزدها بر اساس تاریخ و سال برای تب دستمزدها
-    /// </summary>
-    /// <param name="schemeId"></param>
-    /// <returns></returns>
-    Task<SalaryAndRialCoefficientTab> GetSalariesTabData(long schemeId);
-
-
-    #region ForApi
-    /// <summary>
-    /// لیست دستمزدها بر اساس تاریخ و سال برای تب دستمزدها
-    /// </summary>
-    /// <param name="schemeId"></param>
-    /// <returns></returns>
-    Task<List<SalaryAndRialCoefficientTabDataList>> GetSalaryList(long schemeId);
-
-    #endregion
-}
-    

Company.Domain/ClassificationSchemeAgg/IClassificationRialCoefficientRepository.cs

@@ -1,8 +0,0 @@
-using _0_Framework.Domain;
-
-namespace Company.Domain.ClassificationSchemeAgg;
-
-public interface IClassificationRialCoefficientRepository : IRepository<long, ClassificationRialCoefficient>
-{
-    
-}

Company.Domain/ClassificationSchemeAgg/IClassificationSchemeRepository.cs

@@ -1,56 +0,0 @@
-using _0_Framework.Application;
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.ClassificationScheme;
-using CompanyManagment.App.Contracts.YearlySalary;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Company.Domain.ClassificationSchemeAgg;
-
-public interface IClassificationSchemeRepository : IRepository<long, ClassificationScheme>
-{
-    /// <summary>
-    /// پارشیال صفحه ایجاد طرح
-    /// </summary>
-    /// <param name="worskhopId"></param>
-    /// <returns></returns> 
-    Task<ClassificationSchemeListDto> GetClassificationSchemeList(long workshopId);
-
-
-    /// <summary>
-    /// دریافت اطلاعات طرح برای ویرایش
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    Task<EditClassificationSchemeDto> GetClassificationScheme(long id);
-
-
-    /// <summary>
-    /// دریافت اطلاعات طر برای محاسبات
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    Task<EditClassificationScheme> GetClassificationSchemeToCompute(long id);
-
-    /// <summary>
-    /// متد محاسبه پایه سنوات برا افراد تک گروه
-    /// </summary>
-    /// <param name="schemeStart">تاریخ شروع طرح</param>
-    /// <param name="schemeEnd">تاریخ پاین طرح، اجباری نیست</param>
-    /// <param name="contractStart">تاریخ شروع قراداد</param>
-    /// <param name="contractEnd">تاریخ پایان قراداد</param>
-    /// <param name="groupNo">شماره گروه</param>
-    /// <param name="employeeId">آی دی پرسنل</param>
-    /// <param name="workshopId">آی دی کارگاه</param>
-    /// <returns></returns>
-    Task<BaseYearDataViewModel> BaseYearComputeOneGroup(DateTime schemeStart, DateTime? schemeEnd,
-        DateTime contractStart, DateTime contractEnd, string groupNo, long employeeId, long workshopId);
-
-    /// <summary>
-    /// حذف طرح
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    Task DeleteClassificationScheme(long id);
-}

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/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/CustomizeCheckoutAgg/ICustomizeCheckoutRepository.cs

@@ -1,8 +1,6 @@
 
-using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.CustomizeCheckout;
-using CompanyManagment.App.Contracts.CustomizeCheckout.CustomizeCheckoutDto;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -24,34 +22,5 @@ namespace Company.Domain.CustomizeCheckoutAgg
 
         (bool Checkout, bool CustomizeCheckout, bool CustomizeCheckoutTemp) ValidateExistsCheckouts(
             DateTime startDate, DateTime endDate, long workshopId, List<long> employeeId);
-
-        #region ForApi
-        /// <summary>
-        /// دریافت لیست فیش غیر رسمی نهایی
-        /// Api
-        /// </summary>
-        /// <param name="workshopId"></param>
-        /// <param name="searchModel"></param>
-        /// <returns></returns>
-        Task<PagedResult<CustomizeCheckoutListDto>> GetCustomizeCheckoutList(long workshopId,
-            CustomizeCheckoutSearchModel searchModel);
-
-        /// <summary>
-        /// پرینت فیش غیررسمی نهایی
-        /// </summary>
-        /// <param name="workshopId"></param>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        Task<List<CustomizeCheckoutPrintDto>> PrintCustomizeCheckout(long workshopId, List<long> ids);
-
-        /// <summary>
-        /// دریافت اطلاعات برای اکسل
-        /// </summary>
-        /// <param name="workshopId"></param>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        Task<List<CustomizeCheckoutExcelDto>> CustomizeCheckoutExcelDownloadApi(long workshopId, List<long> ids);
-
-        #endregion
     }
 }

Company.Domain/CustomizeCheckoutTempAgg/ICustomizeCheckoutTempRepository.cs

@@ -1,9 +1,7 @@
 
-using _0_Framework.Application;
 using _0_Framework.Domain;
 using Company.Domain.CustomizeCheckoutAgg;
 using CompanyManagment.App.Contracts.CustomizeCheckout;
-using CompanyManagment.App.Contracts.CustomizeCheckout.CustomizeCheckoutDto;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -24,36 +22,5 @@ namespace Company.Domain.CustomizeCheckoutTempAgg
         void RemoveRange(IEnumerable<CustomizeCheckoutTemp> entities);
         List<CustomizeCheckoutTemp> GetByWorkshopIdEmployeeIdInDates(long workshopId, long employeeId, DateTime startDate, DateTime endDate);
         Task<CustomizeCheckoutTemp> GetByWorkshopIdEmployeeIdInDate(long workshopId, long employeeId, DateTime inDate);
-
-        #region ForApi
-
-        /// <summary>
-        /// لیست فیش حوقوقی غیر رسمی موقت
-        /// </summary>
-        /// <param name="workshopId"></param>
-        /// <param name="searchModel"></param>
-        /// <returns></returns>
-        Task<PagedResult<CustomizeCheckoutListDto>> GetCustomizeCheckoutTempList(long workshopId,
-            CustomizeCheckoutSearchModel searchModel);
-
-        /// <summary>
-        /// پرینت فیش غیررسمی موقت
-        /// </summary>
-        /// <param name="workshopId"></param>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        Task<List<CustomizeCheckoutPrintDto>> PrintCustomizeCheckoutTemp(long workshopId, List<long> ids);
-
-        /// <summary>
-        /// دریافت اطلاعات برای اکسل
-        /// فیش غیر رسمی موقت
-        /// </summary>
-        /// <param name="workshopId"></param>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        /// <returns></returns>
-        Task<List<CustomizeCheckoutExcelDto>> CustomizeCheckoutTempExcelDownloadApi(long workshopId, List<long> ids);
-
-        #endregion
     }
 }

Company.Domain/EmployeeAgg/IEmployeeRepository.cs

@@ -54,7 +54,6 @@ public interface IEmployeeRepository : IRepository<long, Employee>
 
     Employee GetIgnoreQueryFilter(long id);
 
-    [Obsolete("این متد منسوخ شده است و از متد WorkedEmployeesInWorkshopSelectList استفاده کنید")]
     Task<List<EmployeeSelectListViewModel>> WorkedEmployeesInWorkshopSelectList(long workshopId);
 
 
@@ -77,40 +76,7 @@ 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);
-
-    /// <summary>
-    /// دریافت لیست پرسنل کلاینت
-    /// api
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    Task<List<EmployeeListDto>> ListOfAllEmployeesClient(EmployeeSearchModelDto searchModel, long workshopId);
-
-    /// <summary>
-    /// پرینت تجمیعی پرسنل کلاینت
-    /// api
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    Task<List<PrintAllEmployeesInfoDtoClient>> PrintAllEmployeesInfoClient(long workshopId);
-
-    /// <summary>
-    /// پرینت گروهی تفکیکی پرسنل
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    Task<List<PrintAllDetailsPersonnelInfoDtoClient>> PrintAllDetailsPersonnelInfoClient(long workshopId);
-
-    /// <summary>
-    /// سلکت لیست پرسنل های کارگاه کلاینت 
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    Task<List<EmployeeSelectListViewModel>> GetWorkingEmployeesSelectList(long workshopId);
-
-    #endregion
+	#endregion
 
 
 }

Company.Domain/EmployeeBankInformationAgg/IEmployeeBankInformationRepository.cs

@@ -1,11 +1,7 @@
 
-using System;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.EmployeeBankInformation;
 using System.Collections.Generic;
-using System.Security.AccessControl;
-using System.Threading.Tasks;
-using CompanyManagment.App.Contracts.Workshop;
 
 namespace Company.Domain.EmployeeBankInformationAgg
 {
@@ -15,31 +11,14 @@ namespace Company.Domain.EmployeeBankInformationAgg
         void Remove(EmployeeBankInformation bankInformation);
         void RemoveRange(List<EmployeeBankInformation> entities);
 
-        [Obsolete("از متد async استفاده کنید")]
         List<GroupedEmployeeBankInformationViewModel> Search(long workshopId, EmployeeBankInformationSearchModel searchParams);
-        
-        Task<List<GroupedEmployeeBankInformationViewModel>> SearchAsync(long workshopId,
-            EmployeeBankInformationSearchModel searchParams);
-        
 
         GroupedEmployeeBankInformationViewModel GetByEmployeeId(long workshopId, long employeeId);
         List<EmployeeBankInformation> GetRangeByEmployeeId(long workshopId, long employeeId);
         EmployeeBankInformationViewModel GetDetails(long id);
         List<GroupedEmployeeBankInformationViewModel> GetAllByWorkshopId(long workshopId);
-        
-        List<EmployeeBankInformationViewModelForExcel> SearchForExcel(long workshopId,
-            EmployeeBankInfoExcelSearchModel searchParams);
 
-        /// <summary>
-        ///  جزئیات اطلاعات بانکی بر اساس پرسنل
-        /// </summary>
-        /// <param name="workshopId"></param>
-        /// <param name="employeeId"></param>
-        /// <returns></returns>
-        Task<GetEmployeeBankInfoDetailsDto> GetDetailsByEmployeeIdAsync(long workshopId, long employeeId);
-        
-        
-        
+
+        List<EmployeeBankInformationViewModelForExcel> SearchForExcel(long workshopId, EmployeeBankInformationSearchModel searchParams);
     }
-
 }

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

@@ -7,12 +7,13 @@ using _0_Framework.Application.Enums;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.Workshop;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Company.Domain.InstitutionContractAgg;
 
 public interface IInstitutionContractRepository : IRepository<long, InstitutionContract>
 {
-
+    
     EditInstitutionContract GetDetails(long id);
     EditInstitutionContract GetFirstContract(long contractingPartyId, string typeOfContract);
     List<InstitutionContractViewModel> InstitutionContractsWithoutAccount();
@@ -55,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
 
@@ -72,28 +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);
-    Task<GetInstitutionContractWorkshopsDetails> GetContractWorkshopsDetails(long id);
-    Task AmendmentComplete(InstitutionContractAmendmentCompleteRequest request);
-    Task<GetInstitutionAmendmentVerificationDetailsViewModel> GetAmendmentVerificationDetails(Guid id, long amendmentId);
 
 
-  
+    #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
 
@@ -106,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,15 +262,6 @@ public class InstitutionContract : EntityBase
     {
         WorkshopGroup = null;
     }
-    public void SetSigningType(InstitutionContractSigningType signingType)
-    {
-        SigningType = signingType;
-    }
-
-    public void AddAmendment(InstitutionContractAmendment amendment)
-    {
-        Amendments.Add(amendment);
-    }
 }
 
 public class InstitutionContractAmendment : EntityBase
@@ -287,15 +269,14 @@ public class InstitutionContractAmendment : EntityBase
     private InstitutionContractAmendment(){}
     public InstitutionContractAmendment(long institutionContractId,
         List<InstitutionContractInstallment> installments, double amount, bool hasInstallment,
-        List<InstitutionContractAmendmentChange> amendmentChanges, long lawId)
+        InstitutionContractAmendmentChange amendmentChange, long lawId)
     {
         InstitutionContractId = institutionContractId;
         Installments = installments is { Count: > 0} ? installments : [];
         Amount = amount;
         HasInstallment = hasInstallment;
-        AmendmentChanges = amendmentChanges;
+        AmendmentChanges = [amendmentChange];
         LawId = lawId;
-        VerificationStatus = InstitutionContractVerificationStatus.PendingForVerify;
     }
 
     public long InstitutionContractId { get; set; }
@@ -309,15 +290,6 @@ public class InstitutionContractAmendment : EntityBase
 
     public long LawId { get; set; }
 
-    
-    public string VerifierPhoneNumber { get; private set; }
-
-    public string VerifierFullName { get; private set; }
-
-    public InstitutionContractVerificationStatus VerificationStatus { get; set; }
-
-    public DateTime VerifyCodeCreation { get; set; }
-    
     public void SetVerifyCode(string code,string verifierFullName, string verifierPhoneNumber)
     {
         VerifyCode = code;
@@ -325,22 +297,25 @@ public class InstitutionContractAmendment : EntityBase
         VerifierFullName = verifierFullName;
         VerifierPhoneNumber = verifierPhoneNumber;
     }
-    public void Verified()
-    {
-        VerificationStatus = InstitutionContractVerificationStatus.Verified;
-    }
+
+    public string VerifierPhoneNumber { get; private set; }
+
+    public string VerifierFullName { get; private set; }
+
+    public DateTime VerifyCodeCreation { get; set; }
 }
 
 public class InstitutionContractAmendmentChange : EntityBase
 {
     private InstitutionContractAmendmentChange() { }
-    
-    private InstitutionContractAmendmentChange(InstitutionContractAmendmentChangeType changeType,
-        DateTime changeDateGr, bool? hasCustomizeCheckoutPlan, bool? hasContractPlan,
+    private InstitutionContractAmendmentChange(long institutionContractAmendmentId,
+        InstitutionContractAmendment institutionContractAmendment, InstitutionContractAmendmentChangeType changeType,
+        DateTime changeDateGr, bool? hasRollCallPlan, bool? hasCustomizeCheckoutPlan, bool? hasContractPlan,
         bool? hasContractPlanInPerson, bool? hasInsurancePlan, bool? hasInsurancePlanInPerson, int? personnelCount,
-        bool? hasRollCallPlan, bool? hasRollCallInPerson,
-        long? currentWorkshopId, int personnelCountDifference)
+        long? workshopDetailsId)
     {
+        InstitutionContractAmendmentId = institutionContractAmendmentId;
+        InstitutionContractAmendment = institutionContractAmendment;
         ChangeType = changeType;
         ChangeDateGr = changeDateGr;
         HasRollCallPlan = hasRollCallPlan;
@@ -350,80 +325,9 @@ public class InstitutionContractAmendmentChange : EntityBase
         HasInsurancePlan = hasInsurancePlan;
         HasInsurancePlanInPerson = hasInsurancePlanInPerson;
         PersonnelCount = personnelCount;
-        PersonnelCountDifference = personnelCountDifference;
-        CurrentWorkshopId = currentWorkshopId;
-        HasRollCallInPerson = hasRollCallInPerson;
+        WorkshopDetailsId = workshopDetailsId;
     }
 
-    /// <summary>
-    /// تغییر تعداد پرسنل
-    /// </summary>
-    public static InstitutionContractAmendmentChange CreatePersonCountChange(
-        DateTime changeDateGr, int personnelCount, int personnelCountDifference,
-        long currentWorkshopId)
-    {
-        return new InstitutionContractAmendmentChange(
-            changeType: InstitutionContractAmendmentChangeType.PersonCount,
-            changeDateGr: changeDateGr,
-            hasCustomizeCheckoutPlan: null,
-            hasContractPlan: null,
-            hasContractPlanInPerson: null,
-            hasInsurancePlan: null,
-            hasInsurancePlanInPerson: null,
-            personnelCount: personnelCount,
-            hasRollCallPlan: null,
-            hasRollCallInPerson: null,
-            currentWorkshopId: currentWorkshopId,
-            personnelCountDifference: personnelCountDifference);
-    }
-
-    /// <summary>
-    /// تغییر خدمات
-    /// </summary>
-    public static InstitutionContractAmendmentChange CreateServicesChange(
-        DateTime changeDateGr, long currentWorkshopId, bool hasRollCallPlan, bool hasRollCallInPerson,
-        bool hasCustomizeCheckoutPlan, bool hasContractPlan, bool hasContractPlanInPerson,
-        bool hasInsurancePlan, bool hasInsurancePlanInPerson)
-    {
-        return new InstitutionContractAmendmentChange(
-            changeType: InstitutionContractAmendmentChangeType.Services,
-            changeDateGr: changeDateGr,
-            hasCustomizeCheckoutPlan: hasCustomizeCheckoutPlan,
-            hasContractPlan: hasContractPlan,
-            hasContractPlanInPerson: hasContractPlanInPerson,
-            hasInsurancePlan: hasInsurancePlan,
-            hasInsurancePlanInPerson: hasInsurancePlanInPerson,
-            personnelCount: null,
-            hasRollCallPlan: hasRollCallPlan,
-            hasRollCallInPerson: hasRollCallInPerson,
-            currentWorkshopId: currentWorkshopId,
-            personnelCountDifference: 0);
-    }
-
-    /// <summary>
-    /// ایجاد کارگاه جدید
-    /// </summary>
-    public static InstitutionContractAmendmentChange CreateWorkshopCreatedChange(
-        DateTime changeDateGr, bool hasRollCallPlan, bool hasRollCallInPerson,
-        bool hasCustomizeCheckoutPlan, bool hasContractPlan, bool hasContractPlanInPerson,
-        bool hasInsurancePlan, bool hasInsurancePlanInPerson,int personnelCount)
-    {
-        return new InstitutionContractAmendmentChange(
-            changeType: InstitutionContractAmendmentChangeType.WorkshopCreated,
-            changeDateGr: changeDateGr,
-            hasCustomizeCheckoutPlan: hasCustomizeCheckoutPlan,
-            hasContractPlan: hasContractPlan,
-            hasContractPlanInPerson: hasContractPlanInPerson,
-            hasInsurancePlan: hasInsurancePlan,
-            hasInsurancePlanInPerson: hasInsurancePlanInPerson,
-            personnelCount: personnelCount,
-            hasRollCallPlan: hasRollCallPlan,
-            hasRollCallInPerson: hasRollCallInPerson,
-            currentWorkshopId: null,
-            personnelCountDifference: 0);
-    }
-
-
     public long InstitutionContractAmendmentId { get; private set; }
     public InstitutionContractAmendment InstitutionContractAmendment { get; private set; }
     public InstitutionContractAmendmentChangeType ChangeType { get; private set; }
@@ -434,8 +338,6 @@ public class InstitutionContractAmendmentChange : EntityBase
     /// </summary>
     public bool? HasRollCallPlan { get; private set; }
 
-    public bool? HasRollCallInPerson { get; set; }
-
     /// <summary>
     /// پلن فیش غیر رسمی
     /// </summary>
@@ -465,17 +367,11 @@ public class InstitutionContractAmendmentChange : EntityBase
     /// تعداد پرسنل
     /// </summary>
     public int? PersonnelCount { get; private set; }
-    
-    /// <summary>
-    /// مقدار تغییرات تعداد پرسنل
-    /// </summary>
-    public int PersonnelCountDifference { get; set; }
-    
 
     /// <summary>
     /// تعداد کارگاه
     /// </summary>
-    public long? CurrentWorkshopId { get; private set; }
+    public long? WorkshopDetailsId { get; private set; }
 }
 
 public enum InstitutionContractAmendmentChangeType

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopBase.cs

@@ -9,7 +9,7 @@ public class InstitutionContractWorkshopBase:EntityBase
     protected InstitutionContractWorkshopBase(){}
     public InstitutionContractWorkshopBase(string workshopName, bool hasRollCallPlan,bool hasRollCallPlanInPerson,
         bool hasCustomizeCheckoutPlan, bool hasContractPlan,bool hasContractPlanInPerson,bool hasInsurancePlan,bool hasInsurancePlanInPerson,
-        int personnelCount, double price,bool isAmendment )
+        int personnelCount, double price )
     {
         WorkshopName = workshopName;
         Services = new WorkshopServices(hasInsurancePlan, hasInsurancePlanInPerson,
@@ -17,10 +17,7 @@ public class InstitutionContractWorkshopBase:EntityBase
         PersonnelCount = personnelCount;
         Price = price;
         Employers = [];
-        IsAmendment = isAmendment;
     }
-
-
     /// <summary>
     /// شناسه کارگاه
     /// </summary>
@@ -45,11 +42,7 @@ public class InstitutionContractWorkshopBase:EntityBase
     
 
     public double Price { get; private set; }
-    
-    /// <summary>
-    /// جهت نمایش دادن اینکه آیا این کارگاه مربوط به ارتقا قرارداد است یا خیر
-    /// </summary>
-    public bool IsAmendment { get; set; }
+
     
     public List<InstitutionContractWorkshopDetailEmployer> Employers { get; private set; } = new();
 

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,bool isAmendment, 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,isAmendment)
+        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)
     {
@@ -33,23 +31,10 @@ public class InstitutionContractWorkshopGroup : EntityBase
         InitialWorkshops = initialWorkshops.ToList();
         LastModifiedDate = DateTime.Now;
     }
-    
-    public void AddAmendmentWorkshops(List<InstitutionContractWorkshopInitial> amendmentDetails)
-    {
-        InitialWorkshops.AddRange(amendmentDetails);
-        LastModifiedDate = DateTime.Now;
-    }
-    
 
     public void UpdateCurrentWorkshops(List<InstitutionContractWorkshopCurrent> updatedDetails)
     {
         CurrentWorkshops = updatedDetails.ToList();
         LastModifiedDate = DateTime.Now;
     }
-
-    public void AddCurrentWorkshop(InstitutionContractWorkshopCurrent currentWorkshop)
-    {
-        CurrentWorkshops.Add(currentWorkshop);
-        LastModifiedDate = DateTime.Now;
-    }
 }

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopInitial.cs

@@ -11,9 +11,9 @@ public class InstitutionContractWorkshopInitial:InstitutionContractWorkshopBase
     public InstitutionContractWorkshopInitial(string workshopName, bool hasRollCallPlan, 
         bool hasRollCallPlanInPerson, bool hasCustomizeCheckoutPlan, bool hasContractPlan,
         bool hasContractPlanInPerson, bool hasInsurancePlan, bool hasInsurancePlanInPerson, 
-        int personnelCount, double price,bool isAmendment =false) : base(workshopName, hasRollCallPlan,
+        int personnelCount, double price) : base(workshopName, hasRollCallPlan,
         hasRollCallPlanInPerson, hasCustomizeCheckoutPlan, hasContractPlan, hasContractPlanInPerson,
-        hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price,isAmendment)
+        hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price)
     {
         WorkshopCreated = false;
     }
@@ -31,8 +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,
-            IsAmendment, id);
+            Services.InsuranceInPerson,PersonnelCount,Price,InstitutionContractWorkshopGroupId,WorkshopGroup,workshopId);
         WorkshopCurrent.SetEmployers(Employers.Select(x=>x.EmployerId).ToList());
     }
 

Company.Domain/InstitutionContractAmendmentTempAgg/InstitutionContractAmendmentTemp.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using CompanyManagment.App.Contracts.InstitutionContract;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
 
@@ -17,7 +16,7 @@ public class InstitutionContractAmendmentTemp
         NewWorkshops = prevWorkshops.Select(x=> new InstitutionContractAmendmentTempNewWorkshop(
             x.WorkshopName, x.CountPerson, x.ContractAndCheckout, x.ContractAndCheckoutInPerson, x.Insurance,
             x.InsuranceInPerson, x.RollCall, x.RollCallInPerson, x.CustomizeCheckout, x.Price, x.WorkshopId,
-            x.CurrentWorkshopId, 0,x.Id)).ToList();
+            x.CurrentWorkshopId, 0)).ToList();
         InstitutionContractId = institutionContractId;
     }
 
@@ -26,32 +25,17 @@ public class InstitutionContractAmendmentTemp
     public Guid Id { get; private set; }
     public List<InstitutionContractAmendmentTempPrevWorkshop> PrevWorkshops { get; private set; }
     public List<InstitutionContractAmendmentTempNewWorkshop> NewWorkshops { get; private set; }
-    
-    public InstitutionContractPaymentMonthlyViewModel MonthlyPayment { get; set; }
-    
-    public InstitutionContractPaymentOneTimeViewModel OneTimePayment { get; set; }
-    
     public long InstitutionContractId { get; private set; }
-
-    public int MonthDifference { get; set; }
-    public void AddPaymentDetails(InstitutionContractPaymentMonthlyViewModel resMonthly, InstitutionContractPaymentOneTimeViewModel resOneTime, int monthDiff)
-    {
-        MonthlyPayment = resMonthly;
-        OneTimePayment = resOneTime;
-        MonthDifference = monthDiff;
-    }
-
 }
 
 public class InstitutionContractAmendmentTempNewWorkshop : InstitutionContractAmendmentTempPrevWorkshop
 {
     public InstitutionContractAmendmentTempNewWorkshop(string workshopName, int countPerson, bool contractAndCheckout,
         bool contractAndCheckoutInPerson, bool insurance, bool insuranceInPerson, bool rollCall, bool rollCallInPerson,
-        bool customizeCheckout, double price, long workshopId, long currentWorkshopId,double priceDifference,Guid prevId) : base(
+        bool customizeCheckout, double price, long workshopId, long currentWorkshopId,double priceDifference) : base(
         workshopName, countPerson, contractAndCheckout, contractAndCheckoutInPerson, insurance, insuranceInPerson,
         rollCall, rollCallInPerson, customizeCheckout, price, workshopId, currentWorkshopId)
     {
-        Id = prevId;
         PriceDifference = priceDifference;
     }
 

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/JobAgg/IJobRepository.cs

@@ -11,13 +11,6 @@ public interface IJobRepository : IRepository<long, Job>
     EditJob GetDetails(long id);
     List<JobViewModel> Search(JobSearchModel searchModel);
     List<JobViewModel> SearchJobForMain(JobSearchModel searchModel);
-
-    /// <summary>
-    /// جستجوس مشاغل 
-    /// </summary>
-    /// <param name="searchtText"></param>
-    /// <returns></returns>
-    Task<List<JobListDto>> JobSearchSelect(string searchtText);
     // Task<List<JobViewModel>> GetJobListByText(string searchtText);
     List<JobViewModel> GetJobListByText(string searchtText);
     List<JobViewModel> GetJobListByWorkshopId(long workshopId);

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,37 +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);
-
-
-    /// <summary>
-    /// پرینت مرخصی کلاینت
-    /// Api
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    Task<OperationResult<List<LeavePrintForClientDto>>> LeavePrintForClientApi(List<long> ids, long workshopId);
 }

Company.Domain/RollCallAgg/IRollCallMandatoryRepository.cs

@@ -1,22 +1,21 @@
-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;
 
 public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
 {
-	Task<ComputingViewModel> MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking, bool isStaticCheckout, bool rotatingShiftCompute, double dailyWageUnAffected, bool totalLeaveCompute);
+	ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking, bool isStaticCheckout, bool rotatingShiftCompute, double dailyWageUnAffected, bool totalLeaveCompute);
 
     /// <summary>
     /// محاسبه ساعات کارکرد پرسنل در صورت داشتن حضور غیاب
@@ -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/IRollCallRepository.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.RollCall;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;
@@ -26,7 +25,7 @@ namespace Company.Domain.RollCallAgg
           DateTime endSearch);
         void RemoveEmployeeRollCallsInDate(long workshopId, long employeeId, DateTime date);
         RollCallsByDateViewModel GetWorkshopRollCallHistory(RollCallSearchModel searchModel);
-        CurrentDayRollCall GetWorkshopCurrentDayRollCalls(long workshopId,WorkshopCurrentDayRollCallSearchModel searchModel);
+        CurrentDayRollCall GetWorkshopCurrentDayRollCalls(long workshopId);
         List<PersonnelCheckoutDailyRollCallViewModel> GetEmployeeRollCallsForMonth(IEnumerable<long> employeeIds,
             long workshopId, DateTime start, DateTime end);
 
@@ -92,9 +91,5 @@ namespace Company.Domain.RollCallAgg
         Task<List<RollCall>> GetRollCallsUntilNowWithWorkshopIdEmployeeIds(long workshopId, List<long> employeeIds,
             DateTime fromDate);
         #endregion
-
-        Task<PagedResult<RollCallCaseHistoryTitleDto>> GetCaseHistoryTitles(long workshopId,RollCallCaseHistorySearchModel searchModel);
-        Task<List<RollCallCaseHistoryDetail>> GetCaseHistoryDetails(long workshopId,
-            string titleId, RollCallCaseHistorySearchModel searchModel);
     }
 }

Company.Domain/RollCallEmployeeAgg/IRollCallEmployeeRepository.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.RollCallEmployee;
 
@@ -8,7 +7,7 @@ namespace Company.Domain.RollCallEmployeeAgg;
 
 public interface IRollCallEmployeeRepository : IRepository<long, RollCallEmployee>
 {
-    Task<bool> HasRollCallRecord(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd);
+    bool HasRollCallRecord(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd);
     List<RollCallEmployeeViewModel> GetByWorkshopId(long workshopId);
     EditRollCallEmployee GetDetails(long id);
     RollCallEmployeeViewModel GetByEmployeeIdAndWorkshopId(long employeeId, long workshopId);

Company.Domain/SalaryAidAgg/ISalaryAidRepository.cs

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

Company.Domain/SmsResultAgg/ISmsResultRepository.cs

@@ -1,32 +1,10 @@
-using _0_Framework.Application.Enums;
-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>
-    /// <param name="typeOfSmsSetting"></param>
-    /// <returns></returns>
-    Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date, string typeOfSmsSetting);
-
-    #endregion
     List<SmsResultViewModel> Search(SmsResultSearchModel searchModel);
 }

Company.Domain/SmsResultAgg/ISmsSettingsRepository.cs

@@ -1,7 +1,6 @@
 using _0_Framework.Application.Enums;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.SmsResult;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Company.Domain.SmsResultAgg;
@@ -28,25 +27,4 @@ public interface ISmsSettingsRepository : IRepository<long, SmsSetting>
     /// <param name="id"></param>
     /// <returns></returns>
     Task RemoveItem(long id);
-
-
-    #region ForApi
-   
-    /// <summary>
-    /// دریافت لیست پیامک های خودکار بر اساس نوع آن
-    /// Api
-    /// </summary>
-    /// <param name="typeOfSmsSetting"></param>
-    /// <returns></returns>
-    Task<List<SmsSettingDto>> GetSmsSettingList(TypeOfSmsSetting typeOfSmsSetting);
-
-
-
-    /// <summary>
-    /// دریافت اطلاعات تنظیمات پیامک جهت ویرایش
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    Task<SmsSettingDto> GetSmsSettingDataToEdit(long id);
-    #endregion
 }

Company.Domain/WorkshopAgg/IWorkshopRepository.cs

@@ -106,14 +106,4 @@ public interface IWorkshopRepository : IRepository<long, Workshop>
 
     #endregion
 
-
-    #region ForApi
-    /// <summary>
-    /// دریافت لیست کارگاه های ادمین برای سلکت تو
-    /// Api
-    /// </summary>
-    /// <returns></returns>
-    Task<List<AdminWorkshopSelectListDto>> GetAdminWorkshopSelectList();
-
-    #endregion
 }

Company.Domain/WorkshopAgg/Workshop.cs

@@ -185,17 +185,8 @@ public class Workshop : EntityBase
     public bool AddLeavePay { get; private set; }
     public string ZoneName { get; private set; }
     public bool TotalPaymentHide { get; private set; }
-
-    /// <summary>
-    /// آیا  طبقه بندی شده است
-    /// [کارگاه دارای طرح طبقه بندی می باشد ؟]
-    /// </summary>
     public bool IsClassified { get; private set; }
 
-    /// <summary>
-    /// آیا طرح طبقه بندی تکمیل شده است 
-    /// </summary>
-    public bool IsClassificationSchemeCompleted { get; private set; }
 
     //نحوه محاسبه مزد مرخصی
     public string ComputeOptions { get; private set; }
@@ -325,10 +316,7 @@ public class Workshop : EntityBase
         IsStaticCheckout = isStaticCheckout;
     }
 
-    public void AddContractingPartyId(long contractingPartyId)
-    {
-        ContractingPartyId = contractingPartyId;
-    }
+
     public void Active(string archiveCode)
     {
         this.IsActive = true;

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

@@ -1,8 +1,7 @@
-using _0_Framework.Application;
-using CompanyManagment.App.Contracts.CustomizeCheckout.CustomizeCheckoutDto;
+using System.Drawing;
+using _0_Framework.Application;
 using OfficeOpenXml;
 using OfficeOpenXml.Style;
-using System.Drawing;
 
 namespace CompanyManagement.Infrastructure.Excel.Checkout;
 
@@ -45,9 +44,9 @@ public class CustomizeCheckoutExcelGenerator
         { "BankName", "نام بانک" },
 
     };
-    public static byte[] GenerateCheckoutTempExcelInfo(List<CustomizeCheckoutExcelDto> data, List<string> selectedParameters)
+    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/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

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

CompanyManagement.Infrastructure.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");

CompanyManagement.Infrastructure.Mongo/InstitutionContractSendFlagRepo/InstitutionContractSendFlagRepository.cs

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

CompanyManagment.App.Contracts/AuthorizedBankDetails/IAuthorizedBankDetailsApplication.cs

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

CompanyManagment.App.Contracts/Bank/IBankApplication.cs

@@ -10,12 +10,5 @@ namespace CompanyManagment.App.Contracts.Bank
 		OperationResult Create(CreateBank command);
 		OperationResult Edit(EditBank command);
 		List<BankViewModel> Search(string name);
-		List<BankSelectList> GetBanksForSelectList();
-		
-	}
-
-	public class BankSelectList:SelectListViewModel
-	{
-		
 	}
 }

CompanyManagment.App.Contracts/Checkout/ClientDto/CheckoutListClientDto.cs

@@ -1,142 +0,0 @@
-using System.Collections.Generic;
-using _0_Framework.Application;
-
-namespace CompanyManagment.App.Contracts.Checkout.ClientDto;
-
-public class CheckoutListClientDto
-{
-    /// <summary>
-    /// ای دی فیش
-    /// </summary>
-    public long Id { get; set; }
-    
-    /// <summary>
-    /// سال
-    /// </summary>
-    public string Year { get; set; }
-
-    /// <summary>
-    /// ماه
-    /// </summary>
-    public string Month { get; set; }
-
-    /// <summary>
-    /// نام پرسنل
-    /// </summary>
-    public string EmployeeName { get; set; }
-
-    /// <summary>
-    /// شماره قراداد
-    /// </summary>
-    public string ContractNo { get; set; }
-
-    /// <summary>
-    /// تاریخ شروع فیش
-    /// </summary>
-    public string ContractStart { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان فیش
-    /// </summary>
-    public string ContractEnd { get; set; }
-
-    /// <summary>
-    /// امضاء
-    /// </summary>
-    public bool Signature { get; set; }
-
-    /// <summary>
-    /// کد پرسنلی
-    /// </summary>
-    public string PersonnelCode { get; set; }
-
-    /// <summary>
-    /// آیا فیش  نیاز به بروزرسانی دارد
-    /// </summary>
-    public bool IsUpdateNeeded { get; set; }
-    /// <summary>
-    /// لیست پیام های هشدار فیش حقوقی
-    /// </summary>
-    public List<CheckoutWarningMessageModel> CheckoutWarningMessageList { get; set; }
-
-    /// <summary>
-    /// آیا مبالغ مانند مساعده مغایرت دارند
-    /// </summary>
-    public bool HasAmountConflict { get; set; }
-}
-
-public class CheckoutListClientSearchModel : PaginationRequest
-{
-    /// <summary>
-    /// آی دی پرسنل
-    /// </summary>
-    public long? EmployeeId { get; set; }
-
-    /// <summary>
-    /// سال
-    /// </summary>
-    public int Year { get; set; }
-
-    /// <summary>
-    /// ماه
-    /// </summary>
-    public int Month { get; set; }
-
-    /// <summary>
-    /// تاریخ شروع فیش
-    /// </summary>
-    public string StartDate { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان فیش
-    /// </summary>
-    public string EndDate { get; set; }
-
-    /// <summary>
-    /// مرتب سازی
-    /// </summary>
-    public CheckoutClientListOrderType? OrderType { get; set; }
-}
-
-
-
-public enum CheckoutClientListOrderType
-{
-    //بر اساس تاریخ ایجاد
-    ByCheckoutCreationDate,
-
-    /// <summary>
-    /// بر اساس امضاء شده
-    /// </summary>
-    BySignedCheckout,
-
-    /// <summary>
-    /// بر اساس امضاء نشده
-    /// </summary>
-    ByUnSignedCheckout,
-
-    /// <summary>
-    /// بر اساس کد پرسنلی
-    /// کوچک به بزرگ
-    /// </summary>
-    ByPersonnelCode,
-
-    /// <summary>
-    /// بر اساس کد پرسنلی
-    /// بزرگ به کوچک
-    /// </summary>
-    ByPersonnelCodeDescending,
-
-    /// <summary>
-    /// بر اساس تاریخ شروع
-    /// کوچک به بزرگ
-    /// </summary>
-    ByCheckoutStartDate,
-
-    /// <summary>
-    /// براساس تاریخ شروع
-    /// بزرگ به کوچک
-    /// </summary>
-    ByCheckoutStartDateDescending
-
-}

CompanyManagment.App.Contracts/Checkout/CreateCheckout.cs

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

CompanyManagment.App.Contracts/Checkout/Dto/CheckoutDto.cs

@@ -1,97 +0,0 @@
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.Checkout.Dto;
-
-public class CheckoutDto
-{
-    /// <summary>
-    /// آی دی فیش
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// نام پرسنل
-    /// </summary>
-    public string EmployeeFullName { get; set; }
-
-    /// <summary>
-    /// نام کارگاه
-    /// </summary>
-    public string WorkshopName { get; set; }
-
-    /// <summary>
-    /// شماره قراداد
-    /// </summary>
-    public string ContractNo { get; set; }
-
-    /// <summary>
-    /// تاریخ شروع فیش
-    /// </summary>
-    public string ContractStart { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان فیش
-    /// </summary>
-    public string ContractEnd { get; set; }
-
-    /// <summary>
-    /// ماه
-    /// </summary>
-    public string Month { get; set; }
-
-    /// <summary>
-    /// سال 
-    /// </summary>
-    public string Year { get; set; }
-
-
-
-    /// <summary>
-    /// روزهای کارکرد
-    /// </summary>
-    public string SumOfWorkingDays { get; set; }
-
-    /// <summary>
-    /// شماره کارگاه
-    /// </summary>
-    public string ArchiveCode { get; set; }
-
-    /// <summary>
-    /// کد پرسنلی
-    /// </summary>
-    public string PersonnelCode { get; set; }
-    /// <summary>
-    /// فعال/غیرفعال
-    /// </summary>
-    public bool IsActive { get; set; }
-
-    /// <summary>
-    /// امضاء فیش
-    /// </summary>
-    public bool Signature { get; set; }
-
-    /// <summary>
-    /// نام کارفرما
-    /// </summary>
-    public string EmployerName { get; set; }
-    public bool IsBlockCantracingParty { get; set; }
-    /// <summary>
-    /// آیا فیش  نیاز به بروزرسانی دارد
-    /// </summary>
-    public bool IsUpdateNeeded { get; set; }
-    /// <summary>
-    /// لیست پیام های هشدار فیش حقوقی
-    /// </summary>
-    public List<CheckoutWarningMessageModel> CheckoutWarningMessageList { get; set; }
-
-    /// <summary>
-    /// نیاز به امضاء دارد یا خیر
-    /// </summary>
-    public bool HasSignCheckoutOption { get; set; }
-
-    /// <summary>
-    /// آیا در این فیش مرخصی استحقاقی دارد
-    /// </summary>
-    public bool HasLeave { get; set; }
-
-}

CompanyManagment.App.Contracts/Checkout/Dto/CheckoutPrintDto.cs

@@ -1,251 +0,0 @@
-using System;
-using CompanyManagment.App.Contracts.Loan;
-using CompanyManagment.App.Contracts.RollCall;
-using CompanyManagment.App.Contracts.SalaryAid;
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.Checkout.Dto;
-
-public class CheckoutPrintDto
-{
-    // هدر فیش
-    // اطلاعات هویتی
-    // اطلاعات کارگاه
-    #region Header
-    public long Id { get; set; }
-
-    /// <summary>
-    /// نام پرسنل
-    /// </summary>
-    public string EmployeeFullName { get; set; }
-
-    /// <summary>
-    /// نام پدر
-    /// </summary>
-    public string FathersName { get; set; }
-
-    /// <summary>
-    /// کد ملی
-    /// </summary>
-    public string NationalCode { get; set; }
-
-    /// <summary>
-    /// تاریخ تولد
-    /// </summary>
-    public string DateOfBirth { get; set; }
-
-    /// <summary>
-    /// نام کارگاه
-    /// </summary>
-    public string WorkshopName { get; set; }
-
-    /// <summary>
-    /// شماره قراداد
-    /// </summary>
-    public string ContractNo { get; set; }
-
-    /// <summary>
-    /// ماه
-    /// </summary>
-    public string Month { get; set; }
-
-    /// <summary>
-    /// سال
-    /// </summary>
-    public string Year { get; set; }
-
-    /// <summary>
-    /// لیست کارفرما
-    /// </summary>
-    public List<CheckoutEmployersList> EmployersLists { get; set; }
-
-    /// <summary>
-    /// آیا کارقرما حقوقی است
-    /// </summary>
-    public bool EmployerIslegal { get; set; }
-
-    /// <summary>
-    /// آیا ترک کار کرده
-    /// </summary>
-    public bool HasLeft { get; set; }
-
-    /// <summary>
-    /// آخرین روز کاری
-    /// </summary>
-    public string LastDayOfWork { get; set; }
-
-    /// <summary>
-    /// روز ترک کار
-    /// </summary>
-    public string LeftWorkDate { get; set; }
-
-    /// <summary>
-    /// متن مربوط به دریافت مطالبات
-    /// </summary>
-    public string ClaimsReceivedText { get; set; }
-
-    /// <summary>
-    /// آیا حضورغیاب دارد
-    /// </summary>
-    public bool HasRollCall { get; set; }
-    #endregion
-
-    //جدول مطالبات و کسورات
-    #region PaymentAndDeductionTable    
-    /// <summary>
-    /// مطالبات
-    /// </summary>
-    public List<PaymentAndDeductionList> PaymentList { get; set; }
-
-    /// <summary>
-    /// کسورات
-    /// </summary>
-    public List<PaymentAndDeductionList> DeductionList { get; set; }
-
-    /// <summary>
-    /// جمع مطالبات
-    /// </summary>
-    public string TotalPayment { get; set; }
-
-    /// <summary>
-    /// جمع کسورات
-    /// </summary>
-    public string TotalDeductions { get; set; }
-
-
-    /// <summary>
-    /// مبلغ قابل پرداخت
-    /// </summary>
-    public string TotalClaims { get; set; }
-    #endregion
-
-    //لیست ورود و خروج پرسنل
-    //اطلاعات ساعات کار و موظقی
-    #region RollCallData
-    /// <summary>
-    /// لیست حضورغیاب
-    /// </summary>
-    public CheckoutPrintRollCallDto RollCall { get; set; }
-
-    #endregion
-
-    //اقساط - مساعده
-    #region SalaryAidAndInstallmentData
-
-    public List<CheckoutPrintInstallmentDto> Installments { get; set; }
-    public List<CheckoutPrintSalaryAidDto> SalaryAids { get; set; }
-
-    #endregion
-}
-
-/// <summary>
-/// کسورات
-/// </summary>
-public class PaymentData
-{
-    /// <summary>
-    /// حقوق و مزد
-    /// </summary>
-    public string MonthlySalary { get; set; }
-
-    /// <summary>
-    /// پایه سنوات
-    /// </summary>
-    public string BaseYearsPay { get; set; }
-
-    /// <summary>
-    /// کمک هزینه اقلام مصرفی
-    /// </summary>
-    public string ConsumableItems { get; set; }
-
-    /// <summary>
-    /// کمک هزینه مسکن
-    /// </summary>
-    public string HousingAllowance { get; set; }
-
-    /// <summary>
-    /// فوق العاده اضافه کاری
-    /// </summary>
-    public string OvertimePay { get; set; }
-
-    /// <summary>
-    /// فوق العاده شبکاری
-    /// </summary>
-    public string NightworkPay { get; set; }
-
-    /// <summary>
-    /// فوق العاده جمعه کاری
-    /// </summary>
-    public string FridayPay { get; set; }
-
-    /// <summary>
-    /// فوق العاده ماموریت
-    /// </summary>
-    public string MissionPay { get; set; }
-
-    /// <summary>
-    /// فوق العاده نوبت کاری
-    /// </summary>
-    public string ShiftPay { get; set; }
-
-    /// <summary>
-    /// کمک هزینه عائله مندی
-    /// </summary>
-    public string FamilyAllowance { get; set; }
-
-    /// <summary>
-    /// حق تاهل
-    /// </summary>
-    public string MarriedAllowance { get; set; }
-
-}
-
-/// <summary>
-/// کسورات
-/// </summary>
-public class DeductionData
-{
-
-}
-
-public class PaymentAndDeductionList
-{
-    public int RowNumber { get; set; }
-    /// <summary>
-    /// عنوان
-    /// </summary>
-    public string Title { get; set; }
-
-    /// <summary>
-    /// مقدار/روز/ساعت
-    /// </summary>
-    public string Value { get; set; }
-
-    /// <summary>
-    /// مبلغ
-    /// </summary>
-    public string Amount { get; set; }
-}
-
-
-/// <summary>
-/// لیست کارفرما
-/// </summary>
-public class CheckoutEmployersList
-{
-    public string IsLegal { get; set; }
-    public string EmployerFullName { get; set; }
-}
-
-
-
-
-public class CheckoutGetData : CheckoutPrintDto
-{
-    public DateTime ContractStart { get; set; }
-
-    public int PersonnelCode { get; set; }
-
-    public long WorkshopId { get; set; }
-    public long EmployeeId { get; set; }
-}

CompanyManagment.App.Contracts/Checkout/Dto/CheckoutSearchModelDto.cs

@@ -1,47 +0,0 @@
-using _0_Framework.Application;
-
-namespace CompanyManagment.App.Contracts.Checkout.Dto;
-
-public class CheckoutSearchModelDto : PaginationRequest
-{
-    /// <summary>
-    /// نام پرسنل
-    /// </summary>
-    public string EmployeeFullName { get; set; }
-
-    /// <summary>
-    /// آی دی کارگاه
-    /// </summary>
-    public long WorkshopId { get; set; }
-
-    /// <summary>
-    /// شماره قرارداد
-    /// </summary>
-    public string ContractNo { get; set; }
-
-    /// <summary>
-    /// تاریخ شروع فیش
-    /// </summary>
-    public string ContractStart { get; set; }
-
-    /// <summary>
-    /// تاریخ پاین فیش
-    /// </summary>
-    public string ContractEnd { get; set; }
-
-    /// <summary>
-    /// ماه
-    /// </summary>
-    public int Month { get; set; }
-
-    /// <summary>
-    /// سال
-    /// </summary>
-    public int Year { get; set; }
-
-    /// <summary>
-    /// آی دی گارفرما
-    /// </summary>
-    public long EmployerId { get; set; }
-
-}

CompanyManagment.App.Contracts/Checkout/Dto/ContractsListToCreateCheckoutDto.cs

@@ -1,54 +0,0 @@
-namespace CompanyManagment.App.Contracts.Checkout.Dto;
-
-public class ContractsListToCreateCheckoutDto
-{
-    /// <summary>
-    /// آی دی قراداد
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// کد پرسنلی
-    /// </summary>
-    public long PersonnelCode { get; set; }
-
-    /// <summary>
-    /// شماره قرارداد
-    /// </summary>
-    public string ContractNo { get; set; }
-
-    //نام کارگاه
-    public string WorkshopName { get; set; }
-
-    /// <summary>
-    /// نام پرسنل
-    /// </summary>
-    public string EmployeeName { get; set; }
-
-    /// <summary>
-    /// تاریخ شوع فیش
-    /// </summary>
-    public string ContractStart { get; set; }
-    /// <summary>
-    /// تاریخ پایان فیش
-    /// </summary>
-    public string ContractEnd { get; set; }
-
-    /// <summary>
-    /// تاریخ ترک کار
-    /// </summary>
-    public string LeftWorkDate { get; set; }
-
-    /// <summary>
-    /// وضعیت ایجاد فیش
-    /// </summary>
-    public CreateCheckoutStatus CreateCheckoutStatus { get; set; }
-
-
-    /// <summary>
-    /// توضیحات
-    /// </summary>
-    public string Description { get; set; }
-
-}
-