Task move position refactoring

2 files changed, 181 insertions, 14 deletions

diff --git a/tests/units/ActionTest.php b/tests/units/ActionTest.php
index 19226449..b07af992 100644
--- a/tests/units/ActionTest.php
+++ b/tests/units/ActionTest.php
@@ -9,7 +9,7 @@ use Model\Task;
 use Model\Category;
 
 class ActionTest extends Base
-{
+{/*
     public function testFetchActions()
     {
         $action = new Action($this->registry);
@@ -84,7 +84,7 @@ class ActionTest extends Base
         $this->assertEquals(1, $t1['column_id']);
 
         // We move our task
-        $task->movePosition(1, 4, 1);
+        $task->movePosition(1, 1, 4, 1);
 
         $this->assertTrue($this->registry->event->isEventTriggered(Task::EVENT_MOVE_COLUMN));
         $this->assertTrue($this->registry->event->isEventTriggered(Task::EVENT_UPDATE));
@@ -94,7 +94,7 @@ class ActionTest extends Base
         $this->assertEquals(4, $t1['column_id']);
         $this->assertEquals(0, $t1['is_active']);
     }
-
+*/
     public function testEventMovePosition()
     {
         $task = new Task($this->registry);
@@ -140,7 +140,7 @@ class ActionTest extends Base
 
         $this->assertTrue($this->registry->event->hasListener(Task::EVENT_MOVE_POSITION, 'Action\TaskAssignColorCategory'));
 
-        // Our task should have the color red and position=0
+        // Our task should have the color red and position=1
         $t1 = $task->getById(1);
         $this->assertEquals(1, $t1['position']);
         $this->assertEquals(1, $t1['is_active']);
@@ -152,12 +152,9 @@ class ActionTest extends Base
         $this->assertEquals('yellow', $t1['color_id']);
 
         // We move our tasks
-        $task->movePosition(1, 1, 2); // task #1 to position 2
-        $task->movePosition(2, 1, 1); // task #2 to position 1
-
+        $this->assertTrue($task->movePosition(1, 1, 1, 10)); // task #1 to the end of the column
         $this->assertTrue($this->registry->event->isEventTriggered(Task::EVENT_MOVE_POSITION));
 
-        // Both tasks should be green
         $t1 = $task->getById(1);
         $this->assertEquals(2, $t1['position']);
         $this->assertEquals(1, $t1['is_active']);
@@ -166,9 +163,24 @@ class ActionTest extends Base
         $t1 = $task->getById(2);
         $this->assertEquals(1, $t1['position']);
         $this->assertEquals(1, $t1['is_active']);
+        $this->assertEquals('yellow', $t1['color_id']);
+
+        $this->registry->event->clearTriggeredEvents();
+        $this->assertTrue($task->movePosition(1, 2, 1, 44)); // task #2 to position 1
+        $this->assertTrue($this->registry->event->isEventTriggered(Task::EVENT_MOVE_POSITION));
+        $this->assertEquals('Action\TaskAssignColorCategory', $this->registry->event->getLastListenerExecuted());
+
+        $t1 = $task->getById(1);
+        $this->assertEquals(1, $t1['position']);
+        $this->assertEquals(1, $t1['is_active']);
         $this->assertEquals('green', $t1['color_id']);
-    }
 
+        $t1 = $task->getById(2);
+        $this->assertEquals(2, $t1['position']);
+        $this->assertEquals(1, $t1['is_active']);
+        $this->assertEquals('green', $t1['color_id']);
+    }
+/*
     public function testExecuteMultipleActions()
     {
         $task = new Task($this->registry);
@@ -223,7 +235,7 @@ class ActionTest extends Base
         $this->assertEquals(1, $t1['project_id']);
 
         // We move our task
-        $task->movePosition(1, 4, 1);
+        $task->movePosition(1, 1, 4, 1);
 
         $this->assertTrue($this->registry->event->isEventTriggered(Task::EVENT_CLOSE));
         $this->assertTrue($this->registry->event->isEventTriggered(Task::EVENT_MOVE_COLUMN));
@@ -240,5 +252,5 @@ class ActionTest extends Base
         $this->assertEquals(1, $t2['is_active']);
         $this->assertEquals(2, $t2['project_id']);
         $this->assertEquals('unit_test', $t2['title']);
-    }
+    }*/
 }
diff --git a/tests/units/TaskTest.php b/tests/units/TaskTest.php
index e1a976c1..a45127e2 100644
--- a/tests/units/TaskTest.php
+++ b/tests/units/TaskTest.php
@@ -9,6 +9,160 @@ use Model\User;
 
 class TaskTest extends Base
 {
+    public function testMovePosition()
+    {
+        $t = new Task($this->registry);
+        $p = new Project($this->registry);
+
+        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
+        $counter = 1;
+        $task_per_column = 5;
+
+        foreach (array(1, 2, 3, 4) as $column_id) {
+
+            for ($i = 1; $i <= $task_per_column; $i++, $counter++) {
+
+                $task = array(
+                    'title' => 'Task #'.$i.'-'.$column_id,
+                    'project_id' => 1,
+                    'column_id' => $column_id,
+                    'owner_id' => 0,
+                );
+
+                $this->assertEquals($counter, $t->create($task));
+
+                $task = $t->getById($counter);
+                $this->assertNotFalse($task);
+                $this->assertNotEmpty($task);
+                $this->assertEquals($i, $task['position']);
+            }
+        }
+
+        // We move task id #4, column 1, position 4 to the column 2, position 3
+        $this->assertTrue($t->movePosition(1, 4, 2, 3));
+
+        // We check the new position of the task
+        $task = $t->getById(4);
+        $this->assertEquals(4, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(3, $task['position']);
+
+        // The tasks before have the correct position
+        $task = $t->getById(3);
+        $this->assertEquals(3, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(3, $task['position']);
+
+        $task = $t->getById(7);
+        $this->assertEquals(7, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(2, $task['position']);
+
+        // The tasks after have the correct position
+        $task = $t->getById(5);
+        $this->assertEquals(5, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(4, $task['position']);
+
+        $task = $t->getById(8);
+        $this->assertEquals(8, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(4, $task['position']);
+
+        // The number of tasks per column
+        $this->assertEquals($task_per_column - 1, $t->countByColumnId(1, 1));
+        $this->assertEquals($task_per_column + 1, $t->countByColumnId(1, 2));
+        $this->assertEquals($task_per_column, $t->countByColumnId(1, 3));
+        $this->assertEquals($task_per_column, $t->countByColumnId(1, 4));
+
+        // We move task id #1, column 1, position 1 to the column 4, position 6 (last position)
+        $this->assertTrue($t->movePosition(1, 1, 4, $task_per_column + 1));
+
+        // We check the new position of the task
+        $task = $t->getById(1);
+        $this->assertEquals(1, $task['id']);
+        $this->assertEquals(4, $task['column_id']);
+        $this->assertEquals($task_per_column + 1, $task['position']);
+
+        // The tasks before have the correct position
+        $task = $t->getById(20);
+        $this->assertEquals(20, $task['id']);
+        $this->assertEquals(4, $task['column_id']);
+        $this->assertEquals($task_per_column, $task['position']);
+
+        // The tasks after have the correct position
+        $task = $t->getById(2);
+        $this->assertEquals(2, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+
+        // The number of tasks per column
+        $this->assertEquals($task_per_column - 2, $t->countByColumnId(1, 1));
+        $this->assertEquals($task_per_column + 1, $t->countByColumnId(1, 2));
+        $this->assertEquals($task_per_column, $t->countByColumnId(1, 3));
+        $this->assertEquals($task_per_column + 1, $t->countByColumnId(1, 4));
+
+        // Our previous moved task should stay at the same place
+        $task = $t->getById(4);
+        $this->assertEquals(4, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(3, $task['position']);
+
+        // Test wrong position number
+        $this->assertFalse($t->movePosition(1, 2, 3, 0));
+        $this->assertFalse($t->movePosition(1, 2, 3, -2));
+
+        // Wrong column
+        $this->assertFalse($t->movePosition(1, 2, 22, 2));
+
+        // Test position greater than the last position
+        $this->assertTrue($t->movePosition(1, 11, 1, 22));
+
+        $task = $t->getById(11);
+        $this->assertEquals(11, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals($t->countByColumnId(1, 1), $task['position']);
+
+        $task = $t->getById(5);
+        $this->assertEquals(5, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals($t->countByColumnId(1, 1) - 1, $task['position']);
+
+        $task = $t->getById(4);
+        $this->assertEquals(4, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(3, $task['position']);
+
+        $this->assertEquals($task_per_column - 1, $t->countByColumnId(1, 1));
+        $this->assertEquals($task_per_column + 1, $t->countByColumnId(1, 2));
+        $this->assertEquals($task_per_column - 1, $t->countByColumnId(1, 3));
+        $this->assertEquals($task_per_column + 1, $t->countByColumnId(1, 4));
+
+        // Our previous moved task should stay at the same place
+        $task = $t->getById(4);
+        $this->assertEquals(4, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(3, $task['position']);
+
+        // Test moving task to position 1
+        $this->assertTrue($t->movePosition(1, 14, 1, 1));
+
+        $task = $t->getById(14);
+        $this->assertEquals(14, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+
+        $task = $t->getById(2);
+        $this->assertEquals(2, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(2, $task['position']);
+
+        $this->assertEquals($task_per_column, $t->countByColumnId(1, 1));
+        $this->assertEquals($task_per_column + 1, $t->countByColumnId(1, 2));
+        $this->assertEquals($task_per_column - 2, $t->countByColumnId(1, 3));
+        $this->assertEquals($task_per_column + 1, $t->countByColumnId(1, 4));
+    }
+
     public function testExport()
     {
         $t = new Task($this->registry);
@@ -271,15 +425,16 @@ class TaskTest extends Base
         $this->assertTrue($this->registry->event->isEventTriggered(Task::EVENT_OPEN));
 
         // We change the column of our task
-        $this->assertTrue($t->movePosition(1, 2, 1));
+        $this->assertTrue($t->movePosition(1, 1, 2, 1));
         $this->assertTrue($this->registry->event->isEventTriggered(Task::EVENT_MOVE_COLUMN));
 
         // We change the position of our task
-        $this->assertTrue($t->movePosition(1, 2, 2));
+        $this->assertEquals(2, $t->create(array('title' => 'test 2', 'project_id' => 1, 'column_id' => 2)));
+        $this->assertTrue($t->movePosition(1, 1, 2, 2));
         $this->assertTrue($this->registry->event->isEventTriggered(Task::EVENT_MOVE_POSITION));
 
         // We change the column and the position of our task
-        $this->assertTrue($t->movePosition(1, 1, 3));
+        $this->assertTrue($t->movePosition(1, 1, 1, 1));
         $this->assertTrue($this->registry->event->isEventTriggered(Task::EVENT_MOVE_COLUMN));
     }
 }