Merge pull request #611 from mbican/EF-605_ProcessSagaAsync_SourceId

EF-605: use EventId as SourceId for external event delivered to saga …
eventflow · Apr 11, 2019 · 367dc0f · 367dc0f
2 parents d2f528a + 9f6d3fa
commit 367dc0f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -18,6 +18,8 @@
   - `EventFlow.Sql`
   - `EventFlow.SQLite`
 * New: Added [SourceLink](https://github.com/dotnet/sourcelink) support
+* Fix: `DispatchToSagas.ProcessSagaAsync` use `EventId` instead of `SourceId` as `SourceId` 
+  for delivery of external event to AggregateSaga
 * Fix: `Identity<T>.NewComb()` now produces string values that doesn't cause
   too much index fragmentation in MSSQL string columns
 

diff --git a/Source/EventFlow.TestHelpers/Test.cs b/Source/EventFlow.TestHelpers/Test.cs
@@ -120,6 +120,7 @@ protected IDomainEvent<ThingyAggregate, ThingyId> ToDomainEvent<TAggregateEvent>
                 {
                     Timestamp = A<DateTimeOffset>(),
                     SourceId = A<SourceId>(),
+                    EventId = A<EventId>(),
                 };
 
             if (aggregateSequenceNumber == 0)

diff --git a/Source/EventFlow.Tests/UnitTests/Sagas/DispatchToSagasTests.cs b/Source/EventFlow.Tests/UnitTests/Sagas/DispatchToSagasTests.cs
@@ -91,6 +91,23 @@ public async Task SagaUpdaterIsInvokedCorrectly()
                 Times.Exactly(domainEventCount));
         }
 
+        [Test]
+        public async Task SagaStoreReceivesEventIdAsSourceId()
+        {
+            // Arrange
+            var sagaMock = Arrange_Woking_SagaStore(SagaState.Running);
+            var domainEvent = ADomainEvent<ThingyPingEvent>();
+
+            // Act
+            await Sut.ProcessAsync(new[] { domainEvent }, CancellationToken.None).ConfigureAwait(false);
+
+            // Assert
+            _sagaStoreMock.Verify(a => a.UpdateAsync(It.IsAny<ISagaId>(), It.IsAny<Type>(),
+                domainEvent.Metadata.EventId,
+                It.IsAny<Func<ISaga, CancellationToken, Task>>(),
+                It.IsAny<CancellationToken>()));
+        }
+
         [Test]
         public async Task SagaErrorHandlerIsInvokedCorrectly()
         {

diff --git a/Source/EventFlow/Sagas/DispatchToSagas.cs b/Source/EventFlow/Sagas/DispatchToSagas.cs
@@ -104,7 +104,7 @@ private async Task ProcessSagaAsync(
                 await _sagaStore.UpdateAsync(
                     sagaId,
                     details.SagaType,
-                    domainEvent.Metadata.SourceId,
+                    domainEvent.Metadata.EventId,
                     (s, c) => UpdateSagaAsync(s, domainEvent, details, c),
                     cancellationToken)
                     .ConfigureAwait(false);