Nell/eShopOnWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue/567 (#568)

Browse Source 
* Correctly manage page count when Page size = 0

* make =>TODO: Need to change the api to support full list
Manage to support full list when pagesize is unknow
This commit is contained in:
Cédric Michel
2021-10-24 23:41:36 +02:00
committed by GitHub
parent cafd5d0544
commit 5b5abd9c8d
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ApplicationCore/Specifications/CatalogFilterPaginatedSpecification.cs
View File

@@ -8,6 +8,10 @@ namespace Microsoft.eShopWeb.ApplicationCore.Specifications
public CatalogFilterPaginatedSpecification(int skip, int take, int? brandId, int? typeId) public CatalogFilterPaginatedSpecification(int skip, int take, int? brandId, int? typeId)
: base() : base()
{ {
if (take == 0)
{
take = int.MaxValue;
}
Query Query
.Where(i => (!brandId.HasValue || i.CatalogBrandId == brandId) && .Where(i => (!brandId.HasValue || i.CatalogBrandId == brandId) &&
(!typeId.HasValue || i.CatalogTypeId == typeId)) (!typeId.HasValue || i.CatalogTypeId == typeId))

3
src/BlazorAdmin/Services/CatalogItemService.cs
View File

@@ -85,8 +85,7 @@ namespace BlazorAdmin.Services
var brandListTask = _brandService.List(); var brandListTask = _brandService.List();
var typeListTask = _typeService.List(); var typeListTask = _typeService.List();
//TODO: Need to change the api to support full list var itemListTask = _httpService.HttpGet<PagedCatalogItemResponse>($"catalog-items");
var itemListTask = _httpService.HttpGet<PagedCatalogItemResponse>($"catalog-items?PageSize=100");
await Task.WhenAll(brandListTask, typeListTask, itemListTask); await Task.WhenAll(brandListTask, typeListTask, itemListTask);
var brands = brandListTask.Result; var brands = brandListTask.Result;
var types = typeListTask.Result; var types = typeListTask.Result;

10
src/PublicApi/CatalogItemEndpoints/ListPaged.cs
View File

@@ -56,7 +56,15 @@ namespace Microsoft.eShopWeb.PublicApi.CatalogItemEndpoints
{ {
item.PictureUri = _uriComposer.ComposePicUri(item.PictureUri); item.PictureUri = _uriComposer.ComposePicUri(item.PictureUri);
} }
response.PageCount = int.Parse(Math.Ceiling((decimal)totalItems / request.PageSize).ToString());
if (request.PageSize > 0)
{
response.PageCount = int.Parse(Math.Ceiling((decimal)totalItems / request.PageSize).ToString());
}
else
{
response.PageCount = totalItems > 0 ? 1 : 0;
}
return Ok(response); return Ok(response);
} }