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

Run validation on workflow create and update

Browse Source 
[MAILPOET-4629]
This commit is contained in:
Jan Jakes
2022-09-14 16:30:59 +02:00
committed by David Remer
parent e220b70c78
commit d7b65bd980
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mailpoet/lib/Automation/Engine/Builder/CreateWorkflowFromTemplateController.php
View File

@ -6,6 +6,7 @@ use MailPoet\Automation\Engine\Data\Workflow;
use MailPoet\Automation\Engine\Exceptions\InvalidStateException; use MailPoet\Automation\Engine\Exceptions\InvalidStateException;
use MailPoet\Automation\Engine\Storage\WorkflowStorage; use MailPoet\Automation\Engine\Storage\WorkflowStorage;
use MailPoet\Automation\Engine\Storage\WorkflowTemplateStorage; use MailPoet\Automation\Engine\Storage\WorkflowTemplateStorage;
use MailPoet\Automation\Engine\Validation\WorkflowValidator;
use MailPoet\UnexpectedValueException; use MailPoet\UnexpectedValueException;
class CreateWorkflowFromTemplateController { class CreateWorkflowFromTemplateController {
@ -15,26 +16,32 @@ class CreateWorkflowFromTemplateController {
/** @var WorkflowTemplateStorage */ /** @var WorkflowTemplateStorage */
private $templateStorage; private $templateStorage;
/** @var WorkflowValidator */
private $workflowValidator;
public function __construct( public function __construct(
WorkflowStorage $storage, WorkflowStorage $storage,
WorkflowTemplateStorage $templateStorage WorkflowTemplateStorage $templateStorage,
WorkflowValidator $workflowValidator
) { ) {
$this->storage = $storage; $this->storage = $storage;
$this->templateStorage = $templateStorage; $this->templateStorage = $templateStorage;
$this->workflowValidator = $workflowValidator;
} }
public function createWorkflow(string $slug): Workflow { public function createWorkflow(string $slug): Workflow {
$template = $this->templateStorage->getTemplateBySlug($slug); $template = $this->templateStorage->getTemplateBySlug($slug);
if (!$template) { if (!$template) {
throw UnexpectedValueException::create()->withMessage('Template not found.'); throw UnexpectedValueException::create()->withMessage('Template not found.');
} }
$workflowId = $this->storage->createWorkflow($template->getWorkflow()); $workflow = $template->getWorkflow();
$workflow = $this->storage->getWorkflow($workflowId); $this->workflowValidator->validate($workflow);
if (!$workflow) { $workflowId = $this->storage->createWorkflow($workflow);
$savedWorkflow = $this->storage->getWorkflow($workflowId);
if (!$savedWorkflow) {
throw new InvalidStateException('Workflow not found.'); throw new InvalidStateException('Workflow not found.');
} }
return $workflow; return $savedWorkflow;
} }
} }

12
mailpoet/lib/Automation/Engine/Builder/UpdateWorkflowController.php
View File

@ -8,6 +8,7 @@ use MailPoet\Automation\Engine\Exceptions;
use MailPoet\Automation\Engine\Exceptions\UnexpectedValueException; use MailPoet\Automation\Engine\Exceptions\UnexpectedValueException;
use MailPoet\Automation\Engine\Hooks; use MailPoet\Automation\Engine\Hooks;
use MailPoet\Automation\Engine\Storage\WorkflowStorage; use MailPoet\Automation\Engine\Storage\WorkflowStorage;
use MailPoet\Automation\Engine\Validation\WorkflowValidator;
class UpdateWorkflowController { class UpdateWorkflowController {
/** @var Hooks */ /** @var Hooks */
@ -16,24 +17,25 @@ class UpdateWorkflowController {
/** @var WorkflowStorage */ /** @var WorkflowStorage */
private $storage; private $storage;
/** @var WorkflowValidator */
private $workflowValidator;
/** @var UpdateStepsController */ /** @var UpdateStepsController */
private $updateStepsController; private $updateStepsController;
public function __construct( public function __construct(
Hooks $hooks, Hooks $hooks,
WorkflowStorage $storage, WorkflowStorage $storage,
WorkflowValidator $workflowValidator,
UpdateStepsController $updateStepsController UpdateStepsController $updateStepsController
) { ) {
$this->hooks = $hooks; $this->hooks = $hooks;
$this->storage = $storage; $this->storage = $storage;
$this->workflowValidator = $workflowValidator;
$this->updateStepsController = $updateStepsController; $this->updateStepsController = $updateStepsController;
} }
public function updateWorkflow(int $id, array $data): Workflow { public function updateWorkflow(int $id, array $data): Workflow {
// TODO: data & workflow validation (trigger existence, graph consistency, etc.)
// TODO: new revisions when content is changed
// TODO: validation when status being is changed
$workflow = $this->storage->getWorkflow($id); $workflow = $this->storage->getWorkflow($id);
if (!$workflow) { if (!$workflow) {
throw Exceptions::workflowNotFound($id); throw Exceptions::workflowNotFound($id);
@ -58,6 +60,8 @@ class UpdateWorkflowController {
} }
$this->hooks->doWorkflowBeforeSave($workflow); $this->hooks->doWorkflowBeforeSave($workflow);
$this->workflowValidator->validate($workflow);
$this->storage->updateWorkflow($workflow); $this->storage->updateWorkflow($workflow);
$workflow = $this->storage->getWorkflow($id); $workflow = $this->storage->getWorkflow($id);