From 5720c30f7a3427e7f854bf975e870f0eb74871e9 Mon Sep 17 00:00:00 2001 From: MahanCh Date: Tue, 26 Aug 2025 11:17:16 +0330 Subject: [PATCH] feat: add method to include workshop details in institution contract retrieval --- .../IInstitutionContractRepository.cs | 1 + CompanyManagment.Application/WorkshopAppliction.cs | 4 ++-- .../Repository/InstitutionContractRepository.cs | 8 ++++++++ .../Admin/Controllers/institutionContractController.cs | 1 - 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs b/Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs index be7d3c5f..a829eb04 100644 --- a/Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs +++ b/Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs @@ -50,4 +50,5 @@ public interface IInstitutionContractRepository : IRepository> RegistrationWorkflowMainList(); Task> RegistrationWorkflowItems(long institutionContractId); Task GetInstitutionWorkshopDetails(long institutionWorkshopDetailsId); + Task GetIncludeWorkshopDetailsAsync(long institutionContractId); } \ No newline at end of file diff --git a/CompanyManagment.Application/WorkshopAppliction.cs b/CompanyManagment.Application/WorkshopAppliction.cs index d3c5fd13..261fc1ca 100644 --- a/CompanyManagment.Application/WorkshopAppliction.cs +++ b/CompanyManagment.Application/WorkshopAppliction.cs @@ -1047,7 +1047,7 @@ public class WorkshopAppliction : IWorkshopApplication // return operation.Failed("لطفا نوع ارسال لیست بیمه را مشخص کنید"); var account = new AccountViewModel(); - var institutionContract = _institutionContractRepository.Get(contractWorkshopDetail.InstitutionContractId); + var institutionContract =await _institutionContractRepository.GetIncludeWorkshopDetailsAsync(contractWorkshopDetail.InstitutionContractId); if (institutionContract == null) { return operation.Failed("قرارداد مالی موسسه یافت نشد"); @@ -1095,6 +1095,7 @@ public class WorkshopAppliction : IWorkshopApplication }; _rollCallServiceApplication.Create(commandSave); } + contractWorkshopDetail.SetWorkshopId(workshop.id); foreach (var e in employerIds) @@ -1114,7 +1115,6 @@ public class WorkshopAppliction : IWorkshopApplication if (!op.IsSuccedded) return op; - await transaction.CommitAsync(); return operation.Succcedded(); } diff --git a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs index af1f6ff9..c901cb24 100644 --- a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs +++ b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs @@ -1548,6 +1548,14 @@ public class InstitutionContractRepository : RepositoryBase x.id == institutionWorkshopDetailsId); } + + public async Task GetIncludeWorkshopDetailsAsync(long institutionContractId) + { + return await _context.InstitutionContractSet + .Include(x=>x.WorkshopDetails) + .FirstOrDefaultAsync(x => x.id == institutionContractId); + } + #endregion diff --git a/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs b/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs index 1d64670c..febbed39 100644 --- a/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs +++ b/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs @@ -681,7 +681,6 @@ public class WorkshopServiceCalculatorResponse public record InstitutionPlanCalculatorRequest(double TotalAmountMonth, InstitutionContractDuration Duration = InstitutionContractDuration.TwelveMonths, - string PaymentModel = "OneTime", string ContractStartType = "currentMonth"); public class CreateInquiryRequest