[Bugfix] added custom converted for CardInfo.Type

MangoPay.SDK.Tests/ApiPayInsTest.cs

@@ -5,10 +5,12 @@
 using System.Threading.Tasks;
 using MangoPay.SDK.Core;
 using MangoPay.SDK.Core.Enumerations;
+using MangoPay.SDK.Core.Serializers;
 using MangoPay.SDK.Entities;
 using MangoPay.SDK.Entities.GET;
 using MangoPay.SDK.Entities.POST;
 using MangoPay.SDK.Entities.PUT;
+using Newtonsoft.Json;
 using NUnit.Framework;
 
 namespace MangoPay.SDK.Tests
@@ -66,9 +68,9 @@
                 var wallet = await this.GetJohnsWallet();
                 var user = await this.GetJohn();
 
                 var payInPost = new PayInPayPalPostDTO(user.Id, new Money { Amount = 1000, Currency = CurrencyIso.EUR }, new Money { Amount = 0, Currency = CurrencyIso.EUR }, wallet.Id, "http://test/test");
 
                 var payIn = await this.Api.PayIns.CreatePayPalAsync(payInPost);
 
                 Assert.IsTrue(payIn.Id.Length > 0);
                 Assert.IsTrue(payIn.PaymentType == PayInPaymentType.PAYPAL);
@@ -198,12 +200,12 @@
                     PostalCode = "11222",
                     Region = "Region"
                 };
                 var payInPost = new PayInPayPalPostDTO(user.Id, new Money { Amount = 1000, Currency = CurrencyIso.EUR }, new Money { Amount = 0, Currency = CurrencyIso.EUR }, wallet.Id, "http://test/test")
                 {
                     ShippingAddress = new ShippingAddress("recipient name", AddressForShippingAddress)
                 };
 
                 var payIn = await this.Api.PayIns.CreatePayPalAsync(payInPost);
 
                 Assert.IsNotNull(payIn.ShippingAddress);
                 Assert.AreEqual("recipient name", payIn.ShippingAddress.RecipientName);
@@ -980,15 +982,15 @@
                 var wallet = await this.GetJohnsWallet();
                 var user = await this.GetJohn();
 
                 var payInPost = new PayInPayPalPostDTO(user.Id, new Money { Amount = 1000, Currency = CurrencyIso.EUR }, new Money { Amount = 0, Currency = CurrencyIso.EUR }, wallet.Id, "http://test/test");
 
                 payIn = await this.Api.PayIns.CreatePayPalAsync(payInPost);
 
                 Assert.IsTrue(payIn.Id.Length > 0);
                 Assert.IsTrue(payIn.PaymentType == PayInPaymentType.PAYPAL);
                 Assert.IsTrue(payIn.ExecutionType == PayInExecutionType.WEB);
 
                 var getPayIn = await this.Api.PayIns.GetPayPalAsync(payIn.Id);
 
                 Assert.IsNotNull(getPayIn);
                 Assert.IsTrue(getPayIn.Id == payIn.Id);
@@ -1017,14 +1019,14 @@
                     Region = "Region"
                 };
 
                 var payInPost = new PayInPayPalPostDTO(user.Id, new Money { Amount = 1000, Currency = CurrencyIso.EUR }, new Money { Amount = 0, Currency = CurrencyIso.EUR }, wallet.Id, "http://test/test")
                 {
                     ShippingAddress = new ShippingAddress("recipient name", addressForShippingAddress)
                 };
 
                 payIn = await this.Api.PayIns.CreatePayPalAsync(payInPost);
 
                 var getPayIn = await this.Api.PayIns.GetPayPalAsync(payIn.Id);
 
                 Assert.IsNotNull(getPayIn.ShippingAddress);
                 Assert.AreEqual("recipient name", getPayIn.ShippingAddress.RecipientName);
@@ -1986,5 +1988,55 @@
                 Assert.Fail(ex.Message);
             }
         }
+
+        [Test]
+        public async Task Test_Serialize_CardInfo()
+        {
+            var settings = new JsonSerializerSettings
+            {
+                Converters = { new CardInfoTypeConverter() }
+            };
+
+            var cardInfo = new CardInfo();
+            cardInfo.Type = null;
+
+            var payIn = new PayInCardDirectDTO();
+            payIn.CardInfo = cardInfo;
+
+            string json = JsonConvert.SerializeObject(payIn, settings);
+            Assert.IsTrue(json.Contains("\"Type\":null"));
+
+            cardInfo.Type = CardInfoType.CREDIT;
+            json = JsonConvert.SerializeObject(payIn, settings);
+            Assert.IsTrue(json.Contains("\"Type\":\"CREDIT\""));
+
+            cardInfo.Type = CardInfoType.CHARGE_CARD;
+            json = JsonConvert.SerializeObject(payIn, settings);
+            Assert.IsTrue(json.Contains("\"Type\":\"CHARGE CARD\""));
+        }
+
+        [Test]
+        public async Task Test_Dserialize_CardInfo()
+        {
+            var settings = new JsonSerializerSettings
+            {
+                Converters = { new CardInfoTypeConverter() }
+            };
+
+            string json =
+                "{\"CardInfo\":{\"BIN\":null,\"IssuingBank\":null,\"IssuerCountryCode\":0,\"Type\":null,\"Brand\":null,\"SubType\":null}}";
+            var deserialized = JsonConvert.DeserializeObject<PayInCardDirectDTO>(json, settings);
+            Assert.AreEqual(null, deserialized.CardInfo.Type);
+
+            json =
+                "{\"CardInfo\":{\"BIN\":null,\"IssuingBank\":null,\"IssuerCountryCode\":0,\"Type\":\"DEBIT\",\"Brand\":null,\"SubType\":null}}";
+            deserialized = JsonConvert.DeserializeObject<PayInCardDirectDTO>(json, settings);
+            Assert.AreEqual(CardInfoType.DEBIT, deserialized.CardInfo.Type);
+
+            json =
+                "{\"CardInfo\":{\"BIN\":null,\"IssuingBank\":null,\"IssuerCountryCode\":0,\"Type\":\"CHARGE_CARD\",\"Brand\":null,\"SubType\":null}}";
+            deserialized = JsonConvert.DeserializeObject<PayInCardDirectDTO>(json, settings);
+            Assert.AreEqual(CardInfoType.CHARGE_CARD, deserialized.CardInfo.Type);
+        }
     }
 }

MangoPay.SDK/Core/Serializers/CardInfoTypeConverter.cs

@@ -0,0 +1,35 @@
+using System;
+using MangoPay.SDK.Core.Enumerations;
+using Newtonsoft.Json;
+
+namespace MangoPay.SDK.Core.Serializers
+{
+    /// <summary>
+    /// Serialize "CHARGE_CARD" as "CHARGE CARD"
+    /// </summary>
+    public class CardInfoTypeConverter : JsonConverter<CardInfoType?>
+    {
+        public override void WriteJson(JsonWriter writer, CardInfoType? value, JsonSerializer serializer)
+        {
+            if (value == null)
+            {
+                writer.WriteNull();
+                return;
+            }
+            var stringValue = value == CardInfoType.CHARGE_CARD ? "CHARGE CARD" : value.ToString();
+            writer.WriteValue(stringValue);
+        }
+
+        public override CardInfoType? ReadJson(JsonReader reader, Type objectType, CardInfoType? existingValue,
+            bool hasExistingValue, JsonSerializer serializer)
+        {
+            if (reader.Value == null)
+            {
+                return null;
+            }
+            var value = reader.Value.ToString();
+            var cardInfo = value == "CHARGE CARD" ? CardInfoType.CHARGE_CARD : (CardInfoType)Enum.Parse(typeof(CardInfoType), value);
+            return cardInfo;
+        }
+    }
+}

MangoPay.SDK/Entities/CardInfo.cs

@@ -1,4 +1,6 @@
 using MangoPay.SDK.Core.Enumerations;
+using MangoPay.SDK.Core.Serializers;
+using Newtonsoft.Json;
 
 namespace MangoPay.SDK.Entities
 {
@@ -15,6 +17,7 @@ public class CardInfo
         public CountryIso IssuerCountryCode;
 
         /// <summary>The type of card product: DEBIT, CREDIT, CHARGE CARD.</summary>
+        [JsonConverter(typeof(CardInfoTypeConverter))]
         public CardInfoType? Type;
 
         /// <summary>The card brand. Examples include: AMERICAN EXPRESS, DISCOVER, JCB, MASTERCARD, VISA, etc.</summary>