admin/marco.pms.api
1
0
Fork 0
Code Issues Pull Requests 8 Actions Packages Projects Releases Wiki Activity

Updated the expense details API

Browse Source
This commit is contained in:
ashutosh.nehete 2025-12-09 14:44:39 +05:30
parent 6a300db97c
commit 0395b46610
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marco.Pms.Model/Expenses/Expenses.cs
View File

@ -17,7 +17,6 @@ namespace Marco.Pms.Model.Expenses
public ICollection<BillAttachments> Attachments { get; set; } = new List<BillAttachments>(); public ICollection<BillAttachments> Attachments { get; set; } = new List<BillAttachments>();
public ICollection<ExpensesReimburseMapping> ExpensesReimburseMappings { get; set; } = new List<ExpensesReimburseMapping>(); public ICollection<ExpensesReimburseMapping> ExpensesReimburseMappings { get; set; } = new List<ExpensesReimburseMapping>();
public ICollection<ExpenseLog> ExpenseLogs { get; set; } = new List<ExpenseLog>();
public Guid ExpenseCategoryId { get; set; } public Guid ExpenseCategoryId { get; set; }

12
Marco.Pms.Services/Service/ExpensesService.cs
View File

@ -528,9 +528,6 @@ namespace Marco.Pms.Services.Service
.ThenInclude(erm => erm.ExpensesReimburse) .ThenInclude(erm => erm.ExpensesReimburse)
.ThenInclude(er => er!.ReimburseBy) .ThenInclude(er => er!.ReimburseBy)
.ThenInclude(e => e!.JobRole) .ThenInclude(e => e!.JobRole)
.Include(e => e.ExpenseLogs)
.ThenInclude(el => el.UpdatedBy)
.ThenInclude(e => e!.JobRole)
.FirstOrDefaultAsync(e => .FirstOrDefaultAsync(e =>
(e.Id == id || (e.UIDPrefix + "/" + e.UIDPostfix.ToString().PadLeft(5, '0')) == expenseUId) (e.Id == id || (e.UIDPrefix + "/" + e.UIDPostfix.ToString().PadLeft(5, '0')) == expenseUId)
&& e.TenantId == tenantId); && e.TenantId == tenantId);
@ -563,6 +560,15 @@ namespace Marco.Pms.Services.Service
var projectVm = await GetProjectDetailsAsync(expense.ProjectId, tenantId); var projectVm = await GetProjectDetailsAsync(expense.ProjectId, tenantId);
response.Project = projectVm; response.Project = projectVm;
response.ExpenseLogs = await _context.ExpenseLogs
.AsNoTracking() // Read-only query optimization
.Include(el => el.UpdatedBy)
.ThenInclude(e => e!.JobRole)
.Where(el => el.ExpenseId == expense.Id)
.OrderByDescending(el => el.UpdateAt)
.ProjectTo<ExpenseLogVM>(_mapper.ConfigurationProvider) // Projection
.ToListAsync();
// 9. Generate S3 Pre-signed URLs for attachments // 9. Generate S3 Pre-signed URLs for attachments
response.Documents = expense.Attachments response.Documents = expense.Attachments
.Where(ba => ba.Document != null) .Where(ba => ba.Document != null)