Merge pull request #9 from reecerussell/add-on-complete-events

Add on complete events
reecerussell · Jul 2, 2021 · c115a55 · c115a55
2 parents 625a673 + adf12a7
commit c115a55
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 10 deletions.
diff --git a/TxCommand.Abstractions/ITxCommand.cs b/TxCommand.Abstractions/ITxCommand.cs
@@ -3,12 +3,19 @@
 
 namespace TxCommand.Abstractions
 {
+    /// <summary>
+    /// An empty interface used to identify the different variants of <see cref="ITxCommand"/>.
+    /// </summary>
+    public interface ICommand
+    {
+    }
+
     /// <summary>
     /// A transaction command is an abstraction used to execute a command which requires
     /// a database transaction in order to operate correctly. <see cref="ITxCommand"/> provides a method
     /// to execute the command, providing it with a <see cref="IDbTransaction"/>.
     /// </summary>
-    public interface ITxCommand
+    public interface ITxCommand : ICommand
     {
         /// <summary>
         /// Executes the implementing command, providing a <see cref="IDbTransaction"/>, allowing
@@ -34,7 +41,7 @@ public interface ITxCommand
     /// this provides a type argument, <typeparamref name="TResult"/>, allowing the
     /// command to output data.
     /// </summary>
-    public interface ITxCommand<TResult>
+    public interface ITxCommand<TResult> : ICommand
     {
         /// <summary>
         /// Executes the implementing command, providing a <see cref="IDbTransaction"/>, allowing

diff --git a/TxCommand.Abstractions/TxCommand.Abstractions.csproj b/TxCommand.Abstractions/TxCommand.Abstractions.csproj
@@ -8,9 +8,9 @@
     <RepositoryUrl>https://github.com/reecerussell/tx-command</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>CQRS, commanding, sql, transaction</PackageTags>
-    <AssemblyVersion>0.2.0.0</AssemblyVersion>
-    <FileVersion>0.2.0.0</FileVersion>
-    <Version>0.2.0</Version>
+    <AssemblyVersion>0.3.0.0</AssemblyVersion>
+    <FileVersion>0.3.0.0</FileVersion>
+    <Version>0.3.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/reecerussell/tx-command</PackageProjectUrl>
   </PropertyGroup>

diff --git a/TxCommand.Tests/TxCommandExecutorTests.cs b/TxCommand.Tests/TxCommandExecutorTests.cs
@@ -101,8 +101,18 @@ public async Task ExecuteAsync_GivenCommand_ExecutesTheCommand()
             command.Setup(x => x.ExecuteAsync(connection.Object, transaction)).Returns(Task.CompletedTask).Verifiable();
 
             var commandExecutor = new TxCommandExecutor(connection.Object);
+
+            var callbackCalled = false;
+            commandExecutor.OnComplete += (c) =>
+            {
+                callbackCalled = true;
+                Assert.Equal(command.Object, c);
+            };
+
             await commandExecutor.ExecuteAsync(command.Object);
 
+            Assert.True(callbackCalled);
+
             command.Verify(x => x.Validate(), Times.Once);
             command.Verify(x => x.ExecuteAsync(connection.Object, transaction), Times.Once);
             connection.Verify(x => x.BeginTransaction());
@@ -224,8 +234,18 @@ public async Task ExecuteAsyncWithResult_GivenCommand_ExecutesTheCommand()
             command.Setup(x => x.ExecuteAsync(connection.Object, transaction)).ReturnsAsync(testResult).Verifiable();
 
             var commandExecutor = new TxCommandExecutor(connection.Object);
-            var result = await commandExecutor.ExecuteAsync(command.Object);
+
+            var callbackCalled = false;
+            commandExecutor.OnComplete += (c) =>
+            {
+                callbackCalled = true;
+                Assert.Equal(command.Object, c);
+            };
+
+            var result =await commandExecutor.ExecuteAsync(command.Object);
+
             Assert.Equal(testResult, result);
+            Assert.True(callbackCalled);
 
             command.Verify(x => x.Validate(), Times.Once);
             command.Verify(x => x.ExecuteAsync(connection.Object, transaction), Times.Once);

diff --git a/TxCommand/TxCommand.csproj b/TxCommand/TxCommand.csproj
@@ -2,16 +2,16 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>0.3.1</Version>
+    <Version>0.4.0</Version>
     <Authors>Reece Russell</Authors>
     <RepositoryUrl>https://github.com/reecerussell/tx-command</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>CQRS, commanding, sql, transaction</PackageTags>
     <Description>Provides support for executing CQRS command within a database transaction.</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Company />
-    <AssemblyVersion>0.3.1.0</AssemblyVersion>
-    <FileVersion>0.3.1.0</FileVersion>
+    <AssemblyVersion>0.4.0.0</AssemblyVersion>
+    <FileVersion>0.4.0.0</FileVersion>
     <PackageProjectUrl>https://github.com/reecerussell/tx-command</PackageProjectUrl>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
   </PropertyGroup>

diff --git a/TxCommand/TxCommandExecutor.cs b/TxCommand/TxCommandExecutor.cs
@@ -16,6 +16,9 @@ public class TxCommandExecutor : ITxCommandExecutor
         private bool _disposed = false;
         private bool _completed = true;
 
+        public delegate void CommandDelegate(ICommand command);
+        public CommandDelegate OnComplete;
+
         /// <summary>
         /// Initializes a new instance of <see cref="TxCommandExecutor"/>.
         /// </summary>
@@ -92,6 +95,8 @@ public async Task ExecuteAsync(ITxCommand command)
             {
                 command.Validate();
                 await command.ExecuteAsync(_connection, _transaction);
+
+                OnComplete?.Invoke(command);
             }
             catch
             {
@@ -137,7 +142,12 @@ public async Task<TResult> ExecuteAsync<TResult>(ITxCommand<TResult> command)
             try
             {
                 command.Validate();
-                return await command.ExecuteAsync(_connection, _transaction);
+
+                var result = await command.ExecuteAsync(_connection, _transaction);
+
+                OnComplete?.Invoke(command);
+
+                return result;
             }
             catch
             {