Integration with Catalog api, filter and pagination.

Author: Carlos Cañizares Estévez

src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs

@@ -15,8 +15,6 @@ public static async Task SeedAsync(IApplicationBuilder applicationBuilder)
 
             using (context)
             {
-                context.Database.EnsureDeleted();
-
                 context.Database.EnsureCreated();
 
                 if (!context.CatalogBrands.Any())

src/Services/Catalog/Catalog.API/Startup.cs

@@ -21,7 +21,7 @@ public Startup(IHostingEnvironment env)
         {
             var builder = new ConfigurationBuilder()
                 .SetBasePath(env.ContentRootPath)
-                .AddJsonFile($"settings.{env.EnvironmentName}.json",optional:false)
+                .AddJsonFile($"settings.json",optional:false)
                 .AddEnvironmentVariables();
 
 

src/Services/Catalog/Catalog.API/project.json

@@ -43,7 +43,7 @@
       "wwwroot",
       "Views",
       "Areas/**/Views",
-      "settings.Production.json",
+      "settings.json",
       "web.config",
       "project.json",
       "Dockerfile"

…og/Catalog.API/settings.development.json …rvices/Catalog/Catalog.API/settings.jsonsrc/Services/Catalog/Catalog.API/settings.development.json renamed to src/Services/Catalog/Catalog.API/settings.json src/Services/Catalog/Catalog.API/settings.development.json renamed to src/Services/Catalog/Catalog.API/settings.json

@@ -58,7 +58,7 @@ public async Task<IActionResult> AddToCart(string productId)
                 Id = Guid.NewGuid().ToString(),
                 Quantity = 1,
                 ProductName = productDetails.Name,
-                PictureUrl = productDetails.PictureUrl,
+                PictureUrl = productDetails.PictureUri,
                 UnitPrice = productDetails.Price, 
                 ProductId = productId
             };

src/Services/Catalog/Catalog.API/settings.production.json

@@ -24,19 +24,21 @@ public CatalogController(ICatalogService catalogSvc)
 
         public async Task<IActionResult> Index(int? BrandFilterApplied, int? TypesFilterApplied, int? page)
         {
+            var itemsPage = 10;
+            var catalog = await _catalogSvc.GetCatalogItems(page ?? 0, itemsPage, BrandFilterApplied, TypesFilterApplied);
             var vm = new IndexViewModel()
             {
-                CatalogItems = await _catalogSvc.GetCatalogItems(6 * (page ?? 0), 6),
-                Brands = _catalogSvc.GetBrands(),
-                Types = _catalogSvc.GetTypes(),
+                CatalogItems = catalog.Data,
+                Brands = await _catalogSvc.GetBrands(),
+                Types = await _catalogSvc.GetTypes(),
                 BrandFilterApplied = BrandFilterApplied ?? 0,
                 TypesFilterApplied = TypesFilterApplied ?? 0,
                 PaginationInfo = new PaginationInfo()
                 {
                     ActualPage = page ?? 0,
-                    ItemsPerPage = 6,
+                    ItemsPerPage = (_catalogSvc.TotalItems < itemsPage) ? _catalogSvc.TotalItems : itemsPage,
                     TotalItems = _catalogSvc.TotalItems, 
-                    TotalPages = int.Parse(Math.Round(((decimal)_catalogSvc.TotalItems / 6), MidpointRounding.AwayFromZero).ToString())
+                    TotalPages = int.Parse(Math.Ceiling(((decimal)_catalogSvc.TotalItems / itemsPage)).ToString())
                 }
             };
 

src/Web/WebMVC/Controllers/CartController.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Microsoft.eShopOnContainers.WebMVC.Models
+{
+    public class Catalog
+    {
+        public int PageIndex { get; set; }
+        public int PageSize { get; set; }
+        public int Count { get; set; }
+        public List<CatalogItem> Data { get; set; }
+    }
+}

src/Web/WebMVC/Controllers/CatalogController.cs

@@ -8,6 +8,11 @@ public class CatalogItem
         public string Name { get; set; }
         public string Description { get; set; }
         public decimal Price { get; set; }
-        public string PictureUrl { get; set; }
+        public string PictureUri { get; set; }
+        public int CatalogBrandId { get; set; }
+        public string CatalogBrand { get; set; }
+        public int CatalogTypeId { get; set; }
+        public string CatalogType { get; set; }
+
     }
 }