Merge pull request #119 from Research-Institute/fix/#118

add support for deserializing datetimeoffset format

Author: jaredcnance

src/JsonApiDotNetCore/Internal/TypeHelper.cs

@@ -1,22 +1,36 @@
 using System;
+using System.Reflection;
 
 namespace JsonApiDotNetCore.Internal
 {
     public static class TypeHelper
     {
         public static object ConvertType(object value, Type type)
         {
-            if(value == null)
-                return null;
+            try
+            {
+                if (value == null)
+                    return null;
+
+                type = Nullable.GetUnderlyingType(type) ?? type;
+
+                var stringValue = value.ToString();
 
-           type = Nullable.GetUnderlyingType(type) ?? type;
+                if (type == typeof(Guid))
+                    return Guid.Parse(stringValue);
 
-            var stringValue = value.ToString();
-            
-            if(type == typeof(Guid))
-                return Guid.Parse(stringValue);
+                if (type == typeof(DateTimeOffset))
+                    return DateTimeOffset.Parse(stringValue);
 
-            return Convert.ChangeType(stringValue, type);
+                return Convert.ChangeType(stringValue, type);
+            }
+            catch (Exception)
+            {
+                if (type.GetTypeInfo().IsValueType)
+                    return Activator.CreateInstance(type);
+
+                return null;
+            }
         }
     }
 }

src/JsonApiDotNetCore/JsonApiDotNetCore.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>2.0.7</VersionPrefix>
+    <VersionPrefix>2.0.8</VersionPrefix>
     <TargetFrameworks>netstandard1.6</TargetFrameworks>
     <AssemblyName>JsonApiDotNetCore</AssemblyName>
     <PackageId>JsonApiDotNetCore</PackageId>

test/UnitTests/Internal/TypeHelper_Tests.cs

@@ -0,0 +1,23 @@
+using System;
+using JsonApiDotNetCore.Internal;
+using Xunit;
+
+namespace UnitTests.Internal
+{
+    public class TypeHelper_Tests
+    {
+        [Fact]
+        public void Can_Convert_DateTimeOffsets()
+        {
+            // arrange
+            var dto = DateTimeOffset.Now;
+            var formattedString = dto.ToString("O");
+
+            // act
+            var result = TypeHelper.ConvertType(formattedString, typeof(DateTimeOffset));
+
+            // assert
+            Assert.Equal(dto, result);
+        }
+    }
+}