Merge pull request #4 from bobhonores/dev/2016.11.28_Add_Support_For_…

…Nullable Update ResourceConverterExtenstions.cs
eoin55 · Nov 28, 2016 · c788aed · c788aed
2 parents dd58ae5 + 2711934
commit c788aed
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/Src/HoneyBear.HalClient.Unit.Tests/HalClientTestContext.cs b/Src/HoneyBear.HalClient.Unit.Tests/HalClientTestContext.cs
@@ -47,7 +47,7 @@ public HalClientTestContext()
             _http = _fixture.Freeze<IJsonHttpClient>();
 
             _version = _fixture.Create<Version>();
-            _order = _fixture.Create<Order>();
+            _order = _fixture.Build<Order>().With(x => x.DeliveryDate, null).Create();
             _orderItem = _fixture.Create<OrderItem>();
             _paged = _fixture.Create<PagedList>();
             OrderAdd = _fixture.Create<OrderAdd>();
@@ -361,6 +361,7 @@ private object CreateSingleResourceJson() =>
                 _order.OrderRef,
                 _order.OrderNumber,
                 _order.Status,
+                _order.DeliveryDate,
                 _order.Total,
                 _links =
                     new
@@ -400,6 +401,7 @@ private object CreateSingleResourceJsonWithoutCurie() =>
                 _order.OrderRef,
                 _order.OrderNumber,
                 _order.Status,
+                _order.DeliveryDate,
                 _order.Total,
                 _links =
                     new
@@ -492,6 +494,7 @@ private object CreatePagedResourceWithEmbeddedArrayOfResourcesJson() =>
                                     _order.OrderRef,
                                     _order.OrderNumber,
                                     _order.Status,
+                                    _order.DeliveryDate,
                                     _order.Total,
                                     _links =
                                         new
@@ -533,6 +536,7 @@ private object CreatePagedResourceWithLinkedArrayOfResourcesJson() =>
                                     _order.OrderRef,
                                     _order.OrderNumber,
                                     _order.Status,
+                                    _order.DeliveryDate,
                                     _order.Total,
                                     _links =
                                         new
@@ -607,6 +611,7 @@ private object CreateDefaultPagedResourceJson() =>
                                     _order.OrderRef,
                                     _order.OrderNumber,
                                     _order.Status,
+                                    _order.DeliveryDate,
                                     _order.Total,
                                     _links =
                                         new

diff --git a/Src/HoneyBear.HalClient.Unit.Tests/ProxyResources/Order.cs b/Src/HoneyBear.HalClient.Unit.Tests/ProxyResources/Order.cs
@@ -8,6 +8,7 @@ internal class Order
         public Guid OrderRef { get; set; }
         public string OrderNumber { get; set; }
         public string Status { get; set; }
+        public DateTime? DeliveryDate { get; set; }
         public Money Total { get; set; }
     }
-}
+}
diff --git a/Src/HoneyBear.HalClient/Models/ResourceConverterExtenstions.cs b/Src/HoneyBear.HalClient/Models/ResourceConverterExtenstions.cs
@@ -33,8 +33,10 @@ internal static T Data<T>(this IResource source)
                     value = complex.ToObject(propertyType);
                 else if (array != null)
                     value = array.ToObject(propertyType);
-                else
+                else if (pair.Value != null)
                     value = TypeDescriptor.GetConverter(propertyType).ConvertFromInvariantString(pair.Value.ToString());
+                else
+                    value = null;
 
                 property.SetValue(data, value, null);
             }
@@ -52,4 +54,4 @@ public static IEnumerable<T> Data<T>(this IEnumerable<IResource<T>> source)
             where T : class, new()
             => source.Select(s => s.Data);
     }
-}
+}