From 6d874ee3ef743047a4a64ccd1472f202a858ab39 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Wed, 22 Mar 2017 21:10:01 -0400 Subject: [PATCH] Refactoring to use common BaseEntity class. Fixed error on view page referencing old Models namespace. --- src/Business/Entities/BaseEntity.cs | 7 +++++++ src/Business/Entities/CatalogBrand.cs | 3 +-- src/Business/Entities/CatalogItem.cs | 12 +----------- src/Business/Entities/CatalogType.cs | 4 +--- src/Web/Views/Catalog/_product.cshtml | 2 +- 5 files changed, 11 insertions(+), 17 deletions(-) create mode 100644 src/Business/Entities/BaseEntity.cs diff --git a/src/Business/Entities/BaseEntity.cs b/src/Business/Entities/BaseEntity.cs new file mode 100644 index 0000000..be1833c --- /dev/null +++ b/src/Business/Entities/BaseEntity.cs @@ -0,0 +1,7 @@ +namespace Microsoft.eShopWeb.Business.Entities +{ + public class BaseEntity + { + public int Id { get; set; } + } +} diff --git a/src/Business/Entities/CatalogBrand.cs b/src/Business/Entities/CatalogBrand.cs index e016395..a13a2c2 100644 --- a/src/Business/Entities/CatalogBrand.cs +++ b/src/Business/Entities/CatalogBrand.cs @@ -1,8 +1,7 @@ namespace Microsoft.eShopWeb.Business.Entities { - public class CatalogBrand + public class CatalogBrand : BaseEntity { - public int Id { get; set; } public string Brand { get; set; } } } diff --git a/src/Business/Entities/CatalogItem.cs b/src/Business/Entities/CatalogItem.cs index aedc288..a591e6d 100644 --- a/src/Business/Entities/CatalogItem.cs +++ b/src/Business/Entities/CatalogItem.cs @@ -1,25 +1,15 @@ namespace Microsoft.eShopWeb.Business.Entities { - public class CatalogItem + public class CatalogItem : BaseEntity { - public int Id { get; set; } - public string Name { get; set; } - public string Description { get; set; } - public decimal Price { get; set; } - public string PictureUri { get; set; } - public int CatalogTypeId { get; set; } - public CatalogType CatalogType { get; set; } - public int CatalogBrandId { get; set; } - public CatalogBrand CatalogBrand { get; set; } - public CatalogItem() { } } } \ No newline at end of file diff --git a/src/Business/Entities/CatalogType.cs b/src/Business/Entities/CatalogType.cs index 2842b43..a033f2c 100644 --- a/src/Business/Entities/CatalogType.cs +++ b/src/Business/Entities/CatalogType.cs @@ -1,9 +1,7 @@ namespace Microsoft.eShopWeb.Business.Entities { - public class CatalogType + public class CatalogType : BaseEntity { - public int Id { get; set; } - public string Type { get; set; } } } diff --git a/src/Web/Views/Catalog/_product.cshtml b/src/Web/Views/Catalog/_product.cshtml index 6fbca0d..aaf8226 100644 --- a/src/Web/Views/Catalog/_product.cshtml +++ b/src/Web/Views/Catalog/_product.cshtml @@ -1,4 +1,4 @@ -@model Microsoft.eShopWeb.Models.CatalogItem +@model Microsoft.eShopWeb.Business.Entities.CatalogItem