Use DateOnly instead of DateTime

linkdotnet · linkdotnet · commit b2ca6ea3d8d8 · 2023-02-04T17:14:43.000+01:00
diff --git a/src/LinkDotNet.Blog.Domain/UserRecord.cs b/src/LinkDotNet.Blog.Domain/UserRecord.cs
@@ -6,7 +6,7 @@ public class UserRecord : Entity
 {
     public int UserIdentifierHash { get; set; }
 
-    public DateTime DateTimeUtcClicked { get; set; }
+    public DateOnly DateClicked { get; set; }
 
     public string UrlClicked { get; set; }
 }
diff --git a/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Components/DateRangeSelector.razor b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Components/DateRangeSelector.razor
@@ -19,13 +19,13 @@
 
     private async Task StartDateChanged(ChangeEventArgs args)
     {
-        filter.StartDate = args.Value is string { Length: >0 } dateTime ? DateTime.Parse(dateTime) : null;
+        filter.StartDate = args.Value is string { Length: >0 } dateTime ? DateOnly.Parse(dateTime) : null;
         await ApplyFilters();
     }
 
     private async Task EndDateChanged(ChangeEventArgs args)
     {
-        filter.EndDate = args.Value is string { Length: >0 } dateTime ? DateTime.Parse(dateTime) : null;
+        filter.EndDate = args.Value is string { Length: >0 } dateTime ? DateOnly.Parse(dateTime) : null;
         await ApplyFilters();
     }
-}
+}
diff --git a/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Components/VisitCountPerPage.razor b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Components/VisitCountPerPage.razor
@@ -65,8 +65,8 @@
 
         var userRecordsTask = UserRecordRepository.GetAllByProjectionAsync(
             s => s.UrlClicked,
-            ur => (!filter.StartDate.HasValue || ur.DateTimeUtcClicked >= filter.StartDate)
-                  && (!filter.EndDate.HasValue || ur.DateTimeUtcClicked <= filter.EndDate));
+            ur => (!filter.StartDate.HasValue || ur.DateClicked >= filter.StartDate)
+                  && (!filter.EndDate.HasValue || ur.DateClicked <= filter.EndDate));
 
         var blogPosts = await blogPostsTask;
         var userRecords = await userRecordsTask;
diff --git a/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/DashboardService.cs b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/DashboardService.cs
@@ -20,16 +20,16 @@ public async Task<DashboardData> GetDashboardDataAsync()
     {
         var records = await userRecordRepository.GetAllAsync();
         var users = records.GroupBy(r => r.UserIdentifierHash).Count();
-        var thirtyDaysAgo = DateTime.UtcNow.AddDays(-30).Date;
+        var thirtyDaysAgo = DateOnly.FromDateTime(DateTime.UtcNow.AddDays(-30));
         var users30Days = records
-            .Where(r => r.DateTimeUtcClicked >= thirtyDaysAgo)
+            .Where(r => r.DateClicked >= thirtyDaysAgo)
             .GroupBy(r => r.UserIdentifierHash).Count();
 
         var clicks = records.Count;
-        var clicks30Days = records.Count(r => r.DateTimeUtcClicked >= thirtyDaysAgo);
+        var clicks30Days = records.Count(r => r.DateClicked >= thirtyDaysAgo);
 
         var aboutMeClicks = records.Count(r => r.UrlClicked.Contains("AboutMe"));
-        var aboutMeClicksLast30Days = records.Count(r => r.UrlClicked.Contains("AboutMe") && r.DateTimeUtcClicked >= thirtyDaysAgo);
+        var aboutMeClicksLast30Days = records.Count(r => r.UrlClicked.Contains("AboutMe") && r.DateClicked >= thirtyDaysAgo);
 
         return new DashboardData
         {
@@ -41,4 +41,4 @@ public async Task<DashboardData> GetDashboardDataAsync()
             AboutMeClicksLast30Days = aboutMeClicksLast30Days,
         };
     }
-}
+}
diff --git a/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/Filter.cs b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/Filter.cs
@@ -4,7 +4,7 @@ namespace LinkDotNet.Blog.Web.Features.Admin.Dashboard.Services;
 
 public sealed class Filter
 {
-    public DateTime? StartDate { get; set; }
+    public DateOnly? StartDate { get; set; }
 
-    public DateTime? EndDate { get; set; }
-}
+    public DateOnly? EndDate { get; set; }
+}
diff --git a/src/LinkDotNet.Blog.Web/Features/Services/UserRecordService.cs b/src/LinkDotNet.Blog.Web/Features/Services/UserRecordService.cs
@@ -53,7 +53,7 @@ private async ValueTask GetAndStoreUserRecordAsync()
         var record = new UserRecord
         {
             UserIdentifierHash = identifierHash,
-            DateTimeUtcClicked = DateTime.UtcNow,
+            DateClicked = DateOnly.FromDateTime(DateTime.UtcNow),
             UrlClicked = url,
         };
 
diff --git a/src/LinkDotNet.Blog.Web/LinkDotNet.Blog.Web.csproj b/src/LinkDotNet.Blog.Web/LinkDotNet.Blog.Web.csproj
@@ -7,12 +7,13 @@
     <ItemGroup>
         <PackageReference Include="Blazored.Toast" Version="4.0.0" />
         <PackageReference Include="BuildBundlerMinifier" Version="3.2.449" PrivateAssets="all" />
+		<PackageReference Include="ErikEJ.EntityFrameworkCore.SqlServer.DateOnlyTimeOnly" Version="7.0.1" />
         <PackageReference Include="GitInfo" Version="2.3.0" PrivateAssets="all" />
         <PackageReference Include="Markdig" Version="0.30.4" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.2" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.2" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.2" />
-        <PackageReference Include="System.ServiceModel.Syndication" Version="7.0.0" />
+		<PackageReference Include="System.ServiceModel.Syndication" Version="7.0.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/LinkDotNet.Blog.Web/RegistrationExtensions/SqlRegistrationExtensions.cs b/src/LinkDotNet.Blog.Web/RegistrationExtensions/SqlRegistrationExtensions.cs
@@ -16,7 +16,7 @@ public static void UseSqlAsStorageProvider(this IServiceCollection services)
         {
             var configuration = s.GetRequiredService<AppConfiguration>();
             var connectionString = configuration.ConnectionString;
-            builder.UseSqlServer(connectionString)
+            builder.UseSqlServer(connectionString, x => x.UseDateOnlyTimeOnly())
 #if DEBUG
                 .EnableDetailedErrors()
 #endif
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/Dashboard/Components/VisitCountPerPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/Dashboard/Components/VisitCountPerPageTests.cs
@@ -46,20 +46,20 @@ public async Task ShouldFilterByDate()
         await Repository.StoreAsync(blogPost1);
         await Repository.StoreAsync(blogPost2);
         var clicked1 = new UserRecord
-        { UrlClicked = $"blogPost/{blogPost1.Id}", DateTimeUtcClicked = new DateTime(2020, 1, 1) };
+        { UrlClicked = $"blogPost/{blogPost1.Id}", DateClicked = new DateOnly(2020, 1, 1) };
         var clicked2 = new UserRecord
-        { UrlClicked = $"blogPost/{blogPost1.Id}", DateTimeUtcClicked = DateTime.MinValue };
+        { UrlClicked = $"blogPost/{blogPost1.Id}", DateClicked = DateOnly.MinValue };
         var clicked3 = new UserRecord
-        { UrlClicked = $"blogPost/{blogPost2.Id}", DateTimeUtcClicked = DateTime.MinValue };
+        { UrlClicked = $"blogPost/{blogPost2.Id}", DateClicked = DateOnly.MinValue };
         var clicked4 = new UserRecord
-        { UrlClicked = $"blogPost/{blogPost1.Id}", DateTimeUtcClicked = new DateTime(2021, 1, 1) };
+        { UrlClicked = $"blogPost/{blogPost1.Id}", DateClicked = new DateOnly(2021, 1, 1) };
         await DbContext.UserRecords.AddRangeAsync(new[] { clicked1, clicked2, clicked3, clicked4 });
         await DbContext.SaveChangesAsync();
         using var ctx = new TestContext();
         ctx.ComponentFactories.Add<DateRangeSelector, FilterStubComponent>();
         RegisterRepositories(ctx);
         var cut = ctx.RenderComponent<VisitCountPerPage>();
-        var filter = new Filter { StartDate = new DateTime(2019, 1, 1), EndDate = new DateTime(2020, 12, 31) };
+        var filter = new Filter { StartDate = new DateOnly(2019, 1, 1), EndDate = new DateOnly(2020, 12, 31) };
 
         await cut.InvokeAsync(() => cut.FindComponent<FilterStubComponent>().Instance.FireFilterChanged(filter));
 
@@ -81,13 +81,13 @@ public async Task ShouldShowTotalClickCount()
         await Repository.StoreAsync(blogPost1);
         await Repository.StoreAsync(blogPost2);
         var clicked1 = new UserRecord
-            { UrlClicked = $"blogPost/{blogPost1.Id}", DateTimeUtcClicked = new DateTime(2020, 1, 1) };
+            { UrlClicked = $"blogPost/{blogPost1.Id}", DateClicked = new DateOnly(2020, 1, 1) };
         var clicked2 = new UserRecord
-            { UrlClicked = $"blogPost/{blogPost1.Id}", DateTimeUtcClicked = DateTime.MinValue };
+            { UrlClicked = $"blogPost/{blogPost1.Id}", DateClicked = DateOnly.MinValue };
         var clicked3 = new UserRecord
-            { UrlClicked = $"blogPost/{blogPost2.Id}", DateTimeUtcClicked = DateTime.MinValue };
+            { UrlClicked = $"blogPost/{blogPost2.Id}", DateClicked = DateOnly.MinValue };
         var clicked4 = new UserRecord
-            { UrlClicked = $"blogPost/{blogPost1.Id}", DateTimeUtcClicked = new DateTime(2021, 1, 1) };
+            { UrlClicked = $"blogPost/{blogPost1.Id}", DateClicked = new DateOnly(2021, 1, 1) };
         await DbContext.UserRecords.AddRangeAsync(new[] { clicked1, clicked2, clicked3, clicked4 });
         await DbContext.SaveChangesAsync();
         using var ctx = new TestContext();
@@ -127,4 +127,4 @@ private class FilterStubComponent : ComponentBase
 
         public void FireFilterChanged(Filter filter) => FilterChanged.InvokeAsync(filter);
     }
-}
+}
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/Dashboard/Service/DashboardServiceTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/Dashboard/Service/DashboardServiceTests.cs
@@ -20,7 +20,7 @@ public async Task ShouldGetTotalUsers()
         var record1 = new UserRecord
         {
             UserIdentifierHash = 2,
-            DateTimeUtcClicked = DateTime.UtcNow,
+            DateClicked = DateOnly.FromDateTime(DateTime.UtcNow),
             UrlClicked = string.Empty,
         };
         var record2 = new UserRecord
@@ -48,7 +48,7 @@ public async Task ShouldGetTotalClicks()
     {
         var record1 = new UserRecord
         {
-            DateTimeUtcClicked = DateTime.UtcNow,
+            DateClicked = DateOnly.FromDateTime(DateTime.UtcNow),
             UrlClicked = "index",
         };
         var record2 = new UserRecord
@@ -74,7 +74,7 @@ public async Task ShouldGetAboutMeClicks()
     {
         var record1 = new UserRecord
         {
-            DateTimeUtcClicked = DateTime.UtcNow,
+            DateClicked = DateOnly.FromDateTime(DateTime.UtcNow),
             UrlClicked = "AboutMe",
         };
         var record2 = new UserRecord
@@ -94,4 +94,4 @@ public async Task ShouldGetAboutMeClicks()
         data.TotalAboutMeClicks.Should().Be(2);
         data.AboutMeClicksLast30Days.Should().Be(1);
     }
-}
+}
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Dashboard/Components/DateRangeSelectorTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Dashboard/Components/DateRangeSelectorTests.cs
@@ -18,7 +18,7 @@ public void ShouldSetBeginDateWhenSet()
         cut.Find("#startDate").Change(new DateTime(2020, 1, 1));
 
         filter.Should().NotBeNull();
-        filter.StartDate.Should().Be(new DateTime(2020, 1, 1));
+        filter.StartDate.Should().Be(new DateOnly(2020, 1, 1));
         filter.EndDate.Should().BeNull();
     }
 
@@ -34,7 +34,7 @@ public void ShouldSetEndDateWhenSet()
         cut.Find("#endDate").Change(new DateTime(2020, 1, 1));
 
         filter.Should().NotBeNull();
-        filter.EndDate.Should().Be(new DateTime(2020, 1, 1));
+        filter.EndDate.Should().Be(new DateOnly(2020, 1, 1));
         filter.StartDate.Should().BeNull();
     }
 
@@ -55,4 +55,4 @@ public void ShouldReset()
         filter.StartDate.Should().BeNull();
         filter.EndDate.Should().BeNull();
     }
-}
+}
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Services/UserRecordServiceTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Services/UserRecordServiceTests.cs
@@ -41,7 +41,7 @@ public async Task ShouldStoreInformation()
         recordToDb.Should().NotBeNull();
         recordToDb.UrlClicked.Should().Be("subpart");
         recordToDb.UserIdentifierHash.Should().NotBe(0);
-        recordToDb.DateTimeUtcClicked.Should().BeCloseTo(DateTime.UtcNow, TimeSpan.FromSeconds(1));
+        recordToDb.DateClicked.Should().Be(DateOnly.FromDateTime(DateTime.UtcNow));
     }
 
     [Fact]
@@ -111,4 +111,4 @@ public async Task ShouldRemoveQueryStringIfPresent(string url, string expectedRe
         recordToDb.Should().NotBeNull();
         recordToDb.UrlClicked.Should().Be(expectedRecord);
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public class UserRecord : Entity`
`6`	`6`	`{`
`7`	`7`	`public int UserIdentifierHash { get; set; }`
`8`	`8`
`9`		`- public DateTime DateTimeUtcClicked { get; set; }`
	`9`	`+ public DateOnly DateClicked { get; set; }`
`10`	`10`
`11`	`11`	`public string UrlClicked { get; set; }`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,13 @@`
`19`	`19`
`20`	`20`	`private async Task StartDateChanged(ChangeEventArgs args)`
`21`	`21`	`{`
`22`		`- filter.StartDate = args.Value is string { Length: >0 } dateTime ? DateTime.Parse(dateTime) : null;`
	`22`	`+ filter.StartDate = args.Value is string { Length: >0 } dateTime ? DateOnly.Parse(dateTime) : null;`
`23`	`23`	`await ApplyFilters();`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`private async Task EndDateChanged(ChangeEventArgs args)`
`27`	`27`	`{`
`28`		`- filter.EndDate = args.Value is string { Length: >0 } dateTime ? DateTime.Parse(dateTime) : null;`
	`28`	`+ filter.EndDate = args.Value is string { Length: >0 } dateTime ? DateOnly.Parse(dateTime) : null;`
`29`	`29`	`await ApplyFilters();`
`30`	`30`	`}`
`31`		`-}`
	`31`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace LinkDotNet.Blog.Web.Features.Admin.Dashboard.Services;`
`4`	`4`
`5`	`5`	`public sealed class Filter`
`6`	`6`	`{`
`7`		`- public DateTime? StartDate { get; set; }`
	`7`	`+ public DateOnly? StartDate { get; set; }`
`8`	`8`
`9`		`- public DateTime? EndDate { get; set; }`
`10`		`-}`
	`9`	`+ public DateOnly? EndDate { get; set; }`
	`10`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ private async ValueTask GetAndStoreUserRecordAsync()`
`53`	`53`	`var record = new UserRecord`
`54`	`54`	`{`
`55`	`55`	`UserIdentifierHash = identifierHash,`
`56`		`- DateTimeUtcClicked = DateTime.UtcNow,`
	`56`	`+ DateClicked = DateOnly.FromDateTime(DateTime.UtcNow),`
`57`	`57`	`UrlClicked = url,`
`58`	`58`	`};`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public static void UseSqlAsStorageProvider(this IServiceCollection services)`
`16`	`16`	`{`
`17`	`17`	`var configuration = s.GetRequiredService<AppConfiguration>();`
`18`	`18`	`var connectionString = configuration.ConnectionString;`
`19`		`- builder.UseSqlServer(connectionString)`
	`19`	`+ builder.UseSqlServer(connectionString, x => x.UseDateOnlyTimeOnly())`
`20`	`20`	`#if DEBUG`
`21`	`21`	`.EnableDetailedErrors()`
`22`	`22`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public async Task ShouldGetTotalUsers()`
`20`	`20`	`var record1 = new UserRecord`
`21`	`21`	`{`
`22`	`22`	`UserIdentifierHash = 2,`
`23`		`- DateTimeUtcClicked = DateTime.UtcNow,`
	`23`	`+ DateClicked = DateOnly.FromDateTime(DateTime.UtcNow),`
`24`	`24`	`UrlClicked = string.Empty,`
`25`	`25`	`};`
`26`	`26`	`var record2 = new UserRecord`
`@@ -48,7 +48,7 @@ public async Task ShouldGetTotalClicks()`
`48`	`48`	`{`
`49`	`49`	`var record1 = new UserRecord`
`50`	`50`	`{`
`51`		`- DateTimeUtcClicked = DateTime.UtcNow,`
	`51`	`+ DateClicked = DateOnly.FromDateTime(DateTime.UtcNow),`
`52`	`52`	`UrlClicked = "index",`
`53`	`53`	`};`
`54`	`54`	`var record2 = new UserRecord`
`@@ -74,7 +74,7 @@ public async Task ShouldGetAboutMeClicks()`
`74`	`74`	`{`
`75`	`75`	`var record1 = new UserRecord`
`76`	`76`	`{`
`77`		`- DateTimeUtcClicked = DateTime.UtcNow,`
	`77`	`+ DateClicked = DateOnly.FromDateTime(DateTime.UtcNow),`
`78`	`78`	`UrlClicked = "AboutMe",`
`79`	`79`	`};`
`80`	`80`	`var record2 = new UserRecord`
`@@ -94,4 +94,4 @@ public async Task ShouldGetAboutMeClicks()`
`94`	`94`	`data.TotalAboutMeClicks.Should().Be(2);`
`95`	`95`	`data.AboutMeClicksLast30Days.Should().Be(1);`
`96`	`96`	`}`
`97`		`-}`
	`97`	`+}`