refactor(context-graph): the stored entity name should be dasherized once

there is really no reason to store the proper cased entity name
this also lays the ground work so that later users can specify different cases for entity type names

Author: jaredcnance

src/JsonApiDotNetCore/Builders/ContextGraphBuilder.cs

@@ -4,7 +4,7 @@
 using Microsoft.EntityFrameworkCore;
 using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Models;
-using Newtonsoft.Json;
+using JsonApiDotNetCore.Extensions;
 
 namespace JsonApiDotNetCore.Builders
 {
@@ -100,7 +100,7 @@ public void AddDbContext<T>() where T : DbContext
                     var entityType = dbSetType.GetGenericArguments()[0];
                     entities.Add(new ContextEntity
                     {
-                        EntityName = property.Name,
+                        EntityName = property.Name.Dasherize(),
                         EntityType = entityType,
                         Attributes = GetAttributes(entityType),
                         Relationships = GetRelationships(entityType)

src/JsonApiDotNetCore/Builders/DocumentBuilder.cs

@@ -143,8 +143,8 @@ private void AddRelationships(DocumentData data, ContextEntity contextEntity, II
                 {
                     Links = new Links
                     {
-                        Self = linkBuilder.GetSelfRelationLink(contextEntity.EntityName, entity.StringId, r.InternalRelationshipName),
-                        Related = linkBuilder.GetRelatedRelationLink(contextEntity.EntityName, entity.StringId, r.InternalRelationshipName)
+                        Self = linkBuilder.GetSelfRelationLink(contextEntity.EntityName, entity.StringId, r.PublicRelationshipName),
+                        Related = linkBuilder.GetRelatedRelationLink(contextEntity.EntityName, entity.StringId, r.PublicRelationshipName)
                     }
                 };
 
@@ -227,7 +227,7 @@ private List<Dictionary<string, string>> GetRelationships(IEnumerable<object> en
             foreach (var entity in entities)
             {
                 relationships.Add(new Dictionary<string, string> {
-                    {"type", typeName.EntityName.Dasherize() },
+                    {"type", typeName.EntityName },
                     {"id", ((IIdentifiable)entity).StringId }
                 });
             }
@@ -240,7 +240,7 @@ private Dictionary<string, string> GetRelationship(object entity, string relatio
             var typeName = _jsonApiContext.ContextGraph.GetContextEntity(objType);
 
             return new Dictionary<string, string> {
-                    {"type", typeName.EntityName.Dasherize() },
+                    {"type", typeName.EntityName },
                     {"id", ((IIdentifiable)entity).StringId }
                 };
         }

src/JsonApiDotNetCore/Builders/LinkBuilder.cs

@@ -42,12 +42,12 @@ public string GetSelfRelationLink(string parent, string parentId, string child)
 
         public string GetRelatedRelationLink(string parent, string parentId, string child)
         {
-            return $"{_context.BasePath}/{parent.Dasherize()}/{parentId}/{child.Dasherize()}";
+            return $"{_context.BasePath}/{parent}/{parentId}/{child}";
         }
 
         public string GetPageLink(int pageOffset, int pageSize)
         {
-            return $"{_context.BasePath}/{_context.RequestEntity.EntityName.Dasherize()}?page[size]={pageSize}&page[number]={pageOffset}";
+            return $"{_context.BasePath}/{_context.RequestEntity.EntityName}?page[size]={pageSize}&page[number]={pageOffset}";
         }
     }
 }

src/JsonApiDotNetCore/Internal/ContextGraph.cs

@@ -10,11 +10,11 @@ public class ContextGraph : IContextGraph
         public List<ContextEntity> Entities { get; set; }
         public bool UsesDbContext  { get; set; }
 
-        public ContextEntity GetContextEntity(string dbSetName)
+        public ContextEntity GetContextEntity(string entityName)
         {
             return Entities
                 .FirstOrDefault(e => 
-                    e.EntityName.ToLower() == dbSetName.ToLower());
+                    e.EntityName.ToLower() == entityName.ToLower());
         }
 
         public ContextEntity GetContextEntity(Type entityType)

src/JsonApiDotNetCore/Internal/Query/QuerySet.cs

@@ -158,7 +158,7 @@ private List<string> ParseFieldsQuery(string key, string value)
 
             var includedFields = new List<string> { "Id" };
 
-            if(typeName != _jsonApiContext.RequestEntity.EntityName.Dasherize()) 
+            if(typeName != _jsonApiContext.RequestEntity.EntityName) 
                 return includedFields;
 
             var fields = value.Split(',');

src/JsonApiDotNetCore/Serialization/JsonApiDeSerializer.cs

@@ -61,9 +61,7 @@ public List<TEntity> DeserializeList<TEntity>(string requestBody)
 
         private object DataToObject(DocumentData data)
         {
-            var entityTypeName = data.Type.ToProperCase();
-
-            var contextEntity = _jsonApiContext.ContextGraph.GetContextEntity(entityTypeName);
+            var contextEntity = _jsonApiContext.ContextGraph.GetContextEntity(data.Type);
             _jsonApiContext.RequestEntity = contextEntity;
 
             var entity = Activator.CreateInstance(contextEntity.EntityType);

src/NoEntityFrameworkExample/Startup.cs

@@ -34,7 +34,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddJsonApi(options => {
                 options.Namespace = "api/v1";
                 options.BuildContextGraph((builder) => {
-                    builder.AddResource<MyModel>("MyModels");
+                    builder.AddResource<MyModel>("my-models");
                 });
             }, mvcBuilder);