try set value inner for enumerable type bug fix, null check

NetCoreStack · Feb 16, 2018 · 60dfe9a · 60dfe9a
1 parent 58b9f42
commit 60dfe9a
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 3 deletions.
diff --git a/src/NetCoreStack.Proxy/DefaultModelContentResolver.cs b/src/NetCoreStack.Proxy/DefaultModelContentResolver.cs
@@ -118,6 +118,11 @@ private void TrySetValueInner(string key, ProxyModelMetadata modelMetadata, Mode
                     var index = 0;
                     foreach (var v in values)
                     {
+                        if (v == null)
+                        {
+                            continue;
+                        }
+
                         var propKey = $"{key}[{index}]";
                         var propValue = propertyInfo?.GetValue(v);
                         ResolveInternal(elementModelMetadata, result, propValue, isTopLevelObject:false, prefix: propKey);

diff --git a/src/NetCoreStack.Proxy/NetCoreStack.Proxy.csproj b/src/NetCoreStack.Proxy/NetCoreStack.Proxy.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
-    <PackageReference Include="NetCoreStack.Contracts" Version="2.0.5" />
+    <PackageReference Include="NetCoreStack.Contracts" Version="2.0.6" />
     <PackageReference Include="NetCoreStack.DispatchProxyAsync" Version="2.0.2" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />

diff --git a/test/NetCoreStack.Proxy.Test.Contracts/NetCoreStack.Proxy.Test.Contracts.csproj b/test/NetCoreStack.Proxy.Test.Contracts/NetCoreStack.Proxy.Test.Contracts.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.2" />
-    <PackageReference Include="NetCoreStack.Contracts" Version="2.0.5" />
+    <PackageReference Include="NetCoreStack.Contracts" Version="2.0.6" />
   </ItemGroup>
 
 </Project>
diff --git a/test/NetCoreStack.Proxy.Test.Contracts/TypesModel.cs b/test/NetCoreStack.Proxy.Test.Contracts/TypesModel.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Http;
+using NetCoreStack.Contracts;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -66,6 +67,12 @@ public class Foo
         public IEnumerable<int> IEnumerableInt { get; set; }
     }
 
+    public class FooColumns
+    {
+        public string String { get; set; }
+        public List<Column> IEnumerableColumns { get; set; }
+    }
+
     public class Bar
     {
         public string String { get; set; }

diff --git a/test/NetCoreStack.Proxy.Tests/ModelTypeTests.cs b/test/NetCoreStack.Proxy.Tests/ModelTypeTests.cs
@@ -1,8 +1,11 @@
-using NetCoreStack.Proxy.Internal;
+using NetCoreStack.Contracts;
+using NetCoreStack.Proxy.Internal;
 using NetCoreStack.Proxy.Test.Contracts;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using Xunit;
 
@@ -167,6 +170,25 @@ public void ProxyModelMetadataInfoForFooModel()
             Assert.Equal(6, contentResult.Dictionary.Count);
         }
 
+        [Fact]
+        public void ProxyModelMetadataInfoForFooModelNull()
+        {
+            Foo model = new Foo
+            {
+                String = "Foo string value!",
+                IEnumerableInt = null
+            };
+
+            var contentResult = GetResolvedContentResult(model);
+
+            var expect = new Dictionary<string, string>()
+            {
+                ["String"] = "Foo string value!"
+            };
+
+            Assert.Equal(expect, contentResult.Dictionary);
+        }
+
         [Fact]
         public void ProxyModelMetadataInfoForBarModel()
         {
@@ -414,6 +436,24 @@ public void ProxyModelMetadataInfoForFileModel()
             Assert.Equal("some_text_file.txt", files["InnerFileModel.Files[0]"].FileName);
         }
 
+        [Fact]
+        public void FooColumnEnumerableNullItemTest()
+        {
+            var objStr = File.ReadAllText("ObjFile.txt");
+            CollectionRequest collection = JsonConvert.DeserializeObject<CollectionRequest>(objStr);
+
+            var fooColums = new FooColumns {
+                IEnumerableColumns = new List<Column>()
+            };
+            foreach (var item in collection.Columns)
+            {
+                fooColums.IEnumerableColumns.Add(item);
+            }
+
+            var contentResult = GetResolvedContentResult(collection);
+            Assert.True(true);
+        }
+
         [Fact]
         public void XmlSerializationTest()
         {

diff --git a/test/NetCoreStack.Proxy.Tests/NetCoreStack.Proxy.Tests.csproj b/test/NetCoreStack.Proxy.Tests/NetCoreStack.Proxy.Tests.csproj
@@ -26,6 +26,9 @@
     <None Update="appsettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="ObjFile.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>
diff --git a/test/NetCoreStack.Proxy.Tests/ObjFile.txt b/test/NetCoreStack.Proxy.Tests/ObjFile.txt
@@ -0,0 +1 @@
+{"Metadata":"NetCoreStack.Domain.Contracts.AlbumKnockoutValidatorViewModel","Draw":1,"Length":10,"Start":0,"Text":null,"Search":null,"Filters":null,"Order":null,"Columns":[{"Data":"id","Meta":"String?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"genreId","Meta":"Int64?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"artist","Meta":"String?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"title","Meta":"String?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"title","Meta":"String?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"title","Meta":"String?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"title","Meta":"String?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"title","Meta":"String?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"title","Meta":"String?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"price","Meta":"Decimal?","Composer":"","Searchable":true,"Orderable":true,"Search":null},null]}
diff --git a/test/NetCoreStack.Proxy.Tests/httplive.db b/test/NetCoreStack.Proxy.Tests/httplive.db
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"Metadata":"NetCoreStack.Domain.Contracts.AlbumKnockoutValidatorViewModel","Draw":1,"Length":10,"Start":0,"Text":null,"Search":null,"Filters":null,"Order":null,"Columns":[{"Data":"id","Meta":"String?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"genreId","Meta":"Int64?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"artist","Meta":"String?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"title","Meta":"String?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"title","Meta":"String?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"title","Meta":"String?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"title","Meta":"String?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"title","Meta":"String?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"title","Meta":"String?","Composer":"","Searchable":true,"Orderable":true,"Search":null},{"Data":"price","Meta":"Decimal?","Composer":"","Searchable":true,"Orderable":true,"Search":null},null]}