refactor(links): add poco Links class

Author: jaredcnance

src/JsonApiDotNetCore/Builders/DocumentBuilder.cs

@@ -78,9 +78,9 @@ private void _addRelationships(DocumentData data, ContextEntity contextEntity, I
 
             contextEntity.Relationships.ForEach(r => {
                 var relationshipData = new RelationshipData {
-                    Links = new Dictionary<string, string> {
-                        {"self", linkBuilder.GetSelfRelationLink(contextEntity.EntityName, entity.Id.ToString(), r.RelationshipName)},
-                        {"related", linkBuilder.GetRelatedRelationLink(contextEntity.EntityName, entity.Id.ToString(), r.RelationshipName)}
+                    Links = new Links {
+                        Self = linkBuilder.GetSelfRelationLink(contextEntity.EntityName, entity.Id.ToString(), r.RelationshipName),
+                        Related = linkBuilder.GetRelatedRelationLink(contextEntity.EntityName, entity.Id.ToString(), r.RelationshipName)
                     }
                 };
                 data.Relationships.Add(r.RelationshipName.Dasherize(), relationshipData);

src/JsonApiDotNetCore/Models/Links.cs

@@ -0,0 +1,13 @@
+using Newtonsoft.Json;
+
+namespace JsonApiDotNetCore.Models
+{
+    public class Links
+    {
+        [JsonProperty("self")]
+        public string Self { get; set; }
+
+        [JsonProperty("related")]
+        public string Related { get; set; }
+    }
+}

src/JsonApiDotNetCore/Models/RelationshipData.cs

@@ -1,13 +1,14 @@
 using System.Collections;
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace JsonApiDotNetCore.Models
 {
     public class RelationshipData
     {
         [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; set; }
+        public Links Links { get; set; }
 
         [JsonProperty("data")]
         public object ExposedData { 
@@ -18,7 +19,12 @@ public object ExposedData {
             }
             set {
                 if(value is IEnumerable)
-                    ManyData = (List<Dictionary<string, string>>)value;
+                    if(value is JObject)
+                        SingleData = ((JObject)value).ToObject<Dictionary<string, string>>();   
+                    else if(value is JArray)
+                        ManyData = ((JArray)value).ToObject<List<Dictionary<string, string>>>();
+                    else
+                        ManyData = (List<Dictionary<string, string>>)value;
                 else
                     SingleData = (Dictionary<string, string>)value;
             }

src/JsonApiDotNetCore/Serialization/JsonApiSerializer.cs

@@ -20,15 +20,20 @@ private static string _serializeDocuments(object entity, IJsonApiContext jsonApi
             var documentBuilder = new DocumentBuilder(jsonApiContext);
             var entities = entity as IEnumerable<IIdentifiable>;
             var documents = documentBuilder.Build(entities);
-            return JsonConvert.SerializeObject(documents);
+            return _serialize(documents);
         }
 
         private static string _serializeDocument(object entity, IJsonApiContext jsonApiContext)
         {
             var documentBuilder = new DocumentBuilder(jsonApiContext);
             var identifiableEntity = entity as IIdentifiable;
             var document = documentBuilder.Build(identifiableEntity);
-            return JsonConvert.SerializeObject(document, new JsonSerializerSettings {
+            return _serialize(document);
+        }
+
+        private static string _serialize(object obj)
+        {
+            return JsonConvert.SerializeObject(obj, new JsonSerializerSettings {
                 NullValueHandling = NullValueHandling.Ignore
             });
         }

src/JsonApiDotNetCoreExample/README.md

@@ -10,6 +10,7 @@
 - [x] Sorting
 - [x] Fetching relationships
 - [x] Creating relationships
+- [x] Refactor relationships links to use an POCO that contains data and links objects
 - [ ] Include Entities
 - [ ] BadRequest should be 422 in POST
 - [ ] Add integration tests to example project
@@ -23,7 +24,7 @@
 - [ ] Dasherized route support
 - [ ] Sorting/Filtering should be handled by the repository so that it is not dependeny on EF ?
 - [ ] Rename ContextEntity ?? 
-- [x] Refactor relationships links to use an POCO that contains data and links objects
+
 
 ## Usage