chore: final stretch

wisepotato · wisepotato · commit d6f763f6f45f · 2019-10-24T19:10:09.000+02:00
diff --git a/src/Examples/JsonApiDotNetCoreExample/Startup.cs b/src/Examples/JsonApiDotNetCoreExample/Startup.cs
@@ -25,7 +25,7 @@ public Startup(IWebHostEnvironment env)
         }
 
         public virtual void ConfigureServices(IServiceCollection services)
-        {
+        {            services.AddJsonApi();
             var loggerFactory = new LoggerFactory();
             services
                 .AddSingleton<ILoggerFactory>(loggerFactory)
@@ -44,6 +44,8 @@ public virtual void ConfigureServices(IServiceCollection services)
                     options.LoaDatabaseValues = true;
                 },
                 discovery => discovery.AddCurrentAssembly());
+           
+
             services.AddClientSerialization();
         }
 
@@ -54,6 +56,7 @@ public virtual void Configure(
         {
 
             context.Database.EnsureCreated();
+           
             app.UseJsonApi();
         }
 
diff --git a/src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs b/src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs
@@ -59,11 +59,8 @@ public IResourceGraphBuilder AddResource<TResource, TId>(string pluralizedTypeNa
         public IResourceGraphBuilder AddResource(Type entityType, Type idType, string pluralizedTypeName = null)
         {
             AssertEntityIsNotAlreadyDefined(entityType);
-
-            pluralizedTypeName = pluralizedTypeName ?? _resourceNameFormatter.FormatResourceName(entityType);
-
+            pluralizedTypeName ??= _resourceNameFormatter.FormatResourceName(entityType);
             _entities.Add(GetEntity(pluralizedTypeName, entityType, idType));
-
             return this;
         }
 
diff --git a/src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs b/src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs
@@ -36,9 +36,10 @@ public static IServiceCollection AddJsonApi<TEfCoreDbContext>(this IServiceColle
             if (options != null)
                 application.ConfigureJsonApiOptions(options);
             application.ConfigureLogging();
-            application.ConfigureMvc();
             application.ConfigureResources<TEfCoreDbContext>(resources);
             application.ConfigureServices();
+            application.ConfigureMvc();
+
             return services;
         }
 
@@ -58,12 +59,13 @@ public static IServiceCollection AddJsonApi(this IServiceCollection services,
             var application = new JsonApiApplicationBuilder(services, mvcBuilder ?? services.AddMvcCore());
             if (options != null)
                 application.ConfigureJsonApiOptions(options);
-            application.ConfigureMvc();
-            if (discovery != null)
-                application.AutoDiscover(discovery);
             if (resources != null)
                 application.ConfigureResources(resources);
             application.ConfigureServices();
+            application.ConfigureMvc();
+            if (discovery != null)
+                application.AutoDiscover(discovery);
+
             return services;
         }
 
diff --git a/src/JsonApiDotNetCore/Internal/DefaultRoutingConvention.cs b/src/JsonApiDotNetCore/Internal/DefaultRoutingConvention.cs
@@ -6,6 +6,7 @@
 using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Extensions;
 using JsonApiDotNetCore.Graph;
+using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Models;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
@@ -37,12 +38,14 @@ public class DefaultRoutingConvention : IJsonApiRoutingConvention, IControllerRe
     {
         private readonly string _namespace;
         private readonly IResourceNameFormatter _formatter;
+        private readonly IResourceGraph _resourceGraph;
         private readonly HashSet<string> _registeredTemplates = new HashSet<string>();
         private readonly Dictionary<string, Type> _registeredResources = new Dictionary<string, Type>();
-        public DefaultRoutingConvention(IJsonApiOptions options, IResourceNameFormatter formatter)
+        public DefaultRoutingConvention(IJsonApiOptions options, IResourceNameFormatter formatter, IResourceGraph resourceGraph)
         {
             _namespace = options.Namespace;
             _formatter = formatter;
+            _resourceGraph = resourceGraph;
         }
 
         /// <inheritdoc/>
@@ -58,18 +61,43 @@ public void Apply(ApplicationModel application)
             foreach (var controller in application.Controllers)
             {
                 var resourceType = GetResourceTypeFromController(controller.ControllerType);
+
                 if (resourceType != null)
+                {
                     _registeredResources.Add(controller.ControllerName, resourceType);
+                }
 
                 if (RoutingConventionDisabled(controller) == false)
+                {
                     continue;
+                }
+                // if defined in resourcegraph, it should be used
+                var contexts = _resourceGraph.GetResourceContexts();
+
+                var foundResourceGraph = contexts.First(c => c.ResourceType == resourceType);
+                string template = null;
+                if (foundResourceGraph != null)
+                {
+                    template = $"{_namespace}/{foundResourceGraph.ResourceName}";
+                }
+                else
+                {
+                    template = TemplateFromResource(controller) ?? TemplateFromController(controller);
+                }
 
-                var template = TemplateFromResource(controller) ?? TemplateFromController(controller);
                 if (template == null)
+                {
                     throw new JsonApiSetupException($"Controllers with overlapping route templates detected: {controller.ControllerType.FullName}");
+                }
 
                 controller.Selectors[0].AttributeRouteModel = new AttributeRouteModel { Template = template };
             }
+
+        }
+
+        public void HandleControllers(IList<ControllerModel> controllers)
+        {
+
         }
 
         /// <summary>
@@ -128,7 +156,7 @@ private Type GetResourceTypeFromController(Type type)
             {
                 var nextBaseType = currentBaseType.BaseType;
 
-                if ( (nextBaseType == controllerBase || nextBaseType == jsonApiMixin) && currentBaseType.IsGenericType)
+                if ((nextBaseType == controllerBase || nextBaseType == jsonApiMixin) && currentBaseType.IsGenericType)
                 {
                     var potentialResource = currentBaseType.GetGenericArguments().FirstOrDefault(t => t.Inherits(identifiable));
                     if (potentialResource != null)
diff --git a/test/NoEntityFrameworkTests/Acceptance/Extensibility/NoEntityFrameworkTests.cs b/test/NoEntityFrameworkTests/Acceptance/Extensibility/NoEntityFrameworkTests.cs
@@ -96,8 +96,7 @@ public async Task Can_Create_TodoItems()
             request.Content = new StringContent(JsonConvert.SerializeObject(content));
             request.Content.Headers.ContentType = new MediaTypeHeaderValue("application/vnd.api+json");
 
-            var builder = new WebHostBuilder()
-                .UseStartup<Startup>();
+            var builder = new WebHostBuilder().UseStartup<Startup>();
             var server = new TestServer(builder);
             var client = server.CreateClient();
 
diff --git a/test/NoEntityFrameworkTests/TestFixture.cs b/test/NoEntityFrameworkTests/TestFixture.cs
@@ -1,4 +1,5 @@
 using JsonApiDotNetCore.Builders;
+using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Serialization.Client;
 using JsonApiDotNetCoreExample;
@@ -23,6 +24,7 @@ public TestFixture()
             var builder = new WebHostBuilder().UseStartup<Startup>();
             Server = new TestServer(builder);
             Context = Server.GetService<AppDbContext>();
+
             Context.Database.EnsureCreated();
             _services = Server.Host.Services;
         }
@@ -38,7 +40,13 @@ public IRequestSerializer GetSerializer<TResource>(Expression<Func<TResource, dy
         }
         public IResponseDeserializer GetDeserializer()
         {
-            var resourceGraph = new ResourceGraphBuilder()
+            IResourceGraph resourceGraph = GetResourceGraph();
+            return new ResponseDeserializer(resourceGraph);
+        }
+
+        private static IResourceGraph GetResourceGraph()
+        {
+            return new ResourceGraphBuilder()
                 .AddResource<PersonRole>()
                 .AddResource<Article>()
                 .AddResource<Tag>()
@@ -49,10 +57,16 @@ public IResponseDeserializer GetDeserializer()
                 .AddResource<Passport>()
                 .AddResource<TodoItemClient>("custom-todo-items")
                 .AddResource<TodoItemCollectionClient, Guid>().Build();
-            return new ResponseDeserializer(resourceGraph);
         }
 
-        public T GetService<T>() => (T)_services.GetService(typeof(T));
+        public T GetService<T>()
+        {
+            if(typeof(T) == typeof(IResourceGraph))
+            {
+                return (T) GetResourceGraph();
+            }
+            return (T)_services.GetService(typeof(T));
+        }
 
         public void Dispose()
         {
diff --git a/test/UnitTests/Routing/DefaultRoutingConventionTests.cs b/test/UnitTests/Routing/DefaultRoutingConventionTests.cs
@@ -0,0 +1,45 @@
+using JsonApiDotNetCore.Builders;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Graph;
+using JsonApiDotNetCore.Internal;
+using JsonApiDotNetCoreExample.Models;
+using Moq;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using JsonApiDotNetCoreExample.Controllers;
+using System.Reflection;
+using Xunit;
+using System.Linq;
+
+namespace UnitTests.Routing
+{
+    public class DefaultRoutingConventionTests
+    {
+
+        [Fact]
+        public void DefaultRoutingCustomRoute_CustomRouteRegistered_ShouldBeRegisteredAsTemplate()
+        {
+            // Arrange
+            var mockOptions = new Mock<IJsonApiOptions>();
+            var mockFormatter = new Mock<IResourceNameFormatter>();
+            var resourceGraph = new ResourceGraphBuilder().AddResource<TodoItem>("customRouteForMe").Build();
+            var convention = new DefaultRoutingConvention(mockOptions.Object, mockFormatter.Object, resourceGraph);
+            var attributes = new List<object>().AsReadOnly();
+            var controllerModel = new ControllerModel(typeof(TodoItemsController).GetTypeInfo(), attributes);
+            controllerModel.ControllerName = "Test";
+            var sModel = new SelectorModel();
+            controllerModel.Selectors.Add(sModel);
+            var appModel = new ApplicationModel();
+            appModel.Controllers.Add(controllerModel);
+
+            // Act 
+            convention.Apply(appModel);
+
+            // Assert
+            Assert.Equal("/customRouteForMe", controllerModel.Selectors[0].AttributeRouteModel.Template);
+        }
+    }
+}
diff --git a/test/UnitTests/UnitTests.csproj b/test/UnitTests/UnitTests.csproj
@@ -10,6 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
     <PackageReference Include="xunit" Version="$(XUnitVersion)" />

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public Startup(IWebHostEnvironment env)`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public virtual void ConfigureServices(IServiceCollection services)`
`28`		`- {`
	`28`	`+ { services.AddJsonApi();`
`29`	`29`	`var loggerFactory = new LoggerFactory();`
`30`	`30`	`services`
`31`	`31`	`.AddSingleton<ILoggerFactory>(loggerFactory)`
`@@ -44,6 +44,8 @@ public virtual void ConfigureServices(IServiceCollection services)`
`44`	`44`	`options.LoaDatabaseValues = true;`
`45`	`45`	`},`
`46`	`46`	`discovery => discovery.AddCurrentAssembly());`
	`47`	`+`
	`48`	`+`
`47`	`49`	`services.AddClientSerialization();`
`48`	`50`	`}`
`49`	`51`
`@@ -54,6 +56,7 @@ public virtual void Configure(`
`54`	`56`	`{`
`55`	`57`
`56`	`58`	`context.Database.EnsureCreated();`
	`59`	`+`
`57`	`60`	`app.UseJsonApi();`
`58`	`61`	`}`
`59`	`62`
Original file line number	Diff line number	Diff line change
`@@ -59,11 +59,8 @@ public IResourceGraphBuilder AddResource<TResource, TId>(string pluralizedTypeNa`
`59`	`59`	`public IResourceGraphBuilder AddResource(Type entityType, Type idType, string pluralizedTypeName = null)`
`60`	`60`	`{`
`61`	`61`	`AssertEntityIsNotAlreadyDefined(entityType);`
`62`		`-`
`63`		`- pluralizedTypeName = pluralizedTypeName ?? _resourceNameFormatter.FormatResourceName(entityType);`
`64`		`-`
	`62`	`+ pluralizedTypeName ??= _resourceNameFormatter.FormatResourceName(entityType);`
`65`	`63`	`_entities.Add(GetEntity(pluralizedTypeName, entityType, idType));`
`66`		`-`
`67`	`64`	`return this;`
`68`	`65`	`}`
`69`	`66`