Fixed #59 - Visit counter works with every repo now

Author: linkdotnet

src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Components/VisitCountPerPage.razor

@@ -4,7 +4,9 @@
 @using LinkDotNet.Blog.Infrastructure.Persistence
 @using LinkDotNet.Blog.Infrastructure.Persistence.Sql
 @using LinkDotNet.Blog.Web.Features.Admin.Dashboard.Services
-@inject BlogDbContext BlogDbContext
+@using X.PagedList
+@inject IRepository<BlogPost> BlogPostRepository
+@inject IRepository<UserRecord> UserRecordRepository
 
 <div class="card">
     <div class="card-header">Blog Post Visit Counts</div>
@@ -54,32 +56,35 @@
 
     protected override async Task OnInitializedAsync()
     {
-        await LoadBlogPostInformationAsync();
+        visitData = await LoadBlogPostInformationAsync();
     }
 
-    private async Task LoadBlogPostInformationAsync()
+    private async Task<List<VisitCountPageData>> LoadBlogPostInformationAsync()
     {
-        var query = from ur in BlogDbContext.UserRecords
-            where (!filter.StartDate.HasValue || ur.DateTimeUtcClicked >= filter.StartDate)
-                  && (!filter.EndDate.HasValue || ur.DateTimeUtcClicked <= filter.EndDate)
-            join bp in BlogDbContext.BlogPosts
+        var blogPosts = (await BlogPostRepository.GetAllAsync()).ToList();
+        var userRecords = (await UserRecordRepository.GetAllAsync(
+            ur => (!filter.StartDate.HasValue || ur.DateTimeUtcClicked >= filter.StartDate)
+                  && (!filter.EndDate.HasValue || ur.DateTimeUtcClicked <= filter.EndDate)))
+            .ToList();
+
+        var visitCountPage = (from ur in userRecords
+            join bp in blogPosts
                 on ur.UrlClicked.Replace("blogPost/", string.Empty) equals bp.Id
             group new { ur, bp } by new { ur.UrlClicked } into gp
             orderby gp.Count() descending
             select new VisitCountPageData
             {
-                Id = gp.FirstOrDefault().bp.Id,
-                Title = gp.FirstOrDefault().bp.Title,
-                Likes = gp.FirstOrDefault().bp.Likes,
+                Id = gp.First().bp.Id,
+                Title = gp.First().bp.Title,
+                Likes = gp.First().bp.Likes,
                 ClickCount = gp.Count()
-            };
-        visitData = await query.ToListAsync();
+            }).ToList();
+        return visitCountPage;
     }
 
     private async Task RefreshVisitCount(Filter newBeginning)
     {
         filter = newBeginning;
-        visitData = null;
-        await LoadBlogPostInformationAsync();
+        visitData = await LoadBlogPostInformationAsync();
     }
 }

tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/Dashboard/Components/VisitCountPerPageTests.cs

@@ -3,10 +3,13 @@
 using System.Threading.Tasks;
 using AngleSharp.Html.Dom;
 using AngleSharpWrappers;
-using Bunit;
 using LinkDotNet.Blog.Domain;
+using LinkDotNet.Blog.Infrastructure.Persistence;
+using LinkDotNet.Blog.Infrastructure.Persistence.Sql;
 using LinkDotNet.Blog.TestUtilities;
 using LinkDotNet.Blog.Web.Features.Admin.Dashboard.Components;
+using LinkDotNet.Blog.Web.Features.Admin.Dashboard.Services;
+using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace LinkDotNet.Blog.IntegrationTests.Web.Features.Admin.Dashboard.Components;
@@ -19,7 +22,8 @@ public async Task ShouldShowCounts()
         var blogPost = new BlogPostBuilder().WithTitle("I was clicked").WithLikes(2).Build();
         await Repository.StoreAsync(blogPost);
         using var ctx = new TestContext();
-        ctx.Services.AddScoped(_ => DbContext);
+        ctx.Services.AddScoped<IRepository<BlogPost>>(_ => new Repository<BlogPost>(DbContext));
+        ctx.Services.AddScoped<IRepository<UserRecord>>(_ => new Repository<UserRecord>(DbContext));
         await SaveBlogPostArticleClicked(blogPost.Id, 10);
 
         var cut = ctx.RenderComponent<VisitCountPerPage>();
@@ -53,20 +57,22 @@ public async Task ShouldFilterByDate()
         await DbContext.UserRecords.AddRangeAsync(new[] { clicked1, clicked2, clicked3, clicked4 });
         await DbContext.SaveChangesAsync();
         using var ctx = new TestContext();
-        ctx.Services.AddScoped(_ => DbContext);
+        ctx.ComponentFactories.Add<DateRangeSelector, FilterStubComponent>();
+        ctx.Services.AddScoped<IRepository<BlogPost>>(_ => new Repository<BlogPost>(DbContext));
+        ctx.Services.AddScoped<IRepository<UserRecord>>(_ => new Repository<UserRecord>(DbContext));
         var cut = ctx.RenderComponent<VisitCountPerPage>();
+        var filter = new Filter { StartDate = new DateTime(2019, 1, 1), EndDate = new DateTime(2020, 12, 31) };
 
-        cut.FindComponent<DateRangeSelector>().Find("#startDate").Change(new DateTime(2019, 1, 1));
-        cut.FindComponent<DateRangeSelector>().Find("#endDate").Change(new DateTime(2020, 12, 31));
+        await cut.InvokeAsync(() => cut.FindComponent<FilterStubComponent>().Instance.FireFilterChanged(filter));
 
-        cut.WaitForState(() => cut.FindAll("td").Any());
+        cut.WaitForState(() => cut.FindAll("td").Count == 3);
         var elements = cut.FindAll("td").ToList();
         elements.Count.Should().Be(3);
         var titleData = elements[0].ChildNodes.Single() as IHtmlAnchorElement;
         titleData.Should().NotBeNull();
         titleData.InnerHtml.Should().Be(blogPost1.Title);
         titleData.Href.Should().Contain($"blogPost/{blogPost1.Id}");
-        elements[1].InnerHtml.Should().Be("1");
+        cut.WaitForAssertion(() => elements[1].InnerHtml.Should().Be("1"));
     }
 
     [Fact]
@@ -87,7 +93,8 @@ public async Task ShouldShowTotalClickCount()
         await DbContext.UserRecords.AddRangeAsync(new[] { clicked1, clicked2, clicked3, clicked4 });
         await DbContext.SaveChangesAsync();
         using var ctx = new TestContext();
-        ctx.Services.AddScoped(_ => DbContext);
+        ctx.Services.AddScoped<IRepository<BlogPost>>(_ => new Repository<BlogPost>(DbContext));
+        ctx.Services.AddScoped<IRepository<UserRecord>>(_ => new Repository<UserRecord>(DbContext));
 
         var cut = ctx.RenderComponent<VisitCountPerPage>();
 
@@ -109,4 +116,12 @@ private async Task SaveBlogPostArticleClicked(string blogPostId, int count)
 
         await DbContext.SaveChangesAsync();
     }
+
+    private class FilterStubComponent : ComponentBase
+    {
+        [Parameter]
+        public EventCallback<Filter> FilterChanged { get; set; }
+
+        public void FireFilterChanged(Filter filter) => FilterChanged.InvokeAsync(filter);
+    }
 }