Merge pull request #78 from GavinPower747/development

Release 1.8.1

Author: GavinPower747

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.8.0.{build}
+version: 1.8.1.{build}
 image: Visual Studio 2017
 skip_tags: true
 

src/pubg-dotnet/Infrastructure/JsonConverters/RelationshipIdConverter.cs

@@ -12,12 +12,18 @@ public class RelationshipIdConverter : JsonConverter
 
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            JObject jo = JObject.Load(reader);
-            var dataToken = jo.SelectToken("data");
+            //if the reader is not reading a relationship object just deserialize as normal.
+            //This allows us to serialize and deserialize multiple times after converting from the Json-API format
+            if (reader.TokenType != JsonToken.StartObject)
+                return serializer.Deserialize(reader, objectType);
 
+            JToken jt = JToken.Load(reader);
+
+            var dataToken = jt.SelectToken("data");
+            
             if (objectType == typeof(string))
                 return dataToken["id"].ToString();
-
+            
             return dataToken.Select(x => (string)x["id"]).ToList();
         }
 

src/pubg-dotnet/pubg-dotnet.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Sync and Async client library for communicating with the Pubg Developer API supporting .net standard 2.0</Description>
     <AssemblyTitle>Pubg.Net</AssemblyTitle>
-    <Version>1.8.0</Version>
+    <Version>1.8.1</Version>
     <Authors>Gavin Power</Authors>
     <TargetFramework>netstandard2.0;net45</TargetFramework>
     <AssemblyName>Pubg.Net</AssemblyName>

test/pubg-dotnet.UnitTests/JsonConverters/RelationshipIdConverterTests.cs

@@ -0,0 +1,121 @@
+using FluentAssertions;
+using JsonApiSerializer;
+using Newtonsoft.Json;
+using Pubg.Net.Infrastructure.JsonConverters;
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Pubg.Net.UnitTests.JsonConverters
+{
+    public class RelationshipIdConverterTests
+    {
+        public class TestArticle
+        {
+            [JsonProperty]
+            public int Id { get; set; }
+
+            [JsonProperty]
+            public string Title { get; set; }
+
+            [JsonProperty]
+            public string Body { get; set; }
+
+            [JsonProperty]
+            public DateTime Created { get; set; }
+
+            [JsonProperty]
+            public DateTime Updated { get; set; }
+
+            [JsonProperty("author")]
+            [JsonConverter(typeof(RelationshipIdConverter))]
+            public IEnumerable<string> AuthorIds { get; set; }
+        }
+
+        string jsonApiLiteral =
+            @"{
+                ""data"": 
+                {
+                  ""type"": ""TestArticle"",
+                  ""id"": ""1"",
+                  ""attributes"": 
+                  {
+                    ""title"": ""JSON API paints my bikeshed!"",
+                    ""body"": ""The shortest article. Ever."",
+                    ""created"": ""2015-05-22T14:56:29.000Z"",
+                    ""updated"": ""2015-05-22T14:56:28.000Z""
+                  },
+                  ""relationships"": 
+                   {
+                      ""author"": 
+                      {
+                        ""data"": 
+                        [ 
+                          {""id"": 42, ""type"": ""people""},
+                          {""id"": 43, ""type"": ""people""},
+                          {""id"": 44, ""type"": ""people""},
+                          {""id"": 45, ""type"": ""people""}
+                        ]
+                      }
+                   }
+                }
+            }";
+
+        [Fact]
+        public void RelationshipIdConverter_Converts_FromJsonApiFormat()
+        {
+            TestArticle testArticle = JsonConvert.DeserializeObject<TestArticle>(jsonApiLiteral, new JsonApiSerializerSettings());
+
+            testArticle.Id.Should().Equals(1);
+            testArticle.Title.Should().Equals("JSON API paints my bikeshed!");
+            testArticle.Body.Should().Equals("The shortest article. Ever.");
+            testArticle.Created.Should().Equals(Convert.ToDateTime("2015-05-22T14:56:29.000Z"));
+            testArticle.Updated.Should().Equals(Convert.ToDateTime("2015-05-22T14:56:28.000Z"));
+            testArticle.AuthorIds.Should().NotBeNullOrEmpty();
+            testArticle.AuthorIds.Should().Contain(new [] { "42", "43", "44", "45" });
+        }
+
+        [Fact]
+        public void RelationshipIdConverter_Converts_FromJsonApiFormat_MultipleTimes()
+        {
+            TestArticle testArticle = JsonConvert.DeserializeObject<TestArticle>(jsonApiLiteral, new JsonApiSerializerSettings());
+
+            var reserializedArticle = JsonConvert.SerializeObject(testArticle);
+            var deserializedArticle = JsonConvert.DeserializeObject<TestArticle>(reserializedArticle);
+
+            deserializedArticle.Id.Should().Equals(1);
+            deserializedArticle.Title.Should().Equals("JSON API paints my bikeshed!");
+            deserializedArticle.Body.Should().Equals("The shortest article. Ever.");
+            deserializedArticle.Created.Should().Equals(Convert.ToDateTime("2015-05-22T14:56:29.000Z"));
+            deserializedArticle.Updated.Should().Equals(Convert.ToDateTime("2015-05-22T14:56:28.000Z"));
+            deserializedArticle.AuthorIds.Should().NotBeNullOrEmpty();
+            deserializedArticle.AuthorIds.Should().Contain(new[] { "42", "43", "44", "45" });
+        }
+
+        [Fact]
+        public void RelationshipIdConverter_Converts_FromApplicationJson()
+        {
+            var baseArticle = new TestArticle
+            {
+                Id = 1,
+                Title = "adsd",
+                Body = "asda",
+                Created = Convert.ToDateTime("2015-05-22T14:56:29.000Z"),
+                Updated = Convert.ToDateTime("2015-05-22T14:56:29.000Z"),
+                AuthorIds = new[] { "11", "12" }
+            };
+
+            var serializedArticle = JsonConvert.SerializeObject(baseArticle);
+
+            var deSerialzedArticle = JsonConvert.DeserializeObject<TestArticle>(serializedArticle);
+
+            deSerialzedArticle.Id.Should().Equals(baseArticle.Id);
+            deSerialzedArticle.Title.Should().Equals(baseArticle.Title);
+            deSerialzedArticle.Body.Should().Equals(baseArticle.Body);
+            deSerialzedArticle.Created.Should().Equals(baseArticle.Created);
+            deSerialzedArticle.Updated.Should().Equals(baseArticle.Updated);
+            deSerialzedArticle.AuthorIds.Should().NotBeNullOrEmpty();
+            deSerialzedArticle.AuthorIds.Should().Contain(baseArticle.AuthorIds);
+        }
+    }
+}