Added analytics in backend

linkdotnet · linkdotnet · commit fa795705b276 · 2021-09-05T11:39:33.000+02:00
diff --git a/LinkDotNet.Blog.Web/Pages/AboutMe.razor b/LinkDotNet.Blog.Web/Pages/AboutMe.razor
@@ -2,6 +2,7 @@
 @using LinkDotNet.Blog.Web.Shared.Skills
 @inject AppConfiguration appConfiguration
 @inject AuthenticationStateProvider authenticationStateProvider
+@inject IUserRecordService userRecordService
 <OgData Title="@("About Me - " + appConfiguration.ProfileInformation.Name)"
         Description="@("About Me," + appConfiguration.ProfileInformation.Name)"
         Keywords="@appConfiguration.ProfileInformation.Name"
@@ -34,6 +35,7 @@
 
     protected override async Task OnInitializedAsync()
     {
+        await userRecordService.StoreUserRecordAsync();
         var userIdentity = (await authenticationStateProvider.GetAuthenticationStateAsync()).User.Identity;
         if (userIdentity != null)
         {
diff --git a/LinkDotNet.Blog.Web/Pages/Admin/Dashboard.razor b/LinkDotNet.Blog.Web/Pages/Admin/Dashboard.razor
@@ -0,0 +1,16 @@
+﻿@page "/dashboard"
+@attribute [Authorize]
+
+<div class="page">
+    <h3>Dashboard</h3>
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-auto">
+                <div class="card  px-3 py-3">
+                    <h5>Total amount of posts: </h5>
+                    <h5 style="text-align: center"> 12 </h5>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/LinkDotNet.Blog.Web/Pages/BlogPostPage.razor b/LinkDotNet.Blog.Web/Pages/BlogPostPage.razor
@@ -6,6 +6,7 @@
 @using Toolbelt.Blazor.HeadElement
 @inject IRepository<BlogPost> blogPostRepository
 @inject IJSRuntime jsRuntime
+@inject IUserRecordService userRecordService
 @inherits MarkdownComponentBase
 
 <div class="page">
@@ -55,6 +56,7 @@
 
     protected override async Task OnInitializedAsync()
     {
+        await userRecordService.StoreUserRecordAsync();
         BlogPost = await blogPostRepository.GetByIdAsync(BlogPostId);
     }
 
diff --git a/LinkDotNet.Blog.Web/Pages/Index.razor b/LinkDotNet.Blog.Web/Pages/Index.razor
@@ -6,6 +6,7 @@
 @inject IRepository<BlogPost> blogPostRepository
 @inject AppConfiguration appConfiguration
 @inject NavigationManager navigationManager
+@inject IUserRecordService userRecordService
 
 <OgData Title="@(Markdown.ToPlainText(appConfiguration.BlogName))" 
         AbsolutePreviewImageUrl="@GetAbsolutePreviewImageUrl()"
@@ -34,6 +35,7 @@
 
     protected override async Task OnInitializedAsync()
     {
+        await userRecordService.StoreUserRecordAsync();
         currentPage = await blogPostRepository.GetAllAsync(
             p => p.IsPublished,
             b => b.UpdatedDate,
diff --git a/LinkDotNet.Blog.Web/Pages/Search.razor b/LinkDotNet.Blog.Web/Pages/Search.razor
@@ -2,6 +2,7 @@
 @using LinkDotNet.Infrastructure.Persistence
 @using LinkDotNet.Domain
 @inject IRepository<BlogPost> blogPostRepository
+@inject IUserRecordService userRecordService
 
 <div class="page">
     <h3>Results for @SearchTerm</h3>
@@ -21,6 +22,7 @@
 
     protected override async Task OnInitializedAsync()
     {
+        await userRecordService.StoreUserRecordAsync();
         var term = Uri.UnescapeDataString(SearchTerm);
         blogPosts = (await blogPostRepository.GetAllAsync(t => t.IsPublished && (t.Title.Contains(term)
             || t.Tags.Any(tag => tag.Content == term)),
diff --git a/LinkDotNet.Blog.Web/Pages/SearchByTag.razor b/LinkDotNet.Blog.Web/Pages/SearchByTag.razor
@@ -3,6 +3,7 @@
 @using LinkDotNet.Infrastructure.Persistence
 @using Toolbelt.Blazor.HeadElement
 @inject IRepository<BlogPost> blogPostRepository
+@inject IUserRecordService userRecordService
 
 <Title>Search for tag: @Tag</Title>
 
@@ -21,6 +22,7 @@
     IList<BlogPost> blogPosts = new List<BlogPost>();
     protected override async Task OnInitializedAsync()
     {
+        await userRecordService.StoreUserRecordAsync();
         Tag = Uri.UnescapeDataString(Tag);
         blogPosts = (await blogPostRepository.GetAllAsync(
             b => b.Tags.Any(t => t.Content == Tag), 
diff --git a/LinkDotNet.Blog.Web/Shared/AccessControl.razor b/LinkDotNet.Blog.Web/Shared/AccessControl.razor
@@ -10,6 +10,9 @@
                 <li><a class="dropdown-item" href="create">Create new</a></li>
                 <li><a class="dropdown-item" href="draft">Show drafts</a></li>
                 <li><hr class="dropdown-divider"></li>
+                <li><h6 class="dropdown-header">Analytics</h6></li>
+                <li><a class="dropdown-item" href="dashboard">Dashboard</a></li>
+                <li><hr class="dropdown-divider"></li>
                 <li><a class="dropdown-item disabled" href="#">Version 1.7</a></li>
             </ul>
         </li>
diff --git a/LinkDotNet.Blog.Web/Shared/NavMenu.razor b/LinkDotNet.Blog.Web/Shared/NavMenu.razor
@@ -3,7 +3,7 @@
 
 <nav class="navbar navbar-expand-lg position-absolute navbar-background inverted-colors navbar-dark" style="width: 100%">
     <div class="container-fluid">
-        <a class="nav-brand barcode ms-5" href="#">@configuration.BlogName</a>
+        <a class="nav-brand barcode ms-5" href="/">@configuration.BlogName</a>
         <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
         </button>
diff --git a/LinkDotNet.Blog.Web/Shared/UserRecordService.cs b/LinkDotNet.Blog.Web/Shared/UserRecordService.cs
@@ -0,0 +1,46 @@
+﻿using System;
+using System.Threading.Tasks;
+using LinkDotNet.Domain;
+using LinkDotNet.Infrastructure.Persistence;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Http;
+
+namespace LinkDotNet.Blog.Web.Shared
+{
+    public interface IUserRecordService
+    {
+        Task StoreUserRecordAsync();
+    }
+
+    public class UserRecordService : IUserRecordService
+    {
+        private readonly IRepository<UserRecord> userRecordRepository;
+        private readonly IHttpContextAccessor httpContextAccessor;
+        private readonly NavigationManager navigationManager;
+
+        public UserRecordService(
+            IRepository<UserRecord> userRecordRepository,
+            IHttpContextAccessor httpContextAccessor,
+            NavigationManager navigationManager)
+        {
+            this.userRecordRepository = userRecordRepository;
+            this.httpContextAccessor = httpContextAccessor;
+            this.navigationManager = navigationManager;
+        }
+
+        public async Task StoreUserRecordAsync()
+        {
+            var httpContext = httpContextAccessor.HttpContext;
+            var ipHash = httpContext.Connection.RemoteIpAddress?.GetHashCode() ?? 0;
+
+            var record = new UserRecord
+            {
+                IpHash = ipHash,
+                DateTimeUtcClicked = DateTime.UtcNow,
+                UrlClicked = navigationManager.ToBaseRelativePath(navigationManager.Uri),
+            };
+
+            await userRecordRepository.StoreAsync(record);
+        }
+    }
+}
diff --git a/LinkDotNet.Blog.Web/Startup.cs b/LinkDotNet.Blog.Web/Startup.cs
@@ -62,6 +62,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddBlazoredLocalStorage();
             services.AddHeadElementHelper();
             services.AddSingleton<ISortOrderCalculator, SortOrderCalculator>();
+            services.AddScoped<IUserRecordService, UserRecordService>();
         }
 
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
diff --git a/LinkDotNet.Domain/UserRecord.cs b/LinkDotNet.Domain/UserRecord.cs
@@ -0,0 +1,13 @@
+﻿using System;
+
+namespace LinkDotNet.Domain
+{
+    public class UserRecord : Entity
+    {
+        public int IpHash { get; set; }
+
+        public DateTime DateTimeUtcClicked { get; set; }
+
+        public string UrlClicked { get; set; }
+    }
+}
diff --git a/LinkDotNet.Infrastructure/Persistence/Sql/BlogDbContext.cs b/LinkDotNet.Infrastructure/Persistence/Sql/BlogDbContext.cs
@@ -20,12 +20,15 @@ public BlogDbContext(DbContextOptions options)
 
         public DbSet<Skill> Skills { get; set; }
 
+        public DbSet<UserRecord> UserRecords { get; set; }
+
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.ApplyConfiguration(new BlogPostConfiguration());
             modelBuilder.ApplyConfiguration(new TagsConfiguration());
             modelBuilder.ApplyConfiguration(new ProfileInformationEntryConfiguration());
             modelBuilder.ApplyConfiguration(new SkillConfiguration());
+            modelBuilder.ApplyConfiguration(new UserRecordConfiguration());
         }
     }
 }
diff --git a/LinkDotNet.Infrastructure/Persistence/Sql/Mapping/UserRecordConfiguration.cs b/LinkDotNet.Infrastructure/Persistence/Sql/Mapping/UserRecordConfiguration.cs
@@ -0,0 +1,15 @@
+﻿using LinkDotNet.Domain;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace LinkDotNet.Infrastructure.Persistence.Sql.Mapping
+{
+    public class UserRecordConfiguration : IEntityTypeConfiguration<UserRecord>
+    {
+        public void Configure(EntityTypeBuilder<UserRecord> builder)
+        {
+            builder.HasKey(s => s.Id);
+            builder.Property(s => s.Id).ValueGeneratedOnAdd();
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`@using LinkDotNet.Blog.Web.Shared.Skills`
`3`	`3`	`@inject AppConfiguration appConfiguration`
`4`	`4`	`@inject AuthenticationStateProvider authenticationStateProvider`
	`5`	`+@inject IUserRecordService userRecordService`
`5`	`6`	`<OgData Title="@("About Me - " + appConfiguration.ProfileInformation.Name)"`
`6`	`7`	`Description="@("About Me," + appConfiguration.ProfileInformation.Name)"`
`7`	`8`	`Keywords="@appConfiguration.ProfileInformation.Name"`
`@@ -34,6 +35,7 @@`
`34`	`35`
`35`	`36`	`protected override async Task OnInitializedAsync()`
`36`	`37`	`{`
	`38`	`+ await userRecordService.StoreUserRecordAsync();`
`37`	`39`	`var userIdentity = (await authenticationStateProvider.GetAuthenticationStateAsync()).User.Identity;`
`38`	`40`	`if (userIdentity != null)`
`39`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`@using Toolbelt.Blazor.HeadElement`
`7`	`7`	`@inject IRepository<BlogPost> blogPostRepository`
`8`	`8`	`@inject IJSRuntime jsRuntime`
	`9`	`+@inject IUserRecordService userRecordService`
`9`	`10`	`@inherits MarkdownComponentBase`
`10`	`11`
`11`	`12`	`<div class="page">`
`@@ -55,6 +56,7 @@`
`55`	`56`
`56`	`57`	`protected override async Task OnInitializedAsync()`
`57`	`58`	`{`
	`59`	`+ await userRecordService.StoreUserRecordAsync();`
`58`	`60`	`BlogPost = await blogPostRepository.GetByIdAsync(BlogPostId);`
`59`	`61`	`}`
`60`	`62`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ public void ConfigureServices(IServiceCollection services)`
`62`	`62`	`services.AddBlazoredLocalStorage();`
`63`	`63`	`services.AddHeadElementHelper();`
`64`	`64`	`services.AddSingleton<ISortOrderCalculator, SortOrderCalculator>();`
	`65`	`+ services.AddScoped<IUserRecordService, UserRecordService>();`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`