Added dynamic eager loading to generic repository for including relat…

…ed entities in product queries.
aliarmgnuygun · Oct 13, 2024 · 8c57d0a · 8c57d0a
1 parent ffbdcba
commit 8c57d0a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/Bulky.DataAccess/Repository/IRepository/IRepository.cs b/Bulky.DataAccess/Repository/IRepository/IRepository.cs
@@ -4,8 +4,8 @@ namespace BookBazaar.DataAccess.Repository.IRepository
 {
     public interface IRepository<T> where T : class
     {
-        IEnumerable<T> GetAll();
-        T Get(Expression<Func<T, bool>> filter);
+        IEnumerable<T> GetAll(string? includeProperties = null);
+        T Get(Expression<Func<T, bool>> filter, string? includeProperties = null);
         void Add(T entity);
         void Update(T entity);
         void Remove(T entity);

diff --git a/Bulky.DataAccess/Repository/Repository.cs b/Bulky.DataAccess/Repository/Repository.cs
@@ -1,35 +1,55 @@
 using BookBazaar.DataAccess.Data;
 using BookBazaar.DataAccess.Repository.IRepository;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.IdentityModel.Tokens;
 using System.Linq.Expressions;
 
 namespace BookBazaar.DataAccess.Repository
 {
     public class Repository<T> : IRepository<T> where T : class
     {
         private readonly ApplicationDbContext _db;
-        internal DbSet<T> dbSet;
+        public DbSet<T> dbSet;
         public Repository(ApplicationDbContext db)
         {
             _db = db;
             this.dbSet = _db.Set<T>();
+            _db.Products.Include(u => u.Category);
         }
 
         public void Add(T entity)
         {
             dbSet.Add(entity);    
         }
 
-        public T Get(Expression<Func<T, bool>> filter)
+        public T Get(Expression<Func<T, bool>> filter,string? includeProperties = null)
         {
             IQueryable<T> query = dbSet;
             query = query.Where(filter);
+            if (!string.IsNullOrEmpty(includeProperties))
+            {
+                foreach (var includeProperty in includeProperties
+                    .Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                {
+                    query = query.Include(includeProperty);
+                }
+            }
             return query.FirstOrDefault();
         }
-
-        public IEnumerable<T> GetAll()
+
+        //Category is a navigation property in Product, so we need to include it
+        //Category, CoverType, Company etc. may be navigation properties in Product
+        public IEnumerable<T> GetAll(string? includeProperties = null)
         {
             IQueryable<T> query = dbSet;
+            if (!string.IsNullOrEmpty(includeProperties))
+            {
+                foreach (var includeProperty in includeProperties
+                    .Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                {
+                    query = query.Include(includeProperty);
+                }
+            }
             return query.ToList();
         }
 

diff --git a/BulkyWeb/Areas/Admin/Controllers/ProductController.cs b/BulkyWeb/Areas/Admin/Controllers/ProductController.cs
@@ -19,7 +19,7 @@ public ProductController(IUnitOfWork unitOfWork, IWebHostEnvironment webHostEnvi
         }
         public IActionResult Index()
         {
-            List<Product> productList = _unitOfWork.Product.GetAll().ToList();
+            List<Product> productList = _unitOfWork.Product.GetAll(includeProperties:"Category").ToList();
             return View(productList);
         }
 

diff --git a/BulkyWeb/Areas/Admin/Views/Product/Index.cshtml b/BulkyWeb/Areas/Admin/Views/Product/Index.cshtml
@@ -46,7 +46,7 @@
                         <td>@obj.Author</td>
                         <td>@obj.ISBN</td>
                         <td>@obj.Price</td>
-                        <td>@obj.CategoryId</td>
+                        <td>@obj.Category.Name</td>
                         <td>
                             <div class="w-75 btn-group" role="group">
                                 <a asp-controller="Product" asp-action="Upsert" asp-route-id="@obj.Id" class="btn btn-primary mx-2">