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

Pass full step map to automation workflow so it can be validated

Browse Source 
[MAILPOET-4629]
This commit is contained in:
Jan Jakes
2022-09-23 11:03:38 +02:00
committed by David Remer
parent 1f37be5ef3
commit 02aaba1ded
4 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mailpoet/lib/Automation/Engine/Data/Workflow.php
View File

@@ -44,7 +44,7 @@ class Workflow {
/** @var array<string, Step> */ /** @var array<string, Step> */
private $steps; private $steps;
/** @param Step[] $steps */ /** @param array<string, Step> $steps */
public function __construct( public function __construct(
string $name, string $name,
array $steps, array $steps,
@@ -53,11 +53,8 @@ class Workflow {
int $versionId = null int $versionId = null
) { ) {
$this->name = $name; $this->name = $name;
$this->steps = []; $this->steps = $steps;
$this->author = $author; $this->author = $author;
foreach ($steps as $step) {
$this->steps[$step->getId()] = $step;
}
if ($id) { if ($id) {
$this->id = $id; $this->id = $id;

4
mailpoet/lib/Automation/Integrations/MailPoet/Templates/WorkflowBuilder.php
View File

@@ -38,9 +38,9 @@ class WorkflowBuilder {
$nextSteps $nextSteps
); );
$nextSteps = [new NextStep($step->getId())]; $nextSteps = [new NextStep($step->getId())];
$steps[] = $step; $steps[$step->getId()] = $step;
} }
$steps[] = new Step('root', 'root', 'core:root', [], $nextSteps); $steps['root'] = new Step('root', 'root', 'core:root', [], $nextSteps);
$steps = array_reverse($steps); $steps = array_reverse($steps);
return new Workflow( return new Workflow(
$name, $name,

4
mailpoet/tests/integration/Automation/Engine/Data/WorkflowRunLogTest.php
View File

@@ -154,7 +154,7 @@ class WorkflowRunLogTest extends \MailPoetTest {
public function testItStoresWorkflowRunAndStepIdsCorrectly() { public function testItStoresWorkflowRunAndStepIdsCorrectly() {
$testAction = $this->getRegisteredTestAction(); $testAction = $this->getRegisteredTestAction();
$actionStep = new Step('action-step-id', Step::TYPE_ACTION, $testAction->getKey(), [], []); $actionStep = new Step('action-step-id', Step::TYPE_ACTION, $testAction->getKey(), [], []);
$workflow = new Workflow('test_workflow', [$actionStep], new \WP_User()); $workflow = new Workflow('test_workflow', [$actionStep->getId() => $actionStep], new \WP_User());
$workflowId = $this->workflowStorage->createWorkflow($workflow); $workflowId = $this->workflowStorage->createWorkflow($workflow);
// Reload to get additional data post-save // Reload to get additional data post-save
$workflow = $this->workflowStorage->getWorkflow($workflowId); $workflow = $this->workflowStorage->getWorkflow($workflowId);
@@ -240,7 +240,7 @@ class WorkflowRunLogTest extends \MailPoetTest {
} }
$testAction = $this->getRegisteredTestAction($callback); $testAction = $this->getRegisteredTestAction($callback);
$actionStep = new Step('action-step-id', Step::TYPE_ACTION, $testAction->getKey(), [], []); $actionStep = new Step('action-step-id', Step::TYPE_ACTION, $testAction->getKey(), [], []);
$workflow = new Workflow('test_workflow', [$actionStep], new \WP_User()); $workflow = new Workflow('test_workflow', [$actionStep->getId() => $actionStep], new \WP_User());
$workflowId = $this->workflowStorage->createWorkflow($workflow); $workflowId = $this->workflowStorage->createWorkflow($workflow);
// Reload to get additional data post-save // Reload to get additional data post-save
$workflow = $this->workflowStorage->getWorkflow($workflowId); $workflow = $this->workflowStorage->getWorkflow($workflowId);

12
mailpoet/tests/integration/Automation/Integrations/MailPoet/Actions/SendEmailActionTest.php
View File

@@ -107,7 +107,7 @@ class SendEmailActionTest extends \MailPoetTest {
$email = (new Newsletter())->withAutomationType()->create(); $email = (new Newsletter())->withAutomationType()->create();
$step = new Step('step-id', Step::TYPE_ACTION, 'step-key', ['email_id' => $email->getId()], []); $step = new Step('step-id', Step::TYPE_ACTION, 'step-key', ['email_id' => $email->getId()], []);
$workflow = new Workflow('some-workflow', [$step], new \WP_User()); $workflow = new Workflow('some-workflow', [$step->getId() => $step], new \WP_User());
$run = new WorkflowRun(1, 1, 'trigger-key', $subjects); $run = new WorkflowRun(1, 1, 'trigger-key', $subjects);
$scheduled = $this->scheduledTasksRepository->findByNewsletterAndSubscriberId($email, (int)$subscriber->getId()); $scheduled = $this->scheduledTasksRepository->findByNewsletterAndSubscriberId($email, (int)$subscriber->getId());
@@ -129,7 +129,7 @@ class SendEmailActionTest extends \MailPoetTest {
$email = (new Newsletter())->withAutomationType()->create(); $email = (new Newsletter())->withAutomationType()->create();
$step = new Step('step-id', Step::TYPE_ACTION, 'step-key', ['email_id' => $email->getId()], []); $step = new Step('step-id', Step::TYPE_ACTION, 'step-key', ['email_id' => $email->getId()], []);
$workflow = new Workflow('some-workflow', [$step], new \WP_User()); $workflow = new Workflow('some-workflow', [$step->getId() => $step], new \WP_User());
$run = new WorkflowRun(1, 1, 'trigger-key', $subjects); $run = new WorkflowRun(1, 1, 'trigger-key', $subjects);
$scheduled = $this->scheduledTasksRepository->findByNewsletterAndSubscriberId($email, (int)$subscriber->getId()); $scheduled = $this->scheduledTasksRepository->findByNewsletterAndSubscriberId($email, (int)$subscriber->getId());
@@ -161,7 +161,7 @@ class SendEmailActionTest extends \MailPoetTest {
$email = (new Newsletter())->withAutomationType()->create(); $email = (new Newsletter())->withAutomationType()->create();
$step = new Step('step-id', Step::TYPE_ACTION, 'step-key', ['email_id' => $email->getId()], []); $step = new Step('step-id', Step::TYPE_ACTION, 'step-key', ['email_id' => $email->getId()], []);
$workflow = new Workflow('some-workflow', [$step], new \WP_User()); $workflow = new Workflow('some-workflow', [$step->getId() => $step], new \WP_User());
$run = new WorkflowRun(1, 1, 'trigger-key', $subjects); $run = new WorkflowRun(1, 1, 'trigger-key', $subjects);
$scheduled = $this->scheduledTasksRepository->findByNewsletterAndSubscriberId($email, (int)$subscriber->getId()); $scheduled = $this->scheduledTasksRepository->findByNewsletterAndSubscriberId($email, (int)$subscriber->getId());
@@ -190,7 +190,7 @@ class SendEmailActionTest extends \MailPoetTest {
$email = (new Newsletter())->withAutomationType()->create(); $email = (new Newsletter())->withAutomationType()->create();
$step = new Step('step-id', Step::TYPE_ACTION, 'step-key', ['email_id' => $email->getId()], []); $step = new Step('step-id', Step::TYPE_ACTION, 'step-key', ['email_id' => $email->getId()], []);
$workflow = new Workflow('some-workflow', [$step], new \WP_User()); $workflow = new Workflow('some-workflow', [$step->getId() => $step], new \WP_User());
$run = new WorkflowRun(1, 1, 'trigger-key', $subjects); $run = new WorkflowRun(1, 1, 'trigger-key', $subjects);
$scheduled = $this->scheduledTasksRepository->findByNewsletterAndSubscriberId($email, (int)$subscriber->getId()); $scheduled = $this->scheduledTasksRepository->findByNewsletterAndSubscriberId($email, (int)$subscriber->getId());
@@ -228,7 +228,7 @@ class SendEmailActionTest extends \MailPoetTest {
$email = (new Newsletter())->withAutomationType()->create(); $email = (new Newsletter())->withAutomationType()->create();
$step = new Step('step-id', Step::TYPE_ACTION, 'step-key', ['email_id' => $email->getId()], []); $step = new Step('step-id', Step::TYPE_ACTION, 'step-key', ['email_id' => $email->getId()], []);
$workflow = new Workflow('some-workflow', [$step], new \WP_User()); $workflow = new Workflow('some-workflow', [$step->getId() => $step], new \WP_User());
$run = new WorkflowRun(1, 1, 'trigger-key', $subjects); $run = new WorkflowRun(1, 1, 'trigger-key', $subjects);
$scheduled = $this->scheduledTasksRepository->findByNewsletterAndSubscriberId($email, (int)$subscriber->getId()); $scheduled = $this->scheduledTasksRepository->findByNewsletterAndSubscriberId($email, (int)$subscriber->getId());
@@ -257,7 +257,7 @@ class SendEmailActionTest extends \MailPoetTest {
$email = (new Newsletter())->withAutomationType()->create(); $email = (new Newsletter())->withAutomationType()->create();
$step = new Step('step-id', Step::TYPE_ACTION, 'step-key', ['email_id' => $email->getId()], []); $step = new Step('step-id', Step::TYPE_ACTION, 'step-key', ['email_id' => $email->getId()], []);
$workflow = new Workflow('some-workflow', [$step], new \WP_User()); $workflow = new Workflow('some-workflow', [$step->getId() => $step], new \WP_User());
$run = new WorkflowRun(1, 1, 'trigger-key', $subjects); $run = new WorkflowRun(1, 1, 'trigger-key', $subjects);
$scheduled = $this->scheduledTasksRepository->findByNewsletterAndSubscriberId($email, (int)$subscriber->getId()); $scheduled = $this->scheduledTasksRepository->findByNewsletterAndSubscriberId($email, (int)$subscriber->getId());