diff --git a/Marco.Pms.Services/Controllers/OrganizationController.cs b/Marco.Pms.Services/Controllers/OrganizationController.cs index 1001646..15d3b6f 100644 --- a/Marco.Pms.Services/Controllers/OrganizationController.cs +++ b/Marco.Pms.Services/Controllers/OrganizationController.cs @@ -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 .OrderBy(e => e.Name) .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 response = organizations.Select(o => + var vm = organizations.Select(o => { var result = _mapper.Map(o); result.CreatedBy = employees.Where(e => e.Id == o.CreatedById).Select(e => _mapper.Map(e)).FirstOrDefault(); @@ -103,6 +106,14 @@ namespace Marco.Pms.Services.Controllers return result; }); + var response = new + { + CurrentPage = pageNumber, + TotalPages = totalPages, + TotalEntites = totalCount, + Data = vm, + }; + return Ok(ApiResponse.SuccessResponse(response, "Successfully fetched the Service Provider list", 200)); }