From 57b625f3b24df90d4c3b2786a309a75c25f24406 Mon Sep 17 00:00:00 2001
From: MahanCh <www.mahan.13831012c@gmail.com>
Date: Sat, 30 Aug 2025 15:35:15 +0330
Subject: [PATCH] feat: add discount and contracting party properties to
 institution contract responses

---
 .../RegistrationWorkflowMainListViewModel.cs                  | 4 ++++
 .../TemporaryClientRegistration/ReviewAndPaymentViewModel.cs  | 1 +
 .../Repository/InstitutionContractRepository.cs               | 2 ++
 .../Areas/Admin/Controllers/RegistrationWorkflowController.cs | 4 ++--
 .../Areas/Admin/Controllers/institutionContractController.cs  | 2 ++
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CompanyManagment.App.Contracts/InstitutionContract/RegistrationWorkflowMainListViewModel.cs b/CompanyManagment.App.Contracts/InstitutionContract/RegistrationWorkflowMainListViewModel.cs
index 7de935d1..72c95cdb 100644
--- a/CompanyManagment.App.Contracts/InstitutionContract/RegistrationWorkflowMainListViewModel.cs
+++ b/CompanyManagment.App.Contracts/InstitutionContract/RegistrationWorkflowMainListViewModel.cs
@@ -38,6 +38,8 @@ public class RegistrationWorkflowMainListViewModel
     /// مبلغ
     /// </summary>
     public double Amount { get; set; }
+
+    public long ContractingPartyId { get; set; }
 }
 
 /// <summary>
@@ -69,6 +71,8 @@ public class RegistrationWorkflowItemsViewModel
     /// وضعیت انجام شدن
     /// </summary>
     public bool IsDone { get; set; }
+
+    public long WorkshopDetailsId { get; set; }
 }
 
 /// <summary>
diff --git a/CompanyManagment.App.Contracts/TemporaryClientRegistration/ReviewAndPaymentViewModel.cs b/CompanyManagment.App.Contracts/TemporaryClientRegistration/ReviewAndPaymentViewModel.cs
index 13cb62f1..4803d7a7 100644
--- a/CompanyManagment.App.Contracts/TemporaryClientRegistration/ReviewAndPaymentViewModel.cs
+++ b/CompanyManagment.App.Contracts/TemporaryClientRegistration/ReviewAndPaymentViewModel.cs
@@ -114,4 +114,5 @@ public class ReviewAndPaymentViewModel
     /// شمسی
     /// </summary>
     public string ContractEndFa { get; set; }
+    
 }
\ No newline at end of file
diff --git a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
index 2d96e9f1..ebbd1bf9 100644
--- a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
+++ b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
@@ -1413,6 +1413,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     DoneWorkshops = x.institutionContract.WorkshopDetails.Count(w => w.WorkshopCreated),
                     TotalWorkshops = x.institutionContract.WorkshopDetails.Count(),
                     UnDoneWorkshops = x.institutionContract.WorkshopDetails.Count(w => !w.WorkshopCreated),
+                    ContractingPartyId = x.contractingParty.id
                 }).ToListAsync();
     }
 
@@ -1478,6 +1479,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 PersonnelCount = workshopDetail.PersonnelCount,
                 WorkshopName = workshopDetail.WorkshopName,
                 Employers = employers,
+                WorkshopDetailsId = workshopDetail.id
             };
         }).ToList();
 
diff --git a/ServiceHost/Areas/Admin/Controllers/RegistrationWorkflowController.cs b/ServiceHost/Areas/Admin/Controllers/RegistrationWorkflowController.cs
index 0e8317d8..db21069a 100644
--- a/ServiceHost/Areas/Admin/Controllers/RegistrationWorkflowController.cs
+++ b/ServiceHost/Areas/Admin/Controllers/RegistrationWorkflowController.cs
@@ -45,7 +45,7 @@ namespace ServiceHost.Areas.Admin.Controllers
             return result;
         }
         [HttpPost("create-employer")]
-        public async Task<ActionResult<OperationResult>> CreateEmployerForWorkshopDetails(CreateEmployerWorkflowRegistration command)
+        public async Task<ActionResult<OperationResult>> CreateEmployerForWorkshopDetails([FromBody]CreateEmployerWorkflowRegistration command)
         {
             var result = await _employerApplication.CreateWorkflowRegistration(command);
             return result;
@@ -53,7 +53,7 @@ namespace ServiceHost.Areas.Admin.Controllers
 
         [HttpPost("create-workshop")]
         public async Task<ActionResult<OperationResult>> CreateWorkshop(
-            CreateWorkshopWorkflowRegistration command)
+            [FromBody]CreateWorkshopWorkflowRegistration command)
         {
             var result = await _workshopApplication.CreateWorkshopWorkflowRegistration(command);
             return result;
diff --git a/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs b/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
index 9aa5282c..0027b43a 100644
--- a/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
+++ b/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
@@ -620,6 +620,7 @@ public class institutionContractController : AdminBaseController
             TotalTax = res.ValueAddedTaxStr,
             ContractStart = res.ContractStartFa,
             ContractEnd = res.ContractEndFa,
+            Discount = res.Discount??"0",
             
         };
         return response;
@@ -677,6 +678,7 @@ public class InstitutionPlanCalculatorResponse
     public string MonthlyTotalAmountWithoutTax { get; set; }
     public string ContractStart { get; set; }
     public string ContractEnd { get; set; }
+    public string Discount { get; set; }
 }
 
 public class WorkshopServiceCalculatorResponse