refactor(*): further reduction of Dasherize usage

there should be very few places .Dasherize is actually used. most of the time we should stick to using either the Internal or Public attr/relationship names

Author: jaredcnance

src/JsonApiDotNetCore/Builders/DocumentBuilder.cs

@@ -1,7 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using JsonApiDotNetCore.Extensions;
 using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Services;
@@ -148,7 +147,7 @@ private void AddRelationships(DocumentData data, ContextEntity contextEntity, II
                     }
                 };
 
-                if (RelationshipIsIncluded(r.InternalRelationshipName))
+                if (RelationshipIsIncluded(r.PublicRelationshipName))
                 {
                     var navigationEntity = _jsonApiContext.ContextGraph
                         .GetRelationship(entity, r.InternalRelationshipName);
@@ -161,7 +160,7 @@ private void AddRelationships(DocumentData data, ContextEntity contextEntity, II
                         relationshipData.SingleData = GetRelationship(navigationEntity, r.InternalRelationshipName);
                 }
 
-                data.Relationships.Add(r.InternalRelationshipName.Dasherize(), relationshipData);
+                data.Relationships.Add(r.PublicRelationshipName, relationshipData);
             });
         }
 
@@ -171,7 +170,7 @@ private List<DocumentData> GetIncludedEntities(ContextEntity contextEntity, IIde
 
             contextEntity.Relationships.ForEach(r =>
             {
-                if (!RelationshipIsIncluded(r.InternalRelationshipName)) return;
+                if (!RelationshipIsIncluded(r.PublicRelationshipName)) return;
 
                 var navigationEntity = _jsonApiContext.ContextGraph.GetRelationship(entity, r.InternalRelationshipName);
 
@@ -214,7 +213,7 @@ private DocumentData GetIncludedEntity(IIdentifiable entity)
         private bool RelationshipIsIncluded(string relationshipName)
         {
             return _jsonApiContext.IncludedRelationships != null &&
-                _jsonApiContext.IncludedRelationships.Contains(relationshipName.ToProperCase());
+                _jsonApiContext.IncludedRelationships.Contains(relationshipName);
         }
 
         private List<Dictionary<string, string>> GetRelationships(IEnumerable<object> entities, string relationshipName)

src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs

@@ -29,7 +29,7 @@ public void BuildContextGraph<TContext>(Action<IContextGraphBuilder> builder)
         public void BuildContextGraph(Action<IContextGraphBuilder> builder)
         {
             if(builder == null)
-                throw new ArgumentException("Cannot build non-EF context graph without a IContextGraphBuilder action", nameof(builder));
+                throw new ArgumentException("Cannot build non-EF context graph without an IContextGraphBuilder action", nameof(builder));
 
             var contextGraphBuilder = new ContextGraphBuilder();
 

src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs

@@ -138,10 +138,11 @@ public virtual async Task<bool> DeleteAsync(TId id)
         public virtual IQueryable<TEntity> Include(IQueryable<TEntity> entities, string relationshipName)
         {
             var entity = _jsonApiContext.RequestEntity;
-            if(entity.Relationships.Any(r => r.InternalRelationshipName == relationshipName))
-                return entities.Include(relationshipName);
+            var relationship = entity.Relationships.FirstOrDefault(r => r.PublicRelationshipName == relationshipName);
+            if(relationship != null)
+                return entities.Include(relationship.InternalRelationshipName);
 
-            throw new JsonApiException("400", "Invalid relationship",
+            throw new JsonApiException("400", $"Invalid relationship {relationshipName} on {entity.EntityName}",
                 $"{entity.EntityName} does not have a relationship named {relationshipName}");
         }
 

src/JsonApiDotNetCore/Internal/Query/QuerySet.cs

@@ -147,7 +147,6 @@ private List<string> ParseIncludedRelationships(string value)
 
             return value
                 .Split(',')
-                .Select(s => s.ToProperCase())
                 .ToList();
         }
 

src/JsonApiDotNetCore/Models/DocumentData.cs

@@ -1,19 +1,12 @@
 using System.Collections.Generic;
-using JsonApiDotNetCore.Extensions;
 using Newtonsoft.Json;
 
 namespace JsonApiDotNetCore.Models
 {
     public class DocumentData
     {
-        private string _type;
-
         [JsonProperty("type")]
-        public string Type
-        {
-            get { return _type.Dasherize(); }
-            set { _type = value; }
-        }
+        public string Type { get; set; }
 
         [JsonProperty("id")]
         public string Id { get; set; }

src/JsonApiDotNetCore/Serialization/JsonApiDeSerializer.cs

@@ -135,7 +135,7 @@ private object _setHasOneRelationship(object entity,
             if (entityProperty == null)
                 throw new JsonApiException("400", $"{contextEntity.EntityType.Name} does not contain an relationsip named {attr.InternalRelationshipName}");
 
-            var relationshipName = attr.InternalRelationshipName.Dasherize();
+            var relationshipName = attr.PublicRelationshipName;
 
             if (relationships.TryGetValue(relationshipName, out RelationshipData relationshipData))
             {
@@ -168,7 +168,7 @@ private object _setHasManyRelationship(object entity,
             if (entityProperty == null)
                 throw new JsonApiException("400", $"{contextEntity.EntityType.Name} does not contain an relationsip named {attr.InternalRelationshipName}");
 
-            var relationshipName = attr.InternalRelationshipName.Dasherize();
+            var relationshipName = attr.PublicRelationshipName;
 
             if (relationships.TryGetValue(relationshipName, out RelationshipData relationshipData))
             {

src/JsonApiDotNetCore/Services/EntityResourceService.cs

@@ -73,7 +73,7 @@ private async Task<T> GetWithRelationshipsAsync(TId id)
       var query = _entities.Get();
       _jsonApiContext.QuerySet.IncludedRelationships.ForEach(r =>
       {
-        query = _entities.Include(query, r.ToProperCase());
+        query = _entities.Include(query, r);
       });
       return await query.FirstOrDefaultAsync(e => e.Id.Equals(id));
     }
@@ -174,9 +174,9 @@ private async Task<IEnumerable<T>> ApplyPageQueryAsync(IQueryable<T> entities)
     private IQueryable<T> IncludeRelationships(IQueryable<T> entities, List<string> relationships)
     {
       _jsonApiContext.IncludedRelationships = relationships;
-
+      
       foreach (var r in relationships)
-        entities = _entities.Include(entities, r.ToProperCase());
+        entities = _entities.Include(entities, r);
 
       return entities;
     }

src/JsonApiDotNetCoreExample/Controllers/TodoItemCollectionsController.cs renamed to src/JsonApiDotNetCoreExample/Controllers/TodoCollectionsController.cs

@@ -6,9 +6,9 @@
 
 namespace JsonApiDotNetCoreExample.Controllers
 {
-    public class TodoItemCollectionsController : JsonApiController<TodoItemCollection, Guid>
+    public class TodoCollectionsController : JsonApiController<TodoItemCollection, Guid>
     {
-         public TodoItemCollectionsController(
+         public TodoCollectionsController(
             IJsonApiContext jsonApiContext,
             IResourceService<TodoItemCollection, Guid> resourceService,
             ILoggerFactory loggerFactory) 

src/JsonApiDotNetCoreExample/Data/AppDbContext.cs

@@ -1,3 +1,4 @@
+using JsonApiDotNetCore.Models;
 using JsonApiDotNetCoreExample.Models;
 using Microsoft.EntityFrameworkCore;
 
@@ -24,6 +25,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         public DbSet<TodoItem> TodoItems { get; set; }
         public DbSet<Person> People { get; set; }
+
+        [Resource("todo-collections")]
         public DbSet<TodoItemCollection> TodoItemCollections { get; set; }
     }
 }

src/JsonApiDotNetCoreExample/Models/Person.cs

@@ -18,7 +18,7 @@ public class Person : Identifiable, IHasMeta
         [HasMany("assigned-todo-items")]
         public virtual List<TodoItem> AssignedTodoItems { get; set; }
 
-        [HasMany("todo-item-collections")]
+        [HasMany("todo-collections")]
         public virtual List<TodoItemCollection> TodoItemCollections { get; set; }
 
         public Dictionary<string, object> GetMeta(IJsonApiContext context)