Skip to content

Commit 833861b

Browse files
Fix DateTime to DateTimeOffset conversion (#478)
1 parent 3018ac3 commit 833861b

2 files changed

Lines changed: 24 additions & 1 deletion

File tree

net/DevExtreme.AspNet.Data.Tests/FilterExpressionCompilerTypeConversionTests.cs

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
using System;
1+
using Newtonsoft.Json;
2+
using System;
3+
using System.Collections;
24
using System.Collections.Generic;
35
using System.Linq;
46
using System.Threading.Tasks;
@@ -223,6 +225,24 @@ public void StringFuncOnTimeSpan() {
223225
AssertEvaluation(obj, new[] { "NullableTime", "contains", "23" });
224226
}
225227

228+
[Theory]
229+
[InlineData(DateParseHandling.None)]
230+
[InlineData(DateParseHandling.DateTime)]
231+
[InlineData(DateParseHandling.DateTimeOffset)]
232+
public void Issue477(DateParseHandling dateParseHandling) {
233+
var date = new DateTimeOffset(2021, 1, 1, 0, 0, 0, TimeSpan.Zero);
234+
var filterJSON = JsonConvert.SerializeObject(new object[] { "this", date });
235+
var deserializedFilter = JsonConvert.DeserializeObject<IList>(filterJSON, new JsonSerializerSettings {
236+
DateParseHandling = dateParseHandling
237+
});
238+
239+
var loadOptions = new SampleLoadOptions {
240+
Filter = deserializedFilter
241+
};
242+
243+
var loadResult = DataSourceLoader.Load(new[] { date }, loadOptions);
244+
Assert.Single(loadResult.data);
245+
}
226246
}
227247

228248
}

net/DevExtreme.AspNet.Data/Utils.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ public static object ConvertClientValue(object value, Type type) {
4747
if(type == typeof(DateTime) && value is String)
4848
return DateTime.Parse((string)value, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind);
4949

50+
if(type == typeof(DateTimeOffset) && value is DateTime date)
51+
return new DateTimeOffset(date);
52+
5053
var converter = TypeDescriptor.GetConverter(type);
5154
if(converter != null && converter.CanConvertFrom(value.GetType()))
5255
return converter.ConvertFrom(null, CultureInfo.InvariantCulture, value);

0 commit comments

Comments
 (0)