ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Optimize logic in "CatalogController", to make "ChangeUriPlaceholder" more Consistent

Browse Source
This commit is contained in:
Jintao 2023-06-05 22:59:00 +08:00
parent 3169a93344
commit 84fce83a32
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
View File

@ -44,9 +44,9 @@ public class CatalogController : ControllerBase
.OrderBy(c => c.Name) .OrderBy(c => c.Name)
.Skip(pageSize * pageIndex) .Skip(pageSize * pageIndex)
.Take(pageSize) .Take(pageSize)
.ToListAsync(); .ToArrayAsync();
itemsOnPage = ChangeUriPlaceholder(itemsOnPage); ChangeUriPlaceholder(itemsOnPage);
var model = new PaginatedItemsViewModel<CatalogItem>(pageIndex, pageSize, totalItems, itemsOnPage); var model = new PaginatedItemsViewModel<CatalogItem>(pageIndex, pageSize, totalItems, itemsOnPage);
@ -65,11 +65,9 @@ public class CatalogController : ControllerBase
var idsToSelect = numIds var idsToSelect = numIds
.Select(id => id.Value); .Select(id => id.Value);
var items = await _catalogContext.CatalogItems.Where(ci => idsToSelect.Contains(ci.Id)).ToListAsync(); var items = await _catalogContext.CatalogItems.Where(ci => idsToSelect.Contains(ci.Id)).ToArrayAsync();
items = ChangeUriPlaceholder(items); return ChangeUriPlaceholder(items);
return items;
} }
[HttpGet] [HttpGet]
@ -86,13 +84,9 @@ public class CatalogController : ControllerBase
var item = await _catalogContext.CatalogItems.SingleOrDefaultAsync(ci => ci.Id == id); var item = await _catalogContext.CatalogItems.SingleOrDefaultAsync(ci => ci.Id == id);
var baseUri = _settings.PicBaseUrl;
var azureStorageEnabled = _settings.AzureStorageEnabled;
item.FillProductUrl(baseUri, azureStorageEnabled: azureStorageEnabled);
if (item != null) if (item != null)
{ {
ChangeUriPlaceholder(item);
return item; return item;
} }
@ -113,9 +107,9 @@ public class CatalogController : ControllerBase
.Where(c => c.Name.StartsWith(name)) .Where(c => c.Name.StartsWith(name))
.Skip(pageSize * pageIndex) .Skip(pageSize * pageIndex)
.Take(pageSize) .Take(pageSize)
.ToListAsync(); .ToArrayAsync();
itemsOnPage = ChangeUriPlaceholder(itemsOnPage); ChangeUriPlaceholder(itemsOnPage);
return new PaginatedItemsViewModel<CatalogItem>(pageIndex, pageSize, totalItems, itemsOnPage); return new PaginatedItemsViewModel<CatalogItem>(pageIndex, pageSize, totalItems, itemsOnPage);
} }
@ -141,9 +135,9 @@ public class CatalogController : ControllerBase
var itemsOnPage = await root var itemsOnPage = await root
.Skip(pageSize * pageIndex) .Skip(pageSize * pageIndex)
.Take(pageSize) .Take(pageSize)
.ToListAsync(); .ToArrayAsync();
itemsOnPage = ChangeUriPlaceholder(itemsOnPage); ChangeUriPlaceholder(itemsOnPage);
return new PaginatedItemsViewModel<CatalogItem>(pageIndex, pageSize, totalItems, itemsOnPage); return new PaginatedItemsViewModel<CatalogItem>(pageIndex, pageSize, totalItems, itemsOnPage);
} }
@ -167,9 +161,9 @@ public class CatalogController : ControllerBase
var itemsOnPage = await root var itemsOnPage = await root
.Skip(pageSize * pageIndex) .Skip(pageSize * pageIndex)
.Take(pageSize) .Take(pageSize)
.ToListAsync(); .ToArrayAsync();
itemsOnPage = ChangeUriPlaceholder(itemsOnPage); ChangeUriPlaceholder(itemsOnPage);
return new PaginatedItemsViewModel<CatalogItem>(pageIndex, pageSize, totalItems, itemsOnPage); return new PaginatedItemsViewModel<CatalogItem>(pageIndex, pageSize, totalItems, itemsOnPage);
} }
@ -276,7 +270,7 @@ public class CatalogController : ControllerBase
return NoContent(); return NoContent();
} }
private List<CatalogItem> ChangeUriPlaceholder(List<CatalogItem> items) private List<CatalogItem> ChangeUriPlaceholder(params CatalogItem[] items)
{ {
var baseUri = _settings.PicBaseUrl; var baseUri = _settings.PicBaseUrl;
var azureStorageEnabled = _settings.AzureStorageEnabled; var azureStorageEnabled = _settings.AzureStorageEnabled;
@ -286,6 +280,6 @@ public class CatalogController : ControllerBase
item.FillProductUrl(baseUri, azureStorageEnabled: azureStorageEnabled); item.FillProductUrl(baseUri, azureStorageEnabled: azureStorageEnabled);
} }
return items; return items.ToList();
} }
} }