The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Workflow - Avoid billing skipped steps (#19547)
Thomas Trompette31baf5252845
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workspace-services/__tests__/workflow-executor.workspace-service.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workspace-services/__tests__/workflow-executor.workspace-service.spec.tsindex 11f92fa2b61..907c96bbaf3 100644--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workspace-services/__tests__/workflow-executor.workspace-service.spec.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workspace-services/__tests__/workflow-executor.workspace-service.spec.ts@@ -14,6 +14,8 @@ import { MetricsService } from 'src/engine/core-modules/metrics/metrics.service'import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';import { WorkflowActionFactory } from 'src/modules/workflow/workflow-executor/factories/workflow-action.factory';import { shouldExecuteStep } from 'src/modules/workflow/workflow-executor/utils/should-execute-step.util';+import { shouldFailSafely } from 'src/modules/workflow/workflow-executor/utils/should-fail-safely.util';+import { shouldSkipStepExecution } from 'src/modules/workflow/workflow-executor/utils/should-skip-step-execution.util';import {type WorkflowAction,WorkflowActionType,@@ -30,11 +32,25 @@ jest.mock(return {...actual,- shouldExecuteStep: jest.fn().mockReturnValue(true), // default behavior+ shouldExecuteStep: jest.fn().mockReturnValue(true),};},);+jest.mock(+ 'src/modules/workflow/workflow-executor/utils/should-fail-safely.util',+ () => ({+ shouldFailSafely: jest.fn().mockReturnValue(false),+ }),+);++jest.mock(+ 'src/modules/workflow/workflow-executor/utils/should-skip-step-execution.util',+ () => ({+ shouldSkipStepExecution: jest.fn().mockReturnValue(false),+ }),+);+describe('WorkflowExecutorWorkspaceService', () => {let service: WorkflowExecutorWorkspaceService;let workflowActionFactory: WorkflowActionFactory;@@ -358,6 +374,40 @@ describe('WorkflowExecutorWorkspaceService', () => {});});+ it('should not emit billing event for skipped steps', async () => {+ (shouldExecuteStep as jest.Mock).mockReturnValue(false);+ (shouldSkipStepExecution as jest.Mock).mockReturnValue(true);++ await service.executeFromSteps({+ workflowRunId: mockWorkflowRunId,+ stepIds: ['step-1'],+ workspaceId: mockWorkspaceId,+ });++ expect(workflowActionFactory.get).not.toHaveBeenCalled();+ expect(workspaceEventEmitter.emitCustomBatchEvent).not.toHaveBeenCalled();++ (shouldExecuteStep as jest.Mock).mockReturnValue(true);+ (shouldSkipStepExecution as jest.Mock).mockReturnValue(false);+ });++ it('should not emit billing event for fail-safely steps', async () => {+ (shouldExecuteStep as jest.Mock).mockReturnValue(false);+ (shouldFailSafely as jest.Mock).mockReturnValue(true);++ await service.executeFromSteps({+ workflowRunId: mockWorkflowRunId,+ stepIds: ['step-1'],+ workspaceId: mockWorkspaceId,+ });++ expect(workflowActionFactory.get).not.toHaveBeenCalled();+ expect(workspaceEventEmitter.emitCustomBatchEvent).not.toHaveBeenCalled();++ (shouldExecuteStep as jest.Mock).mockReturnValue(true);+ (shouldFailSafely as jest.Mock).mockReturnValue(false);+ });+it('should return if step should not be executed', async () => {(shouldExecuteStep as jest.Mock).mockReturnValueOnce(false);diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workspace-services/workflow-executor.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workspace-services/workflow-executor.workspace-service.tsindex 212fb1715f2..3d7a7470235 100644--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workspace-services/workflow-executor.workspace-service.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workspace-services/workflow-executor.workspace-service.ts@@ -177,7 +177,11 @@ export class WorkflowExecutorWorkspaceService {const isError =isDefined(actionOutput.error) && !actionOutput.shouldFailSafely;- if (!isError && !actionOutput.shouldFailSafely) {+ if (+ !isError &&+ !actionOutput.shouldFailSafely &&+ !actionOutput.shouldSkipStepExecution+ ) {this.sendWorkflowNodeRunEvent(workspaceId, workflowRun.workflowId);}diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/workflow-runner.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/workflow-runner.workspace-service.tsindex a562bbd37e9..a39cd519333 100644--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/workflow-runner.workspace-service.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/workflow-runner.workspace-service.ts@@ -83,6 +83,7 @@ export class WorkflowRunnerWorkspaceService {const isHardThrottled = await this.checkHardThrottleLimit(workspaceId);if (isHardThrottled) {+ this.logger.log(`Workflow throttled for workspace ${workspaceId}`);return this.createFailedWorkflowRun({workspaceId,workflowVersionId,