Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Do not handle workflow runs when workflow status is not active/deactivating

Browse Source 
[MAILPOET-4731]
This commit is contained in:
David Remer
2022-10-24 11:28:36 +03:00
parent b573ce1038
commit 6df11bf3d6
3 changed files with 133 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mailpoet/lib/Automation/Engine/Control/StepHandler.php
View File

@@ -8,6 +8,7 @@ use MailPoet\Automation\Engine\Data\Step;
use MailPoet\Automation\Engine\Data\StepRunArgs;
use MailPoet\Automation\Engine\Data\StepValidationArgs;
use MailPoet\Automation\Engine\Data\SubjectEntry;
use MailPoet\Automation\Engine\Data\Workflow;
use MailPoet\Automation\Engine\Data\WorkflowRun;
use MailPoet\Automation\Engine\Data\WorkflowRunLog;
use MailPoet\Automation\Engine\Exceptions;
@@ -98,7 +99,8 @@ class StepHandler {
try {
$this->handleStep($args);
} catch (Throwable $e) {
$this->workflowRunStorage->updateStatus((int)$args['workflow_run_id'], WorkflowRun::STATUS_FAILED);
$status = $e instanceof InvalidStateException && $e->getErrorCode() === 'mailpoet_automation_workflow_not_active' ? WorkflowRun::STATUS_CANCELLED : WorkflowRun::STATUS_FAILED;
$this->workflowRunStorage->updateStatus((int)$args['workflow_run_id'], $status);
if (!$e instanceof Exception) {
throw new Exception($e->getMessage(), intval($e->getCode()), $e);
}
@@ -123,6 +125,9 @@ class StepHandler {
if (!$workflow) {
throw Exceptions::workflowVersionNotFound($workflowRun->getWorkflowId(), $workflowRun->getVersionId());
}
if (!in_array($workflow->getStatus(), [Workflow::STATUS_ACTIVE, Workflow::STATUS_DEACTIVATING], true)) {
throw Exceptions::workflowNotActive($workflowRun->getWorkflowId());
}
// complete workflow run
if (!$stepId) {