Merge branch 'main' into v2.0

shinyorg · Oct 6, 2024 · c816ac0 · c816ac0
2 parents afca6a5 + 25f8087
commit c816ac0
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 54 deletions.
diff --git a/src/Shiny.Mediator.AspNet/Infrastructure/MediatorContractModelBinder.cs b/src/Shiny.Mediator.AspNet/Infrastructure/MediatorContractModelBinder.cs
@@ -1,36 +1,36 @@
-using System.Reflection;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-
-namespace Shiny.Mediator.AspNet.Infrastructure;
-
-public class MediatorContractModelBinder : IModelBinder
-{
-    public Task BindModelAsync(ModelBindingContext bindingContext)
-    {
-        var type = bindingContext.Model!.GetType();
-        if (type.IsValueType)
-        {
-            var ctor = type.GetConstructors().Single();
-            var parameters = ctor.GetParameters();
-            foreach (var p in parameters)
-            {
-                var result = bindingContext.ValueProvider.GetValue(p.Name);
-            }
-            //Activator.CreateInstance()
-        }
-        else
-        {
-            var props = type
-                .GetProperties(BindingFlags.Public | BindingFlags.Instance)
-                .Where(x => x.CanWrite)
-                .ToList();
-
-            foreach (var prop in props)
-            {
-                var result = bindingContext.ValueProvider.GetValue(prop.Name);
-            }
-        }
-        // bindingContext.ActionContext.RouteData.Values
-        return Task.CompletedTask;
-    }
-}
+// using System.Reflection;
+// using Microsoft.AspNetCore.Mvc.ModelBinding;
+//
+// namespace Shiny.Mediator.AspNet.Infrastructure;
+//
+// public class MediatorContractModelBinder : IModelBinder
+// {
+//     public Task BindModelAsync(ModelBindingContext bindingContext)
+//     {
+//         var type = bindingContext.Model!.GetType();
+//         if (type.IsValueType)
+//         {
+//             var ctor = type.GetConstructors().Single();
+//             var parameters = ctor.GetParameters();
+//             foreach (var p in parameters)
+//             {
+//                 var result = bindingContext.ValueProvider.GetValue(p.Name);
+//             }
+//             //Activator.CreateInstance()
+//         }
+//         else
+//         {
+//             var props = type
+//                 .GetProperties(BindingFlags.Public | BindingFlags.Instance)
+//                 .Where(x => x.CanWrite)
+//                 .ToList();
+//
+//             foreach (var prop in props)
+//             {
+//                 var result = bindingContext.ValueProvider.GetValue(prop.Name);
+//             }
+//         }
+//         // bindingContext.ActionContext.RouteData.Values
+//         return Task.CompletedTask;
+//     }
+// }
diff --git a/src/Shiny.Mediator.AspNet/WebApplicationExtensions.cs b/src/Shiny.Mediator.AspNet/WebApplicationExtensions.cs
@@ -274,36 +274,22 @@ public static void MapResultType<TRequest, TResult>(WebApplication app, Mediator
         {
             routerBuilder = app.MapPost(
                 attribute.UriTemplate,
-                async (
+                (
                     [FromServices] IMediator mediator,
                     [FromBody] TRequest request,
                     CancellationToken cancellationToken
-                ) =>
-                {
-                    var result = await mediator
-                        .Request(request, cancellationToken)
-                        .ConfigureAwait(false);
-
-                    return Results.Ok(result);
-                }
+                ) => mediator.Request(request, cancellationToken)
             );
         }
         else if (attribute.Method == HttpMethod.Put)
         {
             routerBuilder = app.MapGet(
                 attribute.UriTemplate,
-                async (
+                (
                     [FromServices] IMediator mediator,
                     [FromBody] TRequest request,
                     CancellationToken cancellationToken
-                ) =>
-                {
-                    var result = await mediator
-                        .Request(request, cancellationToken)
-                        .ConfigureAwait(false);
-
-                    return Results.Ok(result);
-                }
+                ) => mediator.Request(request, cancellationToken)
             );
         }
         else if (attribute.Method == HttpMethod.Get)