Add new models ColumnMoveRestrictionModel and ProjectRoleModel
This commit is contained in:
Frederic Guillot
parent
102de7e386
commit
dded773749
|
|
@ -0,0 +1,92 @@
|
|||
<?php
|
||||
|
||||
namespace Kanboard\Model;
|
||||
|
||||
use Kanboard\Core\Base;
|
||||
|
||||
/**
|
||||
* Class ColumnMoveRestrictionModel
|
||||
*
|
||||
* @package Kanboard\Model
|
||||
* @author Frederic Guillot
|
||||
*/
|
||||
class ColumnMoveRestrictionModel extends Base
|
||||
{
|
||||
const TABLE = 'column_has_move_restrictions';
|
||||
|
||||
/**
|
||||
* Check if the custom project role is allowed to move a task
|
||||
*
|
||||
* @param int $project_id
|
||||
* @param string $role
|
||||
* @param int $src_column_id
|
||||
* @param int $dst_column_id
|
||||
* @return int
|
||||
*/
|
||||
public function isAllowed($project_id, $role, $src_column_id, $dst_column_id)
|
||||
{
|
||||
return ! $this->db->table(self::TABLE)
|
||||
->left(ProjectRoleModel::TABLE, 'pr', 'role_id', self::TABLE, 'role_id')
|
||||
->eq(self::TABLE.'.project_id', $project_id)
|
||||
->eq(self::TABLE.'.src_column_id', $src_column_id)
|
||||
->eq(self::TABLE.'.dst_column_id', $dst_column_id)
|
||||
->eq('pr.role', $role)
|
||||
->exists();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all project column restrictions
|
||||
*
|
||||
* @param int $project_id
|
||||
* @return array
|
||||
*/
|
||||
public function getAll($project_id)
|
||||
{
|
||||
return $this->db->table(self::TABLE)
|
||||
->columns(
|
||||
'restriction_id',
|
||||
'src_column_id',
|
||||
'dst_column_id',
|
||||
'pr.role',
|
||||
'sc.title as src_column_title',
|
||||
'dc.title as dst_column_title'
|
||||
)
|
||||
->left(ColumnModel::TABLE, 'sc', 'id', self::TABLE, 'src_column_id')
|
||||
->left(ColumnModel::TABLE, 'dc', 'id', self::TABLE, 'dst_column_id')
|
||||
->left(ProjectRoleModel::TABLE, 'pr', 'role_id', self::TABLE, 'role_id')
|
||||
->eq(self::TABLE.'.project_id', $project_id)
|
||||
->findAll();
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new column restriction
|
||||
*
|
||||
* @param int $project_id
|
||||
* @param int $role_id
|
||||
* @param int $src_column_id
|
||||
* @param int $dst_column_id
|
||||
* @return bool|int
|
||||
*/
|
||||
public function create($project_id, $role_id, $src_column_id, $dst_column_id)
|
||||
{
|
||||
return $this->db
|
||||
->table(self::TABLE)
|
||||
->persist(array(
|
||||
'project_id' => $project_id,
|
||||
'role_id' => $role_id,
|
||||
'src_column_id' => $src_column_id,
|
||||
'dst_column_id' => $dst_column_id,
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove a permission
|
||||
*
|
||||
* @param int $restriction_id
|
||||
* @return bool
|
||||
*/
|
||||
public function remove($restriction_id)
|
||||
{
|
||||
return $this->db->table(self::TABLE)->eq('restriction_id', $restriction_id)->remove();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,82 @@
|
|||
<?php
|
||||
|
||||
namespace Kanboard\Model;
|
||||
|
||||
use Kanboard\Core\Base;
|
||||
|
||||
/**
|
||||
* Class ProjectRoleModel
|
||||
*
|
||||
* @package Kanboard\Model
|
||||
* @author Frederic Guillot
|
||||
*/
|
||||
class ProjectRoleModel extends Base
|
||||
{
|
||||
const TABLE = 'project_has_roles';
|
||||
|
||||
/**
|
||||
* Get all project roles
|
||||
*
|
||||
* @param int $project_id
|
||||
* @return array
|
||||
*/
|
||||
public function getAll($project_id)
|
||||
{
|
||||
return $this->db->table(self::TABLE)
|
||||
->eq('project_id', $project_id)
|
||||
->asc('role')
|
||||
->findAll();
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new project role
|
||||
*
|
||||
* @param int $project_id
|
||||
* @param string $role
|
||||
* @return bool|int
|
||||
*/
|
||||
public function create($project_id, $role)
|
||||
{
|
||||
return $this->db
|
||||
->table(self::TABLE)
|
||||
->persist(array(
|
||||
'project_id' => $project_id,
|
||||
'role' => $role,
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Update a project role
|
||||
*
|
||||
* @param int $role_id
|
||||
* @param int $project_id
|
||||
* @param string $role
|
||||
* @return bool
|
||||
*/
|
||||
public function update($role_id, $project_id, $role)
|
||||
{
|
||||
return $this->db
|
||||
->table(self::TABLE)
|
||||
->eq('role_id', $role_id)
|
||||
->eq('project_id', $project_id)
|
||||
->update(array(
|
||||
'role' => $role,
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove a project role
|
||||
*
|
||||
* @param int $project_id
|
||||
* @param int $role_id
|
||||
* @return bool
|
||||
*/
|
||||
public function remove($project_id, $role_id)
|
||||
{
|
||||
return $this->db
|
||||
->table(self::TABLE)
|
||||
->eq('project_id', $project_id)
|
||||
->eq('role_id', $role_id)
|
||||
->remove();
|
||||
}
|
||||
}
|
||||
|
|
@ -6,7 +6,40 @@ use PDO;
|
|||
use Kanboard\Core\Security\Token;
|
||||
use Kanboard\Core\Security\Role;
|
||||
|
||||
const VERSION = 112;
|
||||
const VERSION = 113;
|
||||
|
||||
function version_113(PDO $pdo)
|
||||
{
|
||||
$pdo->exec("
|
||||
CREATE TABLE project_has_roles (
|
||||
role_id INT NOT NULL AUTO_INCREMENT,
|
||||
role VARCHAR(255) NOT NULL,
|
||||
project_id INT NOT NULL,
|
||||
UNIQUE(project_id, role),
|
||||
FOREIGN KEY(project_id) REFERENCES projects(id) ON DELETE CASCADE,
|
||||
PRIMARY KEY(role_id)
|
||||
) ENGINE=InnoDB CHARSET=utf8
|
||||
");
|
||||
|
||||
$pdo->exec("
|
||||
CREATE TABLE column_has_move_restrictions (
|
||||
restriction_id INT NOT NULL AUTO_INCREMENT,
|
||||
project_id INT NOT NULL,
|
||||
role_id INT NOT NULL,
|
||||
src_column_id INT NOT NULL,
|
||||
dst_column_id INT NOT NULL,
|
||||
UNIQUE(role_id, src_column_id, dst_column_id),
|
||||
FOREIGN KEY(project_id) REFERENCES projects(id) ON DELETE CASCADE,
|
||||
FOREIGN KEY(role_id) REFERENCES project_has_roles(role_id) ON DELETE CASCADE,
|
||||
FOREIGN KEY(src_column_id) REFERENCES columns(id) ON DELETE CASCADE,
|
||||
FOREIGN KEY(dst_column_id) REFERENCES columns(id) ON DELETE CASCADE,
|
||||
PRIMARY KEY(restriction_id)
|
||||
) ENGINE=InnoDB CHARSET=utf8
|
||||
");
|
||||
|
||||
$pdo->exec("ALTER TABLE `project_has_users` MODIFY `role` VARCHAR(255) NOT NULL");
|
||||
$pdo->exec("ALTER TABLE `project_has_groups` MODIFY `role` VARCHAR(255) NOT NULL");
|
||||
}
|
||||
|
||||
function version_112(PDO $pdo)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,7 +6,38 @@ use PDO;
|
|||
use Kanboard\Core\Security\Token;
|
||||
use Kanboard\Core\Security\Role;
|
||||
|
||||
const VERSION = 91;
|
||||
const VERSION = 92;
|
||||
|
||||
function version_92(PDO $pdo)
|
||||
{
|
||||
$pdo->exec("
|
||||
CREATE TABLE project_has_roles (
|
||||
role_id SERIAL PRIMARY KEY,
|
||||
role VARCHAR(255) NOT NULL,
|
||||
project_id INTEGER NOT NULL,
|
||||
UNIQUE(project_id, role),
|
||||
FOREIGN KEY(project_id) REFERENCES projects(id) ON DELETE CASCADE
|
||||
)
|
||||
");
|
||||
|
||||
$pdo->exec("
|
||||
CREATE TABLE column_has_move_restrictions (
|
||||
restriction_id SERIAL PRIMARY KEY,
|
||||
project_id INTEGER NOT NULL,
|
||||
role_id INTEGER NOT NULL,
|
||||
src_column_id INTEGER NOT NULL,
|
||||
dst_column_id INTEGER NOT NULL,
|
||||
UNIQUE(role_id, src_column_id, dst_column_id),
|
||||
FOREIGN KEY(project_id) REFERENCES projects(id) ON DELETE CASCADE,
|
||||
FOREIGN KEY(role_id) REFERENCES project_has_roles(role_id) ON DELETE CASCADE,
|
||||
FOREIGN KEY(src_column_id) REFERENCES columns(id) ON DELETE CASCADE,
|
||||
FOREIGN KEY(dst_column_id) REFERENCES columns(id) ON DELETE CASCADE
|
||||
)
|
||||
");
|
||||
|
||||
$pdo->exec('ALTER TABLE "project_has_users" ALTER COLUMN "role" TYPE VARCHAR(255)');
|
||||
$pdo->exec('ALTER TABLE "project_has_groups" ALTER COLUMN "role" TYPE VARCHAR(255)');
|
||||
}
|
||||
|
||||
function version_91(PDO $pdo)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,7 +6,35 @@ use Kanboard\Core\Security\Token;
|
|||
use Kanboard\Core\Security\Role;
|
||||
use PDO;
|
||||
|
||||
const VERSION = 103;
|
||||
const VERSION = 104;
|
||||
|
||||
function version_104(PDO $pdo)
|
||||
{
|
||||
$pdo->exec("
|
||||
CREATE TABLE project_has_roles (
|
||||
role_id INTEGER PRIMARY KEY,
|
||||
role TEXT NOT NULL,
|
||||
project_id INTEGER NOT NULL,
|
||||
UNIQUE(project_id, role),
|
||||
FOREIGN KEY(project_id) REFERENCES projects(id) ON DELETE CASCADE
|
||||
)
|
||||
");
|
||||
|
||||
$pdo->exec("
|
||||
CREATE TABLE column_has_move_restrictions (
|
||||
restriction_id INTEGER PRIMARY KEY,
|
||||
project_id INTEGER NOT NULL,
|
||||
role_id INTEGER NOT NULL,
|
||||
src_column_id INTEGER NOT NULL,
|
||||
dst_column_id INTEGER NOT NULL,
|
||||
UNIQUE(role_id, src_column_id, dst_column_id),
|
||||
FOREIGN KEY(project_id) REFERENCES projects(id) ON DELETE CASCADE,
|
||||
FOREIGN KEY(role_id) REFERENCES project_has_roles(role_id) ON DELETE CASCADE,
|
||||
FOREIGN KEY(src_column_id) REFERENCES columns(id) ON DELETE CASCADE,
|
||||
FOREIGN KEY(dst_column_id) REFERENCES columns(id) ON DELETE CASCADE
|
||||
)
|
||||
");
|
||||
}
|
||||
|
||||
function version_103(PDO $pdo)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,89 @@
|
|||
<?php
|
||||
|
||||
use Kanboard\Model\ColumnMoveRestrictionModel;
|
||||
use Kanboard\Model\ProjectModel;
|
||||
use Kanboard\Model\ProjectRoleModel;
|
||||
|
||||
require_once __DIR__.'/../Base.php';
|
||||
|
||||
class ColumnMoveRestrictionModelTest extends Base
|
||||
{
|
||||
public function testCreation()
|
||||
{
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$projectRoleModel = new ProjectRoleModel($this->container);
|
||||
$columnMoveRestrictionModel = new ColumnMoveRestrictionModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
|
||||
$this->assertEquals(1, $projectRoleModel->create(1, 'Custom Role'));
|
||||
$this->assertEquals(1, $columnMoveRestrictionModel->create(1, 1, 2, 3));
|
||||
$this->assertFalse($columnMoveRestrictionModel->create(1, 1, 2, 3));
|
||||
}
|
||||
|
||||
public function testRemove()
|
||||
{
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$projectRoleModel = new ProjectRoleModel($this->container);
|
||||
$columnMoveRestrictionModel = new ColumnMoveRestrictionModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
|
||||
$this->assertEquals(1, $projectRoleModel->create(1, 'Custom Role'));
|
||||
$this->assertEquals(1, $columnMoveRestrictionModel->create(1, 1, 2, 3));
|
||||
$this->assertTrue($columnMoveRestrictionModel->remove(1));
|
||||
}
|
||||
|
||||
public function testGetAll()
|
||||
{
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$projectRoleModel = new ProjectRoleModel($this->container);
|
||||
$columnMoveRestrictionModel = new ColumnMoveRestrictionModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
|
||||
$this->assertEquals(2, $projectModel->create(array('name' => 'Test')));
|
||||
|
||||
$this->assertEquals(1, $projectRoleModel->create(1, 'Role A'));
|
||||
$this->assertEquals(2, $projectRoleModel->create(1, 'Role B'));
|
||||
$this->assertEquals(3, $projectRoleModel->create(2, 'Role C'));
|
||||
|
||||
$this->assertEquals(1, $columnMoveRestrictionModel->create(1, 1, 2, 3));
|
||||
$this->assertEquals(2, $columnMoveRestrictionModel->create(1, 2, 3, 4));
|
||||
|
||||
$restrictions = $columnMoveRestrictionModel->getAll(1);
|
||||
$this->assertCount(2, $restrictions);
|
||||
|
||||
$this->assertEquals(1, $restrictions[0]['restriction_id']);
|
||||
$this->assertEquals('Role A', $restrictions[0]['role']);
|
||||
$this->assertEquals('Ready', $restrictions[0]['src_column_title']);
|
||||
$this->assertEquals('Work in progress', $restrictions[0]['dst_column_title']);
|
||||
$this->assertEquals(2, $restrictions[0]['src_column_id']);
|
||||
$this->assertEquals(3, $restrictions[0]['dst_column_id']);
|
||||
|
||||
$this->assertEquals(2, $restrictions[1]['restriction_id']);
|
||||
$this->assertEquals('Role B', $restrictions[1]['role']);
|
||||
$this->assertEquals('Work in progress', $restrictions[1]['src_column_title']);
|
||||
$this->assertEquals('Done', $restrictions[1]['dst_column_title']);
|
||||
$this->assertEquals(3, $restrictions[1]['src_column_id']);
|
||||
$this->assertEquals(4, $restrictions[1]['dst_column_id']);
|
||||
}
|
||||
|
||||
public function testIsAllowed()
|
||||
{
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$projectRoleModel = new ProjectRoleModel($this->container);
|
||||
$columnMoveRestrictionModel = new ColumnMoveRestrictionModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
|
||||
$this->assertEquals(2, $projectModel->create(array('name' => 'Test')));
|
||||
|
||||
$this->assertEquals(1, $projectRoleModel->create(1, 'Role A'));
|
||||
$this->assertEquals(2, $projectRoleModel->create(1, 'Role B'));
|
||||
$this->assertEquals(3, $projectRoleModel->create(2, 'Role C'));
|
||||
|
||||
$this->assertEquals(1, $columnMoveRestrictionModel->create(1, 1, 2, 3));
|
||||
$this->assertEquals(2, $columnMoveRestrictionModel->create(1, 2, 3, 4));
|
||||
|
||||
$this->assertTrue($columnMoveRestrictionModel->isAllowed(1, 'Role D', 1, 2));
|
||||
$this->assertTrue($columnMoveRestrictionModel->isAllowed(1, 'Role A', 1, 2));
|
||||
$this->assertFalse($columnMoveRestrictionModel->isAllowed(1, 'Role A', 2, 3));
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
<?php
|
||||
|
||||
use Kanboard\Model\ProjectModel;
|
||||
use Kanboard\Model\ProjectRoleModel;
|
||||
|
||||
require_once __DIR__.'/../Base.php';
|
||||
|
||||
class ProjectRoleModelTest extends Base
|
||||
{
|
||||
public function testCreation()
|
||||
{
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$projectRoleModel = new ProjectRoleModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
|
||||
$this->assertEquals(1, $projectRoleModel->create(1, 'my-custom-role'));
|
||||
$this->assertFalse($projectRoleModel->create(1, 'my-custom-role'));
|
||||
}
|
||||
|
||||
public function testGetAll()
|
||||
{
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$projectRoleModel = new ProjectRoleModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
|
||||
$this->assertEquals(1, $projectRoleModel->create(1, 'Role A'));
|
||||
$this->assertEquals(2, $projectRoleModel->create(1, 'Role B'));
|
||||
|
||||
$roles = $projectRoleModel->getAll(1);
|
||||
$this->assertCount(2, $roles);
|
||||
|
||||
$this->assertEquals(1, $roles[0]['role_id']);
|
||||
$this->assertEquals('Role A', $roles[0]['role']);
|
||||
|
||||
$this->assertEquals(2, $roles[1]['role_id']);
|
||||
$this->assertEquals('Role B', $roles[1]['role']);
|
||||
}
|
||||
|
||||
public function testModification()
|
||||
{
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$projectRoleModel = new ProjectRoleModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
|
||||
$this->assertEquals(1, $projectRoleModel->create(1, 'Role A'));
|
||||
$this->assertTrue($projectRoleModel->update(1, 1, 'Role B'));
|
||||
}
|
||||
|
||||
public function testRemove()
|
||||
{
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$projectRoleModel = new ProjectRoleModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
|
||||
$this->assertEquals(1, $projectRoleModel->create(1, 'Role A'));
|
||||
$this->assertTrue($projectRoleModel->remove(1, 1));
|
||||
$this->assertEmpty($projectRoleModel->getAll(1));
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue