From 21ced430a1d57b6fcd889abfd0cdf75ab1dbc407 Mon Sep 17 00:00:00 2001
From: "Jeremy D. Miller" <jeremydmiller@yahoo.com>
Date: Mon, 13 Nov 2023 12:00:14 -0600
Subject: [PATCH] Can use aggregate loaded from [Aggregate] in middleware.
 Closes GH-628

---
 src/Persistence/Wolverine.Marten/AggregateHandlerAttribute.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Persistence/Wolverine.Marten/AggregateHandlerAttribute.cs b/src/Persistence/Wolverine.Marten/AggregateHandlerAttribute.cs
index 5e60f69f5..eb6faa77c 100644
--- a/src/Persistence/Wolverine.Marten/AggregateHandlerAttribute.cs
+++ b/src/Persistence/Wolverine.Marten/AggregateHandlerAttribute.cs
@@ -142,8 +142,8 @@ internal static void DetermineEventCaptureHandling(IChain chain, MethodCall firs
 
     internal static Variable RelayAggregateToHandlerMethod(MethodCall loader, MethodCall firstCall, Type aggregateType)
     {
-        var aggregateVariable = new Variable(aggregateType!,
-            $"{loader.ReturnVariable!.Usage}.{nameof(IEventStream<string>.Aggregate)}");
+        var aggregateVariable = new MemberAccessVariable(loader.ReturnVariable,
+            typeof(IEventStream<>).MakeGenericType(aggregateType).GetProperty("Aggregate"));
 
         if (firstCall.HandlerType == aggregateType)
         {