fix tests

jaredcnance · jaredcnance · commit 453d4fc704b9 · 2018-09-23T15:25:17.000-07:00
diff --git a/src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs b/src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using JsonApiDotNetCore.Builders;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Data;
@@ -186,10 +187,12 @@ public static void SerializeAsJsonApi(this MvcOptions options, JsonApiOptions js
         }
 
         /// <summary>
+        /// Adds all required registrations for the service to the container
         /// </summary>
+        /// <exception cref="JsonApiSetupException"/>
         public static IServiceCollection AddResourceService<T>(this IServiceCollection services) 
         {
-            var typeImplemenetsAnExpectedInterface = false;
+            var typeImplementsAnExpectedInterface = false;
 
             var serviceImplementationType = typeof(T);
 
@@ -200,19 +203,25 @@ public static IServiceCollection AddResourceService<T>(this IServiceCollection s
             {
                 foreach(var openGenericType in ServiceDiscoveryFacade.ServiceInterfaces)
                 {
-                    var concreteGenericType = openGenericType.GetGenericArguments().Length == 1
+                    // A shorthand interface is one where the id type is ommitted
+                    // e.g. IResourceService<T> is the shorthand for IResourceService<T, TId>
+                    var isShorthandInterface = (openGenericType.GetTypeInfo().GenericTypeParameters.Length == 1);
+                    if(isShorthandInterface && resourceDescriptor.IdType != typeof(int))
+                        continue; // we can't create a shorthand for id types other than int
+
+                    var concreteGenericType = isShorthandInterface
                         ? openGenericType.MakeGenericType(resourceDescriptor.ResourceType)
                         : openGenericType.MakeGenericType(resourceDescriptor.ResourceType, resourceDescriptor.IdType);
 
                     if(concreteGenericType.IsAssignableFrom(serviceImplementationType)) {
-                        services.AddScoped(serviceImplementationType, serviceImplementationType);
-                        typeImplemenetsAnExpectedInterface = true;
+                        services.AddScoped(concreteGenericType, serviceImplementationType);
+                        typeImplementsAnExpectedInterface = true;
                     }
                 }
             }
 
-            if(typeImplemenetsAnExpectedInterface == false)
-                throw new JsonApiSetupException($"{typeImplemenetsAnExpectedInterface} does not implement any of the expected JsonApiDotNetCore interfaces.");
+            if(typeImplementsAnExpectedInterface == false)
+                throw new JsonApiSetupException($"{serviceImplementationType} does not implement any of the expected JsonApiDotNetCore interfaces.");
 
             return services;
         }
@@ -225,8 +234,8 @@ private static HashSet<ResourceDescriptor> GetResourceTypesFromServiceImplementa
             {
                 if(i.IsGenericType)
                 {
-                    var firstGenericArgument = i.GetGenericTypeDefinition().GetGenericArguments().FirstOrDefault();
-                    if(TypeLocator.TryGetResourceDescriptor(firstGenericArgument, out var resourceDescriptor) == false)
+                    var firstGenericArgument = i.GenericTypeArguments.FirstOrDefault();
+                    if(TypeLocator.TryGetResourceDescriptor(firstGenericArgument, out var resourceDescriptor) == true)
                     {
                         resourceDecriptors.Add(resourceDescriptor);
                     }
diff --git a/src/JsonApiDotNetCore/Graph/ServiceDiscoveryFacade.cs b/src/JsonApiDotNetCore/Graph/ServiceDiscoveryFacade.cs
@@ -17,7 +17,11 @@ public class ServiceDiscoveryFacade
     {
         internal static HashSet<Type> ServiceInterfaces = new HashSet<Type> {
             typeof(IResourceService<>),
-            typeof(IResourceService<,>),
+            typeof(IResourceService<,>),            
+            typeof(IResourceCmdService<>),
+            typeof(IResourceCmdService<,>),
+            typeof(IResourceQueryService<>),
+            typeof(IResourceQueryService<,>),
             typeof(ICreateService<>),
             typeof(ICreateService<,>),
             typeof(IGetAllService<>),
@@ -26,6 +30,8 @@ public class ServiceDiscoveryFacade
             typeof(IGetByIdService<,>),
             typeof(IGetRelationshipService<>),
             typeof(IGetRelationshipService<,>),
+            typeof(IGetRelationshipsService<>),
+            typeof(IGetRelationshipsService<,>),
             typeof(IUpdateService<>),
             typeof(IUpdateService<,>),
             typeof(IDeleteService<>),
diff --git a/test/UnitTests/Extensions/IServiceCollectionExtensionsTests.cs b/test/UnitTests/Extensions/IServiceCollectionExtensionsTests.cs
@@ -67,16 +67,16 @@ public void AddResourceService_Registers_All_Shorthand_Service_Interfaces()
             
             // assert
             var provider = services.BuildServiceProvider();
-            Assert.IsType<IntResourceService>(typeof(IResourceService<IntResource>));
-            Assert.IsType<IntResourceService>(typeof(IResourceCmdService<IntResource>));
-            Assert.IsType<IntResourceService>(typeof(IResourceQueryService<IntResource>));
-            Assert.IsType<IntResourceService>(typeof(IGetAllService<IntResource>));
-            Assert.IsType<IntResourceService>(typeof(IGetByIdService<IntResource>));
-            Assert.IsType<IntResourceService>(typeof(IGetRelationshipService<IntResource>));
-            Assert.IsType<IntResourceService>(typeof(IGetRelationshipsService<IntResource>));
-            Assert.IsType<IntResourceService>(typeof(ICreateService<IntResource>));
-            Assert.IsType<IntResourceService>(typeof(IUpdateService<IntResource>));
-            Assert.IsType<IntResourceService>(typeof(IDeleteService<IntResource>));
+            Assert.IsType<IntResourceService>(provider.GetService(typeof(IResourceService<IntResource>)));
+            Assert.IsType<IntResourceService>(provider.GetService(typeof(IResourceCmdService<IntResource>)));
+            Assert.IsType<IntResourceService>(provider.GetService(typeof(IResourceQueryService<IntResource>)));
+            Assert.IsType<IntResourceService>(provider.GetService(typeof(IGetAllService<IntResource>)));
+            Assert.IsType<IntResourceService>(provider.GetService(typeof(IGetByIdService<IntResource>)));
+            Assert.IsType<IntResourceService>(provider.GetService(typeof(IGetRelationshipService<IntResource>)));
+            Assert.IsType<IntResourceService>(provider.GetService(typeof(IGetRelationshipsService<IntResource>)));
+            Assert.IsType<IntResourceService>(provider.GetService(typeof(ICreateService<IntResource>)));
+            Assert.IsType<IntResourceService>(provider.GetService(typeof(IUpdateService<IntResource>)));
+            Assert.IsType<IntResourceService>(provider.GetService(typeof(IDeleteService<IntResource>)));
         }
 
         [Fact]
@@ -90,16 +90,16 @@ public void AddResourceService_Registers_All_LongForm_Service_Interfaces()
             
             // assert
             var provider = services.BuildServiceProvider();
-            Assert.IsType<GuidResourceService>(typeof(IResourceService<GuidResource, Guid>));
-            Assert.IsType<GuidResourceService>(typeof(IResourceCmdService<GuidResource, Guid>));
-            Assert.IsType<GuidResourceService>(typeof(IResourceQueryService<GuidResource, Guid>));
-            Assert.IsType<GuidResourceService>(typeof(IGetAllService<GuidResource, Guid>));
-            Assert.IsType<GuidResourceService>(typeof(IGetByIdService<GuidResource, Guid>));
-            Assert.IsType<GuidResourceService>(typeof(IGetRelationshipService<GuidResource, Guid>));
-            Assert.IsType<GuidResourceService>(typeof(IGetRelationshipsService<GuidResource, Guid>));
-            Assert.IsType<GuidResourceService>(typeof(ICreateService<GuidResource, Guid>));
-            Assert.IsType<GuidResourceService>(typeof(IUpdateService<GuidResource, Guid>));
-            Assert.IsType<GuidResourceService>(typeof(IDeleteService<GuidResource, Guid>));
+            Assert.IsType<GuidResourceService>(provider.GetService(typeof(IResourceService<GuidResource, Guid>)));
+            Assert.IsType<GuidResourceService>(provider.GetService(typeof(IResourceCmdService<GuidResource, Guid>)));
+            Assert.IsType<GuidResourceService>(provider.GetService(typeof(IResourceQueryService<GuidResource, Guid>)));
+            Assert.IsType<GuidResourceService>(provider.GetService(typeof(IGetAllService<GuidResource, Guid>)));
+            Assert.IsType<GuidResourceService>(provider.GetService(typeof(IGetByIdService<GuidResource, Guid>)));
+            Assert.IsType<GuidResourceService>(provider.GetService(typeof(IGetRelationshipService<GuidResource, Guid>)));
+            Assert.IsType<GuidResourceService>(provider.GetService(typeof(IGetRelationshipsService<GuidResource, Guid>)));
+            Assert.IsType<GuidResourceService>(provider.GetService(typeof(ICreateService<GuidResource, Guid>)));
+            Assert.IsType<GuidResourceService>(provider.GetService(typeof(IUpdateService<GuidResource, Guid>)));
+            Assert.IsType<GuidResourceService>(provider.GetService(typeof(IDeleteService<GuidResource, Guid>)));
         }
 
         [Fact]
@@ -109,7 +109,7 @@ public void AddResourceService_Throws_If_Type_Does_Not_Implement_Any_Interfaces(
             var services = new ServiceCollection();
             
             // act, assert
-            Assert.Throws<JsonApiException>(() => services.AddResourceService<int>());
+            Assert.Throws<JsonApiSetupException>(() => services.AddResourceService<int>());
         }
 
         private class IntResource : Identifiable { }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Collections;`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Linq;`
	`5`	`+using System.Reflection;`
`5`	`6`	`using JsonApiDotNetCore.Builders;`
`6`	`7`	`using JsonApiDotNetCore.Configuration;`
`7`	`8`	`using JsonApiDotNetCore.Data;`
`@@ -186,10 +187,12 @@ public static void SerializeAsJsonApi(this MvcOptions options, JsonApiOptions js`
`186`	`187`	`}`
`187`	`188`
`188`	`189`	`/// <summary>`
	`190`	`+ /// Adds all required registrations for the service to the container`
`189`	`191`	`/// </summary>`
	`192`	`+ /// <exception cref="JsonApiSetupException"/>`
`190`	`193`	`public static IServiceCollection AddResourceService<T>(this IServiceCollection services)`
`191`	`194`	`{`
`192`		`- var typeImplemenetsAnExpectedInterface = false;`
	`195`	`+ var typeImplementsAnExpectedInterface = false;`
`193`	`196`
`194`	`197`	`var serviceImplementationType = typeof(T);`
`195`	`198`
`@@ -200,19 +203,25 @@ public static IServiceCollection AddResourceService<T>(this IServiceCollection s`
`200`	`203`	`{`
`201`	`204`	`foreach(var openGenericType in ServiceDiscoveryFacade.ServiceInterfaces)`
`202`	`205`	`{`
`203`		`- var concreteGenericType = openGenericType.GetGenericArguments().Length == 1`
	`206`	`+ // A shorthand interface is one where the id type is ommitted`
	`207`	`+ // e.g. IResourceService<T> is the shorthand for IResourceService<T, TId>`
	`208`	`+ var isShorthandInterface = (openGenericType.GetTypeInfo().GenericTypeParameters.Length == 1);`
	`209`	`+ if(isShorthandInterface && resourceDescriptor.IdType != typeof(int))`
	`210`	`+ continue; // we can't create a shorthand for id types other than int`
	`211`	`+`
	`212`	`+ var concreteGenericType = isShorthandInterface`
`204`	`213`	`? openGenericType.MakeGenericType(resourceDescriptor.ResourceType)`
`205`	`214`	`: openGenericType.MakeGenericType(resourceDescriptor.ResourceType, resourceDescriptor.IdType);`
`206`	`215`
`207`	`216`	`if(concreteGenericType.IsAssignableFrom(serviceImplementationType)) {`
`208`		`- services.AddScoped(serviceImplementationType, serviceImplementationType);`
`209`		`- typeImplemenetsAnExpectedInterface = true;`
	`217`	`+ services.AddScoped(concreteGenericType, serviceImplementationType);`
	`218`	`+ typeImplementsAnExpectedInterface = true;`
`210`	`219`	`}`
`211`	`220`	`}`
`212`	`221`	`}`
`213`	`222`
`214`		`- if(typeImplemenetsAnExpectedInterface == false)`
`215`		`- throw new JsonApiSetupException($"{typeImplemenetsAnExpectedInterface} does not implement any of the expected JsonApiDotNetCore interfaces.");`
	`223`	`+ if(typeImplementsAnExpectedInterface == false)`
	`224`	`+ throw new JsonApiSetupException($"{serviceImplementationType} does not implement any of the expected JsonApiDotNetCore interfaces.");`
`216`	`225`
`217`	`226`	`return services;`
`218`	`227`	`}`
`@@ -225,8 +234,8 @@ private static HashSet<ResourceDescriptor> GetResourceTypesFromServiceImplementa`
`225`	`234`	`{`
`226`	`235`	`if(i.IsGenericType)`
`227`	`236`	`{`
`228`		`- var firstGenericArgument = i.GetGenericTypeDefinition().GetGenericArguments().FirstOrDefault();`
`229`		`- if(TypeLocator.TryGetResourceDescriptor(firstGenericArgument, out var resourceDescriptor) == false)`
	`237`	`+ var firstGenericArgument = i.GenericTypeArguments.FirstOrDefault();`
	`238`	`+ if(TypeLocator.TryGetResourceDescriptor(firstGenericArgument, out var resourceDescriptor) == true)`
`230`	`239`	`{`
`231`	`240`	`resourceDecriptors.Add(resourceDescriptor);`
`232`	`241`	`}`