feat: update InsertAmendmentTempWorkshops method to return detailed response and refactor related classes

2025-10-21 11:02:10 +03:30
parent fde58a7c75
commit acdd7de4f6
7 changed files with 152 additions and 68 deletions
--- a/Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
+++ b/Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
@@ -70,7 +70,7 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
        Task<InstitutionContractAmendmentWorkshopsResponse> GetAmendmentWorkshops(long institutionContractId);
        Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(InsitutionContractAmendmentPaymentRequest request);

-        Task<Guid> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request);
+        Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request);
        #endregion

        Task RemoveAmendmentWorkshops(Guid workshopTempId);
--- a/Company.Domain/InstitutionContractAgg/InstitutionContract.cs
+++ b/Company.Domain/InstitutionContractAgg/InstitutionContract.cs
@@ -252,6 +252,7 @@ public class InstitutionContract : EntityBase

 public class InstitutionContractAmendment : EntityBase
 {
+    private InstitutionContractAmendment(){}
    public InstitutionContractAmendment(long institutionContractId, InstitutionContract institutionContract,
        List<InstitutionContractInstallment> installments, double amount, bool hasInstallment,
        InstitutionContractAmendmentChange amendmentChange, long lawId)
@@ -285,7 +286,8 @@ public class InstitutionContractAmendment : EntityBase

 public class InstitutionContractAmendmentChange : EntityBase
 {
-    private InstitutionContractAmendmentChange(long institutionContractAmendmentId,
+    private InstitutionContractAmendmentChange(){}
+    public InstitutionContractAmendmentChange(long institutionContractAmendmentId,
        InstitutionContractAmendment institutionContractAmendment, InstitutionContractAmendmentChangeType changeType,
        DateTime changeDateGr, bool? hasRollCallPlan, bool? hasCustomizeCheckoutPlan, bool? hasContractPlan,
        bool? hasContractPlanInPerson, bool? hasInsurancePlan, bool? hasInsurancePlanInPerson, int? personnelCount,
--- a/Company.Domain/InstitutionContractAmendmentTempAgg/InstitutionContractAmendmentTemp.cs
+++ b/Company.Domain/InstitutionContractAmendmentTempAgg/InstitutionContractAmendmentTemp.cs
@@ -1,32 +1,65 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using MongoDB.Bson.Serialization.Attributes;

 namespace Company.Domain.InstitutionContractAmendmentTempAgg;

 public class InstitutionContractAmendmentTemp
 {
-    public InstitutionContractAmendmentTemp(List<InstitutionContractAmendmentTempWorkshop> prevWorkshops,
+    public InstitutionContractAmendmentTemp(List<InstitutionContractAmendmentTempPrevWorkshop> prevWorkshops,
        long institutionContractId)
    {
        Id = Guid.NewGuid();
        PrevWorkshops = prevWorkshops;
-        NewWorkshops = prevWorkshops;
+        NewWorkshops = prevWorkshops.Select(x=> new InstitutionContractAmendmentTempNewWorkshop(
+            x.WorkshopName, x.CountPerson, x.ContractAndCheckout, x.ContractAndCheckoutInPerson, x.Insurance,
+            x.InsuranceInPerson, x.RollCall, x.RollCallInPerson, x.CustomizeCheckout, x.Price, x.WorkshopId,
+            x.CurrentWorkshopId, 0)).ToList();
        InstitutionContractId = institutionContractId;
    }
-    [BsonId]
-    public Guid Id { get; private set; }
-    public List<InstitutionContractAmendmentTempWorkshop> PrevWorkshops { get; private set; }
-    public List<InstitutionContractAmendmentTempWorkshop> NewWorkshops { get; private set; }
+
+    [BsonId] public Guid Id { get; private set; }
+    public List<InstitutionContractAmendmentTempPrevWorkshop> PrevWorkshops { get; private set; }
+    public List<InstitutionContractAmendmentTempNewWorkshop> NewWorkshops { get; private set; }
    public long InstitutionContractId { get; private set; }
-    
-    
 }
-public class InstitutionContractAmendmentTempWorkshop
+
+public class InstitutionContractAmendmentTempNewWorkshop : InstitutionContractAmendmentTempPrevWorkshop
 {
-    public InstitutionContractAmendmentTempWorkshop(string workshopName, int countPerson, bool contractAndCheckout, bool contractAndCheckoutInPerson, 
+    public InstitutionContractAmendmentTempNewWorkshop(string workshopName, int countPerson, bool contractAndCheckout,
+        bool contractAndCheckoutInPerson, bool insurance, bool insuranceInPerson, bool rollCall, bool rollCallInPerson,
+        bool customizeCheckout, double price, long workshopId, long currentWorkshopId,double priceDifference) : base(
+        workshopName, countPerson, contractAndCheckout, contractAndCheckoutInPerson, insurance, insuranceInPerson,
+        rollCall, rollCallInPerson, customizeCheckout, price, workshopId, currentWorkshopId)
+    {
+        PriceDifference = priceDifference;
+    }
+
+    /// <summary>
+    /// مبلغ اختلاف کارگاه جدید با کارگاه قبلی(مبلغ اصلی ارتقاء)
+    /// </summary>
+    public double PriceDifference { get; private set; }
+    
+    
+    public void Edit(string workshopName, int countPerson, bool contractAndCheckout,
+        bool contractAndCheckoutInPerson,
+        bool insurance, bool insuranceInPerson, bool rollCall, bool customizeCheckout,
+        double price,double priceDifference)
+    {
+        base.Edit(workshopName, countPerson, contractAndCheckout, contractAndCheckoutInPerson, insurance,
+            insuranceInPerson, rollCall, customizeCheckout, price);
+        PriceDifference = priceDifference;
+    }
+}
+
+public class InstitutionContractAmendmentTempPrevWorkshop
+{
+    public InstitutionContractAmendmentTempPrevWorkshop(string workshopName, int countPerson, bool contractAndCheckout,
+        bool contractAndCheckoutInPerson,
        bool insurance, bool insuranceInPerson,
-        bool rollCall,bool rollCallInPerson, bool customizeCheckout,double price,long workshopId,long currentWorkshopId, string priceStr)
+        bool rollCall, bool rollCallInPerson, bool customizeCheckout, double price, long workshopId,
+        long currentWorkshopId)
    {
        Id = Guid.NewGuid();
        WorkshopName = workshopName;
@@ -41,8 +74,8 @@ public class InstitutionContractAmendmentTempWorkshop
        Price = price;
        WorkshopId = workshopId;
        CurrentWorkshopId = currentWorkshopId;
-        PriceStr = priceStr;
    }
+
    public Guid Id { get; set; }

    public long CurrentWorkshopId { get; private set; }
@@ -56,50 +89,50 @@ public class InstitutionContractAmendmentTempWorkshop
    /// <summary>
    /// تعداد پرسنل 
    /// </summary>
-    public int CountPerson { get; private  set; }
-    
-    
+    public int CountPerson { get; private set; }
+
+
    #region ServiceSelection

    /// <summary>
    /// قرارداد و تصفیه
    /// </summary>
-    public bool ContractAndCheckout { get; private  set; }
+    public bool ContractAndCheckout { get; private set; }

    /// <summary>
    /// بیمه
    /// </summary>
-    public bool Insurance { get; private  set; }
+    public bool Insurance { get; private set; }

    /// <summary>
    /// حضورغباب
    /// </summary>
-    public bool RollCall { get; private  set; }
+    public bool RollCall { get; private set; }

    public bool RollCallInPerson { get; set; }

    /// <summary>
    /// فیش غیر رسمی
    /// </summary>
-    public bool CustomizeCheckout { get;private  set; }
+    public bool CustomizeCheckout { get; private set; }

    /// <summary>
    /// خدمات حضوری قرداد و تصفیه
    /// </summary>
-    public bool ContractAndCheckoutInPerson { get; private  set; }
+    public bool ContractAndCheckoutInPerson { get; private set; }

    /// <summary>
    /// خدمات حضوری بیمه
    /// </summary>
-    public bool InsuranceInPerson { get; private  set; }
+    public bool InsuranceInPerson { get; private set; }

-    public double Price{ get; set; }
-    public string PriceStr { get; set; }
+    public double Price { get; private set; }

    #endregion

    public void Edit(string workshopName, int countPerson, bool contractAndCheckout, bool contractAndCheckoutInPerson,
-        bool insurance, bool insuranceInPerson, bool rollCall, bool customizeCheckout)
+        bool insurance, bool insuranceInPerson, bool rollCall, bool customizeCheckout,
+        double price)
    {
        WorkshopName = workshopName;
        CountPerson = countPerson;
@@ -109,6 +142,6 @@ public class InstitutionContractAmendmentTempWorkshop
        CustomizeCheckout = customizeCheckout;
        ContractAndCheckoutInPerson = contractAndCheckoutInPerson;
        InsuranceInPerson = insuranceInPerson;
-        
+        Price = price;
    }
 }
--- a/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
+++ b/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
@@ -232,13 +232,19 @@ public interface IInstitutionContractApplication
    #region Upgrade (Amendment)

    Task<InstitutionContractAmendmentWorkshopsResponse> GetAmendmentWorkshops(long institutionContractId);
-    Task<Guid> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request);
+    Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request);
    Task RemoveAmendmentWorkshops(Guid workshopTempId);
    Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(InsitutionContractAmendmentPaymentRequest request);
    
    #endregion
 }

+public class InsertAmendmentTempWorkshopResponse
+{
+    public Guid WorkshopTempId { get; set; }
+    public string Amount { get; set; }
+}
+
 public class InstitutionContractAmendmentWorkshopsResponse
 {
    /// <summary>
--- a/CompanyManagment.App.Contracts/InstitutionContract/InsitutionContractAmendmentPaymentRequest.cs
+++ b/CompanyManagment.App.Contracts/InstitutionContract/InsitutionContractAmendmentPaymentRequest.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;

@@ -5,6 +6,5 @@ namespace CompanyManagment.App.Contracts.InstitutionContract;

 public class InsitutionContractAmendmentPaymentRequest
 {
-    public List<WorkshopTempViewModel> Workshops { get; set; }
-    public long InstitutionContractId { get; set; }
+    public Guid TempId { get; set; }
 }
--- a/CompanyManagment.Application/InstitutionContractApplication.cs
+++ b/CompanyManagment.Application/InstitutionContractApplication.cs
@@ -1307,7 +1307,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
        return await _institutionContractRepository.GetAmendmentWorkshops(institutionContractId);
    }

-    public async Task<Guid> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request)
+    public async Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request)
    {
        return await _institutionContractRepository.InsertAmendmentTempWorkshops(request);
    }
--- a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
+++ b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
@@ -2354,11 +2354,11 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
        }

        var workshops = institutionContract.WorkshopGroup.CurrentWorkshops
-            .Select(x => new InstitutionContractAmendmentTempWorkshop(x.WorkshopName,x.PersonnelCount,
+            .Select(x => new InstitutionContractAmendmentTempPrevWorkshop(x.WorkshopName,x.PersonnelCount,
                x.Services.Contract,x.Services.ContractInPerson,x.Services.Insurance,
                x.Services.InsuranceInPerson,x.Services.RollCall,x.Services.RollCallInPerson,
                x.Services.CustomizeCheckout,x.Price,
-                x.WorkshopId??0,x.id,x.Price.ToMoney())).ToList();
+                x.WorkshopId??0,x.id)).ToList();


        
@@ -2378,7 +2378,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                    RollCall = x.RollCall,
                    RollCallInPerson = x.RollCallInPerson,
                    CustomizeCheckout = x.CustomizeCheckout,
-                    PriceStr = x.PriceStr,
+                    PriceStr = x.Price.ToMoney(),
                    Price = x.Price,
                    WorkshopId = x.WorkshopId,
                    WorkshopTempId = x.Id,
@@ -2398,20 +2398,29 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
    public async Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(
        InsitutionContractAmendmentPaymentRequest request)
    {
-        var institutionContract = await _context.InstitutionContractSet
-            .Include(x => x.WorkshopGroup)
-            .ThenInclude(x => x.CurrentWorkshops)
-            .FirstOrDefaultAsync(x => x.id == request.InstitutionContractId);
-        if (institutionContract == null)
-            throw new NotFoundException("قرارداد مالی یافت نشد");
+        var institutionContractAmendmentTemp = await _institutionAmendmentTemp
+            .Find(x=>x.Id == request.TempId)
+            .FirstOrDefaultAsync();
+        if (institutionContractAmendmentTemp == null)
+            throw new NotFoundException("دیتای وارد شده نامعتبر است");

        var amendmentStart = DateTime.Now;
+        
+        var institutionContract = await _context.InstitutionContractSet
+            .Include(x=>x.WorkshopGroup)
+            .ThenInclude(x=>x.CurrentWorkshops)
+            .FirstOrDefaultAsync(x => x.id == institutionContractAmendmentTemp.InstitutionContractId);
+
+        if (institutionContract == null)
+            throw new NotFoundException("قرارداد مؤسسه یافت نشد");
+        
        var amendmentEnd = institutionContract.ContractEndGr;

-        var haContractInPerson = request.Workshops.Any(x => x.ContractAndCheckoutInPerson);
+        var haContractInPerson = institutionContract.WorkshopGroup.CurrentWorkshops
+            .Any(x => x.Services.ContractInPerson);
        if (!haContractInPerson)
        {
-            if (request.Workshops.Any(x => x.ContractAndCheckoutInPerson))
+            if (institutionContractAmendmentTemp.NewWorkshops.Any(x => x.ContractAndCheckoutInPerson))
            {
                throw new BadRequestException("برای قرارداد آنلاین نمیتوان سرویس حضوری انتخاب کرد");
            }
@@ -2434,8 +2443,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
        if (endDay > startDay)
            monthDiff++;
        
-        var sumOneMonth = request.Workshops.Sum(x => x.WorkshopServicesAmount);
-        //TODO:مقدار جمع مبالغ باید از دیتابیس موقت گرفته شود.
+        var sumOneMonth = institutionContractAmendmentTemp.NewWorkshops.Sum(x => x.PriceDifference);
        
        var baseAmount = monthDiff * sumOneMonth;
        var tax = baseAmount*0.10;
@@ -2460,22 +2468,30 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
        if (haContractInPerson)
        {
            var installment = InstitutionMonthlyInstallmentCaculation(monthDiff,totalPayment, amendmentStart.ToFarsi());
+            
+            var firstPrevInstallment = installment.First();
+            var lastPrevInstallment = installment.Last();
+            
            var firstInstallment = new MonthlyInstallment()
            {
-                InstallmentAmountStr = installment.First().InstallmentAmountStr,
-                InstallmentCounter = installment.First().InstallmentCounter,
+                InstallmentAmountStr = firstPrevInstallment.InstallmentAmountStr,
+                InstallmentCounter = firstPrevInstallment.InstallmentCounter,
                InstalmentDate = amendmentStart.ToFarsi()
            };
+            
            var lastInstallment = new MonthlyInstallment()
            {
-                InstallmentAmountStr = installment.Last().InstallmentAmountStr,
-                InstallmentCounter = installment.Last().InstallmentCounter,
-                InstalmentDate = installment.Last().InstalmentDate
+                InstallmentAmountStr = lastPrevInstallment.InstallmentAmountStr,
+                InstallmentCounter = lastPrevInstallment.InstallmentCounter,
+                InstalmentDate = lastPrevInstallment.InstalmentDate
            };
-            installment.Remove(installment.First());
-            installment.Remove(installment.Last());
+            
+            installment.Remove(firstPrevInstallment);
+            installment.Remove(lastPrevInstallment);
+            
            installment.Insert(0, firstInstallment);
            installment.Add(lastInstallment);
+            
            res.Monthly = new InstitutionContractPaymentMonthlyViewModel()
            {
                Installments = installment,
@@ -2489,7 +2505,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
        return res;
    }

-    public async Task<Guid> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request)
+    public async Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(
+        InstitutionContractAmendmentTempWorkshopViewModel request)
    {
        var amendmentTemp =await _institutionAmendmentTemp
            .Find(x=> x.Id == request.TempId).FirstOrDefaultAsync();
@@ -2500,35 +2517,61 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
        var workshopTemp = amendmentTemp.NewWorkshops
            .FirstOrDefault(x => x.Id == request.WorkshopTempId);
        
+        var planForWorkshop = new WorkshopTempViewModel()
+        {
+            WorkshopName = request.WorkshopName,
+            CountPerson = request.CountPerson,
+            ContractAndCheckout = request.ContractAndCheckout,
+            ContractAndCheckoutInPerson = request.ContractAndCheckoutInPerson,
+            Insurance = request.Insurance,
+            InsuranceInPerson = request.InsuranceInPerson,
+            RollCall = request.RollCall,
+            RollCallInPerson = request.RollCallInPerson,
+            CustomizeCheckout = request.CustomizeCheckout
+        };
+        var price = _planPercentageRepository.GetInstitutionPlanForWorkshop(planForWorkshop)
+            .OnlineAndInPersonSumAmountDouble;
+        
        if (workshopTemp == null)
        {
-            var newWorkshopTemp = new InstitutionContractAmendmentTempWorkshop(request.WorkshopName,
+            var newWorkshopTemp = new InstitutionContractAmendmentTempNewWorkshop(request.WorkshopName,
                request.CountPerson,
                request.ContractAndCheckout, request.ContractAndCheckoutInPerson,
                request.Insurance, request.InsuranceInPerson,
                request.RollCall, request.RollCallInPerson,
-                request.CustomizeCheckout, request.Price,
-                request.WorkshopId,0,request.PriceStr);
+                request.CustomizeCheckout, price,
+                request.WorkshopId,0,price);
+
+            workshopTemp = newWorkshopTemp;
            
+
            amendmentTemp.NewWorkshops.Add(newWorkshopTemp);
            
-            await _institutionAmendmentTemp.ReplaceOneAsync(x => x.Id == amendmentTemp.Id, amendmentTemp);
-            
-            return newWorkshopTemp.Id; 
+            await _institutionAmendmentTemp
+                .ReplaceOneAsync(x => x.Id == amendmentTemp.Id, amendmentTemp);
        }
-
-        amendmentTemp.NewWorkshops.Remove(workshopTemp);
+        else
+        {
+            amendmentTemp.NewWorkshops.Remove(workshopTemp);
        
-        workshopTemp.Edit(request.WorkshopName, request.CountPerson,
-            request.ContractAndCheckout, request.ContractAndCheckoutInPerson,
-            request.Insurance, request.InsuranceInPerson,
-            request.RollCall,
-            request.CustomizeCheckout);
+            var differencePrice = price - workshopTemp.Price;
+            workshopTemp.Edit(request.WorkshopName, request.CountPerson,
+                request.ContractAndCheckout, request.ContractAndCheckoutInPerson,
+                request.Insurance, request.InsuranceInPerson,
+                request.RollCall,
+                request.CustomizeCheckout, price,differencePrice);
        
-        amendmentTemp.NewWorkshops.Add(workshopTemp);
+            amendmentTemp.NewWorkshops.Add(workshopTemp);
        
-        await _institutionAmendmentTemp.ReplaceOneAsync(x => x.Id == amendmentTemp.Id, amendmentTemp);
-        return workshopTemp.Id;
+            await _institutionAmendmentTemp
+                .ReplaceOneAsync(x => x.Id == amendmentTemp.Id, amendmentTemp);
+        }
+        
+        return new InsertAmendmentTempWorkshopResponse()
+        {
+            WorkshopTempId = workshopTemp.Id,
+            Amount = workshopTemp.PriceDifference.ToMoney()
+        };
    }

    public async Task RemoveAmendmentWorkshops(Guid workshopTempId)