From 850a1df00b4570dc6b5744cec28fddb98eaa38a7 Mon Sep 17 00:00:00 2001
From: Steven Giesel <stgiesel35@gmail.com>
Date: Tue, 13 Jul 2021 18:02:36 +0200
Subject: [PATCH 1/6] Added Pagination for BlogPosts

---
 LinkDotNet.Blog.Web/Pages/Index.razor         | 17 ++++++--
 .../Shared/BlogPostNavigation.razor           | 40 +++++++++++++++++++
 .../LinkDotNet.Infrastructure.csproj          |  1 +
 .../Persistence/IRepository.cs                | 10 ++++-
 .../InMemory/InMemoryRepository.cs            | 14 +++++--
 .../Persistence/RavenDb/BlogPostRepository.cs | 15 ++++---
 .../Persistence/Sql/BlogPostRepository.cs     | 15 ++++---
 7 files changed, 92 insertions(+), 20 deletions(-)
 create mode 100644 LinkDotNet.Blog.Web/Shared/BlogPostNavigation.razor

diff --git a/LinkDotNet.Blog.Web/Pages/Index.razor b/LinkDotNet.Blog.Web/Pages/Index.razor
index 09d9c8a1..0cefb4ae 100644
--- a/LinkDotNet.Blog.Web/Pages/Index.razor
+++ b/LinkDotNet.Blog.Web/Pages/Index.razor
@@ -2,6 +2,7 @@
 @using LinkDotNet.Domain
 @using LinkDotNet.Infrastructure.Persistence
 @using Markdig
+@using X.PagedList
 @inject IRepository _repository
 @inject AppConfiguration _appConfiguration
 @inject NavigationManager _navigationManager
@@ -13,17 +14,19 @@
     <IntroductionCard Introduction="_appConfiguration.Introduction"></IntroductionCard>
 
     <div class="content px-4">
-        @for (var i = 0; i < _blogPosts.Count; i++)
+        @for (var i = 0; i < _currentPage.Count; i++)
         {
-            <ShortBlogPost BlogPost="_blogPosts[i]" UseAlternativeStyle="@(i % 2 != 0)"></ShortBlogPost>
+            <ShortBlogPost BlogPost="_currentPage[i]" UseAlternativeStyle="@(i % 2 != 0)"></ShortBlogPost>
         }
     </div>
+    <BlogPostNavigation CurrentPage="@_currentPage" OnPageChanged="GetPage"></BlogPostNavigation>
 </section>
 @code {
-    IList<BlogPost> _blogPosts = new List<BlogPost>();
+    IPagedList<BlogPost> _currentPage = new PagedList<BlogPost>(Array.Empty<BlogPost>(), 1, 1);
+
     protected override async Task OnInitializedAsync()
     {
-        _blogPosts = (await _repository.GetAllAsync(p => p.IsPublished, b => b.UpdatedDate)).ToList();
+        _currentPage = await _repository.GetAllAsync(p => p.IsPublished, b => b.UpdatedDate, pageSize: 1);
     }
 
     private string GetAbsolutePreviewImageUrl()
@@ -42,4 +45,10 @@
     {
         return Uri.TryCreate(url, UriKind.Absolute, out _);
     }
+
+    private async Task GetPage(int newPage)
+    {
+        _currentPage = await _repository.GetAllAsync(p => p.IsPublished, b => b.UpdatedDate, pageSize: 1, page: 
+        newPage);
+    }
 }
\ No newline at end of file
diff --git a/LinkDotNet.Blog.Web/Shared/BlogPostNavigation.razor b/LinkDotNet.Blog.Web/Shared/BlogPostNavigation.razor
new file mode 100644
index 00000000..eac2f7a4
--- /dev/null
+++ b/LinkDotNet.Blog.Web/Shared/BlogPostNavigation.razor
@@ -0,0 +1,40 @@
+@using LinkDotNet.Domain
+@using X.PagedList
+    <nav aria-label="Page navigation example">
+        <ul class="pagination justify-content-center">
+            <li class="page-item @(!CurrentPage.IsFirstPage ? string.Empty : "disabled")">
+                <a class="page-link" href="#" tabindex="-1">Previous</a>
+            </li>
+            <li class="page-item"><a class="page-link @(!CurrentPage.IsFirstPage ? string.Empty : "disabled")" 
+                                     href="#" 
+                                     @onclick="PreviousPage">(@CurrentPage.PageNumber - 1)</a></li>
+            <li class="page-item">
+                <a class="page-link @(!CurrentPage.IsLastPage ? string.Empty : "disabled")"
+                   @onclick="NextPage">
+                   href="#">Next</a>
+            </li>
+        </ul>
+    </nav>
+
+    @code {
+        [Parameter]
+        public IPagedList<BlogPost> CurrentPage { get; set; }
+        
+        [Parameter]
+        public EventCallback<int> OnPageChanged { get; set; }
+
+        private async Task PageHasChanged(int newPage)
+        {
+            await OnPageChanged.InvokeAsync(newPage);
+        }
+
+        private async Task PreviousPage()
+        {
+            await PageHasChanged(CurrentPage.PageCount - 1);
+        }
+        
+        private async Task NextPage()
+        {
+            await PageHasChanged(CurrentPage.PageCount + 1);
+        }
+    }
\ No newline at end of file
diff --git a/LinkDotNet.Infrastructure/LinkDotNet.Infrastructure.csproj b/LinkDotNet.Infrastructure/LinkDotNet.Infrastructure.csproj
index 00da4b91..f225d1f4 100644
--- a/LinkDotNet.Infrastructure/LinkDotNet.Infrastructure.csproj
+++ b/LinkDotNet.Infrastructure/LinkDotNet.Infrastructure.csproj
@@ -15,6 +15,7 @@
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
+      <PackageReference Include="X.PagedList" Version="8.1.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/LinkDotNet.Infrastructure/Persistence/IRepository.cs b/LinkDotNet.Infrastructure/Persistence/IRepository.cs
index 46986a6f..5176de32 100644
--- a/LinkDotNet.Infrastructure/Persistence/IRepository.cs
+++ b/LinkDotNet.Infrastructure/Persistence/IRepository.cs
@@ -1,8 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using LinkDotNet.Domain;
+using X.PagedList;
 
 namespace LinkDotNet.Infrastructure.Persistence
 {
@@ -10,7 +10,13 @@ public interface IRepository
     {
         Task<BlogPost> GetByIdAsync(string blogPostId);
 
-        Task<IEnumerable<BlogPost>> GetAllAsync(Expression<Func<BlogPost, bool>> filter = null, Expression<Func<BlogPost, object>> orderBy = null, bool descending = true);
+        Task<IPagedList<BlogPost>> GetAllAsync(
+            Expression<Func<BlogPost, bool>> filter = null,
+            Expression<Func<BlogPost,
+            object>> orderBy = null,
+            bool descending = true,
+            int page = 1,
+            int pageSize = 5);
 
         Task StoreAsync(BlogPost blogPost);
 
diff --git a/LinkDotNet.Infrastructure/Persistence/InMemory/InMemoryRepository.cs b/LinkDotNet.Infrastructure/Persistence/InMemory/InMemoryRepository.cs
index e1335759..847010b0 100644
--- a/LinkDotNet.Infrastructure/Persistence/InMemory/InMemoryRepository.cs
+++ b/LinkDotNet.Infrastructure/Persistence/InMemory/InMemoryRepository.cs
@@ -4,6 +4,7 @@
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using LinkDotNet.Domain;
+using X.PagedList;
 
 namespace LinkDotNet.Infrastructure.Persistence.InMemory
 {
@@ -17,7 +18,12 @@ public Task<BlogPost> GetByIdAsync(string blogPostId)
             return Task.FromResult(blogPost);
         }
 
-        public Task<IEnumerable<BlogPost>> GetAllAsync(Expression<Func<BlogPost, bool>> filter = null, Expression<Func<BlogPost, object>> orderBy = null, bool descending = true)
+        public Task<IPagedList<BlogPost>> GetAllAsync(
+            Expression<Func<BlogPost, bool>> filter = null,
+            Expression<Func<BlogPost, object>> orderBy = null,
+            bool descending = true,
+            int page = 1,
+            int pageSize = 5)
         {
             var result = blogPosts.AsEnumerable();
             if (filter != null)
@@ -29,13 +35,13 @@ public Task<IEnumerable<BlogPost>> GetAllAsync(Expression<Func<BlogPost, bool>>
             {
                 if (descending)
                 {
-                    return Task.FromResult(result.OrderByDescending(orderBy.Compile()).AsEnumerable());
+                    return Task.FromResult(result.OrderByDescending(orderBy.Compile()).ToPagedList(page, pageSize));
                 }
 
-                return Task.FromResult(result.OrderBy(orderBy.Compile()).AsEnumerable());
+                return Task.FromResult(result.OrderBy(orderBy.Compile()).ToPagedList(page, pageSize));
             }
 
-            return Task.FromResult(blogPosts.AsEnumerable());
+            return Task.FromResult(blogPosts.ToPagedList(page, pageSize));
         }
 
         public Task StoreAsync(BlogPost blogPost)
diff --git a/LinkDotNet.Infrastructure/Persistence/RavenDb/BlogPostRepository.cs b/LinkDotNet.Infrastructure/Persistence/RavenDb/BlogPostRepository.cs
index 5885758c..f2d9341b 100644
--- a/LinkDotNet.Infrastructure/Persistence/RavenDb/BlogPostRepository.cs
+++ b/LinkDotNet.Infrastructure/Persistence/RavenDb/BlogPostRepository.cs
@@ -1,10 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using LinkDotNet.Domain;
 using Raven.Client.Documents;
 using Raven.Client.Documents.Linq;
+using X.PagedList;
 
 namespace LinkDotNet.Infrastructure.Persistence.RavenDb
 {
@@ -23,7 +23,12 @@ public async Task<BlogPost> GetByIdAsync(string blogPostId)
             return await session.LoadAsync<BlogPost>(blogPostId);
         }
 
-        public async Task<IEnumerable<BlogPost>> GetAllAsync(Expression<Func<BlogPost, bool>> filter = null, Expression<Func<BlogPost, object>> orderBy = null, bool descending = true)
+        public async Task<IPagedList<BlogPost>> GetAllAsync(
+            Expression<Func<BlogPost, bool>> filter = null,
+            Expression<Func<BlogPost, object>> orderBy = null,
+            bool descending = true,
+            int page = 1,
+            int pageSize = 5)
         {
             using var session = documentStore.OpenAsyncSession();
 
@@ -37,13 +42,13 @@ public async Task<IEnumerable<BlogPost>> GetAllAsync(Expression<Func<BlogPost, b
             {
                 if (descending)
                 {
-                    return await query.OrderByDescending(orderBy).ToListAsync();
+                    return await query.OrderByDescending(orderBy).ToPagedListAsync(page, pageSize);
                 }
 
-                return await query.OrderBy(orderBy).ToListAsync();
+                return await query.OrderBy(orderBy).ToPagedListAsync(page, pageSize);
             }
 
-            return await query.ToListAsync();
+            return await query.ToPagedListAsync(page, pageSize);
         }
 
         public async Task StoreAsync(BlogPost blogPost)
diff --git a/LinkDotNet.Infrastructure/Persistence/Sql/BlogPostRepository.cs b/LinkDotNet.Infrastructure/Persistence/Sql/BlogPostRepository.cs
index 11b443bb..455e2cb7 100644
--- a/LinkDotNet.Infrastructure/Persistence/Sql/BlogPostRepository.cs
+++ b/LinkDotNet.Infrastructure/Persistence/Sql/BlogPostRepository.cs
@@ -1,10 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using LinkDotNet.Domain;
 using Microsoft.EntityFrameworkCore;
+using X.PagedList;
 
 namespace LinkDotNet.Infrastructure.Persistence.Sql
 {
@@ -22,7 +22,12 @@ public async Task<BlogPost> GetByIdAsync(string blogPostId)
             return await blogPostContext.BlogPosts.Include(b => b.Tags).SingleAsync(b => b.Id == blogPostId);
         }
 
-        public async Task<IEnumerable<BlogPost>> GetAllAsync(Expression<Func<BlogPost, bool>> filter = null, Expression<Func<BlogPost, object>> orderBy = null, bool descending = true)
+        public async Task<IPagedList<BlogPost>> GetAllAsync(
+            Expression<Func<BlogPost, bool>> filter = null,
+            Expression<Func<BlogPost, object>> orderBy = null,
+            bool descending = true,
+            int page = 1,
+            int pageSize = 5)
         {
             var blogPosts = blogPostContext.BlogPosts.AsNoTracking().Include(b => b.Tags).AsQueryable();
 
@@ -35,13 +40,13 @@ public async Task<IEnumerable<BlogPost>> GetAllAsync(Expression<Func<BlogPost, b
             {
                 if (descending)
                 {
-                    return await blogPosts.OrderByDescending(orderBy).ToListAsync();
+                    return await blogPosts.OrderByDescending(orderBy).ToPagedListAsync(page, pageSize);
                 }
 
-                return await blogPosts.OrderBy(orderBy).ToListAsync();
+                return await blogPosts.OrderBy(orderBy).ToPagedListAsync(page, pageSize);
             }
 
-            return await blogPosts.ToListAsync();
+            return await blogPosts.ToPagedListAsync(page, pageSize);
         }
 
         public async Task StoreAsync(BlogPost blogPost)

From 2e70022c447f7da340a4f75982044c6a3ae650e1 Mon Sep 17 00:00:00 2001
From: Steven Giesel <stgiesel35@gmail.com>
Date: Tue, 13 Jul 2021 18:14:45 +0200
Subject: [PATCH 2/6] Corrected Pagination

---
 LinkDotNet.Blog.Web/Pages/Index.razor             |  6 +++---
 .../Shared/BlogPostNavigation.razor               | 15 ++++++---------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/LinkDotNet.Blog.Web/Pages/Index.razor b/LinkDotNet.Blog.Web/Pages/Index.razor
index 0cefb4ae..b6db063d 100644
--- a/LinkDotNet.Blog.Web/Pages/Index.razor
+++ b/LinkDotNet.Blog.Web/Pages/Index.razor
@@ -19,14 +19,14 @@
             <ShortBlogPost BlogPost="_currentPage[i]" UseAlternativeStyle="@(i % 2 != 0)"></ShortBlogPost>
         }
     </div>
-    <BlogPostNavigation CurrentPage="@_currentPage" OnPageChanged="GetPage"></BlogPostNavigation>
+    <BlogPostNavigation CurrentPage="@_currentPage" OnPageChanged="@GetPage"></BlogPostNavigation>
 </section>
 @code {
     IPagedList<BlogPost> _currentPage = new PagedList<BlogPost>(Array.Empty<BlogPost>(), 1, 1);
 
     protected override async Task OnInitializedAsync()
     {
-        _currentPage = await _repository.GetAllAsync(p => p.IsPublished, b => b.UpdatedDate, pageSize: 1);
+        _currentPage = await _repository.GetAllAsync(p => p.IsPublished, b => b.UpdatedDate, pageSize: 3);
     }
 
     private string GetAbsolutePreviewImageUrl()
@@ -48,7 +48,7 @@
 
     private async Task GetPage(int newPage)
     {
-        _currentPage = await _repository.GetAllAsync(p => p.IsPublished, b => b.UpdatedDate, pageSize: 1, page: 
+        _currentPage = await _repository.GetAllAsync(p => p.IsPublished, b => b.UpdatedDate, pageSize: 3, page: 
         newPage);
     }
 }
\ No newline at end of file
diff --git a/LinkDotNet.Blog.Web/Shared/BlogPostNavigation.razor b/LinkDotNet.Blog.Web/Shared/BlogPostNavigation.razor
index eac2f7a4..16ef475e 100644
--- a/LinkDotNet.Blog.Web/Shared/BlogPostNavigation.razor
+++ b/LinkDotNet.Blog.Web/Shared/BlogPostNavigation.razor
@@ -3,14 +3,11 @@
     <nav aria-label="Page navigation example">
         <ul class="pagination justify-content-center">
             <li class="page-item @(!CurrentPage.IsFirstPage ? string.Empty : "disabled")">
-                <a class="page-link" href="#" tabindex="-1">Previous</a>
+                <a class="page-link" href="#" tabindex="-1" @onclick="PreviousPage">Previous</a>
             </li>
-            <li class="page-item"><a class="page-link @(!CurrentPage.IsFirstPage ? string.Empty : "disabled")" 
-                                     href="#" 
-                                     @onclick="PreviousPage">(@CurrentPage.PageNumber - 1)</a></li>
-            <li class="page-item">
-                <a class="page-link @(!CurrentPage.IsLastPage ? string.Empty : "disabled")"
-                   @onclick="NextPage">
+            <li class="page-item @(!CurrentPage.IsLastPage ? string.Empty : "disabled")">
+                <a class="page-link"
+                   @onclick="NextPage"
                    href="#">Next</a>
             </li>
         </ul>
@@ -30,11 +27,11 @@
 
         private async Task PreviousPage()
         {
-            await PageHasChanged(CurrentPage.PageCount - 1);
+            await PageHasChanged(CurrentPage.PageNumber - 1);
         }
         
         private async Task NextPage()
         {
-            await PageHasChanged(CurrentPage.PageCount + 1);
+            await PageHasChanged(CurrentPage.PageNumber + 1);
         }
     }
\ No newline at end of file

From e0444ced5c795f8872b9f3bcbd89caeeb0007f46 Mon Sep 17 00:00:00 2001
From: Steven Giesel <stgiesel35@gmail.com>
Date: Tue, 13 Jul 2021 18:30:49 +0200
Subject: [PATCH 3/6] Added Tests for BlogPostNavigation

---
 .../Shared/Admin/CreateNewBlogPostTests.cs    |  1 -
 .../Web/Shared/BlogPostNavigationTests.cs     | 70 +++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 LinkDotNet.Blog.UnitTests/Web/Shared/BlogPostNavigationTests.cs

diff --git a/LinkDotNet.Blog.UnitTests/Web/Shared/Admin/CreateNewBlogPostTests.cs b/LinkDotNet.Blog.UnitTests/Web/Shared/Admin/CreateNewBlogPostTests.cs
index 0440bb26..88b68c1f 100644
--- a/LinkDotNet.Blog.UnitTests/Web/Shared/Admin/CreateNewBlogPostTests.cs
+++ b/LinkDotNet.Blog.UnitTests/Web/Shared/Admin/CreateNewBlogPostTests.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using AngleSharp.Dom;
 using Bunit;
 using FluentAssertions;
 using LinkDotNet.Blog.TestUtilities;
diff --git a/LinkDotNet.Blog.UnitTests/Web/Shared/BlogPostNavigationTests.cs b/LinkDotNet.Blog.UnitTests/Web/Shared/BlogPostNavigationTests.cs
new file mode 100644
index 00000000..0419f072
--- /dev/null
+++ b/LinkDotNet.Blog.UnitTests/Web/Shared/BlogPostNavigationTests.cs
@@ -0,0 +1,70 @@
+using Bunit;
+using FluentAssertions;
+using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Domain;
+using Moq;
+using X.PagedList;
+using Xunit;
+
+namespace LinkDotNet.Blog.UnitTests.Web.Shared
+{
+    public class BlogPostNavigationTests : TestContext
+    {
+        [Fact]
+        public void ShouldFireEventWhenGoingToNextPage()
+        {
+            var actualNewPage = 0;
+            var page = CreatePagedList(2, 3);
+            var cut = RenderComponent<BlogPostNavigation>(p => p.Add(param => param.CurrentPage, page.Object)
+                .Add(param => param.OnPageChanged, newPage => actualNewPage = newPage));
+
+            cut.Find("li:last-child a").Click();
+
+            actualNewPage.Should().Be(3);
+        }
+
+        [Fact]
+        public void ShouldFireEventWhenGoingToPreviousPage()
+        {
+            var actualNewPage = 0;
+            var page = CreatePagedList(2, 3);
+            var cut = RenderComponent<BlogPostNavigation>(p => p.Add(param => param.CurrentPage, page.Object)
+                .Add(param => param.OnPageChanged, newPage => actualNewPage = newPage));
+
+            cut.Find("li:first-child a").Click();
+
+            actualNewPage.Should().Be(1);
+        }
+
+        [Fact]
+        public void ShouldNotFireNextWhenOnLastPage()
+        {
+            var page = CreatePagedList(2, 2);
+            var cut = RenderComponent<BlogPostNavigation>(p =>
+                p.Add(param => param.CurrentPage, page.Object));
+
+            cut.Find("li:last-child").ClassList.Should().Contain("disabled");
+        }
+
+        [Fact]
+        public void ShouldNotFireNextWhenOnFirstPage()
+        {
+            var page = CreatePagedList(1, 2);
+            var cut = RenderComponent<BlogPostNavigation>(p =>
+                p.Add(param => param.CurrentPage, page.Object));
+
+            cut.Find("li:first-child").ClassList.Should().Contain("disabled");
+        }
+
+        private static Mock<IPagedList<BlogPost>> CreatePagedList(int currentPage, int pageCount)
+        {
+            var page = new Mock<IPagedList<BlogPost>>();
+            page.Setup(p => p.PageNumber).Returns(currentPage);
+            page.Setup(p => p.PageCount).Returns(pageCount);
+            page.Setup(p => p.IsFirstPage).Returns(currentPage == 1);
+            page.Setup(p => p.IsLastPage).Returns(currentPage == pageCount);
+
+            return page;
+        }
+    }
+}
\ No newline at end of file

From 223645f11d6cdaa9f9c10be818c350f53a79f747 Mon Sep 17 00:00:00 2001
From: Steven Giesel <stgiesel35@gmail.com>
Date: Tue, 13 Jul 2021 20:04:38 +0200
Subject: [PATCH 4/6] Added Tests for Pagination / Index

---
 .../SqlDatabaseTestBase.cs                    |  4 +-
 .../Web/Pages/IndexTests.cs                   | 57 +++++++++++++++++++
 LinkDotNet.Blog.Web/Pages/Index.razor         |  4 +-
 LinkDotNet.Blog.Web/Pages/SearchByTag.razor   |  5 +-
 4 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/LinkDotNet.Blog.IntegrationTests/SqlDatabaseTestBase.cs b/LinkDotNet.Blog.IntegrationTests/SqlDatabaseTestBase.cs
index 7a3fd965..7677acc2 100644
--- a/LinkDotNet.Blog.IntegrationTests/SqlDatabaseTestBase.cs
+++ b/LinkDotNet.Blog.IntegrationTests/SqlDatabaseTestBase.cs
@@ -19,9 +19,9 @@ protected SqlDatabaseTestBase()
             BlogPostRepository = new BlogPostRepository(new BlogPostContext(options));
         }
 
-        protected BlogPostRepository BlogPostRepository { get; private set; }
+        protected BlogPostRepository BlogPostRepository { get; }
 
-        protected BlogPostContext DbContext { get; private set; }
+        protected BlogPostContext DbContext { get; }
 
         public Task InitializeAsync()
         {
diff --git a/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs b/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs
index 949ef250..620aa887 100644
--- a/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs
+++ b/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs
@@ -53,6 +53,54 @@ public async Task ShouldOnlyShowPublishedPosts()
             blogPosts[0].Find(".description h1").InnerHtml.Should().Be("Published");
         }
 
+        [Fact]
+        public async Task ShouldOnlyLoadTenEntities()
+        {
+            await CreatePublishedBlogPosts(11);
+            using var ctx = new TestContext();
+            ctx.JSInterop.Mode = JSRuntimeMode.Loose;
+            ctx.Services.AddScoped<IRepository>(_ => BlogPostRepository);
+            ctx.Services.AddScoped(_ => CreateSampleAppConfiguration());
+            var cut = ctx.RenderComponent<Index>();
+
+            var blogPosts = cut.FindComponents<ShortBlogPost>();
+
+            blogPosts.Count.Should().Be(10);
+        }
+
+        [Fact]
+        public async Task ShouldLoadNextBatchOnClick()
+        {
+            await CreatePublishedBlogPosts(11);
+            using var ctx = new TestContext();
+            ctx.JSInterop.Mode = JSRuntimeMode.Loose;
+            ctx.Services.AddScoped<IRepository>(_ => BlogPostRepository);
+            ctx.Services.AddScoped(_ => CreateSampleAppConfiguration());
+            var cut = ctx.RenderComponent<Index>();
+
+            cut.FindComponent<BlogPostNavigation>().Find("li:last-child a").Click();
+
+            var blogPosts = cut.FindComponents<ShortBlogPost>();
+            blogPosts.Count.Should().Be(1);
+        }
+
+        [Fact]
+        public async Task ShouldLoadPreviousBatchOnClick()
+        {
+            await CreatePublishedBlogPosts(11);
+            using var ctx = new TestContext();
+            ctx.JSInterop.Mode = JSRuntimeMode.Loose;
+            ctx.Services.AddScoped<IRepository>(_ => BlogPostRepository);
+            ctx.Services.AddScoped(_ => CreateSampleAppConfiguration());
+            var cut = ctx.RenderComponent<Index>();
+            cut.FindComponent<BlogPostNavigation>().Find("li:last-child a").Click();
+
+            cut.FindComponent<BlogPostNavigation>().Find("li:first-child a").Click();
+
+            var blogPosts = cut.FindComponents<ShortBlogPost>();
+            blogPosts.Count.Should().Be(1);
+        }
+
         private static AppConfiguration CreateSampleAppConfiguration()
         {
             return new()
@@ -66,5 +114,14 @@ private static AppConfiguration CreateSampleAppConfiguration()
                 },
             };
         }
+
+        private async Task CreatePublishedBlogPosts(int amount)
+        {
+            for (var i = 0; i < amount; i++)
+            {
+                var blogPost = new BlogPostBuilder().IsPublished().Build();
+                await BlogPostRepository.StoreAsync(blogPost);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/LinkDotNet.Blog.Web/Pages/Index.razor b/LinkDotNet.Blog.Web/Pages/Index.razor
index b6db063d..0b8d1db7 100644
--- a/LinkDotNet.Blog.Web/Pages/Index.razor
+++ b/LinkDotNet.Blog.Web/Pages/Index.razor
@@ -26,7 +26,7 @@
 
     protected override async Task OnInitializedAsync()
     {
-        _currentPage = await _repository.GetAllAsync(p => p.IsPublished, b => b.UpdatedDate, pageSize: 3);
+        _currentPage = await _repository.GetAllAsync(p => p.IsPublished, b => b.UpdatedDate, pageSize: 10);
     }
 
     private string GetAbsolutePreviewImageUrl()
@@ -48,7 +48,7 @@
 
     private async Task GetPage(int newPage)
     {
-        _currentPage = await _repository.GetAllAsync(p => p.IsPublished, b => b.UpdatedDate, pageSize: 3, page: 
+        _currentPage = await _repository.GetAllAsync(p => p.IsPublished, b => b.UpdatedDate, pageSize: 10, page: 
         newPage);
     }
 }
\ No newline at end of file
diff --git a/LinkDotNet.Blog.Web/Pages/SearchByTag.razor b/LinkDotNet.Blog.Web/Pages/SearchByTag.razor
index 86312ad0..440148e1 100644
--- a/LinkDotNet.Blog.Web/Pages/SearchByTag.razor
+++ b/LinkDotNet.Blog.Web/Pages/SearchByTag.razor
@@ -18,6 +18,9 @@
     protected override async Task OnInitializedAsync()
     {
         Tag = Uri.UnescapeDataString(Tag);
-        _blogPosts = (await _repository.GetAllAsync(b => b.Tags.Any(t => t.Content == Tag), b => b.UpdatedDate)).ToList();
+        _blogPosts = (await _repository.GetAllAsync(
+            b => b.Tags.Any(t => t.Content == Tag), 
+            b => b.UpdatedDate))
+            .ToList();
     }
 }
\ No newline at end of file

From 3ae9b518d9b0af0684d065eca493ecfe82e192f5 Mon Sep 17 00:00:00 2001
From: Steven Giesel <stgiesel35@gmail.com>
Date: Wed, 14 Jul 2021 16:08:04 +0200
Subject: [PATCH 5/6] Fixed tests, so that they wait for the async operation

---
 .../Web/Pages/Admin/DraftBlogPostPageTests.cs             | 5 ++++-
 LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs  | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/DraftBlogPostPageTests.cs b/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/DraftBlogPostPageTests.cs
index c4333e7b..07b31488 100644
--- a/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/DraftBlogPostPageTests.cs
+++ b/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/DraftBlogPostPageTests.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Linq;
+using System.Threading.Tasks;
 using Bunit;
 using FluentAssertions;
 using LinkDotNet.Blog.TestUtilities;
@@ -23,6 +24,8 @@ public async Task ShouldOnlyShowPublishedPosts()
             ctx.JSInterop.Mode = JSRuntimeMode.Loose;
             ctx.Services.AddScoped<IRepository>(_ => BlogPostRepository);
             var cut = ctx.RenderComponent<DraftBlogPosts>();
+            cut.WaitForState(() => cut.FindAll(".blog-card").Any());
+
 
             var blogPosts = cut.FindComponents<ShortBlogPost>();
 
diff --git a/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs b/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs
index 620aa887..55e72dfb 100644
--- a/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs
+++ b/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Linq;
+using System.Threading.Tasks;
 using Bunit;
 using FluentAssertions;
 using LinkDotNet.Blog.TestUtilities;
@@ -26,6 +27,7 @@ public async Task ShouldShowAllBlogPostsWithLatestOneFirst()
             ctx.Services.AddScoped<IRepository>(_ => BlogPostRepository);
             ctx.Services.AddScoped(_ => CreateSampleAppConfiguration());
             var cut = ctx.RenderComponent<Index>();
+            cut.WaitForState(() => cut.FindAll(".blog-card").Any());
 
             var blogPosts = cut.FindComponents<ShortBlogPost>();
 
@@ -46,6 +48,7 @@ public async Task ShouldOnlyShowPublishedPosts()
             ctx.Services.AddScoped<IRepository>(_ => BlogPostRepository);
             ctx.Services.AddScoped(_ => CreateSampleAppConfiguration());
             var cut = ctx.RenderComponent<Index>();
+            cut.WaitForState(() => cut.FindAll(".blog-card").Any());
 
             var blogPosts = cut.FindComponents<ShortBlogPost>();
 
@@ -62,6 +65,7 @@ public async Task ShouldOnlyLoadTenEntities()
             ctx.Services.AddScoped<IRepository>(_ => BlogPostRepository);
             ctx.Services.AddScoped(_ => CreateSampleAppConfiguration());
             var cut = ctx.RenderComponent<Index>();
+            cut.WaitForState(() => cut.FindAll(".blog-card").Any());
 
             var blogPosts = cut.FindComponents<ShortBlogPost>();
 
@@ -80,6 +84,7 @@ public async Task ShouldLoadNextBatchOnClick()
 
             cut.FindComponent<BlogPostNavigation>().Find("li:last-child a").Click();
 
+            cut.WaitForState(() => cut.FindAll(".blog-card").Count == 1);
             var blogPosts = cut.FindComponents<ShortBlogPost>();
             blogPosts.Count.Should().Be(1);
         }
@@ -93,6 +98,7 @@ public async Task ShouldLoadPreviousBatchOnClick()
             ctx.Services.AddScoped<IRepository>(_ => BlogPostRepository);
             ctx.Services.AddScoped(_ => CreateSampleAppConfiguration());
             var cut = ctx.RenderComponent<Index>();
+            cut.WaitForState(() => cut.FindAll(".blog-card").Any());
             cut.FindComponent<BlogPostNavigation>().Find("li:last-child a").Click();
 
             cut.FindComponent<BlogPostNavigation>().Find("li:first-child a").Click();

From 4101283fe3bd6a1f0268934dd645e647adcdddd5 Mon Sep 17 00:00:00 2001
From: Steven Giesel <stgiesel35@gmail.com>
Date: Wed, 14 Jul 2021 16:14:36 +0200
Subject: [PATCH 6/6]  Fixed Tests

---
 .../Web/Pages/Admin/DraftBlogPostPageTests.cs                 | 1 -
 LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs      | 4 +++-
 .../Web/Pages/SearchByTagTests.cs                             | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/DraftBlogPostPageTests.cs b/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/DraftBlogPostPageTests.cs
index 07b31488..a6dbf2a7 100644
--- a/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/DraftBlogPostPageTests.cs
+++ b/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/DraftBlogPostPageTests.cs
@@ -26,7 +26,6 @@ public async Task ShouldOnlyShowPublishedPosts()
             var cut = ctx.RenderComponent<DraftBlogPosts>();
             cut.WaitForState(() => cut.FindAll(".blog-card").Any());
 
-
             var blogPosts = cut.FindComponents<ShortBlogPost>();
 
             blogPosts.Should().HaveCount(1);
diff --git a/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs b/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs
index 55e72dfb..fde3c653 100644
--- a/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs
+++ b/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs
@@ -100,11 +100,13 @@ public async Task ShouldLoadPreviousBatchOnClick()
             var cut = ctx.RenderComponent<Index>();
             cut.WaitForState(() => cut.FindAll(".blog-card").Any());
             cut.FindComponent<BlogPostNavigation>().Find("li:last-child a").Click();
+            cut.WaitForState(() => cut.FindAll(".blog-card").Count == 1);
 
             cut.FindComponent<BlogPostNavigation>().Find("li:first-child a").Click();
 
+            cut.WaitForState(() => cut.FindAll(".blog-card").Count > 1);
             var blogPosts = cut.FindComponents<ShortBlogPost>();
-            blogPosts.Count.Should().Be(1);
+            blogPosts.Count.Should().Be(10);
         }
 
         private static AppConfiguration CreateSampleAppConfiguration()
diff --git a/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchByTagTests.cs b/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchByTagTests.cs
index f21683c1..9aebcb7a 100644
--- a/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchByTagTests.cs
+++ b/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchByTagTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Bunit;
 using FluentAssertions;
@@ -21,6 +22,7 @@ public async Task ShouldOnlyDisplayTagsGivenByParameter()
             await AddBlogPostWithTagAsync("Tag 2");
             ctx.Services.AddScoped<IRepository>(_ => BlogPostRepository);
             var cut = ctx.RenderComponent<SearchByTag>(p => p.Add(s => s.Tag, "Tag 1"));
+            cut.WaitForState(() => cut.FindAll(".blog-card").Any());
 
             var tags = cut.FindAll(".blog-card");
 
@@ -34,6 +36,7 @@ public async Task ShouldHandleSpecialCharacters()
             await AddBlogPostWithTagAsync("C#");
             ctx.Services.AddScoped<IRepository>(_ => BlogPostRepository);
             var cut = ctx.RenderComponent<SearchByTag>(p => p.Add(s => s.Tag, Uri.EscapeDataString("C#")));
+            cut.WaitForState(() => cut.FindAll(".blog-card").Any());
 
             var tags = cut.FindAll(".blog-card");