Handle "NA" object sections in FundamentalData responses

EODHistoricalData.Wrapper.Tests/FundamentalDataDeserializationTests.cs

@@ -0,0 +1,68 @@
+using EOD.Model.Fundamental;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Newtonsoft.Json;
+
+namespace EODHistoricalData.Wrapper.NetCore.Tests
+{
+    [TestClass]
+    public class FundamentalDataDeserializationTests
+    {
+        [TestMethod]
+        public void Deserialize_FundamentalDataWithNaObjectSections_ReturnsNullSections()
+        {
+            const string json = @"
+{
+  ""General"": {
+    ""Code"": ""SPIEX"",
+    ""Type"": ""INDEX"",
+    ""Name"": ""Swiss Performance Extra"",
+    ""Exchange"": ""INDX"",
+    ""MarketCap"": null,
+    ""CurrencyCode"": ""CHF"",
+    ""CurrencyName"": ""Swiss Franc"",
+    ""CurrencySymbol"": ""CHF"",
+    ""CountryName"": ""Switzerland"",
+    ""CountryISO"": ""CH"",
+    ""OpenFigi"": null
+  },
+  ""SharesStats"": ""NA"",
+  ""ESGScores"": ""NA""
+}";
+
+            FundamentalData result = JsonConvert.DeserializeObject<FundamentalData>(json);
+
+            Assert.IsNotNull(result);
+            Assert.IsNotNull(result.General);
+            Assert.AreEqual("SPIEX", result.General.Code);
+            Assert.AreEqual("Swiss Performance Extra", result.General.Name);
+            Assert.IsNull(result.SharesStats);
+            Assert.IsNull(result.ESGScores);
+        }
+
+        [TestMethod]
+        public void Deserialize_FundamentalDataWithObjectSections_PopulatesSections()
+        {
+            const string json = @"
+{
+  ""SharesStats"": {
+    ""SharesOutstanding"": 1000,
+    ""SharesFloat"": 750
+  },
+  ""ESGScores"": {
+    ""TotalEsg"": 12.3,
+    ""EnvironmentScore"": 4.5
+  }
+}";
+
+            FundamentalData result = JsonConvert.DeserializeObject<FundamentalData>(json);
+
+            Assert.IsNotNull(result);
+            Assert.IsNotNull(result.SharesStats);
+            Assert.AreEqual(1000, result.SharesStats.SharesOutstanding);
+            Assert.AreEqual(750, result.SharesStats.SharesFloat);
+            Assert.IsNotNull(result.ESGScores);
+            Assert.AreEqual(12.3, result.ESGScores.TotalEsg);
+            Assert.AreEqual(4.5, result.ESGScores.EnvironmentScore);
+        }
+    }
+}

EODHistoricalData.Wrapper/Model/Fundamental/FundamentalData.cs

@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
+using EODHistoricalData.Wrapper.Utils;
 
 namespace EOD.Model.Fundamental
 {
@@ -11,75 +12,93 @@ public class FundamentalData
         /// <summary>
         /// 
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         public General General { get; set; }
         /// <summary>
         /// 
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         public Highlights Highlights { get; set; }
         /// <summary>
         /// 
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         public Valuation Valuation { get; set; }
         /// <summary>
         /// 
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         public SharesStats SharesStats { get; set; }
         /// <summary>
         /// 
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         public SplitsDividends SplitsDividends { get; set; }
         /// <summary>
         /// 
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         public AnalystRatings AnalystRatings { get; set; }
         /// <summary>
         /// 
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         public Holders Holders { get; set; }
         /// <summary>
         /// 
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         public Dictionary<string, InsiderTransactions> InsiderTransactions { get; set; }
         /// <summary>
         /// 
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         public ESGScores ESGScores { get; set; }
         /// <summary>
         /// 
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         public OutstandingShares OutstandingShares { get; set; }
         /// <summary>
         /// 
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         public Earnings Earnings { get; set; }
         /// <summary>
         /// 
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         public Financials Financials { get; set; }
         /// <summary>
         /// 
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         public Technicals Technicals { get; set; }
         /// <summary>
         /// 
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         public ETFData ETF_Data { get; set; }
         /// <summary>
         /// 
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         [JsonProperty("MutualFund_Data")] 
         public MutualFundData MutualFund_Data { get; set; }
         /// <summary>
         /// 
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         public Dictionary<int, Component> Components { get; set; }
         /// <summary>
         /// 
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         public Dictionary<int, HistoricalComponent> HistoricalTickerComponents { get; set; }
         /// <summary>
         /// for Crypto
         /// </summary>
+        [JsonConverter(typeof(NaStringToNullConverter))]
         public Statistics Statistics { get; set; }
     }
 }

EODHistoricalData.Wrapper/Utils/NaStringToNullConverter.cs

@@ -0,0 +1,48 @@
+using System;
+
+namespace EODHistoricalData.Wrapper.Utils
+{
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Linq;
+
+    public sealed class NaStringToNullConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            Type type = Nullable.GetUnderlyingType(objectType) ?? objectType;
+
+            return type != typeof(string)
+                   && !type.IsPrimitive
+                   && !type.IsEnum
+                   && type != typeof(decimal)
+                   && type != typeof(DateTime)
+                   && type != typeof(Guid);
+        }
+
+        public override object ReadJson(
+            JsonReader reader,
+            Type objectType,
+            object existingValue,
+            JsonSerializer serializer)
+        {
+            if (reader.TokenType == JsonToken.Null)
+                return null;
+
+            if (reader.TokenType == JsonToken.String)
+            {
+                string value = reader.Value?.ToString();
+
+                if (string.Equals(value, "NA", StringComparison.OrdinalIgnoreCase))
+                    return null;
+            }
+
+            JToken token = JToken.Load(reader);
+            return token.ToObject(objectType, serializer);
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            serializer.Serialize(writer, value);
+        }
+    }
+}