fix: add DateOnly support to filtering and searching

Author: ascott18

CHANGELOG.md

@@ -1,5 +1,6 @@
 # 6.1.1
 - Fix `AddUrlHelper` to create a more full ActionContext when operating outside an MVC action.
+- Fix errors thrown when filtering and searching on `System.DateOnly` properties.
 
 # 6.1.0
 - Added support for .NET 10

src/IntelliTect.Coalesce.Tests/Tests/Api/DataSources/StandardDataSourceTests.cs

@@ -192,6 +192,33 @@ public void ApplyListPropertyFilter_WhenPropIsDateTime_FiltersProp(
         Assert.Equal(shouldMatch ? 1 : 0, query.Count());
     }
 
+    public static IEnumerable<object[]> Filter_MatchesDateOnlyData = new[]
+    {
+        new object[] { true, "2017-08-02", new DateOnly(2017, 08, 02) },
+        new object[] { false, "2017-08-02", new DateOnly(2017, 08, 03) },
+        new object[] { false, "2017-08-02", new DateOnly(2017, 08, 01) },
+
+        new object[] { true, "2017-08-02T12:34:56", new DateOnly(2017, 08, 02) },
+        new object[] { false, "2017-08-02T12:34:56", new DateOnly(2017, 08, 03) },
+
+        new object[] { false, "can't parse", new DateOnly(2017, 08, 02) },
+        
+        // Null or empty inputs always do nothing - these will always match.
+        new object[] { true, "", new DateOnly(2017, 08, 02) },
+        new object[] { true, null, new DateOnly(2017, 08, 02) },
+    };
+
+    [Theory]
+    [MemberData(nameof(Filter_MatchesDateOnlyData))]
+    public void ApplyListPropertyFilter_WhenPropIsDateOnly_FiltersProp(
+        bool shouldMatch, string inputValue, DateOnly fieldValue)
+    {
+        var (prop, query) = PropertyFiltersTestHelper<ComplexModel, DateOnly>(
+            m => m.SystemDateOnly, fieldValue, inputValue);
+
+        Assert.Equal(shouldMatch ? 1 : 0, query.Count());
+    }
+
 
     public static IEnumerable<object[]> Filter_MatchesDateTimeOffsetsData = new[]
     {

src/IntelliTect.Coalesce.Tests/Tests/Api/SearchTests.cs

@@ -99,6 +99,34 @@ public void Search_DateTime_IsTimeZoneAgnostic(bool expectedMatch, string search
             TimeZoneInfo.CreateCustomTimeZone("test", TimeSpan.FromHours(new Random().Next(-11, 12)), "test", "test"));
     }
 
+    public static IEnumerable<object[]> Search_MatchesDateOnlyData = new[]
+    {
+        new object[] { true, "2017", new DateOnly(2017, 08, 15) },
+        new object[] { false, "2018", new DateOnly(2017, 08, 15) },
+        new object[] { true, "2017-08", new DateOnly(2017, 08, 01) },
+        new object[] { true, "2017-08", new DateOnly(2017, 08, 15) },
+        new object[] { false, "2017-08", new DateOnly(2017, 07, 31) },
+        new object[] { false, "2017-08", new DateOnly(2017, 09, 01) },
+        new object[] { false, "2018-08", new DateOnly(2017, 08, 15) },
+
+        new object[] { true, "Nov 6 17", new DateOnly(2017, 11, 06) },
+        new object[] { true, "Nov 6, 2017", new DateOnly(2017, 11, 06) },
+        new object[] { true, "6 November 2017", new DateOnly(2017, 11, 06) },
+        new object[] { true, "6 Nov 2017", new DateOnly(2017, 11, 06) },
+        new object[] { true, "6 Nov 17", new DateOnly(2017, 11, 06) },
+    };
+
+    [Theory]
+    [MemberData(nameof(Search_MatchesDateOnlyData))]
+    public void Search_DateOnly_SearchesCorrectly(bool expectedMatch, string searchTerm, DateOnly searchCandidate)
+    {
+        SearchHelper(
+            (ComplexModel t) => t.SystemDateOnly,
+            "systemdateonly:" + searchTerm,
+            searchCandidate,
+            expectedMatch);
+    }
+
     [Theory]
     [InlineData(true, "FAFAB015-FFA4-41F8-B4DD-C15EB0CE40B6", "FAFAB015-FFA4-41F8-B4DD-C15EB0CE40B6")]
     [InlineData(true, "FAFAB015-FFA4-41F8-B4DD-C15EB0CE40B6", "fafab015-ffa4-41f8-b4dd-c15eb0ce40b6")]

src/IntelliTect.Coalesce/Api/DataSources/QueryableDataSourceBase`1.cs

@@ -112,6 +112,15 @@ protected virtual IQueryable<T> ApplyListPropertyFilter(
                 return query.Where(_ => false);
             }
 
+            // Handle DateOnly separately since it can't cast from DateTime
+            if (propType.NullableValueUnderlyingType.IsA<DateOnly>() && DateOnly.TryParse(value, out DateOnly parsedDateOnly))
+            {
+                var dateParam = parsedDateOnly.AsQueryParam(propType);
+                return query.WhereExpression(it =>
+                    Expression.Equal(it.Prop(prop), dateParam)
+                );
+            }
+
             // See if they just passed in a date or a date and a time
             if (DateTime.TryParse(value, out DateTime parsedValue))
             {

src/IntelliTect.Coalesce/Helpers/Search/SearchableValueProperty.cs

@@ -19,10 +19,10 @@ public SearchableValueProperty(PropertyViewModel prop) : base(prop)
     public enum ParseFlags
     {
         None = 0,
-        HaveYear   = 1 << 0,
-        HaveMonth  = 1 << 1,
-        HaveDay    = 1 << 2,
-        HaveHour   = 1 << 3,
+        HaveYear = 1 << 0,
+        HaveMonth = 1 << 1,
+        HaveDay = 1 << 2,
+        HaveHour = 1 << 3,
         HaveMinute = 1 << 4,
         HaveSecond = 1 << 5,
 
@@ -144,6 +144,12 @@ out dt
                     min = offset.AsQueryParam(propType);
                     max = offset.Add(range.Value).AsQueryParam(propType);
                 }
+                else if (propType.NullableValueUnderlyingType.IsA<DateOnly>())
+                {
+                    var dateOnly = new DateOnly(dt.Year, dt.Month, dt.Day);
+                    min = dateOnly.AsQueryParam(propType);
+                    max = dateOnly.AddDays((int)range.Value.TotalDays).AsQueryParam(propType);
+                }
                 else
                 {
                     min = dt.AsQueryParam(propType);

src/IntelliTect.Coalesce/TypeDefinition/PropertyViewModel.cs

@@ -224,6 +224,7 @@ propName is null
     /// <summary>
     /// True if the property has the DateType(DateOnly) Attribute.
     /// </summary>
+    [Obsolete("Documentation comment does not match behavior. Use `DateType` directly.")]
     public bool IsDateOnly => DateType == DateTypeAttribute.DateTypes.DateOnly;
 
     /// <summary>