From 4325dffc065a42c5f5917e4e5b20591fee4df716 Mon Sep 17 00:00:00 2001 From: "ashutosh.nehete" Date: Wed, 30 Jul 2025 09:34:16 +0530 Subject: [PATCH] change ExpensesReimburse from list to single entity in expense details view model --- Marco.Pms.Model/ViewModels/Expenses/ExpenseDetailsVM.cs | 2 +- Marco.Pms.Services/Service/ExpensesService.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marco.Pms.Model/ViewModels/Expenses/ExpenseDetailsVM.cs b/Marco.Pms.Model/ViewModels/Expenses/ExpenseDetailsVM.cs index b59bd59..becf685 100644 --- a/Marco.Pms.Model/ViewModels/Expenses/ExpenseDetailsVM.cs +++ b/Marco.Pms.Model/ViewModels/Expenses/ExpenseDetailsVM.cs @@ -27,6 +27,6 @@ namespace Marco.Pms.Model.ViewModels.Expenses public string? GSTNumber { get; set; } public int? NoOfPersons { get; set; } public bool IsActive { get; set; } = true; - public List ExpensesReimburse { get; set; } = new List(); + public ExpensesReimburseVM ExpensesReimburse { get; set; } = new ExpensesReimburseVM(); } } diff --git a/Marco.Pms.Services/Service/ExpensesService.cs b/Marco.Pms.Services/Service/ExpensesService.cs index 2ae8c20..0be0872 100644 --- a/Marco.Pms.Services/Service/ExpensesService.cs +++ b/Marco.Pms.Services/Service/ExpensesService.cs @@ -1099,7 +1099,7 @@ namespace Marco.Pms.Services.Service return await dbContext.ExpensesReimburseMapping .Include(er => er.ExpensesReimburse) .Where(er => er.TenantId == tenantId && er.ExpensesId == Guid.Parse(model.Id)) - .Select(er => er.ExpensesReimburse).ToListAsync(); + .Select(er => er.ExpensesReimburse).FirstOrDefaultAsync(); }); // Await all prerequisite checks at once. @@ -1121,7 +1121,7 @@ namespace Marco.Pms.Services.Service response.CreatedBy = _mapper.Map(createdBy); response.PaymentMode = _mapper.Map(paymentMode); response.ExpensesType = _mapper.Map(expenseType); - response.ExpensesReimburse = _mapper.Map>(expensesReimburse); + response.ExpensesReimburse = _mapper.Map(expensesReimburse); if (statusMapping != null) { response.Status = _mapper.Map(statusMapping.Status);