From 98864ceaddf69c4da46293b692bfd3a7ef29a1e0 Mon Sep 17 00:00:00 2001
From: Faruk AYDIN <omerfaruk26@gmail.com>
Date: Sun, 20 Feb 2022 20:24:16 +0300
Subject: [PATCH] chore: Adjust untilStep logic for processor

---
 packages/backend/src/services/processor.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/services/processor.ts b/packages/backend/src/services/processor.ts
index 0a9b1d03..42f61365 100644
--- a/packages/backend/src/services/processor.ts
+++ b/packages/backend/src/services/processor.ts
@@ -24,25 +24,25 @@ class Processor {
     });
 
     let previousExecutionStep: ExecutionStep;
-    let fetchedActionData;
+    let fetchedData;
 
     for await (const step of steps) {
       if (step.type.toString() === 'trigger') {
         const appClass = (await import(`../apps/${step.appKey}`)).default;
         const appInstance = new appClass(step.connection.data);
-        const fetchedTriggerData = await appInstance.triggers[step.key].run();
+        fetchedData = await appInstance.triggers[step.key].run();
 
         previousExecutionStep = await execution
           .$relatedQuery('executionSteps')
           .insertAndFetch({
             stepId: step.id,
             status: 'success',
-            dataOut: fetchedTriggerData,
+            dataOut: fetchedData,
           });
       } else {
         const appClass = (await import(`../apps/${step.appKey}`)).default;
         const appInstance = new appClass(step.connection.data, step.parameters);
-        fetchedActionData = await appInstance.actions[step.key].run();
+        fetchedData = await appInstance.actions[step.key].run();
 
         previousExecutionStep = await execution
           .$relatedQuery('executionSteps')
@@ -50,12 +50,16 @@ class Processor {
             stepId: step.id,
             status: 'success',
             dataIn: previousExecutionStep.dataOut,
-            dataOut: fetchedActionData,
+            dataOut: fetchedData,
           });
       }
+
+      if (step.id === this.untilStep.id) {
+        return fetchedData;
+      }
     }
 
-    return fetchedActionData;
+    return fetchedData;
   }
 }