fix calls direction

Author: KSemenenko

ManagedCode.Orleans.Graph.Tests/Cluster/TestSiloConfigurations.cs

@@ -12,7 +12,10 @@ public void Configure(ISiloBuilder siloBuilder)
             .CreateGraph(graph =>
             {
                 graph.AddGrain<IGrainA>()
+                    .AllowClientCallGrain()
                     .WithReentrancy();
+
+                graph.AllowClientCallGrain<IGrainB>();
 
                 graph.AddGrainTransition<IGrainA, IGrainB>().AllMethods().WithReentrancy();
                 graph.AddGrainTransition<IGrainB, IGrainC>().AllMethods().WithReentrancy();

…ns.Graph.Tests/GrainGraphManagerTests.cs …aph.Tests/GrainTransitionManagerTests.csManagedCode.Orleans.Graph.Tests/GrainGraphManagerTests.cs renamed to ManagedCode.Orleans.Graph.Tests/GrainTransitionManagerTests.cs ManagedCode.Orleans.Graph.Tests/GrainGraphManagerTests.cs renamed to ManagedCode.Orleans.Graph.Tests/GrainTransitionManagerTests.cs

@@ -1,3 +1,4 @@
+using FluentAssertions;
 using ManagedCode.Orleans.Graph.Tests.Cluster;
 using ManagedCode.Orleans.Graph.Tests.Cluster.Grains.Interfaces;
 using Xunit;
@@ -25,6 +26,32 @@ await _testApp.Cluster
             .GetGrain<IGrainA>("1")
             .MethodA1(1);
     }
+    
+    [Fact]
+    public async Task GrainB_B1Test()
+    {
+        await _testApp.Cluster
+            .Client
+            .GetGrain<IGrainB>("1")
+            .MethodB1(1);
+    }
+    
+    [Fact]
+    public async Task GrainC_C1Test()
+    {
+        var exception = await Assert.ThrowsAsync<InvalidOperationException>(async () =>
+        {
+            await _testApp.Cluster
+                .Client
+                .GetGrain<IGrainC>("1")
+                .MethodC1(1);
+        });
+
+        exception.Message
+            .Should()
+            .StartWith("Transition is not allowed.");
+    }
+    
 
     [Fact]
     public async Task GrainA_B1Test()

ManagedCode.Orleans.Graph.Tests/GraphTests.cs

@@ -1,4 +1,5 @@
 using System;
+using ManagedCode.Orleans.Graph.Interfaces;
 using ManagedCode.Orleans.Graph.Models;
 using Orleans;
 
@@ -14,10 +15,16 @@ public GrainCallsBuilder(bool allowSelfLoops = true)
     {
         _graph = new DirectedGraph(allowSelfLoops);
     }
+    
+    public IGrainCallsBuilder AllowClientCallGrain<TGrain>() where TGrain : IGrain
+    {
+        AddTransition(Constants.ClientCallerId, typeof(TGrain).FullName!);
+        return this;
+    }
 
     public ITransitionBuilder<TGrain> From<TGrain>() where TGrain : IGrain
     {
-        return new TransitionBuilder<TGrain>(this, typeof(TGrain).FullName);
+        return new TransitionBuilder<TGrain>(this, typeof(TGrain).FullName!);
     }
 
     public IMethodBuilder<TGrain, TGrain> AddGrain<TGrain>() where TGrain : IGrain

ManagedCode.Orleans.Graph/Builder/GrainCallsBuilder.cs

@@ -13,6 +13,13 @@ public interface IGrainCallsBuilder
     /// <typeparam name="TGrain">The type of the grain.</typeparam>
     /// <returns>An instance of <see cref="ITransitionBuilder{TGrain}"/>.</returns>
     ITransitionBuilder<TGrain> From<TGrain>() where TGrain : IGrain;
+    
+    /// <summary>
+    /// Allows the client to call the specified grain.
+    /// </summary>
+    /// <typeparam name="TGrain">The type of the grain.</typeparam>
+    /// <returns>The current instance of <see cref="IGrainCallsBuilder"/>.</returns>
+    IGrainCallsBuilder AllowClientCallGrain<TGrain>() where TGrain : IGrain;
 
     /// <summary>
     /// Allows all grain calls.

ManagedCode.Orleans.Graph/Builder/Interfaces/IGrainCallsBuilder.cs

@@ -30,6 +30,12 @@ public interface IMethodBuilder<TSource, TTarget> where TSource : IGrain where T
     /// <returns>The current instance of <see cref="IMethodBuilder{TSource, TTarget}"/>.</returns>
     IMethodBuilder<TSource, TTarget> WithReentrancy();
 
+    /// <summary>
+    /// Allows client calls to the grain.
+    /// </summary>
+    /// <returns>The current instance of <see cref="IMethodBuilder{TSource, TTarget}"/>.</returns>
+    IMethodBuilder<TSource, TTarget> AllowClientCallGrain();
+    
     /// <summary>
     /// Specifies a method transition between two grains using method names.
     /// </summary>

ManagedCode.Orleans.Graph/Builder/Interfaces/IGroupBuilder.cs

@@ -64,6 +64,13 @@ public IMethodBuilder<TSource, TTarget> MethodsByName(params (string sourceMetho
         }
         return this;
     }
+    
+    public IMethodBuilder<TSource, TTarget> AllowClientCallGrain()
+    {
+        _parent.AllowClientCallGrain<TSource>();
+        _parent.AllowClientCallGrain<TTarget>();
+        return this;
+    }
 
     public IMethodBuilder<TSource, TTarget> AllSourceMethodsToSpecificTargetMethods(params string[] targetMethods)
     {

ManagedCode.Orleans.Graph/Builder/Interfaces/IMethodBuilder.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using ManagedCode.Orleans.Graph.Interfaces;
 using ManagedCode.Orleans.Graph.Models;
 using Orleans;
@@ -20,7 +21,9 @@ public static bool TrackOutgoingCall(this IOutgoingGrainCallContext context)
     {
         var caller = context.SourceId is null
             ? Constants.ClientCallerId
-            : context.SourceContext!.GrainInstance!.GetType().Name;
+            : context.SourceContext!.GrainInstance!.GetType()
+                .GetInterfaces()
+                .FirstOrDefault(i => typeof(IGrain).IsAssignableFrom(i))?.FullName;
 
         var call = context.GetCallHistory();
         call.Push(new OutCall(caller, context.InterfaceName, context.MethodName));