load generics by scanning registered services first and fallback to assembly discovery

zero.Web/ApiControllerFeatureProvider.cs

@@ -1,11 +1,13 @@
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
 using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using zero.Core;
 using zero.Core.Assemblies;
+using zero.Core.Entities;
 using zero.Web.Controllers;
 using zero.Web.Filters;
 
@@ -13,14 +15,18 @@ namespace zero.Web
 {
   public class ApiControllerFeatureProvider : IApplicationFeatureProvider<ControllerFeature>
   {
-    public ApiControllerFeatureProvider()
-    {
+    IServiceCollection ServiceCollection;
 
+    public ApiControllerFeatureProvider(IServiceCollection serviceCollection)
+    {
+      ServiceCollection = serviceCollection;
     }
 
 
     public void PopulateFeature(IEnumerable<ApplicationPart> parts, ControllerFeature feature)
-    {  
+    {
+      var pagetype = typeof(IPage);
+      var page = ServiceCollection.FirstOrDefault(x => x.ServiceType.Equals(pagetype));
       IEnumerable<TypeInfo> candidates = AssemblyDiscovery.Current.GetTypes<ISupportsGenericsController>(parts, true).Where(x => x.ContainsGenericParameters);
 
       foreach (TypeInfo candidate in candidates)
@@ -42,12 +48,25 @@ namespace zero.Web
             break;
           }
 
-          TypeInfo concreteArgument = AssemblyDiscovery.Current.GetTypes(requiredService, parts).FirstOrDefault();
+          TypeInfo concreteArgument = null;
+
+          ServiceDescriptor descriptor = ServiceCollection.FirstOrDefault(x => x.ServiceType.Equals(requiredService));
+
+          if (descriptor != null)
+          {
+            concreteArgument = descriptor.ImplementationType?.GetTypeInfo();
+          }
 
           if (concreteArgument == null)
           {
-            isValid = false;
-            break;
+            IEnumerable<TypeInfo> concreteArgumentCandidates = AssemblyDiscovery.Current.GetTypes(requiredService, parts);
+            concreteArgument = concreteArgumentCandidates.FirstOrDefault();
+
+            if (concreteArgument == null)
+            {
+              isValid = false;
+              break;
+            }
           }
 
           concreteArguments.Add(concreteArgument);