Add column restrictions to custom project roles

5 files changed, 229 insertions, 2 deletions

diff --git a/tests/units/Model/ColumnRestrictionModelTest.php b/tests/units/Model/ColumnRestrictionModelTest.php
new file mode 100644
index 00000000..6f66c258
--- /dev/null
+++ b/tests/units/Model/ColumnRestrictionModelTest.php
@@ -0,0 +1,100 @@
+<?php
+
+use Kanboard\Model\ColumnRestrictionModel;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\ProjectRoleModel;
+
+require_once __DIR__.'/../Base.php';
+
+class ColumnRestrictionModelTest extends Base
+{
+    public function testCreation()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $projectRoleModel = new ProjectRoleModel($this->container);
+        $columnRestrictionModel = new ColumnRestrictionModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $projectRoleModel->create(1, 'my-custom-role'));
+        $this->assertEquals(1, $columnRestrictionModel->create(1, 1, 2, ColumnRestrictionModel::RULE_BLOCK_TASK_CREATION));
+    }
+
+    public function testRemove()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $projectRoleModel = new ProjectRoleModel($this->container);
+        $projectRoleRestrictionModel = new ColumnRestrictionModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $projectRoleModel->create(1, 'my-custom-role'));
+        $this->assertEquals(1, $projectRoleRestrictionModel->create(1, 1, 2, ColumnRestrictionModel::RULE_ALLOW_TASK_OPEN_CLOSE));
+        $this->assertTrue($projectRoleRestrictionModel->remove(1));
+        $this->assertFalse($projectRoleRestrictionModel->remove(1));
+    }
+
+    public function testGetById()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $projectRoleModel = new ProjectRoleModel($this->container);
+        $projectRoleRestrictionModel = new ColumnRestrictionModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $projectRoleModel->create(1, 'my-custom-role'));
+        $this->assertEquals(1, $projectRoleRestrictionModel->create(1, 1, 2, ColumnRestrictionModel::RULE_ALLOW_TASK_CREATION));
+
+        $restriction = $projectRoleRestrictionModel->getById(1, 1);
+        $this->assertEquals(ColumnRestrictionModel::RULE_ALLOW_TASK_CREATION, $restriction['rule']);
+        $this->assertEquals(1, $restriction['project_id']);
+        $this->assertEquals(1, $restriction['restriction_id']);
+        $this->assertEquals('Ready', $restriction['column_title']);
+    }
+
+    public function testGetAll()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $projectRoleModel = new ProjectRoleModel($this->container);
+        $projectRoleRestrictionModel = new ColumnRestrictionModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $projectRoleModel->create(1, 'my-custom-role'));
+        $this->assertEquals(1, $projectRoleRestrictionModel->create(1, 1, 2, ColumnRestrictionModel::RULE_ALLOW_TASK_CREATION));
+
+        $restrictions = $projectRoleRestrictionModel->getAll(1);
+        $this->assertCount(1, $restrictions);
+        $this->assertEquals(ColumnRestrictionModel::RULE_ALLOW_TASK_CREATION, $restrictions[0]['rule']);
+        $this->assertEquals(1, $restrictions[0]['project_id']);
+        $this->assertEquals(1, $restrictions[0]['restriction_id']);
+        $this->assertEquals(1, $restrictions[0]['role_id']);
+        $this->assertEquals(2, $restrictions[0]['column_id']);
+        $this->assertEquals('Ready', $restrictions[0]['column_title']);
+    }
+
+    public function testGetByRole()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $projectRoleModel = new ProjectRoleModel($this->container);
+        $columnRestrictionModel = new ColumnRestrictionModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $projectRoleModel->create(1, 'my-custom-role'));
+        $this->assertEquals(1, $columnRestrictionModel->create(1, 1, 2, ColumnRestrictionModel::RULE_BLOCK_TASK_CREATION));
+
+        $restrictions = $columnRestrictionModel->getAllByRole(1, 'my-custom-role');
+        $this->assertCount(1, $restrictions);
+        $this->assertEquals(ColumnRestrictionModel::RULE_BLOCK_TASK_CREATION, $restrictions[0]['rule']);
+        $this->assertEquals(1, $restrictions[0]['project_id']);
+        $this->assertEquals(1, $restrictions[0]['restriction_id']);
+        $this->assertEquals(1, $restrictions[0]['role_id']);
+        $this->assertEquals(2, $restrictions[0]['column_id']);
+        $this->assertEquals('my-custom-role', $restrictions[0]['role']);
+    }
+
+    public function testGetRules()
+    {
+        $columnRestrictionModel = new ColumnRestrictionModel($this->container);
+        $rules = $columnRestrictionModel->getRules();
+
+        $this->assertCount(4, $rules);
+        $this->assertArrayHasKey(ColumnRestrictionModel::RULE_ALLOW_TASK_CREATION, $rules);
+    }
+}
diff --git a/tests/units/Model/ProjectPermissionTest.php b/tests/units/Model/ProjectPermissionModelTest.php
index a9f8ab04..3313cf2d 100644
--- a/tests/units/Model/ProjectPermissionTest.php
+++ b/tests/units/Model/ProjectPermissionModelTest.php
@@ -11,7 +11,7 @@ use Kanboard\Model\ProjectGroupRoleModel;
 use Kanboard\Model\ProjectUserRoleModel;
 use Kanboard\Core\Security\Role;
 
-class ProjectPermissionTest extends Base
+class ProjectPermissionModelTest extends Base
 {
     public function testFindByUsernames()
     {
diff --git a/tests/units/Model/ProjectRoleModelTest.php b/tests/units/Model/ProjectRoleModelTest.php
index 5dd78e20..65208e6a 100644
--- a/tests/units/Model/ProjectRoleModelTest.php
+++ b/tests/units/Model/ProjectRoleModelTest.php
@@ -41,14 +41,44 @@ class ProjectRoleModelTest extends Base
         $this->assertEquals('Role B', $roles[1]['role']);
     }
 
-    public function testModification()
+    public function testModificationWithUserRole()
     {
         $projectModel = new ProjectModel($this->container);
         $projectRoleModel = new ProjectRoleModel($this->container);
+        $projectUserRoleModel = new ProjectUserRoleModel($this->container);
+        $groupModel = new GroupModel($this->container);
+        $groupMemberModel = new GroupMemberModel($this->container);
+
+        $this->assertEquals(1, $groupModel->create('Group A'));
+        $this->assertTrue($groupMemberModel->addUser(1, 1));
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
         $this->assertEquals(1, $projectRoleModel->create(1, 'Role A'));
+        $this->assertTrue($projectUserRoleModel->addUser(1, 1, 'Role A'));
+        $this->assertEquals('Role A', $projectUserRoleModel->getUserRole(1, 1));
+
+        $this->assertTrue($projectRoleModel->update(1, 1, 'Role B'));
+        $this->assertEquals('Role B', $projectUserRoleModel->getUserRole(1, 1));
+    }
+
+    public function testModificationWithGroupRole()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $projectRoleModel = new ProjectRoleModel($this->container);
+        $projectGroupRoleModel = new ProjectGroupRoleModel($this->container);
+        $groupModel = new GroupModel($this->container);
+        $groupMemberModel = new GroupMemberModel($this->container);
+
+        $this->assertEquals(1, $groupModel->create('Group A'));
+        $this->assertTrue($groupMemberModel->addUser(1, 1));
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $projectRoleModel->create(1, 'Role A'));
+        $this->assertTrue($projectGroupRoleModel->addGroup(1, 1, 'Role A'));
+        $this->assertEquals('Role A', $projectGroupRoleModel->getUserRole(1, 1));
+
         $this->assertTrue($projectRoleModel->update(1, 1, 'Role B'));
+        $this->assertEquals('Role B', $projectGroupRoleModel->getUserRole(1, 1));
     }
 
     public function testRemoveWithUserRole()
diff --git a/tests/units/Model/ProjectRoleRestrictionModelTest.php b/tests/units/Model/ProjectRoleRestrictionModelTest.php
new file mode 100644
index 00000000..07473061
--- /dev/null
+++ b/tests/units/Model/ProjectRoleRestrictionModelTest.php
@@ -0,0 +1,96 @@
+<?php
+
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\ProjectRoleModel;
+use Kanboard\Model\ProjectRoleRestrictionModel;
+
+require_once __DIR__.'/../Base.php';
+
+class ProjectRoleRestrictionModelTest extends Base
+{
+    public function testCreation()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $projectRoleModel = new ProjectRoleModel($this->container);
+        $projectRoleRestrictionModel = new ProjectRoleRestrictionModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $projectRoleModel->create(1, 'my-custom-role'));
+        $this->assertEquals(1, $projectRoleRestrictionModel->create(1, 1, ProjectRoleRestrictionModel::RULE_TASK_CREATION));
+    }
+
+    public function testRemove()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $projectRoleModel = new ProjectRoleModel($this->container);
+        $projectRoleRestrictionModel = new ProjectRoleRestrictionModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $projectRoleModel->create(1, 'my-custom-role'));
+        $this->assertEquals(1, $projectRoleRestrictionModel->create(1, 1, ProjectRoleRestrictionModel::RULE_TASK_CREATION));
+        $this->assertTrue($projectRoleRestrictionModel->remove(1));
+        $this->assertFalse($projectRoleRestrictionModel->remove(1));
+    }
+
+    public function testGetById()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $projectRoleModel = new ProjectRoleModel($this->container);
+        $projectRoleRestrictionModel = new ProjectRoleRestrictionModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $projectRoleModel->create(1, 'my-custom-role'));
+        $this->assertEquals(1, $projectRoleRestrictionModel->create(1, 1, ProjectRoleRestrictionModel::RULE_TASK_CREATION));
+
+        $restriction = $projectRoleRestrictionModel->getById(1, 1);
+        $this->assertEquals(ProjectRoleRestrictionModel::RULE_TASK_CREATION, $restriction['rule']);
+        $this->assertEquals(1, $restriction['project_id']);
+        $this->assertEquals(1, $restriction['restriction_id']);
+    }
+
+    public function testGetAll()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $projectRoleModel = new ProjectRoleModel($this->container);
+        $projectRoleRestrictionModel = new ProjectRoleRestrictionModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $projectRoleModel->create(1, 'my-custom-role'));
+        $this->assertEquals(1, $projectRoleRestrictionModel->create(1, 1, ProjectRoleRestrictionModel::RULE_TASK_CREATION));
+
+        $restrictions = $projectRoleRestrictionModel->getAll(1);
+        $this->assertCount(1, $restrictions);
+        $this->assertEquals(ProjectRoleRestrictionModel::RULE_TASK_CREATION, $restrictions[0]['rule']);
+        $this->assertEquals(1, $restrictions[0]['project_id']);
+        $this->assertEquals(1, $restrictions[0]['restriction_id']);
+        $this->assertEquals(1, $restrictions[0]['role_id']);
+    }
+
+    public function testGetByRole()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $projectRoleModel = new ProjectRoleModel($this->container);
+        $projectRoleRestrictionModel = new ProjectRoleRestrictionModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $projectRoleModel->create(1, 'my-custom-role'));
+        $this->assertEquals(1, $projectRoleRestrictionModel->create(1, 1, ProjectRoleRestrictionModel::RULE_TASK_CREATION));
+
+        $restrictions = $projectRoleRestrictionModel->getAllByRole(1, 'my-custom-role');
+        $this->assertCount(1, $restrictions);
+        $this->assertEquals(ProjectRoleRestrictionModel::RULE_TASK_CREATION, $restrictions[0]['rule']);
+        $this->assertEquals(1, $restrictions[0]['project_id']);
+        $this->assertEquals(1, $restrictions[0]['restriction_id']);
+        $this->assertEquals(1, $restrictions[0]['role_id']);
+        $this->assertEquals('my-custom-role', $restrictions[0]['role']);
+    }
+
+    public function testGetRules()
+    {
+        $projectRoleRestrictionModel = new ProjectRoleRestrictionModel($this->container);
+        $rules = $projectRoleRestrictionModel->getRules();
+
+        $this->assertCount(2, $rules);
+        $this->assertArrayHasKey(ProjectRoleRestrictionModel::RULE_TASK_OPEN_CLOSE, $rules);
+    }
+}
diff --git a/tests/units/Model/TaskFinderModelTest.php b/tests/units/Model/TaskFinderModelTest.php
index a9f018ff..9e0369ce 100644
--- a/tests/units/Model/TaskFinderModelTest.php
+++ b/tests/units/Model/TaskFinderModelTest.php
@@ -89,6 +89,7 @@ class TaskFinderModelTest extends Base
         $tasks = $taskFinderModel->getUserQuery(1)->findAll();
         $this->assertCount(1, $tasks);
         $this->assertEquals('Task #1', $tasks[0]['title']);
+        $this->assertEquals(1, $tasks[0]['column_id']);
 
         $this->assertTrue($columnModel->update(2, 'Test', 0, '', 0));