Validate the operation
This commit is contained in:
parent
85813c42f9
commit
4377d99662
|
@ -30,6 +30,7 @@ use OCP\IL10N;
|
|||
use OCP\IServerContainer;
|
||||
use OCP\WorkflowEngine\ICheck;
|
||||
use OCP\WorkflowEngine\IManager;
|
||||
use OCP\WorkflowEngine\IOperation;
|
||||
|
||||
class Manager implements IManager {
|
||||
|
||||
|
@ -176,6 +177,8 @@ class Manager implements IManager {
|
|||
* @throws \UnexpectedValueException
|
||||
*/
|
||||
public function addOperation($class, $name, array $checks, $operation) {
|
||||
$this->validateOperation($class, $name, $checks, $operation);
|
||||
|
||||
$checkIds = [];
|
||||
foreach ($checks as $check) {
|
||||
$checkIds[] = $this->addCheck($check['class'], $check['operator'], $check['value']);
|
||||
|
@ -204,6 +207,9 @@ class Manager implements IManager {
|
|||
* @throws \UnexpectedValueException
|
||||
*/
|
||||
public function updateOperation($id, $name, array $checks, $operation) {
|
||||
$row = $this->getOperation($id);
|
||||
$this->validateOperation($row['class'], $name, $checks, $operation);
|
||||
|
||||
$checkIds = [];
|
||||
foreach ($checks as $check) {
|
||||
$checkIds[] = $this->addCheck($check['class'], $check['operator'], $check['value']);
|
||||
|
@ -232,6 +238,43 @@ class Manager implements IManager {
|
|||
return (bool) $query->execute();
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $class
|
||||
* @param string $name
|
||||
* @param array[] $checks
|
||||
* @param string $operation
|
||||
* @throws \UnexpectedValueException
|
||||
*/
|
||||
protected function validateOperation($class, $name, array $checks, $operation) {
|
||||
try {
|
||||
/** @var IOperation $instance */
|
||||
$instance = $this->container->query($class);
|
||||
} catch (QueryException $e) {
|
||||
throw new \UnexpectedValueException($this->l->t('Operation %s does not exist', $class));
|
||||
}
|
||||
|
||||
if (!($instance instanceof IOperation)) {
|
||||
throw new \UnexpectedValueException($this->l->t('Operation %s is invalid', $class));
|
||||
}
|
||||
|
||||
$instance->validateOperation($name, $checks, $operation);
|
||||
|
||||
foreach ($checks as $check) {
|
||||
try {
|
||||
/** @var ICheck $instance */
|
||||
$instance = $this->container->query($check['class']);
|
||||
} catch (QueryException $e) {
|
||||
throw new \UnexpectedValueException($this->l->t('Check %s does not exist', $class));
|
||||
}
|
||||
|
||||
if (!($instance instanceof ICheck)) {
|
||||
throw new \UnexpectedValueException($this->l->t('Check %s is invalid', $class));
|
||||
}
|
||||
|
||||
$instance->validateCheck($check['operator'], $check['value']);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int[] $checkIds
|
||||
* @return array[]
|
||||
|
@ -279,13 +322,8 @@ class Manager implements IManager {
|
|||
* @param string $operator
|
||||
* @param string $value
|
||||
* @return int Check unique ID
|
||||
* @throws \UnexpectedValueException
|
||||
*/
|
||||
protected function addCheck($class, $operator, $value) {
|
||||
/** @var ICheck $check */
|
||||
$check = $this->container->query($class);
|
||||
$check->validateCheck($operator, $value);
|
||||
|
||||
$hash = md5($class . '::' . $operator . '::' . $value);
|
||||
|
||||
$query = $this->connection->getQueryBuilder();
|
||||
|
|
|
@ -0,0 +1,39 @@
|
|||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OCP\WorkflowEngine;
|
||||
|
||||
/**
|
||||
* Interface IOperation
|
||||
*
|
||||
* @package OCP\WorkflowEngine
|
||||
* @since 9.1
|
||||
*/
|
||||
interface IOperation {
|
||||
/**
|
||||
* @param string $name
|
||||
* @param array[] $checks
|
||||
* @param string $operation
|
||||
* @throws \UnexpectedValueException
|
||||
* @since 9.1
|
||||
*/
|
||||
public function validateOperation($name, array $checks, $operation);
|
||||
}
|
Loading…
Reference in New Issue