Merge pull request #584 from 0xced/DateTime-key

Convert DateTimeOffset to DateTime when necessary
OData · Dec 20, 2018 · af7ad3f · af7ad3f
2 parents 9a0a1c1 + 05052b7
commit af7ad3f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/Microsoft.Restier.AspNet/Query/RestierQueryBuilder.cs b/src/Microsoft.Restier.AspNet/Query/RestierQueryBuilder.cs
@@ -118,7 +118,7 @@ public IQueryable BuildQuery()
         {
             var property = Expression.Property(parameterExpression, propertyName);
             var constant = Expression.Constant(
-                Convert.ChangeType(propertyValue, property.Type, CultureInfo.InvariantCulture));
+                TypeConverter.ChangeType(propertyValue, property.Type, CultureInfo.InvariantCulture));
             return Expression.Equal(property, constant);
         }
 

diff --git a/src/Microsoft.Restier.Core/Extensions/TypeExtensions.cs b/src/Microsoft.Restier.Core/Extensions/TypeExtensions.cs
@@ -129,4 +129,16 @@ public static bool IsDateTimeOffset(Type type)
             return underlyingTypeOrSelf == typeof(DateTimeOffset);
         }
     }
+
+    internal static class TypeConverter
+    {
+        public static object ChangeType(object value, Type conversionType, IFormatProvider provider)
+        {
+            if (conversionType == typeof(DateTime) && value is DateTimeOffset)
+            {
+                return ((DateTimeOffset)value).DateTime;
+            }
+            return Convert.ChangeType(value, conversionType, provider);
+        }
+    }
 }
diff --git a/src/Microsoft.Restier.Core/Submit/ChangeSetItem.cs b/src/Microsoft.Restier.Core/Submit/ChangeSetItem.cs
@@ -305,7 +305,7 @@ private static Expression ApplyPredicate(ParameterExpression param, Expression w
 
             if (itemValue.GetType() != property.Type)
             {
-                itemValue = Convert.ChangeType(itemValue, property.Type, CultureInfo.InvariantCulture);
+                itemValue = TypeConverter.ChangeType(itemValue, property.Type, CultureInfo.InvariantCulture);
             }
 
             // TODO GitHubIssue#31 : Check if LinqParameterContainer is necessary