From edcafa140c1869df3c420c2becfbf23b6af75ddc Mon Sep 17 00:00:00 2001
From: "Carlos R. L. Rodrigues"
 <37986729+carlos-r-l-rodrigues@users.noreply.github.com>
Date: Mon, 29 Apr 2024 13:55:41 -0300
Subject: [PATCH] fix onStepAwaiting events (#7161)

---
 .changeset/twelve-crabs-clean.md                            | 6 ++++++
 .../src/transaction/transaction-orchestrator.ts             | 6 +++---
 .../src/services/workflow-orchestrator.ts                   | 4 +---
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/twelve-crabs-clean.md

diff --git a/.changeset/twelve-crabs-clean.md b/.changeset/twelve-crabs-clean.md
new file mode 100644
index 0000000000..780eba686a
--- /dev/null
+++ b/.changeset/twelve-crabs-clean.md
@@ -0,0 +1,6 @@
+---
+"@medusajs/workflow-engine-redis": patch
+"@medusajs/orchestration": patch
+---
+
+Fix onStepAwaiting event
diff --git a/packages/orchestration/src/transaction/transaction-orchestrator.ts b/packages/orchestration/src/transaction/transaction-orchestrator.ts
index a327734aeb..dca3119a10 100644
--- a/packages/orchestration/src/transaction/transaction-orchestrator.ts
+++ b/packages/orchestration/src/transaction/transaction-orchestrator.ts
@@ -720,6 +720,9 @@ export class TransactionOrchestrator extends EventEmitter {
                 )
                 .then(async (response: any) => {
                   if (!step.definition.backgroundExecution) {
+                    const eventName = DistributedTransactionEvent.STEP_AWAITING
+                    transaction.emit(eventName, { step, transaction })
+
                     return
                   }
 
@@ -752,9 +755,6 @@ export class TransactionOrchestrator extends EventEmitter {
 
                   await setStepFailure(error)
                 })
-
-              const eventName = DistributedTransactionEvent.STEP_AWAITING
-              transaction.emit(eventName, { step, transaction })
             })
           )
         }
diff --git a/packages/workflow-engine-redis/src/services/workflow-orchestrator.ts b/packages/workflow-engine-redis/src/services/workflow-orchestrator.ts
index 7f6484394f..09d048df21 100644
--- a/packages/workflow-engine-redis/src/services/workflow-orchestrator.ts
+++ b/packages/workflow-engine-redis/src/services/workflow-orchestrator.ts
@@ -573,9 +573,7 @@ export class WorkflowOrchestratorService {
 
         await notify({ eventType: "onStepAwaiting", step })
 
-        if (!step.definition.backgroundExecution) {
-          this.activeStepsCount--
-        }
+        this.activeStepsCount--
       },
 
       onCompensateStepSuccess: async ({ step, transaction }) => {