Merge branch 'feature/#167' into develop

Author: i4004

src/SampleApps/SampleApp.Classic/Controllers/Accounts/LoginController.cs

@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
+using SampleApp.Classic.Infrastructure.Log;
 using SampleApp.Classic.Models.Accounts;
 using SampleApp.Classic.Views;
 using SampleApp.Classic.Views.Accounts;
@@ -14,12 +15,14 @@
 namespace SampleApp.Classic.Controllers.Accounts
 {
 	[Post("login")]
-	public class LoginController : AsyncController<LoginViewModel>
+	public class LoginController : LoggableController<LoginViewModel>
 	{
 		public override async Task<ControllerResponse> Invoke()
 		{
 			await ReadModelAsync();
 
+			Log("Login controller executed");
+
 			if (Model.Password == "1" && Model.UserName == "Foo")
 			{
 				var claims = new List<Claim>

src/SampleApps/SampleApp.Classic/Infrastructure/Log/LoggableController.cs

@@ -0,0 +1,10 @@
+using System;
+using Simplify.Web;
+
+namespace SampleApp.Classic.Infrastructure.Log;
+
+public abstract class LoggableController<T> : AsyncController<T>
+	where T : class
+{
+	protected void Log(string message) => Console.WriteLine(message);
+}

src/Simplify.Web.Tests/Meta/ControllersMetaStoreTests.cs

@@ -25,19 +25,21 @@ public void GetControllersMetaData_LocalControllers_GetWithoutIgnored()
 
 			factory.SetupSequence(x => x.CreateControllerMetaData(It.IsAny<Type>()))
 				.Returns(new ControllerMetaData(typeof(TestController1), new ControllerExecParameters(null, 2)))
+				.Returns(new ControllerMetaData(typeof(TestController6)))
 				.Returns(new ControllerMetaData(typeof(TestController2), new ControllerExecParameters(null, 1)))
 				.Returns(new ControllerMetaData(typeof(TestController4)))
 				.Returns(new ControllerMetaData(typeof(TestController5)));
 
 			// Act
 			var metaData = store.ControllersMetaData;
 
-			Assert.AreEqual(4, metaData.Count);
+			Assert.AreEqual(5, metaData.Count);
 
 			factory.Verify(x => x.CreateControllerMetaData(It.Is<Type>(t => t == typeof(TestController1))));
 			factory.Verify(x => x.CreateControllerMetaData(It.Is<Type>(t => t == typeof(TestController2))));
 			factory.Verify(x => x.CreateControllerMetaData(It.Is<Type>(t => t == typeof(TestController4))));
 			factory.Verify(x => x.CreateControllerMetaData(It.Is<Type>(t => t == typeof(TestController5))));
+			factory.Verify(x => x.CreateControllerMetaData(It.Is<Type>(t => t == typeof(TestController6))));
 		}
 	}
 }

src/Simplify.Web.Tests/Meta/SimplifyWebTypesFinderTests.cs

@@ -48,10 +48,11 @@ public void FindTypesDerivedFrom_TypeHave3TypesDerived_3TestControllersReturned(
 
 			// Assert
 
-			Assert.AreEqual(2, types.Count);
+			Assert.AreEqual(3, types.Count);
 			Assert.AreEqual(1, types2.Count);
 			Assert.AreEqual("Simplify.Web.Tests.TestEntities.TestController1", types[0].FullName);
 			Assert.AreEqual("Simplify.Web.Tests.TestEntities.TestController3", types[1].FullName);
+			Assert.AreEqual("Simplify.Web.Tests.TestEntities.TestController6", types[2].FullName);
 			Assert.AreEqual("Simplify.Web.Tests.TestEntities.TestController2", types2[0].FullName);
 		}
 

src/Simplify.Web.Tests/TestEntities/ControllerBase.cs

@@ -0,0 +1,6 @@
+namespace Simplify.Web.Tests.TestEntities
+{
+	public abstract class ControllerBase : Controller
+	{
+	}
+}

src/Simplify.Web.Tests/TestEntities/TestController6.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace Simplify.Web.Tests.TestEntities
+{
+	public class TestController6 : ControllerBase
+	{
+		public override ControllerResponse Invoke() => throw new NotImplementedException();
+	}
+}

src/Simplify.Web.sln.DotSettings

@@ -16,6 +16,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catched/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=intellisense/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Katana/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Loggable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=middlewares/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Redirector/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Katana/@EntryIndexedValue">True</s:Boolean>

src/Simplify.Web/Meta/SimplifyWebTypesFinder.cs

@@ -60,11 +60,25 @@ public static class SimplifyWebTypesFinder
 		/// <param name="type">The type.</param>
 		/// <returns></returns>
 		public static IList<Type> FindTypesDerivedFrom(Type type) =>
-			CurrentDomainAssembliesTypes.Where(t => t.BaseType != null
-													&& ((t.BaseType.IsGenericType == false && t.BaseType == type)
-														||
-														(t.BaseType.IsGenericType && t.BaseType.GetGenericTypeDefinition() == type)))
-				.ToList();
+			CurrentDomainAssembliesTypes.Where(t =>
+			{
+				if (t.IsAbstract)
+					return false;
+
+				if (t.BaseType == null)
+					return false;
+
+				if (t.BaseType.IsTypeOf(type))
+					return true;
+
+				if (t.BaseType.BaseType == null)
+					return false;
+
+				if (t.BaseType.BaseType.IsTypeOf(type))
+					return true;
+
+				return false;
+			}).ToList();
 
 		/// <summary>
 		/// Gets all types.
@@ -102,6 +116,19 @@ public static void CleanLoadedTypesAndAssembliesInfo()
 			_currentDomainAssembliesTypes = null;
 		}
 
+		private static bool IsTypeOf(this Type t, Type type)
+		{
+			switch (t.IsGenericType)
+			{
+				case false when t == type:
+				case true when t.GetGenericTypeDefinition() == type:
+					return true;
+
+				default:
+					return false;
+			}
+		}
+
 		private static IEnumerable<Type> GetAssembliesTypes(IEnumerable<Assembly> assemblies)
 		{
 			var types = new List<Type>();