Support result return from paramless action

Author: stidsborg

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

@@ -1,6 +1,4 @@
 using System.Threading.Tasks;
-using Cleipnir.ResilientFunctions.Helpers;
-using Cleipnir.ResilientFunctions.Storage;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Cleipnir.ResilientFunctions.Tests.InMemoryTests.RFunctionTests;
@@ -16,6 +14,10 @@ public override Task SunshineScenarioFunc()
     public override Task SunshineScenarioParamless()
         => SunshineScenarioParamless(FunctionStoreFactory.Create());
 
+    [TestMethod]
+    public override Task SunshineScenarioParamlessWithResultReturnType()
+        => SunshineScenarioParamlessWithResultReturnType(FunctionStoreFactory.Create());
+
     [TestMethod]
     public override Task SunshineScenarioFuncWithState()
         => SunshineScenarioFuncWithState(FunctionStoreFactory.Create());

Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/RFunctionTests/SunshineTests.cs

@@ -80,6 +80,37 @@ public async Task SunshineScenarioParamless(Task<IFunctionStore> storeTask)
 
         unhandledExceptionHandler.ThrownExceptions.ShouldBeEmpty();
     }
+    
+    public abstract Task SunshineScenarioParamlessWithResultReturnType();
+    public async Task SunshineScenarioParamlessWithResultReturnType(Task<IFunctionStore> storeTask)
+    {
+        var store = await storeTask;
+        var functionTypeId = TestFunctionId.Create().TypeId;
+        var unhandledExceptionHandler = new UnhandledExceptionCatcher();
+
+        using var functionsRegistry = new FunctionsRegistry(store, new Settings(unhandledExceptionHandler.Catch));
+        var flag = new SyncedFlag();
+        var registration = functionsRegistry
+            .RegisterParamless(
+                functionTypeId,
+                inner: () =>
+                {
+                    flag.Raise();
+                    return Result.Succeed.ToTask();
+                })
+            .Invoke;
+
+        await registration("SomeInstanceId");
+        flag.Position.ShouldBe(FlagPosition.Raised);
+            
+        var storedFunction = await store.GetFunction(new FunctionId(functionTypeId, functionInstanceId: "SomeInstanceId"));
+        storedFunction.ShouldNotBeNull();
+        storedFunction.Status.ShouldBe(Status.Succeeded);
+        storedFunction.Result.ShouldBeNull();
+        storedFunction.Parameter.ShouldBeNull();
+            
+        unhandledExceptionHandler.ThrownExceptions.ShouldBeEmpty();
+    }
 
     public abstract Task SunshineScenarioFuncWithState();
     public async Task SunshineScenarioFuncWithState(Task<IFunctionStore> storeTask)

Core/Cleipnir.ResilientFunctions/Domain/Result.cs

@@ -41,7 +41,7 @@ private Result(bool succeed, Postpone? postpone, Exception? fail, Suspend? suspe
 
     public Result<Unit?> ToUnit() => Outcome switch
     {
-        Outcome.Succeed => new Result<Unit?>(Unit.Instance),
+        Outcome.Succeed => new Result<Unit?>(succeedWithValue: default),
         Outcome.Postpone => new Result<Unit?>(Postpone!),
         Outcome.Fail => new Result<Unit?>(Fail!),
         Outcome.Suspend => new Result<Unit?>(Suspend!),

Core/Cleipnir.ResilientFunctions/InnerAdapters/InnerToAsyncResultAdapters.cs

@@ -40,6 +40,36 @@ internal static class InnerToAsyncResultAdapters
         };
     }
 
+    public static Func<Unit?, Workflow, Task<Result<Unit?>>> ToInnerParamlessWithTaskResultReturn(Func<Task<Result>> inner)
+    {
+        return async (_, _) =>
+        {
+            try
+            {
+                var result = await inner();
+                return result.ToUnit();
+            }
+            catch (PostponeInvocationException exception) { return Postpone.Until(exception.PostponeUntil); }
+            catch (SuspendInvocationException exception) { return Suspend.While(exception.ExpectedInterruptCount.Value); }
+            catch (Exception exception) { return Fail.WithException(exception); }
+        };
+    }
+    
+    public static Func<Unit?, Workflow, Task<Result<Unit?>>> ToInnerParamlessWithTaskResultReturn(Func<Workflow, Task<Result>> inner)
+    {
+        return async (_, workflow) =>
+        {
+            try
+            {
+                var result = await inner(workflow);
+                return result.ToUnit();
+            }
+            catch (PostponeInvocationException exception) { return Postpone.Until(exception.PostponeUntil); }
+            catch (SuspendInvocationException exception) { return Suspend.While(exception.ExpectedInterruptCount.Value); }
+            catch (Exception exception) { return Fail.WithException(exception); }
+        };
+    }
+    
     // ** !! ACTION !! ** //
     // ** SYNC ** //
     public static Func<TParam, Workflow, Task<Result<Unit?>>> ToInnerActionWithTaskResultReturn<TParam>(Action<TParam> inner) where TParam : notnull

Stores/MySQL/Cleipnir.ResilientFunctions.MySQL.Tests/RFunctionTests/SunshineTests.cs

@@ -12,7 +12,11 @@ public override Task SunshineScenarioFunc()
     [TestMethod]
     public override Task SunshineScenarioParamless()
         => SunshineScenarioParamless(FunctionStoreFactory.Create());
-    
+
+    [TestMethod]
+    public override Task SunshineScenarioParamlessWithResultReturnType()
+        => SunshineScenarioParamlessWithResultReturnType(FunctionStoreFactory.Create());
+
     [TestMethod]
     public override Task SunshineScenarioFuncWithState() 
         => SunshineScenarioFuncWithState(FunctionStoreFactory.Create());

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

@@ -13,6 +13,10 @@ public override Task SunshineScenarioFunc()
     [TestMethod]
     public override Task SunshineScenarioParamless()
         => SunshineScenarioParamless(FunctionStoreFactory.Create());
+    
+    [TestMethod]
+    public override Task SunshineScenarioParamlessWithResultReturnType()
+        => SunshineScenarioParamlessWithResultReturnType(FunctionStoreFactory.Create());
 
     [TestMethod]
     public override Task SunshineScenarioFuncWithState() 

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

@@ -13,7 +13,11 @@ public override Task SunshineScenarioFunc()
     [TestMethod]
     public override Task SunshineScenarioParamless()
         => SunshineScenarioParamless(FunctionStoreFactory.Create());
-    
+
+    [TestMethod]
+    public override Task SunshineScenarioParamlessWithResultReturnType()
+        => SunshineScenarioParamlessWithResultReturnType(FunctionStoreFactory.Create());
+
     [TestMethod]
     public override Task SunshineScenarioFuncWithState() 
         => SunshineScenarioFuncWithState(FunctionStoreFactory.Create());