Merge branch 'hotfix/commoditymarketquote-nullreference' into develop

EDCD · Jun 22, 2020 · 7f30854 · 7f30854
2 parents 985dad9 + f7f290c
commit 7f30854
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/DataDefinitions/CommodityMarketQuote.cs b/DataDefinitions/CommodityMarketQuote.cs
@@ -176,11 +176,14 @@ dynamic intStringOrNull(JObject jObject, string key)
                 };
 
                 List<string> StatusFlags = new List<string>();
-                foreach (string statusFlag in capiJSON["statusFlags"])
+                if (capiJSON["statusFlags"] != null)
                 {
-                    StatusFlags.Add(statusFlag);
+                    foreach (string statusFlag in capiJSON["statusFlags"])
+                    {
+                        StatusFlags.Add(statusFlag);
+                    }
+                    quote.StatusFlags = StatusFlags;
                 }
-                quote.StatusFlags = StatusFlags;
             }
             catch (Exception e)
             {

diff --git a/Tests/DataDefinitionTests.cs b/Tests/DataDefinitionTests.cs
@@ -453,5 +453,13 @@ public void TestExtensionMethods()
             Assert.IsTrue(system1.DeepEquals(system3));
             Assert.IsFalse(DeserializeJsonResource<StarSystem>(Resources.sqlStarSystem1).Equals(system3));
         }
+
+        [TestMethod]
+        public void TestCommodityMarketQuoteFromCAPIjson()
+        {
+            string line = @" {""id"":128066403,""categoryname"":""NonMarketable"",""name"":""Drones"",""stock"":9999999,""buyPrice"":101,""sellPrice"":101,""demand"":9999999,""legality"":"""",""meanPrice"":101,""demandBracket"":2,""stockBracket"":2,""locName"":""Limpet""} ";
+            var jObject = JObject.Parse(line);
+            var result = CommodityMarketQuote.FromCapiJson(jObject);
+        }
     }
 }