adding proper translation for DateTimeOffsets

redis · Aug 11, 2023 · ec86ff5 · ec86ff5
1 parent 6399ed5
commit ec86ff5
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 0 deletions.
diff --git a/src/Redis.OM/Common/ExpressionParserUtilities.cs b/src/Redis.OM/Common/ExpressionParserUtilities.cs
@@ -903,6 +903,11 @@ private static string ValueToString(object value)
                 return ((double)value).ToString(CultureInfo.InvariantCulture);
             }
 
+            if (value is DateTimeOffset dto)
+            {
+                return dto.ToUnixTimeMilliseconds().ToString(CultureInfo.InvariantCulture);
+            }
+
             if (value is DateTime dt)
             {
                 return new DateTimeOffset(dt).ToUnixTimeMilliseconds().ToString(CultureInfo.InvariantCulture);

diff --git a/test/Redis.OM.Unit.Tests/RediSearchTests/ObjectWithDateTime.cs b/test/Redis.OM.Unit.Tests/RediSearchTests/ObjectWithDateTime.cs
@@ -10,6 +10,8 @@ public class ObjectWithDateTime
     public string Id { get; set; }
     [Indexed(Sortable = true)]
     public DateTime Timestamp { get; set; }
+    [Indexed(Sortable = true)]
+    public DateTimeOffset TimestampOffset { get; set; }
     [Indexed]
     public DateTime? NullableTimestamp { get; set; }
 }

diff --git a/test/Redis.OM.Unit.Tests/RediSearchTests/SearchTests.cs b/test/Redis.OM.Unit.Tests/RediSearchTests/SearchTests.cs
@@ -2409,6 +2409,84 @@ public void Issue201()
             ));
         }
 
+        [Fact]
+        public void RangeOnDateTimeWithMultiplePredicates()
+        {
+            _mock.Setup(x => x.Execute(It.IsAny<string>(), It.IsAny<string[]>()))
+                .Returns(_mockReply);
+
+            var fromDto = DateTimeOffset.UtcNow.Subtract(TimeSpan.FromHours(4));
+            var toDto = DateTimeOffset.UtcNow;
+
+            var fromDt = fromDto.DateTime;
+            var toDt = toDto.DateTime;
+
+            var msFrom = fromDto.ToUnixTimeMilliseconds();
+            var msTo = toDto.ToUnixTimeMilliseconds();
+
+            var collection = new RedisCollection<ObjectWithDateTime>(_mock.Object, 1000);
+            _ = collection.Where(x => x.TimestampOffset <= fromDto && x.TimestampOffset >= toDto).ToList();
+            _ = collection.Where(x => x.TimestampOffset <= fromDt && x.TimestampOffset >= toDt).ToList();
+            _ = collection.Where(x => x.Timestamp <= fromDto && x.Timestamp >= toDto).ToList();
+            _ = collection.Where(x => x.Timestamp <= fromDt && x.Timestamp >= toDt).ToList();
+            _ = collection.Where(x => x.NullableTimestamp <= fromDto && x.NullableTimestamp >= toDto).ToList();
+            _ = collection.Where(x => x.NullableTimestamp <= fromDt && x.NullableTimestamp >= toDt).ToList();
+
+            _mock.Verify(x => x.Execute(
+                "FT.SEARCH",
+                "objectwithdatetime-idx",
+                $"((@TimestampOffset:[-inf {msFrom}]) (@TimestampOffset:[{msTo} inf]))",
+                "LIMIT",
+                "0",
+                "1000"
+            ));
+
+            _mock.Verify(x => x.Execute(
+                "FT.SEARCH",
+                "objectwithdatetime-idx",
+                $"((@TimestampOffset:[-inf {new DateTimeOffset(fromDt).ToUnixTimeMilliseconds()}]) (@TimestampOffset:[{new DateTimeOffset(toDt).ToUnixTimeMilliseconds()} inf]))",
+                "LIMIT",
+                "0",
+                "1000"
+            ));
+
+            _mock.Verify(x => x.Execute(
+                "FT.SEARCH",
+                "objectwithdatetime-idx",
+                $"((@Timestamp:[-inf {msFrom}]) (@Timestamp:[{msTo} inf]))",
+                "LIMIT",
+                "0",
+                "1000"
+            ));
+
+            _mock.Verify(x => x.Execute(
+                "FT.SEARCH",
+                "objectwithdatetime-idx",
+                $"((@Timestamp:[-inf {new DateTimeOffset(fromDt).ToUnixTimeMilliseconds()}]) (@Timestamp:[{new DateTimeOffset(toDt).ToUnixTimeMilliseconds()} inf]))",
+                "LIMIT",
+                "0",
+                "1000"
+            ));
+
+            _mock.Verify(x => x.Execute(
+                "FT.SEARCH",
+                "objectwithdatetime-idx",
+                $"((@NullableTimestamp:[-inf {msFrom}]) (@NullableTimestamp:[{msTo} inf]))",
+                "LIMIT",
+                "0",
+                "1000"
+            ));
+
+            _mock.Verify(x => x.Execute(
+                "FT.SEARCH",
+                "objectwithdatetime-idx",
+                $"((@NullableTimestamp:[-inf {new DateTimeOffset(fromDt).ToUnixTimeMilliseconds()}]) (@NullableTimestamp:[{new DateTimeOffset(toDt).ToUnixTimeMilliseconds()} inf]))",
+                "LIMIT",
+                "0",
+                "1000"
+            ));
+        }
+
         [Fact]
         public void RangeOnDatetime()
         {