Fixed issue with graphql generation not creating the correct method (#…

…1793)
RocketSurgeonsGuild · Feb 3, 2024 · e559e3e · e559e3e
1 parent a4f83ca
commit e559e3e
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 20 deletions.
diff --git a/src/Analyzers/GraphqlMutationActionBodyGenerator.cs b/src/Analyzers/GraphqlMutationActionBodyGenerator.cs
@@ -111,8 +111,8 @@ IParameterSymbol parameter
         }
 
         var sendRequestExpression = isStream
-            ? streamMediatorRequest(IdentifierName(parameter.Name), cancellationTokenParameter)
-            : sendMediatorRequest(IdentifierName(parameter.Name), cancellationTokenParameter);
+            ? streamMediatorRequest(IdentifierName(parameter.Name), IdentifierName(mediatorParameter.Name), cancellationTokenParameter)
+            : sendMediatorRequest(IdentifierName(parameter.Name), IdentifierName(mediatorParameter.Name), cancellationTokenParameter);
 
         if (parameterType.IsRecord)
         {
@@ -137,8 +137,8 @@ IParameterSymbol parameter
                     InitializerExpression(SyntaxKind.WithInitializerExpression, SeparatedList(expressions))
                 );
                 sendRequestExpression = isStream
-                    ? streamMediatorRequest(withExpression, cancellationTokenParameter)
-                    : sendMediatorRequest(withExpression, cancellationTokenParameter);
+                    ? streamMediatorRequest(withExpression, IdentifierName(mediatorParameter.Name), cancellationTokenParameter)
+                    : sendMediatorRequest(withExpression, IdentifierName(mediatorParameter.Name), cancellationTokenParameter);
             }
         }
         else
@@ -185,7 +185,11 @@ IParameterSymbol parameter
               .WithBody(block.NormalizeWhitespace())
               .WithSemicolonToken(Token(SyntaxKind.None));
 
-        static ExpressionSyntax sendMediatorRequest(ExpressionSyntax nameSyntax, IParameterSymbol? cancellationTokenParameter)
+        static ExpressionSyntax sendMediatorRequest(
+            ExpressionSyntax nameSyntax,
+            ExpressionSyntax mediatorParameterSyntax,
+            IParameterSymbol? cancellationTokenParameter
+        )
         {
             var arguments = new List<ArgumentSyntax> { Argument(nameSyntax), };
             if (cancellationTokenParameter is { })
@@ -200,7 +204,7 @@ static ExpressionSyntax sendMediatorRequest(ExpressionSyntax nameSyntax, IParame
                             InvocationExpression(
                                     MemberAccessExpression(
                                         SyntaxKind.SimpleMemberAccessExpression,
-                                        IdentifierName("Mediator"),
+                                        mediatorParameterSyntax,
                                         IdentifierName("Send")
                                     )
                                 )
@@ -222,7 +226,11 @@ static ExpressionSyntax sendMediatorRequest(ExpressionSyntax nameSyntax, IParame
             );
         }
 
-        static ExpressionSyntax streamMediatorRequest(ExpressionSyntax nameSyntax, IParameterSymbol? cancellationTokenParameter)
+        static ExpressionSyntax streamMediatorRequest(
+            ExpressionSyntax nameSyntax,
+            ExpressionSyntax mediatorParameterSyntax,
+            IParameterSymbol? cancellationTokenParameter
+        )
         {
             var arguments = new List<ArgumentSyntax> { Argument(nameSyntax), };
             if (cancellationTokenParameter is { })
@@ -233,7 +241,7 @@ static ExpressionSyntax streamMediatorRequest(ExpressionSyntax nameSyntax, IPara
             return InvocationExpression(
                     MemberAccessExpression(
                         SyntaxKind.SimpleMemberAccessExpression,
-                        IdentifierName("Mediator"),
+                        mediatorParameterSyntax,
                         IdentifierName("CreateStream")
                     )
                 )

diff --git a/...uld_Generate_Method_Bodies_key=GenerateBodiesWithMultipleParameters2_sources=.verified.cs b/...uld_Generate_Method_Bodies_key=GenerateBodiesWithMultipleParameters2_sources=.verified.cs
@@ -13,7 +13,7 @@ public partial class RocketMutation
         /// <returns></returns>
         public partial async Task<LaunchRecordModel> GetRocketLaunchRecord(IMediator mediator, GetRocketLaunchRecord.Request request)
         {
-            var result = await Mediator.Send(request).ConfigureAwait(false);
+            var result = await mediator.Send(request).ConfigureAwait(false);
             return result;
         }
     }

diff --git a/...uld_Generate_Method_Bodies_key=GenerateBodiesWithMultipleParameters3_sources=.verified.cs b/...uld_Generate_Method_Bodies_key=GenerateBodiesWithMultipleParameters3_sources=.verified.cs
@@ -13,7 +13,7 @@ public partial class RocketMutation
         /// <returns></returns>
         public partial async Task<LaunchRecordModel> GetRocketLaunchRecord(IMediator mediator, GetRocketLaunchRecord.Request request)
         {
-            var result = await Mediator.Send(request).ConfigureAwait(false);
+            var result = await mediator.Send(request).ConfigureAwait(false);
             return result;
         }
     }

diff --git a/...uld_Generate_Method_Bodies_key=GenerateBodiesWithMultipleParameters4_sources=.verified.cs b/...uld_Generate_Method_Bodies_key=GenerateBodiesWithMultipleParameters4_sources=.verified.cs
@@ -13,7 +13,7 @@ public partial class RocketMutation
         /// <returns></returns>
         public partial async Task<LaunchRecordModel> GetRocketLaunchRecord(IMediator mediator, GetRocketLaunchRecord.Request request)
         {
-            var result = await Mediator.Send(request).ConfigureAwait(false);
+            var result = await mediator.Send(request).ConfigureAwait(false);
             return result;
         }
     }

diff --git a/...ould_Generate_Method_Bodies_key=GenerateBodiesWithMultipleParameters_sources=.verified.cs b/...ould_Generate_Method_Bodies_key=GenerateBodiesWithMultipleParameters_sources=.verified.cs
@@ -13,7 +13,7 @@ public partial class RocketMutation
         /// <returns></returns>
         public partial IAsyncEnumerable<LaunchRecordModel> GetRocketLaunchRecords([HotChocolate.ServiceAttribute] IMediator mediator, GetRocketLaunchRecords.Request request)
         {
-            var result = Mediator.CreateStream(request);
+            var result = mediator.CreateStream(request);
             return result;
         }
 
@@ -23,7 +23,7 @@ public partial IAsyncEnumerable<LaunchRecordModel> GetRocketLaunchRecords([HotCh
         /// <returns></returns>
         public partial async Task<LaunchRecordModel> GetRocketLaunchRecord(IMediator mediator, GetRocketLaunchRecord.Request request)
         {
-            var result = await Mediator.Send(request).ConfigureAwait(false);
+            var result = await mediator.Send(request).ConfigureAwait(false);
             return result;
         }
     }

diff --git a/...eratorTests.Should_Generate_Method_Bodies_key=GenerateBodyForRequest_sources=.verified.cs b/...eratorTests.Should_Generate_Method_Bodies_key=GenerateBodyForRequest_sources=.verified.cs
@@ -9,7 +9,7 @@ public partial class RocketMutation
     {
         public partial async Task<RocketModel> GetRocket(IMediator mediator, GetRocket.Request request)
         {
-            var result = await Mediator.Send(request).ConfigureAwait(false);
+            var result = await mediator.Send(request).ConfigureAwait(false);
             return result;
         }
     }

diff --git a/...ethod_Bodies_key=GenerateBodyWithCancellationTokenAndClaimsPrincipal_sources=.verified.cs b/...ethod_Bodies_key=GenerateBodyWithCancellationTokenAndClaimsPrincipal_sources=.verified.cs
@@ -10,7 +10,7 @@ public partial class RocketMutation
     {
         public partial async Task<RocketModel> Save2Rocket(IMediator mediator, Save2Rocket.Request request, ClaimsPrincipal cp, CancellationToken cancellationToken)
         {
-            var result = await Mediator.Send(request with { ClaimsPrincipal = cp }, cancellationToken).ConfigureAwait(false);
+            var result = await mediator.Send(request with { ClaimsPrincipal = cp }, cancellationToken).ConfigureAwait(false);
             return result;
         }
     }

diff --git a/....Should_Generate_Method_Bodies_key=GenerateBodyWithCancellationToken_sources=.verified.cs b/....Should_Generate_Method_Bodies_key=GenerateBodyWithCancellationToken_sources=.verified.cs
@@ -10,7 +10,7 @@ public partial class RocketMutation
     {
         public partial async Task<RocketModel> Save2Rocket(IMediator mediator, Save2Rocket.Request request, CancellationToken cancellationToken)
         {
-            var result = await Mediator.Send(request, cancellationToken).ConfigureAwait(false);
+            var result = await mediator.Send(request, cancellationToken).ConfigureAwait(false);
             return result;
         }
     }

diff --git a/...ts.Should_Generate_Method_Bodies_key=GenerateBodyWithClaimsPrincipal_sources=.verified.cs b/...ts.Should_Generate_Method_Bodies_key=GenerateBodyWithClaimsPrincipal_sources=.verified.cs
@@ -10,7 +10,7 @@ public partial class RocketMutation
     {
         public partial async Task<RocketModel> Save2Rocket(IMediator mediator, ClaimsPrincipal claimsPrincipal, Save2Rocket.Request request)
         {
-            var result = await Mediator.Send(request with { ClaimsPrincipal = claimsPrincipal }).ConfigureAwait(false);
+            var result = await mediator.Send(request with { ClaimsPrincipal = claimsPrincipal }).ConfigureAwait(false);
             return result;
         }
     }

diff --git a/..._Method_Bodies_key=GenerateBodyWithDifferentlyNamedCancellationToken_sources=.verified.cs b/..._Method_Bodies_key=GenerateBodyWithDifferentlyNamedCancellationToken_sources=.verified.cs
@@ -10,7 +10,7 @@ public partial class RocketMutation
     {
         public partial async Task<RocketModel> Save2Rocket(IMediator mediator, Save2Rocket.Request request, CancellationToken token)
         {
-            var result = await Mediator.Send(request, token).ConfigureAwait(false);
+            var result = await mediator.Send(request, token).ConfigureAwait(false);
             return result;
         }
     }

diff --git a/...te_Method_Bodies_key=GenerateBodyWithDifferentlyNamedClaimsPrincipal_sources=.verified.cs b/...te_Method_Bodies_key=GenerateBodyWithDifferentlyNamedClaimsPrincipal_sources=.verified.cs
@@ -11,7 +11,7 @@ public partial class RocketMutation
         public partial async Task<RocketModel> Save2Rocket(IMediator mediator, Save2Rocket.Request request, ClaimsPrincipal cp)
         {
             request.ClaimsPrincipal = cp;
-            var result = await Mediator.Send(request).ConfigureAwait(false);
+            var result = await mediator.Send(request).ConfigureAwait(false);
             return result;
         }
     }

diff --git a/...ould_Generate_Method_Bodies_key=GenerateBodyWithoutCancellationToken_sources=.verified.cs b/...ould_Generate_Method_Bodies_key=GenerateBodyWithoutCancellationToken_sources=.verified.cs
@@ -10,7 +10,7 @@ public partial class RocketMutation
     {
         public partial async Task<RocketModel> Save2Rocket(IMediator mediator, Save2Rocket.Request request)
         {
-            var result = await Mediator.Send(request).ConfigureAwait(false);
+            var result = await mediator.Send(request).ConfigureAwait(false);
             return result;
         }
     }