refactor(Identifiable): rename property to StringId

Author: jaredcnance

src/JsonApiDotNetCore/Builders/DocumentBuilder.cs

@@ -94,7 +94,7 @@ private DocumentData _getData(ContextEntity contextEntity, IIdentifiable entity)
             var data = new DocumentData
             {
                 Type = contextEntity.EntityName,
-                Id = entity.Id.ToString()
+                Id = entity.StringId
             };
 
             if (_jsonApiContext.IsRelationshipData)
@@ -124,8 +124,8 @@ private void _addRelationships(DocumentData data, ContextEntity contextEntity, I
                 {
                     Links = new Links
                     {
-                        Self = linkBuilder.GetSelfRelationLink(contextEntity.EntityName, entity.Id.ToString(), r.InternalRelationshipName),
-                        Related = linkBuilder.GetRelatedRelationLink(contextEntity.EntityName, entity.Id.ToString(), r.InternalRelationshipName)
+                        Self = linkBuilder.GetSelfRelationLink(contextEntity.EntityName, entity.StringId, r.InternalRelationshipName),
+                        Related = linkBuilder.GetRelatedRelationLink(contextEntity.EntityName, entity.StringId, r.InternalRelationshipName)
                     }
                 };
 
@@ -175,7 +175,7 @@ private DocumentData _getIncludedEntity(IIdentifiable entity)
             var data = new DocumentData
             {
                 Type = contextEntity.EntityName,
-                Id = entity.Id.ToString()
+                Id = entity.StringId
             };
 
             data.Attributes = new Dictionary<string, object>();
@@ -205,7 +205,7 @@ private List<Dictionary<string, string>> _getRelationships(IEnumerable<object> e
             {
                 relationships.Add(new Dictionary<string, string> {
                     {"type", typeName.EntityName.Dasherize() },
-                    {"id", ((IIdentifiable)entity).Id.ToString() }
+                    {"id", ((IIdentifiable)entity).StringId }
                 });
             }
             return relationships;
@@ -218,7 +218,7 @@ private Dictionary<string, string> _getRelationship(object entity, string relati
 
             return new Dictionary<string, string> {
                     {"type", typeName.EntityName.Dasherize() },
-                    {"id", ((IIdentifiable)entity).Id.ToString() }
+                    {"id", ((IIdentifiable)entity).StringId }
                 };
         }
     }

src/JsonApiDotNetCore/Internal/Generics/GenericProcessor.cs

@@ -23,12 +23,12 @@ public async Task UpdateRelationshipsAsync(object parent, RelationshipAttribute
 
             if(relationship.IsHasMany)
             {
-                var entities = _context.GetDbSet<T>().Where(x => relationshipIds.Contains(x.Id.ToString())).ToList();
+                var entities = _context.GetDbSet<T>().Where(x => relationshipIds.Contains(x.StringId)).ToList();
                 relationship.SetValue(parent, entities);
             }
             else
             {
-                var entity = _context.GetDbSet<T>().SingleOrDefault(x => relationshipIds.First() == x.Id.ToString());
+                var entity = _context.GetDbSet<T>().SingleOrDefault(x => relationshipIds.First() == x.StringId);
                 relationship.SetValue(parent, entity);
             }            
 

src/JsonApiDotNetCore/Models/IIdentifiable.cs

@@ -2,11 +2,11 @@ namespace JsonApiDotNetCore.Models
 {
     public interface IIdentifiable
     {
-        string Id { get; set; }
+        string StringId { get; set; }
     }
 
     public interface IIdentifiable<T> : IIdentifiable
     {
-        new T Id { get; set; }
+        T Id { get; set; }
     }
 }

src/JsonApiDotNetCore/Models/Identifiable.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Reflection;
+using System.ComponentModel.DataAnnotations.Schema;
 using JsonApiDotNetCore.Internal;
 
 namespace JsonApiDotNetCore.Models
@@ -11,7 +11,8 @@ public class Identifiable<T> : IIdentifiable<T>, IIdentifiable
     {
         public virtual T Id { get; set; }
 
-        string IIdentifiable.Id
+        [NotMapped]
+        public string StringId
         {
             get { return GetStringId(Id); }
             set { Id = (T)GetConcreteId(value); }

src/JsonApiDotNetCore/Serialization/JsonApiDeSerializer.cs

@@ -60,7 +60,7 @@ private static object DataToObject(DocumentData data, IJsonApiContext context)
             var identifiableEntity = (IIdentifiable)entity;
 
             if (data.Id != null)
-                identifiableEntity.Id = data.Id;
+                identifiableEntity.StringId = data.Id;
 
             return identifiableEntity;
         }