[#227] [add] Controllers v2 search in meta store

SimplifyNet · Jan 15, 2024 · 1b7132a · 1b7132a
1 parent dad04a1
commit 1b7132a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/Simplify.Web.Tests/Meta/ControllersMetaStoreTests.cs b/src/Simplify.Web.Tests/Meta/ControllersMetaStoreTests.cs
@@ -14,7 +14,7 @@ public class ControllersMetaStoreTests
  [Test]
  public void GetControllersMetaData_LocalControllers_GetWithoutIgnored()
  {
- // Assign
+ // Arrange
 
  SimplifyWebTypesFinder.ExcludedAssembliesPrefixes.Remove("Simplify");
  SimplifyWebTypesFinder.ExcludedAssembliesPrefixes.Add("DynamicProxyGenAssembly2");
@@ -28,17 +28,23 @@ public void GetControllersMetaData_LocalControllers_GetWithoutIgnored()
  .Returns(new ControllerMetaData(typeof(TestController6)))
  .Returns(new ControllerMetaData(typeof(TestController2), new ControllerExecParameters(null, 1)))
  .Returns(new ControllerMetaData(typeof(TestController4)))
- .Returns(new ControllerMetaData(typeof(TestController5)));
+ .Returns(new ControllerMetaData(typeof(TestController5)))
+ .Returns(new ControllerMetaData(typeof(TestControllerV2)))
+ .Returns(new ControllerMetaData(typeof(TestControllerV2WithModel)));
 
  // Act
  var metaData = store.ControllersMetaData;
 
- Assert.AreEqual(5, metaData.Count);
+ // Assert
+
+ Assert.AreEqual(7, 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))));
+ factory.Verify(x => x.CreateControllerMetaData(It.Is<Type>(t => t == typeof(TestControllerV2))));
+ factory.Verify(x => x.CreateControllerMetaData(It.Is<Type>(t => t == typeof(TestControllerV2WithModel))));
  }
 }
diff --git a/src/Simplify.Web/Meta/ControllersMetaStore.cs b/src/Simplify.Web/Meta/ControllersMetaStore.cs
@@ -40,8 +40,9 @@ public IList<IControllerMetaData> ControllersMetaData
 
  var controllersMetaContainers = new List<IControllerMetaData>();
 
- var types = SimplifyWebTypesFinder.FindTypesDerivedFrom<Controller>();
-
+ var types = SimplifyWebTypesFinder.FindTypesDerivedFrom<Controller2>();
+ types = types.Concat(SimplifyWebTypesFinder.FindTypesDerivedFrom(typeof(Controller2<>))).ToList();
+ types = types.Concat(SimplifyWebTypesFinder.FindTypesDerivedFrom<Controller>()).ToList();
  types = types.Concat(SimplifyWebTypesFinder.FindTypesDerivedFrom<AsyncController>()).ToList();
  types = types.Concat(SimplifyWebTypesFinder.FindTypesDerivedFrom(typeof(Controller<>))).ToList();
  types = types.Concat(SimplifyWebTypesFinder.FindTypesDerivedFrom(typeof(AsyncController<>))).ToList();