Don't show unpublished in archive (Fixes #56)

linkdotnet · linkdotnet · commit 0cb627b0fba4 · 2022-02-11T19:40:06.000+01:00
diff --git a/src/LinkDotNet.Blog.Web/Features/Archive/ArchivePage.razor b/src/LinkDotNet.Blog.Web/Features/Archive/ArchivePage.razor
@@ -29,7 +29,9 @@
 
     protected override async Task OnInitializedAsync()
     {
-        blogPostsPerYear = (await repository.GetAllAsync()).GroupBy(r => r.UpdatedDate.Year).ToList();
+        blogPostsPerYear = (await repository.GetAllAsync(p => p.IsPublished))
+            .GroupBy(r => r.UpdatedDate.Year)
+            .ToList();
     }
 
 }
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/SqlDatabaseTestBase.cs b/tests/LinkDotNet.Blog.IntegrationTests/SqlDatabaseTestBase.cs
@@ -2,6 +2,7 @@
 using System.Data.Common;
 using System.Threading.Tasks;
 using LinkDotNet.Blog.Domain;
+using LinkDotNet.Blog.Infrastructure.Persistence;
 using LinkDotNet.Blog.Infrastructure.Persistence.Sql;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
@@ -20,7 +21,7 @@ protected SqlDatabaseTestBase()
         Repository = new Repository<TEntity>(new BlogDbContext(options));
     }
 
-    protected Repository<TEntity> Repository { get; }
+    protected IRepository<TEntity> Repository { get; }
 
     protected BlogDbContext DbContext { get; }
 
@@ -48,4 +49,4 @@ private static DbConnection CreateInMemoryConnection()
 
         return connection;
     }
-}
+}
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/CreateNewBlogPostPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/CreateNewBlogPostPageTests.cs
@@ -21,7 +21,7 @@ public async Task ShouldSaveBlogPostOnSave()
         using var ctx = new TestContext();
         var toastService = new Mock<IToastService>();
         ctx.AddTestAuthorization().SetAuthorized("some username");
-        ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => toastService.Object);
         ctx.ComponentFactories.AddStub<UploadFile>();
         ctx.Services.AddScoped(_ => Mock.Of<IFileProcessor>());
@@ -42,7 +42,7 @@ public async Task ShouldSetContentFromFile()
         using var ctx = new TestContext();
         const string contentFromFile = "content";
         ctx.AddTestAuthorization().SetAuthorized("some username");
-        ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IToastService>());
         var args = SetupUploadFile(contentFromFile, ctx);
         var cut = ctx.RenderComponent<CreateNewBlogPost>();
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/UpdateBlogPostPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/UpdateBlogPostPageTests.cs
@@ -23,7 +23,7 @@ public async Task ShouldSaveBlogPostOnSave()
         var blogPost = new BlogPostBuilder().WithTitle("Title").WithShortDescription("Sub").Build();
         await Repository.StoreAsync(blogPost);
         ctx.AddTestAuthorization().SetAuthorized("some username");
-        ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => toastService.Object);
         ctx.ComponentFactories.AddStub<UploadFile>();
         using var cut = ctx.RenderComponent<UpdateBlogPostPage>(
@@ -43,7 +43,7 @@ public void ShouldThrowWhenNoIdProvided()
     {
         using var ctx = new TestContext();
         ctx.AddTestAuthorization().SetAuthorized("some username");
-        ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IToastService>());
 
         Action act = () => ctx.RenderComponent<UpdateBlogPostPage>(
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/DraftBlogPost/DraftBlogPostPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/DraftBlogPost/DraftBlogPostPageTests.cs
@@ -21,7 +21,7 @@ public async Task ShouldOnlyShowPublishedPosts()
         await Repository.StoreAsync(unpublishedPost);
         using var ctx = new TestContext();
         ctx.JSInterop.Mode = JSRuntimeMode.Loose;
-        ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         var cut = ctx.RenderComponent<DraftBlogPostPage>();
         cut.WaitForState(() => cut.FindAll(".blog-card").Any());
 
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Archive/ArchivePageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Archive/ArchivePageTests.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Threading.Tasks;
+using Bunit;
+using LinkDotNet.Blog.Domain;
+using LinkDotNet.Blog.TestUtilities;
+using LinkDotNet.Blog.Web.Features.Archive;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace LinkDotNet.Blog.IntegrationTests.Web.Features.Archive;
+
+public class ArchivePageTests : SqlDatabaseTestBase<BlogPost>
+{
+    [Fact]
+    public async Task ShouldDisplayAllBlogPosts()
+    {
+        using var ctx = new TestContext();
+        ctx.Services.AddScoped(_ => Repository);
+        await Repository.StoreAsync(CreateBlogPost(new DateTime(2021, 1, 1), "Blog Post 1"));
+        await Repository.StoreAsync(CreateBlogPost(new DateTime(2021, 2, 1), "Blog Post 2"));
+        await Repository.StoreAsync(CreateBlogPost(new DateTime(2022, 1, 1), "Blog Post 3"));
+
+        var cut = ctx.RenderComponent<ArchivePage>();
+
+        cut.WaitForElements("h2");
+        var yearHeader = cut.FindAll("h2");
+        yearHeader.Should().HaveCount(2);
+        yearHeader[0].TextContent.Should().Be("2022");
+        yearHeader[1].TextContent.Should().Be("2021");
+        var entries = cut.FindAll("li");
+        entries.Should().HaveCount(3);
+        entries[0].TextContent.Should().Be("Blog Post 3");
+        entries[1].TextContent.Should().Be("Blog Post 2");
+        entries[2].TextContent.Should().Be("Blog Post 1");
+    }
+
+    [Fact]
+    public async Task ShouldOnlyShowPublishedBlogPosts()
+    {
+        using var ctx = new TestContext();
+        ctx.Services.AddScoped(_ => Repository);
+        var publishedBlogPost = new BlogPostBuilder().WithUpdatedDate(new DateTime(2022, 1, 1)).IsPublished().Build();
+        var unPublishedBlogPost = new BlogPostBuilder().WithUpdatedDate(new DateTime(2022, 1, 1)).IsPublished(false).Build();
+        await Repository.StoreAsync(publishedBlogPost);
+        await Repository.StoreAsync(unPublishedBlogPost);
+
+        var cut = ctx.RenderComponent<ArchivePage>();
+
+        cut.FindAll("h2").Should().HaveCount(1);
+    }
+
+    private static BlogPost CreateBlogPost(DateTime date, string title)
+    {
+        return new BlogPostBuilder()
+            .WithTitle(title)
+            .WithUpdatedDate(date)
+            .Build();
+    }
+}
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Home/IndexTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Home/IndexTests.cs
@@ -167,7 +167,7 @@ private async Task CreatePublishedBlogPosts(int amount)
 
     private void RegisterComponents(TestContextBase ctx)
     {
-        ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => CreateSampleAppConfiguration());
         ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
     }
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Search/SearchPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Search/SearchPageTests.cs
@@ -21,7 +21,7 @@ public async Task ShouldFindBlogPostWhenTitleMatches()
         await Repository.StoreAsync(blogPost1);
         await Repository.StoreAsync(blogPost2);
         using var ctx = new TestContext();
-        ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
 
         var cut = ctx.RenderComponent<SearchPage>(p => p.Add(s => s.SearchTerm, "Title 1"));
@@ -40,7 +40,7 @@ public async Task ShouldFindBlogPostWhenTagMatches()
         await Repository.StoreAsync(blogPost1);
         await Repository.StoreAsync(blogPost2);
         using var ctx = new TestContext();
-        ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
 
         var cut = ctx.RenderComponent<SearchPage>(p => p.Add(s => s.SearchTerm, "Cat"));
@@ -57,7 +57,7 @@ public async Task ShouldUnescapeQuery()
         var blogPost1 = new BlogPostBuilder().WithTitle("Title 1").Build();
         await Repository.StoreAsync(blogPost1);
         using var ctx = new TestContext();
-        ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
 
         var cut = ctx.RenderComponent<SearchPage>(p => p.Add(s => s.SearchTerm, "Title%201"));
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/SearchByTag/SearchByTagPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/SearchByTag/SearchByTagPageTests.cs
@@ -22,7 +22,7 @@ public async Task ShouldOnlyDisplayTagsGivenByParameter()
         await AddBlogPostWithTagAsync("Tag 1");
         await AddBlogPostWithTagAsync("Tag 1");
         await AddBlogPostWithTagAsync("Tag 2");
-        ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
         var cut = ctx.RenderComponent<SearchByTagPage>(p => p.Add(s => s.Tag, "Tag 1"));
         cut.WaitForState(() => cut.FindAll(".blog-card").Any());
@@ -37,7 +37,7 @@ public async Task ShouldHandleSpecialCharacters()
     {
         using var ctx = new TestContext();
         await AddBlogPostWithTagAsync("C#");
-        ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
         var cut = ctx.RenderComponent<SearchByTagPage>(p => p.Add(s => s.Tag, Uri.EscapeDataString("C#")));
         cut.WaitForState(() => cut.FindAll(".blog-card").Any());
@@ -51,7 +51,7 @@ public async Task ShouldHandleSpecialCharacters()
     public void ShouldSetTitleToTag()
     {
         using var ctx = new TestContext();
-        ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
         ctx.ComponentFactories.AddStub<PageTitle>();
 
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/ShowBlogPost/ShowBlogPostPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/ShowBlogPost/ShowBlogPostPageTests.cs
@@ -80,7 +80,7 @@ public async Task ShouldSetTagsWhenAvailable()
 
     private void RegisterComponents(TestContextBase ctx, ILocalStorageService localStorageService = null)
     {
-        ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => localStorageService ?? Mock.Of<ILocalStorageService>());
         ctx.Services.AddScoped(_ => Mock.Of<IToastService>());
         ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Skills/SkillTableTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Skills/SkillTableTests.cs
@@ -19,7 +19,7 @@ public async Task ShouldDeleteItem()
         var skill = new SkillBuilder().WithSkillName("C#").Build();
         using var ctx = new TestContext();
         await Repository.StoreAsync(skill);
-        ctx.Services.AddScoped<IRepository<Skill>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IToastService>());
         var cut = ctx.RenderComponent<SkillTable>(p =>
             p.Add(s => s.IsAuthenticated, true));
@@ -36,7 +36,7 @@ public async Task ShouldDeleteItem()
     public async Task ShouldAddSkill()
     {
         using var ctx = new TestContext();
-        ctx.Services.AddScoped<IRepository<Skill>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IToastService>());
         var cut = ctx.RenderComponent<SkillTable>(p =>
             p.Add(s => s.IsAuthenticated, true));
@@ -65,7 +65,7 @@ public async Task ShouldNotAllowToEditSkillTagsWhenNotAdmin()
         using var ctx = new TestContext();
         var skill = new SkillBuilder().Build();
         await Repository.StoreAsync(skill);
-        ctx.Services.AddScoped<IRepository<Skill>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IToastService>());
 
         var cut = ctx.RenderComponent<SkillTable>(p =>
@@ -82,7 +82,7 @@ public async Task ShouldUpdateProficiencyWhenSkillTagDragged()
         var skill = new SkillBuilder().WithProficiencyLevel(ProficiencyLevel.Familiar).Build();
         await DbContext.AddAsync(skill);
         await DbContext.SaveChangesAsync();
-        ctx.Services.AddScoped<IRepository<Skill>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IToastService>());
         var cut = ctx.RenderComponent<SkillTable>(p =>
             p.Add(s => s.IsAuthenticated, true));
@@ -102,7 +102,7 @@ public async Task ShouldStayOnSameProficiencyWhenDroppedOnSameProficiencyLevel()
         var skill = new SkillBuilder().WithProficiencyLevel(ProficiencyLevel.Familiar).Build();
         await DbContext.AddAsync(skill);
         await DbContext.SaveChangesAsync();
-        ctx.Services.AddScoped<IRepository<Skill>>(_ => Repository);
+        ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IToastService>());
         var cut = ctx.RenderComponent<SkillTable>(p =>
             p.Add(s => s.IsAuthenticated, true));
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Archive/ArchivePageTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Archive/ArchivePageTests.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using Bunit;
+using LinkDotNet.Blog.Domain;
+using LinkDotNet.Blog.Infrastructure.Persistence;
+using LinkDotNet.Blog.Web.Features.Archive;
+using LinkDotNet.Blog.Web.Features.Components;
+using Microsoft.Extensions.DependencyInjection;
+using X.PagedList;
+
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Archive;
+
+public class ArchivePageTests : TestContext
+{
+    [Fact]
+    public void ShouldShowLoading()
+    {
+        var repository = new Mock<IRepository<BlogPost>>();
+        Services.AddScoped(_ => repository.Object);
+        repository.Setup(r => r.GetAllAsync(
+                It.IsAny<Expression<Func<BlogPost, bool>>>(),
+                It.IsAny<Expression<Func<BlogPost, object>>>(),
+                It.IsAny<bool>(),
+                It.IsAny<int>(),
+                It.IsAny<int>()))
+            .Returns(async () =>
+            {
+                await Task.Delay(250);
+                return new PagedList<BlogPost>(Array.Empty<BlogPost>(), 1, 1);
+            });
+
+        var cut = RenderComponent<ArchivePage>();
+
+        cut.FindComponents<Loading>().Count.Should().Be(1);
+    }
+}
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Archive/ArchiveTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Archive/ArchiveTests.cs

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,9 @@`
`29`	`29`
`30`	`30`	`protected override async Task OnInitializedAsync()`
`31`	`31`	`{`
`32`		`- blogPostsPerYear = (await repository.GetAllAsync()).GroupBy(r => r.UpdatedDate.Year).ToList();`
	`32`	`+ blogPostsPerYear = (await repository.GetAllAsync(p => p.IsPublished))`
	`33`	`+ .GroupBy(r => r.UpdatedDate.Year)`
	`34`	`+ .ToList();`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ private async Task CreatePublishedBlogPosts(int amount)`
`167`	`167`
`168`	`168`	`private void RegisterComponents(TestContextBase ctx)`
`169`	`169`	`{`
`170`		`- ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);`
	`170`	`+ ctx.Services.AddScoped(_ => Repository);`
`171`	`171`	`ctx.Services.AddScoped(_ => CreateSampleAppConfiguration());`
`172`	`172`	`ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());`
`173`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public async Task ShouldSetTagsWhenAvailable()`
`80`	`80`
`81`	`81`	`private void RegisterComponents(TestContextBase ctx, ILocalStorageService localStorageService = null)`
`82`	`82`	`{`
`83`		`- ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);`
	`83`	`+ ctx.Services.AddScoped(_ => Repository);`
`84`	`84`	`ctx.Services.AddScoped(_ => localStorageService ?? Mock.Of<ILocalStorageService>());`
`85`	`85`	`ctx.Services.AddScoped(_ => Mock.Of<IToastService>());`
`86`	`86`	`ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());`