From 66b9deae515acbabe536387dfa4d7ec089b957d0 Mon Sep 17 00:00:00 2001
From: Alex Klaus <alexander.klaus@angloamerican.com>
Date: Mon, 1 Jan 2024 13:55:32 +1000
Subject: [PATCH] Got rid off DateOnly converters

---
 Api/Api.csproj                                |  4 ++-
 Database/DataContext.cs                       |  4 +--
 Database/Infrastructure/DateOnlyComparer.cs   | 29 ----------------
 Database/Infrastructure/DateOnlyConverter.cs  | 34 -------------------
 .../20220322114144_InititalCreate.cs          |  2 +-
 5 files changed, 5 insertions(+), 68 deletions(-)
 delete mode 100644 Database/Infrastructure/DateOnlyComparer.cs
 delete mode 100644 Database/Infrastructure/DateOnlyConverter.cs

diff --git a/Api/Api.csproj b/Api/Api.csproj
index f9de729..9897cbf 100644
--- a/Api/Api.csproj
+++ b/Api/Api.csproj
@@ -7,8 +7,10 @@
 
 	<ItemGroup>
 		<PackageReference Include="DomainResult" Version="3.2.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+		<!-- The EF references below are required for generating the migration script only -->
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/Database/DataContext.cs b/Database/DataContext.cs
index 18899b4..53672c0 100644
--- a/Database/DataContext.cs
+++ b/Database/DataContext.cs
@@ -1,5 +1,4 @@
 using AK.DbSample.Database.Entities;
-using AK.DbSample.Database.Infrastructure;
 
 using Microsoft.EntityFrameworkCore;
 
@@ -20,8 +19,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 			{
 				// Date is a DateOnly property and date on database
 				builder.Property(x => x.Date)
-					// These converters are still required in EF 7 (https://github.com/dotnet/efcore/issues/24507)
-					.HasConversion<DateOnlyConverter, DateOnlyComparer>();
+					   .HasColumnType("date");
 
 				// Set cascade delete
 				builder.HasOne(p => p.Client)
diff --git a/Database/Infrastructure/DateOnlyComparer.cs b/Database/Infrastructure/DateOnlyComparer.cs
deleted file mode 100644
index 6b76fde..0000000
--- a/Database/Infrastructure/DateOnlyComparer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Microsoft.EntityFrameworkCore.ChangeTracking;
-
-namespace AK.DbSample.Database.Infrastructure;
-
-/// <summary>
-///		Compares <see cref="DateOnly" />.
-/// </summary>
-public class DateOnlyComparer : ValueComparer<DateOnly>
-{
-	/// <summary>
-	///		Creates a new instance of this converter.
-	/// </summary>
-	public DateOnlyComparer() : base(
-		(d1, d2) => d1 == d2 && d1.DayNumber == d2.DayNumber, 
-		d => d.GetHashCode()) {}
-}
-
-/// <summary>
-///		Compares <see cref="Nullable{DateOnly}" />.
-/// </summary>
-public class NullableDateOnlyComparer : ValueComparer<DateOnly?>
-{
-	/// <summary>
-	/// Creates a new instance of this converter.
-	/// </summary>
-	public NullableDateOnlyComparer() : base(
-		(d1, d2) => d1 == d2 && d1.GetValueOrDefault().DayNumber == d2.GetValueOrDefault().DayNumber,
-		d => d.GetHashCode()) {}
-}
\ No newline at end of file
diff --git a/Database/Infrastructure/DateOnlyConverter.cs b/Database/Infrastructure/DateOnlyConverter.cs
deleted file mode 100644
index 12925af..0000000
--- a/Database/Infrastructure/DateOnlyConverter.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-namespace AK.DbSample.Database.Infrastructure;
-
-/// <summary>
-///		Converts <see cref="DateOnly" /> to <see cref="DateTime"/> and vice versa.
-/// </summary>
-public class DateOnlyConverter : ValueConverter<DateOnly, DateTime>
-{
-	/// <summary>
-	/// Creates a new instance of this converter.
-	/// </summary>
-	public DateOnlyConverter() : base(
-		d => d.ToDateTime(TimeOnly.MinValue),
-		d => DateOnly.FromDateTime(d)) { }
-}
-
-/// <summary>
-///		Converts <see cref="Nullable{DateOnly}" /> to <see cref="Nullable{DateTime}"/> and vice versa.
-/// </summary>
-public class NullableDateOnlyConverter : ValueConverter<DateOnly?, DateTime?>
-{
-	/// <summary>
-	/// Creates a new instance of this converter.
-	/// </summary>
-	public NullableDateOnlyConverter() : base(
-		d => d == null 
-			? null 
-			: new DateTime?(d.Value.ToDateTime(TimeOnly.MinValue)),
-		d => d == null 
-			? null 
-			: new DateOnly?(DateOnly.FromDateTime(d.Value)))
-	{ }
-}
\ No newline at end of file
diff --git a/Database/Migrations/20220322114144_InititalCreate.cs b/Database/Migrations/20220322114144_InititalCreate.cs
index 3456329..f2f6cdd 100644
--- a/Database/Migrations/20220322114144_InititalCreate.cs
+++ b/Database/Migrations/20220322114144_InititalCreate.cs
@@ -28,7 +28,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 {
                     Number = table.Column<string>(type: "nvarchar(100)", nullable: false),
                     ClientId = table.Column<long>(type: "bigint", nullable: false),
-                    Date = table.Column<DateTime>(type: "datetime", nullable: false),
+                    Date = table.Column<DateOnly>(type: "date", nullable: false),
                     Amount = table.Column<decimal>(type: "decimal(18,2)", nullable: false)
                 },
                 constraints: table =>