Moving DateOnlyConversionMode to the Enums folder and renaming the EnforceMidnight option to RequireMidnight

Author: michelebastione

src/MiniExcel.Core/Enums/DateOnlyConversionMode.cs

@@ -0,0 +1,20 @@
+namespace MiniExcelLib.Core.Enums;
+
+
+public enum DateOnlyConversionMode
+{
+    /// <summary>
+    /// No conversion is applied and DateOnly values are not transformed.
+    /// </summary>
+    None,
+
+    /// <summary>
+    /// Allows conversion from DateTime to DateOnly only if the time component is exactly midnight (00:00:00).
+    /// </summary>
+    RequireMidnight,
+
+    /// <summary>
+    /// Converts DateTime to DateOnly by ignoring the time part completely, assuming the time component is not critical.
+    /// </summary>
+    IgnoreTimePart
+}

src/MiniExcel.Core/MiniExcelConfiguration.cs

@@ -1,4 +1,5 @@
 using MiniExcelLib.Core.Attributes;
+using MiniExcelLib.Core.Enums;
 
 namespace MiniExcelLib.Core;
 
@@ -17,29 +18,7 @@ public abstract class MiniExcelBaseConfiguration : IMiniExcelConfiguration
     public bool DynamicColumnFirst { get; set; } = false;
 
     /// <summary>
-    /// Sets the options to how and when encountered DateTime values can be converted to DateOnly values.
+    /// Specifies when and how DateTime values are converted to DateOnly values.
     /// </summary>
-    public DateOnlyConversionMode DateOnlyConversionMode { get; set; } = DateOnlyConversionMode.None;
-}
-
-
-/// <summary>
-/// Specifies how DateTime values should be converted to DateOnly.
-/// </summary>
-public enum DateOnlyConversionMode
-{
-    /// <summary>
-    /// No conversion is applied; DateOnly values are not transformed.
-    /// </summary>
-    None,
-
-    /// <summary>
-    /// Converts DateTime to DateOnly by enforcing midnight (00:00:00) as the time component.
-    /// </summary>
-    EnforceMidnight,
-
-    /// <summary>
-    /// Converts DateTime to DateOnly by ignoring the time part completely, assuming the time component is not critical.
-    /// </summary>
-    IgnoreTimePart
-}
+    public DateOnlyConversionMode DateOnlyConversionMode { get; set; }
+}

src/MiniExcel.Core/Reflection/MiniExcelMapper.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using MiniExcelLib.Core.Enums;
 using MiniExcelLib.Core.Exceptions;
 
 namespace MiniExcelLib.Core.Reflection;
@@ -150,15 +151,11 @@ public static partial class MiniExcelMapper
                     return newValue;
                 }
 
-                if (itemValue is DateTime dateTimeValue &&
-                    config.DateOnlyConversionMode is DateOnlyConversionMode.EnforceMidnight
-                        or DateOnlyConversionMode.IgnoreTimePart)
+                if (itemValue is DateTime dateTimeValue && config.DateOnlyConversionMode is not DateOnlyConversionMode.None)
                 {
-                    if (config.DateOnlyConversionMode == DateOnlyConversionMode.EnforceMidnight && dateTimeValue.TimeOfDay != TimeSpan.Zero)
-                    {
-                        throw new InvalidCastException(
-                            $"Could not convert cell of type DateTime to DateOnly, because DateTime was not at midnight, but at {dateTimeValue:HH:mm:ss}.");
-                    }
+                    if (config.DateOnlyConversionMode == DateOnlyConversionMode.RequireMidnight && dateTimeValue.TimeOfDay != TimeSpan.Zero)
+                        throw new InvalidCastException($"Could not convert cell of type DateTime to DateOnly, because DateTime was not at midnight, but at {dateTimeValue:HH:mm:ss}.");
+
                     return DateOnly.FromDateTime(dateTimeValue);
                 }
 

tests/MiniExcel.Core.Tests/MiniExcelIssueTests.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using System.Text.RegularExpressions;
+using MiniExcelLib.Core.Enums;
 using MiniExcelLib.Core.Exceptions;
 using MiniExcelLib.Core.OpenXml.Picture;
 using MiniExcelLib.Core.OpenXml.Utils;
@@ -16,44 +17,7 @@ public class MiniExcelIssueTests(ITestOutputHelper output)
     private readonly OpenXmlExporter _excelExporter =  MiniExcel.Exporters.GetOpenXmlExporter();
     private readonly OpenXmlTemplater _excelTemplater =  MiniExcel.Templaters.GetOpenXmlTemplater();
 
-    // private readonly OpenXmlImporter _csvImporter =  MiniExcel.Importer.GetCsvImporter();
-    // private readonly OpenXmlExporter _csvExporter =  MiniExcel.Exporter.GetCsvExporter();
-    
-    [Theory]
-    [InlineData("DateTimeMidnight", DateOnlyConversionMode.None, true)]
-    [InlineData("DateTimeNotMidnight", DateOnlyConversionMode.None, true)]
-    [InlineData("DateTimeMidnight", DateOnlyConversionMode.EnforceMidnight, false)]
-    [InlineData("DateTimeNotMidnight", DateOnlyConversionMode.EnforceMidnight, true)]
-    [InlineData("DateTimeMidnight", DateOnlyConversionMode.IgnoreTimePart, false)]
-    [InlineData("DateTimeNotMidnight", DateOnlyConversionMode.IgnoreTimePart, false)]
-    public void TestIssue869(string fileName, DateOnlyConversionMode mode, bool throwsException)
-    {
-        var path = PathHelper.GetFile($"xlsx/TestIssue869/{fileName}.xlsx");
-        var config = new OpenXmlConfiguration { DateOnlyConversionMode = mode };
-        var testFn = () => _excelImporter.Query<DateTimeSheet>(path, configuration: config).ToList();
-        if (throwsException)
-        {
-            Assert.Throws<MiniExcelInvalidCastException>(testFn);
-        }
-        else
-        {
-            try
-            {
-                _ = testFn();
-            }
-            catch (Exception ex)
-            {
-                Assert.Fail($"No exception should be thrown, but still one was thrown: {ex.Message}.");
-            }
-        }
-    }
 
-    private class DateTimeSheet
-    {
-        public string? Name { get; set; }
-        public DateOnly? Date { get; set; }
-    }
-    
     /// <summary>
     /// https://github.com/mini-software/MiniExcel/issues/549
     /// </summary>
@@ -3688,4 +3652,41 @@ public void TestIssue809()
         Assert.Equal(null, rows[0].A);
         Assert.Equal(2, rows[2].B);
     }
+    
+    
+    private class Issue869
+    {
+        public string? Name { get; set; }
+        public DateOnly? Date { get; set; }
+    }
+
+    [Theory]
+    [InlineData("DateTimeMidnight", DateOnlyConversionMode.None, true)]
+    [InlineData("DateTimeNotMidnight", DateOnlyConversionMode.None, true)]
+    [InlineData("DateTimeMidnight", DateOnlyConversionMode.RequireMidnight, false)]
+    [InlineData("DateTimeNotMidnight", DateOnlyConversionMode.RequireMidnight, true)]
+    [InlineData("DateTimeMidnight", DateOnlyConversionMode.IgnoreTimePart, false)]
+    [InlineData("DateTimeNotMidnight", DateOnlyConversionMode.IgnoreTimePart, false)]
+    public void TestIssue869(string fileName, DateOnlyConversionMode mode, bool throwsException)
+    {
+        var path = PathHelper.GetFile($"xlsx/TestIssue869/{fileName}.xlsx");
+        var config = new OpenXmlConfiguration { DateOnlyConversionMode = mode };
+        
+        var testFn = () => _excelImporter.Query<Issue869>(path, configuration: config).ToList();
+        if (throwsException)
+        {
+            Assert.Throws<MiniExcelInvalidCastException>(testFn);
+        }
+        else
+        {
+            try
+            {
+                _ = testFn();
+            }
+            catch (Exception ex)
+            {
+                Assert.Fail($"No exception should be thrown, but one was still thrown: {ex}.");
+            }
+        }
+    }
 }