Fix #196

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Master (upcoming 1.8)
 
+## Version 1.7.2
+
+- [**BUGFIX**] Support camel case serialization for relationship names
+
 ## Version 1.7.1
 
 - [**BUGFIX**] Support camel case serialization for nested properties in attributes and meta hashes

Saule/Serialization/ResourceDeserializer.cs

@@ -108,7 +108,7 @@ private JToken SingleToFlatStructure(JObject child)
             foreach (var rel in child["relationships"] ?? new JArray())
             {
                 var prop = rel as JProperty;
-                result.Add(prop?.Name.ToPascalCase(), ToFlatStructure(prop?.Value));
+                result.Add(_propertyNameConverter.ToModelPropertyName(prop?.Name), ToFlatStructure(prop?.Value));
             }
 
             return result;

Saule/Serialization/ResourceGraphNodeKey.cs

@@ -17,7 +17,7 @@ public ResourceGraphNodeKey(
             obj.ThrowIfNull(nameof(obj));
             resource.ThrowIfNull(nameof(resource));
 
-            Type = resource.ResourceType.ToDashed();
+            Type = resource.ResourceType;
             if (obj != null)
             {
                 Id = obj.GetValueOfProperty(resource.IdProperty)?.ToString();

Saule/Serialization/ResourceSerializer.cs

@@ -331,7 +331,7 @@ private JObject SerializeRelationships(ResourceGraphNode node)
                     item["data"] = data;
                 }
 
-                response[kv.Key] = item;
+                response[_propertyNameConverter.ToJsonPropertyName(kv.Key)] = item;
             }
 
             return response;

Tests/Integration/PropertyNameConverterTests.cs

@@ -1,4 +1,8 @@
-using System.Threading.Tasks;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
 using Saule.Http;
 using Saule.Serialization;
 using Tests.Helpers;
@@ -8,6 +12,30 @@ namespace Tests.Integration
 {
     public class PropertyNameConverterTests
     {
+        [Fact(DisplayName = "Deserializes complex models correctly")]
+        public async Task DeserializeWorks()
+        {
+            using (var server = new NewSetupJsonApiServer(new JsonApiConfiguration
+            {
+                PropertyNameConverter = new CamelCasePropertyNameConverter()
+            }))
+            {
+                var client = server.GetClient();
+
+                var getResult = await client.GetJsonResponseAsync("api/people/123");
+                getResult.Remove("included");
+
+                var content = new StringContent(getResult.ToString());
+                content.Headers.ContentType = new MediaTypeHeaderValue("application/vnd.api+json");
+                var postResultMessage = await client.PostAsync("api/people/123", content);
+
+                var postResult = JObject.Parse(await postResultMessage.Content.ReadAsStringAsync());
+                postResult.Remove("included");
+
+                Assert.True(JToken.DeepEquals(getResult, postResult));
+            }
+        }
+
         [Fact(DisplayName = "CamelCase constuctor generates attributes in camelCase")]
         public async Task CamelCaseConstructor()
         {
@@ -25,6 +53,28 @@ public async Task CamelCaseConstructor()
             }
         }
 
+        [Fact(DisplayName = "Relationship names are converted correctly")]
+        public async Task CamelCaseRelationships()
+        {
+            using (var server = new NewSetupJsonApiServer(new JsonApiConfiguration
+            {
+                PropertyNameConverter = new CamelCasePropertyNameConverter()
+            }))
+            {
+                var client = server.GetClient();
+
+                var result = await client.GetJsonResponseAsync("api/people/123");
+
+                var relationships = result["data"]["relationships"];
+
+                Assert.NotNull(relationships["secretFriends"]);
+                Assert.NotNull(relationships["familyMembers"]);
+
+                Assert.Null(relationships["secret-friends"]);
+                Assert.Null(relationships["family-members"]);
+            }
+        }
+
         [Fact(DisplayName = "Nested properties in attributes are converted correctly")]
         public async Task CamelCaseNestedAttrs()
         {

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.7.1.{build}
+version: 1.7.2.{build}
 configuration: Release
 skip_tags: true
 assembly_info: