date work

Author: pwelter34

src/Serilog.Sinks.AzureTableStorage/Sinks/AzureTableStorage/DefaultKeyGenerator.cs

@@ -142,8 +142,10 @@ public static string GenerateRowKey(DateTime eventTime)
     public static string GeneratePartitionKeyQuery(DateOnly date, TimeSpan offset)
     {
         // date is assumed to be in local time, will be converted to UTC
-        var eventTime = new DateTimeOffset(date.Year, date.Month, date.Day, 0, 0, 0, offset);
-        return GeneratePartitionKeyQuery(eventTime);
+        var startTime = new DateTimeOffset(date.Year, date.Month, date.Day, 0, 0, 0, offset);
+        var endTime = startTime.AddDays(1);
+
+        return GeneratePartitionKeyQuery(startTime, endTime);
     }
 
     /// <summary>
@@ -155,42 +157,44 @@ public static string GeneratePartitionKeyQuery(DateOnly date, TimeSpan offset)
     public static string GeneratePartitionKeyQuery(DateOnly date, TimeZoneInfo zone = null)
     {
         // date is assumed to be in local time, will be converted to UTC
-        zone ??= TimeZoneInfo.Local;
-
-        var dateTime = date.ToDateTime(TimeOnly.MinValue);
-        var offset = zone.GetUtcOffset(dateTime);
+        var startTime = date.ToDateTimeOffset(zone);
+        var endTime = date.AddDays(1).ToDateTimeOffset(zone);
 
-        var eventTime = new DateTimeOffset(dateTime, offset);
-        return GeneratePartitionKeyQuery(eventTime);
+        return GeneratePartitionKeyQuery(startTime, endTime);
     }
 #endif
 
     /// <summary>
-    /// Generates the partition key query using the specified <paramref name="eventTime"/>.
+    /// Generates the partition key query using the specified <paramref name="startDate"/> and <paramref name="endDate"/>.
     /// </summary>
-    /// <param name="eventTime">The date to use for query.</param>
+    /// <param name="startDate">The start date to use for query.</param>
+    /// <param name="endDate">The end date to use for query.</param>
     /// <returns>An Azure Table partiion key query.</returns>
-    public static string GeneratePartitionKeyQuery(DateTime eventTime)
+    public static string GeneratePartitionKeyQuery(DateTime startDate, DateTime endDate)
     {
-        var dateTime = eventTime.ToUniversalTime();
-        var dateTimeOffset = new DateTimeOffset(dateTime, TimeSpan.Zero);
+        var startTime = startDate.ToUniversalTime();
+        var startTimeOffset = new DateTimeOffset(startTime, TimeSpan.Zero);
 
-        return GeneratePartitionKeyQuery(dateTimeOffset);
+        var endTime = endDate.ToUniversalTime();
+        var endTimeOffset = new DateTimeOffset(endTime, TimeSpan.Zero);
+
+        return GeneratePartitionKeyQuery(startTimeOffset, endTimeOffset);
     }
 
     /// <summary>
-    /// Generates the partition key query using the specified <paramref name="eventTime"/>.
+    /// Generates the partition key query using the specified <paramref name="startDate"/> and <paramref name="endDate"/>.
     /// </summary>
-    /// <param name="eventTime">The date to use for query.</param>
+    /// <param name="startDate">The start date to use for query.</param>
+    /// <param name="endDate">The end date to use for query.</param>
     /// <returns>An Azure Table partiion key query.</returns>
-    public static string GeneratePartitionKeyQuery(DateTimeOffset eventTime)
+    public static string GeneratePartitionKeyQuery(DateTimeOffset startDate, DateTimeOffset endDate)
     {
-        var dateTime = eventTime.ToUniversalTime();
+        var startTime = startDate.ToUniversalTime();
+        var endTime = endDate.ToUniversalTime();
 
-        var upper = dateTime.ToReverseChronological().Ticks.ToString("D19");
-        var lower = dateTime.AddDays(1).ToReverseChronological().Ticks.ToString("D19");
+        var upper = startTime.ToReverseChronological().Ticks.ToString("D19");
+        var lower = endTime.ToReverseChronological().Ticks.ToString("D19");
 
         return $"({PartitionKeyName} ge '{lower}') and ({PartitionKeyName} lt '{upper}')";
     }
-
 }

test/Serilog.Sinks.AzureTableStorage.Tests/DefaultKeyGeneratorTests.cs

@@ -115,21 +115,26 @@ public void GeneratePartitionKeyQueryDateOnly()
     [Fact]
     public void GeneratePartitionKeyQueryDateTime()
     {
-        var dateTime = new DateTimeOffset(2024, 4, 1, 0, 0, 0, TimeSpan.FromHours(-5));
-        var eventTime = dateTime.UtcDateTime;
+        var startDate = new DateTimeOffset(2024, 4, 1, 0, 0, 0, TimeSpan.FromHours(-5));
+        var startTime = startDate.DateTime;
+
+        var endDate = new DateTimeOffset(2024, 4, 2, 0, 0, 0, TimeSpan.FromHours(-5));
+        var endTime = endDate.DateTime;
 
-        var partitionKeyQuery = DefaultKeyGenerator.GeneratePartitionKeyQuery(eventTime);
+        var partitionKeyQuery = DefaultKeyGenerator.GeneratePartitionKeyQuery(startTime, endTime);
         partitionKeyQuery.Should().NotBeNull();
         partitionKeyQuery.Should().Be("(PartitionKey ge '2516902667999999999') and (PartitionKey lt '2516903531999999999')");
     }
 
     [Fact]
     public void GeneratePartitionKeyQueryDateTimeOffset()
     {
-        var dateTime = new DateTimeOffset(2024, 4, 1, 0, 0, 0, TimeSpan.FromHours(-5));
+        var startTime = new DateTimeOffset(2024, 4, 1, 0, 0, 0, TimeSpan.FromHours(-5));
+        var endTime = new DateTimeOffset(2024, 4, 2, 0, 0, 0, TimeSpan.FromHours(-5));
 
-        var partitionKeyQuery = DefaultKeyGenerator.GeneratePartitionKeyQuery(dateTime);
+        var partitionKeyQuery = DefaultKeyGenerator.GeneratePartitionKeyQuery(startTime, endTime);
         partitionKeyQuery.Should().NotBeNull();
         partitionKeyQuery.Should().Be("(PartitionKey ge '2516902667999999999') and (PartitionKey lt '2516903531999999999')");
     }
+
 }