diff --git a/Marco.Pms.Model/ViewModels/Expenses/ExpenseDetailsVM.cs b/Marco.Pms.Model/ViewModels/Expenses/ExpenseDetailsVM.cs index b777d13..174a53d 100644 --- a/Marco.Pms.Model/ViewModels/Expenses/ExpenseDetailsVM.cs +++ b/Marco.Pms.Model/ViewModels/Expenses/ExpenseDetailsVM.cs @@ -27,6 +27,7 @@ namespace Marco.Pms.Model.ViewModels.Expenses public string Description { get; set; } = string.Empty; public string? Location { get; set; } public List Documents { get; set; } = new List(); + public List ExpenseLogs { get; set; } = new List(); public string? GSTNumber { get; set; } public int? NoOfPersons { get; set; } public bool IsActive { get; set; } = true; diff --git a/Marco.Pms.Model/ViewModels/Expenses/ExpenseLogVM.cs b/Marco.Pms.Model/ViewModels/Expenses/ExpenseLogVM.cs new file mode 100644 index 0000000..6a05ff7 --- /dev/null +++ b/Marco.Pms.Model/ViewModels/Expenses/ExpenseLogVM.cs @@ -0,0 +1,12 @@ +using Marco.Pms.Model.ViewModels.Activities; + +namespace Marco.Pms.Model.ViewModels.Expenses +{ + public class ExpenseLogVM + { + public Guid Id { get; set; } + public BasicEmployeeVM? UpdatedBy { get; set; } + public string Action { get; set; } = string.Empty; + public string? Comment { get; set; } + } +} diff --git a/Marco.Pms.Services/Controllers/EmployeeController.cs b/Marco.Pms.Services/Controllers/EmployeeController.cs index 21de1bf..cdc28ed 100644 --- a/Marco.Pms.Services/Controllers/EmployeeController.cs +++ b/Marco.Pms.Services/Controllers/EmployeeController.cs @@ -188,11 +188,7 @@ namespace MarcoBMS.Services.Controllers employeeQuery = employeeQuery.Where(e => (e.FirstName + " " + e.LastName).ToLower().Contains(searchStringLower)); } - if (string.IsNullOrWhiteSpace(searchString) && (projectId == null || projectId == Guid.Empty)) - { - employeeQuery = employeeQuery.Take(10); - } - var response = await employeeQuery.Select(e => _mapper.Map(e)).ToListAsync(); + var response = await employeeQuery.Take(10).Select(e => _mapper.Map(e)).ToListAsync(); return Ok(ApiResponse.SuccessResponse(response, $"{response.Count} records of employees fetched successfully", 200)); } [HttpGet] diff --git a/Marco.Pms.Services/MappingProfiles/MappingProfile.cs b/Marco.Pms.Services/MappingProfiles/MappingProfile.cs index 3d1b90d..a5fc445 100644 --- a/Marco.Pms.Services/MappingProfiles/MappingProfile.cs +++ b/Marco.Pms.Services/MappingProfiles/MappingProfile.cs @@ -123,6 +123,7 @@ namespace Marco.Pms.Services.MappingProfiles CreateMap(); CreateMap(); CreateMap(); + CreateMap(); CreateMap(); CreateMap() diff --git a/Marco.Pms.Services/Service/ExpensesService.cs b/Marco.Pms.Services/Service/ExpensesService.cs index 5d82745..fb639bc 100644 --- a/Marco.Pms.Services/Service/ExpensesService.cs +++ b/Marco.Pms.Services/Service/ExpensesService.cs @@ -321,6 +321,9 @@ namespace Marco.Pms.Services.Service response!.ThumbPreSignedUrl = _s3Service.GeneratePreSignedUrl(document.ThumbS3Key); } + var expenselogs = await _context.ExpenseLogs.Include(el => el.UpdatedBy).Where(el => el.ExpenseId == vm.Id).Select(el => _mapper.Map(el)).ToListAsync(); + + vm.ExpenseLogs = expenselogs; _logger.LogInfo("Employee {EmployeeId} successfully fetched expense details with ID {ExpenseId}", loggedInEmployee.Id, vm.Id); return ApiResponse.SuccessResponse(vm, "Successfully fetched the details of expense", 200);