Fixed suspension issue when append messages to own flow

Author: stidsborg

Core/Cleipnir.ResilientFunctions.Tests/InMemoryTests/RFunctionTests/SuspensionTests.cs

@@ -91,4 +91,8 @@ public override Task ExecutingFlowIsReExecutedWhenSuspendedAfterInterrupt()
     [TestMethod]
     public override Task InterruptSuspendedFlows()
         => InterruptSuspendedFlows(FunctionStoreFactory.Create());
+
+    [TestMethod]
+    public override Task AwaitMessageAfterAppendShouldNotCauseSuspension()
+        => AwaitMessageAfterAppendShouldNotCauseSuspension(FunctionStoreFactory.Create());
 }

Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/FunctionTests/SuspensionTests.cs

@@ -742,4 +742,35 @@ protected async Task InterruptSuspendedFlows(Task<IFunctionStore> storeTask)
 
         unhandledExceptionHandler.ShouldNotHaveExceptions();
     }
+    
+    public abstract Task AwaitMessageAfterAppendShouldNotCauseSuspension();
+    protected async Task AwaitMessageAfterAppendShouldNotCauseSuspension(Task<IFunctionStore> storeTask)
+    {
+        var store = await storeTask;
+        var id = TestFlowId.Create();
+        var (flowType, flowInstance) = id;
+
+        var unhandledExceptionHandler = new UnhandledExceptionCatcher();
+        using var functionsRegistry = new FunctionsRegistry
+        (
+            store,
+            new Settings(unhandledExceptionHandler.Catch)
+        );
+        
+        var registration = functionsRegistry.RegisterFunc<string, string>(
+            flowType,
+            inner: async Task<string> (param, workflow) =>
+            {
+                var messages = workflow.Messages;
+                await messages.AppendMessage(param);
+                    
+                return await messages.FirstOfType<string>();
+            }
+        );
+
+        var result = await registration.Invoke("SomeInstance", "Hello World");
+        result.ShouldBe("Hello World");
+        
+        unhandledExceptionHandler.ShouldNotHaveExceptions();
+    }
 }

Core/Cleipnir.ResilientFunctions/Messaging/MessagesPullerAndEmitter.cs

@@ -84,8 +84,10 @@ public async Task PullEvents(TimeSpan maxSinceLastSynced)
         try
         {
             var storedMessages = _initialMessages ?? await _messageStore.GetMessages(_storedId, _skip);
-            _initialMessages = null;
+            if (_initialMessages != null && maxSinceLastSynced == TimeSpan.Zero)
+                storedMessages = storedMessages.Concat(await _messageStore.GetMessages(_storedId, _skip)).ToList();   
 
+            _initialMessages = null;
             _lastSynced = _utcNow();
             _skip += storedMessages.Count;
 
@@ -118,7 +120,5 @@ public async Task PullEvents(TimeSpan maxSinceLastSynced)
 
             throw eventHandlingException;
         }
-
-        return;
     }
 }

Stores/MariaDB/Cleipnir.ResilientFunctions.MariaDB.Tests/RFunctionTests/SuspensionTests.cs

@@ -79,4 +79,8 @@ public override Task InterruptSuspendedFlows()
     [TestMethod]
     public override Task ChildIsCreatedWithParentsId()
         => ChildIsCreatedWithParentsId(FunctionStoreFactory.Create());
+    
+    [TestMethod]
+    public override Task AwaitMessageAfterAppendShouldNotCauseSuspension()
+        => AwaitMessageAfterAppendShouldNotCauseSuspension(FunctionStoreFactory.Create());
 }

Stores/PostgreSQL/Cleipnir.ResilientFunctions.PostgreSQL.Tests/RFunctionTests/SuspensionTests.cs

@@ -80,4 +80,8 @@ public override Task InterruptSuspendedFlows()
     [TestMethod]
     public override Task ChildIsCreatedWithParentsId()
         => ChildIsCreatedWithParentsId(FunctionStoreFactory.Create());
+    
+    [TestMethod]
+    public override Task AwaitMessageAfterAppendShouldNotCauseSuspension()
+        => AwaitMessageAfterAppendShouldNotCauseSuspension(FunctionStoreFactory.Create());
 }

Stores/SqlServer/Cleipnir.ResilientFunctions.SqlServer.Tests/RFunctionTests/SuspensionTests.cs

@@ -80,4 +80,8 @@ public override Task ExecutingFlowIsReExecutedWhenSuspendedAfterInterrupt()
     [TestMethod]
     public override Task InterruptSuspendedFlows()
         => InterruptSuspendedFlows(FunctionStoreFactory.Create());
+    
+    [TestMethod]
+    public override Task AwaitMessageAfterAppendShouldNotCauseSuspension()
+        => AwaitMessageAfterAppendShouldNotCauseSuspension(FunctionStoreFactory.Create());
 }