From 61674d69da6fc188202bde69ea00d3b4979168bf Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Tue, 4 Nov 2025 09:49:28 +0530
Subject: [PATCH] Corrected the spell correct in get payment request filter

---
 .../Expenses/AdvancePaymentTransactionVM.cs        | 14 +++++---------
 Marco.Pms.Services/Service/ExpensesService.cs      | 13 ++++++++-----
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Marco.Pms.Model/ViewModels/Expenses/AdvancePaymentTransactionVM.cs b/Marco.Pms.Model/ViewModels/Expenses/AdvancePaymentTransactionVM.cs
index 58665d4..0e8be83 100644
--- a/Marco.Pms.Model/ViewModels/Expenses/AdvancePaymentTransactionVM.cs
+++ b/Marco.Pms.Model/ViewModels/Expenses/AdvancePaymentTransactionVM.cs
@@ -1,18 +1,14 @@
 using Marco.Pms.Model.ViewModels.Activities;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Marco.Pms.Model.ViewModels.Projects;
 
 namespace Marco.Pms.Model.ViewModels.Expenses
 {
-     public class AdvancePaymentTransactionVM
+    public class AdvancePaymentTransactionVM
     {
         public Guid Id { get; set; }
-        public string FinanceUId { get; set; } = default!;
+        public string? FinanceUId { get; set; }
+        public string? Title { get; set; }
+        public BasicProjectVM? Project { get; set; }
         public BasicEmployeeVM? Employee { get; set; }
         public double Amount { get; set; }
         public DateTime CreatedAt { get; set; }
diff --git a/Marco.Pms.Services/Service/ExpensesService.cs b/Marco.Pms.Services/Service/ExpensesService.cs
index b7e742d..aaea0c0 100644
--- a/Marco.Pms.Services/Service/ExpensesService.cs
+++ b/Marco.Pms.Services/Service/ExpensesService.cs
@@ -1566,7 +1566,7 @@ namespace Marco.Pms.Services.Service
                     Currency = paymentRequests.Where(pr => pr.Currency != null).Select(pr => new { Id = pr.Currency!.Id, Name = pr.Currency.CurrencyName }).Distinct().ToList(),
                     CreatedBy = paymentRequests.Where(pr => pr.CreatedBy != null).Select(pr => new { Id = pr.CreatedBy!.Id, Name = $"{pr.CreatedBy.FirstName} {pr.CreatedBy.LastName}" }).Distinct().ToList(),
                     Status = paymentRequests.Where(pr => pr.ExpenseStatus != null).Select(pr => new { Id = pr.ExpenseStatus!.Id, Name = pr.ExpenseStatus.Name }).Distinct().ToList(),
-                    ExpensesCategory = paymentRequests.Where(pr => pr.ExpenseCategory != null).Select(pr => new { Id = pr.ExpenseCategory!.Id, Name = pr.ExpenseCategory.Name }).Distinct().ToList(),
+                    ExpenseCategory = paymentRequests.Where(pr => pr.ExpenseCategory != null).Select(pr => new { Id = pr.ExpenseCategory!.Id, Name = pr.ExpenseCategory.Name }).Distinct().ToList(),
                     Payees = paymentRequests.Where(pr => !string.IsNullOrWhiteSpace(pr.Payee)).Select(pr => new { Id = pr.Payee, Name = pr.Payee }).Distinct().ToList()
                 };
                 return ApiResponse<object>.SuccessResponse(response, "Successfully fetched the filter list", 200);
@@ -2102,10 +2102,13 @@ namespace Marco.Pms.Services.Service
             try
             {
                 var transactions = await _context.AdvancePaymentTransactions
-                    .Include(t => t.Employee)
-                    .Include(t => t.CreatedBy)
-                    .Where(t => t.EmployeeId == employeeId && t.IsActive)
-                    .OrderByDescending(t => t.CreatedAt)
+                    .Include(apt => apt.Project)
+                    .Include(apt => apt.Employee)
+                        .ThenInclude(e => e!.JobRole)
+                    .Include(apt => apt.CreatedBy)
+                        .ThenInclude(e => e!.JobRole)
+                    .Where(apt => apt.EmployeeId == employeeId && apt.IsActive)
+                    .OrderByDescending(apt => apt.CreatedAt)
                     .ToListAsync();
 
                 if (transactions == null || !transactions.Any())