Merge pull request #132 from jasolko/deserialize-enums

fix(deserialization): deserialize enums
json-api-dotnet · Jun 14, 2017 · 94b6a62 · 94b6a62
2 parents 111773f + d45fe14
commit 94b6a62
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/src/JsonApiDotNetCore/Internal/TypeHelper.cs b/src/JsonApiDotNetCore/Internal/TypeHelper.cs
@@ -22,6 +22,9 @@ public static object ConvertType(object value, Type type)
                 if (type == typeof(DateTimeOffset))
                     return DateTimeOffset.Parse(stringValue);
 
+                if (type.GetTypeInfo().IsEnum)
+                    return Enum.Parse(type, stringValue);
+
                 return Convert.ChangeType(stringValue, type);
             }
             catch (Exception e)

diff --git a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>2.0.8</VersionPrefix>
+    <VersionPrefix>2.0.9</VersionPrefix>
     <TargetFrameworks>netstandard1.6</TargetFrameworks>
     <AssemblyName>JsonApiDotNetCore</AssemblyName>
     <PackageId>JsonApiDotNetCore</PackageId>
@@ -21,4 +21,4 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
     <PackageReference Include="System.ValueTuple" Version="4.3.1" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/test/UnitTests/Internal/TypeHelper_Tests.cs b/test/UnitTests/Internal/TypeHelper_Tests.cs
@@ -30,5 +30,23 @@ public void Bad_DateTimeOffset_String_Throws()
             // assert
             Assert.Throws<FormatException>(() => TypeHelper.ConvertType(formattedString, typeof(DateTimeOffset)));
         }
+
+        [Fact]
+        public void Can_Convert_Enums()
+        {
+            // arrange
+            var formattedString = "1";
+
+            // act
+            var result = TypeHelper.ConvertType(formattedString, typeof(TestEnum));
+
+            // assert
+            Assert.Equal(TestEnum.Test, result);
+        }
+
+        public enum TestEnum
+        {
+            Test = 1
+        }
     }
 }