Organization_Management #142

Merged
ashutosh.nehete merged 92 commits from Organization_Management into main 2025-09-30 09:05:14 +00:00
Showing only changes of commit 2f03de97d6 - Show all commits

View File

@ -84,6 +84,9 @@ namespace Marco.Pms.Services.Controllers
} }
} }
var totalCount = await organizationQuery.CountAsync();
var totalPages = (int)Math.Ceiling((double)totalCount / pageSize);
var organizations = await organizationQuery var organizations = await organizationQuery
.OrderBy(e => e.Name) .OrderBy(e => e.Name)
.Skip((pageNumber - 1) * pageSize) .Skip((pageNumber - 1) * pageSize)
@ -95,7 +98,7 @@ namespace Marco.Pms.Services.Controllers
var employees = await _context.Employees.Where(e => createdByIds.Contains(e.Id) || updatedByIds.Contains(e.Id)).ToListAsync(); var employees = await _context.Employees.Where(e => createdByIds.Contains(e.Id) || updatedByIds.Contains(e.Id)).ToListAsync();
var response = organizations.Select(o => var vm = organizations.Select(o =>
{ {
var result = _mapper.Map<OrganizationVM>(o); var result = _mapper.Map<OrganizationVM>(o);
result.CreatedBy = employees.Where(e => e.Id == o.CreatedById).Select(e => _mapper.Map<BasicEmployeeVM>(e)).FirstOrDefault(); result.CreatedBy = employees.Where(e => e.Id == o.CreatedById).Select(e => _mapper.Map<BasicEmployeeVM>(e)).FirstOrDefault();
@ -103,6 +106,14 @@ namespace Marco.Pms.Services.Controllers
return result; return result;
}); });
var response = new
{
CurrentPage = pageNumber,
TotalPages = totalPages,
TotalEntites = totalCount,
Data = vm,
};
return Ok(ApiResponse<object>.SuccessResponse(response, "Successfully fetched the Service Provider list", 200)); return Ok(ApiResponse<object>.SuccessResponse(response, "Successfully fetched the Service Provider list", 200));
} }