fix: Null bug fix.

Milvasoft · Oct 31, 2024 · fb922c8 · fb922c8
1 parent edef1b5
commit fb922c8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/ExpressionBuilder.Test.NetCore/Unit/Operations/DateEqualToTests.cs b/ExpressionBuilder.Test.NetCore/Unit/Operations/DateEqualToTests.cs
@@ -28,9 +28,9 @@ public DateEqualToTests()
     public void GetExpressionDateTimeValueTest(string propertyName, object value, bool useUtcConversionInDateTypes)
     {
         Settings.UseUtcConversionInDateTypes = useUtcConversionInDateTypes;
-        var dateValue = DateTime.Parse(value.ToString());
-        var startDate = Settings.UseUtcConversionInDateTypes ? dateValue.ToUniversalTime() : dateValue;
-        var endDate = startDate.AddDays(1).AddTicks(-1);
+        DateTime? dateValue = null;
+        var startDate = Settings.UseUtcConversionInDateTypes ? dateValue : dateValue;
+        var endDate = startDate.Value.AddDays(1).AddTicks(-1);
         var operation = new DateEqualTo();
         var param = Expression.Parameter(typeof(Person), "x");
         var member = Expression.Property(param, propertyName);

diff --git a/ExpressionBuilder/ExpressionBuilder.csproj b/ExpressionBuilder/ExpressionBuilder.csproj
@@ -18,7 +18,7 @@
 		</Description>
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-		<Version>1.0.15</Version>
+		<Version>1.0.16</Version>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 		<PackageId>Milvasoft.ExpressionBuilder</PackageId>
 	</PropertyGroup>

diff --git a/ExpressionBuilder/Operations/DateEqualTo.cs b/ExpressionBuilder/Operations/DateEqualTo.cs
@@ -17,8 +17,8 @@ public DateEqualTo() : base(nameof(DateEqualTo), ValueCount, TypeGroup.Date) { }
     /// <inheritdoc />
     public override Expression GetExpression(MemberExpression member, ConstantExpression constant1, ConstantExpression constant2)
     {
-        if (!IsDateType(constant1))
-            throw new InvalidDataException("DateEqualTo can be used with only date types");
+        if (!IsDateType(member))
+            throw new InvalidDataException("DateEqualTo can be used with only date types!");
 
         if (constant1.Value == null)
             return Expression.Equal(member, constant1);
@@ -81,8 +81,8 @@ private static (ConstantExpression, ConstantExpression) GetStartAndEndDates(Cons
         return (startDateExpression, endDateExpression);
     }
 
-    private static bool IsDateType(ConstantExpression constant) => constant.Type == typeof(DateTime)
-                                                                || constant.Type == typeof(DateTime?)
-                                                                || constant.Type == typeof(DateTimeOffset)
-                                                                || constant.Type == typeof(DateTimeOffset?);
+    private static bool IsDateType(MemberExpression member) => member.Type == typeof(DateTime)
+                                                              || member.Type == typeof(DateTime?)
+                                                              || member.Type == typeof(DateTimeOffset)
+                                                              || member.Type == typeof(DateTimeOffset?);
 }