Fix registration on groups

SimCubeLtd · Nov 9, 2022 · 34489ac · 34489ac
1 parent 2a84f9e
commit 34489ac
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 16 deletions.
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "7.0.0",
+    "version": "7.0.100",
     "rollForward": "latestMajor",
     "allowPrerelease": false
   }
-}
+}
diff --git a/src/SimCube.Spartan.ExampleConsole/.xml b/src/SimCube.Spartan.ExampleConsole/.xml
@@ -82,6 +82,14 @@
         <member name="M:SimCube.Spartan.ExampleConsole.Handlers.GetExampleRequestHandler.Handle(SimCube.Spartan.ExampleConsole.Requests.GetExampleRequest,System.Threading.CancellationToken)">
             <inheritdoc />
         </member>
+        <member name="T:SimCube.Spartan.ExampleConsole.Handlers.GetExampleThreeGroupRequestHandler">
+            <summary>
+            Th example request handler.
+            </summary>
+        </member>
+        <member name="M:SimCube.Spartan.ExampleConsole.Handlers.GetExampleThreeGroupRequestHandler.Handle(SimCube.Spartan.ExampleConsole.Requests.GetExampleThreeGroupRequest,System.Threading.CancellationToken)">
+            <inheritdoc />
+        </member>
         <member name="T:SimCube.Spartan.ExampleConsole.Handlers.GetExampleTwoGroupRequestHandler">
             <summary>
             Th example request handler.
@@ -243,6 +251,28 @@
         <member name="P:SimCube.Spartan.ExampleConsole.Requests.GetExampleRequest.Name">
             <summary>The name.</summary>
         </member>
+        <member name="T:SimCube.Spartan.ExampleConsole.Requests.GetExampleThreeGroupRequest">
+            <summary>
+            The example get request.
+            </summary>
+        </member>
+        <member name="M:SimCube.Spartan.ExampleConsole.Requests.GetExampleThreeGroupRequest.#ctor(System.Int32,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:SimCube.Spartan.ExampleConsole.Requests.GetExampleThreeGroupRequest"/> class.
+            </summary>
+            <param name="age">The age.</param>
+            <param name="name">The name.</param>
+        </member>
+        <member name="P:SimCube.Spartan.ExampleConsole.Requests.GetExampleThreeGroupRequest.Age">
+            <summary>
+            Gets the age.
+            </summary>
+        </member>
+        <member name="P:SimCube.Spartan.ExampleConsole.Requests.GetExampleThreeGroupRequest.Name">
+            <summary>
+            Gets the name.
+            </summary>
+        </member>
         <member name="T:SimCube.Spartan.ExampleConsole.Requests.GetExampleTwoGroupRequest">
             <summary>
             The example get request.

diff --git a/src/SimCube.Spartan.ExampleConsole/DemoRegistrationMethods.cs b/src/SimCube.Spartan.ExampleConsole/DemoRegistrationMethods.cs
@@ -68,6 +68,7 @@ public static WebApplication AddExampleGroupedMaps(this WebApplication app)
 
         // Or manually register the requests on the group if they do not have the attribute.
         group.MediatedGet<GetExampleTwoGroupRequest>("/example-two/{name}/{age}");
+        group.MediatedGet<GetExampleThreeGroupRequest, Results<Ok<string>, NotFound>>("/example-three/{name}/{age}");
 
         return app;
     }

diff --git a/src/SimCube.Spartan.ExampleConsole/Handlers/GetExampleThreeGroupRequestHandler.cs b/src/SimCube.Spartan.ExampleConsole/Handlers/GetExampleThreeGroupRequestHandler.cs
@@ -0,0 +1,19 @@
+namespace SimCube.Spartan.ExampleConsole.Handlers;
+
+/// <summary>
+/// Th example request handler.
+/// </summary>
+public class GetExampleThreeGroupRequestHandler : IRequestHandler<GetExampleThreeGroupRequest, Results<Ok<string>, NotFound>>
+{
+    /// <inheritdoc />
+    public async Task<Results<Ok<string>, NotFound>> Handle(GetExampleThreeGroupRequest request, CancellationToken cancellationToken)
+    {
+        await Task.Delay(1, cancellationToken);
+
+        return request.Age switch
+        {
+            < 18 => TypedResults.NotFound(),
+            >= 18 => TypedResults.Ok($"The age was {request.Age} and the name was {request.Name}"),
+        };
+    }
+}
diff --git a/src/SimCube.Spartan.ExampleConsole/Requests/GetExampleThreeGroupRequest.cs b/src/SimCube.Spartan.ExampleConsole/Requests/GetExampleThreeGroupRequest.cs
@@ -0,0 +1,28 @@
+namespace SimCube.Spartan.ExampleConsole.Requests;
+
+/// <summary>
+/// The example get request.
+/// </summary>
+public class GetExampleThreeGroupRequest : IMediatedRequest<Results<Ok<string>, NotFound>>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="GetExampleThreeGroupRequest"/> class.
+    /// </summary>
+    /// <param name="age">The age.</param>
+    /// <param name="name">The name.</param>
+    public GetExampleThreeGroupRequest(int age, string name)
+    {
+        Age = age;
+        Name = name;
+    }
+
+    /// <summary>
+    /// Gets the age.
+    /// </summary>
+    public int Age { get; }
+
+    /// <summary>
+    /// Gets the name.
+    /// </summary>
+    public string Name { get; }
+}
diff --git a/src/SimCube.Spartan/Extensions/AttributeExtensions.cs b/src/SimCube.Spartan/Extensions/AttributeExtensions.cs
@@ -108,13 +108,6 @@ private static (Type? Type, ImplementedType ImplementedType) GetResultType(Type
         return (null, ImplementedType.Unknown);
     }
 
-    private static Type? GetGenericInterface(Type[] interfacesOnType) =>
-        Array.Find(
-            interfacesOnType,
-            x => x.IsGenericType &&
-                 (x.GetGenericTypeDefinition() == typeof(IMediatedRequest<>) ||
-                  x.GetGenericTypeDefinition() == typeof(IMediatedRequest<>)));
-
     private static string? GetCachedPolicyNameIfHasAttribute(Attribute[] attributes) =>
         attributes?.FirstOrDefault(x => x is CachePolicyAttribute) is not CachePolicyAttribute cachePolicyAttribute
             ? null

diff --git a/src/SimCube.Spartan/Startup.cs b/src/SimCube.Spartan/Startup.cs
@@ -117,15 +117,10 @@ public static RouteGroupBuilder AddMediatedEndpointsToGroup(this RouteGroupBuild
         }
 
         var endpointsToDefine = groupRequests
-            .Where(type => type.BaseType == typeof(BaseMediatedRequest) &&
-                           type.GetCustomAttributes(typeof(MediatedEndpointAttribute), true).Length > 0)
+            .Where(type => type.GetCustomAttributes(typeof(MediatedEndpointAttribute), true).Length > 0)
             .ToArray();
 
-        var requests = endpointsToDefine
-            .Where(type => type.GetInterfaces().Contains(typeof(IMediatedRequest))
-                           || (type.IsGenericType && type.GetInterfaces().Contains(typeof(IMediatedStream<>)))).ToArray();
-
-        foreach (var request in requests)
+        foreach (var request in endpointsToDefine)
         {
             Attribute
                 .GetCustomAttributes(request)