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

Add error messages to action validation, use step validation args

Browse Source 
[MAILPOET-4659]
This commit is contained in:
Jan Jakes
2022-09-23 16:29:05 +02:00
committed by Jan Jakeš
parent b6ba15c6c3
commit 7425c73d9e
10 changed files with 79 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ use Exception;
use MailPoet\Automation\Engine\Control\Steps\ActionStepRunner;
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\WorkflowRun;
use MailPoet\Automation\Engine\Data\WorkflowRunLog;
@@ -135,7 +136,10 @@ class StepHandler {
$requiredSubjects = $step instanceof Action ? $step->getSubjectKeys() : [];
$subjectEntries = $this->getSubjectEntries($workflowRun, $requiredSubjects);
$args = new StepRunArgs($workflow, $workflowRun, $step, $subjectEntries);
$this->stepRunners[$stepType]->run($args);
$validationArgs = new StepValidationArgs($workflow, $step, array_map(function (SubjectEntry $entry) {
return $entry->getSubject();
}, $subjectEntries));
$this->stepRunners[$stepType]->run($args, $validationArgs);
$log->markCompletedSuccessfully();
} catch (Throwable $e) {
$log->markFailed();