Remove Include filter and use autoinclude for EF Core

Author: linkdotnet

LinkDotNet.Blog.IntegrationTests/Infrastructure/Persistence/Sql/BlogPostRepositoryTests.cs

@@ -17,7 +17,7 @@ public async Task ShouldLoadBlogPost()
             await DbContext.BlogPosts.AddAsync(blogPost);
             await DbContext.SaveChangesAsync();
 
-            var blogPostFromRepo = await Repository.GetByIdAsync(blogPost.Id, post => post.Tags);
+            var blogPostFromRepo = await Repository.GetByIdAsync(blogPost.Id);
 
             blogPostFromRepo.Should().NotBeNull();
             blogPostFromRepo.Title.Should().Be("Title");
@@ -56,7 +56,7 @@ public async Task ShouldGetAllBlogPosts()
             await DbContext.BlogPosts.AddAsync(blogPost);
             await DbContext.SaveChangesAsync();
 
-            var blogPostsFromRepo = (await Repository.GetAllAsync(include: post => post.Tags)).ToList();
+            var blogPostsFromRepo = (await Repository.GetAllAsync()).ToList();
 
             blogPostsFromRepo.Should().NotBeNull();
             blogPostsFromRepo.Should().HaveCount(1);
@@ -100,7 +100,6 @@ public async Task ShouldFilterAndOrder()
             var blogPosts = await Repository.GetAllAsync(
                 bp => bp.Title != "FilterOut",
                 bp => bp.UpdatedDate,
-                null,
                 false);
 
             var retrievedPosts = blogPosts.ToList();

LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs

@@ -153,7 +153,6 @@ private static void SetupGetAll(
             repoMock.Setup(r => r.GetAllAsync(
                     It.IsAny<Expression<Func<ProfileInformationEntry, bool>>>(),
                     It.IsAny<Expression<Func<ProfileInformationEntry, object>>>(),
-                    It.IsAny<Expression<Func<ProfileInformationEntry, object>>>(),
                     It.IsAny<bool>(),
                     It.IsAny<int>(),
                     It.IsAny<int>()))
@@ -170,7 +169,6 @@ private static void SetupGetAll(
             repoMock.Setup(r => r.GetAllAsync(
                 It.IsAny<Expression<Func<ProfileInformationEntry, bool>>>(),
                 It.IsAny<Expression<Func<ProfileInformationEntry, object>>>(),
-                It.IsAny<Expression<Func<ProfileInformationEntry, object>>>(),
                 It.IsAny<bool>(),
                 It.IsAny<int>(),
                 It.IsAny<int>())).ReturnsAsync(new List<ProfileInformationEntry>().ToPagedList());

LinkDotNet.Blog.UnitTests/Infrastructure/Persistence/InMemory/BlogPostRepositoryTests.cs

@@ -55,7 +55,6 @@ public async Task ShouldFilterAndOrder()
             var blogPosts = await sut.GetAllAsync(
                 bp => bp.Title != "FilterOut",
                 bp => bp.UpdatedDate,
-                null,
                 false);
 
             var retrievedPosts = blogPosts.ToList();

LinkDotNet.Blog.Web/Pages/Index.razor

@@ -37,7 +37,6 @@
         currentPage = await blogPostRepository.GetAllAsync(
             p => p.IsPublished,
             b => b.UpdatedDate,
-            b => b.Tags,
             pageSize: appConfiguration.BlogPostsPerPage);
     }
 

LinkDotNet.Infrastructure/Persistence/IRepository.cs

@@ -9,13 +9,12 @@ namespace LinkDotNet.Infrastructure.Persistence
     public interface IRepository<TEntity>
     where TEntity : Entity
     {
-        Task<TEntity> GetByIdAsync(string id, Expression<Func<TEntity, object>> include = null);
+        Task<TEntity> GetByIdAsync(string id);
 
         Task<IPagedList<TEntity>> GetAllAsync(
             Expression<Func<TEntity, bool>> filter = null,
             Expression<Func<TEntity,
                 object>> orderBy = null,
-            Expression<Func<TEntity, object>> include = null,
             bool descending = true,
             int page = 1,
             int pageSize = int.MaxValue);

LinkDotNet.Infrastructure/Persistence/InMemory/Repository.cs

@@ -13,7 +13,7 @@ public class Repository<TEntity> : IRepository<TEntity>
     {
         private readonly List<TEntity> entities = new();
 
-        public Task<TEntity> GetByIdAsync(string id, Expression<Func<TEntity, object>> include = null)
+        public Task<TEntity> GetByIdAsync(string id)
         {
             var entity = entities.SingleOrDefault(b => b.Id == id);
             return Task.FromResult(entity);
@@ -22,7 +22,6 @@ public Task<TEntity> GetByIdAsync(string id, Expression<Func<TEntity, object>> i
         public Task<IPagedList<TEntity>> GetAllAsync(
             Expression<Func<TEntity, bool>> filter = null,
             Expression<Func<TEntity, object>> orderBy = null,
-            Expression<Func<TEntity, object>> include = null,
             bool descending = true,
             int page = 1,
             int pageSize = int.MaxValue)

LinkDotNet.Infrastructure/Persistence/RavenDb/Repository.cs

@@ -18,7 +18,7 @@ public Repository(IDocumentStore documentStore)
             this.documentStore = documentStore;
         }
 
-        public async Task<TEntity> GetByIdAsync(string id, Expression<Func<TEntity, object>> include = null)
+        public async Task<TEntity> GetByIdAsync(string id)
         {
             using var session = documentStore.OpenAsyncSession();
             return await session.LoadAsync<TEntity>(id);
@@ -27,7 +27,6 @@ public async Task<TEntity> GetByIdAsync(string id, Expression<Func<TEntity, obje
         public async Task<IPagedList<TEntity>> GetAllAsync(
             Expression<Func<TEntity, bool>> filter = null,
             Expression<Func<TEntity, object>> orderBy = null,
-            Expression<Func<TEntity, object>> include = null,
             bool descending = true,
             int page = 1,
             int pageSize = int.MaxValue)

LinkDotNet.Infrastructure/Persistence/Sql/Mapping/BlogPostConfiguration.cs

@@ -14,6 +14,7 @@ public void Configure(EntityTypeBuilder<BlogPost> builder)
             builder.HasMany(t => t.Tags)
                 .WithOne()
                 .OnDelete(DeleteBehavior.Cascade);
+            builder.Navigation(x => x.Tags).AutoInclude();
         }
     }
 }

LinkDotNet.Infrastructure/Persistence/Sql/Repository.cs

@@ -18,34 +18,19 @@ public Repository(BlogDbContext blogDbContext)
             this.blogDbContext = blogDbContext;
         }
 
-        public async Task<TEntity> GetByIdAsync(string id, Expression<Func<TEntity, object>> include = null)
+        public async Task<TEntity> GetByIdAsync(string id)
         {
-            if (include != null)
-            {
-                return await blogDbContext.Set<TEntity>().Include(include).SingleOrDefaultAsync(b => b.Id == id);
-            }
-
             return await blogDbContext.Set<TEntity>().SingleOrDefaultAsync(b => b.Id == id);
         }
 
         public async Task<IPagedList<TEntity>> GetAllAsync(
             Expression<Func<TEntity, bool>> filter = null,
             Expression<Func<TEntity, object>> orderBy = null,
-            Expression<Func<TEntity, object>> include = null,
             bool descending = true,
             int page = 1,
             int pageSize = int.MaxValue)
         {
-            IQueryable<TEntity> entity;
-
-            if (include != null)
-            {
-                entity = blogDbContext.Set<TEntity>().AsNoTracking().Include(include).AsQueryable();
-            }
-            else
-            {
-                entity = blogDbContext.Set<TEntity>().AsNoTracking().AsQueryable();
-            }
+            var entity = blogDbContext.Set<TEntity>().AsNoTracking().AsQueryable();
 
             if (filter != null)
             {