feat: implement async methods for activating and deactivating personal contracting parties

Updated deployment configuration to use environment variables for server host and credentials.

.github/workflows/dotnet-developPublish.yml

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

0_Framework/0_Framework.csproj

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

0_Framework/Application/AuthHelper.cs

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

0_Framework/Application/AuthViewModel.cs

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

0_Framework/Application/Enums/TypeOfSmsSetting.cs

@@ -33,4 +33,9 @@ public enum TypeOfSmsSetting
     /// </summary>
     LegalAction,
 
+    /// <summary>
+    /// پیامک تایید قراداد
+    /// </summary>
+    InstitutionContractConfirm,
+
 }

0_Framework/Application/FaceEmbedding/IFaceEmbeddingService.cs

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

0_Framework/Application/IAuthHelper.cs

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

0_Framework/Application/SecretKeys.cs

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

0_Framework/Application/Sms/ISmsService.cs

@@ -27,7 +27,7 @@ public interface ISmsService
 
     Task<double> GetCreditAmount();
     
-    public Task<bool> SendInstitutionCreationVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId);
+    public Task<bool> SendInstitutionCreationVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId, string typeOfSms = null);
     
     public Task<bool> SendInstitutionVerificationCode(string number, string code, string contractingPartyFullName,
         long contractingPartyId, long institutionContractId);

0_Framework/Application/StaticWorkshopAccounts.cs

@@ -39,4 +39,15 @@ public static class StaticWorkshopAccounts
     /// که کاربر همچنان به کارگاه دسترسی دارد
     /// </summary>
     public static DateTime ContinuesWorkingDate = new DateTime(2150, 1, 1);
+
+
+    /// <summary>
+    /// لیستی آی دی نقش هایی که مسئول بیمه کارگاه هستند
+    /// 7 : بیمه ارشد
+    /// 8 : بیمه ساده
+    /// </summary>
+    public static List<long> InsuranceAccountsRoleIds = [7, 8];
+
+
+
 }

0_Framework/Excel/ExcelGenerator.cs

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

0_Framework/Exceptions/Handler/CustomExceptionHandler.cs

@@ -1,7 +1,10 @@
-using System;
+#nullable enable
+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;
@@ -21,12 +24,24 @@ public class CustomExceptionHandler : IExceptionHandler
 
     public async ValueTask<bool> TryHandleAsync(HttpContext context, Exception exception, CancellationToken cancellationToken)
     {
-        _logger.LogError(
-            "Error Message: {exceptionMessage}, Time of occurrence {time}",
-            exception.Message, DateTime.UtcNow);
+        _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);
 
         (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,
@@ -34,6 +49,7 @@ public class CustomExceptionHandler : IExceptionHandler
                 context.Response.StatusCode = StatusCodes.Status500InternalServerError,
                 null
             ),
+
             BadRequestException bre =>
             (
                 exception.Message,
@@ -41,6 +57,7 @@ public class CustomExceptionHandler : IExceptionHandler
                 context.Response.StatusCode = StatusCodes.Status400BadRequest,
                 bre.Extra
             ),
+            
             NotFoundException =>
             (
                 exception.Message,
@@ -48,6 +65,7 @@ public class CustomExceptionHandler : IExceptionHandler
                 context.Response.StatusCode = StatusCodes.Status404NotFound,
                 null
             ),
+            
             UnAuthorizeException =>
             (
                 exception.Message,
@@ -55,6 +73,7 @@ public class CustomExceptionHandler : IExceptionHandler
                 context.Response.StatusCode = StatusCodes.Status401Unauthorized,
                 null
             ),
+            
             _ =>
             (
                 exception.Message,
@@ -73,8 +92,6 @@ public class CustomExceptionHandler : IExceptionHandler
             Extensions = details.Extra ?? new Dictionary<string, object>()
         };
         
-
-        
         problemDetails.Extensions.Add("traceId", context.TraceIdentifier);
 
         await context.Response.WriteAsJsonAsync(problemDetails, cancellationToken: cancellationToken);

0_Framework/InfraStructure/FaceEmbeddingService.cs

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

AccountManagement.Application.Contracts/Account/CreateAccount.cs

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

AccountManagement.Application.Contracts/Account/EditAccount.cs

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

AccountManagement.Application.Contracts/Account/EditClientAccount.cs

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

AccountManagement.Application.Contracts/Account/IAccountApplication.cs

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

AccountManagement.Application.Contracts/Account/RegisterAccount.cs

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

AccountManagement.Application.Contracts/Account/WorkshopSelectList.cs

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

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

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

AccountManagement.Application.Contracts/ProgramManagerApiResult/ApiResponse.cs

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

AccountManagement.Application.Contracts/ProgramManagerApiResult/CreateProgramManagerRole.cs

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

AccountManagement.Application.Contracts/ProgramManagerApiResult/CreateProgramManagerUser.cs

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

AccountManagement.Application.Contracts/ProgramManagerApiResult/ErrorType.cs

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

AccountManagement.Application.Contracts/ProgramManagerApiResult/RoleResponse.cs

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

AccountManagement.Application.Contracts/ProgramManagerApiResult/SingleUserResponseResult.cs

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

AccountManagement.Application.Contracts/Role/CreateRole.cs

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

AccountManagement.Application.Contracts/Role/IRoleApplication.cs

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

AccountManagement.Application/AccountApplication.cs

@@ -1,29 +1,26 @@
-using System;
-using System.Collections;
-using _0_Framework.Application;
+using _0_Framework.Application;
+using _0_Framework.Application.Sms;
+using _0_Framework.Exceptions;
 using AccountManagement.Application.Contracts.Account;
 using AccountManagement.Domain.AccountAgg;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
-using _0_Framework.Application.Sms;
 using AccountManagement.Domain.AccountLeftWorkAgg;
 using AccountManagement.Domain.CameraAccountAgg;
-using AccountManagement.Domain.RoleAgg;
-using CompanyManagment.App.Contracts.Workshop;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.Rendering;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
-using Company.Domain.WorkshopAgg;
-using System.Security.Claims;
-using _0_Framework.Exceptions;
 using AccountManagement.Domain.PositionAgg;
+using AccountManagement.Domain.RoleAgg;
 using AccountManagement.Domain.SubAccountAgg;
 using AccountManagement.Domain.SubAccountPermissionSubtitle1Agg;
 using AccountManagement.Domain.SubAccountRoleAgg;
+using Company.Domain._common;
+using Company.Domain.WorkshopAgg;
 using Company.Domain.WorkshopSubAccountAgg;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+using Shared.Contracts.PmUser.Commands;
+using Shared.Contracts.PmUser.Queries;
 
 //using AccountManagement.Domain.RoleAgg;
 
@@ -39,15 +36,19 @@ public class AccountApplication : IAccountApplication
     private readonly ISmsService _smsService;
     private readonly ICameraAccountRepository _cameraAccountRepository;
     private readonly IPositionRepository _positionRepository;
-    private readonly IAccountLeftworkRepository _accountLeftworkRepository; 
+    private readonly IAccountLeftworkRepository _accountLeftworkRepository;
     private readonly IWorkshopRepository _workshopRepository;
     private readonly ISubAccountRepository _subAccountRepository;
     private readonly ISubAccountRoleRepository _subAccountRoleRepository;
     private readonly IWorkshopSubAccountRepository _workshopSubAccountRepository;
     private readonly ISubAccountPermissionSubtitle1Repository _accountPermissionSubtitle1Repository;
 
-	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)
+    private readonly IUnitOfWork _unitOfWork;
+    private readonly IPmUserQueryService _pmUserQueryService;
+    private readonly IPmUserCommandService _pmUserCommandService;
+
+    public AccountApplication(IAccountRepository accountRepository, IPasswordHasher passwordHasher,
+        IFileUploader fileUploader, IAuthHelper authHelper, IRoleRepository roleRepository, IWorker worker, ISmsService smsService, ICameraAccountRepository cameraAccountRepository, IPositionRepository positionRepository, IAccountLeftworkRepository accountLeftworkRepository, IWorkshopRepository workshopRepository, ISubAccountRepository subAccountRepository, ISubAccountRoleRepository subAccountRoleRepository, IWorkshopSubAccountRepository workshopSubAccountRepository, ISubAccountPermissionSubtitle1Repository accountPermissionSubtitle1Repository, IUnitOfWork unitOfWork, IPmUserQueryService pmUserQueryService, IPmUserCommandService pmUserCommandService)
     {
         _authHelper = authHelper;
         _roleRepository = roleRepository;
@@ -60,10 +61,14 @@ public class AccountApplication : IAccountApplication
         _subAccountRoleRepository = subAccountRoleRepository;
         _workshopSubAccountRepository = workshopSubAccountRepository;
         _accountPermissionSubtitle1Repository = accountPermissionSubtitle1Repository;
+        _unitOfWork = unitOfWork;
+
+        _pmUserQueryService = pmUserQueryService;
+        _pmUserCommandService = pmUserCommandService;
         _fileUploader = fileUploader;
         _passwordHasher = passwordHasher;
         _accountRepository = accountRepository;
-            
+
     }
 
     public OperationResult EditClient(EditClientAccount command)
@@ -92,7 +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();
     }
@@ -123,7 +128,7 @@ public class AccountApplication : IAccountApplication
         };
     }
 
-    public OperationResult Create(CreateAccount command)
+    public async Task<OperationResult> Create(CreateAccount command)
     {
         var operation = new OperationResult();
 
@@ -133,15 +138,59 @@ public class AccountApplication : IAccountApplication
         var password = _passwordHasher.Hash(command.Password);
         var roleName = _roleRepository.GetDetails(command.RoleId);
         var path = $"profilePhotos";
+        var picturePath = "";
         if (_fileUploader != null)
         {
-            var picturePath = _fileUploader.Upload(command.ProfilePhoto, path);
-            var account = new Account(command.Fullname, command.Username, password, command.Mobile, command.RoleId,
-                picturePath, roleName.Name,"true","false");
-            _accountRepository.Create(account);
+            picturePath = _fileUploader.Upload(command.ProfilePhoto, path);
+
+        }
+        var account = new Account(command.Fullname, command.Username, password, command.Mobile, command.RoleId,
+            picturePath, roleName.Name, "true", "false");
+
+        _unitOfWork.BeginAccountContext();
+
+
+        _accountRepository.Create(account);
+        _accountRepository.SaveChanges();
+
+        if (command.IsProgramManagerUser)
+        {
+            if (command.UserRoles == null)
+                return operation.Failed("حداقل یک نقش برای کاربر مدیریت پروژه لازم است");
+            var pmUserRoles = command.UserRoles.Where(x => x > 0).ToList();
+            var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname, command.Username, account.Password, command.Mobile,
+                null, account.id, pmUserRoles));
+            if (!createPm.isSuccess)
+            {
+                _unitOfWork.RollbackAccountContext();
+                return operation.Failed("خطا در ویرایش کاربر پروگرام منیجر");
+            }
+
+
+
+            //var url = "api/user/create";
+            //var key = SecretKeys.ProgramManagerInternalApi;
+
+            //var response = InternalApiCaller.PostAsync<CreateProgramManagerUser, ApiResponse>(
+            //    url,
+            //    key,
+            //    parameters
+            //);
+
+            //if (!response.Success)
+            //{
+            //    _unitOfWork.RollbackAccountContext();
+            //    return operation.Failed(response.Error);
+            //}
+
+            //if (!response.Result.isSuccess)
+            //{
+            //    _unitOfWork.RollbackAccountContext();
+            //    return operation.Failed(response.Result.errorMessage);
+            //}
         }
 
-        _accountRepository.SaveChanges();
+        _unitOfWork.CommitAccountContext();
         return operation.Succcedded();
     }
 
@@ -155,8 +204,8 @@ public class AccountApplication : IAccountApplication
             return opreation.Failed("پر کردن تمامی فیلدها الزامی است");
         if (_accountRepository.Exists(x => x.Username == command.Username))
             return opreation.Failed("نام کاربری تکراری است");
-        if (_accountRepository.Exists(x => x.Mobile == command.Mobile && x.IsActiveString =="true"))
-                                          
+        if (_accountRepository.Exists(x => x.Mobile == command.Mobile && x.IsActiveString == "true"))
+
             return opreation.Failed("مقادیر وارد شده تکراری است");
 
         //var nationalCodeValidation = command.NationalCode.NationalCodeValid();
@@ -173,14 +222,14 @@ public class AccountApplication : IAccountApplication
         //        break;
         //}
         var password = _passwordHasher.Hash(command.Password);
-        var register =new Account(command.Fullname,command.Username, password, command.Mobile, command.NationalCode);
+        var register = new Account(command.Fullname, command.Username, password, command.Mobile, command.NationalCode);
         _accountRepository.Create(register);
         _accountRepository.SaveChanges();
 
-        return opreation.Succcedded(register.id,message: "ثبت نام شما با موفقیت انجام شد");
+        return opreation.Succcedded(register.id, message: "ثبت نام شما با موفقیت انجام شد");
     }
 
-    public OperationResult Edit(EditAccount command)
+    public async Task<OperationResult> Edit(EditAccount command)
     {
         var operation = new OperationResult();
         var account = _accountRepository.Get(command.Id);
@@ -194,8 +243,129 @@ public class AccountApplication : IAccountApplication
         var roleName = _roleRepository.GetDetails(command.RoleId);
         var path = $"profilePhotos";
         var picturePath = _fileUploader.Upload(command.ProfilePhoto, path);
+        _unitOfWork.BeginAccountContext();
         account.Edit(command.Fullname, command.Username, command.Mobile, command.RoleId, picturePath, roleName.Name);
         _accountRepository.SaveChanges();
+        var key = SecretKeys.ProgramManagerInternalApi;
+
+        //var apiResult = InternalApiCaller.GetAsync<SingleUserResponseResult>(
+        //    $"api/user/{account.id}",
+        //    key
+        //);
+        var userResult =await _pmUserQueryService.GetPmUserDataByAccountId(account.id);
+
+        if (command.UserRoles == null)
+            return operation.Failed("حداقل یک نقش برای کاربر مدیریت پروژه لازم است");
+        var pmUserRoles = command.UserRoles.Where(x => x > 0).ToList();
+
+        //اگر کاربر در پروگرام منیجر قبلا ایجاد شده
+        if (userResult.Id >0)
+        {
+            if (!command.UserRoles.Any())
+            {
+                _unitOfWork.RollbackAccountContext();
+                return operation.Failed("حداقل یک نقش باید انتخاب شود");
+            }
+           
+            var editPm =await _pmUserCommandService.Edit(new EditPmUserDto(command.Fullname, command.Username, command.Mobile, account.id, pmUserRoles,
+                command.IsProgramManagerUser));
+            if (!editPm.isSuccess)
+            {
+                _unitOfWork.RollbackAccountContext();
+                return operation.Failed("خطا در ویرایش کاربر پروگرام منیجر");
+            }
+ 
+            //var parameters = new EditUserCommand(
+            //    command.Fullname,
+            //    command.Username,
+            //    command.Mobile,
+            //    account.id,
+            //    command.UserRoles,
+            //    command.IsProgramManagerUser
+            //);
+            //var url = "api/user/edit";
+            //var response = InternalApiCaller.PostAsync<EditUserCommand, ApiResponse>(
+            //    url,
+            //    key,
+            //    parameters
+            //);
+
+            //if (!response.Success)
+            //{
+            //    _unitOfWork.RollbackAccountContext();
+            //    return operation.Failed(response.Error);
+
+            //}
+
+            //if (!response.Result.isSuccess)
+            //{
+            //    _unitOfWork.RollbackAccountContext();
+            //    return operation.Failed(response.Error);
+            //}
+
+        }
+        else //اگر کاربر قبلا ایجاد نشده
+        {
+            //اگر تیک فعالیت در پروگرام منیجر روشن بود
+            if (command.IsProgramManagerUser)
+            {
+                if (!command.UserRoles.Any())
+                {
+                    _unitOfWork.RollbackAccountContext();
+                    return operation.Failed("حداقل یک نقش باید انتخاب شود");
+                }
+
+             
+
+                
+
+               
+                var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname, command.Username, account.Password, command.Mobile,
+                    null, account.id, pmUserRoles));
+                if (!createPm.isSuccess)
+                {
+                    _unitOfWork.RollbackAccountContext();
+                    return operation.Failed("خطا در ویرایش کاربر پروگرام منیجر");
+                }
+              
+
+
+                //var parameters = new CreateProgramManagerUser(
+                //    command.Fullname,
+                //    command.Username,
+                //    account.Password,
+                //    command.Mobile,
+                //    command.Email,
+                //    account.id,
+                //    command.UserRoles
+                //);
+
+                //var url = "api/user/Create";
+
+
+                //var response = InternalApiCaller.PostAsync<CreateProgramManagerUser, ApiResponse>(
+                //    url,
+                //    key,
+                //    parameters
+                //);
+
+                //if (!response.Success)
+                //{
+                //    _unitOfWork.RollbackAccountContext();
+                //    return operation.Failed(response.Error);
+
+                //}
+
+                //if (!response.Result.isSuccess)
+                //{
+                //    _unitOfWork.RollbackAccountContext();
+                //    return operation.Failed(response.Error);
+                //}
+            }
+
+        }
+
+        _unitOfWork.CommitAccountContext();
         return operation.Succcedded();
     }
 
@@ -210,18 +380,18 @@ public class AccountApplication : IAccountApplication
         long idAutoriz = 0;
         var operation = new OperationResult();
         if (string.IsNullOrWhiteSpace(command.Password))
-	        return operation.Failed(ApplicationMessages.EmptyPassword);
+            return operation.Failed(ApplicationMessages.EmptyPassword);
 
         if (string.IsNullOrWhiteSpace(command.Username))
-	        return operation.Failed(ApplicationMessages.EmptyUsername);
+            return operation.Failed(ApplicationMessages.EmptyUsername);
 
-		var account = _accountRepository.GetBy(command.Username);
+        var account = _accountRepository.GetBy(command.Username);
         var cameraAccount = _cameraAccountRepository.GetBy(command.Username);
-		SubAccount subAccount = _subAccountRepository.GetBy(command.Username);
-		if (account == null && cameraAccount == null && subAccount == null)
-			return operation.Failed(ApplicationMessages.WrongUserPass);
+        SubAccount subAccount = _subAccountRepository.GetBy(command.Username);
+        if (account == null && cameraAccount == null && subAccount == null)
+            return operation.Failed(ApplicationMessages.WrongUserPass);
 
-		if (account != null)
+        if (account != null)
         {
             (bool Verified, bool NeedUpgrade) result = _passwordHasher.Check(account.Password, command.Password);
             if (!result.Verified)
@@ -230,6 +400,23 @@ public class AccountApplication : IAccountApplication
                 .Permissions
                 .Select(x => x.Code)
                 .ToList();
+            //PmPermission
+            var PmUserData = _pmUserQueryService.GetPmUserDataByAccountId(account.id).GetAwaiter().GetResult();
+            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);
+            }
+           
+
             int? positionValue;
             if (account.PositionId != null)
             {
@@ -239,14 +426,17 @@ public class AccountApplication : IAccountApplication
             {
                 positionValue = null;
             }
+            var pmUserId = PmUserData.AccountId > 0 ? PmUserData.AccountId : null;
             var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
-                , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, account.AdminAreaPermission, account.ClientAriaPermission, positionValue);
+                , account.Username, account.Mobile, account.ProfilePhoto,
+                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 clientPermissions = _accountPermissionSubtitle1Repository.GetAllPermissionCodes();
+                authViewModel.Permissions = clientPermissions;
                 var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x => new WorkshopClaim
                 {
                     PersonnelCount = x.PersonnelCount,
@@ -255,14 +445,14 @@ public class AccountApplication : IAccountApplication
                     Slug = _passwordHasher.SlugHasher(x.Id)
                 }).OrderByDescending(x => x.PersonnelCount).ToList();
                 authViewModel.WorkshopList = workshopList;
-				if (workshopList.Any())
-				{
-					var workshop = workshopList.First();
-					authViewModel.WorkshopName = workshop.Name;
-					authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
+                if (workshopList.Any())
+                {
+                    var workshop = workshopList.First();
+                    authViewModel.WorkshopName = workshop.Name;
+                    authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
                     authViewModel.WorkshopId = workshop.Id;
                 }
-			}
+            }
 
             _authHelper.Signin(authViewModel);
 
@@ -281,7 +471,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);
@@ -291,41 +481,41 @@ public class AccountApplication : IAccountApplication
             {
                 idAutoriz = 0;
             }
-          
+
         }
 
-		if (subAccount != null)
-		{
-			(bool Verified, bool NeedUpgrade) result = _passwordHasher.Check(subAccount.Password, command.Password);
-			if (!result.Verified)
-				return operation.Failed(ApplicationMessages.WrongUserPass);
-			var role = _subAccountRoleRepository.Get(subAccount.SubAccountRoleId);
+        if (subAccount != null)
+        {
+            (bool Verified, bool NeedUpgrade) result = _passwordHasher.Check(subAccount.Password, command.Password);
+            if (!result.Verified)
+                return operation.Failed(ApplicationMessages.WrongUserPass);
+            var role = _subAccountRoleRepository.Get(subAccount.SubAccountRoleId);
 
-			var permissions = role.RolePermissions.Select(x => x.PermissionCode).ToList();
-			var authViewModel = new AuthViewModel(subAccount.AccountId, subAccount.SubAccountRoleId, subAccount.FullName
-				, subAccount.Username, subAccount.PhoneNumber, "", permissions, role.Title, "false",
-				"true", 0, subAccount.id);
-			var workshopList = _workshopSubAccountRepository.GetWorkshopsBySubAccountId(subAccount.id);
-			authViewModel.WorkshopList = workshopList.Select(x => new WorkshopClaim()
-			{
-				Slug = _passwordHasher.SlugHasher(x.WorkshopId),
-				Name = x.WorkshopName,
-				PersonnelCount = x.PersonnelCount,
-				Id = x.WorkshopId
-			}).ToList();
+            var permissions = role.RolePermissions.Select(x => x.PermissionCode).ToList();
+            var authViewModel = new AuthViewModel(subAccount.AccountId, subAccount.SubAccountRoleId, subAccount.FullName
+                , subAccount.Username, subAccount.PhoneNumber, "", permissions, role.Title, "false",
+                "true", 0, subAccount.id);
+            var workshopList = _workshopSubAccountRepository.GetWorkshopsBySubAccountId(subAccount.id);
+            authViewModel.WorkshopList = workshopList.Select(x => new WorkshopClaim()
+            {
+                Slug = _passwordHasher.SlugHasher(x.WorkshopId),
+                Name = x.WorkshopName,
+                PersonnelCount = x.PersonnelCount,
+                Id = x.WorkshopId
+            }).ToList();
 
-			if (workshopList.Any())
-			{
-				var workshop = workshopList.First();
-				authViewModel.WorkshopName = workshop.WorkshopName;
-				authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.WorkshopId);
+            if (workshopList.Any())
+            {
+                var workshop = workshopList.First();
+                authViewModel.WorkshopName = workshop.WorkshopName;
+                authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.WorkshopId);
                 authViewModel.WorkshopId = workshop.WorkshopId;
-			}
-			_authHelper.Signin(authViewModel);
-			idAutoriz = 2;
-		}
+            }
+            _authHelper.Signin(authViewModel);
+            idAutoriz = 2;
+        }
 
-		return operation.Succcedded(idAutoriz);
+        return operation.Succcedded(idAutoriz);
     }
     public OperationResult LoginWithMobile(long id)
     {
@@ -356,24 +546,24 @@ public class AccountApplication : IAccountApplication
         if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" &&
             account.IsActiveString == "true")
         {
-	        var clientPermissions = _accountPermissionSubtitle1Repository.GetAllPermissionCodes();
-	        authViewModel.Permissions = clientPermissions;
-	        var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x => new WorkshopClaim
-	        {
-		        PersonnelCount = x.PersonnelCount,
-		        Id = x.Id,
-		        Name = x.WorkshopFullName,
-		        Slug = _passwordHasher.SlugHasher(x.Id)
-	        }).OrderByDescending(x => x.PersonnelCount).ToList();
-			authViewModel.WorkshopList = workshopList;
-			if (workshopList.Any())
-			{
-				var workshop = workshopList.First();
-				authViewModel.WorkshopName = workshop.Name;
-				authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
+            var clientPermissions = _accountPermissionSubtitle1Repository.GetAllPermissionCodes();
+            authViewModel.Permissions = clientPermissions;
+            var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x => new WorkshopClaim
+            {
+                PersonnelCount = x.PersonnelCount,
+                Id = x.Id,
+                Name = x.WorkshopFullName,
+                Slug = _passwordHasher.SlugHasher(x.Id)
+            }).OrderByDescending(x => x.PersonnelCount).ToList();
+            authViewModel.WorkshopList = workshopList;
+            if (workshopList.Any())
+            {
+                var workshop = workshopList.First();
+                authViewModel.WorkshopName = workshop.Name;
+                authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
                 authViewModel.WorkshopId = workshop.Id;
-			}
-		}
+            }
+        }
 
         _authHelper.Signin(authViewModel);
         long idAutoriz = 0;
@@ -429,7 +619,7 @@ public class AccountApplication : IAccountApplication
         return _accountRepository.GetByUserNameAndId(id, username);
     }
 
-    public async Task <OperationResult> SetVerifyCode(string phone, long id)
+    public async Task<OperationResult> SetVerifyCode(string phone, long id)
     {
         var operation = new OperationResult();
         var account = _accountRepository.Get(id);
@@ -443,11 +633,11 @@ public class AccountApplication : IAccountApplication
         _smsService.LoginSend(phone, r);
 
         //TimeSpan delay = TimeSpan.FromSeconds(30);
-       
+
         await _accountRepository.RemoveCode(id);
-       
+
         return operation.Succcedded();
-           
+
     }
 
 
@@ -498,67 +688,67 @@ public class AccountApplication : IAccountApplication
             .Select(x => x.Code)
             .ToList();
 
-    
+
         _authHelper.SignOut();
         var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
-            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, "false", "true",null);
-		var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x => new WorkshopClaim
-		{
-			PersonnelCount = x.PersonnelCount,
-			Id = x.Id,
-			Name = x.WorkshopFullName,
-			Slug = _passwordHasher.SlugHasher(x.Id)
-		}).OrderByDescending(x => x.PersonnelCount).ToList();
+            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, "false", "true", null);
+        var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x => new WorkshopClaim
+        {
+            PersonnelCount = x.PersonnelCount,
+            Id = x.Id,
+            Name = x.WorkshopFullName,
+            Slug = _passwordHasher.SlugHasher(x.Id)
+        }).OrderByDescending(x => x.PersonnelCount).ToList();
 
-		authViewModel.WorkshopList = workshopList;
+        authViewModel.WorkshopList = workshopList;
 
-		var clientPermissions = _accountPermissionSubtitle1Repository.GetAllPermissionCodes();
+        var clientPermissions = _accountPermissionSubtitle1Repository.GetAllPermissionCodes();
         authViewModel.Permissions = clientPermissions;
-		if (authViewModel.WorkshopList.Any())
-		{
-			var workshop = authViewModel.WorkshopList.First();
-			authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
-			authViewModel.WorkshopName = workshop.Name;
+        if (authViewModel.WorkshopList.Any())
+        {
+            var workshop = authViewModel.WorkshopList.First();
+            authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
+            authViewModel.WorkshopName = workshop.Name;
             authViewModel.WorkshopId = workshop.Id;
-		}
-		_authHelper.Signin(authViewModel);
+        }
+        _authHelper.Signin(authViewModel);
         return operation.Succcedded(2);
     }
     public OperationResult DirectCameraLogin(long cameraAccountId)
     {
-	    var prAcc = _authHelper.CurrentAccountInfo();
-	    var operation = new OperationResult();
-	    var cameraAccount = _cameraAccountRepository.GetById(cameraAccountId);
-	    if (cameraAccount == null)
-		    return operation.Failed("این اکانت وجود ندارد");
+        var prAcc = _authHelper.CurrentAccountInfo();
+        var operation = new OperationResult();
+        var cameraAccount = _cameraAccountRepository.GetById(cameraAccountId);
+        if (cameraAccount == null)
+            return operation.Failed("این اکانت وجود ندارد");
 
 
 
 
 
-	    _authHelper.SignOut();
+        _authHelper.SignOut();
 
 
-	    var mobile = string.IsNullOrWhiteSpace(cameraAccount.Mobile) ? " " : cameraAccount.Mobile;
-	    var authViewModel = new CameraAuthViewModel(cameraAccount.id, cameraAccount.WorkshopId,
-		    cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId, cameraAccount.IsActiveSting);
-	    if (cameraAccount.IsActiveSting == "true")
-	    {
-		    _authHelper.CameraSignIn(authViewModel);
-		
-	    }
-	    else
-	    {
-		    return operation.Failed("این اکانت غیر فعال شده است");
-		}
-		return operation.Succcedded(2);
+        var mobile = string.IsNullOrWhiteSpace(cameraAccount.Mobile) ? " " : cameraAccount.Mobile;
+        var authViewModel = new CameraAuthViewModel(cameraAccount.id, cameraAccount.WorkshopId,
+            cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId, cameraAccount.IsActiveSting);
+        if (cameraAccount.IsActiveSting == "true")
+        {
+            _authHelper.CameraSignIn(authViewModel);
+
+        }
+        else
+        {
+            return operation.Failed("این اکانت غیر فعال شده است");
+        }
+        return operation.Succcedded(2);
     }
 
-  
+
     public AccountLeftWorkViewModel WorkshopList(long accountId)
     {
         string fullname = this._accountRepository.GetById(accountId).Fullname;
-        List<WorkshopAccountlistViewModel> source =_accountLeftworkRepository.WorkshopList(accountId);
+        List<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();
@@ -641,65 +831,65 @@ public class AccountApplication : IAccountApplication
     #region Pooya
     public OperationResult IsPhoneNumberAndPasswordValid(long accountId, string phoneNumber, string password, string rePassword)
     {
-	    OperationResult op = new();
+        OperationResult op = new();
 
-	    var entity = _accountRepository.Get(accountId);
+        var entity = _accountRepository.Get(accountId);
 
-	    if (entity == null)
-		    return op.Failed(ApplicationMessages.RecordNotFound);
+        if (entity == null)
+            return op.Failed(ApplicationMessages.RecordNotFound);
 
-	    if (!string.IsNullOrWhiteSpace(rePassword) || !string.IsNullOrWhiteSpace(password))
-	    {
-		    if (rePassword != password)
-			    return op.Failed("تکرار رمز عبور با رمز عبور مطابقت ندارد");
+        if (!string.IsNullOrWhiteSpace(rePassword) || !string.IsNullOrWhiteSpace(password))
+        {
+            if (rePassword != password)
+                return op.Failed("تکرار رمز عبور با رمز عبور مطابقت ندارد");
 
-		    if (password.Length < 8)
-			    return op.Failed("رمز عبور نمی تواند کمتر از 8 کاراکتر باشد");
-	    }
+            if (password.Length < 8)
+                return op.Failed("رمز عبور نمی تواند کمتر از 8 کاراکتر باشد");
+        }
 
-	    if ((string.IsNullOrWhiteSpace(phoneNumber) || entity.Mobile == phoneNumber) && string.IsNullOrWhiteSpace(rePassword))
-		    return op.Failed("چیزی برای تغییر وجود ندارد");
+        if ((string.IsNullOrWhiteSpace(phoneNumber) || entity.Mobile == phoneNumber) && string.IsNullOrWhiteSpace(rePassword))
+            return op.Failed("چیزی برای تغییر وجود ندارد");
 
 
-	    if (!string.IsNullOrWhiteSpace(phoneNumber) && entity.Mobile != phoneNumber)
-	    {
-		    phoneNumber = phoneNumber.Trim();
-		    if (phoneNumber.Length != 11)
-			    return op.Failed("شماره تلفن همراه به درستی وارد نشده است");
-		    if (_accountRepository.Exists(x => x.Mobile == phoneNumber && x.id != accountId) ||
-		        _subAccountRepository.Exists(x => x.PhoneNumber == phoneNumber) ||
-		        _cameraAccountRepository.Exists(x => x.Mobile == phoneNumber))
-			    return op.Failed("قبلا یک حساب با این شماره ثبت شده است");
-	    }
+        if (!string.IsNullOrWhiteSpace(phoneNumber) && entity.Mobile != phoneNumber)
+        {
+            phoneNumber = phoneNumber.Trim();
+            if (phoneNumber.Length != 11)
+                return op.Failed("شماره تلفن همراه به درستی وارد نشده است");
+            if (_accountRepository.Exists(x => x.Mobile == phoneNumber && x.id != accountId) ||
+                _subAccountRepository.Exists(x => x.PhoneNumber == phoneNumber) ||
+                _cameraAccountRepository.Exists(x => x.Mobile == phoneNumber))
+                return op.Failed("قبلا یک حساب با این شماره ثبت شده است");
+        }
 
 
-	    return op.Succcedded();
-	}
+        return op.Succcedded();
+    }
 
     public OperationResult ChangePasswordAndPhoneNumber(AccountChangePasswordAndPhoneNumber command)
     {
-	    OperationResult op = new();
-	    command.PhoneNumber = command.PhoneNumber.Trim();
-	    var entity = _accountRepository.Get(command.AccountId);
-	    if (entity == null)
-		    return op.Failed(ApplicationMessages.RecordNotFound);
-	    var validationResult = IsPhoneNumberAndPasswordValid(command.AccountId, command.PhoneNumber, command.Password, command.RePassword);
-	    if (validationResult.IsSuccedded == false)
-		    return validationResult;
+        OperationResult op = new();
+        command.PhoneNumber = command.PhoneNumber.Trim();
+        var entity = _accountRepository.Get(command.AccountId);
+        if (entity == null)
+            return op.Failed(ApplicationMessages.RecordNotFound);
+        var validationResult = IsPhoneNumberAndPasswordValid(command.AccountId, command.PhoneNumber, command.Password, command.RePassword);
+        if (validationResult.IsSuccedded == false)
+            return validationResult;
 
-	    if (!string.IsNullOrWhiteSpace(command.RePassword))
-	    {
+        if (!string.IsNullOrWhiteSpace(command.RePassword))
+        {
 
-		    entity.ChangePassword(_passwordHasher.Hash(command.Password));
-	    }
+            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);
-	    }
-	    _accountRepository.SaveChanges();
-	    return op.Succcedded();
-	}
+        if (!string.IsNullOrWhiteSpace(command.PhoneNumber))
+        {
+            entity.Edit(entity.Fullname, entity.Username, command.PhoneNumber, entity.RoleId, entity.ProfilePhoto, entity.RoleName);
+        }
+        _accountRepository.SaveChanges();
+        return op.Succcedded();
+    }
     //public UserClaimsResponseDTO GetClaimsForSignIn(Login command)
     //{
     //    var operation = new OperationResult();
@@ -815,12 +1005,12 @@ public class AccountApplication : IAccountApplication
         }
 
         (bool Verified, bool NeedUpgrade) result = _passwordHasher.Check(cameraAccount.Password, request.Password);
-        
+
         if (!result.Verified)
             throw new BadRequestException(ApplicationMessages.WrongUserPass);
 
         var mobile = string.IsNullOrWhiteSpace(cameraAccount.Mobile) ? " " : cameraAccount.Mobile;
-        
+
         var authViewModel = new CameraAuthViewModel(cameraAccount.id, cameraAccount.WorkshopId,
             cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId,
             cameraAccount.IsActiveSting);
@@ -829,4 +1019,10 @@ public class AccountApplication : IAccountApplication
 
         _authHelper.CameraSignIn(authViewModel);
     }
+
+    public async Task<GetPmUserDto> GetPmUserAsync(long accountId)
+    {
+        return await _pmUserQueryService.GetPmUserDataByAccountId(accountId);
+    }
+    
 }

AccountManagement.Application/AccountManagement.Application.csproj

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

AccountManagement.Application/CameraAccountApplication.cs

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

AccountManagement.Application/MediaApplication.cs

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

AccountManagement.Application/RoleApplication.cs

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

AccountManagement.Application/SubAccountApplication.cs

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

AccountManagement.Application/TaskSubjectApplication.cs

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

AccountManagement.Configuration/AccountManagement.Configuration.csproj

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

AccountManagement.Domain/AccountManagement.Domain.csproj

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

AccountManagement.Domain/InternalApiCaller/InternalApiCaller.cs

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

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

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

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

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

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

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

AccountMangement.Infrastructure.EFCore/Migrations/AccountContextModelSnapshot.cs

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

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/BackgroundInstitutionContract.Task.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <AssemblyName>BackgroundInstitutionContract.Task</AssemblyName>
@@ -12,8 +12,14 @@
       <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,5 +1,6 @@
 
 using _0_Framework.Application;
+using _0_Framework.Application.Sms;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.InstitutionContractAgg;
 using Hangfire;
@@ -13,18 +14,22 @@ public class JobSchedulerRegistrator
     private readonly IInstitutionContractRepository _institutionContractRepository;
     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)
+    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository, ISmsService smsService, ILogger<JobSchedulerRegistrator> logger)
     {
         _smsReminder = smsReminder;
         _backgroundJobClient = backgroundJobClient;
         _institutionContractRepository = institutionContractRepository;
+        _smsService = smsService;
+        _logger = logger;
     }
 
     public void Register()
     {
-
+        _logger.LogInformation("hangfire Started");
         RecurringJob.AddOrUpdate(
             "InstitutionContract.CreateFinancialTransaction",
             () => CreateFinancialTransaction(),
@@ -47,6 +52,11 @@ public class JobSchedulerRegistrator
             () => SendBlockSms(),
             "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
         );
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.SendInstitutionContractConfirmSms",
+            () => SendInstitutionContractConfirmSms(),
+            "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
+        );
     }
 
 
@@ -60,7 +70,7 @@ public class JobSchedulerRegistrator
         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)
         {
@@ -86,8 +96,8 @@ public class JobSchedulerRegistrator
             }
             catch (Exception e)
             {
-                //_smsService.Alarm("09114221321", "خطا-ایجاد سند مالی");
-          
+                await _smsService.Alarm("09114221321", "خطا-ایجاد سند مالی");
+
             }
            
         }
@@ -105,7 +115,7 @@ 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)
         {
@@ -133,6 +143,7 @@ public class JobSchedulerRegistrator
     [DisableConcurrentExecution(timeoutInSeconds: 1200)]
     public async System.Threading.Tasks.Task SendReminderSms()
     {
+        _logger.LogInformation("SendReminderSms job run");
         await _institutionContractRepository.SendReminderSmsForBackgroundTask();
     }
 
@@ -143,7 +154,20 @@ public class JobSchedulerRegistrator
     [DisableConcurrentExecution(timeoutInSeconds: 100)]
     public async System.Threading.Tasks.Task SendBlockSms()
     {
+        _logger.LogInformation("SendBlockSms job run");
         await _institutionContractRepository.SendBlockSmsForBackgroundTask();
     }
 
+
+    /// <summary>
+    /// ارسال پیامک یادآور تایید قراداد مالی
+    /// </summary>
+    /// <returns></returns>
+    [DisableConcurrentExecution(timeoutInSeconds: 100)]
+    public async System.Threading.Tasks.Task SendInstitutionContractConfirmSms()
+    {
+        _logger.LogInformation("SendInstitutionContractConfirmSms job run");
+        await _institutionContractRepository.SendInstitutionContractConfirmSmsTask();
+    }
+
 }

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/NullBoardNotificationPublisher.cs

@@ -0,0 +1,10 @@
+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,13 +7,47 @@ 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));
@@ -26,7 +60,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");
@@ -38,17 +72,28 @@ builder.Services.AddSingleton<IMongoDatabase>(mongoDatabase);
 
 #endregion
 
+builder.Services.AddProgramManagerApplication();
+builder.Services.AddProgramManagerInfrastructure(builder.Configuration);
+
+
 PersonalBootstrapper.Configure(builder.Services, connectionString);
 TestDbBootStrapper.Configure(builder.Services, connectionStringTestDb);
 AccountManagementBootstrapper.Configure(builder.Services, connectionString);
 WorkFlowBootstrapper.Configure(builder.Services, connectionString);
+
 QueryBootstrapper.Configure(builder.Services);
 JobsBootstrapper.Configure(builder.Services);
 builder.Services.AddHttpClient();
 builder.Services.AddHttpContextAccessor();
 builder.Services.AddSignalR();
 
+
+builder.Host.UseSerilog();
+Log.Information("SERILOG STARTED SUCCESSFULLY");
+
+
 var app = builder.Build();
+
 app.MapHub<SendSmsHub>("/sendSmsHub");
 
 app.MapHangfireDashboard();

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/appsettings.Development.json

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

BackgroundJobs/BackgroundJobs.Task/BackgroundJobs.Task.csproj

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

Company.Domain/CameraBugReportAgg/CameraBugReport.cs

@@ -92,12 +92,17 @@ public class CameraBugReport
     public string StackTrace { get; private set; }
     
     [BsonElement("status")]
+    [BsonRepresentation(MongoDB.Bson.BsonType.String)]
     public CameraBugReportStatus Status { get; private set; }
     
     [BsonElement("priority")]
+    [BsonRepresentation(MongoDB.Bson.BsonType.String)]
+    
     public CameraBugPriority Priority { get; private set; }
     
     [BsonElement("type")]
+    [BsonRepresentation(MongoDB.Bson.BsonType.String)]
+    
     public CameraBugReportType Type { get; private set; }
     
     [BsonElement("flavor")]

Company.Domain/Company.Domain.csproj

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

Company.Domain/ContarctingPartyAgg/IPersonalContractingPartyRepository.cs

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

Company.Domain/ContractAgg/IContractRepository.cs

@@ -48,6 +48,10 @@ 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
 
@@ -63,4 +67,8 @@ public interface IContractRepository : IRepository<long, Contract>
     ContractViweModel GetByWorkshopIdEmployeeIdInDates(long workshopId, long employeeId, DateTime startOfMonth, DateTime endOfMonth);
     List<ContractViweModel> GetByWorkshopIdInDates(long workshopId, DateTime contractStart, DateTime contractEnd);
     #endregion
-}
+
+}
+
+
+

Company.Domain/EmployeeAgg/IEmployeeRepository.cs

@@ -76,6 +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);
 	#endregion
 
 

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -56,7 +56,7 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     void UpdateStatusIfNeeded(long institutionContractId);
     Task<GetInstitutionVerificationDetailsViewModel> GetVerificationDetails(Guid id);
     Task<InstitutionContract> GetByPublicIdAsync(Guid id);
-    InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request);
+    InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request,string contractStart = null);
     InstitutionContractDiscountResponse ResetDiscountCreate(InstitutionContractResetDiscountForCreateRequest request);
     
 
@@ -140,6 +140,11 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     /// <returns></returns>
     Task SendReminderSmsToContractingParties(List<SmsListData> smsListData, string typeOfSms, string sendMessStart, string sendMessEnd);
 
+    /// <summary>
+    /// ارسال پیامک یادآور تایید قراداد مالی
+    /// </summary>
+    /// <returns></returns>
+    Task SendInstitutionContractConfirmSmsTask();
     #endregion
 
     #region CreateMontlyTransaction
@@ -154,4 +159,5 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     #endregion
 
     Task<long> GetIdByInstallmentId(long installmentId);
+    Task<InstitutionContract> GetPreviousContract(long currentInstitutionContractId);
 }

Company.Domain/InstitutionContractAgg/InstitutionContract.cs

@@ -98,6 +98,11 @@ 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; }
 
@@ -159,6 +164,10 @@ 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 = [];
@@ -262,6 +271,10 @@ public class InstitutionContract : EntityBase
     {
         WorkshopGroup = null;
     }
+    public void SetSigningType(InstitutionContractSigningType signingType)
+    {
+        SigningType = signingType;
+    }
 }
 
 public class InstitutionContractAmendment : EntityBase

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs

@@ -10,13 +10,15 @@ 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) : base(workshopName, hasRollCallPlan, 
+        int personnelCount, double price,long institutionContractWorkshopGroupId,
+        InstitutionContractWorkshopGroup workshopGroup,long workshopId,long initialWorkshopId) : base(workshopName, hasRollCallPlan, 
         hasRollCallPlanInPerson, hasCustomizeCheckoutPlan, hasContractPlan,
         hasContractPlanInPerson, hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price)
     {
         InstitutionContractWorkshopGroupId = institutionContractWorkshopGroupId;
         WorkshopGroup = workshopGroup;
         WorkshopId = workshopId;
+        InitialWorkshopId = initialWorkshopId;
     }
     public long InstitutionContractWorkshopGroupId { get; private set; }
     public InstitutionContractWorkshopGroup WorkshopGroup { get; private set; }

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopGroup.cs

@@ -23,6 +23,8 @@ 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)
     {
@@ -37,4 +39,10 @@ public class InstitutionContractWorkshopGroup : EntityBase
         CurrentWorkshops = updatedDetails.ToList();
         LastModifiedDate = DateTime.Now;
     }
+
+    public void AddCurrentWorkshop(InstitutionContractWorkshopCurrent currentWorkshop)
+    {
+        CurrentWorkshops.Add(currentWorkshop);
+        LastModifiedDate = DateTime.Now;
+    }
 }

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopInitial.cs

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

Company.Domain/InstitutionPlanAgg/IPlanPercentageRepository.cs

@@ -1,7 +1,9 @@
-using _0_Framework.Domain;
+using _0_Framework.Application;
+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;
 
@@ -26,4 +28,18 @@ 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,10 +73,12 @@ public interface IInsuranceListRepository:IRepository<long, InsuranceList>
     Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
 
 	Task<InsuranceListTabsCountViewModel> GetTabCounts(InsuranceListSearchModel searchModel);
+	Task<PagedResult<InsuranceClientListViewModel>> GetInsuranceClientList(InsuranceClientSearchModel searchModel);
 
 	#endregion
 
 	Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel);
+	Task<InsuranceClientPrintViewModel> ClientPrintOne(long id);
 }
 
 

Company.Domain/LeaveAgg/ILeaveRepository.cs

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

Company.Domain/WorkshopAgg/Workshop.cs

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

Company.Domain/_common/IUnitOfWork.cs

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

CompanyManagement.Infrastructure.Excel/CWS/CustomizeWorkshopGroupSettingExcelGenerator.cs

@@ -26,7 +26,7 @@ public class CustomizeWorkshopGroupSettingExcelGenerator
 {
     public static byte[] Generate(List<CustomizeWorkshopGroupExcelViewModel> groups)
     {
-        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         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.LicenseContext = LicenseContext.NonCommercial;
+        OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         using var package = new ExcelPackage();
         CreateSheet(data, package,"همه");
         CreateSheet(data.Where(x=>x.Status ==2).ToList(), package,"فعال");

CompanyManagement.Infrastructure.Excel/Checkout/CustomizeCheckoutExcelGenerator.cs

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

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

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

CompanyManagement.Infrastructure.Excel/EmployeeBankInfo/EmployeeBankInfoExcelGenerator.cs

@@ -7,7 +7,7 @@ public class EmployeeBankInfoExcelGenerator
 {
     public static byte[] Generate(List<EmployeeBankInfoExcelViewModel> list)
     {
-        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         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.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         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,86 +8,129 @@ 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<InstitutionContractViewModel> institutionContractViewModels)
+    public static byte[] GenerateExcel(List<InstitutionContractExcelViewModel> contractViewModels)
     {
-        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         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();
         
-        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);
+        // ایجاد شیت برای هر تب با داده‌های مربوطه
+        foreach (var viewModel in contractViewModels)
+        {
+            var worksheet = CreateWorksheet(package, viewModel.Tab);
+            CreateExcelSheet(viewModel.GetInstitutionContractListItemsViewModels ?? new List<GetInstitutionContractListItemsViewModel>(), worksheet);
+        }
 
         return package.GetAsByteArray();
     }
 
-    private static void CreateExcelSheet(List<InstitutionContractViewModel> institutionContractViewModels, ExcelWorksheet worksheet)
+    /// <summary>
+    /// ایجاد شیت بر اساس نوع تب
+    /// </summary>
+    private static ExcelWorksheet CreateWorksheet(ExcelPackage package, InstitutionContractListStatus? status)
     {
-        // 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 = "وضعیت مالی";
+        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)
+        };
+    }
 
-        using (var range = worksheet.Cells[1, 1, 1, 11])
+    /// <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])
         {
             range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
             range.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
@@ -110,30 +153,35 @@ public class InstitutionContractExcelGenerator
 
         int row = 2;
 
-        for (int i = 0; i < institutionContractViewModels.Count; i++)
+        for (int i = 0; i < contractItems.Count; i++)
         {
-            var contract = institutionContractViewModels[i];
-            var employers = contract.EmployerViewModels?.ToList() ?? new();
-            var workshops = contract.WorkshopViewModels?.ToList() ?? new();
+            var contract = contractItems[i];
+            var employers = contract.EmployerNames?.ToList() ?? new();
+            var workshops = contract.WorkshopNames?.ToList() ?? new();
 
-            int maxRows = Math.Max(employers.Count, workshops.Count);
-            maxRows = Math.Max(1, maxRows);
+            int maxRows = 1; // هر قرارداد فقط یک ردیف؛ نیازی به مرج عمودی نیست
 
             int startRow = row;
             int endRow = row + maxRows - 1;
 
-            // 🎨 دریافت رنگ پس‌زمینه از مقدار رنگ موجود در داده
-            string colorName = contract.ExpireColor.ToLower();
-            var fillColor = GetColorByName(colorName, contract.WorkshopCount, contract.IsContractingPartyBlock);
+            // 🎨 دریافت رنگ پس‌زمینه بر اساس وضعیت قرارداد
+            var fillColor = GetColorByStatus(contract.ListStatus, contract.WorkshopsCount);
 
             for (int j = 0; j < maxRows; j++)
             {
                 int currentRow = row + j;
 
-                worksheet.Cells[currentRow, 4].Value = j < employers.Count ? employers[j].FullName : null;
-                worksheet.Cells[currentRow, 5].Value = j < workshops.Count ? workshops[j].WorkshopFullName : null;
+                // پر کردن ستون‌های employer و workshop
+                var employerColIndex = GetColumnIndexForType(ExcelColumnType.EmployerName, visibleColumnIndices);
+                var workshopColIndex = GetColumnIndexForType(ExcelColumnType.WorkshopName, visibleColumnIndices);
 
-                for (int col = 1; col <= 11; col++)
+                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++)
                 {
                     var cell = worksheet.Cells[currentRow, col];
 
@@ -154,109 +202,235 @@ public class InstitutionContractExcelGenerator
             }
 
             // 🧱 مرج و مقداردهی ستون‌های اصلی
-            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);
+            FillColumnData(worksheet, contract, startRow, endRow, visibleColumnIndices);
 
             // 📦 بوردر ضخیم خارجی برای هر سطر
-            var boldRange = worksheet.Cells[startRow, 1, endRow, 11];
+            var boldRange = worksheet.Cells[startRow, 1, endRow, columnCount];
             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;
-        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;
+
+        // تنظیم عرض ستون‌ها بر اساس نوع ستون
+        for (int i = 0; i < visibleColumns.Count; i++)
+        {
+            int columnIndex = i + 1;
+            worksheet.Columns[columnIndex].Width = GetColumnWidth(visibleColumns[i]);
+        }
+
         worksheet.View.RightToLeft = true; // فارسی
-        //worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();
+    }
+
+    /// <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
+        };
     }
 
     private static double MoneyToDouble(string value)
     {
-        Console.WriteLine(value);
+        if (string.IsNullOrEmpty(value))
+            return 0;
+
         var min = value.Length > 1 ? value.Substring(0, 2) : "";
         var test = min == "\u200e\u2212" ? value.MoneyToDouble() * -1 : value.MoneyToDouble();
-
-        Console.WriteLine(test);
         return test;
     }
-    private static Color GetColorByName(string name, string workshopCount, string IsContractingPartyBlock)
+
+    /// <summary>
+    /// دریافت رنگ بر اساس وضعیت قرارداد
+    /// </summary>
+    private static Color GetColorByStatus(InstitutionContractListStatus status, int workshopsCount)
     {
-        return name switch
+        return status switch
         {
-            "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,
+            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,
             _ => Color.White
         };
     }
 
-}
+}
+
+public class InstitutionContractExcelViewModel
+{
+    public InstitutionContractListStatus? Tab { get; set; }
+    public List<GetInstitutionContractListItemsViewModel> GetInstitutionContractListItemsViewModels { get; set; }
+}

CompanyManagement.Infrastructure.Excel/RollCall/RollCallExcelGenerator.cs

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

CompanyManagement.Infrastructure.Excel/SalaryAid/SalaryAidImportExcel.cs

@@ -43,7 +43,7 @@ public class SalaryAidImportExcel
             ValidData = []
         };
 
-        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
 
         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.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         using (var package = new ExcelPackage())
         {
             var ws = package.Workbook.Worksheets.Add("Workshops");

CompanyManagement.Infrastructure.Mongo/CompanyManagement.Infrastructure.Mongo.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
@@ -11,7 +11,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="MongoDB.Driver" Version="3.5.0" />
+      <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.0" />
+      <PackageReference Include="MongoDB.Driver" Version="3.5.2" />
     </ItemGroup>
 
 </Project>

CompanyManagment.App.Contracts/CompanyManagment.App.Contracts.csproj

@@ -1,12 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<NoWarn>$(NoWarn);1591</NoWarn>
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.1" />
 		<PackageReference Include="PersianTools.Core" Version="2.0.4" />
+		<PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.1" />
 	</ItemGroup>
 
 	<ItemGroup>

CompanyManagment.App.Contracts/Contract/ContractListOrderType.cs

@@ -0,0 +1,12 @@
+namespace CompanyManagment.App.Contracts.Contract;
+
+public enum ContractListOrderType
+{
+    ByContractCreationDate,
+    BySignedContract,
+    ByUnSignedContract,
+    ByPersonnelCode,
+    ByPersonnelCodeDescending,
+    ByContractStartDate,
+    ByContractStartDateDescending
+}

CompanyManagment.App.Contracts/Contract/GetContractListForClientRequest.cs

@@ -0,0 +1,13 @@
+using _0_Framework.Application;
+
+namespace CompanyManagment.App.Contracts.Contract;
+
+public class GetContractListForClientRequest: PaginationRequest
+{
+    public int Year { get; set; }
+    public int Month { get; set; }
+    public string StartDate { get; set; }
+    public string EndDate { get; set; }
+    public long EmployeeId { get; set; }
+    public ContractListOrderType? OrderType { get; set; }
+}

CompanyManagment.App.Contracts/Contract/GetContractListForClientResponse.cs

@@ -0,0 +1,15 @@
+namespace CompanyManagment.App.Contracts.Contract;
+
+public class GetContractListForClientResponse
+{
+    public long Id { get; set; }
+    public string PersonnelCode { get; set; }
+    public string ContractNo { get; set; }
+    public string EmployeeFullName { get; set; }
+    public string ContractStart { get; set; }
+    public string ContractEnd { get; set; }
+    public bool IsSigned { get; set; }
+    public string DailyWage { get; set; }
+    public string AvgWorkingHour { get; set; }
+    public string FamilyAllowance { get; set; }
+}

CompanyManagment.App.Contracts/Contract/IContractApplication.cs

@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.Workshop;
 using System.Threading.Tasks;
+using _0_Framework.Application.Enums;
+
 namespace CompanyManagment.App.Contracts.Contract;
 
 public interface IContractApplication
@@ -45,16 +47,101 @@ public interface IContractApplication
     #region Client
 
     OperationResult Remove(long id);
+    
+    [Obsolete("این متد منسوخ شده است. لطفاً از متد GetContractListForClient استفاده کنید.")]
     List<ContractViweModel> SearchForClient(ContractSearchModel searchModel);
-    #endregion
+    
+    /// <summary>
+    /// لیست قراردادها برای کلاینت
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    Task<PagedResult<GetContractListForClientResponse>> 
+        GetContractListForClient(GetContractListForClientRequest searchModel);
+    Task<ContractPrintViewModel> PrintOneAsync(long id);
+    Task<List<ContractPrintViewModel>> PrintAllAsync(List<long> ids);
 
-    #region NewChangeByHeydari
+	#endregion
 
-    OperationResult DeleteAllContarcts(List<long> ids);
+	#region NewChangeByHeydari
+
+	OperationResult DeleteAllContarcts(List<long> ids);
     OperationResult DeleteContarcts(long id);
     List<long> CheckHasCheckout(List<long> ids);
     List<long> CheckHasSignature(List<long> ids);
     List<ContractViweModel> SearchForMainContract(ContractSearchModel searchModel);
 
     #endregion
+}
+
+public class ContractPrintViewModel
+{
+    public string ContractNo { get; set; }
+    public ContractPrintEmployerViewModel Employer { get; set; }
+    public ContractPrintEmployeeViewModel Employee { get; set; }
+    public ContractPrintTypeOfContractViewModel TypeOfContract { get; set; }
+    public ContractPrintFeesViewModel Fees { get; set; }
+    public string ConditionAndDetials { get; set; }
+    
+    
+}
+
+public class ContractPrintFeesViewModel
+{
+    public string DailyWage { get; set; }
+    public string FamilyAllowance { get; set; }
+    public string ConsumableItems { get; set; }
+    public string HousingAllowance { get; set; }
+}
+
+public class ContractPrintTypeOfContractViewModel
+{
+    public string ContractType { get; set; }
+    public string JobName { get; set; }
+    public string SetContractDate { get; set; }
+    public string ContarctStart { get; set; }
+    public string ContractEnd { get; set; }
+    public string WorkingHoursWeekly { get; set; }
+    public List<string> WorkshopAddress { get; set; }
+    
+    
+    
+}
+
+public class ContractPrintEmployeeViewModel
+{
+    public string FullName { get; set; }
+    public string NationalCode { get; set; }
+    public string IdNumber { get; set; }
+    public string DateOfBirth { get; set; }
+    public string FatherName { get; set; }
+    public string LevelOfEducation { get; set; }
+    public string Address { get; set; }
+    
+    
+}
+
+public class ContractPrintEmployerViewModel
+{
+    public LegalType LegalType { get; set; }
+    public ContractPrintRealEmployerViewModel RealEmployer { get; set; }
+    public ContractPrintLegalEmployerViewModel LegalEmployer { get; set; }
+    public string WorkshopName { get; set; }
+    public string Address { get; set; }
+    public string WorkshopCode { get; set; }
+    
+}
+
+public class ContractPrintLegalEmployerViewModel
+{
+    public string CompanyName { get; set; }
+    public string NationalId  { get; set; }
+    public string RegisterId { get; set; }
+}
+
+public class ContractPrintRealEmployerViewModel
+{
+    public string FullName { get; set; }
+    public string NationalCode { get; set; }
+    public string IdNumber { get; set; }
 }

CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs

@@ -60,7 +60,7 @@ public interface IEmployeeApplication
     /// <returns></returns>
     Task<OperationResult<EmployeeByNationalCodeInWorkshopViewModel>>
         ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(string nationalCode,
-            string birthDate, long workshopId);
+            string birthDate,bool authorizedCanceled, long workshopId);
 
     /// <summary>
     /// پرسنل هایی که در کارگاهی از سمت ادمین شروع به کار کرده اند
@@ -94,7 +94,42 @@ public interface IEmployeeApplication
 	/// </summary>
 	/// <returns></returns>
 	Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel);
+	
+	/// <summary>
+	/// لیست کل پرسنل کلاینت
+	/// </summary>
+	/// <param name="searchModel"></param>
+	/// <param name="workshopId"></param>
+	/// <returns></returns>
+	Task<List<GetClientEmployeeListViewModel>> GetClientEmployeeList(GetClientEmployeeListSearchModel searchModel, long workshopId);
 
 	#endregion
 
+}
+
+public class GetClientEmployeeListSearchModel
+{
+}
+
+public class GetClientEmployeeListViewModel
+{
+	public string FullName { get; set; }
+	public long EmployeeId { get; set; }
+	public long WorkshopId { get; set; }
+	public long PersonnelCode { get; set; }
+	public string MaritalStatus { get; set; }
+	public string NationalCode { get; set; }
+	public string IdNumber { get; set; }
+	public string DateOfBirthFa { get; set; }
+	public string FatherName { get; set; }
+	public int ChildrenCount { get; set; }
+	public string LastStartInsuranceWork { get; set; }
+	public string LastLeftInsuranceWork { get; set; }
+	public string LastStartContractWork { get; set; }
+	public string LastLeftContractWork { get; set; }
+	public bool HasContractLeftWork { get; set; }
+	public bool HasInsuranceLeftWork { get; set; }
+	public bool LeftWorkCompletely { get; set; }
+	public bool PendingStartWork { get; set; }
+	public bool PendingLeftWork { get; set; }
 }

CompanyManagment.App.Contracts/EmployeeDocuments/WorkshopWithEmployeeDocumentsViewModel.cs

@@ -13,5 +13,6 @@ namespace CompanyManagment.App.Contracts.EmployeeDocuments
 		public string EmployerName { get; set; }
         public List<EmployeeDocumentItemViewModel> SubmittedItems { get; set; }
         public int EmployeesWithoutDocumentCount { get; set; }
+        public long EmployeeId { get; set; }
     }
 }

CompanyManagment.App.Contracts/InstitutionContract/ContractSigningType.cs

@@ -0,0 +1,17 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public enum InstitutionContractSigningType
+{ 
+    /// <summary>
+    /// قدیمی
+    /// </summary>
+    Legacy = 0,
+    /// <summary>
+    /// الکترونیکی با کد یکبار مصرف
+    /// </summary>
+    OtpBased = 1,
+    /// <summary>
+    /// به صورت فیزیکی
+    /// </summary>
+    Physical = 2
+}

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListItemsViewModel.cs

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

CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Application.Sms;
 using CompanyManagment.App.Contracts.Checkout;
-using CompanyManagment.App.Contracts.Law;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.App.Contracts.WorkshopPlan;
@@ -260,154 +259,13 @@ public interface IInstitutionContractApplication
     /// <returns></returns>
     Task<InstitutionContractPrintViewModel> PrintOneAsync(long id);
 
-    Task<OperationResult> SetPendingWorkflow(long entityId);
+    Task<OperationResult> SetPendingWorkflow(long entityId,InstitutionContractSigningType signingType);
     Task<long> GetIdByInstallmentId(long installmentId);
-
-}
-
-public class InstitutionContractDiscountResponse
-{
-    public InstitutionContractDiscountOneTimeViewModel OneTime { get; set; }
-    public InstitutionContractDiscountMonthlyViewModel Monthly { get; set; }
-}
-
-public class InstitutionContractDiscountMonthlyViewModel:InstitutionContractDiscountOneTimeViewModel
-{
-    public List<MonthlyInstallment> Installments { get; set; }
-}
-
-public class InstitutionContractDiscountOneTimeViewModel
-{
     /// <summary>
-    /// مجموع مبالغ
+    /// تایید قرارداد مالی به صورت دستی
     /// </summary>
-    public string TotalAmount { get; set; }
-    /// <summary>
-    /// ارزش افزوده
-    /// </summary>
-    public string Tax { get; set; }
-    /// <summary>
-    /// مبلغ قابل پرداخت
-    /// </summary>
-    public string PaymentAmount { get; set; }
-    
-    public string DiscountedAmount { get; set; }
-    
-    public int DiscountPercetage { get; set; }
+    /// <param name="institutionContractId"></param>
+    /// <returns></returns>
+    Task<OperationResult> VerifyInstitutionContractManually(long institutionContractId);
 
-    public string Obligation { get; set; }
-    
-    public string OneMonthAmount { get; set; }
-}
-
-public class InstitutionContractResetDiscountForCreateRequest
-{
-    public int DiscountPercentage { get; set; }
-    public double TotalAmount { get; set; }
-    public bool IsInstallment { get; set; }
-    public InstitutionContractDuration Duration { get; set; }
-    public double OneMonthAmount { get; set; }
-}
-
-public class InstitutionContractSetDiscountForExtensionRequest
-{
-    public Guid TempId { get; set; }
-    public int DiscountPercentage { get; set; }
-    public double TotalAmount { get; set; }
-    public bool IsInstallment { get; set; }
-}
-public class InstitutionContractResetDiscountForExtensionRequest
-{
-    public Guid TempId { get; set; }
-    public bool IsInstallment { get; set; }
-}
-
-
-public class InstitutionContractSetDiscountRequest
-{
-    public int DiscountPercentage { get; set; }
-    public double TotalAmount { get; set; }
-    public InstitutionContractDuration Duration { get; set; }
-    public double OneMonthAmount { get; set; }
-    public bool IsInstallment { get; set; }
-}
-
-public class InstitutionContractPrintViewModel
-{
-    public InstitutionContratVerificationParty FirstParty { get; set; }
-    public InstitutionContratVerificationParty SecondParty { get; set; }
-    public string ContractNo { get; set; }
-    public string CreationDate { get; set; }
-    public string ContractStart { get; set; }
-    public string ContractEnd { get; set; }
-    public List<GetInstitutionVerificationDetailsWorkshopsViewModel> Workshops { get; set; }
-    public string TotalPrice { get; set; }
-    public string TaxPrice { get; set; }
-    public string PaymentPrice { get; set; }
-    public string VerifyCode { get; set; }
-    public string VerifyDate { get; set; }
-    public string VerifyTime { get; set; }
-    public string VerifierFullName { get; set; }
-    public string VerifierPhoneNumber { get; set; }
-    public LawViewModel LawViewModel { get; set; }
-    public string Obligation { get; set; }
-}
-
-public class InsertAmendmentTempWorkshopResponse
-{
-    public Guid WorkshopTempId { get; set; }
-    public string Amount { get; set; }
-}
-
-public class InstitutionContractAmendmentWorkshopsResponse
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public List<InstitutionContractAmendmentTempWorkshopViewModel> Workshops { get; set; }
-
-    public Guid TempId { get; set; }
-
-}
-
-public class InstitutionContractSelectListViewModel : SelectListViewModel;
-
-public class InstitutionContractExtensionInquiryResponse
-{
-    public long Id { get; set; }
-    public string FName { get; set; }
-    public string LName { get; set; }
-    public string DateOfBirthFa { get; set; }
-    public string FatherName { get; set; }
-    public string IdNumberSerial { get; set; }
-    public string IdNumber { get; set; }
-    public string Address { get; set; }
-    public string Phone { get; set; }
-    public string City { get; set; }
-    public string State { get; set; }
-    public long RepresentativeId { get; set; }
-    public string NationalCode { get; set; }
-}
-
-
-
-public class InstitutionContractExtensionPaymentMonthly:InstitutionContractExtensionPaymentOneTime
-{
-    public List<MonthlyInstallment> Installments { get; set; }
-}
-
-public class InstitutionContractExtensionPaymentOneTime
-{
-    /// <summary>
-    /// مجموع مبالغ
-    /// </summary>
-    public string TotalAmount { get; set; }
-    /// <summary>
-    /// ارزش افزوده
-    /// </summary>
-    public string Tax { get; set; }
-    /// <summary>
-    /// مبلغ قابل پرداخت
-    /// </summary>
-    public string PaymentAmount { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/InsertAmendmentTempWorkshopResponse.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InsertAmendmentTempWorkshopResponse
+{
+    public Guid WorkshopTempId { get; set; }
+    public string Amount { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractAmendmentWorkshopsResponse.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractAmendmentWorkshopsResponse
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public List<InstitutionContractAmendmentTempWorkshopViewModel> Workshops { get; set; }
+
+    public Guid TempId { get; set; }
+
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractDiscountResponse.cs

@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using CompanyManagment.App.Contracts.TemporaryClientRegistration;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractDiscountResponse
+{
+    public InstitutionContractDiscountOneTimeViewModel OneTime { get; set; }
+    public InstitutionContractDiscountMonthlyViewModel Monthly { get; set; }
+}
+public class InstitutionContractDiscountMonthlyViewModel:InstitutionContractDiscountOneTimeViewModel
+{
+    public List<MonthlyInstallment> Installments { get; set; }
+}
+
+public class InstitutionContractDiscountOneTimeViewModel
+{
+    /// <summary>
+    /// مجموع مبالغ
+    /// </summary>
+    public string TotalAmount { get; set; }
+    /// <summary>
+    /// ارزش افزوده
+    /// </summary>
+    public string Tax { get; set; }
+    /// <summary>
+    /// مبلغ قابل پرداخت
+    /// </summary>
+    public string PaymentAmount { get; set; }
+    
+    public string DiscountedAmount { get; set; }
+    
+    public int DiscountPercetage { get; set; }
+
+    public string Obligation { get; set; }
+    
+    public string OneMonthAmount { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionInquiryResponse.cs

@@ -0,0 +1,18 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractExtensionInquiryResponse
+{
+    public long Id { get; set; }
+    public string FName { get; set; }
+    public string LName { get; set; }
+    public string DateOfBirthFa { get; set; }
+    public string FatherName { get; set; }
+    public string IdNumberSerial { get; set; }
+    public string IdNumber { get; set; }
+    public string Address { get; set; }
+    public string Phone { get; set; }
+    public string City { get; set; }
+    public string State { get; set; }
+    public long RepresentativeId { get; set; }
+    public string NationalCode { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionPaymentOneTime.cs

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

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPaymentOneTimeViewModel.cs

@@ -18,6 +18,16 @@ public class InstitutionContractPaymentOneTimeViewModel
     /// </summary>
     public string PaymentAmount { get; set; }
 
+    /// <summary>
+    /// مجموع مبالغ بدون تخفیف
+    /// </summary>
+    public string TotalAmountWithoutDiscount { get; set; }
+
+    /// <summary>
+    /// مبلغ یک ماه بدون تخفیف
+    /// </summary>
+    public string OneMonthPaymentWithoutDiscount { get; set; }
+
     public string DiscountedAmount { get; set; }
     public int DiscountPercetage { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPrintViewModel.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using CompanyManagment.App.Contracts.Law;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractPrintViewModel
+{
+    public InstitutionContratVerificationParty FirstParty { get; set; }
+    public InstitutionContratVerificationParty SecondParty { get; set; }
+    public string ContractNo { get; set; }
+    public string CreationDate { get; set; }
+    public string ContractStart { get; set; }
+    public string ContractEnd { get; set; }
+    public List<GetInstitutionVerificationDetailsWorkshopsViewModel> Workshops { get; set; }
+    public string TotalPrice { get; set; }
+    public string TaxPrice { get; set; }
+    public string PaymentPrice { get; set; }
+    public string OneMonthPrice { get; set; }
+    public string VerifyCode { get; set; }
+    public string VerifyDate { get; set; }
+    public string VerifyTime { get; set; }
+    public string VerifierFullName { get; set; }
+    public string VerifierPhoneNumber { get; set; }
+    public LawViewModel LawViewModel { get; set; }
+    public string Obligation { get; set; }
+    public string OneMonthWithoutTax { get; set; }
+    public string OneMonthTax { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractResetDiscountForCreateRequest.cs

@@ -0,0 +1,10 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractResetDiscountForCreateRequest
+{
+    public int DiscountPercentage { get; set; }
+    public double TotalAmount { get; set; }
+    public bool IsInstallment { get; set; }
+    public InstitutionContractDuration Duration { get; set; }
+    public double OneMonthAmount { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractResetDiscountForExtensionRequest.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractResetDiscountForExtensionRequest
+{
+    public Guid TempId { get; set; }
+    public bool IsInstallment { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractSelectListViewModel.cs

@@ -0,0 +1,5 @@
+using _0_Framework.Application;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractSelectListViewModel : SelectListViewModel;

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractSetDiscountForExtensionRequest.cs

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

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractSetDiscountRequest.cs

@@ -0,0 +1,10 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractSetDiscountRequest
+{
+    public int DiscountPercentage { get; set; }
+    public double TotalAmount { get; set; }
+    public InstitutionContractDuration Duration { get; set; }
+    public double OneMonthAmount { get; set; }
+    public bool IsInstallment { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractViewModel.cs

@@ -76,5 +76,7 @@ public class InstitutionContractViewModel
     public bool IsInstallment { get; set; }
     public InstitutionContractVerificationStatus VerificationStatus { get; set; }
 
+    public InstitutionContractSigningType? SigningType { get; set; }
+
     public List<InstitutionContractInstallmentViewModel> InstallmentList { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionCreationVerificationSmsDto.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public record InstitutionCreationVerificationSmsDto
+{
+    public string Number{ get; set; }
+    public string FullName { get; set; }
+    public Guid InstitutionId { get; set; }
+    public long ContractingPartyId { get; set; }
+    public long InstitutionContractId { get; set; }
+};

CompanyManagment.App.Contracts/InstitutionPlan/CreateServiceAmountDto.cs

@@ -0,0 +1,51 @@
+namespace CompanyManagment.App.Contracts.InstitutionPlan;
+
+public class CreateServiceAmountDto
+{
+    /// <summary>
+    /// آی دی
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// قرارداد و تصفیه
+    /// درصد از مزد روزانه
+    /// string
+    /// </summary>
+    public string ContractAndCheckoutPercentStr { get; set; }
+
+    /// <summary>
+    /// بیمه
+    /// درصد از مزد روزانه
+    /// string
+    /// </summary>
+    public string InsurancePercentStr { get; set; }
+
+    /// <summary>
+    /// حضورغباب
+    /// درصد از مزد روزانه
+    /// string
+    /// </summary>
+    public string RollCallPercentStr { get; set; }
+
+    /// <summary>
+    /// فیش غیر رسمی
+    /// درصد از مزد روزانه
+    /// string
+    /// </summary>
+    public string CustomizeCheckoutPercentStr { get; set; }
+
+    /// <summary>
+    /// خدمات حضوری قرداد و تصفیه
+    /// درصد از مزد روزانه
+    /// string
+    /// </summary>
+    public string ContractAndCheckoutInPersonPercentStr { get; set; }
+
+    /// <summary>
+    /// خدمات حضوری بیمه
+    /// درصد از مزد روزانه
+    /// string
+    /// </summary>
+    public string InsuranceInPersonPercentStr { get; set; }
+}