Merge pull request #1126 from automatisch/optimize-last-execution

refactor: Optimize fetching last execution step
automatisch · Jun 5, 2023 · 34e95f1 · 34e95f1
2 parents 9f759d7 + 6a92cfc
commit 34e95f1
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git a/packages/backend/src/apps/flowers-software/triggers/new-activity/index.ts b/packages/backend/src/apps/flowers-software/triggers/new-activity/index.ts
@@ -20,12 +20,14 @@ export default defineTrigger({
   ],
 
   async testRun($) {
-    if (!isEmpty($.lastExecutionStep?.dataOut)) {
+    const lastExecutionStep = await $.getLastExecutionStep();
+
+    if (!isEmpty(lastExecutionStep?.dataOut)) {
       $.pushTriggerItem({
-        raw: $.lastExecutionStep.dataOut,
+        raw: lastExecutionStep.dataOut,
         meta: {
           internalId: '',
-        }
+        },
       });
     }
   },
@@ -35,20 +37,15 @@ export default defineTrigger({
       name: $.flow.id,
       type: 'POST',
       url: $.webhookUrl,
-      filters: [$.step.parameters.filters]
+      filters: [$.step.parameters.filters],
     };
 
-    const { data } = await $.http.post(
-      `/v2/public/api/webhooks`,
-      payload
-    );
+    const { data } = await $.http.post(`/v2/public/api/webhooks`, payload);
 
     await $.flow.setRemoteWebhookId(data.id);
   },
 
   async unregisterHook($) {
-    await $.http.delete(
-      `/v2/public/api/webhooks/${$.flow.remoteWebhookId}`
-    );
+    await $.http.delete(`/v2/public/api/webhooks/${$.flow.remoteWebhookId}`);
   },
 });
diff --git a/packages/backend/src/apps/twilio/triggers/receive-sms/index.ts b/packages/backend/src/apps/twilio/triggers/receive-sms/index.ts
@@ -28,7 +28,7 @@ export default defineTrigger({
           {
             name: 'parameters.valueType',
             value: 'sid',
-          }
+          },
         ],
       },
     },
@@ -37,12 +37,14 @@ export default defineTrigger({
   async testRun($) {
     await fetchMessages($);
 
-    if (!isEmpty($.lastExecutionStep?.dataOut)) {
+    const lastExecutionStep = await $.getLastExecutionStep();
+
+    if (!isEmpty(lastExecutionStep?.dataOut)) {
       $.pushTriggerItem({
-        raw: $.lastExecutionStep.dataOut,
+        raw: lastExecutionStep.dataOut,
         meta: {
           internalId: '',
-        }
+        },
       });
     }
   },

diff --git a/packages/backend/src/apps/webhook/triggers/catch-raw-webhook/index.ts b/packages/backend/src/apps/webhook/triggers/catch-raw-webhook/index.ts
@@ -8,12 +8,14 @@ export default defineTrigger({
   description: 'Triggers when the webhook receives a request.',
 
   async testRun($) {
-    if (!isEmpty($.lastExecutionStep?.dataOut)) {
+    const lastExecutionStep = await $.getLastExecutionStep();
+
+    if (!isEmpty(lastExecutionStep?.dataOut)) {
       $.pushTriggerItem({
-        raw: $.lastExecutionStep.dataOut,
+        raw: lastExecutionStep.dataOut,
         meta: {
           internalId: '',
-        }
+        },
       });
     }
   },

diff --git a/packages/backend/src/helpers/global-variable.ts b/packages/backend/src/helpers/global-variable.ts
@@ -80,9 +80,10 @@ const globalVariable = async (
       testRun,
       exit: () => {
         throw new EarlyExitError();
-      }
+      },
     },
-    lastExecutionStep: (await step?.getLastExecutionStep())?.toJSON(),
+    getLastExecutionStep: async () =>
+      (await step?.getLastExecutionStep())?.toJSON(),
     triggerOutput: {
       data: [],
     },

diff --git a/packages/types/index.d.ts b/packages/types/index.d.ts
@@ -331,7 +331,7 @@ export type IGlobalVariable = {
     testRun: boolean;
     exit: () => void;
   };
-  lastExecutionStep?: IExecutionStep;
+  getLastExecutionStep?: () => Promise<IExecutionStep>;
   webhookUrl?: string;
   triggerOutput?: ITriggerOutput;
   actionOutput?: IActionOutput;