feat: remove temporary institution amendment record after saving changes

# Conflicts:
#	0_Framework/Application/Sms/ISmsService.cs
#	CompanyManagment.EFCore/Services/SmsService.cs

0_Framework/Application/PaymentGateway/IPaymentGateway.cs

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

0_Framework/Application/PaymentGateway/SepehrPaymentGateway.cs

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

0_Framework/Application/Sms/ISmsService.cs

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

AccountManagement.Application.Contracts/Account/IAccountApplication.cs

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

AccountManagement.Application/AccountApplication.cs

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

Company.Domain/AndroidApkVersionAgg/AndroidApkVersion.cs

@@ -1,7 +1,6 @@
 using System;
 using _0_Framework.Application;
 using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.AndroidApkVersion;
 
 namespace Company.Domain.AndroidApkVersionAgg;
 
@@ -9,17 +8,14 @@ public class AndroidApkVersion:EntityBase
 {
     private AndroidApkVersion () { }
 
-    public AndroidApkVersion( string versionName,string versionCode, IsActive isActive, string path, ApkType apkType, bool isForce = false)
+    public AndroidApkVersion( string versionName,string versionCode, IsActive isActive, string path)
     {
         
         VersionName = versionName;
         VersionCode = versionCode;
         IsActive = isActive;
         Path = path;
-        ApkType = apkType;
-        IsForce = isForce;
-        var appName = apkType == ApkType.WebView ? "Gozareshgir-WebView" : "Gozareshgir-FaceDetection";
-        Title = $"{appName}-{versionName}-{CreationDate:g}";
+        Title = $"Gozareshgir-{versionName}-{CreationDate:g}";
     }
 
     public string Title { get; private set; }
@@ -27,9 +23,6 @@ public class AndroidApkVersion:EntityBase
     public string VersionCode{ get; private set; }
     public IsActive IsActive { get; private set; }
     public string Path { get; set; }
-    public ApkType ApkType { get; private set; }
-    public bool IsForce { get; private set; }
-    
 
     public void Active()
     {
@@ -40,4 +33,4 @@ public class AndroidApkVersion:EntityBase
     {
         IsActive = IsActive.False;
     }
-}
+}

Company.Domain/AndroidApkVersionAgg/IAndroidApkVersionRepository.cs

@@ -1,14 +1,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using _0_Framework_b.Domain;
-using CompanyManagment.App.Contracts.AndroidApkVersion;
 
 namespace Company.Domain.AndroidApkVersionAgg;
 
 public interface IAndroidApkVersionRepository:IRepository<long,AndroidApkVersion>
 {
-    IQueryable<AndroidApkVersion> GetActives(ApkType apkType);
-    AndroidApkVersion GetLatestActive(ApkType apkType);
+    IQueryable<AndroidApkVersion> GetActives();
     void Remove(AndroidApkVersion entity);
-    System.Threading.Tasks.Task<string> GetLatestActiveVersionPath(ApkType apkType);
+    System.Threading.Tasks.Task<string> GetLatestActiveVersionPath();
 }

Company.Domain/EmployeeFaceEmbeddingAgg/EmployeeFaceEmbedding.cs

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

Company.Domain/EmployeeFaceEmbeddingAgg/IEmployeeFaceEmbeddingRepository.cs

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

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -6,7 +6,6 @@ using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.Workshop;
-using Microsoft.AspNetCore.Mvc;
 
 namespace Company.Domain.InstitutionContractAgg;
 
@@ -77,4 +76,6 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
 
     Task<List<InstitutionContractSelectListViewModel>> GetInstitutionContractSelectList(string search, string selected);
     Task<List<InstitutionContractPrintViewModel>> PrintAllAsync(List<long> ids);
+    Task AmendmentComplete(InstitutionContractAmendmentCompleteRequest request);
+    Task<GetInstitutionAmendmentVerificationDetailsViewModel> GetAmendmentVerificationDetails(Guid id, long amendmentId);
 }

Company.Domain/InstitutionContractAgg/InstitutionContract.cs

@@ -252,6 +252,11 @@ public class InstitutionContract : EntityBase
     {
         WorkshopGroup = null;
     }
+
+    public void AddAmendment(InstitutionContractAmendment amendment)
+    {
+        Amendments.Add(amendment);
+    }
 }
 
 public class InstitutionContractAmendment : EntityBase
@@ -259,14 +264,15 @@ public class InstitutionContractAmendment : EntityBase
     private InstitutionContractAmendment(){}
     public InstitutionContractAmendment(long institutionContractId,
         List<InstitutionContractInstallment> installments, double amount, bool hasInstallment,
-        InstitutionContractAmendmentChange amendmentChange, long lawId)
+        List<InstitutionContractAmendmentChange> amendmentChanges, long lawId)
     {
         InstitutionContractId = institutionContractId;
         Installments = installments is { Count: > 0} ? installments : [];
         Amount = amount;
         HasInstallment = hasInstallment;
-        AmendmentChanges = [amendmentChange];
+        AmendmentChanges = amendmentChanges;
         LawId = lawId;
+        VerificationStatus = InstitutionContractVerificationStatus.PendingForVerify;
     }
 
     public long InstitutionContractId { get; set; }
@@ -280,6 +286,15 @@ public class InstitutionContractAmendment : EntityBase
 
     public long LawId { get; set; }
 
+    
+    public string VerifierPhoneNumber { get; private set; }
+
+    public string VerifierFullName { get; private set; }
+
+    public InstitutionContractVerificationStatus VerificationStatus { get; set; }
+
+    public DateTime VerifyCodeCreation { get; set; }
+    
     public void SetVerifyCode(string code,string verifierFullName, string verifierPhoneNumber)
     {
         VerifyCode = code;
@@ -287,25 +302,22 @@ public class InstitutionContractAmendment : EntityBase
         VerifierFullName = verifierFullName;
         VerifierPhoneNumber = verifierPhoneNumber;
     }
-
-    public string VerifierPhoneNumber { get; private set; }
-
-    public string VerifierFullName { get; private set; }
-
-    public DateTime VerifyCodeCreation { get; set; }
+    public void Verified()
+    {
+        VerificationStatus = InstitutionContractVerificationStatus.Verified;
+    }
 }
 
 public class InstitutionContractAmendmentChange : EntityBase
 {
     private InstitutionContractAmendmentChange() { }
-    private InstitutionContractAmendmentChange(long institutionContractAmendmentId,
-        InstitutionContractAmendment institutionContractAmendment, InstitutionContractAmendmentChangeType changeType,
-        DateTime changeDateGr, bool? hasRollCallPlan, bool? hasCustomizeCheckoutPlan, bool? hasContractPlan,
+    
+    private InstitutionContractAmendmentChange(InstitutionContractAmendmentChangeType changeType,
+        DateTime changeDateGr, bool? hasCustomizeCheckoutPlan, bool? hasContractPlan,
         bool? hasContractPlanInPerson, bool? hasInsurancePlan, bool? hasInsurancePlanInPerson, int? personnelCount,
-        long? workshopDetailsId)
+        bool? hasRollCallPlan, bool? hasRollCallInPerson,
+        long? currentWorkshopId, int personnelCountDifference)
     {
-        InstitutionContractAmendmentId = institutionContractAmendmentId;
-        InstitutionContractAmendment = institutionContractAmendment;
         ChangeType = changeType;
         ChangeDateGr = changeDateGr;
         HasRollCallPlan = hasRollCallPlan;
@@ -315,9 +327,80 @@ public class InstitutionContractAmendmentChange : EntityBase
         HasInsurancePlan = hasInsurancePlan;
         HasInsurancePlanInPerson = hasInsurancePlanInPerson;
         PersonnelCount = personnelCount;
-        WorkshopDetailsId = workshopDetailsId;
+        PersonnelCountDifference = personnelCountDifference;
+        CurrentWorkshopId = currentWorkshopId;
+        HasRollCallInPerson = hasRollCallInPerson;
     }
 
+    /// <summary>
+    /// تغییر تعداد پرسنل
+    /// </summary>
+    public static InstitutionContractAmendmentChange CreatePersonCountChange(
+        DateTime changeDateGr, int personnelCount, int personnelCountDifference,
+        long currentWorkshopId)
+    {
+        return new InstitutionContractAmendmentChange(
+            changeType: InstitutionContractAmendmentChangeType.PersonCount,
+            changeDateGr: changeDateGr,
+            hasCustomizeCheckoutPlan: null,
+            hasContractPlan: null,
+            hasContractPlanInPerson: null,
+            hasInsurancePlan: null,
+            hasInsurancePlanInPerson: null,
+            personnelCount: personnelCount,
+            hasRollCallPlan: null,
+            hasRollCallInPerson: null,
+            currentWorkshopId: currentWorkshopId,
+            personnelCountDifference: personnelCountDifference);
+    }
+
+    /// <summary>
+    /// تغییر خدمات
+    /// </summary>
+    public static InstitutionContractAmendmentChange CreateServicesChange(
+        DateTime changeDateGr, long currentWorkshopId, bool hasRollCallPlan, bool hasRollCallInPerson,
+        bool hasCustomizeCheckoutPlan, bool hasContractPlan, bool hasContractPlanInPerson,
+        bool hasInsurancePlan, bool hasInsurancePlanInPerson)
+    {
+        return new InstitutionContractAmendmentChange(
+            changeType: InstitutionContractAmendmentChangeType.Services,
+            changeDateGr: changeDateGr,
+            hasCustomizeCheckoutPlan: hasCustomizeCheckoutPlan,
+            hasContractPlan: hasContractPlan,
+            hasContractPlanInPerson: hasContractPlanInPerson,
+            hasInsurancePlan: hasInsurancePlan,
+            hasInsurancePlanInPerson: hasInsurancePlanInPerson,
+            personnelCount: null,
+            hasRollCallPlan: hasRollCallPlan,
+            hasRollCallInPerson: hasRollCallInPerson,
+            currentWorkshopId: currentWorkshopId,
+            personnelCountDifference: 0);
+    }
+
+    /// <summary>
+    /// ایجاد کارگاه جدید
+    /// </summary>
+    public static InstitutionContractAmendmentChange CreateWorkshopCreatedChange(
+        DateTime changeDateGr, bool hasRollCallPlan, bool hasRollCallInPerson,
+        bool hasCustomizeCheckoutPlan, bool hasContractPlan, bool hasContractPlanInPerson,
+        bool hasInsurancePlan, bool hasInsurancePlanInPerson,int personnelCount)
+    {
+        return new InstitutionContractAmendmentChange(
+            changeType: InstitutionContractAmendmentChangeType.WorkshopCreated,
+            changeDateGr: changeDateGr,
+            hasCustomizeCheckoutPlan: hasCustomizeCheckoutPlan,
+            hasContractPlan: hasContractPlan,
+            hasContractPlanInPerson: hasContractPlanInPerson,
+            hasInsurancePlan: hasInsurancePlan,
+            hasInsurancePlanInPerson: hasInsurancePlanInPerson,
+            personnelCount: personnelCount,
+            hasRollCallPlan: hasRollCallPlan,
+            hasRollCallInPerson: hasRollCallInPerson,
+            currentWorkshopId: null,
+            personnelCountDifference: 0);
+    }
+
+
     public long InstitutionContractAmendmentId { get; private set; }
     public InstitutionContractAmendment InstitutionContractAmendment { get; private set; }
     public InstitutionContractAmendmentChangeType ChangeType { get; private set; }
@@ -328,6 +411,8 @@ public class InstitutionContractAmendmentChange : EntityBase
     /// </summary>
     public bool? HasRollCallPlan { get; private set; }
 
+    public bool? HasRollCallInPerson { get; set; }
+
     /// <summary>
     /// پلن فیش غیر رسمی
     /// </summary>
@@ -357,11 +442,17 @@ public class InstitutionContractAmendmentChange : EntityBase
     /// تعداد پرسنل
     /// </summary>
     public int? PersonnelCount { get; private set; }
+    
+    /// <summary>
+    /// مقدار تغییرات تعداد پرسنل
+    /// </summary>
+    public int PersonnelCountDifference { get; set; }
+    
 
     /// <summary>
     /// تعداد کارگاه
     /// </summary>
-    public long? WorkshopDetailsId { get; private set; }
+    public long? CurrentWorkshopId { get; private set; }
 }
 
 public enum InstitutionContractAmendmentChangeType

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopBase.cs

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

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs

@@ -10,9 +10,10 @@ 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,bool isAmendment) : base(workshopName, hasRollCallPlan, 
         hasRollCallPlanInPerson, hasCustomizeCheckoutPlan, hasContractPlan,
-        hasContractPlanInPerson, hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price)
+        hasContractPlanInPerson, hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price,isAmendment)
     {
         InstitutionContractWorkshopGroupId = institutionContractWorkshopGroupId;
         WorkshopGroup = workshopGroup;

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopGroup.cs

@@ -31,6 +31,13 @@ public class InstitutionContractWorkshopGroup : EntityBase
         InitialWorkshops = initialWorkshops.ToList();
         LastModifiedDate = DateTime.Now;
     }
+    
+    public void AddAmendmentWorkshops(List<InstitutionContractWorkshopInitial> amendmentDetails)
+    {
+        InitialWorkshops.AddRange(amendmentDetails);
+        LastModifiedDate = DateTime.Now;
+    }
+    
 
     public void UpdateCurrentWorkshops(List<InstitutionContractWorkshopCurrent> updatedDetails)
     {

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopInitial.cs

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

Company.Domain/InstitutionContractAmendmentTempAgg/InstitutionContractAmendmentTemp.cs

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

Company.Domain/PaymentTransactionAgg/PaymentTransaction.cs

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

CompanyManagement.Infrastructure.Mongo/EmployeeFaceEmbeddingRepo/EmployeeFaceEmbeddingRepository.cs

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

CompanyManagment.App.Contracts/AndroidApkVersion/ApkType.cs

@@ -1,8 +0,0 @@
-namespace CompanyManagment.App.Contracts.AndroidApkVersion;
-
-public enum ApkType
-{
-    WebView,
-    FaceDetection
-}
-

CompanyManagment.App.Contracts/AndroidApkVersion/IAndroidApkVersionApplication.cs

@@ -4,15 +4,12 @@ using Microsoft.AspNetCore.Http;
 
 namespace CompanyManagment.App.Contracts.AndroidApkVersion;
 
-public record AndroidApkVersionInfo(int LatestVersionCode, string LatestVersionName, bool ShouldUpdate, bool IsForceUpdate, string DownloadUrl, string ReleaseNotes);
-
 public interface IAndroidApkVersionApplication
 {
-    Task<OperationResult> CreateAndActive(IFormFile file, ApkType apkType, bool isForce = false);
-    Task<OperationResult> CreateAndDeActive(IFormFile file, ApkType apkType, bool isForce = false);
-    Task<string> GetLatestActiveVersionPath(ApkType apkType);
-    Task<AndroidApkVersionInfo> GetLatestActiveInfo(ApkType apkType, int currentVersionCode);
+    Task<OperationResult> CreateAndActive(IFormFile file);
+    Task<OperationResult> CreateAndDeActive(IFormFile file);
+    Task<string> GetLatestActiveVersionPath();
     OperationResult Remove(long id);
 
-    bool HasAndroidApkToDownload(ApkType apkType);
+    bool HasAndroidApkToDownload();
 }

CompanyManagment.App.Contracts/EmployeeFaceEmbedding/EmployeeFaceEmbeddingDto.cs

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

CompanyManagment.App.Contracts/EmployeeFaceEmbedding/EmployeeFaceEmbeddingDtos.cs

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

CompanyManagment.App.Contracts/EmployeeFaceEmbedding/IEmployeeFaceEmbeddingApplication.cs

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

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionVerificationDetailsWorkshopsViewModel.cs

@@ -4,6 +4,8 @@ public class GetInstitutionVerificationDetailsWorkshopsViewModel
 {
     public string Name { get; set; }
     public int PersonnelCount { get; set; }
+    
+    public WorkshopServicesViewModel OldServices { get; set; }
     public WorkshopServicesViewModel Services { get; set; }
     public string Price { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

@@ -244,13 +244,41 @@ public interface IInstitutionContractApplication
     #endregion
 
     Task<OperationResult> ResendVerifyLink(long institutionContractId);
-
+    Task AmendmentComplete(InstitutionContractAmendmentCompleteRequest request);
     /// <summary>
     /// دیتای پرینت قرارداد مالی
     /// </summary>
     /// <param name="id"></param>
     /// <returns></returns>
     Task<InstitutionContractPrintViewModel> PrintOneAsync(long id);
+
+    Task<GetInstitutionAmendmentVerificationDetailsViewModel> GetAmendmentVerificationDetails(Guid id, long amendmentId);
+}
+
+public class GetInstitutionAmendmentVerificationDetailsViewModel
+{
+    public InstitutionContratVerificationParty FirstParty { get; set; }
+    public InstitutionContratVerificationParty SecondParty { get; set; }
+    public string ContractNo { get; set; }
+    public string AmendmentCreationDate { get; set; }
+    public string AmendmentStart { get; set; }
+    public string AmendmentEnd { get; set; }
+    public List<GetInstitutionVerificationDetailsWorkshopsViewModel> Workshops { get; set; }
+    public string TotalPrice { get; set; }
+    public string TaxPrice { get; set; }
+    public string PaymentPrice { get; set; }
+    public List<InstitutionContractInstallmentViewModel> Installments { get; set; }
+    public bool IsInstallment { get; set; }
+    
+}
+
+public class InstitutionContractAmendmentCompleteRequest
+{
+    public Guid TempId { get; set; }
+    public bool IsInstallment { get; set; }
+    public long LawId { get; set; }
+
+
 }
 
 public class InstitutionContractPrintViewModel

CompanyManagment.App.Contracts/InstitutionContract/InsitutionContractAmendmentPaymentResponse.cs

@@ -1,11 +1,28 @@
+using System.Collections.Generic;
+
 namespace CompanyManagment.App.Contracts.InstitutionContract;
 
 public class InsitutionContractAmendmentPaymentResponse
 {
+    public List<InsitutionContractAmendmentPaymentWorkshopResponse> workshops { get; set; }
     public InstitutionContractPaymentOneTimeViewModel OneTime { get; set; }
     public InstitutionContractPaymentMonthlyViewModel Monthly { get; set; }
     public string ContractStart { get; set; }
     public string ContractEnd { get; set; }
     public string OneMonthAmount { get; set; }
     public string TotalAmount { get; set; }
+}
+
+public class InsitutionContractAmendmentPaymentWorkshopResponse
+{
+    public string WorkshopName { get; set; }
+    public WorkshopServicesViewModel OldServices { get; set; }
+    public WorkshopServicesViewModel NewServices { get; set; }
+
+    public bool IsNewWorkshop { get; set; }
+
+    public int PrevPersonnelCount { get; set; }
+    public int NewPersonnelCount { get; set; }
+
+    public double Price { get; set; }
 }

CompanyManagment.App.Contracts/PaymentTransaction/CreatePaymentTransaction.cs

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

CompanyManagment.App.Contracts/PaymentTransaction/IPaymentTransactionApplication.cs

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

CompanyManagment.Application/AndroidApkVersionApplication.cs

@@ -1,11 +1,13 @@
 using System;
 using System.IO;
 using AccountManagement.Domain.TaskAgg;
+using ApkReader;
 using Company.Domain.AndroidApkVersionAgg;
 using CompanyManagment.App.Contracts.AndroidApkVersion;
-using CompanyManagment.Application.Helpers;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
+using System;
+using System.IO;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 
@@ -22,7 +24,7 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
         _taskRepository = taskRepository;
     }
 
-    public async Task<OperationResult> CreateAndActive(IFormFile file, ApkType apkType, bool isForce = false)
+    public async Task<OperationResult> CreateAndActive(IFormFile file)
     {
         OperationResult op = new OperationResult();
 
@@ -36,41 +38,21 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
 
         #endregion
 
-        var activeApks = _androidApkVersionRepository.GetActives(apkType);
+        var activeApks = _androidApkVersionRepository.GetActives();
 
          await activeApks.ExecuteUpdateAsync(setter => setter.SetProperty(e => e.IsActive, IsActive.False));
         _androidApkVersionRepository.SaveChanges();
 
-        var folderName = apkType == ApkType.WebView ? "GozreshgirWebView" : "GozreshgirFaceDetection";
         var path = Path.Combine($"{_taskRepository.GetWebEnvironmentPath()}", "Storage",
-            "Apk", "Android", folderName);
+            "Apk", "Android", "GozreshgirWebView");
 
         Directory.CreateDirectory(path);
 
-        // Read APK metadata with error handling
-        ApkInfo apk;
-        try
-        {
-            apk = ApkHelper.ReadApkInfo(file.OpenReadStream());
-            
-            // Validate APK info
-            if (string.IsNullOrEmpty(apk.VersionName) || string.IsNullOrEmpty(apk.VersionCode))
-            {
-                return op.Failed("فایل APK معتبر نیست - اطلاعات نسخه یافت نشد");
-            }
-            
-            // Validate version code is numeric
-            if (!int.TryParse(apk.VersionCode, out _))
-            {
-                return op.Failed("فایل APK معتبر نیست - کد نسخه باید عددی باشد");
-            }
-        }
-        catch (Exception ex)
-        {
-            return op.Failed("خطا در خواندن فایل APK: " + ex.Message);
-        }
+        //var apk = new ApkReader.ApkReader().Read(file.OpenReadStream());
+
+        string uniqueFileName = $"{Path.GetFileNameWithoutExtension(file.FileName)}{Path.GetExtension(file.FileName)}";
+
 
-        string uniqueFileName = $"{Path.GetFileNameWithoutExtension(file.FileName)}.v{apk.VersionName}{Path.GetExtension(file.FileName)}";
         string filepath = Path.Combine(path, uniqueFileName);
 
         await using (var stream = new FileStream(filepath, FileMode.Create))
@@ -78,13 +60,13 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
             await file.CopyToAsync(stream);
         }
 
-        var entity = new AndroidApkVersion(apk.VersionName, apk.VersionCode, IsActive.True, filepath, apkType, isForce);
+        var entity = new AndroidApkVersion("0", "0", IsActive.True, filepath);
         _androidApkVersionRepository.Create(entity);
         _androidApkVersionRepository.SaveChanges();
         return op.Succcedded();
     }
 
-    public async Task<OperationResult> CreateAndDeActive(IFormFile file, ApkType apkType, bool isForce = false)
+    public async Task<OperationResult> CreateAndDeActive(IFormFile file)
     {
         OperationResult op = new OperationResult();
 
@@ -99,34 +81,12 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
         #endregion
 
 
-        var folderName = apkType == ApkType.WebView ? "GozreshgirWebView" : "GozreshgirFaceDetection";
         var path = Path.Combine($"{_taskRepository.GetWebEnvironmentPath()}", "Storage",
-            "Apk", "Android", folderName);
+            "Apk", "Android", "GozreshgirWebView");
 
         Directory.CreateDirectory(path);
 
-        // Read APK metadata with error handling
-        ApkInfo apk;
-        try
-        {
-            apk = ApkHelper.ReadApkInfo(file.OpenReadStream());
-            
-            // Validate APK info
-            if (string.IsNullOrEmpty(apk.VersionName) || string.IsNullOrEmpty(apk.VersionCode))
-            {
-                return op.Failed("فایل APK معتبر نیست - اطلاعات نسخه یافت نشد");
-            }
-            
-            // Validate version code is numeric
-            if (!int.TryParse(apk.VersionCode, out _))
-            {
-                return op.Failed("فایل APK معتبر نیست - کد نسخه باید عددی باشد");
-            }
-        }
-        catch (Exception ex)
-        {
-            return op.Failed("خطا در خواندن فایل APK: " + ex.Message);
-        }
+        var apk = new ApkReader.ApkReader().Read(file.OpenReadStream());
 
         string uniqueFileName = $"{Path.GetFileNameWithoutExtension(file.FileName)}.v{apk.VersionName}{Path.GetExtension(file.FileName)}";
 
@@ -138,15 +98,14 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
            await file.CopyToAsync(stream);
         }
 
-        var entity = new AndroidApkVersion(apk.VersionName, apk.VersionCode, IsActive.False, filepath, apkType, isForce);
-        _androidApkVersionRepository.Create(entity);
+        var entity = new AndroidApkVersion(apk.VersionName, apk.VersionCode, IsActive.False, filepath);
         _androidApkVersionRepository.SaveChanges();
         return op.Succcedded();
     }
 
-    public async Task<string> GetLatestActiveVersionPath(ApkType apkType)
+    public async Task<string> GetLatestActiveVersionPath()
     {
-       return await _androidApkVersionRepository.GetLatestActiveVersionPath(apkType);
+       return await _androidApkVersionRepository.GetLatestActiveVersionPath();
     }
 
     public OperationResult Remove(long id)
@@ -168,22 +127,8 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
         return op.Succcedded();
     }
 
-    public bool HasAndroidApkToDownload(ApkType apkType)
+    public bool HasAndroidApkToDownload()
     {
-       return _androidApkVersionRepository.Exists(x => x.IsActive == IsActive.True && x.ApkType == apkType);
-    }
-
-    public Task<AndroidApkVersionInfo> GetLatestActiveInfo(ApkType apkType, int currentVersionCode)
-    {
-        var latest = _androidApkVersionRepository.GetLatestActive(apkType);
-        if (latest == null)
-            return Task.FromResult(new AndroidApkVersionInfo(0, "0", false, false, string.Empty, string.Empty));
-
-        // Return API endpoint for downloading APK file
-        var fileUrl = $"/api/android-apk/download?type={apkType}";
-        int latestCode = 0;
-        int.TryParse(latest.VersionCode, out latestCode);
-        var shouldUpdate = latestCode > currentVersionCode;
-        return Task.FromResult(new AndroidApkVersionInfo(latestCode, latest.VersionName, shouldUpdate, latest.IsForce, fileUrl, "Bug fixes and improvements"));
+       return _androidApkVersionRepository.Exists(x => x.IsActive == IsActive.True);
     }
 }

CompanyManagment.Application/CompanyManagment.Application.csproj

@@ -5,8 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AndroidXml" Version="1.1.24" />
-    <PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
+    <PackageReference Include="ApkReader" Version="2.0.1.1" />
   </ItemGroup>
 
   <ItemGroup>

CompanyManagment.Application/EmployeeFaceEmbeddingApplication.cs

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

CompanyManagment.Application/Helpers/ApkHelper.cs

@@ -1,132 +0,0 @@
-
-using System;
-using System.IO;
-using System.IO.Compression;
-using System.Text.RegularExpressions;
-
-namespace CompanyManagment.Application.Helpers
-{
-    public class ApkInfo
-    {
-        public string VersionName { get; set; } = string.Empty;
-        public string VersionCode { get; set; } = string.Empty;
-        public string PackageName { get; set; } = string.Empty;
-        public string ApplicationLabel { get; set; } = string.Empty;
-    }
-
-    public static class ApkHelper
-    {
-        public static ApkInfo ReadApkInfo(Stream apkStream)
-        {
-            var apkInfo = new ApkInfo();
-
-            try
-            {
-                using var archive = new ZipArchive(apkStream, ZipArchiveMode.Read, true);
-                var manifestEntry = archive.GetEntry("AndroidManifest.xml");
-                
-                if (manifestEntry == null)
-                {
-                    throw new InvalidOperationException("AndroidManifest.xml not found in APK file");
-                }
-
-                using var manifestStream = manifestEntry.Open();
-                using var memoryStream = new MemoryStream();
-                manifestStream.CopyTo(memoryStream);
-                var manifestBytes = memoryStream.ToArray();
-
-                // Parse the binary AndroidManifest.xml
-                apkInfo = ParseBinaryManifest(manifestBytes);
-
-                // Validate that we found at least version information
-                if (string.IsNullOrEmpty(apkInfo.VersionCode) && string.IsNullOrEmpty(apkInfo.VersionName))
-                {
-                    throw new InvalidOperationException("Could not extract version information from APK");
-                }
-
-                return apkInfo;
-            }
-            catch (Exception ex)
-            {
-                throw new InvalidOperationException($"Error reading APK file: {ex.Message}", ex);
-            }
-        }
-
-        private static ApkInfo ParseBinaryManifest(byte[] manifestBytes)
-        {
-            var apkInfo = new ApkInfo();
-            
-            try
-            {
-                // Convert bytes to string for regex parsing
-                var text = System.Text.Encoding.UTF8.GetString(manifestBytes);
-                
-                // Extract package name
-                var packageMatch = Regex.Match(text, @"package[^a-zA-Z]+([a-zA-Z][a-zA-Z0-9_]*(?:\.[a-zA-Z][a-zA-Z0-9_]*)+)", RegexOptions.IgnoreCase);
-                if (packageMatch.Success)
-                {
-                    apkInfo.PackageName = packageMatch.Groups[1].Value;
-                }
-                
-                // Extract version code - look for numeric values that could be version codes
-                var versionCodeMatch = Regex.Match(text, @"versionCode[^\d]*(\d+)", RegexOptions.IgnoreCase);
-                if (versionCodeMatch.Success)
-                {
-                    apkInfo.VersionCode = versionCodeMatch.Groups[1].Value;
-                }
-                else
-                {
-                    // Fallback: try to find reasonable numeric values
-                    var numbers = Regex.Matches(text, @"\b(\d{1,8})\b");
-                    foreach (Match numMatch in numbers)
-                    {
-                        if (int.TryParse(numMatch.Groups[1].Value, out int num) && num > 0 && num < 99999999)
-                        {
-                            apkInfo.VersionCode = num.ToString();
-                            break;
-                        }
-                    }
-                }
-                
-                // Extract version name
-                var versionNameMatch = Regex.Match(text, @"versionName[^\d]*(\d+(?:\.\d+)*(?:\.\d+)*)", RegexOptions.IgnoreCase);
-                if (versionNameMatch.Success)
-                {
-                    apkInfo.VersionName = versionNameMatch.Groups[1].Value;
-                }
-                else
-                {
-                    // Fallback: look for version-like patterns
-                    var versionMatch = Regex.Match(text, @"\b(\d+\.\d+(?:\.\d+)*)\b");
-                    if (versionMatch.Success)
-                    {
-                        apkInfo.VersionName = versionMatch.Groups[1].Value;
-                    }
-                }
-                
-                // Set defaults if nothing found
-                if (string.IsNullOrEmpty(apkInfo.VersionCode))
-                    apkInfo.VersionCode = "1";
-                    
-                if (string.IsNullOrEmpty(apkInfo.VersionName))
-                    apkInfo.VersionName = "1.0";
-                    
-                if (string.IsNullOrEmpty(apkInfo.PackageName))
-                    apkInfo.PackageName = "unknown.package";
-
-                return apkInfo;
-            }
-            catch (Exception)
-            {
-                // Return default values if parsing fails
-                return new ApkInfo
-                {
-                    VersionCode = "1",
-                    VersionName = "1.0",
-                    PackageName = "unknown.package"
-                };
-            }
-        }
-    }
-}
-

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -1387,6 +1387,16 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return (await _institutionContractRepository.PrintAllAsync([id])).FirstOrDefault();
     }
 
+    public async Task<GetInstitutionAmendmentVerificationDetailsViewModel> GetAmendmentVerificationDetails(Guid id, long amendmentId)
+    {
+        return await _institutionContractRepository.GetAmendmentVerificationDetails(id,amendmentId);
+    }
+
+    public async Task AmendmentComplete(InstitutionContractAmendmentCompleteRequest request)
+    {
+        await _institutionContractRepository.AmendmentComplete(request);
+    }
+
 
     private async Task<OperationResult<PersonalContractingParty>> CreateLegalContractingPartyEntity(
         CreateInstitutionContractLegalPartyRequest request, long representativeId, string address, string city,

CompanyManagment.Application/PaymentTransactionApplication.cs

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

CompanyManagment.EFCore/CompanyManagment.EFCore.csproj

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

CompanyManagment.EFCore/Mapping/AndroidApkVersionMapping.cs

@@ -1,8 +1,9 @@
-using Company.Domain.AndroidApkVersionAgg;
-using CompanyManagment.App.Contracts.AndroidApkVersion;
+
+using Company.Domain.AndroidApkVersionAgg;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using System;
+using Microsoft.AspNetCore.Hosting.Builder;
 using _0_Framework.Application;
 
 namespace CompanyManagment.EFCore.Mapping;
@@ -18,15 +19,10 @@ public class AndroidApkVersionMapping:IEntityTypeConfiguration<AndroidApkVersion
             v => v.ToString(),
             v => (IsActive)Enum.Parse(typeof(IsActive), v)).HasMaxLength(5);
 
-        builder.Property(x => x.ApkType).HasConversion(
-            v => v.ToString(),
-            v => (ApkType)Enum.Parse(typeof(ApkType), v)).HasMaxLength(20);
-
         builder.Property(x => x.Title).HasMaxLength(50);
         builder.Property(x => x.VersionCode).HasMaxLength(20);
         builder.Property(x => x.VersionName).HasMaxLength(35);
         builder.Property(x => x.Path).HasMaxLength(255);
-        builder.Property(x => x.IsForce);
 
     }
 }

CompanyManagment.EFCore/Mapping/InstitutionContractAmendmentMapping.cs

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

CompanyManagment.EFCore/Mapping/PaymentTransactionMapping.cs

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

CompanyManagment.EFCore/Migrations/20251027112040_Add IsAmendment in institutioncontractWorkshopDetials.Designer.cs

@@ -13,8 +13,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace CompanyManagment.EFCore.Migrations
 {
     [DbContext(typeof(CompanyContext))]
-    [Migration("20251112143907_addGateways in transaction ")]
-    partial class addGatewaysintransaction
+    [Migration("20251027112040_Add IsAmendment in institutioncontractWorkshopDetials")]
+    partial class AddIsAmendmentininstitutioncontractWorkshopDetials
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -418,9 +418,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool>("HasAmountConflict")
                         .HasColumnType("bit");
 
-                    b.Property<bool>("HasInsuranceShareTheSameAsList")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("HasRollCall")
                         .HasColumnType("bit");
 
@@ -437,9 +434,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
 
-                    b.Property<bool>("IsUpdateNeeded")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("LeaveCheckout")
                         .HasColumnType("bit");
 
@@ -552,33 +546,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("Checkouts", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<long>("CheckoutId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("TypeOfCheckoutWarning")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("nvarchar(30)");
-
-                    b.Property<string>("WarningMessage")
-                        .HasMaxLength(150)
-                        .HasColumnType("nvarchar(150)");
-
-                    b.HasKey("id");
-
-                    b.HasIndex("CheckoutId");
-
-                    b.ToTable("CheckoutWarningMessage", (string)null);
-                });
-
             modelBuilder.Entity("Company.Domain.ClassifiedSalaryAgg.ClassifiedSalary", b =>
                 {
                     b.Property<long>("id")
@@ -3291,6 +3258,11 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("VerificationCreation")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("VerificationStatus")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
                     b.Property<string>("VerifierFullName")
                         .HasMaxLength(100)
                         .HasColumnType("nvarchar(100)");
@@ -3330,6 +3302,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<long?>("CurrentWorkshopId")
+                        .HasColumnType("bigint");
+
                     b.Property<bool?>("HasContractPlan")
                         .HasColumnType("bit");
 
@@ -3345,6 +3320,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool?>("HasInsurancePlanInPerson")
                         .HasColumnType("bit");
 
+                    b.Property<bool?>("HasRollCallInPerson")
+                        .HasColumnType("bit");
+
                     b.Property<bool?>("HasRollCallPlan")
                         .HasColumnType("bit");
 
@@ -3354,8 +3332,8 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<int?>("PersonnelCount")
                         .HasColumnType("int");
 
-                    b.Property<long?>("WorkshopDetailsId")
-                        .HasColumnType("bigint");
+                    b.Property<int>("PersonnelCountDifference")
+                        .HasColumnType("int");
 
                     b.HasKey("id");
 
@@ -3422,6 +3400,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -3487,6 +3468,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -4993,11 +4977,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("Gateway")
-                        .IsRequired()
-                        .HasMaxLength(35)
-                        .HasColumnType("nvarchar(35)");
-
                     b.Property<string>("Status")
                         .IsRequired()
                         .HasMaxLength(35)
@@ -7252,17 +7231,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("Workshop");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.HasOne("Company.Domain.CheckoutAgg.Checkout", "Checkout")
-                        .WithMany("CheckoutWarningMessageList")
-                        .HasForeignKey("CheckoutId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Checkout");
-                });
-
             modelBuilder.Entity("Company.Domain.ClientEmployeeWorkshopAgg.ClientEmployeeWorkshop", b =>
                 {
                     b.HasOne("Company.Domain.EmployeeAgg.Employee", "Employee")
@@ -10782,11 +10750,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("PetitionsList");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.Checkout", b =>
-                {
-                    b.Navigation("CheckoutWarningMessageList");
-                });
-
             modelBuilder.Entity("Company.Domain.ContarctingPartyAgg.PersonalContractingParty", b =>
                 {
                     b.Navigation("ContractingPartyBankAccounts");

CompanyManagment.EFCore/Migrations/20251027112040_Add IsAmendment in institutioncontractWorkshopDetials.cs

@@ -0,0 +1,83 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddIsAmendmentininstitutioncontractWorkshopDetials : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "WorkshopDetailsId",
+                table: "InstitutionContractAmendmentChange",
+                newName: "CurrentWorkshopId");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsAmendment",
+                table: "InstitutionContractWorkshopInitials",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsAmendment",
+                table: "InstitutionContractWorkshopCurrents",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<string>(
+                name: "VerificationStatus",
+                table: "InstitutionContractAmendments",
+                type: "nvarchar(50)",
+                maxLength: 50,
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "HasRollCallInPerson",
+                table: "InstitutionContractAmendmentChange",
+                type: "bit",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "PersonnelCountDifference",
+                table: "InstitutionContractAmendmentChange",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsAmendment",
+                table: "InstitutionContractWorkshopInitials");
+
+            migrationBuilder.DropColumn(
+                name: "IsAmendment",
+                table: "InstitutionContractWorkshopCurrents");
+
+            migrationBuilder.DropColumn(
+                name: "VerificationStatus",
+                table: "InstitutionContractAmendments");
+
+            migrationBuilder.DropColumn(
+                name: "HasRollCallInPerson",
+                table: "InstitutionContractAmendmentChange");
+
+            migrationBuilder.DropColumn(
+                name: "PersonnelCountDifference",
+                table: "InstitutionContractAmendmentChange");
+
+            migrationBuilder.RenameColumn(
+                name: "CurrentWorkshopId",
+                table: "InstitutionContractAmendmentChange",
+                newName: "WorkshopDetailsId");
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20251106075529_institutioncontractAmendment law id.Designer.cs

@@ -13,8 +13,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace CompanyManagment.EFCore.Migrations
 {
     [DbContext(typeof(CompanyContext))]
-    [Migration("20251115161128_AddApkTypeToAndroidApkVersion")]
-    partial class AddApkTypeToAndroidApkVersion
+    [Migration("20251106075529_institutioncontractAmendment law id")]
+    partial class institutioncontractAmendmentlawid
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -64,11 +64,6 @@ namespace CompanyManagment.EFCore.Migrations
 
                     SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
 
-                    b.Property<string>("ApkType")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("nvarchar(20)");
-
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
@@ -423,9 +418,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool>("HasAmountConflict")
                         .HasColumnType("bit");
 
-                    b.Property<bool>("HasInsuranceShareTheSameAsList")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("HasRollCall")
                         .HasColumnType("bit");
 
@@ -442,9 +434,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
 
-                    b.Property<bool>("IsUpdateNeeded")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("LeaveCheckout")
                         .HasColumnType("bit");
 
@@ -557,33 +546,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("Checkouts", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<long>("CheckoutId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("TypeOfCheckoutWarning")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("nvarchar(30)");
-
-                    b.Property<string>("WarningMessage")
-                        .HasMaxLength(150)
-                        .HasColumnType("nvarchar(150)");
-
-                    b.HasKey("id");
-
-                    b.HasIndex("CheckoutId");
-
-                    b.ToTable("CheckoutWarningMessage", (string)null);
-                });
-
             modelBuilder.Entity("Company.Domain.ClassifiedSalaryAgg.ClassifiedSalary", b =>
                 {
                     b.Property<long>("id")
@@ -3291,11 +3253,17 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasColumnType("bigint");
 
                     b.Property<long>("LawId")
-                        .HasColumnType("bigint");
+                        .HasColumnType("bigint")
+                        .HasColumnName("LawId");
 
                     b.Property<DateTime>("VerificationCreation")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("VerificationStatus")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
                     b.Property<string>("VerifierFullName")
                         .HasMaxLength(100)
                         .HasColumnType("nvarchar(100)");
@@ -3335,6 +3303,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<long?>("CurrentWorkshopId")
+                        .HasColumnType("bigint");
+
                     b.Property<bool?>("HasContractPlan")
                         .HasColumnType("bit");
 
@@ -3350,6 +3321,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool?>("HasInsurancePlanInPerson")
                         .HasColumnType("bit");
 
+                    b.Property<bool?>("HasRollCallInPerson")
+                        .HasColumnType("bit");
+
                     b.Property<bool?>("HasRollCallPlan")
                         .HasColumnType("bit");
 
@@ -3359,8 +3333,8 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<int?>("PersonnelCount")
                         .HasColumnType("int");
 
-                    b.Property<long?>("WorkshopDetailsId")
-                        .HasColumnType("bigint");
+                    b.Property<int>("PersonnelCountDifference")
+                        .HasColumnType("int");
 
                     b.HasKey("id");
 
@@ -3427,6 +3401,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -3492,6 +3469,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -4998,19 +4978,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("DigitalReceipt")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
-                    b.Property<string>("Gateway")
-                        .IsRequired()
-                        .HasMaxLength(35)
-                        .HasColumnType("nvarchar(35)");
-
-                    b.Property<string>("Rrn")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
                     b.Property<string>("Status")
                         .IsRequired()
                         .HasMaxLength(35)
@@ -7265,17 +7232,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("Workshop");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.HasOne("Company.Domain.CheckoutAgg.Checkout", "Checkout")
-                        .WithMany("CheckoutWarningMessageList")
-                        .HasForeignKey("CheckoutId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Checkout");
-                });
-
             modelBuilder.Entity("Company.Domain.ClientEmployeeWorkshopAgg.ClientEmployeeWorkshop", b =>
                 {
                     b.HasOne("Company.Domain.EmployeeAgg.Employee", "Employee")
@@ -10795,11 +10751,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("PetitionsList");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.Checkout", b =>
-                {
-                    b.Navigation("CheckoutWarningMessageList");
-                });
-
             modelBuilder.Entity("Company.Domain.ContarctingPartyAgg.PersonalContractingParty", b =>
                 {
                     b.Navigation("ContractingPartyBankAccounts");

CompanyManagment.EFCore/Migrations/20251106075529_institutioncontractAmendment law id.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class institutioncontractAmendmentlawid : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20251106075938_ignore law id.Designer.cs

@@ -13,8 +13,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace CompanyManagment.EFCore.Migrations
 {
     [DbContext(typeof(CompanyContext))]
-    [Migration("20251116081057_AddIsForceFieldToAndroidApkVersions")]
-    partial class AddIsForceFieldToAndroidApkVersions
+    [Migration("20251106075938_ignore law id")]
+    partial class ignorelawid
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -64,11 +64,6 @@ namespace CompanyManagment.EFCore.Migrations
 
                     SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
 
-                    b.Property<string>("ApkType")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("nvarchar(20)");
-
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
@@ -77,9 +72,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(5)
                         .HasColumnType("nvarchar(5)");
 
-                    b.Property<bool>("IsForce")
-                        .HasColumnType("bit");
-
                     b.Property<string>("Path")
                         .HasMaxLength(255)
                         .HasColumnType("nvarchar(255)");
@@ -426,9 +418,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool>("HasAmountConflict")
                         .HasColumnType("bit");
 
-                    b.Property<bool>("HasInsuranceShareTheSameAsList")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("HasRollCall")
                         .HasColumnType("bit");
 
@@ -445,9 +434,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
 
-                    b.Property<bool>("IsUpdateNeeded")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("LeaveCheckout")
                         .HasColumnType("bit");
 
@@ -560,33 +546,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("Checkouts", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<long>("CheckoutId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("TypeOfCheckoutWarning")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("nvarchar(30)");
-
-                    b.Property<string>("WarningMessage")
-                        .HasMaxLength(150)
-                        .HasColumnType("nvarchar(150)");
-
-                    b.HasKey("id");
-
-                    b.HasIndex("CheckoutId");
-
-                    b.ToTable("CheckoutWarningMessage", (string)null);
-                });
-
             modelBuilder.Entity("Company.Domain.ClassifiedSalaryAgg.ClassifiedSalary", b =>
                 {
                     b.Property<long>("id")
@@ -3293,12 +3252,14 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractId")
                         .HasColumnType("bigint");
 
-                    b.Property<long>("LawId")
-                        .HasColumnType("bigint");
-
                     b.Property<DateTime>("VerificationCreation")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("VerificationStatus")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
                     b.Property<string>("VerifierFullName")
                         .HasMaxLength(100)
                         .HasColumnType("nvarchar(100)");
@@ -3338,6 +3299,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<long?>("CurrentWorkshopId")
+                        .HasColumnType("bigint");
+
                     b.Property<bool?>("HasContractPlan")
                         .HasColumnType("bit");
 
@@ -3353,6 +3317,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool?>("HasInsurancePlanInPerson")
                         .HasColumnType("bit");
 
+                    b.Property<bool?>("HasRollCallInPerson")
+                        .HasColumnType("bit");
+
                     b.Property<bool?>("HasRollCallPlan")
                         .HasColumnType("bit");
 
@@ -3362,8 +3329,8 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<int?>("PersonnelCount")
                         .HasColumnType("int");
 
-                    b.Property<long?>("WorkshopDetailsId")
-                        .HasColumnType("bigint");
+                    b.Property<int>("PersonnelCountDifference")
+                        .HasColumnType("int");
 
                     b.HasKey("id");
 
@@ -3430,6 +3397,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -3495,6 +3465,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -5001,19 +4974,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("DigitalReceipt")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
-                    b.Property<string>("Gateway")
-                        .IsRequired()
-                        .HasMaxLength(35)
-                        .HasColumnType("nvarchar(35)");
-
-                    b.Property<string>("Rrn")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
                     b.Property<string>("Status")
                         .IsRequired()
                         .HasMaxLength(35)
@@ -7268,17 +7228,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("Workshop");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.HasOne("Company.Domain.CheckoutAgg.Checkout", "Checkout")
-                        .WithMany("CheckoutWarningMessageList")
-                        .HasForeignKey("CheckoutId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Checkout");
-                });
-
             modelBuilder.Entity("Company.Domain.ClientEmployeeWorkshopAgg.ClientEmployeeWorkshop", b =>
                 {
                     b.HasOne("Company.Domain.EmployeeAgg.Employee", "Employee")
@@ -10798,11 +10747,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("PetitionsList");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.Checkout", b =>
-                {
-                    b.Navigation("CheckoutWarningMessageList");
-                });
-
             modelBuilder.Entity("Company.Domain.ContarctingPartyAgg.PersonalContractingParty", b =>
                 {
                     b.Navigation("ContractingPartyBankAccounts");

CompanyManagment.EFCore/Migrations/20251106075938_ignore law id.cs

@@ -5,25 +5,26 @@
 namespace CompanyManagment.EFCore.Migrations
 {
     /// <inheritdoc />
-    public partial class AddIsForceFieldToAndroidApkVersions : Migration
+    public partial class ignorelawid : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.AddColumn<bool>(
-                name: "IsForce",
-                table: "AndroidApkVersions",
-                type: "bit",
+            migrationBuilder.AddColumn<long>(
+                name: "LawId",
+                table: "InstitutionContractAmendments",
+                type: "bigint",
                 nullable: false,
-                defaultValue: false);
+                defaultValue: 0L);
+           
         }
 
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropColumn(
-                name: "IsForce",
-                table: "AndroidApkVersions");
+                name: "LawId",
+                table: "InstitutionContractAmendments");
         }
     }
 }

CompanyManagment.EFCore/Migrations/20251106080435_lawId test.Designer.cs

@@ -13,8 +13,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace CompanyManagment.EFCore.Migrations
 {
     [DbContext(typeof(CompanyContext))]
-    [Migration("20251112151518_add rrn and digital receipt")]
-    partial class addrrnanddigitalreceipt
+    [Migration("20251106080435_lawId test")]
+    partial class lawIdtest
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -418,9 +418,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool>("HasAmountConflict")
                         .HasColumnType("bit");
 
-                    b.Property<bool>("HasInsuranceShareTheSameAsList")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("HasRollCall")
                         .HasColumnType("bit");
 
@@ -437,9 +434,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
 
-                    b.Property<bool>("IsUpdateNeeded")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("LeaveCheckout")
                         .HasColumnType("bit");
 
@@ -552,33 +546,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("Checkouts", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<long>("CheckoutId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("TypeOfCheckoutWarning")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("nvarchar(30)");
-
-                    b.Property<string>("WarningMessage")
-                        .HasMaxLength(150)
-                        .HasColumnType("nvarchar(150)");
-
-                    b.HasKey("id");
-
-                    b.HasIndex("CheckoutId");
-
-                    b.ToTable("CheckoutWarningMessage", (string)null);
-                });
-
             modelBuilder.Entity("Company.Domain.ClassifiedSalaryAgg.ClassifiedSalary", b =>
                 {
                     b.Property<long>("id")
@@ -3291,6 +3258,11 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("VerificationCreation")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("VerificationStatus")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
                     b.Property<string>("VerifierFullName")
                         .HasMaxLength(100)
                         .HasColumnType("nvarchar(100)");
@@ -3330,6 +3302,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<long?>("CurrentWorkshopId")
+                        .HasColumnType("bigint");
+
                     b.Property<bool?>("HasContractPlan")
                         .HasColumnType("bit");
 
@@ -3345,6 +3320,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool?>("HasInsurancePlanInPerson")
                         .HasColumnType("bit");
 
+                    b.Property<bool?>("HasRollCallInPerson")
+                        .HasColumnType("bit");
+
                     b.Property<bool?>("HasRollCallPlan")
                         .HasColumnType("bit");
 
@@ -3354,8 +3332,8 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<int?>("PersonnelCount")
                         .HasColumnType("int");
 
-                    b.Property<long?>("WorkshopDetailsId")
-                        .HasColumnType("bigint");
+                    b.Property<int>("PersonnelCountDifference")
+                        .HasColumnType("int");
 
                     b.HasKey("id");
 
@@ -3422,6 +3400,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -3487,6 +3468,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -4993,19 +4977,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("DigitalReceipt")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
-                    b.Property<string>("Gateway")
-                        .IsRequired()
-                        .HasMaxLength(35)
-                        .HasColumnType("nvarchar(35)");
-
-                    b.Property<string>("Rrn")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
                     b.Property<string>("Status")
                         .IsRequired()
                         .HasMaxLength(35)
@@ -7260,17 +7231,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("Workshop");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.HasOne("Company.Domain.CheckoutAgg.Checkout", "Checkout")
-                        .WithMany("CheckoutWarningMessageList")
-                        .HasForeignKey("CheckoutId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Checkout");
-                });
-
             modelBuilder.Entity("Company.Domain.ClientEmployeeWorkshopAgg.ClientEmployeeWorkshop", b =>
                 {
                     b.HasOne("Company.Domain.EmployeeAgg.Employee", "Employee")
@@ -10790,11 +10750,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("PetitionsList");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.Checkout", b =>
-                {
-                    b.Navigation("CheckoutWarningMessageList");
-                });
-
             modelBuilder.Entity("Company.Domain.ContarctingPartyAgg.PersonalContractingParty", b =>
                 {
                     b.Navigation("ContractingPartyBankAccounts");

CompanyManagment.EFCore/Migrations/20251106080435_lawId test.cs

@@ -0,0 +1,20 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class lawIdtest : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}

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

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

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

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

CompanyManagment.EFCore/Migrations/20251115161128_AddApkTypeToAndroidApkVersion.cs

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

CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs

@@ -61,11 +61,6 @@ namespace CompanyManagment.EFCore.Migrations
 
                     SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
 
-                    b.Property<string>("ApkType")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("nvarchar(20)");
-
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
@@ -74,9 +69,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(5)
                         .HasColumnType("nvarchar(5)");
 
-                    b.Property<bool>("IsForce")
-                        .HasColumnType("bit");
-
                     b.Property<string>("Path")
                         .HasMaxLength(255)
                         .HasColumnType("nvarchar(255)");
@@ -3296,6 +3288,11 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("VerificationCreation")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("VerificationStatus")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
                     b.Property<string>("VerifierFullName")
                         .HasMaxLength(100)
                         .HasColumnType("nvarchar(100)");
@@ -3335,6 +3332,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<long?>("CurrentWorkshopId")
+                        .HasColumnType("bigint");
+
                     b.Property<bool?>("HasContractPlan")
                         .HasColumnType("bit");
 
@@ -3350,6 +3350,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool?>("HasInsurancePlanInPerson")
                         .HasColumnType("bit");
 
+                    b.Property<bool?>("HasRollCallInPerson")
+                        .HasColumnType("bit");
+
                     b.Property<bool?>("HasRollCallPlan")
                         .HasColumnType("bit");
 
@@ -3359,8 +3362,8 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<int?>("PersonnelCount")
                         .HasColumnType("int");
 
-                    b.Property<long?>("WorkshopDetailsId")
-                        .HasColumnType("bigint");
+                    b.Property<int>("PersonnelCountDifference")
+                        .HasColumnType("int");
 
                     b.HasKey("id");
 
@@ -3427,6 +3430,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -3492,6 +3498,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -4998,19 +5007,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("DigitalReceipt")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
-                    b.Property<string>("Gateway")
-                        .IsRequired()
-                        .HasMaxLength(35)
-                        .HasColumnType("nvarchar(35)");
-
-                    b.Property<string>("Rrn")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
                     b.Property<string>("Status")
                         .IsRequired()
                         .HasMaxLength(35)

CompanyManagment.EFCore/Repository/AndroidApkVersionRepository.cs

@@ -3,7 +3,6 @@ using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using Company.Domain.AndroidApkVersionAgg;
-using CompanyManagment.App.Contracts.AndroidApkVersion;
 using Microsoft.EntityFrameworkCore;
 
 namespace CompanyManagment.EFCore.Repository;
@@ -16,21 +15,13 @@ public class AndroidApkVersionRepository:RepositoryBase<long, AndroidApkVersion>
         _companyContext = companyContext;
     }
 
-    public IQueryable<AndroidApkVersion> GetActives(ApkType apkType)
+    public IQueryable<AndroidApkVersion> GetActives()
     {
-        return _companyContext.AndroidApkVersions.Where(x => x.IsActive == IsActive.True && x.ApkType == apkType);
+        return _companyContext.AndroidApkVersions.Where(x => x.IsActive == IsActive.True);
     }
 
-    public async Task<string> GetLatestActiveVersionPath(ApkType apkType)
+    public async Task<string> GetLatestActiveVersionPath()
     {
-        return (await _companyContext.AndroidApkVersions.OrderByDescending(x=>x.CreationDate).FirstOrDefaultAsync(x => x.IsActive == IsActive.True && x.ApkType == apkType)).Path;
-    }
-
-    public AndroidApkVersion GetLatestActive(ApkType apkType)
-    {
-        return _companyContext.AndroidApkVersions
-            .Where(x => x.IsActive == IsActive.True && x.ApkType == apkType)
-            .OrderByDescending(x => x.CreationDate)
-            .FirstOrDefault();
+        return (await _companyContext.AndroidApkVersions.OrderByDescending(x=>x.CreationDate).FirstOrDefaultAsync(x => x.IsActive == IsActive.True)).Path;
     }
 }

CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

@@ -29,7 +29,6 @@ using CompanyManagment.App.Contracts.Law;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.App.Contracts.WorkshopPlan;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
@@ -2374,6 +2373,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 x.WorkshopId??0,x.id)).ToList();
 
 
+        await _institutionAmendmentTemp
+            .DeleteManyAsync(x => x.InstitutionContractId == institutionContractId);;
         
         var temp = new InstitutionContractAmendmentTemp(workshops, institutionContractId);
         
@@ -2456,12 +2457,14 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         if (endDay > startDay)
             monthDiff++;
         
-        var sumOneMonth = institutionContractAmendmentTemp.NewWorkshops.Sum(x => x.PriceDifference);
+        var sumOneMonth = institutionContractAmendmentTemp
+            .NewWorkshops.Sum(x => x.PriceDifference);
         
         var baseAmount = monthDiff * sumOneMonth;
         var tax = baseAmount*0.10;
         var totalPayment = tax+baseAmount;
 
+        
 
         var res = new InsitutionContractAmendmentPaymentResponse()
         {
@@ -2469,6 +2472,41 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             ContractEnd = amendmentEnd.ToFarsi(),
             OneMonthAmount = sumOneMonth.ToMoney(),
             TotalAmount = baseAmount.ToMoney(),
+            workshops = institutionContractAmendmentTemp.NewWorkshops
+                .Select(x=>
+                {
+                    var prevWorkshop  = institutionContractAmendmentTemp.PrevWorkshops
+                        .FirstOrDefault(w=> w.Id == x.Id);
+                    var isNewWorkshop = prevWorkshop == null;
+                    return new InsitutionContractAmendmentPaymentWorkshopResponse()
+                    {
+                        WorkshopName = x.WorkshopName,
+                        IsNewWorkshop = isNewWorkshop,
+                        NewPersonnelCount = x.CountPerson,
+                        PrevPersonnelCount = prevWorkshop?.CountPerson??0,
+                        Price = x.PriceDifference,
+                        OldServices = prevWorkshop != null? new WorkshopServicesViewModel()
+                        {
+                            Contract = prevWorkshop.ContractAndCheckout,
+                            ContractInPerson = prevWorkshop.ContractAndCheckoutInPerson,
+                            CustomizeCheckout = prevWorkshop.CustomizeCheckout,
+                            Insurance = prevWorkshop.Insurance,
+                            InsuranceInPerson = prevWorkshop.InsuranceInPerson,
+                            RollCall = prevWorkshop.RollCall,
+                            RollCallInPerson = prevWorkshop.RollCallInPerson,
+                        }: new WorkshopServicesViewModel(),
+                        NewServices = new WorkshopServicesViewModel()
+                        {
+                            Contract = x.ContractAndCheckout,
+                            ContractInPerson = x.ContractAndCheckoutInPerson,
+                            CustomizeCheckout = x.CustomizeCheckout,
+                            Insurance = x.Insurance,
+                            InsuranceInPerson = x.InsuranceInPerson,
+                            RollCall = x.RollCall,
+                            RollCallInPerson = x.RollCallInPerson,
+                        },
+                    };
+                }).OrderByDescending(x=>x.Price).ToList()
         };
         
         res.OneTime = new InstitutionContractPaymentOneTimeViewModel()
@@ -2515,6 +2553,13 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             };
 
         }
+        
+        institutionContractAmendmentTemp.AddPaymentDetails(res.Monthly, res.OneTime, monthDiff);
+        await _institutionAmendmentTemp
+            .ReplaceOneAsync(x => x.Id == institutionContractAmendmentTemp.Id, institutionContractAmendmentTemp);
+        
+        
+        
         return res;
     }
 
@@ -2553,7 +2598,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 request.Insurance, request.InsuranceInPerson,
                 request.RollCall, request.RollCallInPerson,
                 request.CustomizeCheckout, price,
-                request.WorkshopId,0,price);
+                request.WorkshopId,0,price,Guid.NewGuid());
 
             workshopTemp = newWorkshopTemp;
             
@@ -2565,9 +2610,24 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         }
         else
         {
+            var prevWorkshop = amendmentTemp.PrevWorkshops
+                .FirstOrDefault(x => x.Id == workshopTemp.Id);
+            var differencePrice = 0d;
+            if (prevWorkshop != null)
+            {
+                differencePrice = price - prevWorkshop.Price;
+            }
+            else
+            {
+                differencePrice = price;
+            }
             amendmentTemp.NewWorkshops.Remove(workshopTemp);
         
-            var differencePrice = price - workshopTemp.Price;
+          
+            if (differencePrice<0)
+            {
+                differencePrice = 0;
+            }
             workshopTemp.Edit(request.WorkshopName, request.CountPerson,
                 request.ContractAndCheckout, request.ContractAndCheckoutInPerson,
                 request.Insurance, request.InsuranceInPerson,
@@ -2768,6 +2828,146 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         return res;
     }
 
+    public async Task AmendmentComplete(InstitutionContractAmendmentCompleteRequest request)
+    {
+        var amendmentTemp = await _institutionAmendmentTemp
+            .Find(x=>x.Id == request.TempId).FirstOrDefaultAsync();
+        
+        if (amendmentTemp == null)
+            throw new BadRequestException("دیتای وارد شده نامعتبر است");
+        
+        var institutionContract = await _context.InstitutionContractSet
+            .Include(x=>x.Amendments)
+            .Include(x=>x.WorkshopGroup)
+            .ThenInclude(x=>x.CurrentWorkshops)
+            .FirstOrDefaultAsync(x => x.id == amendmentTemp.InstitutionContractId);
+
+
+        List<InstitutionContractInstallment> installments = [];
+        double amount = 0;
+        if (request.IsInstallment)
+        {
+            installments = amendmentTemp.MonthlyPayment.Installments.Select(x=>
+                new InstitutionContractInstallment(x.InstalmentDate.ToGeorgianDateTime(),
+                    x.InstallmentAmountStr.MoneyToDouble(), "")).ToList();
+            amount = amendmentTemp.MonthlyPayment.PaymentAmount.MoneyToDouble();
+        }
+        else
+        {
+            amount = amendmentTemp.OneTimePayment.PaymentAmount.MoneyToDouble();
+        }
+        var newWorkshops = amendmentTemp
+            .NewWorkshops.Where(x=>x.CurrentWorkshopId ==0).ToList();
+        
+            var newWorkshopTempIds = newWorkshops.Select(x=>x.Id).ToList();
+                
+            var changes = newWorkshops.Select(x=>
+                InstitutionContractAmendmentChange.CreateWorkshopCreatedChange(DateTime.Now,x.RollCall,x.RollCallInPerson,x.CustomizeCheckout,
+                x.ContractAndCheckout,x.ContractAndCheckoutInPerson,x.Insurance,x.InsuranceInPerson,x.CountPerson)).ToList();
+
+            var changedWorkshops = amendmentTemp.NewWorkshops
+                .Where(x => !newWorkshopTempIds.Contains(x.Id)).ToList();
+
+            foreach (var changedWorkshop in changedWorkshops)
+            {
+                var prev = amendmentTemp.PrevWorkshops.FirstOrDefault(x => x.Id == changedWorkshop.Id);
+                if (prev == null)
+                    throw new BadRequestException("دیتای وارد شده ناقص ذخیره شده است");
+                
+                // مقایسه مقادیر بولین بین prev و changedWorkshop برای تشخیص تغییرات
+                var changedBooleans = new Dictionary<string, (bool Previous, bool Current)>();
+                
+                if (prev.CustomizeCheckout != changedWorkshop.CustomizeCheckout)
+                    changedBooleans.Add("CustomizeCheckout", (prev.CustomizeCheckout, changedWorkshop.CustomizeCheckout));
+                
+                if (prev.ContractAndCheckout != changedWorkshop.ContractAndCheckout)
+                    changedBooleans.Add("ContractAndCheckout", (prev.ContractAndCheckout, changedWorkshop.ContractAndCheckout));
+                
+                if (prev.ContractAndCheckoutInPerson != changedWorkshop.ContractAndCheckoutInPerson)
+                    changedBooleans.Add("ContractAndCheckoutInPerson", (prev.ContractAndCheckoutInPerson, changedWorkshop.ContractAndCheckoutInPerson));
+                
+                if (prev.Insurance != changedWorkshop.Insurance)
+                    changedBooleans.Add("Insurance", (prev.Insurance, changedWorkshop.Insurance));
+                
+                if (prev.InsuranceInPerson != changedWorkshop.InsuranceInPerson)
+                    changedBooleans.Add("InsuranceInPerson", (prev.InsuranceInPerson, changedWorkshop.InsuranceInPerson));
+                
+                if (prev.RollCall != changedWorkshop.RollCall)
+                    changedBooleans.Add("RollCall", (prev.RollCall, changedWorkshop.RollCall));
+                
+                if (prev.RollCallInPerson != changedWorkshop.RollCallInPerson)
+                    changedBooleans.Add("RollCallInPerson", (prev.RollCallInPerson, changedWorkshop.RollCallInPerson));
+                
+                // اگر تغییری وجود داشته باشد، آن را به لیست تغییرات اضافه کن
+                if (changedBooleans.Any())
+                {
+                    var change = InstitutionContractAmendmentChange.CreateServicesChange(
+                        DateTime.Now,
+                        changedWorkshop.WorkshopId,
+                        changedWorkshop.RollCall,
+                        changedWorkshop.RollCallInPerson,
+                        changedWorkshop.CustomizeCheckout,
+                        changedWorkshop.ContractAndCheckout,
+                        changedWorkshop.ContractAndCheckoutInPerson,
+                        changedWorkshop.Insurance,
+                        changedWorkshop.InsuranceInPerson);
+                    
+                    changes.Add(change);
+                }
+
+                if (changedWorkshop.CountPerson != prev.CountPerson)
+                {
+                    var difference = changedWorkshop.CountPerson - prev.CountPerson;
+                    var change = InstitutionContractAmendmentChange.CreatePersonCountChange(
+                        DateTime.Now,
+                        changedWorkshop.CountPerson,
+                        difference,changedWorkshop.WorkshopId);
+                    
+                    changes.Add(change);
+                }
+            }
+        
+        var amendment = new InstitutionContractAmendment(institutionContract.id,installments,amount,
+            request.IsInstallment,changes,request.LawId);
+        institutionContract.AddAmendment(amendment);
+
+        await _smsService.SendInstitutionAmendmentVerificationLink(
+            institutionContract.VerifierPhoneNumber,
+            institutionContract.ContractingPartyName,
+            institutionContract.PublicId,
+            institutionContract.ContractingPartyId,
+            institutionContract.id
+            );
+        
+        await _institutionAmendmentTemp.DeleteOneAsync(x=>x.Id == amendmentTemp.Id);
+        await _context.SaveChangesAsync();
+
+    }
+
+    public async Task<GetInstitutionAmendmentVerificationDetailsViewModel> GetAmendmentVerificationDetails(Guid id,
+        long amendmentId)
+    {
+        var institutionContract = await _context.InstitutionContractSet
+            .Include(x => x.Amendments)
+            .FirstOrDefaultAsync(x => x.PublicId == id);
+        
+        if (institutionContract == null)
+            throw new NotFoundException("قرارداد مؤسسه یافت نشد");
+        
+        var amendment = institutionContract.Amendments
+            .FirstOrDefault(x => x.id == amendmentId);
+        if (amendment == null)
+            throw new NotFoundException("ارتقا یافت نشد");
+
+        if (amendment.VerificationStatus != InstitutionContractVerificationStatus.PendingForVerify)
+            throw new BadRequestException("این ارتقا قبلا تایید شده است");
+
+        throw new NotImplementedException();
+
+
+
+    }
+
 
     private InstitutionContractExtensionPaymentResponse CalculateInPersonPayment(
         InstitutionContractExtensionPlanDetail selectedPlan, double baseAmount, double tenPercent,

CompanyManagment.EFCore/Repository/ReportRepository.cs

@@ -802,8 +802,6 @@ public class ReportRepository : IReportRepository
 
 
         };
-
-
         Console.WriteLine("new metod >>>>>: " + watch.Elapsed);
         Console.WriteLine("watchAllProssecd >>>>>: " + watchAllProssec.Elapsed);
 
@@ -1162,14 +1160,13 @@ public class ReportRepository : IReportRepository
 
 
         var allContractCreated = await _context.Contracts
-            .Where(x => allContractLeftworkEmployeeIds.Contains(x.EmployeeId))
+            .Where(x => allContractLeftworkEmployeeIds.Contains(x.EmployeeId) && allContractLeftworksWorkshopIdList.Contains(x.WorkshopIds))
             .Where(x =>
                 x.ContarctStart <= nextMonthEnd && x.ContractEnd > nextMonthStart && x.IsActiveString == "true")
             .Select(x=> new {x.id, x.EmployeeId, x.WorkshopIds, x.Signature}).ToListAsync();
-        allContractCreated = allContractCreated.Where(x => allContractLeftworksWorkshopIdList.Contains(x.WorkshopIds)).ToList();
 
         #endregion
-
+   
         Console.WriteLine("ajax 1 >>>>>: " + watch.Elapsed);
         var workshops = _context.Workshops.Include(x => x.LeftWorks).Where(x => allContractLeftworksWorkshopIdList.Contains(x.id)).ToList();
         var workshopListResult = workshops
@@ -1253,8 +1250,6 @@ public class ReportRepository : IReportRepository
 
         #region NewChanges
 
-    
-
         //تمام پرسنل فعال برای قراداد در ماه مورد نظر
         var allContractLeftworksList = await _context.LeftWorkList
             .Where(x => workshopList.Contains(x.WorkshopId))
@@ -1297,6 +1292,9 @@ public class ReportRepository : IReportRepository
 
 
 
+
+    
+
         var allContractLeftworkEmployeeIds = allContractLeftworks.Select(x => x.EmployeeId).ToList();
 
 
@@ -1310,7 +1308,6 @@ public class ReportRepository : IReportRepository
             .Where(x =>
                 x.ContarctStart <= nextMonthEnd && x.ContractEnd > nextMonthStart && x.IsActiveString == "true")
             .Select(x=> new {x.id, x.EmployeeId, x.WorkshopIds, x.Signature, x.Employee}).ToListAsync();
-        allContractCreated = allContractCreated.Where(x => workshopList.Contains(x.WorkshopIds)).ToList();
 
 
         var allContractSignedListWorkshopId = new List<(long id, long EmployeeId, long WorkshopId, string Signature, Employee Employee)>();
@@ -1404,7 +1401,7 @@ public class ReportRepository : IReportRepository
                 WorkshopSearches = workshopListResult,
                 EmployeeNotDones = new(),
             };
-      
+
         var badWorkshop = workshopListResult.FirstOrDefault();
         var badWorkshopCreated = allContractSignToBeListWorkshopId.Where(x => x.WorkshopId == badWorkshop.Id);
         var badWorkshopSigned = allContractSigned.Where(x => x.WorkshopId == badWorkshop.Id).Select(x => x.EmployeeId);
@@ -1498,11 +1495,10 @@ public class ReportRepository : IReportRepository
 
   
 
-        var allContractCreated =await _context.CheckoutSet
-            .Where(x => allContractLeftworkEmployeeIds.Contains(x.EmployeeId))
+        var allContractCreated = _context.CheckoutSet
+            .Where(x => allContractLeftworkEmployeeIds.Contains(x.EmployeeId) && allContractLeftworkWorkshopIds.Contains(x.WorkshopId))
             .Where(x =>
-                x.ContractStart.Date <= currentMonthEnd.Date && x.ContractEnd.Date > currentMonthStart.Date && x.IsActiveString == "true").ToListAsync();
-        allContractCreated = allContractCreated.Where(x => allContractLeftworkWorkshopIds.Contains(x.WorkshopId)).ToList();
+                x.ContractStart.Date <= currentMonthEnd.Date && x.ContractEnd.Date > currentMonthStart.Date && x.IsActiveString == "true");
 
         var createdContractTople = allContractCreated
             .Select(x => new { x.EmployeeId, x.WorkshopId })
@@ -1645,15 +1641,14 @@ public class ReportRepository : IReportRepository
         //    .Select(x => new { x.EmployeeId, x.WorkshopId }).ToListAsync();
 
         var allContractLeftworkEmployeeIds = allContractLeftworks.Select(x => x.EmployeeId).ToList();
-        var allContractLeftworkWorkshopIds = allContractLeftworks.Select(x => x.WorkshopId).ToList();
 
 
         var allContractCreated =await _context.CheckoutSet
             .Where(x => allContractLeftworkEmployeeIds.Contains(x.EmployeeId))
             .Where(x =>
                 x.ContractStart <= currentMonthEnd && x.ContractEnd > currentMonthStart && x.IsActiveString == "true")
-            .Select(x => new { x.id, x.EmployeeId, x.WorkshopId, x.Signature, x.EmployeeFullName }).ToListAsync(); 
-        allContractCreated = allContractCreated.Where(x => allContractLeftworkWorkshopIds.Contains(x.WorkshopId)).ToList();
+            .Select(x => new { x.id, x.EmployeeId, x.WorkshopId, x.Signature, x.EmployeeFullName }).ToListAsync();
+
 
         var allContractSignedListWorkshopId = new List<(long id, long EmployeeId, long WorkshopId, string Signature, string EmployeeFullName)>();
 

PersonalContractingParty.Config/PersonalBootstrapper.cs

@@ -220,12 +220,9 @@ using CompanyManagment.App.Contracts.PaymentInstrument;
 using CompanyManagment.App.Contracts.PaymentTransaction;
 using CompanyManagment.App.Contracts.AuthorizedPerson;
 using Company.Domain.AuthorizedPersonAgg;
-using Company.Domain.EmployeeFaceEmbeddingAgg;
 using Company.Domain.InstitutionContractExtensionTempAgg;
 using Company.Domain.LawAgg;
-using CompanyManagement.Infrastructure.Mongo.EmployeeFaceEmbeddingRepo;
 using CompanyManagement.Infrastructure.Mongo.InstitutionContractInsertTempRepo;
-using CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
 using CompanyManagment.App.Contracts.Law;
 using CompanyManagment.EFCore.Repository;
 
@@ -482,10 +479,6 @@ public class PersonalBootstrapper
 
         services
             .AddTransient<IInstitutionContractExtenstionTempRepository, InstitutionContractExtenstionTempRepository>();
-        
-        services.AddTransient<IEmployeeFaceEmbeddingRepository, EmployeeFaceEmbeddingRepository>();
-        services.AddTransient<IEmployeeFaceEmbeddingApplication, EmployeeFaceEmbeddingApplication>();
-        
         #endregion
 
         #region Pooya

ServiceHost/Areas/Admin/Controllers/AndroidApkController.cs

@@ -1,61 +0,0 @@
-
-using CompanyManagment.App.Contracts.AndroidApkVersion;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using ServiceHost.BaseControllers;
-
-namespace ServiceHost.Areas.Admin.Controllers;
-
-[AllowAnonymous]
-[ApiController]
-[Route("api/android-apk")] 
-public class AndroidApkController:AdminBaseController
-{
-    private readonly IAndroidApkVersionApplication _apkApp;
-    public AndroidApkController(IAndroidApkVersionApplication apkApp)
-    {
-        _apkApp = apkApp;
-    }
-
-    [HttpGet("check-update")]
-    public async Task<IActionResult> CheckUpdate([FromQuery] ApkType type, [FromQuery] int currentVersionCode = 0)
-    {
-     
-        var info = await _apkApp.GetLatestActiveInfo(type, currentVersionCode);
-        return Ok(new
-        {
-            latestVersionCode = info.LatestVersionCode,
-            latestVersionName = info.LatestVersionName,
-            shouldUpdate = info.ShouldUpdate,
-            isForceUpdate = info.IsForceUpdate,
-            downloadUrl = info.DownloadUrl,
-            releaseNotes = info.ReleaseNotes
-        });
-    }
-
-    [HttpGet("download")]
-    public async Task<IActionResult> Download([FromQuery] ApkType type)
-    {
-        // Check if APK exists
-        if (!_apkApp.HasAndroidApkToDownload(type))
-        {
-            return NotFound(new { message = $"هیچ فایل APK فعالی برای {type} یافت نشد" });
-        }
-
-        // Get the path to the latest active APK
-        var path = await _apkApp.GetLatestActiveVersionPath(type);
-        
-        if (string.IsNullOrEmpty(path) || !System.IO.File.Exists(path))
-        {
-            return NotFound(new { message = "فایل APK یافت نشد" });
-        }
-
-        // Set appropriate file name for download
-        var fileName = type == ApkType.WebView 
-            ? "Gozareshgir.apk" 
-            : "Gozareshgir-FaceDetection.apk";
-
-        // Return the file for download
-        return PhysicalFile(path, "application/vnd.android.package-archive", fileName);
-    }
-}

ServiceHost/Areas/Admin/Controllers/institutionContractController.cs

@@ -541,18 +541,52 @@ public class institutionContractController : AdminBaseController
         var res =await _institutionContractApplication.InsertAmendmentTempWorkshops(request);
         return res;
     }
+    
     [HttpDelete("amendment/remove-temp-workshops/{workshopTempId:guid}")]
     public async Task<ActionResult> RemoveAmendmentWorkshops(Guid workshopTempId)
     {        
         await _institutionContractApplication.RemoveAmendmentWorkshops(workshopTempId);
         return Ok();
     }
+    
     [HttpPost("amendment/payment-details")]
     public async Task<ActionResult<InsitutionContractAmendmentPaymentResponse>> GetAmendmentPaymentDetails([FromBody]InsitutionContractAmendmentPaymentRequest request)
     {
         var res =await _institutionContractApplication.GetAmendmentPaymentDetails(request);
         return res;
     }
+
+    [HttpPost("amendment/complete")]
+    public async Task<ActionResult> AmendmentComplete(
+       [FromBody] InstitutionContractAmendmentCompleteRequest request)
+    {
+        
+         await _institutionContractApplication.AmendmentComplete(request);
+        return Ok();
+
+    }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpGet("/api/institutionContract/amendment-Verification/{id:guid}/{amendmentId:long}")]
+    [AllowAnonymous]
+    public async Task<GetInstitutionAmendmentVerificationDetailsViewModel> GetAmendmentVerificationDetails(Guid id,long amendmentId)
+    {
+        return await _institutionContractApplication.GetAmendmentVerificationDetails(id,amendmentId);
+    }
+
+    [HttpPost("/api/institutionContract/Verify-amendment")]
+    [AllowAnonymous]
+    public async Task<ActionResult<OperationResult>> VerifyAmendment([FromBody] InstitutionVerificationRequest command)
+    {
+        throw new NotImplementedException();
+        //var res = await _institutionContractApplication.AmendmentVerifyOtp(command.Id, command.Code);
+        //return res;
+    }
+    
     
     
     [HttpGet("edit-old/{id}")]

ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml

@@ -10,17 +10,7 @@
         <label asp-for="File">Choose a file:</label>
         <input asp-for="File" type="file" required>
     </div>
-    <div style="margin-top:12px;">
-        <label asp-for="SelectedApkType">نوع اپلیکیشن:</label>
-        <select asp-for="SelectedApkType" asp-items="Html.GetEnumSelectList<CompanyManagment.App.Contracts.AndroidApkVersion.ApkType>()"></select>
-    </div>
-    <div style="margin-top:12px;">
-        <label asp-for="IsForce">
-            <input asp-for="IsForce" type="checkbox">
-            آپدیت اجباری (Force Update)
-        </label>
-    </div>
-    <button type="submit" style="margin-top:12px;">Upload</button>
+    <button type="submit">Upload</button>
 </form>
 
 <form asp-page-handler="ShiftDate" id="8" method="post">

ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs

@@ -2,7 +2,6 @@
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using AccountManagement.Domain.AccountLeftWorkAgg;
 using AccountMangement.Infrastructure.EFCore;
-using Company.Domain.AndroidApkVersionAgg;
 using Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 using Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
 using Company.Domain.RewardAgg;
@@ -19,14 +18,9 @@ using System.Text.Json.Serialization;
 using _0_Framework.Application.PaymentGateway;
 using Company.Domain.InstitutionContractAgg;
 using Company.Domain.InstitutionPlanAgg;
-using Company.Domain.PaymentTransactionAgg;
 using CompanyManagment.App.Contracts.InstitutionContract;
-using CompanyManagment.App.Contracts.PaymentTransaction;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using Microsoft.Extensions.Options;
-using Parbad;
-using Parbad.AspNetCore;
-using Parbad.Gateway.Sepehr;
 using static ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk.IndexModel2;
 
 namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
@@ -40,28 +34,21 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         private readonly AccountContext _accountContext;
         private readonly IPaymentGateway _paymentGateway;
         private readonly ITemporaryClientRegistrationApplication _clientRegistrationApplication;
-        private readonly IHttpClientFactory _httpClientFactory;
-        private readonly IOnlinePayment _onlinePayment;
-
 
 
         [BindProperty] public IFormFile File { get; set; }
-        [BindProperty] public ApkType SelectedApkType { get; set; }
-        [BindProperty] public bool IsForce { get; set; }
 
         public IndexModel(IAndroidApkVersionApplication application, IRollCallDomainService rollCallDomainService,
             CompanyContext context, AccountContext accountContext, IHttpClientFactory httpClientFactory,
             IOptions<AppSettingConfiguration> appSetting,
-            ITemporaryClientRegistrationApplication clientRegistrationApplication, IOnlinePayment onlinePayment)
+            ITemporaryClientRegistrationApplication clientRegistrationApplication)
         {
             _application = application;
             _rollCallDomainService = rollCallDomainService;
             _context = context;
             _accountContext = accountContext;
-            _httpClientFactory = httpClientFactory;
             _clientRegistrationApplication = clientRegistrationApplication;
-            _onlinePayment = onlinePayment;
-            _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
+            _paymentGateway = new AqayePardakhtPaymentGateway(httpClientFactory, appSetting);
         }
 
         public void OnGet()
@@ -70,13 +57,13 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
 
         public async Task<IActionResult> OnPostUpload()
         {
-            var result = await _application.CreateAndActive(File, SelectedApkType, IsForce);
+            var result = await _application.CreateAndActive(File);
             ViewData["message"] = result.Message;
             return Page();
         }
 
 
-        public async Task<IActionResult> OnPostShiftDate()
+        public IActionResult OnPostShiftDate()
         {
             //var startRollCall = new DateTime(2025, 2, 19);
             //var rollCalls = _context.RollCalls.Where(x => x.ShiftDate >= startRollCall);
@@ -86,116 +73,10 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
             //var notEndedRollCalls = rollCalls.Where(x => x.EndDate == null).ToList();
             //RefactorAllTheRollCallsOnEsfand(endedRollCalls, notEndedRollCalls);
             //CreateRewardForKebabMahdi().GetAwaiter().GetResult();
-
-            var callBack = Url.Action("Verify", "General", null, Request.Scheme);
-
-
-            var amount = 10000;
-            var transaction = new PaymentTransaction(30427, amount, "سید حسن مصباح", "https://client.gozareshgir.ir", PaymentTransactionGateWay.SepehrPay);
-
-            _context.PaymentTransactions.Add(transaction);
-            await _context.SaveChangesAsync();
-
-            var command = new CreatePaymentGatewayRequest()
-            {
-                InvoiceId = transaction.id.ToString(),
-                Amount = amount,
-                CallBackUrl = callBack
-			};
-
-            var createRes = await _paymentGateway.Create(command);
-
-            if (createRes.IsSuccess)
-            {
-	            var payUrl = _paymentGateway.GetStartPayUrl(createRes.Token);
-	            return Redirect(payUrl);
-            }
-            else
-            {
-	            return BadRequest(createRes.Status + "خطا در ارسال به درگاه پرداخت");
-            }
-        }
-
-        private async System.Threading.Tasks.Task CreateDadmehrWorkshopFaceEmbedding()
-        {
-            var basePath = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "faces");
-
-            if (!Directory.Exists(basePath))
-            {
-                ViewData["message"] = "مسیر پوشه یافت نشد";
-                return;
-            }
-
-            var directories = Directory.GetDirectories(basePath);
-
-            var client = new HttpClient();
-
-            foreach (var mainDirectory in directories)
-            {
-                var subDirectories = Directory.GetDirectories(mainDirectory);
-                var workshopName = Path.GetFileName(mainDirectory);
-                foreach (var directory in subDirectories)
-                {
-                    var directoryName = Path.GetFileName(directory);
-
-                    var employee = await _context.Employees
-                        .FirstOrDefaultAsync(x => x.id == Convert.ToInt64(directoryName));
-                    var fullname = employee != null ? employee.FullName : "نامشخص";
-
-                    var imageFiles = Directory.GetFiles(directory, "*.*")
-                        .Take(2)
-                        .ToArray();
-
-                    if (imageFiles.Length < 2)
-                    {
-                        Console.WriteLine($"تعداد تصاویر کافی برای {directoryName} وجود ندارد");
-                        continue;
-                    }
-
-                    using var formData = new MultipartFormDataContent();
-                    formData.Add(new StringContent(directoryName), "employee_id");
-                    formData.Add(new StringContent(workshopName), "workshop_id");
-                    formData.Add(new StringContent(fullname), "employee_full_name");
-
-                    FileStream file1Stream = null;
-                    FileStream file2Stream = null;
-
-                    try
-                    {
-                        // ارسال فایل اول
-                        file1Stream = new FileStream(imageFiles[0], FileMode.Open, FileAccess.Read);
-                        var file1Content = new StreamContent(file1Stream);
-                        file1Content.Headers.ContentType =
-                            new System.Net.Http.Headers.MediaTypeHeaderValue("image/jpeg");
-                        formData.Add(file1Content, "picture1", Path.GetFileName(imageFiles[0]));
-
-                        // ارسال فایل دوم
-                        file2Stream = new FileStream(imageFiles[1], FileMode.Open, FileAccess.Read);
-                        var file2Content = new StreamContent(file2Stream);
-                        file2Content.Headers.ContentType =
-                            new System.Net.Http.Headers.MediaTypeHeaderValue("image/jpeg");
-                        formData.Add(file2Content, "picture2", Path.GetFileName(imageFiles[1]));
-
-                        var response = await client.PostAsync("http://127.0.0.1:8000/embeddings", formData);
-
-                        if (response.IsSuccessStatusCode)
-                        {
-                            var result = await response.Content.ReadAsStringAsync();
-                            Console.WriteLine($"✓ {directoryName}: {result}");
-                        }
-                        else
-                        {
-                            var error = await response.Content.ReadAsStringAsync();
-                            Console.WriteLine($"✗ {directoryName}: {response.StatusCode} - {error}");
-                        }
-                    }
-                    finally
-                    {
-                        file1Stream?.Dispose();
-                        file2Stream?.Dispose();
-                    }
-                }
-            }
+            SetEntityIdForCheckoutValues();
+            SetEntityIdForCheckoutValuesTemp();
+            ViewData["message"] = "ایجاد شد";
+            return Page();
         }
 
         public IActionResult OnPostShiftDateNew()
@@ -247,7 +128,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
 
             if (createResponse.Status == "success")
             {
-                return Redirect(_paymentGateway.GetStartPayUrl(createResponse.Token));
+                return Redirect(_paymentGateway.GetStartPayUrl(createResponse.TransactionId));
             }
 
             //TranslateCode(result?.ErrorCode);
@@ -814,7 +695,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                 //TODO: set data for institution price
                 var workshops = item.contractingParty.Employers
                     .SelectMany(e => e.WorkshopEmployers.Select(we => we.Workshop)).ToList()
-                    .DistinctBy(x => x.id).ToList();
+                    .DistinctBy(x=>x.id).ToList();
 
                 var initialWorkshop = workshops
                     .Select(w =>
@@ -856,7 +737,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                         x.PersonnelCount,
                         x.Price, x.InstitutionContractWorkshopGroupId,
                         group,
-                        x.WorkshopId.Value);
+                        x.WorkshopId.Value,false);
                     entity.SetEmployers(x.Employers.Select(e => e.EmployerId).ToList());
 
                     return entity;
@@ -869,56 +750,56 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
 
                 //var oneMonthSum = current.Sum(x => x.Price);
                 item.contract.SetWorkshopGroup(group);
-                // var totalPaymentAndWorkshopList = await _clientRegistrationApplication.GetTotalPaymentAndWorkshopList(oneMonthSum,duration: InstitutionContractDuration.TwelveMonths,false);
-                //    item.contract.SetAmount(totalPaymentAndWorkshopList.OneTimeTotalPaymentStr.MoneyToDouble(),
-                //      totalPaymentAndWorkshopList.OneTimeValueAddedTaxStr.MoneyToDouble(),totalPaymentAndWorkshopList.DiscountedAmountForOneMonth.MoneyToDouble());
+               // var totalPaymentAndWorkshopList = await _clientRegistrationApplication.GetTotalPaymentAndWorkshopList(oneMonthSum,duration: InstitutionContractDuration.TwelveMonths,false);
+            //    item.contract.SetAmount(totalPaymentAndWorkshopList.OneTimeTotalPaymentStr.MoneyToDouble(),
+              //      totalPaymentAndWorkshopList.OneTimeValueAddedTaxStr.MoneyToDouble(),totalPaymentAndWorkshopList.DiscountedAmountForOneMonth.MoneyToDouble());
             }
 
             var remoteIds = remoteContractsQuery.Select(x => x.contract.id);
-            var inPersonContracts = await query
-                .Where(x => !remoteIds.Contains(x.contractingParty.id)).ToListAsync();
+            var inPersonContracts =await query
+                .Where(x=>!remoteIds.Contains(x.contractingParty.id)).ToListAsync();
             foreach (var item in inPersonContracts)
             {
                 var workshops = item.contractingParty.Employers
                     .SelectMany(e => e.WorkshopEmployers.Select(we => we.Workshop)).ToList()
-                    .DistinctBy(x => x.id).ToList();
+                    .DistinctBy(x=>x.id).ToList();
 
                 var initialWorkshop = workshops
                     .Select(w =>
                     {
                         var personnelCount =
                             w.LeftWorks.Count(lw => lw.StartWorkDate <= today && lw.LeftWorkDate >= today);
-
+                        
                         bool hasRollCallPlan = true;
                         bool hasRollCallPlanInPerson = false;
                         bool hasCustomizeCheckoutPlan = w.id == 170;
                         bool hasContractPlan = true;
                         bool hasContractPlanInPerson = true;
-                        bool hasInsurancePlan = true;
+                        bool hasInsurancePlan =true;
                         bool hasInsurancePlanInPerson = true;
-
-                        var initial = InstitutionContractWorkshopInitial.CreateManual(w.WorkshopFullName,
-                            hasRollCallPlan,
-                            hasRollCallPlanInPerson, hasCustomizeCheckoutPlan,
-                            hasContractPlan, hasContractPlanInPerson,
-                            hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, 0,
+                        
+                        var initial = InstitutionContractWorkshopInitial.CreateManual(w.WorkshopFullName, hasRollCallPlan,
+                            hasRollCallPlanInPerson,hasCustomizeCheckoutPlan,
+                            hasContractPlan,hasContractPlanInPerson,
+                            hasInsurancePlan,hasInsurancePlanInPerson,personnelCount,0,
                             w.id, w.WorkshopEmployers.Select(x => x.EmployerId
                             ).ToList());
                         return initial;
                     }).ToList();
 
                 var group = new InstitutionContractWorkshopGroup(item.contract.id, initialWorkshop);
-
+                
                 await _context.AddAsync(group);
                 await _context.SaveChangesAsync();
-
+                
                 initialWorkshop.ForEach(x =>
                 {
                     var workshopId = workshops.First(w => x.WorkshopId.Value == w.id).id;
                     x.SetWorkshopId(workshopId);
                 });
-
+                
                 item.contract.SetWorkshopGroup(group);
+                
             }
 
             await _context.SaveChangesAsync();

ServiceHost/Areas/Camera/Controllers/CameraController.cs

@@ -1,352 +0,0 @@
-using ServiceHost.BaseControllers;
-using System;
-using System.IO;
-using System.Linq;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Hosting;
-using _0_Framework.Application;
-using _0_Framework.Exceptions;
-using AccountManagement.Application.Contracts.Account;
-using AccountManagement.Application.Contracts.CameraAccount;
-using AccountManagement.Domain.TaskAgg;
-using CompanyManagment.App.Contracts.AndroidApkVersion;
-using CompanyManagment.App.Contracts.PersonnleCode;
-using CompanyManagment.App.Contracts.RollCall;
-using CompanyManagment.App.Contracts.RollCallEmployee;
-using CompanyManagment.App.Contracts.RollCallService;
-using CompanyManagment.App.Contracts.Employee;
-using CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
-using Microsoft.AspNetCore.Authorization;
-
-namespace ServiceHost.Areas.Camera.Controllers;
-
-public class CameraController : CameraBaseController
-{
-    private readonly IWebHostEnvironment _webHostEnvironment;
-    private readonly IConfiguration _configuration;
-    private readonly IEmployeeApplication _employeeApplication;
-    private readonly IRollCallApplication _rollCallApplication;
-    private readonly IRollCallServiceApplication _rollCallServiceApplication;
-    private readonly IRollCallEmployeeApplication _rollCallEmployeeApplication;
-    private readonly IAuthHelper _authHelper;
-    private readonly IPersonnelCodeApplication _personnelCodeApplication;
-    private readonly IAccountApplication _accountApplication;
-    private readonly IPasswordHasher _passwordHasher;
-    private readonly ICameraAccountApplication _cameraAccountApplication;
-    private readonly IEmployeeFaceEmbeddingApplication _employeeFaceEmbeddingApplication;
-    private long _workshopId;
-    private readonly IHttpClientFactory _httpClientFactory;
-    private readonly HttpClient _faceEmbeddingHttpClient;
-    private readonly IAndroidApkVersionApplication _androidApkVersionApplication;
-
-    public CameraController(IWebHostEnvironment webHostEnvironment,
-        IConfiguration configuration,
-        IEmployeeApplication employeeApplication,
-        IRollCallApplication rollCallApplication,
-        IAuthHelper authHelper,
-        IRollCallServiceApplication rollCallServiceApplication,
-        IRollCallEmployeeApplication rollCallEmployeeApplication,
-        IPersonnelCodeApplication personnelCodeApplication,
-        IAccountApplication accountApplication,
-        IPasswordHasher passwordHasher,
-        ICameraAccountApplication cameraAccountApplication,
-        IEmployeeFaceEmbeddingApplication employeeFaceEmbeddingApplication, IHttpClientFactory httpClientFactory, IAndroidApkVersionApplication androidApkVersionApplication)
-    {
-        _webHostEnvironment = webHostEnvironment;
-        _configuration = configuration;
-        _employeeApplication = employeeApplication;
-        _rollCallApplication = rollCallApplication;
-        _authHelper = authHelper;
-        _rollCallServiceApplication = rollCallServiceApplication;
-        _rollCallEmployeeApplication = rollCallEmployeeApplication;
-        _personnelCodeApplication = personnelCodeApplication;
-        _accountApplication = accountApplication;
-        _passwordHasher = passwordHasher;
-        _cameraAccountApplication = cameraAccountApplication;
-        _employeeFaceEmbeddingApplication = employeeFaceEmbeddingApplication;
-        _httpClientFactory = httpClientFactory;
-        _androidApkVersionApplication = androidApkVersionApplication;
-        _faceEmbeddingHttpClient = httpClientFactory.CreateClient();
-        _faceEmbeddingHttpClient.BaseAddress = new Uri("http://localhost:8000/");
-        _workshopId= authHelper.GetWorkshopId();
-        
-    }
-
-    [HttpPost("login")]
-    [AllowAnonymous]
-    public IActionResult CameraLogin([FromBody] CameraLoginRequest request)
-    {
-        _accountApplication.CameraLogin(request);
-        return Ok();
-    }
-
-
-    [HttpPost("embedding")]
-    [AllowAnonymous]
-    public async Task<ActionResult<List<EmployeeFaceEmbeddingDto>>> WorkshopEmbedding()
-    {
-        if (!User.Identity?.IsAuthenticated ?? false)
-        {
-            return Unauthorized();
-        }
-        _workshopId = _authHelper.GetWorkshopId(); 
-        var data = await _employeeFaceEmbeddingApplication
-            .GetByWorkshopIdsAsync([_workshopId]);
-        
-        return data;
-    }
-    
-    [HttpPost("flag/{employeeId:long}")]
-    public async Task<IActionResult> GetFlag(long employeeId)
-    {
-        var flagId = _rollCallApplication.Flag(employeeId, _workshopId);
-        return Ok(new
-        {
-            flagId = flagId,
-            status = flagId == 0 ? "enter": "exit"
-        });
-    }
-
-    [HttpPost("exit")]
-    public IActionResult Exit([FromBody]RollCallExitRequest request)
-    {
-        var employeeId = request.EmployeeId;
-        var flagId = request.FlagId;
-        bool rollCallEmployee = _rollCallEmployeeApplication.IsEmployeeRollCallActive(employeeId,
-            _workshopId);
-        
-        if (!rollCallEmployee)
-        {
-            throw new BadRequestException("پرسنل مورد نظر غیر فعال است");
-        }
-        
-        _faceEmbeddingHttpClient.PostAsync("embeddings/refine",
-            JsonContent.Create(new {
-                employeeId,
-                workshopId = _workshopId,
-                embedding =request.Embeddings ,
-                confidence =request.Confidence ,
-                metadata =new{},
-                
-            }));
-        
-        
-        
-        var repeatStatus = _rollCallApplication.CheckRepeat(employeeId, _workshopId);
-        switch (repeatStatus)
-        {
-            case "IncomRegistred-InvalidOut":
-            throw new BadRequestException("شما به تازگی ثبت ورود نموده اید ,تا 2 دقیقه نمی توانید ثبت خروج نمایید");
-            
-            case "outRegistred-InvalidIncom":
-            throw new BadRequestException("شما به تازگی ثبت خروج نموده اید تا 2 دقیقه نمی توانید ثبت ورود نمایید");
-            
-        }
-        
-        var res = _rollCallApplication.Edit(flagId);
-        
-        if (res.IsSuccedded)
-        {
-            return new JsonResult(new
-            {
-                isSuccess = true,
-            });
-        }
-
-        throw new BadRequestException(res.Message);
-    }
-
-    [HttpPost("enter")]
-    public IActionResult Enter([FromBody]RollCallEnterRequest request)
-    {
-        var employeeId = request.EmployeeId;
-        var now = DateTime.Now;
-        var command = new CreateRollCall()
-        {
-            WorkshopId = _workshopId,
-            EmployeeId = request.EmployeeId,
-            StartDate = now,
-        };
-        bool rollCallEmployee = _rollCallEmployeeApplication.IsEmployeeRollCallActive(employeeId,
-            _workshopId);
-        
-        if (!rollCallEmployee)
-        {
-            throw new BadRequestException("پرسنل مورد نظر غیر فعال است");
-        }
-        
-        _faceEmbeddingHttpClient.PostAsync("embeddings/refine",
-            JsonContent.Create(new {
-                employeeId,
-                workshopId = _workshopId,
-                embedding =request.Embeddings ,
-                confidence =request.Confidence ,
-                metadata =new{},
-                
-                
-            }));
-        
-        
-        
-        var repeatStatus = _rollCallApplication.CheckRepeat(employeeId, _workshopId);
-        switch (repeatStatus)
-        {
-            case "IncomRegistred-InvalidOut":
-                throw new BadRequestException("شما به تازگی ثبت ورود نموده اید ,تا 2 دقیقه نمی توانید ثبت خروج نمایید");
-            
-            case "outRegistred-InvalidIncom":
-                throw new BadRequestException("شما به تازگی ثبت خروج نموده اید تا 2 دقیقه نمی توانید ثبت ورود نمایید");
-            
-        }
-        
-
-        var res = _rollCallApplication.Create(command);
-        if (res.IsSuccedded)
-        {
-            return new JsonResult(new
-            {
-                isSuccess = true,
-            });
-        }
-        else
-        {
-            return new JsonResult(new
-            {
-                isSuccess = false,
-            });
-        }
-    }
-    
-    [AllowAnonymous]
-    [HttpGet("check-update")]
-    public async Task<IActionResult> CheckUpdate([FromQuery] ApkType type, [FromQuery] int currentVersionCode = 0)
-    {
-     
-        var info = await _androidApkVersionApplication.GetLatestActiveInfo(type, currentVersionCode);
-        return Ok(new
-        {
-            latestVersionCode = 6000,
-            latestVersionName = "2.0.0",
-            shouldUpdate = info.ShouldUpdate,
-            isForceUpdate = info.IsForceUpdate,
-            downloadUrl = info.DownloadUrl,
-            releaseNotes = info.ReleaseNotes
-        });
-    }
-    
-    [AllowAnonymous]
-    [HttpGet("download")]
-    public async Task<IActionResult> Download([FromQuery] ApkType type)
-    {
-        // Check if APK exists
-        if (!_androidApkVersionApplication.HasAndroidApkToDownload(type))
-        {
-            return NotFound(new { message = $"هیچ فایل APK فعالی برای {type} یافت نشد" });
-        }
-
-        // Get the path to the latest active APK
-        var path = await _androidApkVersionApplication.GetLatestActiveVersionPath(type);
-        
-        if (string.IsNullOrEmpty(path) || !System.IO.File.Exists(path))
-        {
-            return NotFound(new { message = "فایل APK یافت نشد" });
-        }
-
-        // Set appropriate file name for download
-        var fileName = type == ApkType.WebView 
-            ? "Gozareshgir.apk" 
-            : "Gozareshgir-FaceDetection.apk";
-
-        // Return the file for download
-        return PhysicalFile(path, "application/vnd.android.package-archive", fileName);
-    }
-    
-    
-    [HttpGet("SendPersonelCodeToGetEmployeeId")]
-    public IActionResult SendPersonelCodeToGetEmployeeId(long personelCode, long workshopId)
-    {
-        long employeeId = _personnelCodeApplication.GetEmployeeIdByPersonelCode(personelCode, workshopId);
-
-        if (employeeId == 0)
-        {
-            return new JsonResult(new
-            {
-                isSuccess = false,
-                message = "کد پرسنلی یافت نشد",
-            });
-        }
-
-        bool rollcallEmployee = _rollCallEmployeeApplication.IsEmployeeRollCallActive(employeeId, workshopId);
-        if (!rollcallEmployee)
-        {
-            return new JsonResult(new
-            {
-                isSuccess = false,
-                message = "پرسنل مورد نظر غیر فعال است",
-            });
-        }
-
-        var repeatStatus = _rollCallApplication.CheckRepeat(employeeId, workshopId);
-        switch (repeatStatus)
-        {
-            case "IncomRegistred-InvalidOut":
-                return new JsonResult(new
-                {
-                    isSuccess = false,
-                    message = "شما به تازگی ثبت ورود نموده اید ,تا 2 دقیقه نمی توانید ثبت خروج نمایید",
-                });
-            case "outRegistred-InvalidIncom":
-                return new JsonResult(new
-                {
-                    isSuccess = false,
-                    message = "شما به تازگی ثبت خروج نموده اید تا 2 دقیقه نمی توانید ثبت ورود نمایید",
-                });
-        }
-
-        return new JsonResult(new
-        {
-            isSuccess = true,
-            message = "",
-            personId = $"{employeeId}",
-        });
-    }
-
-    [HttpGet("EmployeeFlag")]
-    public IActionResult EmployeeFlag(long employeeId, long workshopId)
-    {
-        var employee = _rollCallEmployeeApplication.GetByEmployeeIdAndWorkshopId(employeeId, workshopId);
-        var employeeFullName = employee?.EmployeeFullName ?? string.Empty;
-        var flagId = _rollCallApplication.Flag(employeeId, workshopId);
-
-        return new JsonResult(new
-        {
-            employeeName = employeeFullName,
-            flag = flagId
-        });
-    }
-    
-
-    [HttpGet("Logout")]
-    public IActionResult Logout()
-    {
-        _accountApplication.Logout();
-        return new JsonResult(new { isSuccess = true });
-    }
-}
-
-public class RollCallExitRequest:RollCallEnterRequest
-{
-    public long FlagId { get; set; }
-}
-public class RollCallEnterRequest
-{
-    public long EmployeeId { get; set; }
-    public List<double> Embeddings { get; set; }
-    public float Confidence { get; set; }
-}
-
-public class CameraFlagRequest
-{
-    public long EmployeeId { get; set; }
-    public long WorkshopId { get; set; }
-}

ServiceHost/Areas/Client/Controllers/FinancialController.cs

@@ -93,8 +93,8 @@ public class FinancialController : ClientBaseController
 
         if (gatewayResponse.IsSuccess)
         {
-            _ = await _paymentTransactionApplication.SetTransactionId(transaction.SendId, gatewayResponse.Token);
-            return Redirect(_paymentGateway.GetStartPayUrl(gatewayResponse.Token));
+            _ = await _paymentTransactionApplication.SetTransactionId(transaction.SendId, gatewayResponse.TransactionId);
+            return Redirect(_paymentGateway.GetStartPayUrl(gatewayResponse.TransactionId));
         }
 
         if (gatewayResponse.ErrorCode.HasValue)

ServiceHost/Areas/Client/Pages/Index.cshtml.cs

@@ -65,7 +65,6 @@ namespace ServiceHost.Areas.Client.Pages
         #region Mahan
         public bool HasInsuranceToConfirm { get; set; }
         public bool HasApkToDownload { get; set; }
-        public bool HasFaceDetectionApkToDownload { get; set; }
 
         #endregion
         public IndexModel(IAuthHelper authHelper, IPasswordHasher passwordHasher, IWorkshopApplication workshopApplication, ILeaveApplication leaveApplication, IEmployeeApplication employeeApplication, IPaymentToEmployeeItemApplication paymentToEmployeeItemApplication, IPaymentToEmployeeApplication paymentToEmployeeApplication, IHolidayItemApplication holidayItemApplication, IInsuranceListApplication insuranceListApplication, IAndroidApkVersionApplication androidApkVersionApplication, IRollCallServiceApplication rollCallServiceApplication, IPersonnelCodeApplication personnelCodeApplication, ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IBankApplication bankApplication, ILeftWorkTempApplication leftWorkTempApplication, IJobApplication jobApplication, ICustomizeWorkshopSettingsApplication customizeWorkshopEmployee, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, ICameraAccountApplication cameraAccountApplication)
@@ -101,8 +100,7 @@ namespace ServiceHost.Areas.Client.Pages
             profilePicture = account.ProfilePhoto;
             AccountFullName = account.Fullname;
             var todayGr = DateTime.Now;
-            HasApkToDownload = _androidApkVersionApplication.HasAndroidApkToDownload(ApkType.WebView);
-            HasFaceDetectionApkToDownload = _androidApkVersionApplication.HasAndroidApkToDownload(ApkType.FaceDetection);
+            HasApkToDownload = _androidApkVersionApplication.HasAndroidApkToDownload();
 
 
             #region Mahan

ServiceHost/BaseControllers/CameraBaseController.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc;
 namespace ServiceHost.BaseControllers;
 
 
-[ApiExplorerSettings(GroupName = "Camera")]
+//[ApiExplorerSettings(GroupName = "Camera")]
 [Authorize(Policy = "CameraArea")]
 [Area("Camera")]
 [Route("api/[area]/[controller]")]

ServiceHost/Controllers/GeneralController.cs

@@ -1,24 +1,14 @@
 using _0_Framework.Application;
-using _0_Framework.Application.PaymentGateway;
-using Company.Domain.BankAgg;
-using Company.Domain.PaymentTransactionAgg;
-using CompanyManagment.App.Contracts.FinancialStatment;
-using CompanyManagment.App.Contracts.FinancilTransaction;
 using CompanyManagment.App.Contracts.PaymentTransaction;
-using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.EFCore.Migrations;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-using NuGet.Protocol;
-using Parbad;
 using ServiceHost.BaseControllers;
-using System.ComponentModel.DataAnnotations;
 using System.Globalization;
-using System.Net.Http;
-using System.Security.Cryptography;
-using System.Threading;
+using _0_Framework.Application.PaymentGateway;
+using Microsoft.Extensions.Options;
+using CompanyManagment.App.Contracts.FinancialStatment;
+using CompanyManagment.App.Contracts.FinancilTransaction;
 
 namespace ServiceHost.Controllers;
 
@@ -28,14 +18,12 @@ public class GeneralController : GeneralBaseController
     private readonly IPaymentTransactionApplication _paymentTransactionApplication;
     private readonly IPaymentGateway _paymentGateway;
     private readonly IFinancialStatmentApplication _financialStatmentApplication;
-    private readonly IOnlinePayment _onlinePayment;
 
-	public GeneralController(IPaymentTransactionApplication paymentTransactionApplication,IHttpClientFactory clientFactory, IFinancialStatmentApplication financialStatmentApplication, IOptions<AppSettingConfiguration> appSetting, IOnlinePayment onlinePayment)
+    public GeneralController(IPaymentTransactionApplication paymentTransactionApplication,IHttpClientFactory clientFactory, IFinancialStatmentApplication financialStatmentApplication, IOptions<AppSettingConfiguration> appSetting)
     {
         _paymentTransactionApplication = paymentTransactionApplication;
-        _paymentGateway = new SepehrPaymentGateway(clientFactory);
+        _paymentGateway = new AqayePardakhtPaymentGateway(clientFactory, appSetting);
         _financialStatmentApplication = financialStatmentApplication;
-        _onlinePayment = onlinePayment;
     }
 
     /// <summary>
@@ -59,103 +47,7 @@ public class GeneralController : GeneralBaseController
         });
     }
 
-
-    [HttpGet("/api/callback"), HttpPost("/api/callback")]
-    public async Task<IActionResult> Verify(SepehrGatewayPayResponse payResponse)
-    {
-	    if (!long.TryParse(payResponse.invoiceid, out var paymentTransactionId))
-	    {
-		    return BadRequest("Invalid invoice_id");
-	    }
-
-		var transaction = await _paymentTransactionApplication.GetDetails(paymentTransactionId);
-
-		if (transaction == null)
-		{
-			return NotFound("Transaction not found");
-		}
-
-		if (transaction.Status != PaymentTransactionStatus.Pending)
-		{
-			return BadRequest("این تراکنش قبلا پرداخت شده است");
-		}
-		
-	
-		if (payResponse.respcode != 0)
-		{
-			return await HandleFailedTransaction(transaction);
-		}
-
-		var verifyCommand = new VerifyPaymentGateWayRequest()
-		{
-			Amount = transaction.Amount,
-			TransactionId = payResponse.invoiceid,
-			DigitalReceipt = payResponse.digitalreceipt
-		};
-		var verifyRes = await _paymentGateway.Verify(verifyCommand, CancellationToken.None);
-		
-
-
-		
-		if (verifyRes.IsSuccess)
-		{
-			var command = new CreateFinancialStatment()
-			{
-				ContractingPartyId = transaction.ContractingPartyId,
-				Deptor = 0,
-				Creditor = transaction.Amount,
-				DeptorString = "0",
-				TypeOfTransaction = "credit",
-				DescriptionOption = "بابت قرارداد مابین (روابط کار)",
-				Description = "درگاه بانکی",
-				
-			};
-			var statementResult = _financialStatmentApplication.CreateFromBankGateway(command);
-			if (!statementResult.IsSuccedded)
-			{
-				return new JsonResult(statementResult);
-			}
-
-			var setSuccessResult = _paymentTransactionApplication.SetSuccess(paymentTransactionId, payResponse.cardnumber, payResponse.issuerbank, payResponse.rrn.ToString(), payResponse.digitalreceipt);
-
-			if (!setSuccessResult.IsSuccedded)
-			{
-				return await HandleFailedTransaction(transaction);
-			}
-			return Redirect(BuildCallbackUrl(transaction.CallBackUrl, true, transaction.Id));
-		}
-
-		// در غیر این صورت تراکنش ناموفق است
-		return await HandleFailedTransaction(transaction);
-
-
-		//var data = JsonConvert.SerializeObject(invoice.AdditionalData);
-		//var statics =
-		//JsonConvert.SerializeObject(res);
-
-		//await _onlinePayment.CancelAsync(invoice);
-		//return new JsonResult(new
-		//{
-		//	data,
-		//	statics
-		//});
-
-		//// Check if the invoice is new, or it's already processed before.
-		//if (invoice.Status != PaymentFetchResultStatus.ReadyForVerifying)
-		//{
-		//	// You can also see if the invoice is already verified before.
-		//	var isAlreadyVerified = invoice.IsAlreadyVerified;
-
-		//	return Content("The payment was not successful.");
-		//}
-
-		//// Note: Save the verifyResult.TransactionCode in your database.
-
-
-
-	}
-
-	[HttpPost("/api/callback3232")]
+    [HttpPost("/api/callback")]
     public async Task<IActionResult> OnGetCallBack(string? transid, string? cardnumber, string? tracking_number, 
         string bank, string invoice_id, string? status,CancellationToken cancellationToken)
     {
@@ -178,7 +70,7 @@ public class GeneralController : GeneralBaseController
         // اگر شماره کارت یا شماره پیگیری خالی باشد، تراکنش ناموفق است
         if (string.IsNullOrWhiteSpace(cardnumber) || string.IsNullOrWhiteSpace(tracking_number))
         {
-            return await HandleFailedTransaction(transaction);
+            return await HandleFailedTransaction(transaction, paymentTransactionId);
         }
 
         var verifyCommand = new VerifyPaymentGateWayRequest()
@@ -205,10 +97,10 @@ public class GeneralController : GeneralBaseController
             var statementResult = _financialStatmentApplication.CreateFromBankGateway(command);
             if (!statementResult.IsSuccedded)
             {
-                return await HandleFailedTransaction(transaction);
+                return await HandleFailedTransaction(transaction, paymentTransactionId);
             }
 
-            var setSuccessResult = _paymentTransactionApplication.SetSuccess(paymentTransactionId, cardnumber, bank,null,null);
+            var setSuccessResult = _paymentTransactionApplication.SetSuccess(paymentTransactionId, cardnumber, bank);
 
             if (!setSuccessResult.IsSuccedded)
             {
@@ -218,12 +110,12 @@ public class GeneralController : GeneralBaseController
         }
 
         // در غیر این صورت تراکنش ناموفق است
-        return await HandleFailedTransaction(transaction);
+        return await HandleFailedTransaction(transaction, paymentTransactionId);
     }
 
-    private async Task<IActionResult> HandleFailedTransaction(PaymentTransactionDetailsViewModel transaction)
+    private async Task<IActionResult> HandleFailedTransaction(PaymentTransactionDetailsViewModel transaction, long transactionId)
     {
-        var result = _paymentTransactionApplication.SetFailed(transaction.Id);
+        var result = _paymentTransactionApplication.SetFailed(transactionId);
         if (!result.IsSuccedded)
         {
             return new JsonResult(result);
@@ -239,81 +131,4 @@ public class GeneralController : GeneralBaseController
     }
 
 
-}
-
-public class TokenReq
-{
-	
-	public long Amount { get; set; }
-
-	public string CallbackUrl { get; set; }
-	[Display(Name = "شماره فاکتور")]
-	[MaxLength(100)]
-	[Required]
-	[Key]
-	// be ezaye har pazirande bayad yekta bashad
-	public string invoiceID { get; set; }
-	[Required]
-	public long terminalID { get; set; }
-	/*
-	 * JSON Bashad
-	 * etelaate takmili site harchi
-	 * nabayad char khas dashte bashe (*'"xp_%!+- ...)
-	 */
-	public string Payload { get; set; } = "";
-	public string email { get; set; }
-}
-public class TokenResp
-{
-	// if 0 = success
-	public int Status { get; set; }
-	public string AccessToken { get; set; }
-}
-public class PayRequest
-{
-	[Required]
-	[MaxLength(3000)]
-	public string token { get; set; }
-	[Required]
-	public long terminalID { get; set; }
-	public string nationalCode { get; set; }
-
-}
-public class SepehrGatewayPayResponse
-{
-	/* 0 yni movafaq
-	 * -1 yni enseraf
-	 * -2 yni etmam zaman
-	 */
-	public int respcode { get; set; }
-	[Display(Name = "متن نتیجه تراکنش")]
-	public string respmsg { get; set; }
-	[Display(Name = "مبلغ کسر شده از مشتری")]
-	public long amount { get; set; }
-	[Display(Name = " شماره فاکتور ")]
-	public string invoiceid { get; set; }
-	[Display(Name = " اطلاعاتی که پذیرنده ارسال کرد ")]
-	public string payload { get; set; }
-	[Display(Name = " شماره ترمینال ")]
-	public long terminalid { get; set; }
-	[Display(Name = " شماره پیگیری ")]
-	public long tracenumber { get; set; }
-	// bayad negah dari she hatman to db
-	[Display(Name = " شماره سند بانکی ")]
-	public long rrn { get; set; }
-	[Display(Name = " زمان و تاریخ پرداخت ")]
-	public string datepaid { get; set; }
-	[Display(Name = " رسید دیجیتال ")]
-	public string digitalreceipt { get; set; }
-	[Display(Name = " نام بانک صادر کننده کارت ")]
-	public string issuerbank { get; set; }
-	[Display(Name = " شماره کارت ")]
-	public string cardnumber { get; set; }
-}
-
-public class AdviceReq
-{
-	[Display(Name = " رسید دیجیتال ")]
-	public string digitalreceipt { get; set; }
-	public long Tid { get; set; }
 }

ServiceHost/Pages/Apk/AndroidApk.cs

@@ -13,11 +13,9 @@ public class AndroidApk : Controller
     }
 
     [Route("Apk/Android")]
-    public async Task<IActionResult> Index([FromQuery] string type = "WebView")
+    public async Task<IActionResult> Index()
     {
-        ApkType apkType = type.ToLower() == "facedetection" ? ApkType.FaceDetection : ApkType.WebView;
-        var path = await _androidApkVersionApplication.GetLatestActiveVersionPath(apkType);
-        var fileName = apkType == ApkType.WebView ? "Gozareshgir.apk" : "Gozareshgir-FaceDetection.apk";
-        return PhysicalFile(path,"application/vnd.android.package-archive", fileName);
+        var path = await _androidApkVersionApplication.GetLatestActiveVersionPath();
+        return PhysicalFile(path,"application/vnd.android.package-archive","Gozareshgir.apk");
     }
 }

ServiceHost/Pages/login/Index.cshtml.cs

@@ -43,7 +43,6 @@ public class IndexModel : PageModel
     [BindProperty] public string Password { get; set; }
     [BindProperty] public string CaptchaResponse { get; set; }
     public bool HasApkToDownload { get; set; }
-    public bool HasFaceDetectionApkToDownload { get; set; }
     private static Timer aTimer;
     public Login login;
     public AccountViewModel Search;
@@ -77,8 +76,7 @@ public class IndexModel : PageModel
 
         //_context.SaveChanges();
 
-        HasApkToDownload = _androidApkVersionApplication.HasAndroidApkToDownload(ApkType.WebView);
-        HasFaceDetectionApkToDownload = _androidApkVersionApplication.HasAndroidApkToDownload(ApkType.FaceDetection);
+        HasApkToDownload = _androidApkVersionApplication.HasAndroidApkToDownload();
         if (User.Identity is { IsAuthenticated: true })
         {
             if (User.FindFirstValue("IsCamera") == "true")

ServiceHost/Program.cs

@@ -24,15 +24,12 @@ using ServiceHost.Test;
 using System.Text.Json.Serialization;
 using System.Text.Json;
 using _0_Framework.InfraStructure.Mongo;
-using Bogus;
 using CompanyManagment.EFCore.Services;
 using Microsoft.AspNetCore.CookiePolicy;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Diagnostics;
 using MongoDB.Driver;
-using Parbad.Builder;
-using Parbad.Gateway.Sepehr;
 using Swashbuckle.AspNetCore.SwaggerUI;
 
 
@@ -309,29 +306,11 @@ builder.Services.AddCors(options =>
 
 builder.Services.AddExceptionHandler<CustomExceptionHandler>();
 
-var sepehrTerminalId = builder.Configuration.GetValue<long>("SepehrGateWayTerminalId");
-
-builder.Services.AddParbad().ConfigureGateways(gateways =>
-{
-	gateways.AddSepehr().WithAccounts(accounts =>
-	{
-		accounts.AddInMemory(account =>
-		{
-			account.TerminalId = sepehrTerminalId;
-            account.Name="Sepehr Account";
-		});
-	});
-}).ConfigureHttpContext(httpContext=>httpContext.UseDefaultAspNetCore())
-.ConfigureStorage(storage =>
-{
-	storage.UseMemoryCache();
-});
 
 var app = builder.Build();
 app.UseCors("AllowSpecificOrigins");
 
 
-
 #region Mahan
 
 //app.UseStatusCodePagesWithRedirects("/error/{0}");
@@ -345,7 +324,6 @@ if (builder.Environment.IsDevelopment())
     await tester.Test();
 }
 
-
 if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();

ServiceHost/Properties/launchSettings.json

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

ServiceHost/ServiceHost.csproj

@@ -90,8 +90,6 @@
 	  </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
     <PackageReference Include="MongoDB.Driver" Version="3.5.0" />
-    <PackageReference Include="Parbad.AspNetCore" Version="1.5.0" />
-    <PackageReference Include="Parbad.Storage.Cache" Version="1.5.0" />
     <PackageReference Include="SocialExplorer.FastDBF" Version="1.0.0" />
     <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
 	  <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.4" />

ServiceHost/appsettings.Development.json

@@ -42,8 +42,7 @@
   "SmsSettings": {
     "IsTestMode": true,
     "TestNumbers": [ "09116967898", "09116067106", "09114221321" ]
-  },
-  "SepehrGateWayTerminalId": 99213700
+  }
 
 }
 

ServiceHost/appsettings.json

@@ -35,7 +35,5 @@
   "SmsSettings": {
     "IsTestMode": false,
     "TestNumbers": []
-  },
-  "SepehrGateWayTerminalId": 99213700
-
+  }
 }

plan-addApkTypeToAndroidApkVersion.prompt.md

@@ -1,184 +0,0 @@
-# Plan: Add ApkType to AndroidApkVersion for WebView and FaceDetection separation
-
-## Overview
-
-The user wants to integrate the `ApkType` enum (WebView/FaceDetection) into the `AndroidApkVersion` entity to distinguish between the two different APK types. Currently, all APKs are treated as WebView. The system needs to be updated to support both types with separate handling.
-
-## Steps
-
-### 1. Update AndroidApkVersion.cs domain entity
-**File:** `Company.Domain\AndroidApkVersionAgg\AndroidApkVersion.cs`
-
-- Add `ApkType` property to the class
-- Update constructor to accept `ApkType` parameter
-- Modify `Title` property generation to include APK type information
-- Update the constructor logic to handle both WebView and FaceDetection types
-
-### 2. Update AndroidApkVersionMapping.cs EF configuration
-**File:** `CompanyManagment.EFCore\Mapping\AndroidApkVersionMapping.cs`
-
-- Add mapping configuration for `ApkType` property
-- Use enum-to-string conversion (similar to existing `IsActive` mapping)
-- Set appropriate column max length for the enum value
-
-### 3. Create database migration
-**Files:** Generated migration files in `CompanyManagment.EFCore\Migrations\`
-
-- Generate new migration to add `ApkType` column to `AndroidApkVersions` table
-- Set default value to `ApkType.WebView` for existing records
-- Apply migration to update database schema
-
-### 4. Update IAndroidApkVersionRepository.cs interface
-**File:** `Company.Domain\AndroidApkVersionAgg\IAndroidApkVersionRepository.cs`
-
-- Modify `GetActives()` to accept `ApkType` parameter for filtering
-- Modify `GetLatestActiveVersionPath()` to accept `ApkType` parameter
-- Add methods to handle type-specific queries
-
-### 5. Update AndroidApkVersionRepository.cs implementation
-**File:** `CompanyManagment.EFCore\Repository\AndroidApkVersionRepository.cs`
-
-- Implement type-based filtering in `GetActives()` method
-- Implement type-based filtering in `GetLatestActiveVersionPath()` method
-- Add appropriate WHERE clauses to filter by `ApkType`
-
-### 6. Update IAndroidApkVersionApplication.cs interface
-**File:** `CompanyManagment.App.Contracts\AndroidApkVersion\IAndroidApkVersionApplication.cs`
-
-- Add `ApkType` parameter to `CreateAndActive()` method
-- Add `ApkType` parameter to `CreateAndDeActive()` method
-- Add `ApkType` parameter to `GetLatestActiveVersionPath()` method
-- Add `ApkType` parameter to `HasAndroidApkToDownload()` method
-
-### 7. Update AndroidApkVersionApplication.cs implementation
-**File:** `CompanyManagment.Application\AndroidApkVersionApplication.cs`
-
-- Update `CreateAndActive()` method:
-  - Accept `ApkType` parameter
-  - Change storage path from hardcoded "GozreshgirWebView" to dynamic based on type
-  - Use "GozreshgirWebView" for `ApkType.WebView`
-  - Use "GozreshgirFaceDetection" for `ApkType.FaceDetection`
-  - Pass `ApkType` to repository methods when getting/deactivating existing APKs
-  - Pass `ApkType` to entity constructor
-
-- Update `CreateAndDeActive()` method:
-  - Accept `ApkType` parameter
-  - Update storage path logic similar to `CreateAndActive()`
-  - Pass `ApkType` to entity constructor
-
-- Update `GetLatestActiveVersionPath()` method:
-  - Accept `ApkType` parameter
-  - Pass type to repository method
-
-- Update `HasAndroidApkToDownload()` method:
-  - Accept `ApkType` parameter
-  - Filter by type when checking for active APKs
-
-### 8. Update AndroidApk.cs controller
-**File:** `ServiceHost\Pages\Apk\AndroidApk.cs`
-
-- Modify the download endpoint to accept `ApkType` parameter
-- Options:
-  - Add query string parameter: `/Apk/Android?type=WebView` or `/Apk/Android?type=FaceDetection`
-  - Create separate routes: `/Apk/Android/WebView` and `/Apk/Android/FaceDetection`
-- Pass the type parameter to `GetLatestActiveVersionPath()` method
-- Maintain backward compatibility by defaulting to `ApkType.WebView` if no type specified
-
-### 9. Update admin UI Index.cshtml.cs
-**File:** `ServiceHost\Areas\AdminNew\Pages\Company\AndroidApk\Index.cshtml.cs`
-
-- Add property to store selected `ApkType`
-- Add `[BindProperty]` for ApkType selection
-- Modify `OnPostUpload()` to pass selected `ApkType` to application method
-- Create corresponding UI changes in Index.cshtml (if exists) to allow type selection
-
-### 10. Update client-facing pages
-**Files:** 
-- `ServiceHost\Pages\login\Index.cshtml.cs`
-- `ServiceHost\Areas\Client\Pages\Index.cshtml.cs`
-
-- Update calls to `HasAndroidApkToDownload()` to specify which APK type to check
-- Consider showing different download buttons/links for WebView vs FaceDetection apps
-- Update download links to include APK type parameter
-
-## Migration Strategy
-
-### Handling Existing Data
-- All existing `AndroidApkVersion` records should be marked as `ApkType.WebView` by default
-- Use migration to set default value
-- No manual data update required if migration includes default value
-
-### Database Schema Change
-```sql
-ALTER TABLE AndroidApkVersions 
-ADD ApkType NVARCHAR(20) NOT NULL DEFAULT 'WebView';
-```
-
-## UI Design Considerations
-
-### Admin Upload Page
-**Recommended approach:** Single form with radio buttons or dropdown
-
-- Add radio buttons or dropdown to select APK type before upload
-- Labels: "WebView Application" and "Face Detection Application"
-- Group uploads by type in the list/table view
-- Show type column in the APK list
-
-### Client Download Pages
-**Recommended approach:** Separate download buttons
-
-- Show "Download Gozareshgir WebView" button (existing functionality)
-- Show "Download Gozareshgir FaceDetection" button (new functionality)
-- Only show buttons if corresponding APK type is available
-- Use different icons or colors to distinguish between types
-
-## Download URL Structure
-
-**Recommended approach:** Single endpoint with query parameter
-
-- Current: `/Apk/Android` (defaults to WebView for backward compatibility)
-- New WebView: `/Apk/Android?type=WebView`
-- New FaceDetection: `/Apk/Android?type=FaceDetection`
-
-**Alternative approach:** Separate endpoints
-- `/Apk/Android/WebView`
-- `/Apk/Android/FaceDetection`
-
-## Testing Checklist
-
-1. ✅ Upload WebView APK successfully
-2. ✅ Upload FaceDetection APK successfully
-3. ✅ Both types can coexist in database
-4. ✅ Activating WebView APK doesn't affect FaceDetection APK
-5. ✅ Activating FaceDetection APK doesn't affect WebView APK
-6. ✅ Download correct APK based on type parameter
-7. ✅ Admin UI shows type information correctly
-8. ✅ Client pages show correct download availability
-9. ✅ Backward compatibility maintained (existing links still work)
-10. ✅ Migration applies successfully to existing database
-
-## File Summary
-
-**Files to modify:**
-1. `Company.Domain\AndroidApkVersionAgg\AndroidApkVersion.cs`
-2. `CompanyManagment.EFCore\Mapping\AndroidApkVersionMapping.cs`
-3. `Company.Domain\AndroidApkVersionAgg\IAndroidApkVersionRepository.cs`
-4. `CompanyManagment.EFCore\Repository\AndroidApkVersionRepository.cs`
-5. `CompanyManagment.App.Contracts\AndroidApkVersion\IAndroidApkVersionApplication.cs`
-6. `CompanyManagment.Application\AndroidApkVersionApplication.cs`
-7. `ServiceHost\Pages\Apk\AndroidApk.cs`
-8. `ServiceHost\Areas\AdminNew\Pages\Company\AndroidApk\Index.cshtml.cs`
-9. `ServiceHost\Pages\login\Index.cshtml.cs`
-10. `ServiceHost\Areas\Client\Pages\Index.cshtml.cs`
-
-**Files to create:**
-1. New migration file (auto-generated)
-2. Possibly `ServiceHost\Areas\AdminNew\Pages\Company\AndroidApk\Index.cshtml` (if doesn't exist)
-
-## Notes
-
-- The `ApkType` enum is already defined in `AndroidApkVersion.cs`
-- Storage folders will be separate: `Storage/Apk/Android/GozreshgirWebView` and `Storage/Apk/Android/GozreshgirFaceDetection`
-- Each APK type maintains its own active/inactive state independently
-- Consider adding validation to ensure APK file matches selected type (optional enhancement)
-

plan-addIsForceToAndroidApkVersion.prompt.md

@@ -1,151 +0,0 @@
-# Plan: Add IsForce Field to Android APK Version Management
-
-## Overview
-Add support for force update functionality to the Android APK version management system. This allows administrators to specify whether an APK update is mandatory (force update) or optional when uploading new versions. The system now supports two separate APK types: WebView and FaceDetection.
-
-## Context
-- The system manages Android APK versions for two different application types
-- Previously, all updates were treated as optional
-- Need to add ability to mark certain updates as mandatory
-- Force update flag should be stored in database and returned via API
-
-## Requirements
-1. Add `IsForce` boolean field to the `AndroidApkVersion` entity
-2. Allow administrators to specify force update status when uploading APK
-3. Store force update status in database
-4. Return force update status via API endpoint
-5. Separate handling for WebView and FaceDetection APK types
-
-## Implementation Steps
-
-### 1. Domain Layer Updates
-- ✅ Add `IsForce` property to `AndroidApkVersion` entity
-- ✅ Update constructor to accept `isForce` parameter with default value of `false`
-- ✅ File: `Company.Domain/AndroidApkVersionAgg/AndroidApkVersion.cs`
-
-### 2. Database Mapping
-- ✅ Add `IsForce` property mapping in `AndroidApkVersionMapping`
-- ✅ File: `CompanyManagment.EFCore/Mapping/AndroidApkVersionMapping.cs`
-
-### 3. Application Layer Updates
-- ✅ Update `IAndroidApkVersionApplication` interface:
-  - Add `isForce` parameter to `CreateAndActive` method
-  - Add `isForce` parameter to `CreateAndDeActive` method
-  - Remove `isForceUpdate` parameter from `GetLatestActiveInfo` method
-- ✅ File: `CompanyManagment.App.Contracts/AndroidApkVersion/IAndroidApkVersionApplication.cs`
-
-### 4. Application Implementation
-- ✅ Update `AndroidApkVersionApplication`:
-  - Pass `isForce` to `AndroidApkVersion` constructor in `CreateAndActive`
-  - Pass `isForce` to `AndroidApkVersion` constructor in `CreateAndDeActive`
-  - Update `GetLatestActiveInfo` to return `IsForce` from database entity instead of parameter
-- ✅ File: `CompanyManagment.Application/AndroidApkVersionApplication.cs`
-
-### 5. API Controller Updates
-- ✅ Update `AndroidApkController`:
-  - Remove `force` parameter from `CheckUpdate` endpoint
-  - API now returns `IsForce` from database
-- ✅ File: `ServiceHost/Areas/Admin/Controllers/AndroidApkController.cs`
-
-### 6. Admin UI Updates
-- ✅ Add `IsForce` property to `IndexModel`
-- ✅ Add checkbox for force update in upload form
-- ✅ Pass `IsForce` value to `CreateAndActive` method
-- ✅ Files:
-  - `ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs`
-  - `ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml`
-
-### 7. Database Migration (To Be Done)
-- ⚠️ **REQUIRED**: Create and run migration to add `IsForce` column to `AndroidApkVersions` table
-- Command: `Add-Migration AddIsForceToAndroidApkVersion`
-- Then: `Update-Database`
-
-## API Endpoints
-
-### Check for Updates
-```http
-GET /api/android-apk/check-update?type={ApkType}&currentVersionCode={int}
-```
-
-**Parameters:**
-- `type`: Enum value - `WebView` or `FaceDetection`
-- `currentVersionCode`: Current version code of installed app (integer)
-
-**Response:**
-```json
-{
-  "latestVersionCode": 120,
-  "latestVersionName": "1.2.0",
-  "shouldUpdate": true,
-  "isForceUpdate": false,
-  "downloadUrl": "/Apk/Android?type=WebView",
-  "releaseNotes": "Bug fixes and improvements"
-}
-```
-
-## APK Type Separation
-
-The system now fully supports two separate APK types:
-1. **WebView**: Original web-view based application
-   - Stored in: `Storage/Apk/Android/GozreshgirWebView/`
-   - Title format: `Gozareshgir-WebView-{version}-{date}`
-
-2. **FaceDetection**: New face detection application
-   - Stored in: `Storage/Apk/Android/GozreshgirFaceDetection/`
-   - Title format: `Gozareshgir-FaceDetection-{version}-{date}`
-
-Each APK type maintains its own:
-- Version history
-- Active version
-- Force update settings
-- Download endpoint
-
-## Usage Examples
-
-### Admin Upload with Force Update
-1. Navigate to admin APK upload page
-2. Select APK file
-3. Choose APK type (WebView or FaceDetection)
-4. Check "آپدیت اجباری (Force Update)" if update should be mandatory
-5. Click Upload
-
-### Client Check for Update (WebView)
-```http
-GET /api/android-apk/check-update?type=WebView&currentVersionCode=100
-```
-
-### Client Check for Update (FaceDetection)
-```http
-GET /api/android-apk/check-update?type=FaceDetection&currentVersionCode=50
-```
-
-## Testing Checklist
-- [ ] Test uploading APK with force update enabled for WebView
-- [ ] Test uploading APK with force update disabled for WebView
-- [ ] Test uploading APK with force update enabled for FaceDetection
-- [ ] Test uploading APK with force update disabled for FaceDetection
-- [ ] Verify API returns correct `isForceUpdate` value for WebView
-- [ ] Verify API returns correct `isForceUpdate` value for FaceDetection
-- [ ] Verify only one active version exists per APK type
-- [ ] Test migration creates `IsForce` column correctly
-- [ ] Verify existing records default to `false` for `IsForce`
-
-## Notes
-- Default value for `IsForce` is `false` (optional update)
-- When uploading new active APK, all previous active versions of same type are deactivated
-- Each APK type is managed independently
-- Force update flag is stored per version, not globally
-- API returns force update status from the latest active version in database
-
-## Files Modified
-1. `Company.Domain/AndroidApkVersionAgg/AndroidApkVersion.cs`
-2. `CompanyManagment.EFCore/Mapping/AndroidApkVersionMapping.cs`
-3. `CompanyManagment.App.Contracts/AndroidApkVersion/IAndroidApkVersionApplication.cs`
-4. `CompanyManagment.Application/AndroidApkVersionApplication.cs`
-5. `ServiceHost/Areas/Admin/Controllers/AndroidApkController.cs`
-6. `ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs`
-7. `ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml`
-
-## Migration Required
-⚠️ **Important**: Don't forget to create and run the database migration to add the `IsForce` column.
-