Possible fix saga side effects for #2163 (#2176)

reimagined · Dec 13, 2021 · 3c0b722 · 3c0b722
1 parent b22a148
commit 3c0b722
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 31 deletions.
diff --git a/packages/core/core/src/saga/create-event-handler.ts b/packages/core/core/src/saga/create-event-handler.ts
@@ -70,7 +70,7 @@ export const createEventHandler = (
     const sideEffectsTimestamp = await runtime.getSideEffectsTimestamp()
 
     const isEnabled = !isNaN(+sideEffectsTimestamp)
-      ? +sideEffectsTimestamp <= +event.timestamp
+      ? +sideEffectsTimestamp < +event.timestamp
       : true
 
     if (

diff --git a/packages/runtime/runtimes/runtime-aws-serverless/src/event-subscriber-notifier-factory.ts b/packages/runtime/runtimes/runtime-aws-serverless/src/event-subscriber-notifier-factory.ts
@@ -18,8 +18,8 @@ type NotifierRuntime = {
 
 export const LAMBDA_TO_STEP_FUNCTION_COST_EXPENSE_THRESHOLD_MS = 3000
 
-export const waitForSubscriber = async (isSaga = false) =>
-  await new Promise((resolve) => setTimeout(resolve, isSaga ? 10000 : 1000))
+export const waitForSubscriber = async () =>
+  await new Promise((resolve) => setTimeout(resolve, 1000))
 
 export const checkError = (error: any, value: string) =>
   error != null &&

diff --git a/packages/runtime/runtimes/runtime-aws-serverless/src/lambda-worker.ts b/packages/runtime/runtimes/runtime-aws-serverless/src/lambda-worker.ts
@@ -1,10 +1,7 @@
 import { getLog, createRuntime } from '@resolve-js/runtime-base'
 
 import { schedulerFactory } from './scheduler-factory'
-import {
-  eventSubscriberNotifierFactory,
-  waitForSubscriber,
-} from './event-subscriber-notifier-factory'
+import { eventSubscriberNotifierFactory } from './event-subscriber-notifier-factory'
 import { putDurationMetrics } from './metrics'
 import { handleWebsocketEvent } from './websocket-event-handler'
 import { handleApiGatewayEvent } from './api-gateway-handler'
@@ -141,29 +138,14 @@ export const lambdaWorker = async (
       const { resolveSource, eventSubscriber, ...buildParameters } = lambdaEvent
       void resolveSource
 
-      const currentEventSubscriber = coldStartContext.eventListeners.get(
-        eventSubscriber
-      ) ?? { isSaga: false }
-
-      let executorResult = await runtime.eventSubscriber.build({
+      const executorResult = await runtime.eventSubscriber.build({
         ...buildParameters,
         eventSubscriber,
         coldStart,
       })
 
       log.verbose(`executorResult: ${JSON.stringify(executorResult)}`)
 
-      if (currentEventSubscriber.isSaga) {
-        await waitForSubscriber(true)
-        executorResult = await runtime.eventSubscriber.build({
-          ...buildParameters,
-          eventSubscriber,
-          coldStart,
-        })
-
-        log.verbose(`sagaExecutorResult: ${JSON.stringify(executorResult)}`)
-      }
-
       return executorResult
     } else if (
       Array.isArray(lambdaEvent.Records) &&

diff --git a/packages/tools/testing-tools/src/runtime/get-event-store.ts b/packages/tools/testing-tools/src/runtime/get-event-store.ts
@@ -70,9 +70,9 @@ export const getEventStore = async (
         const event = events[timestampIndex]
 
         event.timestamp =
-          eventByAggregateIdVersion.get(
+          (eventByAggregateIdVersion.get(
             `${event.aggregateId}:${event.aggregateVersion}`
-          )?.timestamp ?? timestampIndex
+          )?.timestamp ?? timestampIndex) + 1
       }
 
       return {

diff --git a/packages/tools/testing-tools/test/__snapshots__/read-model.test.ts.snap b/packages/tools/testing-tools/test/__snapshots__/read-model.test.ts.snap
@@ -3,15 +3,15 @@
 exports[`givenEvents tests should match snapshot 1`] = `
 Array [
   Object {
-    "timestamp": 0,
+    "timestamp": 1,
     "value": "test-1",
   },
   Object {
-    "timestamp": 1,
+    "timestamp": 2,
     "value": "test-2",
   },
   Object {
-    "timestamp": 2,
+    "timestamp": 3,
     "value": "test-3",
   },
 ]
@@ -20,15 +20,15 @@ Array [
 exports[`givenEvents tests should match snapshot with specified timestamp 1`] = `
 Array [
   Object {
-    "timestamp": 10,
+    "timestamp": 11,
     "value": "test-1",
   },
   Object {
-    "timestamp": 20,
+    "timestamp": 21,
     "value": "test-2",
   },
   Object {
-    "timestamp": 30,
+    "timestamp": 31,
     "value": "test-3",
   },
 ]