fix: Fix timezone bounded date expression creation.

Author: bugrakosen

ExpressionBuilder.Test.NetCore/Unit/Helpers/TestData.cs

@@ -38,8 +38,8 @@ public TestData()
             new Person { Name = "Jane Jones", Gender = PersonGender.Female, Salary=3500, Birth = new Person.BirthData { Date = new DateTime(1980, 12, 20), Country = "AUS" } },
             new Person { Name = "Fulano Silva", Gender = PersonGender.Male, Salary=3322, Birth = new Person.BirthData { Date = new DateTime(1983, 5, 10), Country = "BRA" }, Employer = company, Manager = manager2, EmployeeReferenceNumber = 986543434323 },
             new Person { Name = "John Hancock", Gender = PersonGender.Male, Employer = company },
-            new Person { Name = "Jack Luffy", SalaryDate = new DateTime(2024, 10, 29, 23, 10, 10, DateTimeKind.Local), Gender = PersonGender.Male, Employer = company },
-            new Person { Name = "Jack Luffy", SalaryDateOffset = new DateTimeOffset(2024, 10, 29, 23, 10, 10, new TimeSpan(3, 0, 0)), Gender = PersonGender.Male, Employer = company },
+            new Person { Name = "Jack Luffy 30-21", SalaryDate = new DateTime(2024, 10, 30, 21, 10, 10, DateTimeKind.Utc), Gender = PersonGender.Male, Employer = company },
+            new Person { Name = "Jack Luffy Offset 30-21", SalaryDateOffset = new DateTimeOffset(2024, 10, 30, 21, 10, 10, TimeSpan.Zero), Gender = PersonGender.Male, Employer = company },
         ];
         var id = 1;
         foreach (var person in People)

ExpressionBuilder.Test.NetCore/Unit/Operations/DateEqualToTests.cs

@@ -20,12 +20,13 @@ public DateEqualToTests()
         TestData = new TestData();
     }
 
-    [TestCase("SalaryDate", "2024-10-29", TestName = "'DateEqualTo' operation - Get expression (DateTime? value)")]
+    [TestCase("SalaryDate", "2024-10-31", TestName = "'DateEqualTo' operation - Get expression (DateTime? value)")]
+    [TestCase("SalaryDate", "2024-10-30", TestName = "'DateEqualTo' operation - Get expression (DateTime? value)")]
     public void GetExpressionDateTimeValueTest(string propertyName, object value)
     {
         var dateValue = DateTime.Parse(value.ToString());
-        dateValue = new DateTime(dateValue.Year, dateValue.Month, dateValue.Day, 0, 0, 0, DateTimeKind.Utc);
-        var endDate = dateValue.AddDays(1).AddTicks(-1);
+        var startDate = dateValue.ToUniversalTime();
+        var endDate = startDate.AddDays(1).AddTicks(-1);
         var operation = new DateEqualTo();
         var param = Expression.Parameter(typeof(Person), "x");
         var member = Expression.Property(param, propertyName);
@@ -44,29 +45,30 @@ public void GetExpressionDateTimeValueTest(string propertyName, object value)
         Assert.That((shouldSubjectLeft.Left as MemberExpression).Member.Name, Is.EqualTo("Value"));
         Assert.That(shouldSubjectLeft.NodeType, Is.EqualTo(ExpressionType.GreaterThanOrEqual));
         Assert.That(shouldSubjectLeft.Right, Is.AssignableFrom<ConstantExpression>());
-        Assert.That((shouldSubjectLeft.Right as ConstantExpression).Value, Is.LessThanOrEqualTo(dateValue));
+        Assert.That((shouldSubjectLeft.Right as ConstantExpression).Value, Is.GreaterThanOrEqualTo(startDate));
 
         var shouldSubjectRight = (BinaryExpression)((BinaryExpression)expression.Right).Right;
         Assert.That((shouldSubjectRight.Left as MemberExpression).Member.Name, Is.EqualTo("Value"));
         Assert.That(shouldSubjectRight.NodeType, Is.EqualTo(ExpressionType.LessThanOrEqual));
         Assert.That(shouldSubjectRight.Right, Is.AssignableFrom<ConstantExpression>());
-        Assert.That((shouldSubjectRight.Right as ConstantExpression).Value, Is.GreaterThanOrEqualTo(dateValue));
+        Assert.That((shouldSubjectRight.Right as ConstantExpression).Value, Is.LessThanOrEqualTo(endDate));
 
         //Testing the operation execution
         var lambda = Expression.Lambda<Func<Person, bool>>(expression, param);
         var people = TestData.People.Where(lambda.Compile());
-        var solutionMethod = (Func<Person, bool>)GetType().GetMethod(propertyName).Invoke(this, [dateValue, endDate]);
+        var solutionMethod = (Func<Person, bool>)GetType().GetMethod(propertyName).Invoke(this, [startDate, endDate]);
         var solution = TestData.People.Where(solutionMethod);
         Assert.That(people, Is.EquivalentTo(solution));
     }
 
     public static Func<Person, bool> SalaryDate(DateTime startDate, DateTime endDate) => x => x.SalaryDate != null && (x.SalaryDate.Value >= startDate && x.SalaryDate.Value <= endDate);
 
-    [TestCase("SalaryDateOffset", "2024-10-29", TestName = "'DateEqualTo Offset' operation - Get expression (DateTimeOffset? value)")]
+    [TestCase("SalaryDateOffset", "2024-10-31", TestName = "'DateEqualTo Offset' operation - Get expression (DateTimeOffset? value)")]
+    [TestCase("SalaryDateOffset", "2024-10-30", TestName = "'DateEqualTo Offset' operation - Get expression (DateTimeOffset? value)")]
     public void GetExpressionDateTimeOffsetValueTest(string propertyName, object value)
     {
         var dateValue = DateTimeOffset.Parse(value.ToString());
-        dateValue = new DateTimeOffset(dateValue.Year, dateValue.Month, dateValue.Day, 0, 0, 0, TimeSpan.Zero);
+        var startDate = dateValue.ToUniversalTime();
         var endDate = dateValue.AddDays(1).AddTicks(-1);
         var operation = new DateEqualTo();
         var param = Expression.Parameter(typeof(Person), "x");
@@ -97,10 +99,10 @@ public void GetExpressionDateTimeOffsetValueTest(string propertyName, object val
         //Testing the operation execution
         var lambda = Expression.Lambda<Func<Person, bool>>(expression, param);
         var people = TestData.People.Where(lambda.Compile());
-        var solutionMethod = (Func<Person, bool>)GetType().GetMethod(propertyName).Invoke(this, [dateValue, endDate]);
+        var solutionMethod = (Func<Person, bool>)GetType().GetMethod(propertyName).Invoke(this, [startDate, endDate]);
         var solution = TestData.People.Where(solutionMethod);
         Assert.That(people, Is.EquivalentTo(solution));
     }
 
-    public static Func<Person, bool> SalaryDateOffset(DateTimeOffset startDate, DateTimeOffset endDate) => x => x.SalaryDate != null && (x.SalaryDate.Value >= startDate && x.SalaryDate.Value <= endDate);
+    public static Func<Person, bool> SalaryDateOffset(DateTimeOffset startDate, DateTimeOffset endDate) => x => x.SalaryDateOffset != null && (x.SalaryDateOffset.Value >= startDate && x.SalaryDateOffset.Value <= endDate);
 }

ExpressionBuilder/ExpressionBuilder.csproj

@@ -18,7 +18,7 @@
 		</Description>
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-		<Version>1.0.10</Version>
+		<Version>1.0.11</Version>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 		<PackageId>Milvasoft.ExpressionBuilder</PackageId>
 	</PropertyGroup>

ExpressionBuilder/Operations/DateEqualTo.cs

@@ -42,17 +42,29 @@ private static (ConstantExpression, ConstantExpression) GetStartAndEndDates(Cons
         if (constant.Type == typeof(DateTime) || constant.Type == typeof(DateTime?))
         {
             var valueAsDateTime = (DateTime)constant.Value;
-            DateTime startDate = new(valueAsDateTime.Year, valueAsDateTime.Month, valueAsDateTime.Day, 0, 0, 0, kind: DateTimeKind.Utc);
-            DateTime endDate = startDate.AddDays(1).AddTicks(-1);
+
+            // Kullanıcının tarihine göre günün başı ve sonu
+            DateTime startDateLocal = new DateTime(valueAsDateTime.Year, valueAsDateTime.Month, valueAsDateTime.Day, 0, 0, 0, DateTimeKind.Local);
+            DateTime endDateLocal = startDateLocal.AddDays(1).AddTicks(-1);
+
+            // UTC'ye dönüştürme
+            DateTime startDate = startDateLocal.ToUniversalTime();
+            DateTime endDate = endDateLocal.ToUniversalTime();
 
             startDateExpression = Expression.Constant(startDate);
             endDateExpression = Expression.Constant(endDate);
         }
         else if (constant.Type == typeof(DateTimeOffset) || constant.Type == typeof(DateTimeOffset?))
         {
             var valueAsDateTimeOffset = (DateTimeOffset)constant.Value;
-            DateTimeOffset startDate = new(valueAsDateTimeOffset.Year, valueAsDateTimeOffset.Month, valueAsDateTimeOffset.Day, 0, 0, 0, TimeSpan.Zero); // UTC
-            DateTimeOffset endDate = startDate.AddDays(1).AddTicks(-1);
+
+            // Kullanıcının saat dilimine göre gün başlangıcı ve sonu
+            DateTimeOffset startDateLocal = new(valueAsDateTimeOffset.Year, valueAsDateTimeOffset.Month, valueAsDateTimeOffset.Day, 0, 0, 0, valueAsDateTimeOffset.Offset);
+            DateTimeOffset endDateLocal = startDateLocal.AddDays(1).AddTicks(-1);
+
+            // UTC'ye dönüştürme
+            DateTimeOffset startDate = startDateLocal.ToOffset(TimeSpan.Zero);
+            DateTimeOffset endDate = endDateLocal.ToOffset(TimeSpan.Zero);
 
             startDateExpression = Expression.Constant(startDate);
             endDateExpression = Expression.Constant(endDate);