Update HttpChain.cs

Author: erdtsieck

src/Http/Wolverine.Http.Marten/AggregateAttribute.cs

@@ -149,6 +149,16 @@ public override Variable Modify(HttpChain chain, ParameterInfo parameter, IServi
             return v3;
         }
 
+        if (chain.FindQuerystringVariable(idType, "id", out var v4))
+        {
+            return v4;
+        }
+
+        if (chain.FindQuerystringVariable(idType, $"{AggregateType.Name.ToCamelCase()}Id", out var v5))
+        {
+            return v5;
+        }
+        
         return null;
     }
 

src/Http/Wolverine.Http.Tests/Marten/using_aggregate_handler_workflow.cs

@@ -174,6 +174,32 @@ await Scenario(x =>
         order.ShouldNotBeNull();
         order.Shipped.HasValue.ShouldBeTrue();
     }
+    
+    [Fact]
+    public async Task use_aggregate_in_endpoint_from_query_param_in_url()
+    {
+        var result1 = await Scenario(x =>
+        {
+            x.Post.Json(new StartOrder(["Socks", "Shoes", "Shirt"])).ToUrl("/orders/create");
+        });
+
+        var status1 = result1.ReadAsJson<OrderStatus>();
+        status1.ShouldNotBeNull();
+
+        await Scenario(x =>
+        {
+            x.Post.Url($"/orders/ship/from-query?id={status1.OrderId}");
+
+            x.StatusCodeShouldBe(204);
+        });
+
+        await using var session = Store.LightweightSession();
+
+        var order = await session.Events.AggregateStreamAsync<Order>(status1.OrderId);
+
+        order.ShouldNotBeNull();
+        order.Shipped.HasValue.ShouldBeTrue();
+    }
 
     [Fact]
     public async Task use_stream_collision_policy()

src/Http/Wolverine.Http/HttpChain.cs

@@ -418,6 +418,23 @@ private void applyMetadata()
 
         return variable;
     }
+ 
+    public bool FindQuerystringVariable(Type variableType, string routeOrParameterName, [NotNullWhen(true)]out Variable? variable)
+    {
+        var matched = Method.Method.GetParameters()
+            .FirstOrDefault(x => x.ParameterType == variableType && x.Name != null && x.Name.EqualsIgnoreCase(routeOrParameterName));
+        if (matched is not null)
+        {
+            variable = TryFindOrCreateQuerystringValue(matched);
+            if (variable is not null)
+            {
+                return true;
+            }
+        }
+
+        variable = null;
+        return false;
+    }
 
     public HttpElementVariable? TryFindOrCreateQuerystringValue(ParameterInfo parameter)
     {

src/Http/WolverineWebApi/Marten/Orders.cs

@@ -172,6 +172,20 @@ public static OrderShipped Ship4([Aggregate] Order order)
         return new OrderShipped();
     }
 
+    #region sample_using_aggregate_attribute_query_parameter
+    
+    [WolverinePost("/orders/ship/from-query"), EmptyResponse]
+    // The OrderShipped return value is treated as an event being posted
+    // to a Marten even stream
+    // instead of as the HTTP response body because of the presence of
+    // the [EmptyResponse] attribute
+    public static OrderShipped ShipFromQuery([FromQuery] Guid id, [Aggregate] Order order)
+    {
+        return new OrderShipped();
+    }
+
+    #endregion
+
     [Transactional]
     [WolverinePost("/orders/create")]
     public static OrderStatus StartOrder(StartOrder command, IDocumentSession session)