Correctly identify DateTimeOffset JSON properties as scalar (#264)

OctopusDeploy · Jul 28, 2023 · 4924efc · 4924efc
1 parent 156fdc2
commit 4924efc
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 1 deletion.
diff --git a/source/Nevermore.IntegrationTests/Model/Machine.cs b/source/Nevermore.IntegrationTests/Model/Machine.cs
@@ -1,4 +1,6 @@
-namespace Nevermore.IntegrationTests.Model
+using System;
+
+namespace Nevermore.IntegrationTests.Model
 {
     public class Machine
     {
@@ -7,5 +9,6 @@ public class Machine
 
         public string Description { get; set; }
         public Endpoint Endpoint { get; set; }
+        public DateTimeOffset LastModified { get; set; }
     }
 }
diff --git a/source/Nevermore.IntegrationTests/QueryableIntegrationFixture.cs b/source/Nevermore.IntegrationTests/QueryableIntegrationFixture.cs
@@ -172,6 +172,33 @@ public void WhereEqualJson()
             customers.Select(m => m.Name).Should().BeEquivalentTo("Machine A");
         }
 
+        [Test]
+        public void WhereEqualJsonDateTimeOffset()
+        {
+            using var t = Store.BeginTransaction();
+
+            var testLastModified = new DateTimeOffset(2023, 07, 27, 16, 04, 00, TimeSpan.Zero);
+            var testMachines = new[]
+            {
+                new Machine { Name = "Machine A", LastModified = DateTimeOffset.Now },
+                new Machine { Name = "Machine B", LastModified = testLastModified},
+                new Machine { Name = "Machine C", LastModified = DateTimeOffset.Now},
+            };
+
+            foreach (var c in testMachines)
+            {
+                t.Insert(c);
+            }
+
+            t.Commit();
+
+            var customers = t.Queryable<Machine>()
+                .Where(m => m.LastModified == testLastModified)
+                .ToList();
+
+            customers.Select(m => m.Name).Should().BeEquivalentTo("Machine B");
+        }
+
         [Test]
         public void WhereIsNullJsonValue()
         {

diff --git a/source/Nevermore/Advanced/Queryable/PropertyInfoExtensions.cs b/source/Nevermore/Advanced/Queryable/PropertyInfoExtensions.cs
@@ -1,10 +1,16 @@
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 
 namespace Nevermore.Advanced.Queryable
 {
     internal static class PropertyInfoExtensions
     {
+        static readonly HashSet<Type> KnownScalarTypes = new()
+        {
+            typeof(DateTimeOffset)
+        };
+
         public static bool Matches(this PropertyInfo propertyInfo, PropertyInfo other)
         {
             return propertyInfo.Name.Equals(other.Name) &&
@@ -13,6 +19,12 @@ public static bool Matches(this PropertyInfo propertyInfo, PropertyInfo other)
 
         public static bool IsScalar(this PropertyInfo propertyInfo)
         {
+            // there are some types that can be consider scalars but have a TypeCode of Object
+            if (KnownScalarTypes.Contains(propertyInfo.PropertyType))
+            {
+                return true;
+            }
+
             return Type.GetTypeCode(propertyInfo.PropertyType) switch
             {
                 TypeCode.Object => false,