From 25085b2959bf315814507cef9835d9e2a8d673a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 15 May 2020 03:10:40 +0300
Subject: [PATCH] Improve extension property model binding.

---
 .../AbpExtraPropertyModelBinder.cs            |  4 ++-
 .../ObjectExtendingPropertyInfoExtensions.cs  | 36 ++++++++++++++-----
 .../Volo/Abp/Reflection/TypeHelper.cs         | 13 +++++++
 .../Volo/Abp/Reflection/TypeHelper_Tests.cs   |  8 +++++
 4 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpExtraPropertyModelBinder.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpExtraPropertyModelBinder.cs
index d3f570b1ce..c94ad08e74 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpExtraPropertyModelBinder.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpExtraPropertyModelBinder.cs
@@ -1,7 +1,9 @@
 using System;
+using System.ComponentModel;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Volo.Abp.ObjectExtending;
+using Volo.Abp.Reflection;
 
 namespace Volo.Abp.AspNetCore.Mvc.ModelBinding
 {
@@ -59,7 +61,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ModelBinding
                 return value;
             }
 
-            return Convert.ChangeType(value, propertyInfo.Type);
+            return TypeHelper.ConvertFromString(propertyInfo.Type, value);
         }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/ObjectExtending/ObjectExtendingPropertyInfoExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/ObjectExtending/ObjectExtendingPropertyInfoExtensions.cs
index 9bb6c903a9..04339eedd3 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/ObjectExtending/ObjectExtendingPropertyInfoExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/ObjectExtending/ObjectExtendingPropertyInfoExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Mvc;
 
@@ -6,6 +7,31 @@ namespace Volo.Abp.ObjectExtending
 {
     public static class ObjectExtensionPropertyInfoAspNetCoreMvcExtensions
     {
+        private static readonly HashSet<Type> NumberTypes = new HashSet<Type> {
+            typeof(int),
+            typeof(long),
+            typeof(byte),
+            typeof(sbyte),
+            typeof(short),
+            typeof(ushort),
+            typeof(uint),
+            typeof(long),
+            typeof(ulong),
+            typeof(float),
+            typeof(double),
+            typeof(int?),
+            typeof(long?),
+            typeof(byte?),
+            typeof(sbyte?),
+            typeof(short?),
+            typeof(ushort?),
+            typeof(uint?),
+            typeof(long?),
+            typeof(ulong?),
+            typeof(float?),
+            typeof(double?),
+        };
+
         public static string GetInputType(this ObjectExtensionPropertyInfo propertyInfo)
         {
             foreach (var attribute in propertyInfo.Attributes)
@@ -79,15 +105,7 @@ namespace Volo.Abp.ObjectExtending
                 return "datetime-local";
             }
 
-            if (type == typeof(int) ||
-                type == typeof(long) || 
-                type == typeof(byte) ||
-                type == typeof(sbyte) ||
-                type == typeof(short) ||
-                type == typeof(ushort) ||
-                type == typeof(uint) ||
-                type == typeof(long) ||
-                type == typeof(ulong))
+            if (NumberTypes.Contains(type))
             {
                 return "number";
             }
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs
index 11f43f852e..63b3538c3a 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
@@ -264,5 +265,17 @@ namespace Volo.Abp.Reflection
 
             return type.FullName;
         }
+
+        public static object ConvertFromString<TTargetType>(string value)
+        {
+            return ConvertFromString(typeof(TTargetType), value);
+        }
+
+        public static object ConvertFromString(Type targetType, string value)
+        {
+            return TypeDescriptor
+                .GetConverter(targetType)
+                .ConvertFromString(value);
+        }
     }
 }
diff --git a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/TypeHelper_Tests.cs b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/TypeHelper_Tests.cs
index 23eba093a6..02056aab20 100644
--- a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/TypeHelper_Tests.cs
+++ b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/TypeHelper_Tests.cs
@@ -75,6 +75,14 @@ namespace Volo.Abp.Reflection
             TypeHelper.GetDefaultValue(typeof(string)).ShouldBeNull();
         }
 
+        [Fact]
+        public void ConvertFromString()
+        {
+            TypeHelper.ConvertFromString<int>("42").ShouldBe(42);
+            TypeHelper.ConvertFromString<int?>("42").ShouldBe((int?)42);
+            TypeHelper.ConvertFromString<int?>(null).ShouldBeNull();
+        }
+
         public class MyDictionary : Dictionary<bool, TypeHelper_Tests>
         {