fix(routing-convention): do not try to infer routing

Author: jaredcnance

src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs

@@ -59,8 +59,8 @@ public virtual IQueryable<TEntity> Filter(IQueryable<TEntity> entities,  FilterQ
 
             if(filterQuery.IsAttributeOfRelationship)
                 return entities.Filter(new RelatedAttrFilterQuery(_jsonApiContext, filterQuery));
-            else
-                return entities.Filter(new AttrFilterQuery(_jsonApiContext, filterQuery));
+            
+            return entities.Filter(new AttrFilterQuery(_jsonApiContext, filterQuery));
         }
 
         public virtual IQueryable<TEntity> Sort(IQueryable<TEntity> entities, List<SortQuery> sortQueries)

src/JsonApiDotNetCore/Extensions/IQueryableExtensions.cs

@@ -177,12 +177,9 @@ private static Expression GetFilterExpressionLambda(Expression left, Expression
             return body;
         }
 
-
-        public static IQueryable<TSource> Select<TSource>(this IQueryable<TSource> source, IEnumerable<string> columns)
+        public static IQueryable<TSource> Select<TSource>(this IQueryable<TSource> source, List<string> columns)
         {
-            var enumeratedColumns = columns as IList<string> ?? columns.ToList();
-
-            if (columns == null || enumeratedColumns.Any() == false)
+            if (columns == null || columns.Any() == false)
                 return source;
 
             var sourceType = source.ElementType;
@@ -192,7 +189,7 @@ public static IQueryable<TSource> Select<TSource>(this IQueryable<TSource> sourc
             // {model}
             var parameter = Expression.Parameter(sourceType, "model");
 
-            var bindings = enumeratedColumns.Select(column => Expression.Bind(
+            var bindings = columns.Select(column => Expression.Bind(
                 resultType.GetProperty(column), Expression.PropertyOrField(parameter, column)));
 
             // { new Model () { Property = model.Property } }

src/JsonApiDotNetCore/Internal/DasherizedRoutingConvention.cs

@@ -3,7 +3,6 @@
 using System.Reflection;
 using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Extensions;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
 
 namespace JsonApiDotNetCore.Internal
@@ -20,11 +19,11 @@ public void Apply(ApplicationModel application)
         {
             foreach (var controller in application.Controllers)
             {
-                var template = IsDasherizedJsonApiController(controller) 
-                    ? $"{_namespace}/{controller.ControllerName.Dasherize()}" 
-                    : GetTemplate(controller);
+                if (IsDasherizedJsonApiController(controller) == false)
+                    continue;
 
-                controller.Selectors[0].AttributeRouteModel = new AttributeRouteModel()
+                var template = $"{_namespace}/{controller.ControllerName.Dasherize()}";
+                controller.Selectors[0].AttributeRouteModel = new AttributeRouteModel
                 {
                     Template = template
                 };
@@ -37,14 +36,5 @@ private bool IsDasherizedJsonApiController(ControllerModel controller)
             var notDisabled = type.GetCustomAttribute<DisableRoutingConventionAttribute>() == null;
             return notDisabled && type.IsSubclassOf(typeof(JsonApiControllerMixin));
         }
-
-        private string GetTemplate(ControllerModel controller)
-        {
-            var type = controller.ControllerType;
-            var routeAttr = type.GetCustomAttribute<RouteAttribute>();
-            return routeAttr != null 
-                ? routeAttr.Template 
-                : controller.ControllerName;
-        }
     }
 }

src/JsonApiDotNetCoreExample/Controllers/CamelCasedModelsController.cs

@@ -1,10 +1,12 @@
 using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Services;
 using JsonApiDotNetCoreExample.Models;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
 namespace JsonApiDotNetCoreExample.Controllers
 {
+    [Route("[controller]")]
     [DisableRoutingConvention]
     public class CamelCasedModelsController : JsonApiController<CamelCasedModel>
     {

test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/SparseFieldSetTests.cs

@@ -1,4 +1,6 @@
-using System.Threading.Tasks;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using DotNetCoreDocs;
 using DotNetCoreDocs.Writers;
 using JsonApiDotNetCoreExample;
@@ -14,6 +16,7 @@
 using Newtonsoft.Json;
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCoreExampleTests.Helpers.Extensions;
+using StringExtensions = JsonApiDotNetCoreExampleTests.Helpers.Extensions.StringExtensions;
 
 namespace JsonApiDotNetCoreExampleTests.Acceptance.Spec
 {
@@ -33,26 +36,26 @@ public SparseFieldSetTests(DocsFixture<Startup, JsonDocWriter> fixture)
         public async Task Can_Select_Sparse_Fieldsets()
         {
             // arrange
-            var fields = new string[] { "Id", "Description", "CreatedDate", "AchievedDate" };
+            var fields = new List<string> { "Id", "Description", "CreatedDate", "AchievedDate" };
             var todoItem = new TodoItem {
                 Description = "description",
                 Ordinal = 1,
-                CreatedDate = System.DateTime.Now,
-                AchievedDate = System.DateTime.Now.AddDays(2)
+                CreatedDate = DateTime.Now,
+                AchievedDate = DateTime.Now.AddDays(2)
             };
             _dbContext.TodoItems.Add(todoItem);
             await _dbContext.SaveChangesAsync();
-            var expectedSql = $@"SELECT 't'.'Id', 't'.'Description', 't'.'CreatedDate', 't'.'AchievedDate'
+            var expectedSql = StringExtensions.Normalize($@"SELECT 't'.'Id', 't'.'Description', 't'.'CreatedDate', 't'.'AchievedDate'
                                 FROM 'TodoItems' AS 't'
-                                WHERE 't'.'Id' = {todoItem.Id}".Normalize();
+                                WHERE 't'.'Id' = {todoItem.Id}");
 
             // act
             var query = _dbContext
                 .TodoItems
                 .Where(t=>t.Id == todoItem.Id)
                 .Select(fields);
 
-            var resultSql = query.ToSql().Normalize();
+            var resultSql = StringExtensions.Normalize(query.ToSql());
             var result = await query.FirstAsync();
 
             // assert
@@ -70,7 +73,7 @@ public async Task Fields_Query_Selects_Sparse_Field_Sets()
             var todoItem = new TodoItem {
                 Description = "description",
                 Ordinal = 1, 
-                CreatedDate = System.DateTime.Now
+                CreatedDate = DateTime.Now
             };
             _dbContext.TodoItems.Add(todoItem);
             await _dbContext.SaveChangesAsync();
@@ -93,7 +96,7 @@ public async Task Fields_Query_Selects_Sparse_Field_Sets()
             Assert.Equal(todoItem.StringId, deserializeBody.Data.Id);
             Assert.Equal(2, deserializeBody.Data.Attributes.Count);
             Assert.Equal(todoItem.Description, deserializeBody.Data.Attributes["description"]);
-            Assert.Equal(todoItem.CreatedDate, deserializeBody.Data.Attributes["created-date"]);
+            Assert.Equal(todoItem.CreatedDate.ToString("G"), ((DateTime)deserializeBody.Data.Attributes["created-date"]).ToString("G"));
         }
     }
 }