Fix #1994

reimagined · Sep 10, 2021 · 6e3a462 · 6e3a462
1 parent 8ca4e63
commit 6e3a462
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/packages/core/core/src/aggregate/get-aggregates-interop-builder.ts b/packages/core/core/src/aggregate/get-aggregates-interop-builder.ts
@@ -508,7 +508,7 @@ const makeCommandExecutor = (
         processedEvent.payload = event.payload
       }
 
-      await (async (): Promise<void> => {
+      const savedEvent = await (async (): Promise<Event> => {
         const subSegment = getPerformanceTracerSubsegment(
           runtime.monitoring,
           'saveEvent'
@@ -525,7 +525,7 @@ const makeCommandExecutor = (
       })()
 
       return aggregate.commandHttpResponseMode === CommandHttpResponseMode.event
-        ? processedEvent
+        ? savedEvent
         : {}
     } catch (error) {
       executionError = error

diff --git a/packages/core/core/test/get-aggregates-interop-builder.unit.test.ts b/packages/core/core/test/get-aggregates-interop-builder.unit.test.ts
@@ -27,6 +27,8 @@ const makeAggregateMeta = (params: any) => ({
     params.commandHttpResponseMode || CommandHttpResponseMode.event,
 })
 
+let lastSavedEvent: any = null
+
 const makeTestRuntime = (storedEvents: Event[] = []): AggregateRuntime => {
   const generatedEvents: Event[] = []
 
@@ -37,8 +39,10 @@ const makeTestRuntime = (storedEvents: Event[] = []): AggregateRuntime => {
   }
 
   const eventstore: Eventstore = {
-    saveEvent: jest.fn(async (event) => {
+    saveEvent: jest.fn(async (originalEvent) => {
+      const event = { ...originalEvent, timestamp: Date.now() }
       generatedEvents.push(event)
+      lastSavedEvent = event
       return {
         cursor: null,
         event,
@@ -720,6 +724,31 @@ describe('Command handlers', () => {
       })
     ).resolves.toEqual({})
   })
+
+  test('should execute command and return last saved event', async () => {
+    const { executeCommand } = getAggregatesInteropBuilder([
+      makeAggregateMeta({
+        encryption: () => Promise.resolve({}),
+        name: 'empty',
+        commands: {
+          emptyCommand: () => {
+            return {
+              type: 'EmptyEvent',
+              payload: {},
+            }
+          },
+        },
+      }),
+    ])(makeTestRuntime())
+
+    const event = (await executeCommand({
+      aggregateName: 'empty',
+      aggregateId: 'aggregateId',
+      type: 'emptyCommand',
+    })) as CommandResult
+
+    expect(event).toBe(lastSavedEvent)
+  })
 })
 
 describe('Snapshots', () => {