Section 6 - Include Properties

jacksonsophat · Sep 23, 2021 · ef3be3b · ef3be3b
1 parent 13fe8db
commit ef3be3b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/BulkyBook.DataAccess/Repository/IRepository/IRepository.cs b/BulkyBook.DataAccess/Repository/IRepository/IRepository.cs
@@ -10,8 +10,8 @@ namespace BulkyBook.DataAccess.Repository.IRepository
     public interface IRepository<T> where T : class
     {
         //T - Category
-        T GetFirstOrDefault(Expression<Func<T, bool>> filter);
-        IEnumerable<T> GetAll();
+        T GetFirstOrDefault(Expression<Func<T, bool>> filter, string? includeProperties = null);
+        IEnumerable<T> GetAll(string? includeProperties = null);
         void Add(T entity);
         void Remove(T entity);
         void RemoveRange(IEnumerable<T> entity);

diff --git a/BulkyBook.DataAccess/Repository/Repository.cs b/BulkyBook.DataAccess/Repository/Repository.cs
@@ -17,25 +17,39 @@ public class Repository<T> : IRepository<T> where T : class
         public Repository(ApplicationDbContext db)
         {
             _db= db;
+            //_db.Products.Include(u => u.Category).Include(u=>u.CoverType);
             this.dbSet= _db.Set<T>();
         }
         public void Add(T entity)
         {
             dbSet.Add(entity);
         }
-
-        public IEnumerable<T> GetAll()
+        //includeProp - "Category,CoverType"
+        public IEnumerable<T> GetAll(string? includeProperties = null)
         {
             IQueryable<T> query = dbSet;
+            if (includeProperties != null)
+            {
+                foreach(var includeProp in includeProperties.Split(new char[] { ','}, StringSplitOptions.RemoveEmptyEntries))
+                {
+                    query = query.Include(includeProp);
+                }
+            }
             return query.ToList();
         }
 
-        public T GetFirstOrDefault(Expression<Func<T, bool>> filter)
+        public T GetFirstOrDefault(Expression<Func<T, bool>> filter, string? includeProperties = null)
         {
             IQueryable<T> query = dbSet;
 
             query = query.Where(filter);
-
+            if (includeProperties != null)
+            {
+                foreach (var includeProp in includeProperties.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                {
+                    query = query.Include(includeProp);
+                }
+            }
             return query.FirstOrDefault();
         }
 

diff --git a/BulkyBookWeb/Areas/Admin/Controllers/ProductController.cs b/BulkyBookWeb/Areas/Admin/Controllers/ProductController.cs
@@ -133,7 +133,7 @@ public IActionResult DeletePOST(int? id)
     [HttpGet]
     public IActionResult GetAll()
     {
-        var productList = _unitOfWork.Product.GetAll();
+        var productList = _unitOfWork.Product.GetAll(includeProperties:"Category,CoverType");
         return Json(new { data = productList });
     }
     #endregion

diff --git a/BulkyBookWeb/Areas/Admin/Views/Product/Index.cshtml b/BulkyBookWeb/Areas/Admin/Views/Product/Index.cshtml
@@ -18,7 +18,7 @@
             <th>ISBN</th>
             <th>Price</th>
             <th>Author</th>
-            @*<th>Category</th>*@
+            <th>Category</th>
             @*<th></th>*@
 		</tr>
 	</thead>

diff --git a/BulkyBookWeb/wwwroot/js/product.js b/BulkyBookWeb/wwwroot/js/product.js
@@ -14,6 +14,7 @@ function loadDataTable() {
             { "data": "isbn", "width": "15%" },
             { "data": "price", "width": "15%" },
             { "data": "author", "width": "15%" },
+            { "data": "category.name", "width": "15%" },
         ]
     });
 }