From 18cb7ad0a4a96be63030f5207b74a195c8b6cd6c Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Fri, 24 Jun 2016 15:43:34 -0400
Subject: Expose tags to the user interface (first prototype)

---
 app/Model/TaskModificationModel.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/Model/TaskModificationModel.php')

diff --git a/app/Model/TaskModificationModel.php b/app/Model/TaskModificationModel.php
index 762af2c5..0fc3617e 100644
--- a/app/Model/TaskModificationModel.php
+++ b/app/Model/TaskModificationModel.php
@@ -85,6 +85,11 @@ class TaskModificationModel extends Base
      */
     public function prepare(array &$values)
     {
+        if (isset($values['tags'])) {
+            $this->taskTagModel->save($values['project_id'], $values['id'], $values['tags']);
+            unset($values['tags']);
+        }
+
         $values = $this->dateParser->convert($values, array('date_due'));
         $values = $this->dateParser->convert($values, array('date_started'), true);
 
-- 
cgit v1.2.3


From 49d312d5a41ccfe23432ef0f00a6ae79c8fd558f Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Fri, 24 Jun 2016 18:35:33 -0400
Subject: Added unit test when updating tags for a task

---
 app/Model/TaskModificationModel.php        | 29 +++++++++++++++++++--------
 tests/units/Model/TaskModificationTest.php | 32 +++++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 9 deletions(-)

(limited to 'app/Model/TaskModificationModel.php')

diff --git a/app/Model/TaskModificationModel.php b/app/Model/TaskModificationModel.php
index 0fc3617e..1b176a41 100644
--- a/app/Model/TaskModificationModel.php
+++ b/app/Model/TaskModificationModel.php
@@ -25,6 +25,7 @@ class TaskModificationModel extends Base
     {
         $original_task = $this->taskFinderModel->getById($values['id']);
 
+        $this->updateTags($values, $original_task);
         $this->prepare($values);
         $result = $this->db->table(TaskModel::TABLE)->eq('id', $original_task['id'])->update($values);
 
@@ -80,16 +81,11 @@ class TaskModificationModel extends Base
     /**
      * Prepare data before task modification
      *
-     * @access public
-     * @param  array    $values    Form values
+     * @access protected
+     * @param  array  $values
      */
-    public function prepare(array &$values)
+    protected function prepare(array &$values)
     {
-        if (isset($values['tags'])) {
-            $this->taskTagModel->save($values['project_id'], $values['id'], $values['tags']);
-            unset($values['tags']);
-        }
-
         $values = $this->dateParser->convert($values, array('date_due'));
         $values = $this->dateParser->convert($values, array('date_started'), true);
 
@@ -99,4 +95,21 @@ class TaskModificationModel extends Base
 
         $values['date_modification'] = time();
     }
+
+    /**
+     * Update tags
+     *
+     * @access protected
+     * @param  array  $values
+     * @param  array  $original_task
+     */
+    protected function updateTags(array &$values, array $original_task)
+    {
+        if (isset($values['tags'])) {
+            $this->taskTagModel->save($original_task['project_id'], $values['id'], $values['tags']);
+            unset($values['tags']);
+        } else {
+            $this->taskTagModel->save($original_task['project_id'], $values['id'], array());
+        }
+    }
 }
diff --git a/tests/units/Model/TaskModificationTest.php b/tests/units/Model/TaskModificationTest.php
index a8ace25a..5cbc44e6 100644
--- a/tests/units/Model/TaskModificationTest.php
+++ b/tests/units/Model/TaskModificationTest.php
@@ -7,6 +7,7 @@ use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskModificationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskTagModel;
 
 class TaskModificationTest extends Base
 {
@@ -45,7 +46,6 @@ class TaskModificationTest extends Base
         $p = new ProjectModel($this->container);
         $tc = new TaskCreationModel($this->container);
         $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
 
         $this->assertEquals(1, $p->create(array('name' => 'test')));
         $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
@@ -280,4 +280,34 @@ class TaskModificationTest extends Base
         $task = $tf->getById(1);
         $this->assertEquals(13.3, $task['time_spent']);
     }
+
+    public function testChangeTags()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'tags' => array('tag1', 'tag2'))));
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'tags' => array('tag2'))));
+
+        $tags = $taskTagModel->getList(1);
+        $this->assertEquals(array(2 => 'tag2'), $tags);
+    }
+
+    public function testRemoveAllTags()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'tags' => array('tag1', 'tag2'))));
+        $this->assertTrue($taskModificationModel->update(array('id' => 1)));
+
+        $tags = $taskTagModel->getList(1);
+        $this->assertEquals(array(), $tags);
+    }
 }
-- 
cgit v1.2.3


From 853189a43fff8b8b64f18029a35ac910b14932e8 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 2 Jul 2016 11:50:32 -0400
Subject: Do not create empty tags and remove tags only when necessary

---
 app/Helper/TaskHelper.php                       |   1 +
 app/Model/TaskModificationModel.php             |   2 -
 app/Model/TaskTagModel.php                      |   1 +
 tests/units/Model/TaskModificationModelTest.php | 322 ++++++++++++++++++++++++
 tests/units/Model/TaskModificationTest.php      | 313 -----------------------
 tests/units/Model/TaskTagModelTest.php          |   2 +-
 6 files changed, 325 insertions(+), 316 deletions(-)
 create mode 100644 tests/units/Model/TaskModificationModelTest.php
 delete mode 100644 tests/units/Model/TaskModificationTest.php

(limited to 'app/Model/TaskModificationModel.php')

diff --git a/app/Helper/TaskHelper.php b/app/Helper/TaskHelper.php
index ce39eb2a..84b41e42 100644
--- a/app/Helper/TaskHelper.php
+++ b/app/Helper/TaskHelper.php
@@ -70,6 +70,7 @@ class TaskHelper extends Base
         $options = $this->tagModel->getAssignableList($project['id']);
 
         $html = $this->helper->form->label(t('Tags'), 'tags[]');
+        $html .= '<input type="hidden" name="tags[]" value="">';
         $html .= '<select name="tags[]" id="form-tags" class="tag-autocomplete" multiple>';
 
         foreach ($options as $tag) {
diff --git a/app/Model/TaskModificationModel.php b/app/Model/TaskModificationModel.php
index 1b176a41..be5f53c8 100644
--- a/app/Model/TaskModificationModel.php
+++ b/app/Model/TaskModificationModel.php
@@ -108,8 +108,6 @@ class TaskModificationModel extends Base
         if (isset($values['tags'])) {
             $this->taskTagModel->save($original_task['project_id'], $values['id'], $values['tags']);
             unset($values['tags']);
-        } else {
-            $this->taskTagModel->save($original_task['project_id'], $values['id'], array());
         }
     }
 }
diff --git a/app/Model/TaskTagModel.php b/app/Model/TaskTagModel.php
index 91dfd224..2a08e867 100644
--- a/app/Model/TaskTagModel.php
+++ b/app/Model/TaskTagModel.php
@@ -82,6 +82,7 @@ class TaskTagModel extends Base
     public function save($project_id, $task_id, array $tags)
     {
         $task_tags = $this->getList($task_id);
+        $tags = array_filter($tags);
 
         return $this->associateTags($project_id, $task_id, $task_tags, $tags) &&
             $this->dissociateTags($task_id, $task_tags, $tags);
diff --git a/tests/units/Model/TaskModificationModelTest.php b/tests/units/Model/TaskModificationModelTest.php
new file mode 100644
index 00000000..c81f968b
--- /dev/null
+++ b/tests/units/Model/TaskModificationModelTest.php
@@ -0,0 +1,322 @@
+<?php
+
+require_once __DIR__.'/../Base.php';
+
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskModificationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskTagModel;
+
+class TaskModificationModelTest extends Base
+{
+    public function onCreateUpdate($event)
+    {
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+
+        $event_data = $event->getAll();
+        $this->assertNotEmpty($event_data);
+        $this->assertEquals(1, $event_data['task_id']);
+        $this->assertEquals('Task #1', $event_data['title']);
+    }
+
+    public function onUpdate($event)
+    {
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+
+        $event_data = $event->getAll();
+        $this->assertNotEmpty($event_data);
+        $this->assertEquals(1, $event_data['task_id']);
+        $this->assertEquals('Task #1', $event_data['title']);
+    }
+
+    public function onAssigneeChange($event)
+    {
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+
+        $event_data = $event->getAll();
+        $this->assertNotEmpty($event_data);
+        $this->assertEquals(1, $event_data['task_id']);
+        $this->assertEquals(1, $event_data['owner_id']);
+    }
+
+    public function testThatNoEventAreFiredWhenNoChanges()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, array($this, 'onCreateUpdate'));
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_UPDATE, array($this, 'onUpdate'));
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'title' => 'test')));
+
+        $this->assertEmpty($this->container['dispatcher']->getCalledListeners());
+    }
+
+    public function testChangeTitle()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, array($this, 'onCreateUpdate'));
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_UPDATE, array($this, 'onUpdate'));
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'title' => 'Task #1')));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.TaskModificationModelTest::onCreateUpdate', $called);
+        $this->assertArrayHasKey(TaskModel::EVENT_UPDATE.'.TaskModificationModelTest::onUpdate', $called);
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('Task #1', $task['title']);
+    }
+
+    public function testChangeAssignee()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(0, $task['owner_id']);
+
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_ASSIGNEE_CHANGE, array($this, 'onAssigneeChange'));
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'owner_id' => 1)));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_ASSIGNEE_CHANGE.'.TaskModificationModelTest::onAssigneeChange', $called);
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(1, $task['owner_id']);
+    }
+
+    public function testChangeDescription()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('', $task['description']);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'description' => 'test')));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('test', $task['description']);
+    }
+
+    public function testChangeCategory()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(0, $task['category_id']);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'category_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(1, $task['category_id']);
+    }
+
+    public function testChangeColor()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('yellow', $task['color_id']);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'color_id' => 'blue')));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('blue', $task['color_id']);
+    }
+
+    public function testChangeScore()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(0, $task['score']);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'score' => 13)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(13, $task['score']);
+    }
+
+    public function testChangeDueDate()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(0, $task['date_due']);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'date_due' => '2014-11-24')));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('2014-11-24', date('Y-m-d', $task['date_due']));
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'date_due' => time())));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(date('Y-m-d'), date('Y-m-d', $task['date_due']));
+    }
+
+    public function testChangeStartedDate()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(0, $task['date_started']);
+
+        // Set only a date
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'date_started' => '2014-11-24')));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('2014-11-24 '.date('H:i'), date('Y-m-d H:i', $task['date_started']));
+
+        // Set a datetime
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'date_started' => '2014-11-24 16:25')));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('2014-11-24 16:25', date('Y-m-d H:i', $task['date_started']));
+
+        // Set a datetime
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'date_started' => '11/24/2014 18:25')));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('2014-11-24 18:25', date('Y-m-d H:i', $task['date_started']));
+
+        // Set a timestamp
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'date_started' => time())));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(time(), $task['date_started'], '', 1);
+    }
+
+    public function testChangeTimeEstimated()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(0, $task['time_estimated']);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'time_estimated' => 13.3)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(13.3, $task['time_estimated']);
+    }
+
+    public function testChangeTimeSpent()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(0, $task['time_spent']);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'time_spent' => 13.3)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(13.3, $task['time_spent']);
+    }
+
+    public function testChangeTags()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'tags' => array('tag1', 'tag2'))));
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'tags' => array('tag2'))));
+
+        $tags = $taskTagModel->getList(1);
+        $this->assertEquals(array(2 => 'tag2'), $tags);
+    }
+
+    public function testRemoveAllTags()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test1', 'project_id' => 1, 'tags' => array('tag1', 'tag2'))));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'test2', 'project_id' => 1, 'tags' => array('tag1', 'tag2'))));
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1)));
+        $tags = $taskTagModel->getList(1);
+        $this->assertEquals(array(1 => 'tag1', 2 => 'tag2'), $tags);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'tags' => array())));
+        $tags = $taskTagModel->getList(1);
+        $this->assertEquals(array(), $tags);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 2, 'tags' => array(''))));
+        $tags = $taskTagModel->getList(2);
+        $this->assertEquals(array(), $tags);
+    }
+}
diff --git a/tests/units/Model/TaskModificationTest.php b/tests/units/Model/TaskModificationTest.php
deleted file mode 100644
index 5cbc44e6..00000000
--- a/tests/units/Model/TaskModificationTest.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-
-require_once __DIR__.'/../Base.php';
-
-use Kanboard\Model\TaskModel;
-use Kanboard\Model\TaskCreationModel;
-use Kanboard\Model\TaskModificationModel;
-use Kanboard\Model\TaskFinderModel;
-use Kanboard\Model\ProjectModel;
-use Kanboard\Model\TaskTagModel;
-
-class TaskModificationTest extends Base
-{
-    public function onCreateUpdate($event)
-    {
-        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
-
-        $event_data = $event->getAll();
-        $this->assertNotEmpty($event_data);
-        $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals('Task #1', $event_data['title']);
-    }
-
-    public function onUpdate($event)
-    {
-        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
-
-        $event_data = $event->getAll();
-        $this->assertNotEmpty($event_data);
-        $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals('Task #1', $event_data['title']);
-    }
-
-    public function onAssigneeChange($event)
-    {
-        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
-
-        $event_data = $event->getAll();
-        $this->assertNotEmpty($event_data);
-        $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals(1, $event_data['owner_id']);
-    }
-
-    public function testThatNoEventAreFiredWhenNoChanges()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, array($this, 'onCreateUpdate'));
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_UPDATE, array($this, 'onUpdate'));
-
-        $this->assertTrue($tm->update(array('id' => 1, 'title' => 'test')));
-
-        $this->assertEmpty($this->container['dispatcher']->getCalledListeners());
-    }
-
-    public function testChangeTitle()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, array($this, 'onCreateUpdate'));
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_UPDATE, array($this, 'onUpdate'));
-
-        $this->assertTrue($tm->update(array('id' => 1, 'title' => 'Task #1')));
-
-        $called = $this->container['dispatcher']->getCalledListeners();
-        $this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.TaskModificationTest::onCreateUpdate', $called);
-        $this->assertArrayHasKey(TaskModel::EVENT_UPDATE.'.TaskModificationTest::onUpdate', $called);
-
-        $task = $tf->getById(1);
-        $this->assertEquals('Task #1', $task['title']);
-    }
-
-    public function testChangeAssignee()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(0, $task['owner_id']);
-
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_ASSIGNEE_CHANGE, array($this, 'onAssigneeChange'));
-
-        $this->assertTrue($tm->update(array('id' => 1, 'owner_id' => 1)));
-
-        $called = $this->container['dispatcher']->getCalledListeners();
-        $this->assertArrayHasKey(TaskModel::EVENT_ASSIGNEE_CHANGE.'.TaskModificationTest::onAssigneeChange', $called);
-
-        $task = $tf->getById(1);
-        $this->assertEquals(1, $task['owner_id']);
-    }
-
-    public function testChangeDescription()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals('', $task['description']);
-
-        $this->assertTrue($tm->update(array('id' => 1, 'description' => 'test')));
-
-        $task = $tf->getById(1);
-        $this->assertEquals('test', $task['description']);
-    }
-
-    public function testChangeCategory()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(0, $task['category_id']);
-
-        $this->assertTrue($tm->update(array('id' => 1, 'category_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(1, $task['category_id']);
-    }
-
-    public function testChangeColor()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals('yellow', $task['color_id']);
-
-        $this->assertTrue($tm->update(array('id' => 1, 'color_id' => 'blue')));
-
-        $task = $tf->getById(1);
-        $this->assertEquals('blue', $task['color_id']);
-    }
-
-    public function testChangeScore()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(0, $task['score']);
-
-        $this->assertTrue($tm->update(array('id' => 1, 'score' => 13)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(13, $task['score']);
-    }
-
-    public function testChangeDueDate()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(0, $task['date_due']);
-
-        $this->assertTrue($tm->update(array('id' => 1, 'date_due' => '2014-11-24')));
-
-        $task = $tf->getById(1);
-        $this->assertEquals('2014-11-24', date('Y-m-d', $task['date_due']));
-
-        $this->assertTrue($tm->update(array('id' => 1, 'date_due' => time())));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(date('Y-m-d'), date('Y-m-d', $task['date_due']));
-    }
-
-    public function testChangeStartedDate()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(0, $task['date_started']);
-
-        // Set only a date
-        $this->assertTrue($tm->update(array('id' => 1, 'date_started' => '2014-11-24')));
-
-        $task = $tf->getById(1);
-        $this->assertEquals('2014-11-24 '.date('H:i'), date('Y-m-d H:i', $task['date_started']));
-
-        // Set a datetime
-        $this->assertTrue($tm->update(array('id' => 1, 'date_started' => '2014-11-24 16:25')));
-
-        $task = $tf->getById(1);
-        $this->assertEquals('2014-11-24 16:25', date('Y-m-d H:i', $task['date_started']));
-
-        // Set a datetime
-        $this->assertTrue($tm->update(array('id' => 1, 'date_started' => '11/24/2014 18:25')));
-
-        $task = $tf->getById(1);
-        $this->assertEquals('2014-11-24 18:25', date('Y-m-d H:i', $task['date_started']));
-
-        // Set a timestamp
-        $this->assertTrue($tm->update(array('id' => 1, 'date_started' => time())));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(time(), $task['date_started'], '', 1);
-    }
-
-    public function testChangeTimeEstimated()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(0, $task['time_estimated']);
-
-        $this->assertTrue($tm->update(array('id' => 1, 'time_estimated' => 13.3)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(13.3, $task['time_estimated']);
-    }
-
-    public function testChangeTimeSpent()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(0, $task['time_spent']);
-
-        $this->assertTrue($tm->update(array('id' => 1, 'time_spent' => 13.3)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(13.3, $task['time_spent']);
-    }
-
-    public function testChangeTags()
-    {
-        $projectModel = new ProjectModel($this->container);
-        $taskCreationModel = new TaskCreationModel($this->container);
-        $taskModificationModel = new TaskModificationModel($this->container);
-        $taskTagModel = new TaskTagModel($this->container);
-
-        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
-        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'tags' => array('tag1', 'tag2'))));
-        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'tags' => array('tag2'))));
-
-        $tags = $taskTagModel->getList(1);
-        $this->assertEquals(array(2 => 'tag2'), $tags);
-    }
-
-    public function testRemoveAllTags()
-    {
-        $projectModel = new ProjectModel($this->container);
-        $taskCreationModel = new TaskCreationModel($this->container);
-        $taskModificationModel = new TaskModificationModel($this->container);
-        $taskTagModel = new TaskTagModel($this->container);
-
-        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
-        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'tags' => array('tag1', 'tag2'))));
-        $this->assertTrue($taskModificationModel->update(array('id' => 1)));
-
-        $tags = $taskTagModel->getList(1);
-        $this->assertEquals(array(), $tags);
-    }
-}
diff --git a/tests/units/Model/TaskTagModelTest.php b/tests/units/Model/TaskTagModelTest.php
index 73bbeac1..88055d5f 100644
--- a/tests/units/Model/TaskTagModelTest.php
+++ b/tests/units/Model/TaskTagModelTest.php
@@ -22,7 +22,7 @@ class TaskTagModelTest extends Base
         $this->assertEquals(1, $tagModel->create(0, 'My tag 1'));
         $this->assertEquals(2, $tagModel->create(0, 'My tag 2'));
 
-        $this->assertTrue($taskTagModel->save(1, 1, array('My tag 1', 'My tag 2', 'My tag 3')));
+        $this->assertTrue($taskTagModel->save(1, 1, array('My tag 1', 'My tag 2', '', 'My tag 3')));
 
         $tags = $taskTagModel->getTagsByTask(1);
         $this->assertCount(3, $tags);
-- 
cgit v1.2.3


From 390082aa41cb81610089163b1cc3a256f3b3c513 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Tue, 19 Jul 2016 22:38:30 -0400
Subject: Refactoring of internal task events

---
 app/Action/Base.php                                |  13 +-
 app/Action/CommentCreationMoveTaskColumn.php       |  12 +-
 app/Action/TaskAssignCategoryColor.php             |   7 +-
 app/Action/TaskAssignColorCategory.php             |   7 +-
 app/Action/TaskAssignColorColumn.php               |   7 +-
 app/Action/TaskAssignColorPriority.php             |   7 +-
 app/Action/TaskAssignColorUser.php                 |   7 +-
 app/Action/TaskAssignCurrentUserColumn.php         |   7 +-
 app/Action/TaskAssignSpecificUser.php              |   7 +-
 app/Action/TaskCloseColumn.php                     |  10 +-
 app/Action/TaskCreation.php                        |   1 +
 app/Action/TaskDuplicateAnotherProject.php         |  14 +-
 app/Action/TaskEmail.php                           |  14 +-
 app/Action/TaskMoveAnotherProject.php              |   8 +-
 app/Action/TaskMoveColumnAssigned.php              |  19 +-
 app/Action/TaskMoveColumnCategoryChange.php        |  19 +-
 app/Action/TaskMoveColumnUnAssigned.php            |  19 +-
 app/Action/TaskUpdateStartDate.php                 |   7 +-
 app/Core/Base.php                                  |   1 +
 app/EventBuilder/TaskEventBuilder.php              | 123 ++++
 app/Job/NotificationJob.php                        |  50 +-
 app/Job/TaskEventJob.php                           |  75 +++
 app/Model/SubtaskModel.php                         |   1 -
 app/Model/TaskCreationModel.php                    |  32 +-
 app/Model/TaskModificationModel.php                |  62 +-
 app/Model/TaskPositionModel.php                    |  28 +-
 app/Model/TaskProjectMoveModel.php                 |   7 +-
 app/Model/TaskStatusModel.php                      |   8 +-
 app/ServiceProvider/JobProvider.php                |   5 +
 app/Subscriber/NotificationSubscriber.php          |   6 +-
 .../ProjectModificationDateSubscriber.php          |   6 +-
 tests/units/Action/BaseActionTest.php              |  10 +-
 .../Action/CommentCreationMoveTaskColumnTest.php   |   6 +-
 tests/units/Action/TaskAssignCategoryColorTest.php |  18 +-
 tests/units/Action/TaskAssignCategoryLinkTest.php  |  43 +-
 tests/units/Action/TaskAssignColorCategoryTest.php |  18 +-
 tests/units/Action/TaskAssignColorColumnTest.php   |  18 +-
 tests/units/Action/TaskAssignColorPriorityTest.php |  18 +-
 tests/units/Action/TaskAssignColorUserTest.php     |  18 +-
 .../Action/TaskAssignCurrentUserColumnTest.php     |  26 +-
 tests/units/Action/TaskAssignSpecificUserTest.php  |  17 +-
 tests/units/Action/TaskCloseColumnTest.php         |  18 +-
 tests/units/Action/TaskCloseTest.php               |  15 +-
 .../Action/TaskDuplicateAnotherProjectTest.php     |  18 +-
 tests/units/Action/TaskEmailTest.php               |  19 +-
 tests/units/Action/TaskMoveAnotherProjectTest.php  |  17 +-
 tests/units/Action/TaskMoveColumnAssignedTest.php  |  18 +-
 .../Action/TaskMoveColumnCategoryChangeTest.php    |  31 +-
 .../units/Action/TaskMoveColumnUnAssignedTest.php  |  31 +-
 tests/units/Action/TaskOpenTest.php                |  15 +-
 tests/units/Action/TaskUpdateStartDateTest.php     |  17 +-
 tests/units/EventBuilder/TaskEventBuilderTest.php  | 100 ++++
 tests/units/Job/SubtaskEventJobTest.php            |   4 +-
 tests/units/Job/TaskEventJobTest.php               | 189 ++++++
 tests/units/Model/TaskCreationModelTest.php        |   2 +-
 tests/units/Model/TaskModificationModelTest.php    |  13 +-
 tests/units/Model/TaskPositionModelTest.php        | 631 +++++++++++++++++++++
 tests/units/Model/TaskPositionTest.php             | 631 ---------------------
 tests/units/Model/TaskProjectMoveModelTest.php     |   2 +-
 59 files changed, 1647 insertions(+), 905 deletions(-)
 create mode 100644 app/EventBuilder/TaskEventBuilder.php
 create mode 100644 app/Job/TaskEventJob.php
 create mode 100644 tests/units/EventBuilder/TaskEventBuilderTest.php
 create mode 100644 tests/units/Job/TaskEventJobTest.php
 create mode 100644 tests/units/Model/TaskPositionModelTest.php
 delete mode 100644 tests/units/Model/TaskPositionTest.php

(limited to 'app/Model/TaskModificationModel.php')

diff --git a/app/Action/Base.php b/app/Action/Base.php
index e5c65a17..e0ed8bde 100644
--- a/app/Action/Base.php
+++ b/app/Action/Base.php
@@ -216,7 +216,8 @@ abstract class Base extends \Kanboard\Core\Base
      */
     public function hasRequiredProject(array $data)
     {
-        return isset($data['project_id']) && $data['project_id'] == $this->getProjectId();
+        return (isset($data['project_id']) && $data['project_id'] == $this->getProjectId()) ||
+            (isset($data['task']['project_id']) && $data['task']['project_id'] == $this->getProjectId());
     }
 
     /**
@@ -226,10 +227,14 @@ abstract class Base extends \Kanboard\Core\Base
      * @param  array   $data   Event data dictionary
      * @return bool            True if all keys are there
      */
-    public function hasRequiredParameters(array $data)
+    public function hasRequiredParameters(array $data, array $parameters = array())
     {
-        foreach ($this->getEventRequiredParameters() as $parameter) {
-            if (! isset($data[$parameter])) {
+        $parameters = $parameters ?: $this->getEventRequiredParameters();
+
+        foreach ($parameters as $key => $value) {
+            if (is_array($value)) {
+                return isset($data[$key]) && $this->hasRequiredParameters($data[$key], $value);
+            } else if (! isset($data[$value])) {
                 return false;
             }
         }
diff --git a/app/Action/CommentCreationMoveTaskColumn.php b/app/Action/CommentCreationMoveTaskColumn.php
index 1b16f481..8ab792ad 100644
--- a/app/Action/CommentCreationMoveTaskColumn.php
+++ b/app/Action/CommentCreationMoveTaskColumn.php
@@ -55,7 +55,13 @@ class CommentCreationMoveTaskColumn extends Base
      */
     public function getEventRequiredParameters()
     {
-        return array('task_id', 'column_id');
+        return array(
+            'task_id',
+            'task' => array(
+                'column_id',
+                'project_id',
+            ),
+        );
     }
 
     /**
@@ -71,7 +77,7 @@ class CommentCreationMoveTaskColumn extends Base
             return false;
         }
 
-        $column = $this->columnModel->getById($data['column_id']);
+        $column = $this->columnModel->getById($data['task']['column_id']);
 
         return (bool) $this->commentModel->create(array(
             'comment' => t('Moved to column %s', $column['title']),
@@ -89,6 +95,6 @@ class CommentCreationMoveTaskColumn extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $data['column_id'] == $this->getParam('column_id');
+        return $data['task']['column_id'] == $this->getParam('column_id');
     }
 }
diff --git a/app/Action/TaskAssignCategoryColor.php b/app/Action/TaskAssignCategoryColor.php
index fc486870..2df90b2c 100644
--- a/app/Action/TaskAssignCategoryColor.php
+++ b/app/Action/TaskAssignCategoryColor.php
@@ -60,7 +60,10 @@ class TaskAssignCategoryColor extends Base
     {
         return array(
             'task_id',
-            'color_id',
+            'task' => array(
+                'project_id',
+                'color_id',
+            ),
         );
     }
 
@@ -90,6 +93,6 @@ class TaskAssignCategoryColor extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $data['color_id'] == $this->getParam('color_id');
+        return $data['task']['color_id'] == $this->getParam('color_id');
     }
 }
diff --git a/app/Action/TaskAssignColorCategory.php b/app/Action/TaskAssignColorCategory.php
index 284b8f40..91860be4 100644
--- a/app/Action/TaskAssignColorCategory.php
+++ b/app/Action/TaskAssignColorCategory.php
@@ -60,7 +60,10 @@ class TaskAssignColorCategory extends Base
     {
         return array(
             'task_id',
-            'category_id',
+            'task' => array(
+                'project_id',
+                'category_id',
+            ),
         );
     }
 
@@ -90,6 +93,6 @@ class TaskAssignColorCategory extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $data['category_id'] == $this->getParam('category_id');
+        return $data['task']['category_id'] == $this->getParam('category_id');
     }
 }
diff --git a/app/Action/TaskAssignColorColumn.php b/app/Action/TaskAssignColorColumn.php
index 57fd6f44..6c674b1f 100644
--- a/app/Action/TaskAssignColorColumn.php
+++ b/app/Action/TaskAssignColorColumn.php
@@ -61,7 +61,10 @@ class TaskAssignColorColumn extends Base
     {
         return array(
             'task_id',
-            'column_id',
+            'task' => array(
+                'project_id',
+                'column_id',
+            ),
         );
     }
 
@@ -91,6 +94,6 @@ class TaskAssignColorColumn extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $data['column_id'] == $this->getParam('column_id');
+        return $data['task']['column_id'] == $this->getParam('column_id');
     }
 }
diff --git a/app/Action/TaskAssignColorPriority.php b/app/Action/TaskAssignColorPriority.php
index eae1b771..57000ba8 100644
--- a/app/Action/TaskAssignColorPriority.php
+++ b/app/Action/TaskAssignColorPriority.php
@@ -60,7 +60,10 @@ class TaskAssignColorPriority extends Base
     {
         return array(
             'task_id',
-            'priority',
+            'task' => array(
+                'project_id',
+                'priority',
+            ),
         );
     }
 
@@ -90,6 +93,6 @@ class TaskAssignColorPriority extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $data['priority'] == $this->getParam('priority');
+        return $data['task']['priority'] == $this->getParam('priority');
     }
 }
diff --git a/app/Action/TaskAssignColorUser.php b/app/Action/TaskAssignColorUser.php
index 4bcf7a5c..385db793 100644
--- a/app/Action/TaskAssignColorUser.php
+++ b/app/Action/TaskAssignColorUser.php
@@ -61,7 +61,10 @@ class TaskAssignColorUser extends Base
     {
         return array(
             'task_id',
-            'owner_id',
+            'task' => array(
+                'project_id',
+                'owner_id',
+            ),
         );
     }
 
@@ -91,6 +94,6 @@ class TaskAssignColorUser extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $data['owner_id'] == $this->getParam('user_id');
+        return $data['task']['owner_id'] == $this->getParam('user_id');
     }
 }
diff --git a/app/Action/TaskAssignCurrentUserColumn.php b/app/Action/TaskAssignCurrentUserColumn.php
index bc28a90b..e4eade33 100644
--- a/app/Action/TaskAssignCurrentUserColumn.php
+++ b/app/Action/TaskAssignCurrentUserColumn.php
@@ -59,7 +59,10 @@ class TaskAssignCurrentUserColumn extends Base
     {
         return array(
             'task_id',
-            'column_id',
+            'task' => array(
+                'project_id',
+                'column_id',
+            ),
         );
     }
 
@@ -93,6 +96,6 @@ class TaskAssignCurrentUserColumn extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $data['column_id'] == $this->getParam('column_id');
+        return $data['task']['column_id'] == $this->getParam('column_id');
     }
 }
diff --git a/app/Action/TaskAssignSpecificUser.php b/app/Action/TaskAssignSpecificUser.php
index 50a2b2ae..2c7dcacd 100644
--- a/app/Action/TaskAssignSpecificUser.php
+++ b/app/Action/TaskAssignSpecificUser.php
@@ -61,7 +61,10 @@ class TaskAssignSpecificUser extends Base
     {
         return array(
             'task_id',
-            'column_id',
+            'task' => array(
+                'project_id',
+                'column_id',
+            ),
         );
     }
 
@@ -91,6 +94,6 @@ class TaskAssignSpecificUser extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $data['column_id'] == $this->getParam('column_id');
+        return $data['task']['column_id'] == $this->getParam('column_id');
     }
 }
diff --git a/app/Action/TaskCloseColumn.php b/app/Action/TaskCloseColumn.php
index 1edce8fa..4f1ffc92 100644
--- a/app/Action/TaskCloseColumn.php
+++ b/app/Action/TaskCloseColumn.php
@@ -55,7 +55,13 @@ class TaskCloseColumn extends Base
      */
     public function getEventRequiredParameters()
     {
-        return array('task_id', 'column_id');
+        return array(
+            'task_id',
+            'task' => array(
+                'project_id',
+                'column_id',
+            )
+        );
     }
 
     /**
@@ -79,6 +85,6 @@ class TaskCloseColumn extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $data['column_id'] == $this->getParam('column_id');
+        return $data['task']['column_id'] == $this->getParam('column_id');
     }
 }
diff --git a/app/Action/TaskCreation.php b/app/Action/TaskCreation.php
index e9e5c5f3..0620afd3 100644
--- a/app/Action/TaskCreation.php
+++ b/app/Action/TaskCreation.php
@@ -52,6 +52,7 @@ class TaskCreation extends Base
     public function getEventRequiredParameters()
     {
         return array(
+            'project_id',
             'reference',
             'title',
         );
diff --git a/app/Action/TaskDuplicateAnotherProject.php b/app/Action/TaskDuplicateAnotherProject.php
index d70d2ee8..d6d8d51f 100644
--- a/app/Action/TaskDuplicateAnotherProject.php
+++ b/app/Action/TaskDuplicateAnotherProject.php
@@ -62,7 +62,10 @@ class TaskDuplicateAnotherProject extends Base
     {
         return array(
             'task_id',
-            'column_id',
+            'task' => array(
+                'project_id',
+                'column_id',
+            )
         );
     }
 
@@ -76,7 +79,12 @@ class TaskDuplicateAnotherProject extends Base
     public function doAction(array $data)
     {
         $destination_column_id = $this->columnModel->getFirstColumnId($this->getParam('project_id'));
-        return (bool) $this->taskProjectDuplicationModel->duplicateToProject($data['task_id'], $this->getParam('project_id'), null, $destination_column_id);
+        return (bool) $this->taskProjectDuplicationModel->duplicateToProject(
+            $data['task_id'],
+            $this->getParam('project_id'),
+            null,
+            $destination_column_id
+        );
     }
 
     /**
@@ -88,6 +96,6 @@ class TaskDuplicateAnotherProject extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $data['column_id'] == $this->getParam('column_id') && $data['project_id'] != $this->getParam('project_id');
+        return $data['task']['column_id'] == $this->getParam('column_id') && $data['task']['project_id'] != $this->getParam('project_id');
     }
 }
diff --git a/app/Action/TaskEmail.php b/app/Action/TaskEmail.php
index 7f9ba416..526e9aa8 100644
--- a/app/Action/TaskEmail.php
+++ b/app/Action/TaskEmail.php
@@ -62,7 +62,10 @@ class TaskEmail extends Base
     {
         return array(
             'task_id',
-            'column_id',
+            'task' => array(
+                'project_id',
+                'column_id',
+            ),
         );
     }
 
@@ -78,13 +81,14 @@ class TaskEmail extends Base
         $user = $this->userModel->getById($this->getParam('user_id'));
 
         if (! empty($user['email'])) {
-            $task = $this->taskFinderModel->getDetails($data['task_id']);
-
             $this->emailClient->send(
                 $user['email'],
                 $user['name'] ?: $user['username'],
                 $this->getParam('subject'),
-                $this->template->render('notification/task_create', array('task' => $task, 'application_url' => $this->configModel->get('application_url')))
+                $this->template->render('notification/task_create', array(
+                    'task' => $data['task'],
+                    'application_url' => $this->configModel->get('application_url'),
+                ))
             );
 
             return true;
@@ -102,6 +106,6 @@ class TaskEmail extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $data['column_id'] == $this->getParam('column_id');
+        return $data['task']['column_id'] == $this->getParam('column_id');
     }
 }
diff --git a/app/Action/TaskMoveAnotherProject.php b/app/Action/TaskMoveAnotherProject.php
index 66635a63..148b6b0c 100644
--- a/app/Action/TaskMoveAnotherProject.php
+++ b/app/Action/TaskMoveAnotherProject.php
@@ -61,8 +61,10 @@ class TaskMoveAnotherProject extends Base
     {
         return array(
             'task_id',
-            'column_id',
-            'project_id',
+            'task' => array(
+                'project_id',
+                'column_id',
+            )
         );
     }
 
@@ -87,6 +89,6 @@ class TaskMoveAnotherProject extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $data['column_id'] == $this->getParam('column_id') && $data['project_id'] != $this->getParam('project_id');
+        return $data['task']['column_id'] == $this->getParam('column_id') && $data['task']['project_id'] != $this->getParam('project_id');
     }
 }
diff --git a/app/Action/TaskMoveColumnAssigned.php b/app/Action/TaskMoveColumnAssigned.php
index 7e3db9c5..1c1f657a 100644
--- a/app/Action/TaskMoveColumnAssigned.php
+++ b/app/Action/TaskMoveColumnAssigned.php
@@ -61,8 +61,13 @@ class TaskMoveColumnAssigned extends Base
     {
         return array(
             'task_id',
-            'column_id',
-            'owner_id'
+            'task' => array(
+                'project_id',
+                'column_id',
+                'owner_id',
+                'position',
+                'swimlane_id',
+            )
         );
     }
 
@@ -75,14 +80,12 @@ class TaskMoveColumnAssigned extends Base
      */
     public function doAction(array $data)
     {
-        $original_task = $this->taskFinderModel->getById($data['task_id']);
-
         return $this->taskPositionModel->movePosition(
-            $data['project_id'],
+            $data['task']['project_id'],
             $data['task_id'],
             $this->getParam('dest_column_id'),
-            $original_task['position'],
-            $original_task['swimlane_id'],
+            $data['task']['position'],
+            $data['task']['swimlane_id'],
             false
         );
     }
@@ -96,6 +99,6 @@ class TaskMoveColumnAssigned extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $data['column_id'] == $this->getParam('src_column_id') && $data['owner_id'] > 0;
+        return $data['task']['column_id'] == $this->getParam('src_column_id') && $data['task']['owner_id'] > 0;
     }
 }
diff --git a/app/Action/TaskMoveColumnCategoryChange.php b/app/Action/TaskMoveColumnCategoryChange.php
index e4f88760..4c2b289a 100644
--- a/app/Action/TaskMoveColumnCategoryChange.php
+++ b/app/Action/TaskMoveColumnCategoryChange.php
@@ -60,8 +60,13 @@ class TaskMoveColumnCategoryChange extends Base
     {
         return array(
             'task_id',
-            'column_id',
-            'category_id',
+            'task' => array(
+                'project_id',
+                'column_id',
+                'category_id',
+                'position',
+                'swimlane_id',
+            )
         );
     }
 
@@ -74,14 +79,12 @@ class TaskMoveColumnCategoryChange extends Base
      */
     public function doAction(array $data)
     {
-        $original_task = $this->taskFinderModel->getById($data['task_id']);
-
         return $this->taskPositionModel->movePosition(
-            $data['project_id'],
+            $data['task']['project_id'],
             $data['task_id'],
             $this->getParam('dest_column_id'),
-            $original_task['position'],
-            $original_task['swimlane_id'],
+            $data['task']['position'],
+            $data['task']['swimlane_id'],
             false
         );
     }
@@ -95,6 +98,6 @@ class TaskMoveColumnCategoryChange extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $data['column_id'] != $this->getParam('dest_column_id') && $data['category_id'] == $this->getParam('category_id');
+        return $data['task']['column_id'] != $this->getParam('dest_column_id') && $data['task']['category_id'] == $this->getParam('category_id');
     }
 }
diff --git a/app/Action/TaskMoveColumnUnAssigned.php b/app/Action/TaskMoveColumnUnAssigned.php
index c3ae9e1d..0e9a8a16 100644
--- a/app/Action/TaskMoveColumnUnAssigned.php
+++ b/app/Action/TaskMoveColumnUnAssigned.php
@@ -61,8 +61,13 @@ class TaskMoveColumnUnAssigned extends Base
     {
         return array(
             'task_id',
-            'column_id',
-            'owner_id'
+            'task' => array(
+                'project_id',
+                'column_id',
+                'owner_id',
+                'position',
+                'swimlane_id',
+            )
         );
     }
 
@@ -75,14 +80,12 @@ class TaskMoveColumnUnAssigned extends Base
      */
     public function doAction(array $data)
     {
-        $original_task = $this->taskFinderModel->getById($data['task_id']);
-
         return $this->taskPositionModel->movePosition(
-            $data['project_id'],
+            $data['task']['project_id'],
             $data['task_id'],
             $this->getParam('dest_column_id'),
-            $original_task['position'],
-            $original_task['swimlane_id'],
+            $data['task']['position'],
+            $data['task']['swimlane_id'],
             false
         );
     }
@@ -96,6 +99,6 @@ class TaskMoveColumnUnAssigned extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $data['column_id'] == $this->getParam('src_column_id') && $data['owner_id'] == 0;
+        return $data['task']['column_id'] == $this->getParam('src_column_id') && $data['task']['owner_id'] == 0;
     }
 }
diff --git a/app/Action/TaskUpdateStartDate.php b/app/Action/TaskUpdateStartDate.php
index e5410a87..cc016da1 100644
--- a/app/Action/TaskUpdateStartDate.php
+++ b/app/Action/TaskUpdateStartDate.php
@@ -59,7 +59,10 @@ class TaskUpdateStartDate extends Base
     {
         return array(
             'task_id',
-            'column_id',
+            'task' => array(
+                'project_id',
+                'column_id',
+            ),
         );
     }
 
@@ -89,6 +92,6 @@ class TaskUpdateStartDate extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $data['column_id'] == $this->getParam('column_id');
+        return $data['task']['column_id'] == $this->getParam('column_id');
     }
 }
diff --git a/app/Core/Base.php b/app/Core/Base.php
index 6650680b..098bd880 100644
--- a/app/Core/Base.php
+++ b/app/Core/Base.php
@@ -152,6 +152,7 @@ use Pimple\Container;
  * @property \Kanboard\Core\Filter\LexerBuilder                  $projectActivityLexer
  * @property \Kanboard\Job\CommentEventJob                       $commentEventJob
  * @property \Kanboard\Job\SubtaskEventJob                       $subtaskEventJob
+ * @property \Kanboard\Job\TaskEventJob                          $taskEventJob
  * @property \Kanboard\Job\TaskFileEventJob                      $taskFileEventJob
  * @property \Kanboard\Job\ProjectFileEventJob                   $projectFileEventJob
  * @property \Kanboard\Job\NotificationJob                       $notificationJob
diff --git a/app/EventBuilder/TaskEventBuilder.php b/app/EventBuilder/TaskEventBuilder.php
new file mode 100644
index 00000000..e7a5653d
--- /dev/null
+++ b/app/EventBuilder/TaskEventBuilder.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace Kanboard\EventBuilder;
+
+use Kanboard\Event\TaskEvent;
+
+/**
+ * Class TaskEventBuilder
+ *
+ * @package Kanboard\EventBuilder
+ * @author  Frederic Guillot
+ */
+class TaskEventBuilder extends BaseEventBuilder
+{
+    /**
+     * TaskId
+     *
+     * @access protected
+     * @var int
+     */
+    protected $taskId = 0;
+
+    /**
+     * Task
+     *
+     * @access protected
+     * @var array
+     */
+    protected $task = array();
+
+    /**
+     * Extra values
+     *
+     * @access protected
+     * @var array
+     */
+    protected $values = array();
+
+    /**
+     * Changed values
+     *
+     * @access protected
+     * @var array
+     */
+    protected $changes = array();
+
+    /**
+     * Set TaskId
+     *
+     * @param  int $taskId
+     * @return $this
+     */
+    public function withTaskId($taskId)
+    {
+        $this->taskId = $taskId;
+        return $this;
+    }
+
+    /**
+     * Set task
+     *
+     * @param  array $task
+     * @return $this
+     */
+    public function withTask(array $task)
+    {
+        $this->task = $task;
+        return $this;
+    }
+
+    /**
+     * Set values
+     *
+     * @param  array $values
+     * @return $this
+     */
+    public function withValues(array $values)
+    {
+        $this->values = $values;
+        return $this;
+    }
+
+    /**
+     * Set changes
+     *
+     * @param  array $changes
+     * @return $this
+     */
+    public function withChanges(array $changes)
+    {
+        $this->changes = $changes;
+        return $this;
+    }
+
+    /**
+     * Build event data
+     *
+     * @access public
+     * @return TaskEvent|null
+     */
+    public function build()
+    {
+        $eventData = array();
+        $eventData['task_id'] = $this->taskId;
+        $eventData['task'] = $this->taskFinderModel->getDetails($this->taskId);
+
+        if (empty($eventData['task'])) {
+            $this->logger->debug(__METHOD__.': Task not found');
+            return null;
+        }
+
+        if (! empty($this->changes)) {
+            if (empty($this->task)) {
+                $this->task = $eventData['task'];
+            }
+
+            $eventData['changes'] = array_diff_assoc($this->changes, $this->task);
+            unset($eventData['changes']['date_modification']);
+        }
+
+        return new TaskEvent(array_merge($eventData, $this->values));
+    }
+}
diff --git a/app/Job/NotificationJob.php b/app/Job/NotificationJob.php
index 5a52eb31..8fb260e8 100644
--- a/app/Job/NotificationJob.php
+++ b/app/Job/NotificationJob.php
@@ -17,59 +17,27 @@ class NotificationJob extends BaseJob
      *
      * @param GenericEvent $event
      * @param string       $eventName
-     * @param string       $eventObjectName
      * @return $this
      */
-    public function withParams(GenericEvent $event, $eventName, $eventObjectName)
+    public function withParams(GenericEvent $event, $eventName)
     {
-        $this->jobParams = array($event->getAll(), $eventName, $eventObjectName);
+        $this->jobParams = array($event->getAll(), $eventName);
         return $this;
     }
 
     /**
      * Execute job
      *
-     * @param array  $event
+     * @param array  $eventData
      * @param string $eventName
-     * @param string $eventObjectName
      */
-    public function execute(array $event, $eventName, $eventObjectName)
+    public function execute(array $eventData, $eventName)
     {
-        $eventData = $this->getEventData($event, $eventObjectName);
-
-        if (! empty($eventData)) {
-            if (! empty($event['mention'])) {
-                $this->userNotificationModel->sendUserNotification($event['mention'], $eventName, $eventData);
-            } else {
-                $this->userNotificationModel->sendNotifications($eventName, $eventData);
-                $this->projectNotificationModel->sendNotifications($eventData['task']['project_id'], $eventName, $eventData);
-            }
-        }
-    }
-
-    /**
-     * Get event data
-     *
-     * @param array  $event
-     * @param string $eventObjectName
-     * @return array
-     */
-    public function getEventData(array $event, $eventObjectName)
-    {
-        $values = array();
-
-        if (! empty($event['changes'])) {
-            $values['changes'] = $event['changes'];
+        if (! empty($eventData['mention'])) {
+            $this->userNotificationModel->sendUserNotification($eventData['mention'], $eventName, $eventData);
+        } else {
+            $this->userNotificationModel->sendNotifications($eventName, $eventData);
+            $this->projectNotificationModel->sendNotifications($eventData['task']['project_id'], $eventName, $eventData);
         }
-
-        switch ($eventObjectName) {
-            case 'Kanboard\Event\TaskEvent':
-                $values['task'] = $this->taskFinderModel->getDetails($event['task_id']);
-                break;
-            default:
-                $values = $event;
-        }
-
-        return $values;
     }
 }
diff --git a/app/Job/TaskEventJob.php b/app/Job/TaskEventJob.php
new file mode 100644
index 00000000..46f7a16c
--- /dev/null
+++ b/app/Job/TaskEventJob.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Kanboard\Job;
+
+use Kanboard\Event\TaskEvent;
+use Kanboard\EventBuilder\TaskEventBuilder;
+use Kanboard\Model\TaskModel;
+
+/**
+ * Class TaskEventJob
+ *
+ * @package Kanboard\Job
+ * @author  Frederic Guillot
+ */
+class TaskEventJob extends BaseJob
+{
+    /**
+     * Set job params
+     *
+     * @param  int    $taskId
+     * @param  array  $eventNames
+     * @param  array  $changes
+     * @param  array  $values
+     * @param  array  $task
+     * @return $this
+     */
+    public function withParams($taskId, array $eventNames, array $changes = array(), array $values = array(), array $task = array())
+    {
+        $this->jobParams = array($taskId, $eventNames, $changes, $values, $task);
+        return $this;
+    }
+
+    /**
+     * Execute job
+     *
+     * @param  int    $taskId
+     * @param  array  $eventNames
+     * @param  array  $changes
+     * @param  array  $values
+     * @param  array  $task
+     * @return $this
+     */
+    public function execute($taskId, array $eventNames, array $changes = array(), array $values = array(), array $task = array())
+    {
+        $event = TaskEventBuilder::getInstance($this->container)
+            ->withTaskId($taskId)
+            ->withChanges($changes)
+            ->withValues($values)
+            ->withTask($task)
+            ->build();
+
+        if ($event !== null) {
+            foreach ($eventNames as $eventName) {
+                $this->fireEvent($eventName, $event);
+            }
+        }
+    }
+
+    /**
+     * Trigger event
+     *
+     * @access protected
+     * @param  string    $eventName
+     * @param  TaskEvent $event
+     */
+    protected function fireEvent($eventName, TaskEvent $event)
+    {
+        $this->logger->debug(__METHOD__.' Event fired: '.$eventName);
+        $this->dispatcher->dispatch($eventName, $event);
+
+        if ($eventName === TaskModel::EVENT_CREATE) {
+            $this->userMentionModel->fireEvents($event['task']['description'], TaskModel::EVENT_USER_MENTION, $event);
+        }
+    }
+}
diff --git a/app/Model/SubtaskModel.php b/app/Model/SubtaskModel.php
index 6dd1f26a..f3fc72ba 100644
--- a/app/Model/SubtaskModel.php
+++ b/app/Model/SubtaskModel.php
@@ -4,7 +4,6 @@ namespace Kanboard\Model;
 
 use PicoDb\Database;
 use Kanboard\Core\Base;
-use Kanboard\Event\SubtaskEvent;
 
 /**
  * Subtask Model
diff --git a/app/Model/TaskCreationModel.php b/app/Model/TaskCreationModel.php
index cd70a028..1c0fd7d9 100644
--- a/app/Model/TaskCreationModel.php
+++ b/app/Model/TaskCreationModel.php
@@ -3,7 +3,6 @@
 namespace Kanboard\Model;
 
 use Kanboard\Core\Base;
-use Kanboard\Event\TaskEvent;
 
 /**
  * Task Creation
@@ -42,7 +41,10 @@ class TaskCreationModel extends Base
                 $this->taskTagModel->save($values['project_id'], $task_id, $tags);
             }
 
-            $this->fireEvents($task_id, $values);
+            $this->queueManager->push($this->taskEventJob->withParams(
+                $task_id,
+                array(TaskModel::EVENT_CREATE_UPDATE, TaskModel::EVENT_CREATE)
+            ));
         }
 
         return (int) $task_id;
@@ -51,10 +53,10 @@ class TaskCreationModel extends Base
     /**
      * Prepare data
      *
-     * @access public
+     * @access protected
      * @param  array    $values    Form values
      */
-    public function prepare(array &$values)
+    protected function prepare(array &$values)
     {
         $values = $this->dateParser->convert($values, array('date_due'));
         $values = $this->dateParser->convert($values, array('date_started'), true);
@@ -84,26 +86,4 @@ class TaskCreationModel extends Base
         $values['date_moved'] = $values['date_creation'];
         $values['position'] = $this->taskFinderModel->countByColumnAndSwimlaneId($values['project_id'], $values['column_id'], $values['swimlane_id']) + 1;
     }
-
-    /**
-     * Fire events
-     *
-     * @access private
-     * @param  integer  $task_id     Task id
-     * @param  array    $values      Form values
-     */
-    private function fireEvents($task_id, array $values)
-    {
-        $event = new TaskEvent(array('task_id' => $task_id) + $values);
-
-        $this->logger->debug('Event fired: '.TaskModel::EVENT_CREATE_UPDATE);
-        $this->logger->debug('Event fired: '.TaskModel::EVENT_CREATE);
-
-        $this->dispatcher->dispatch(TaskModel::EVENT_CREATE_UPDATE, $event);
-        $this->dispatcher->dispatch(TaskModel::EVENT_CREATE, $event);
-
-        if (! empty($values['description'])) {
-            $this->userMentionModel->fireEvents($values['description'], TaskModel::EVENT_USER_MENTION, $event);
-        }
-    }
 }
diff --git a/app/Model/TaskModificationModel.php b/app/Model/TaskModificationModel.php
index be5f53c8..16b48f3d 100644
--- a/app/Model/TaskModificationModel.php
+++ b/app/Model/TaskModificationModel.php
@@ -3,7 +3,6 @@
 namespace Kanboard\Model;
 
 use Kanboard\Core\Base;
-use Kanboard\Event\TaskEvent;
 
 /**
  * Task Modification
@@ -23,14 +22,14 @@ class TaskModificationModel extends Base
      */
     public function update(array $values, $fire_events = true)
     {
-        $original_task = $this->taskFinderModel->getById($values['id']);
+        $task = $this->taskFinderModel->getById($values['id']);
 
-        $this->updateTags($values, $original_task);
+        $this->updateTags($values, $task);
         $this->prepare($values);
-        $result = $this->db->table(TaskModel::TABLE)->eq('id', $original_task['id'])->update($values);
+        $result = $this->db->table(TaskModel::TABLE)->eq('id', $task['id'])->update($values);
 
         if ($fire_events && $result) {
-            $this->fireEvents($original_task, $values);
+            $this->fireEvents($task, $values);
         }
 
         return $result;
@@ -39,43 +38,56 @@ class TaskModificationModel extends Base
     /**
      * Fire events
      *
-     * @access public
-     * @param  array     $task
-     * @param  array     $new_values
+     * @access protected
+     * @param  array $task
+     * @param  array $changes
      */
-    public function fireEvents(array $task, array $new_values)
+    protected function fireEvents(array $task, array $changes)
     {
         $events = array();
-        $event_data = array_merge($task, $new_values, array('task_id' => $task['id']));
 
-        // Values changed
-        $event_data['changes'] = array_diff_assoc($new_values, $task);
-        unset($event_data['changes']['date_modification']);
-
-        if ($this->isFieldModified('owner_id', $event_data['changes'])) {
+        if ($this->isAssigneeChanged($task, $changes)) {
             $events[] = TaskModel::EVENT_ASSIGNEE_CHANGE;
-        } elseif (! empty($event_data['changes'])) {
+        } elseif ($this->isModified($task, $changes)) {
             $events[] = TaskModel::EVENT_CREATE_UPDATE;
             $events[] = TaskModel::EVENT_UPDATE;
         }
 
-        foreach ($events as $event) {
-            $this->logger->debug('Event fired: '.$event);
-            $this->dispatcher->dispatch($event, new TaskEvent($event_data));
+        if (! empty($events)) {
+            $this->queueManager->push($this->taskEventJob
+                ->withParams($task['id'], $events, $changes, array(), $task)
+            );
         }
     }
 
+    /**
+     * Return true if the task have been modified
+     *
+     * @access protected
+     * @param  array $task
+     * @param  array $changes
+     * @return bool
+     */
+    protected function isModified(array $task, array $changes)
+    {
+        $diff = array_diff_assoc($changes, $task);
+        unset($diff['date_modification']);
+        return count($diff) > 0;
+    }
+
     /**
      * Return true if the field is the only modified value
      *
-     * @access public
-     * @param  string  $field
-     * @param  array   $changes
-     * @return boolean
+     * @access protected
+     * @param  array  $task
+     * @param  array  $changes
+     * @return bool
      */
-    public function isFieldModified($field, array $changes)
+    protected function isAssigneeChanged(array $task, array $changes)
     {
-        return isset($changes[$field]) && count($changes) === 1;
+        $diff = array_diff_assoc($changes, $task);
+        unset($diff['date_modification']);
+        return isset($changes['owner_id']) && $task['owner_id'] != $changes['owner_id'] && count($diff) === 1;
     }
 
     /**
diff --git a/app/Model/TaskPositionModel.php b/app/Model/TaskPositionModel.php
index 9fdb8f7d..d6d2a0af 100644
--- a/app/Model/TaskPositionModel.php
+++ b/app/Model/TaskPositionModel.php
@@ -3,7 +3,6 @@
 namespace Kanboard\Model;
 
 use Kanboard\Core\Base;
-use Kanboard\Event\TaskEvent;
 
 /**
  * Task Position
@@ -212,8 +211,7 @@ class TaskPositionModel extends Base
      */
     private function fireEvents(array $task, $new_column_id, $new_position, $new_swimlane_id)
     {
-        $event_data = array(
-            'task_id' => $task['id'],
+        $changes = array(
             'project_id' => $task['project_id'],
             'position' => $new_position,
             'column_id' => $new_column_id,
@@ -226,14 +224,26 @@ class TaskPositionModel extends Base
         );
 
         if ($task['swimlane_id'] != $new_swimlane_id) {
-            $this->logger->debug('Event fired: '.TaskModel::EVENT_MOVE_SWIMLANE);
-            $this->dispatcher->dispatch(TaskModel::EVENT_MOVE_SWIMLANE, new TaskEvent($event_data));
+            $this->queueManager->push($this->taskEventJob->withParams(
+                $task['id'],
+                array(TaskModel::EVENT_MOVE_SWIMLANE),
+                $changes,
+                $changes
+            ));
         } elseif ($task['column_id'] != $new_column_id) {
-            $this->logger->debug('Event fired: '.TaskModel::EVENT_MOVE_COLUMN);
-            $this->dispatcher->dispatch(TaskModel::EVENT_MOVE_COLUMN, new TaskEvent($event_data));
+            $this->queueManager->push($this->taskEventJob->withParams(
+                $task['id'],
+                array(TaskModel::EVENT_MOVE_COLUMN),
+                $changes,
+                $changes
+            ));
         } elseif ($task['position'] != $new_position) {
-            $this->logger->debug('Event fired: '.TaskModel::EVENT_MOVE_POSITION);
-            $this->dispatcher->dispatch(TaskModel::EVENT_MOVE_POSITION, new TaskEvent($event_data));
+            $this->queueManager->push($this->taskEventJob->withParams(
+                $task['id'],
+                array(TaskModel::EVENT_MOVE_POSITION),
+                $changes,
+                $changes
+            ));
         }
     }
 }
diff --git a/app/Model/TaskProjectMoveModel.php b/app/Model/TaskProjectMoveModel.php
index eda23c0b..ae3ae084 100644
--- a/app/Model/TaskProjectMoveModel.php
+++ b/app/Model/TaskProjectMoveModel.php
@@ -2,8 +2,6 @@
 
 namespace Kanboard\Model;
 
-use Kanboard\Event\TaskEvent;
-
 /**
  * Task Project Move
  *
@@ -32,9 +30,8 @@ class TaskProjectMoveModel extends TaskDuplicationModel
         $this->checkDestinationProjectValues($values);
         $this->tagDuplicationModel->syncTaskTagsToAnotherProject($task_id, $project_id);
 
-        if ($this->db->table(TaskModel::TABLE)->eq('id', $task['id'])->update($values)) {
-            $event = new TaskEvent(array_merge($task, $values, array('task_id' => $task['id'])));
-            $this->dispatcher->dispatch(TaskModel::EVENT_MOVE_PROJECT, $event);
+        if ($this->db->table(TaskModel::TABLE)->eq('id', $task_id)->update($values)) {
+            $this->queueManager->push($this->taskEventJob->withParams($task_id, array(TaskModel::EVENT_MOVE_PROJECT), $values));
         }
 
         return true;
diff --git a/app/Model/TaskStatusModel.php b/app/Model/TaskStatusModel.php
index 4d573f0e..ea304beb 100644
--- a/app/Model/TaskStatusModel.php
+++ b/app/Model/TaskStatusModel.php
@@ -3,7 +3,6 @@
 namespace Kanboard\Model;
 
 use Kanboard\Core\Base;
-use Kanboard\Event\TaskEvent;
 
 /**
  * Task Status
@@ -101,10 +100,10 @@ class TaskStatusModel extends Base
      * @param  integer   $task_id             Task id
      * @param  integer   $status              Task status
      * @param  integer   $date_completed      Timestamp
-     * @param  string    $event               Event name
+     * @param  string    $event_name          Event name
      * @return boolean
      */
-    private function changeStatus($task_id, $status, $date_completed, $event)
+    private function changeStatus($task_id, $status, $date_completed, $event_name)
     {
         if (! $this->taskFinderModel->exists($task_id)) {
             return false;
@@ -120,8 +119,7 @@ class TaskStatusModel extends Base
                         ));
 
         if ($result) {
-            $this->logger->debug('Event fired: '.$event);
-            $this->dispatcher->dispatch($event, new TaskEvent(array('task_id' => $task_id) + $this->taskFinderModel->getById($task_id)));
+            $this->queueManager->push($this->taskEventJob->withParams($task_id, array($event_name)));
         }
 
         return $result;
diff --git a/app/ServiceProvider/JobProvider.php b/app/ServiceProvider/JobProvider.php
index bfea6e6e..c7f323f1 100644
--- a/app/ServiceProvider/JobProvider.php
+++ b/app/ServiceProvider/JobProvider.php
@@ -6,6 +6,7 @@ use Kanboard\Job\CommentEventJob;
 use Kanboard\Job\NotificationJob;
 use Kanboard\Job\ProjectFileEventJob;
 use Kanboard\Job\SubtaskEventJob;
+use Kanboard\Job\TaskEventJob;
 use Kanboard\Job\TaskFileEventJob;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
@@ -35,6 +36,10 @@ class JobProvider implements ServiceProviderInterface
             return new SubtaskEventJob($c);
         });
 
+        $container['taskEventJob'] = $container->factory(function ($c) {
+            return new TaskEventJob($c);
+        });
+
         $container['taskFileEventJob'] = $container->factory(function ($c) {
             return new TaskFileEventJob($c);
         });
diff --git a/app/Subscriber/NotificationSubscriber.php b/app/Subscriber/NotificationSubscriber.php
index 0b3760c4..104927a0 100644
--- a/app/Subscriber/NotificationSubscriber.php
+++ b/app/Subscriber/NotificationSubscriber.php
@@ -3,7 +3,6 @@
 namespace Kanboard\Subscriber;
 
 use Kanboard\Event\GenericEvent;
-use Kanboard\Job\NotificationJob;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\CommentModel;
 use Kanboard\Model\SubtaskModel;
@@ -38,9 +37,6 @@ class NotificationSubscriber extends BaseSubscriber implements EventSubscriberIn
     public function handleEvent(GenericEvent $event, $eventName)
     {
         $this->logger->debug('Subscriber executed: ' . __METHOD__);
-
-        $this->queueManager->push(NotificationJob::getInstance($this->container)
-            ->withParams($event, $eventName, get_class($event))
-        );
+        $this->queueManager->push($this->notificationJob->withParams($event, $eventName));
     }
 }
diff --git a/app/Subscriber/ProjectModificationDateSubscriber.php b/app/Subscriber/ProjectModificationDateSubscriber.php
index 97923af9..1ffe0248 100644
--- a/app/Subscriber/ProjectModificationDateSubscriber.php
+++ b/app/Subscriber/ProjectModificationDateSubscriber.php
@@ -24,9 +24,7 @@ class ProjectModificationDateSubscriber extends BaseSubscriber implements EventS
 
     public function execute(GenericEvent $event)
     {
-        if (isset($event['project_id'])) {
-            $this->logger->debug('Subscriber executed: '.__METHOD__);
-            $this->projectModel->updateModificationDate($event['project_id']);
-        }
+        $this->logger->debug('Subscriber executed: '.__METHOD__);
+        $this->projectModel->updateModificationDate($event['task']['project_id']);
     }
 }
diff --git a/tests/units/Action/BaseActionTest.php b/tests/units/Action/BaseActionTest.php
index 1d50c70e..feeba3f9 100644
--- a/tests/units/Action/BaseActionTest.php
+++ b/tests/units/Action/BaseActionTest.php
@@ -23,7 +23,7 @@ class DummyAction extends Kanboard\Action\Base
 
     public function getEventRequiredParameters()
     {
-        return array('p1', 'p2');
+        return array('p1', 'p2', 'p3' => array('p4'));
     }
 
     public function doAction(array $data)
@@ -60,7 +60,7 @@ class BaseActionTest extends Base
     public function testGetEventRequiredParameters()
     {
         $dummyAction = new DummyAction($this->container);
-        $this->assertEquals(array('p1', 'p2'), $dummyAction->getEventRequiredParameters());
+        $this->assertEquals(array('p1', 'p2', 'p3' => array('p4')), $dummyAction->getEventRequiredParameters());
     }
 
     public function testGetCompatibleEvents()
@@ -113,7 +113,7 @@ class BaseActionTest extends Base
         $dummyAction = new DummyAction($this->container);
         $dummyAction->setProjectId(1234);
 
-        $this->assertTrue($dummyAction->hasRequiredParameters(array('p1' => 12, 'p2' => 34)));
+        $this->assertTrue($dummyAction->hasRequiredParameters(array('p1' => 12, 'p2' => 34, 'p3' => array('p4' => 'foobar'))));
         $this->assertFalse($dummyAction->hasRequiredParameters(array('p1' => 12)));
         $this->assertFalse($dummyAction->hasRequiredParameters(array()));
     }
@@ -125,7 +125,7 @@ class BaseActionTest extends Base
         $dummyAction->addEvent('my.event', 'My Event Overrided');
 
         $events = $dummyAction->getEvents();
-        $this->assertcount(2, $events);
+        $this->assertCount(2, $events);
         $this->assertEquals(array('my.event', 'foobar'), $events);
     }
 
@@ -136,7 +136,7 @@ class BaseActionTest extends Base
         $dummyAction->setParam('p1', 'something');
         $dummyAction->addEvent('foobar', 'FooBar');
 
-        $event = new GenericEvent(array('project_id' => 1234, 'p1' => 'something', 'p2' => 'abc'));
+        $event = new GenericEvent(array('project_id' => 1234, 'p1' => 'something', 'p2' => 'abc', 'p3' => array('p4' => 'a')));
 
         $this->assertTrue($dummyAction->execute($event, 'foobar'));
         $this->assertFalse($dummyAction->execute($event, 'foobar'));
diff --git a/tests/units/Action/CommentCreationMoveTaskColumnTest.php b/tests/units/Action/CommentCreationMoveTaskColumnTest.php
index 5eaf515e..b3d21287 100644
--- a/tests/units/Action/CommentCreationMoveTaskColumnTest.php
+++ b/tests/units/Action/CommentCreationMoveTaskColumnTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\CommentModel;
@@ -22,7 +22,7 @@ class CommentCreationMoveTaskColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array('task' => array('project_id' => 1, 'column_id' => 2), 'task_id' => 1));
 
         $action = new CommentCreationMoveTaskColumn($this->container);
         $action->setProjectId(1);
@@ -45,7 +45,7 @@ class CommentCreationMoveTaskColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array('task' => array('project_id' => 1, 'column_id' => 3), 'task_id' => 1));
 
         $action = new CommentCreationMoveTaskColumn($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskAssignCategoryColorTest.php b/tests/units/Action/TaskAssignCategoryColorTest.php
index 09c08264..5a0f7d03 100644
--- a/tests/units/Action/TaskAssignCategoryColorTest.php
+++ b/tests/units/Action/TaskAssignCategoryColorTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\CategoryModel;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
@@ -23,7 +23,13 @@ class TaskAssignCategoryColorTest extends Base
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
         $this->assertEquals(1, $categoryModel->create(array('name' => 'c1', 'project_id' => 1)));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'color_id' => 'red'));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'color_id' => 'red',
+            )
+        ));
 
         $action = new TaskAssignCategoryColor($this->container);
         $action->setProjectId(1);
@@ -47,7 +53,13 @@ class TaskAssignCategoryColorTest extends Base
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
         $this->assertEquals(1, $categoryModel->create(array('name' => 'c1', 'project_id' => 1)));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'color_id' => 'blue'));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'color_id' => 'blue',
+            )
+        ));
 
         $action = new TaskAssignCategoryColor($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskAssignCategoryLinkTest.php b/tests/units/Action/TaskAssignCategoryLinkTest.php
index 712c3c02..d7e68f72 100644
--- a/tests/units/Action/TaskAssignCategoryLinkTest.php
+++ b/tests/units/Action/TaskAssignCategoryLinkTest.php
@@ -14,19 +14,19 @@ class TaskAssignCategoryLinkTest extends Base
 {
     public function testAssignCategory()
     {
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $c = new CategoryModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $categoryModel = new CategoryModel($this->container);
 
         $action = new TaskAssignCategoryLink($this->container);
         $action->setProjectId(1);
         $action->setParam('category_id', 1);
         $action->setParam('link_id', 2);
 
-        $this->assertEquals(1, $p->create(array('name' => 'P1')));
-        $this->assertEquals(1, $c->create(array('name' => 'C1', 'project_id' => 1)));
-        $this->assertEquals(1, $tc->create(array('title' => 'T1', 'project_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
+        $this->assertEquals(1, $categoryModel->create(array('name' => 'C1', 'project_id' => 1)));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'T1', 'project_id' => 1)));
 
         $event = new TaskLinkEvent(array(
             'project_id' => 1,
@@ -37,25 +37,24 @@ class TaskAssignCategoryLinkTest extends Base
 
         $this->assertTrue($action->execute($event, TaskLinkModel::EVENT_CREATE_UPDATE));
 
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertEquals(1, $task['category_id']);
     }
 
     public function testWhenLinkDontMatch()
     {
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $c = new CategoryModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $categoryModel = new CategoryModel($this->container);
 
         $action = new TaskAssignCategoryLink($this->container);
         $action->setProjectId(1);
         $action->setParam('category_id', 1);
         $action->setParam('link_id', 1);
 
-        $this->assertEquals(1, $p->create(array('name' => 'P1')));
-        $this->assertEquals(1, $c->create(array('name' => 'C1', 'project_id' => 1)));
-        $this->assertEquals(1, $tc->create(array('title' => 'T1', 'project_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
+        $this->assertEquals(1, $categoryModel->create(array('name' => 'C1', 'project_id' => 1)));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'T1', 'project_id' => 1)));
 
         $event = new TaskLinkEvent(array(
             'project_id' => 1,
@@ -69,19 +68,19 @@ class TaskAssignCategoryLinkTest extends Base
 
     public function testThatExistingCategoryWillNotChange()
     {
-        $tc = new TaskCreationModel($this->container);
-        $p = new ProjectModel($this->container);
-        $c = new CategoryModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $categoryModel = new CategoryModel($this->container);
 
         $action = new TaskAssignCategoryLink($this->container);
         $action->setProjectId(1);
         $action->setParam('category_id', 2);
         $action->setParam('link_id', 2);
 
-        $this->assertEquals(1, $p->create(array('name' => 'P1')));
-        $this->assertEquals(1, $c->create(array('name' => 'C1', 'project_id' => 1)));
-        $this->assertEquals(2, $c->create(array('name' => 'C2', 'project_id' => 1)));
-        $this->assertEquals(1, $tc->create(array('title' => 'T1', 'project_id' => 1, 'category_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
+        $this->assertEquals(1, $categoryModel->create(array('name' => 'C1', 'project_id' => 1)));
+        $this->assertEquals(2, $categoryModel->create(array('name' => 'C2', 'project_id' => 1)));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'T1', 'project_id' => 1, 'category_id' => 1)));
 
         $event = new TaskLinkEvent(array(
             'project_id' => 1,
diff --git a/tests/units/Action/TaskAssignColorCategoryTest.php b/tests/units/Action/TaskAssignColorCategoryTest.php
index 6502035f..16ad1290 100644
--- a/tests/units/Action/TaskAssignColorCategoryTest.php
+++ b/tests/units/Action/TaskAssignColorCategoryTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\CategoryModel;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
@@ -23,7 +23,13 @@ class TaskAssignColorCategoryTest extends Base
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
         $this->assertEquals(1, $categoryModel->create(array('name' => 'c1', 'project_id' => 1)));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'category_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'category_id' => 1,
+            )
+        ));
 
         $action = new TaskAssignColorCategory($this->container);
         $action->setProjectId(1);
@@ -45,7 +51,13 @@ class TaskAssignColorCategoryTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'category_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'category_id' => 2,
+            )
+        ));
 
         $action = new TaskAssignColorCategory($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskAssignColorColumnTest.php b/tests/units/Action/TaskAssignColorColumnTest.php
index d4ba8e01..ccfb9e88 100644
--- a/tests/units/Action/TaskAssignColorColumnTest.php
+++ b/tests/units/Action/TaskAssignColorColumnTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
@@ -20,7 +20,13 @@ class TaskAssignColorColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+            )
+        ));
 
         $action = new TaskAssignColorColumn($this->container);
         $action->setProjectId(1);
@@ -42,7 +48,13 @@ class TaskAssignColorColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+            )
+        ));
 
         $action = new TaskAssignColorColumn($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskAssignColorPriorityTest.php b/tests/units/Action/TaskAssignColorPriorityTest.php
index 2fce8e66..0ea874cd 100644
--- a/tests/units/Action/TaskAssignColorPriorityTest.php
+++ b/tests/units/Action/TaskAssignColorPriorityTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\CategoryModel;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
@@ -23,7 +23,13 @@ class TaskAssignColorPriorityTest extends Base
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
         $this->assertEquals(1, $categoryModel->create(array('name' => 'c1', 'project_id' => 1)));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'priority' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'priority' => 1,
+            )
+        ));
 
         $action = new TaskAssignColorPriority($this->container);
         $action->setProjectId(1);
@@ -45,7 +51,13 @@ class TaskAssignColorPriorityTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'priority' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'priority' => 2,
+            )
+        ));
 
         $action = new TaskAssignColorPriority($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskAssignColorUserTest.php b/tests/units/Action/TaskAssignColorUserTest.php
index 370f9070..45faa3ff 100644
--- a/tests/units/Action/TaskAssignColorUserTest.php
+++ b/tests/units/Action/TaskAssignColorUserTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
@@ -20,7 +20,13 @@ class TaskAssignColorUserTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'owner_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'owner_id' => 1,
+            )
+        ));
 
         $action = new TaskAssignColorUser($this->container);
         $action->setProjectId(1);
@@ -42,7 +48,13 @@ class TaskAssignColorUserTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'owner_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'owner_id' => 2,
+            )
+        ));
 
         $action = new TaskAssignColorUser($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskAssignCurrentUserColumnTest.php b/tests/units/Action/TaskAssignCurrentUserColumnTest.php
index 6fdbda63..3b64d718 100644
--- a/tests/units/Action/TaskAssignCurrentUserColumnTest.php
+++ b/tests/units/Action/TaskAssignCurrentUserColumnTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
@@ -22,7 +22,13 @@ class TaskAssignCurrentUserColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+            )
+        ));
 
         $action = new TaskAssignCurrentUserColumn($this->container);
         $action->setProjectId(1);
@@ -45,7 +51,13 @@ class TaskAssignCurrentUserColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+            )
+        ));
 
         $action = new TaskAssignCurrentUserColumn($this->container);
         $action->setProjectId(1);
@@ -62,7 +74,13 @@ class TaskAssignCurrentUserColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+            )
+        ));
 
         $action = new TaskAssignCurrentUserColumn($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskAssignSpecificUserTest.php b/tests/units/Action/TaskAssignSpecificUserTest.php
index 78ec314f..0e63fc13 100644
--- a/tests/units/Action/TaskAssignSpecificUserTest.php
+++ b/tests/units/Action/TaskAssignSpecificUserTest.php
@@ -3,6 +3,7 @@
 require_once __DIR__.'/../Base.php';
 
 use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
@@ -20,7 +21,13 @@ class TaskAssignSpecificUserTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test', 'owner_id' => 0)));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+            )
+        ));
 
         $action = new TaskAssignSpecificUser($this->container);
         $action->setProjectId(1);
@@ -42,7 +49,13 @@ class TaskAssignSpecificUserTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+            )
+        ));
 
         $action = new TaskAssignSpecificUser($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskCloseColumnTest.php b/tests/units/Action/TaskCloseColumnTest.php
index f9a938f0..7afb0478 100644
--- a/tests/units/Action/TaskCloseColumnTest.php
+++ b/tests/units/Action/TaskCloseColumnTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
@@ -20,7 +20,13 @@ class TaskCloseColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+            )
+        ));
 
         $action = new TaskCloseColumn($this->container);
         $action->setProjectId(1);
@@ -41,7 +47,13 @@ class TaskCloseColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+            )
+        ));
 
         $action = new TaskCloseColumn($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskCloseTest.php b/tests/units/Action/TaskCloseTest.php
index 3df10cb8..589ef133 100644
--- a/tests/units/Action/TaskCloseTest.php
+++ b/tests/units/Action/TaskCloseTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
@@ -19,7 +19,12 @@ class TaskCloseTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+            )
+        ));
 
         $action = new TaskClose($this->container);
         $action->setProjectId(1);
@@ -40,7 +45,11 @@ class TaskCloseTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1));
+        $event = new TaskEvent(array(
+            'task' => array(
+                'project_id' => 1,
+            )
+        ));
 
         $action = new TaskClose($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskDuplicateAnotherProjectTest.php b/tests/units/Action/TaskDuplicateAnotherProjectTest.php
index 98ff187f..5cd0c977 100644
--- a/tests/units/Action/TaskDuplicateAnotherProjectTest.php
+++ b/tests/units/Action/TaskDuplicateAnotherProjectTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\TaskCreationModel;
@@ -21,7 +21,13 @@ class TaskDuplicateAnotherProjectTest extends Base
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+            )
+        ));
 
         $action = new TaskDuplicateAnotherProject($this->container);
         $action->setProjectId(1);
@@ -43,7 +49,13 @@ class TaskDuplicateAnotherProjectTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+            )
+        ));
 
         $action = new TaskDuplicateAnotherProject($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskEmailTest.php b/tests/units/Action/TaskEmailTest.php
index df71aaf8..421c89ca 100644
--- a/tests/units/Action/TaskEmailTest.php
+++ b/tests/units/Action/TaskEmailTest.php
@@ -2,7 +2,8 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
+use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\ProjectModel;
@@ -16,16 +17,20 @@ class TaskEmailTest extends Base
         $userModel = new UserModel($this->container);
         $projectModel = new ProjectModel($this->container);
         $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
         $this->assertTrue($userModel->update(array('id' => 1, 'email' => 'admin@localhost')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => $taskFinderModel->getDetails(1)
+        ));
 
         $action = new TaskEmail($this->container);
         $action->setProjectId(1);
-        $action->setParam('column_id', 2);
+        $action->setParam('column_id', 1);
         $action->setParam('user_id', 1);
         $action->setParam('subject', 'My email subject');
 
@@ -47,7 +52,13 @@ class TaskEmailTest extends Base
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+            )
+        ));
 
         $action = new TaskEmail($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskMoveAnotherProjectTest.php b/tests/units/Action/TaskMoveAnotherProjectTest.php
index d36df47b..a41fd03f 100644
--- a/tests/units/Action/TaskMoveAnotherProjectTest.php
+++ b/tests/units/Action/TaskMoveAnotherProjectTest.php
@@ -3,6 +3,7 @@
 require_once __DIR__.'/../Base.php';
 
 use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\TaskCreationModel;
@@ -21,7 +22,13 @@ class TaskMoveAnotherProjectTest extends Base
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+            )
+        ));
 
         $action = new TaskMoveAnotherProject($this->container);
         $action->setProjectId(1);
@@ -44,7 +51,13 @@ class TaskMoveAnotherProjectTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+            )
+        ));
 
         $action = new TaskMoveAnotherProject($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskMoveColumnAssignedTest.php b/tests/units/Action/TaskMoveColumnAssignedTest.php
index f8982969..aa9d3592 100644
--- a/tests/units/Action/TaskMoveColumnAssignedTest.php
+++ b/tests/units/Action/TaskMoveColumnAssignedTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\TaskCreationModel;
@@ -19,9 +19,12 @@ class TaskMoveColumnAssignedTest extends Base
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
-        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test', 'owner_id' => 1)));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 1, 'owner_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => $taskFinderModel->getDetails(1),
+        ));
 
         $action = new TaskMoveColumnAssigned($this->container);
         $action->setProjectId(1);
@@ -43,7 +46,14 @@ class TaskMoveColumnAssignedTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3, 'owner_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+                'owner_id' => 1,
+            )
+        ));
 
         $action = new TaskMoveColumnAssigned($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskMoveColumnCategoryChangeTest.php b/tests/units/Action/TaskMoveColumnCategoryChangeTest.php
index c42383f8..7e0856df 100644
--- a/tests/units/Action/TaskMoveColumnCategoryChangeTest.php
+++ b/tests/units/Action/TaskMoveColumnCategoryChangeTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\CategoryModel;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\TaskFinderModel;
@@ -24,7 +24,16 @@ class TaskMoveColumnCategoryChangeTest extends Base
         $this->assertEquals(1, $categoryModel->create(array('name' => 'c1', 'project_id' => 1)));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 1, 'category_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 1,
+                'category_id' => 1,
+                'position' => 1,
+                'swimlane_id' => 0,
+            )
+        ));
 
         $action = new TaskMoveColumnCategoryChange($this->container);
         $action->setProjectId(1);
@@ -50,7 +59,14 @@ class TaskMoveColumnCategoryChangeTest extends Base
         $this->assertEquals(1, $categoryModel->create(array('name' => 'c1', 'project_id' => 1)));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2, 'category_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+                'category_id' => 1,
+            )
+        ));
 
         $action = new TaskMoveColumnCategoryChange($this->container);
         $action->setProjectId(1);
@@ -72,7 +88,14 @@ class TaskMoveColumnCategoryChangeTest extends Base
         $this->assertEquals(2, $categoryModel->create(array('name' => 'c2', 'project_id' => 1)));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 1, 'category_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 1,
+                'category_id' => 2,
+            )
+        ));
 
         $action = new TaskMoveColumnCategoryChange($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskMoveColumnUnAssignedTest.php b/tests/units/Action/TaskMoveColumnUnAssignedTest.php
index befae36b..b45dec08 100644
--- a/tests/units/Action/TaskMoveColumnUnAssignedTest.php
+++ b/tests/units/Action/TaskMoveColumnUnAssignedTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\TaskCreationModel;
@@ -21,7 +21,16 @@ class TaskMoveColumnUnAssignedTest extends Base
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 1, 'owner_id' => 0));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 1,
+                'owner_id' => 0,
+                'position' => 1,
+                'swimlane_id' => 0,
+            )
+        ));
 
         $action = new TaskMoveColumnUnAssigned($this->container);
         $action->setProjectId(1);
@@ -43,7 +52,14 @@ class TaskMoveColumnUnAssignedTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2, 'owner_id' => 0));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+                'owner_id' => 0,
+            )
+        ));
 
         $action = new TaskMoveColumnUnAssigned($this->container);
         $action->setProjectId(1);
@@ -60,7 +76,14 @@ class TaskMoveColumnUnAssignedTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 1, 'owner_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 1,
+                'owner_id' => 1,
+            )
+        ));
 
         $action = new TaskMoveColumnUnAssigned($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskOpenTest.php b/tests/units/Action/TaskOpenTest.php
index 1018e2ea..825c6ac9 100644
--- a/tests/units/Action/TaskOpenTest.php
+++ b/tests/units/Action/TaskOpenTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
@@ -19,7 +19,12 @@ class TaskOpenTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test', 'is_active' => 0)));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+            )
+        ));
 
         $action = new TaskOpen($this->container);
         $action->setProjectId(1);
@@ -40,7 +45,11 @@ class TaskOpenTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1));
+        $event = new TaskEvent(array(
+            'task' => array(
+                'project_id' => 1,
+            )
+        ));
 
         $action = new TaskOpen($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskUpdateStartDateTest.php b/tests/units/Action/TaskUpdateStartDateTest.php
index ddd9eafd..8d609b3e 100644
--- a/tests/units/Action/TaskUpdateStartDateTest.php
+++ b/tests/units/Action/TaskUpdateStartDateTest.php
@@ -3,6 +3,7 @@
 require_once __DIR__.'/../Base.php';
 
 use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
@@ -20,7 +21,13 @@ class TaskUpdateStartDateTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+            )
+        ));
 
         $action = new TaskUpdateStartDate($this->container);
         $action->setProjectId(1);
@@ -41,7 +48,13 @@ class TaskUpdateStartDateTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+            )
+        ));
 
         $action = new TaskUpdateStartDate($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/EventBuilder/TaskEventBuilderTest.php b/tests/units/EventBuilder/TaskEventBuilderTest.php
new file mode 100644
index 00000000..e6334fe2
--- /dev/null
+++ b/tests/units/EventBuilder/TaskEventBuilderTest.php
@@ -0,0 +1,100 @@
+<?php
+
+use Kanboard\EventBuilder\TaskEventBuilder;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskCreationModel;
+
+require_once __DIR__.'/../Base.php';
+
+class TaskEventBuilderTest extends Base
+{
+    public function testWithMissingTask()
+    {
+        $taskEventBuilder = new TaskEventBuilder($this->container);
+        $taskEventBuilder->withTaskId(42);
+        $this->assertNull($taskEventBuilder->build());
+    }
+
+    public function testBuildWithTask()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskEventBuilder = new TaskEventBuilder($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'before', 'project_id' => 1)));
+
+        $event = $taskEventBuilder
+            ->withTaskId(1)
+            ->withTask(array('title' => 'before'))
+            ->withChanges(array('title' => 'after'))
+            ->build();
+
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+        $this->assertNotEmpty($event['task']);
+        $this->assertEquals(1, $event['task_id']);
+        $this->assertEquals(array('title' => 'after'), $event['changes']);
+    }
+
+    public function testBuildWithoutChanges()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskEventBuilder = new TaskEventBuilder($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $event = $taskEventBuilder->withTaskId(1)->build();
+
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+        $this->assertNotEmpty($event['task']);
+        $this->assertEquals(1, $event['task_id']);
+        $this->assertArrayNotHasKey('changes', $event);
+    }
+
+    public function testBuildWithChanges()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskEventBuilder = new TaskEventBuilder($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $event = $taskEventBuilder
+            ->withTaskId(1)
+            ->withChanges(array('title' => 'new title'))
+            ->build();
+
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+        $this->assertNotEmpty($event['task']);
+        $this->assertNotEmpty($event['changes']);
+        $this->assertEquals('new title', $event['changes']['title']);
+    }
+
+    public function testBuildWithChangesAndValues()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskEventBuilder = new TaskEventBuilder($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $event = $taskEventBuilder
+            ->withTaskId(1)
+            ->withChanges(array('title' => 'new title', 'project_id' => 1))
+            ->withValues(array('key' => 'value'))
+            ->build();
+
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+        $this->assertNotEmpty($event['task']);
+        $this->assertNotEmpty($event['changes']);
+        $this->assertNotEmpty($event['key']);
+        $this->assertEquals('value', $event['key']);
+
+        $this->assertCount(1, $event['changes']);
+        $this->assertEquals('new title', $event['changes']['title']);
+    }
+}
diff --git a/tests/units/Job/SubtaskEventJobTest.php b/tests/units/Job/SubtaskEventJobTest.php
index 265a8e2d..66c3db05 100644
--- a/tests/units/Job/SubtaskEventJobTest.php
+++ b/tests/units/Job/SubtaskEventJobTest.php
@@ -21,8 +21,8 @@ class SubtaskEventJobTest extends Base
     {
         $this->container['dispatcher']->addListener(SubtaskModel::EVENT_CREATE, function() {});
 
-        $SubtaskEventJob = new SubtaskEventJob($this->container);
-        $SubtaskEventJob->execute(42, SubtaskModel::EVENT_CREATE);
+        $subtaskEventJob = new SubtaskEventJob($this->container);
+        $subtaskEventJob->execute(42, SubtaskModel::EVENT_CREATE);
 
         $called = $this->container['dispatcher']->getCalledListeners();
         $this->assertEmpty($called);
diff --git a/tests/units/Job/TaskEventJobTest.php b/tests/units/Job/TaskEventJobTest.php
new file mode 100644
index 00000000..c399faad
--- /dev/null
+++ b/tests/units/Job/TaskEventJobTest.php
@@ -0,0 +1,189 @@
+<?php
+
+use Kanboard\Job\TaskEventJob;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\SwimlaneModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\TaskModificationModel;
+use Kanboard\Model\TaskPositionModel;
+use Kanboard\Model\TaskProjectMoveModel;
+use Kanboard\Model\TaskStatusModel;
+
+require_once __DIR__.'/../Base.php';
+
+class TaskEventJobTest extends Base
+{
+    public function testJobParams()
+    {
+        $taskEventJob = new TaskEventJob($this->container);
+        $taskEventJob->withParams(123, array('foobar'), array('k' => 'v'), array('k1' => 'v1'), array('k2' => 'v2'));
+
+        $this->assertSame(
+            array(123, array('foobar'), array('k' => 'v'), array('k1' => 'v1'), array('k2' => 'v2')),
+            $taskEventJob->getJobParams()
+        );
+    }
+
+    public function testWithMissingTask()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE, function() {});
+
+        $taskEventJob = new TaskEventJob($this->container);
+        $taskEventJob->execute(42, array(TaskModel::EVENT_CREATE));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertEmpty($called);
+    }
+
+    public function testTriggerCreateEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE, function() {});
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_CREATE.'.closure', $called);
+        $this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
+    }
+
+    public function testTriggerUpdateEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_UPDATE, function() {});
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'title' => 'new title')));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_UPDATE.'.closure', $called);
+        $this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
+    }
+
+    public function testTriggerAssigneeChangeEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_ASSIGNEE_CHANGE, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'owner_id' => 1)));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_ASSIGNEE_CHANGE.'.closure', $called);
+    }
+
+    public function testTriggerCloseEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CLOSE, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskStatusModel = new TaskStatusModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertTrue($taskStatusModel->close(1));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_CLOSE.'.closure', $called);
+    }
+
+    public function testTriggerOpenEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_OPEN, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskStatusModel = new TaskStatusModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertTrue($taskStatusModel->close(1));
+        $this->assertTrue($taskStatusModel->open(1));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_OPEN.'.closure', $called);
+    }
+
+    public function testTriggerMovePositionEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_POSITION, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'test 2', 'project_id' => 1)));
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 1, 2));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_POSITION.'.closure', $called);
+    }
+
+    public function testTriggerMoveColumnEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_COLUMN, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 2, 2));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_COLUMN.'.closure', $called);
+    }
+
+    public function testTriggerMoveSwimlaneEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_SWIMLANE, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $swimlaneModel = new SwimlaneModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $swimlaneModel->create(array('name' => 'S1', 'project_id' => 1)));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 1, 1, 1));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_SWIMLANE.'.closure', $called);
+    }
+
+    public function testTriggerMoveProjectEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_PROJECT, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskProjectMoveModel = new TaskProjectMoveModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
+        $this->assertTrue($taskProjectMoveModel->moveToProject(1, 1));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_PROJECT.'.closure', $called);
+    }
+}
diff --git a/tests/units/Model/TaskCreationModelTest.php b/tests/units/Model/TaskCreationModelTest.php
index f97c61dc..ce9996d9 100644
--- a/tests/units/Model/TaskCreationModelTest.php
+++ b/tests/units/Model/TaskCreationModelTest.php
@@ -17,7 +17,7 @@ class TaskCreationModelTest extends Base
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
         $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals('test', $event_data['title']);
+        $this->assertEquals('test', $event_data['task']['title']);
     }
 
     public function testNoTitle()
diff --git a/tests/units/Model/TaskModificationModelTest.php b/tests/units/Model/TaskModificationModelTest.php
index c81f968b..f70561b3 100644
--- a/tests/units/Model/TaskModificationModelTest.php
+++ b/tests/units/Model/TaskModificationModelTest.php
@@ -18,7 +18,8 @@ class TaskModificationModelTest extends Base
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
         $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals('Task #1', $event_data['title']);
+        $this->assertEquals('After', $event_data['task']['title']);
+        $this->assertEquals('After', $event_data['changes']['title']);
     }
 
     public function onUpdate($event)
@@ -28,7 +29,7 @@ class TaskModificationModelTest extends Base
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
         $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals('Task #1', $event_data['title']);
+        $this->assertEquals('After', $event_data['task']['title']);
     }
 
     public function onAssigneeChange($event)
@@ -38,7 +39,7 @@ class TaskModificationModelTest extends Base
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
         $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals(1, $event_data['owner_id']);
+        $this->assertEquals(1, $event_data['changes']['owner_id']);
     }
 
     public function testThatNoEventAreFiredWhenNoChanges()
@@ -66,19 +67,19 @@ class TaskModificationModelTest extends Base
         $taskFinderModel = new TaskFinderModel($this->container);
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
-        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Before', 'project_id' => 1)));
 
         $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, array($this, 'onCreateUpdate'));
         $this->container['dispatcher']->addListener(TaskModel::EVENT_UPDATE, array($this, 'onUpdate'));
 
-        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'title' => 'Task #1')));
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'title' => 'After')));
 
         $called = $this->container['dispatcher']->getCalledListeners();
         $this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.TaskModificationModelTest::onCreateUpdate', $called);
         $this->assertArrayHasKey(TaskModel::EVENT_UPDATE.'.TaskModificationModelTest::onUpdate', $called);
 
         $task = $taskFinderModel->getById(1);
-        $this->assertEquals('Task #1', $task['title']);
+        $this->assertEquals('After', $task['title']);
     }
 
     public function testChangeAssignee()
diff --git a/tests/units/Model/TaskPositionModelTest.php b/tests/units/Model/TaskPositionModelTest.php
new file mode 100644
index 00000000..03caf7ed
--- /dev/null
+++ b/tests/units/Model/TaskPositionModelTest.php
@@ -0,0 +1,631 @@
+<?php
+
+require_once __DIR__.'/../Base.php';
+
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\ColumnModel;
+use Kanboard\Model\TaskStatusModel;
+use Kanboard\Model\TaskPositionModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\SwimlaneModel;
+
+class TaskPositionModelTest extends Base
+{
+    public function testGetTaskProgression()
+    {
+        $taskModel = new TaskModel($this->container);
+        $taskStatusModel = new TaskStatusModel($this->container);
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $columnModel = new ColumnModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(0, $taskModel->getProgress($taskFinderModel->getById(1), $columnModel->getList(1)));
+
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 2, 1));
+        $this->assertEquals(25, $taskModel->getProgress($taskFinderModel->getById(1), $columnModel->getList(1)));
+
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 3, 1));
+        $this->assertEquals(50, $taskModel->getProgress($taskFinderModel->getById(1), $columnModel->getList(1)));
+
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 4, 1));
+        $this->assertEquals(75, $taskModel->getProgress($taskFinderModel->getById(1), $columnModel->getList(1)));
+
+        $this->assertTrue($taskStatusModel->close(1));
+        $this->assertEquals(100, $taskModel->getProgress($taskFinderModel->getById(1), $columnModel->getList(1)));
+    }
+
+    public function testMoveTaskToWrongPosition()
+    {
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
+
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
+
+        // We move the task 2 to the position 0
+        $this->assertFalse($taskPositionModel->movePosition(1, 1, 3, 0));
+
+        // Check tasks position
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(1, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertEquals(2, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(2, $task['position']);
+    }
+
+    public function testMoveTaskToGreaterPosition()
+    {
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
+
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
+
+        // We move the task 2 to the position 42
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 1, 42));
+
+        // Check tasks position
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(1, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(2, $task['position']);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertEquals(2, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+    }
+
+    public function testMoveTaskToEmptyColumn()
+    {
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
+
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
+
+        // We move the task 1 to the column 3
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 3, 1));
+
+        // Check tasks position
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(1, $task['id']);
+        $this->assertEquals(3, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertEquals(2, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+    }
+
+    public function testMoveTaskToAnotherColumn()
+    {
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
+
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(3, $taskCreationModel->create(array('title' => 'Task #3', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(4, $taskCreationModel->create(array('title' => 'Task #4', 'project_id' => 1, 'column_id' => 2)));
+        $this->assertEquals(5, $taskCreationModel->create(array('title' => 'Task #5', 'project_id' => 1, 'column_id' => 2)));
+        $this->assertEquals(6, $taskCreationModel->create(array('title' => 'Task #6', 'project_id' => 1, 'column_id' => 2)));
+        $this->assertEquals(7, $taskCreationModel->create(array('title' => 'Task #7', 'project_id' => 1, 'column_id' => 3)));
+        $this->assertEquals(8, $taskCreationModel->create(array('title' => 'Task #8', 'project_id' => 1, 'column_id' => 1)));
+
+        // We move the task 3 to the column 3
+        $this->assertTrue($taskPositionModel->movePosition(1, 3, 3, 2));
+
+        // Check tasks position
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(1, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertEquals(2, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(2, $task['position']);
+
+        $task = $taskFinderModel->getById(3);
+        $this->assertEquals(3, $task['id']);
+        $this->assertEquals(3, $task['column_id']);
+        $this->assertEquals(2, $task['position']);
+
+        $task = $taskFinderModel->getById(4);
+        $this->assertEquals(4, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+
+        $task = $taskFinderModel->getById(5);
+        $this->assertEquals(5, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(2, $task['position']);
+
+        $task = $taskFinderModel->getById(6);
+        $this->assertEquals(6, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(3, $task['position']);
+
+        $task = $taskFinderModel->getById(7);
+        $this->assertEquals(7, $task['id']);
+        $this->assertEquals(3, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+
+        $task = $taskFinderModel->getById(8);
+        $this->assertEquals(8, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(3, $task['position']);
+    }
+
+    public function testMoveTaskTop()
+    {
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(3, $taskCreationModel->create(array('title' => 'Task #3', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(4, $taskCreationModel->create(array('title' => 'Task #4', 'project_id' => 1, 'column_id' => 1)));
+
+        // Move the last task to the top
+        $this->assertTrue($taskPositionModel->movePosition(1, 4, 1, 1));
+
+        // Check tasks position
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(1, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(2, $task['position']);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertEquals(2, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(3, $task['position']);
+
+        $task = $taskFinderModel->getById(3);
+        $this->assertEquals(3, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(4, $task['position']);
+
+        $task = $taskFinderModel->getById(4);
+        $this->assertEquals(4, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+    }
+
+    public function testMoveTaskBottom()
+    {
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(3, $taskCreationModel->create(array('title' => 'Task #3', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(4, $taskCreationModel->create(array('title' => 'Task #4', 'project_id' => 1, 'column_id' => 1)));
+
+        // Move the first task to the bottom
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 1, 4));
+
+        // Check tasks position
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(1, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(4, $task['position']);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertEquals(2, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+
+        $task = $taskFinderModel->getById(3);
+        $this->assertEquals(3, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(2, $task['position']);
+
+        $task = $taskFinderModel->getById(4);
+        $this->assertEquals(4, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(3, $task['position']);
+    }
+
+    public function testMovePosition()
+    {
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->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, $taskCreationModel->create($task));
+
+                $task = $taskFinderModel->getById($counter);
+                $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($taskPositionModel->movePosition(1, 4, 2, 3));
+
+        // We check the new position of the task
+        $task = $taskFinderModel->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 = $taskFinderModel->getById(3);
+        $this->assertEquals(3, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(3, $task['position']);
+
+        $task = $taskFinderModel->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 = $taskFinderModel->getById(5);
+        $this->assertEquals(5, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(4, $task['position']);
+
+        $task = $taskFinderModel->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, $taskFinderModel->countByColumnId(1, 1));
+        $this->assertEquals($task_per_column + 1, $taskFinderModel->countByColumnId(1, 2));
+        $this->assertEquals($task_per_column, $taskFinderModel->countByColumnId(1, 3));
+        $this->assertEquals($task_per_column, $taskFinderModel->countByColumnId(1, 4));
+
+        // We move task id #1, column 1, position 1 to the column 4, position 6 (last position)
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 4, $task_per_column + 1));
+
+        // We check the new position of the task
+        $task = $taskFinderModel->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 = $taskFinderModel->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 = $taskFinderModel->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, $taskFinderModel->countByColumnId(1, 1));
+        $this->assertEquals($task_per_column + 1, $taskFinderModel->countByColumnId(1, 2));
+        $this->assertEquals($task_per_column, $taskFinderModel->countByColumnId(1, 3));
+        $this->assertEquals($task_per_column + 1, $taskFinderModel->countByColumnId(1, 4));
+
+        // Our previous moved task should stay at the same place
+        $task = $taskFinderModel->getById(4);
+        $this->assertEquals(4, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(3, $task['position']);
+
+        // Test wrong position number
+        $this->assertFalse($taskPositionModel->movePosition(1, 2, 3, 0));
+        $this->assertFalse($taskPositionModel->movePosition(1, 2, 3, -2));
+
+        // Wrong column
+        $this->assertFalse($taskPositionModel->movePosition(1, 2, 22, 2));
+
+        // Test position greater than the last position
+        $this->assertTrue($taskPositionModel->movePosition(1, 11, 1, 22));
+
+        $task = $taskFinderModel->getById(11);
+        $this->assertEquals(11, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals($taskFinderModel->countByColumnId(1, 1), $task['position']);
+
+        $task = $taskFinderModel->getById(5);
+        $this->assertEquals(5, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals($taskFinderModel->countByColumnId(1, 1) - 1, $task['position']);
+
+        $task = $taskFinderModel->getById(4);
+        $this->assertEquals(4, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(3, $task['position']);
+
+        $this->assertEquals($task_per_column - 1, $taskFinderModel->countByColumnId(1, 1));
+        $this->assertEquals($task_per_column + 1, $taskFinderModel->countByColumnId(1, 2));
+        $this->assertEquals($task_per_column - 1, $taskFinderModel->countByColumnId(1, 3));
+        $this->assertEquals($task_per_column + 1, $taskFinderModel->countByColumnId(1, 4));
+
+        // Our previous moved task should stay at the same place
+        $task = $taskFinderModel->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($taskPositionModel->movePosition(1, 14, 1, 1));
+
+        $task = $taskFinderModel->getById(14);
+        $this->assertEquals(14, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertEquals(2, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(2, $task['position']);
+
+        $this->assertEquals($task_per_column, $taskFinderModel->countByColumnId(1, 1));
+        $this->assertEquals($task_per_column + 1, $taskFinderModel->countByColumnId(1, 2));
+        $this->assertEquals($task_per_column - 2, $taskFinderModel->countByColumnId(1, 3));
+        $this->assertEquals($task_per_column + 1, $taskFinderModel->countByColumnId(1, 4));
+    }
+
+    public function testMoveTaskSwimlane()
+    {
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $swimlaneModel = new SwimlaneModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
+        $this->assertEquals(1, $swimlaneModel->create(array('project_id' => 1, 'name' => 'test 1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(3, $taskCreationModel->create(array('title' => 'Task #3', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(4, $taskCreationModel->create(array('title' => 'Task #4', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(5, $taskCreationModel->create(array('title' => 'Task #5', 'project_id' => 1, 'column_id' => 1)));
+
+        // Move the task to the swimlane
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 2, 1, 1));
+
+        // Check tasks position
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(1, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(1, $task['swimlane_id']);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertEquals(2, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(0, $task['swimlane_id']);
+
+        $task = $taskFinderModel->getById(3);
+        $this->assertEquals(3, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(2, $task['position']);
+        $this->assertEquals(0, $task['swimlane_id']);
+
+        $task = $taskFinderModel->getById(4);
+        $this->assertEquals(4, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(3, $task['position']);
+        $this->assertEquals(0, $task['swimlane_id']);
+
+        // Move the task to the swimlane
+        $this->assertTrue($taskPositionModel->movePosition(1, 2, 2, 1, 1));
+
+        // Check tasks position
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(1, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(2, $task['position']);
+        $this->assertEquals(1, $task['swimlane_id']);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertEquals(2, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(1, $task['swimlane_id']);
+
+        $task = $taskFinderModel->getById(3);
+        $this->assertEquals(3, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(0, $task['swimlane_id']);
+
+        $task = $taskFinderModel->getById(4);
+        $this->assertEquals(4, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(2, $task['position']);
+        $this->assertEquals(0, $task['swimlane_id']);
+
+        // Move the task 5 to the last column
+        $this->assertTrue($taskPositionModel->movePosition(1, 5, 4, 1, 0));
+
+        // Check tasks position
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(1, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(2, $task['position']);
+        $this->assertEquals(1, $task['swimlane_id']);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertEquals(2, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(1, $task['swimlane_id']);
+
+        $task = $taskFinderModel->getById(3);
+        $this->assertEquals(3, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(0, $task['swimlane_id']);
+
+        $task = $taskFinderModel->getById(4);
+        $this->assertEquals(4, $task['id']);
+        $this->assertEquals(1, $task['column_id']);
+        $this->assertEquals(2, $task['position']);
+        $this->assertEquals(0, $task['swimlane_id']);
+
+        $task = $taskFinderModel->getById(5);
+        $this->assertEquals(5, $task['id']);
+        $this->assertEquals(4, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(0, $task['swimlane_id']);
+    }
+
+    public function testEvents()
+    {
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $swimlaneModel = new SwimlaneModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
+        $this->assertEquals(1, $swimlaneModel->create(array('project_id' => 1, 'name' => 'test 1')));
+
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 2)));
+
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_COLUMN, array($this, 'onMoveColumn'));
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_POSITION, array($this, 'onMovePosition'));
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_SWIMLANE, array($this, 'onMoveSwimlane'));
+
+        // We move the task 1 to the column 2
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 2, 1));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(1, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertEquals(2, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(2, $task['position']);
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_COLUMN.'.TaskPositionModelTest::onMoveColumn', $called);
+        $this->assertEquals(1, count($called));
+
+        // We move the task 1 to the position 2
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 2, 2));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(1, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(2, $task['position']);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertEquals(2, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_POSITION.'.TaskPositionModelTest::onMovePosition', $called);
+        $this->assertEquals(2, count($called));
+
+        // Move to another swimlane
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 3, 1, 1));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(1, $task['id']);
+        $this->assertEquals(3, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(1, $task['swimlane_id']);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertEquals(2, $task['id']);
+        $this->assertEquals(2, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(0, $task['swimlane_id']);
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_SWIMLANE.'.TaskPositionModelTest::onMoveSwimlane', $called);
+        $this->assertEquals(3, count($called));
+    }
+
+    public function onMoveColumn($event)
+    {
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+
+        $event_data = $event->getAll();
+        $this->assertNotEmpty($event_data);
+        $this->assertEquals(1, $event_data['task_id']);
+        $this->assertEquals(1, $event_data['position']);
+        $this->assertEquals(2, $event_data['column_id']);
+        $this->assertEquals(1, $event_data['project_id']);
+    }
+
+    public function onMovePosition($event)
+    {
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+
+        $event_data = $event->getAll();
+        $this->assertNotEmpty($event_data);
+        $this->assertEquals(1, $event_data['task_id']);
+        $this->assertEquals(2, $event_data['position']);
+        $this->assertEquals(2, $event_data['column_id']);
+        $this->assertEquals(1, $event_data['project_id']);
+    }
+
+    public function onMoveSwimlane($event)
+    {
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+
+        $event_data = $event->getAll();
+        $this->assertNotEmpty($event_data);
+        $this->assertEquals(1, $event_data['task_id']);
+        $this->assertEquals(1, $event_data['position']);
+        $this->assertEquals(3, $event_data['column_id']);
+        $this->assertEquals(1, $event_data['project_id']);
+        $this->assertEquals(1, $event_data['swimlane_id']);
+    }
+}
diff --git a/tests/units/Model/TaskPositionTest.php b/tests/units/Model/TaskPositionTest.php
deleted file mode 100644
index 7ab6950e..00000000
--- a/tests/units/Model/TaskPositionTest.php
+++ /dev/null
@@ -1,631 +0,0 @@
-<?php
-
-require_once __DIR__.'/../Base.php';
-
-use Kanboard\Model\TaskModel;
-use Kanboard\Model\ColumnModel;
-use Kanboard\Model\TaskStatusModel;
-use Kanboard\Model\TaskPositionModel;
-use Kanboard\Model\TaskCreationModel;
-use Kanboard\Model\TaskFinderModel;
-use Kanboard\Model\ProjectModel;
-use Kanboard\Model\SwimlaneModel;
-
-class TaskPositionTest extends Base
-{
-    public function testGetTaskProgression()
-    {
-        $t = new TaskModel($this->container);
-        $ts = new TaskStatusModel($this->container);
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $columnModel = new ColumnModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(0, $t->getProgress($tf->getById(1), $columnModel->getList(1)));
-
-        $this->assertTrue($tp->movePosition(1, 1, 2, 1));
-        $this->assertEquals(25, $t->getProgress($tf->getById(1), $columnModel->getList(1)));
-
-        $this->assertTrue($tp->movePosition(1, 1, 3, 1));
-        $this->assertEquals(50, $t->getProgress($tf->getById(1), $columnModel->getList(1)));
-
-        $this->assertTrue($tp->movePosition(1, 1, 4, 1));
-        $this->assertEquals(75, $t->getProgress($tf->getById(1), $columnModel->getList(1)));
-
-        $this->assertTrue($ts->close(1));
-        $this->assertEquals(100, $t->getProgress($tf->getById(1), $columnModel->getList(1)));
-    }
-
-    public function testMoveTaskToWrongPosition()
-    {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
-
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
-
-        // We move the task 2 to the position 0
-        $this->assertFalse($tp->movePosition(1, 1, 3, 0));
-
-        // Check tasks position
-        $task = $tf->getById(1);
-        $this->assertEquals(1, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-
-        $task = $tf->getById(2);
-        $this->assertEquals(2, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(2, $task['position']);
-    }
-
-    public function testMoveTaskToGreaterPosition()
-    {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
-
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
-
-        // We move the task 2 to the position 42
-        $this->assertTrue($tp->movePosition(1, 1, 1, 42));
-
-        // Check tasks position
-        $task = $tf->getById(1);
-        $this->assertEquals(1, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(2, $task['position']);
-
-        $task = $tf->getById(2);
-        $this->assertEquals(2, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-    }
-
-    public function testMoveTaskToEmptyColumn()
-    {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
-
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
-
-        // We move the task 1 to the column 3
-        $this->assertTrue($tp->movePosition(1, 1, 3, 1));
-
-        // Check tasks position
-        $task = $tf->getById(1);
-        $this->assertEquals(1, $task['id']);
-        $this->assertEquals(3, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-
-        $task = $tf->getById(2);
-        $this->assertEquals(2, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-    }
-
-    public function testMoveTaskToAnotherColumn()
-    {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
-
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(3, $tc->create(array('title' => 'Task #3', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(4, $tc->create(array('title' => 'Task #4', 'project_id' => 1, 'column_id' => 2)));
-        $this->assertEquals(5, $tc->create(array('title' => 'Task #5', 'project_id' => 1, 'column_id' => 2)));
-        $this->assertEquals(6, $tc->create(array('title' => 'Task #6', 'project_id' => 1, 'column_id' => 2)));
-        $this->assertEquals(7, $tc->create(array('title' => 'Task #7', 'project_id' => 1, 'column_id' => 3)));
-        $this->assertEquals(8, $tc->create(array('title' => 'Task #8', 'project_id' => 1, 'column_id' => 1)));
-
-        // We move the task 3 to the column 3
-        $this->assertTrue($tp->movePosition(1, 3, 3, 2));
-
-        // Check tasks position
-        $task = $tf->getById(1);
-        $this->assertEquals(1, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-
-        $task = $tf->getById(2);
-        $this->assertEquals(2, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(2, $task['position']);
-
-        $task = $tf->getById(3);
-        $this->assertEquals(3, $task['id']);
-        $this->assertEquals(3, $task['column_id']);
-        $this->assertEquals(2, $task['position']);
-
-        $task = $tf->getById(4);
-        $this->assertEquals(4, $task['id']);
-        $this->assertEquals(2, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-
-        $task = $tf->getById(5);
-        $this->assertEquals(5, $task['id']);
-        $this->assertEquals(2, $task['column_id']);
-        $this->assertEquals(2, $task['position']);
-
-        $task = $tf->getById(6);
-        $this->assertEquals(6, $task['id']);
-        $this->assertEquals(2, $task['column_id']);
-        $this->assertEquals(3, $task['position']);
-
-        $task = $tf->getById(7);
-        $this->assertEquals(7, $task['id']);
-        $this->assertEquals(3, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-
-        $task = $tf->getById(8);
-        $this->assertEquals(8, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(3, $task['position']);
-    }
-
-    public function testMoveTaskTop()
-    {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(3, $tc->create(array('title' => 'Task #3', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(4, $tc->create(array('title' => 'Task #4', 'project_id' => 1, 'column_id' => 1)));
-
-        // Move the last task to the top
-        $this->assertTrue($tp->movePosition(1, 4, 1, 1));
-
-        // Check tasks position
-        $task = $tf->getById(1);
-        $this->assertEquals(1, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(2, $task['position']);
-
-        $task = $tf->getById(2);
-        $this->assertEquals(2, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(3, $task['position']);
-
-        $task = $tf->getById(3);
-        $this->assertEquals(3, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(4, $task['position']);
-
-        $task = $tf->getById(4);
-        $this->assertEquals(4, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-    }
-
-    public function testMoveTaskBottom()
-    {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(3, $tc->create(array('title' => 'Task #3', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(4, $tc->create(array('title' => 'Task #4', 'project_id' => 1, 'column_id' => 1)));
-
-        // Move the first task to the bottom
-        $this->assertTrue($tp->movePosition(1, 1, 1, 4));
-
-        // Check tasks position
-        $task = $tf->getById(1);
-        $this->assertEquals(1, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(4, $task['position']);
-
-        $task = $tf->getById(2);
-        $this->assertEquals(2, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-
-        $task = $tf->getById(3);
-        $this->assertEquals(3, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(2, $task['position']);
-
-        $task = $tf->getById(4);
-        $this->assertEquals(4, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(3, $task['position']);
-    }
-
-    public function testMovePosition()
-    {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-
-        $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, $tc->create($task));
-
-                $task = $tf->getById($counter);
-                $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($tp->movePosition(1, 4, 2, 3));
-
-        // We check the new position of the task
-        $task = $tf->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 = $tf->getById(3);
-        $this->assertEquals(3, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(3, $task['position']);
-
-        $task = $tf->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 = $tf->getById(5);
-        $this->assertEquals(5, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(4, $task['position']);
-
-        $task = $tf->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, $tf->countByColumnId(1, 1));
-        $this->assertEquals($task_per_column + 1, $tf->countByColumnId(1, 2));
-        $this->assertEquals($task_per_column, $tf->countByColumnId(1, 3));
-        $this->assertEquals($task_per_column, $tf->countByColumnId(1, 4));
-
-        // We move task id #1, column 1, position 1 to the column 4, position 6 (last position)
-        $this->assertTrue($tp->movePosition(1, 1, 4, $task_per_column + 1));
-
-        // We check the new position of the task
-        $task = $tf->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 = $tf->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 = $tf->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, $tf->countByColumnId(1, 1));
-        $this->assertEquals($task_per_column + 1, $tf->countByColumnId(1, 2));
-        $this->assertEquals($task_per_column, $tf->countByColumnId(1, 3));
-        $this->assertEquals($task_per_column + 1, $tf->countByColumnId(1, 4));
-
-        // Our previous moved task should stay at the same place
-        $task = $tf->getById(4);
-        $this->assertEquals(4, $task['id']);
-        $this->assertEquals(2, $task['column_id']);
-        $this->assertEquals(3, $task['position']);
-
-        // Test wrong position number
-        $this->assertFalse($tp->movePosition(1, 2, 3, 0));
-        $this->assertFalse($tp->movePosition(1, 2, 3, -2));
-
-        // Wrong column
-        $this->assertFalse($tp->movePosition(1, 2, 22, 2));
-
-        // Test position greater than the last position
-        $this->assertTrue($tp->movePosition(1, 11, 1, 22));
-
-        $task = $tf->getById(11);
-        $this->assertEquals(11, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals($tf->countByColumnId(1, 1), $task['position']);
-
-        $task = $tf->getById(5);
-        $this->assertEquals(5, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals($tf->countByColumnId(1, 1) - 1, $task['position']);
-
-        $task = $tf->getById(4);
-        $this->assertEquals(4, $task['id']);
-        $this->assertEquals(2, $task['column_id']);
-        $this->assertEquals(3, $task['position']);
-
-        $this->assertEquals($task_per_column - 1, $tf->countByColumnId(1, 1));
-        $this->assertEquals($task_per_column + 1, $tf->countByColumnId(1, 2));
-        $this->assertEquals($task_per_column - 1, $tf->countByColumnId(1, 3));
-        $this->assertEquals($task_per_column + 1, $tf->countByColumnId(1, 4));
-
-        // Our previous moved task should stay at the same place
-        $task = $tf->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($tp->movePosition(1, 14, 1, 1));
-
-        $task = $tf->getById(14);
-        $this->assertEquals(14, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-
-        $task = $tf->getById(2);
-        $this->assertEquals(2, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(2, $task['position']);
-
-        $this->assertEquals($task_per_column, $tf->countByColumnId(1, 1));
-        $this->assertEquals($task_per_column + 1, $tf->countByColumnId(1, 2));
-        $this->assertEquals($task_per_column - 2, $tf->countByColumnId(1, 3));
-        $this->assertEquals($task_per_column + 1, $tf->countByColumnId(1, 4));
-    }
-
-    public function testMoveTaskSwimlane()
-    {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $s = new SwimlaneModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
-        $this->assertEquals(1, $s->create(array('project_id' => 1, 'name' => 'test 1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(3, $tc->create(array('title' => 'Task #3', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(4, $tc->create(array('title' => 'Task #4', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(5, $tc->create(array('title' => 'Task #5', 'project_id' => 1, 'column_id' => 1)));
-
-        // Move the task to the swimlane
-        $this->assertTrue($tp->movePosition(1, 1, 2, 1, 1));
-
-        // Check tasks position
-        $task = $tf->getById(1);
-        $this->assertEquals(1, $task['id']);
-        $this->assertEquals(2, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(1, $task['swimlane_id']);
-
-        $task = $tf->getById(2);
-        $this->assertEquals(2, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(0, $task['swimlane_id']);
-
-        $task = $tf->getById(3);
-        $this->assertEquals(3, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(2, $task['position']);
-        $this->assertEquals(0, $task['swimlane_id']);
-
-        $task = $tf->getById(4);
-        $this->assertEquals(4, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(3, $task['position']);
-        $this->assertEquals(0, $task['swimlane_id']);
-
-        // Move the task to the swimlane
-        $this->assertTrue($tp->movePosition(1, 2, 2, 1, 1));
-
-        // Check tasks position
-        $task = $tf->getById(1);
-        $this->assertEquals(1, $task['id']);
-        $this->assertEquals(2, $task['column_id']);
-        $this->assertEquals(2, $task['position']);
-        $this->assertEquals(1, $task['swimlane_id']);
-
-        $task = $tf->getById(2);
-        $this->assertEquals(2, $task['id']);
-        $this->assertEquals(2, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(1, $task['swimlane_id']);
-
-        $task = $tf->getById(3);
-        $this->assertEquals(3, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(0, $task['swimlane_id']);
-
-        $task = $tf->getById(4);
-        $this->assertEquals(4, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(2, $task['position']);
-        $this->assertEquals(0, $task['swimlane_id']);
-
-        // Move the task 5 to the last column
-        $this->assertTrue($tp->movePosition(1, 5, 4, 1, 0));
-
-        // Check tasks position
-        $task = $tf->getById(1);
-        $this->assertEquals(1, $task['id']);
-        $this->assertEquals(2, $task['column_id']);
-        $this->assertEquals(2, $task['position']);
-        $this->assertEquals(1, $task['swimlane_id']);
-
-        $task = $tf->getById(2);
-        $this->assertEquals(2, $task['id']);
-        $this->assertEquals(2, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(1, $task['swimlane_id']);
-
-        $task = $tf->getById(3);
-        $this->assertEquals(3, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(0, $task['swimlane_id']);
-
-        $task = $tf->getById(4);
-        $this->assertEquals(4, $task['id']);
-        $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals(2, $task['position']);
-        $this->assertEquals(0, $task['swimlane_id']);
-
-        $task = $tf->getById(5);
-        $this->assertEquals(5, $task['id']);
-        $this->assertEquals(4, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(0, $task['swimlane_id']);
-    }
-
-    public function testEvents()
-    {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $s = new SwimlaneModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
-        $this->assertEquals(1, $s->create(array('project_id' => 1, 'name' => 'test 1')));
-
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 2)));
-
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_COLUMN, array($this, 'onMoveColumn'));
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_POSITION, array($this, 'onMovePosition'));
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_SWIMLANE, array($this, 'onMoveSwimlane'));
-
-        // We move the task 1 to the column 2
-        $this->assertTrue($tp->movePosition(1, 1, 2, 1));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(1, $task['id']);
-        $this->assertEquals(2, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-
-        $task = $tf->getById(2);
-        $this->assertEquals(2, $task['id']);
-        $this->assertEquals(2, $task['column_id']);
-        $this->assertEquals(2, $task['position']);
-
-        $called = $this->container['dispatcher']->getCalledListeners();
-        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_COLUMN.'.TaskPositionTest::onMoveColumn', $called);
-        $this->assertEquals(1, count($called));
-
-        // We move the task 1 to the position 2
-        $this->assertTrue($tp->movePosition(1, 1, 2, 2));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(1, $task['id']);
-        $this->assertEquals(2, $task['column_id']);
-        $this->assertEquals(2, $task['position']);
-
-        $task = $tf->getById(2);
-        $this->assertEquals(2, $task['id']);
-        $this->assertEquals(2, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-
-        $called = $this->container['dispatcher']->getCalledListeners();
-        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_POSITION.'.TaskPositionTest::onMovePosition', $called);
-        $this->assertEquals(2, count($called));
-
-        // Move to another swimlane
-        $this->assertTrue($tp->movePosition(1, 1, 3, 1, 1));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(1, $task['id']);
-        $this->assertEquals(3, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(1, $task['swimlane_id']);
-
-        $task = $tf->getById(2);
-        $this->assertEquals(2, $task['id']);
-        $this->assertEquals(2, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(0, $task['swimlane_id']);
-
-        $called = $this->container['dispatcher']->getCalledListeners();
-        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_SWIMLANE.'.TaskPositionTest::onMoveSwimlane', $called);
-        $this->assertEquals(3, count($called));
-    }
-
-    public function onMoveColumn($event)
-    {
-        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
-
-        $event_data = $event->getAll();
-        $this->assertNotEmpty($event_data);
-        $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals(1, $event_data['position']);
-        $this->assertEquals(2, $event_data['column_id']);
-        $this->assertEquals(1, $event_data['project_id']);
-    }
-
-    public function onMovePosition($event)
-    {
-        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
-
-        $event_data = $event->getAll();
-        $this->assertNotEmpty($event_data);
-        $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals(2, $event_data['position']);
-        $this->assertEquals(2, $event_data['column_id']);
-        $this->assertEquals(1, $event_data['project_id']);
-    }
-
-    public function onMoveSwimlane($event)
-    {
-        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
-
-        $event_data = $event->getAll();
-        $this->assertNotEmpty($event_data);
-        $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals(1, $event_data['position']);
-        $this->assertEquals(3, $event_data['column_id']);
-        $this->assertEquals(1, $event_data['project_id']);
-        $this->assertEquals(1, $event_data['swimlane_id']);
-    }
-}
diff --git a/tests/units/Model/TaskProjectMoveModelTest.php b/tests/units/Model/TaskProjectMoveModelTest.php
index c4282638..52f61b28 100644
--- a/tests/units/Model/TaskProjectMoveModelTest.php
+++ b/tests/units/Model/TaskProjectMoveModelTest.php
@@ -24,7 +24,7 @@ class TaskProjectMoveModelTest extends Base
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
         $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals('test', $event_data['title']);
+        $this->assertEquals('test', $event_data['task']['title']);
     }
 
     public function testMoveAnotherProject()
-- 
cgit v1.2.3