Merge pull request #806 from clement911/charge-test-fix

Fix for Charge.test serialization
nozzlegear · Nov 11, 2022 · 7528eb5 · 7528eb5
2 parents 52fdbef + ebebc47
commit 7528eb5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/ShopifySharp.Tests/FalseToNullConverter_Tests.cs b/ShopifySharp.Tests/FalseToNullConverter_Tests.cs
@@ -1,5 +1,7 @@
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using ShopifySharp.Converters;
+using ShopifySharp.Infrastructure;
 using Xunit;
 
 namespace ShopifySharp.Tests
@@ -12,6 +14,25 @@ public FalseToNullConverter_Tests()
 
         }
 
+        [Fact]
+        public void SerializeChargeTest()
+        {
+            var charge = Serializer.Deserialize<RecurringCharge>("{ \"test\" : true }");
+            Assert.True(charge.Test);
+
+            charge = Serializer.Deserialize<RecurringCharge>("{ \"test\" : null }");
+            Assert.False(charge.Test);
+
+            charge = Serializer.Deserialize<RecurringCharge>("{ \"test\" : false }");
+            Assert.False(charge.Test);
+
+            Assert.True(JObject.Parse(Serializer.Serialize(new RecurringCharge { Test = true })).Value<bool?>("test"));
+
+            Assert.Null(JObject.Parse(Serializer.Serialize(new RecurringCharge { Test = false })).Value<bool?>("test"));
+
+            Assert.Null(JObject.Parse(Serializer.Serialize(new RecurringCharge { Test = null })).Value<bool?>("test"));
+        }
+
         [Fact]
         public void SerializeTrue()
         {

diff --git a/ShopifySharp/Entities/Charge.cs b/ShopifySharp/Entities/Charge.cs
@@ -55,7 +55,7 @@ public class Charge : ShopifyObject
         /// States whether or not the application charge is a test transaction.
         /// </summary>
         /// <remarks>Valid values are 'true' or null. Needs a special converter to convert null to false and vice-versa.</remarks>
-        [JsonProperty("test"), JsonConverter(typeof(FalseToNullConverter))]
+        [JsonProperty("test", NullValueHandling = NullValueHandling.Include), JsonConverter(typeof(FalseToNullConverter))]
         public bool? Test { get; set; }
 
         /// <summary>

diff --git a/ShopifySharp/Entities/RecurringCharge.cs b/ShopifySharp/Entities/RecurringCharge.cs
@@ -87,7 +87,7 @@ public class RecurringCharge : ShopifyObject
         /// States whether or not the application charge is a test transaction.
         /// </summary>
         /// <remarks>Valid values are 'true' or null. Needs a special converter to convert null to false and vice-versa.</remarks>
-        [JsonProperty("test"), JsonConverter(typeof(FalseToNullConverter))]
+        [JsonProperty("test", NullValueHandling = NullValueHandling.Include), JsonConverter(typeof(FalseToNullConverter))]
         public bool? Test { get; set; }
 
         /// <summary>