Refactoring

Author: AngeloDotNet

src/NET6CustomLibrary/DateTime/Comparer/DateOnlyComparer.cs

@@ -0,0 +1,10 @@
+namespace NET6CustomLibrary.DateTime.Comparer;
+
+public class DateOnlyComparer : ValueComparer<DateOnly>
+{
+    public DateOnlyComparer() : base(
+        (d1, d2) => d1.DayNumber == d2.DayNumber,
+        d => d.GetHashCode())
+    {
+    }
+}

src/NET6CustomLibrary/DateTime/Comparer/TimeOnlyComparer.cs

@@ -0,0 +1,10 @@
+namespace NET6CustomLibrary.DateTime.Comparer;
+
+public class TimeOnlyComparer : ValueComparer<TimeOnly>
+{
+    public TimeOnlyComparer() : base(
+        (t1, t2) => t1.Ticks == t2.Ticks,
+        t => t.GetHashCode())
+    {
+    }
+}

src/NET6CustomLibrary/DateTime/Converters/DateOnlyConverter.cs

@@ -1,13 +1,22 @@
 namespace NET6CustomLibrary.DateTime.Converters;
 
-public class DateOnlyConverter : JsonConverter<DateOnly>
+//public class DateOnlyConverter : JsonConverter<DateOnly>
+//{
+//    public override DateOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+//    {
+//        var value = reader.GetString();
+//        return DateOnly.Parse(value);
+//    }
+
+//    public override void Write(Utf8JsonWriter writer, DateOnly value, JsonSerializerOptions options)
+//        => writer.WriteStringValue(value.ToString("yyyy-MM-dd"));
+//}
+
+public class DateOnlyConverter : ValueConverter<DateOnly, System.DateTime>
 {
-    public override DateOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    public DateOnlyConverter() : base(
+            dateOnly => dateOnly.ToDateTime(TimeOnly.MinValue),
+            dateTime => DateOnly.FromDateTime(dateTime))
     {
-        var value = reader.GetString();
-        return DateOnly.Parse(value);
     }
-
-    public override void Write(Utf8JsonWriter writer, DateOnly value, JsonSerializerOptions options)
-        => writer.WriteStringValue(value.ToString("yyyy-MM-dd"));
 }

src/NET6CustomLibrary/DateTime/Converters/TimeOnlyConverter.cs

@@ -1,13 +1,24 @@
 namespace NET6CustomLibrary.DateTime.Converters;
 
-public class TimeOnlyConverter : JsonConverter<TimeOnly>
+//public class TimeOnlyConverter : JsonConverter<TimeOnly>
+//{
+//    public override TimeOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+//    {
+//        var value = reader.GetString();
+//        return TimeOnly.Parse(value!);
+//    }
+
+//    //public override void Write(Utf8JsonWriter writer, TimeOnly value, JsonSerializerOptions options)
+//    //    => writer.WriteStringValue(value.ToString("HH:mm:ss.fff"));
+//    public override void Write(Utf8JsonWriter writer, TimeOnly value, JsonSerializerOptions options)
+//        => writer.WriteStringValue(value.ToString("HH:mm:ss"));
+//}
+
+public class TimeOnlyConverter : ValueConverter<TimeOnly, TimeSpan>
 {
-    public override TimeOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    public TimeOnlyConverter() : base(
+            timeOnly => timeOnly.ToTimeSpan(),
+            timeSpan => TimeOnly.FromTimeSpan(timeSpan))
     {
-        var value = reader.GetString();
-        return TimeOnly.Parse(value!);
     }
-
-    public override void Write(Utf8JsonWriter writer, TimeOnly value, JsonSerializerOptions options)
-        => writer.WriteStringValue(value.ToString("HH:mm:ss.fff"));
 }

src/NET6CustomLibrary/DateTime/Converters/UtcDateTimeConverter.cs

@@ -17,5 +17,6 @@ public override System.DateTime Read(ref Utf8JsonReader reader, Type typeToConve
         => reader.GetDateTime().ToUniversalTime();
 
     public override void Write(Utf8JsonWriter writer, System.DateTime value, JsonSerializerOptions options)
-        => writer.WriteStringValue((value.Kind == DateTimeKind.Local ? value.ToUniversalTime() : value).ToString(serializationFormat));
+        => writer.WriteStringValue((value.Kind == DateTimeKind.Local ? value.ToUniversalTime() : value)
+            .ToString(serializationFormat));
 }

src/NET6CustomLibrary/DateTime/TypeConverters/DateOnlyTypeConverter.cs

@@ -1,6 +1,6 @@
 namespace NET6CustomLibrary.DateTime.TypeConverters;
 
-public class DateOnlyTypeConverter : TypeConverter
+internal class DateOnlyTypeConverter : TypeConverter
 {
     public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
     {

src/NET6CustomLibrary/Docs/README-DateTimeOnly.md

@@ -1,6 +1,21 @@
 # Date and Time only configuration
 
 
+## Add the converters and the comparers in the OnModelCreating method of the DbContext 
+```csharp
+modelBuilder.Entity<MyEntity>(builder =>
+{
+  // Date is a DateOnly property and date on database
+  builder.Property(x => x.Date)
+    .HasConversion<DateOnlyConverter, DateOnlyComparer>();
+
+  // Time is a TimeOnly property and time on database
+  builder.Property(x => x.Time)
+    .HasConversion<TimeOnlyConverter, TimeOnlyComparer>();
+});
+
+```
+
 ## Registering services at Startup
 
 ```csharp

src/NET6CustomLibrary/Extensions/DependencyInjection.cs

@@ -2,7 +2,6 @@
 
 public static class DependencyInjection
 {
-    #region "SERILOG"
     public static IServiceCollection AddSerilogServices(this IServiceCollection services)
     {
         services.AddTransient<ILoggerService, LoggerService>();
@@ -29,9 +28,7 @@ public static WebApplicationBuilder AddSerilogOptionsBuilder(this WebApplication
 
         return builder;
     }
-    #endregion
 
-    #region "MULTI LANGUAGE"
     public static IServiceCollection AddSupportedCultures(this IServiceCollection services, string[] cultures)
     {
         var supportedCultures = cultures;
@@ -56,23 +53,21 @@ public static WebApplication UseLocalizationConfiguration(this WebApplication ap
 
         return app;
     }
-    #endregion
 
-    #region "DATE and TIME ONLY"
     public static IMvcBuilder AddDateTimeJsonOptions(this IMvcBuilder builder)
     {
         builder.AddJsonOptions(options =>
         {
             options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
-            options.JsonSerializerOptions.Converters.Add(new DateOnlyConverter());
-            options.JsonSerializerOptions.Converters.Add(new TimeOnlyConverter());
+            //options.JsonSerializerOptions.Converters.Add(new DateOnlyConverter());
+            //options.JsonSerializerOptions.Converters.Add(new TimeOnlyConverter());
             options.JsonSerializerOptions.Converters.Add(new UtcDateTimeConverter());
         });
 
         return builder;
     }
 
-    [Obsolete("This method is deprecated. Please indicate the TypeDescriptors as indicated in the README", true)]
+    //[Obsolete("This method is deprecated. Please indicate the TypeDescriptors as indicated in the README", false)]
     public static IServiceCollection AddDateTimeOnlyAttributes(this IServiceCollection services)
     {
         TypeDescriptor.AddAttributes(typeof(DateOnly), new TypeConverterAttribute(typeof(DateOnlyTypeConverter)));
@@ -98,9 +93,7 @@ public static SwaggerGenOptions AddDateTimeSwaggerGenOptions(this SwaggerGenOpti
 
         return options;
     }
-    #endregion
 
-    #region "JSON"
     public static IMvcBuilder AddSimpleJsonOptions(this IMvcBuilder builder)
     {
         builder.AddJsonOptions(options =>
@@ -109,9 +102,7 @@ public static IMvcBuilder AddSimpleJsonOptions(this IMvcBuilder builder)
         });
         return builder;
     }
-    #endregion
 
-    #region "EFCORE DBContext Generics"
     public static IServiceCollection AddDbContextGenericsMethods<TDbContext>(this IServiceCollection services) where TDbContext : DbContext
     {
         services.AddScoped<DbContext, TDbContext>();
@@ -121,9 +112,7 @@ public static IServiceCollection AddDbContextGenericsMethods<TDbContext>(this IS
 
         return services;
     }
-    #endregion
 
-    #region "EFCORE DBContext"
     public static IServiceCollection AddDbContextUseMySql<TDbContext>(this IServiceCollection services, string connectionString, int retryOnFailure) where TDbContext : DbContext
     {
         services.AddDbContextPool<TDbContext>(optionBuilder =>
@@ -144,9 +133,7 @@ public static IServiceCollection AddDbContextUseMySql<TDbContext>(this IServiceC
         });
         return services;
     }
-    #endregion
 
-    #region "DATABASE HEALTH CHECKS"
     public static IServiceCollection AddMySqlHealthChecks(this IServiceCollection services, string connectionString, string nameAsyncCheck)
     {
         services.AddHealthChecks()
@@ -213,9 +200,7 @@ public static IEndpointRouteBuilder AddDatabaseHealthChecks(this IEndpointRouteB
 
         return builder;
     }
-    #endregion
 
-    #region "MAILKIT"
     public static IServiceCollection AddMailKitEmailSenderService(this IServiceCollection services, IConfiguration configuration)
     {
         services
@@ -227,5 +212,4 @@ public static IServiceCollection AddMailKitEmailSenderService(this IServiceColle
 
         return services;
     }
-    #endregion
 }

src/NET6CustomLibrary/GlobalUsings.cs

@@ -17,6 +17,8 @@
 global using Microsoft.AspNetCore.Identity.UI.Services;
 global using Microsoft.AspNetCore.Routing;
 global using Microsoft.EntityFrameworkCore;
+global using Microsoft.EntityFrameworkCore.ChangeTracking;
+global using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 global using Microsoft.Extensions.Configuration;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Diagnostics.HealthChecks;