From 911be6ed00c1ece5d9ef2c16e80899bb7bffad67 Mon Sep 17 00:00:00 2001
From: i00171 <anton.delitsch@implema.se>
Date: Sun, 26 Jun 2016 18:33:23 +0200
Subject: New actionprovider that closes tasks if they are in a specific column
 and havn't been changed for X days.

---
 app/Action/TaskCloseNoActivityColumn.php | 98 ++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 app/Action/TaskCloseNoActivityColumn.php

(limited to 'app/Action')

diff --git a/app/Action/TaskCloseNoActivityColumn.php b/app/Action/TaskCloseNoActivityColumn.php
new file mode 100644
index 00000000..42043e1f
--- /dev/null
+++ b/app/Action/TaskCloseNoActivityColumn.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Kanboard\Action;
+
+use Kanboard\Model\TaskModel;
+
+/**
+ * Close automatically a task after inactive and in an defined column
+ *
+ * @package action
+ * @author  Frederic Guillot
+ */
+class TaskCloseNoActivityColumn extends Base
+{
+    /**
+     * Get automatic action description
+     *
+     * @access public
+     * @return string
+     */
+    public function getDescription()
+    {
+        return t('Close a task when there is no activity in an specific column');
+    }
+
+    /**
+     * Get the list of compatible events
+     *
+     * @access public
+     * @return array
+     */
+    public function getCompatibleEvents()
+    {
+        return array(TaskModel::EVENT_DAILY_CRONJOB);
+    }
+
+    /**
+     * Get the required parameter for the action (defined by the user)
+     *
+     * @access public
+     * @return array
+     */
+    public function getActionRequiredParameters()
+    {
+        return array(
+            'duration' => t('Duration in days'),
+			'column_id' => t('Column')
+        );
+    }
+
+    /**
+     * Get the required parameter for the event
+     *
+     * @access public
+     * @return string[]
+     */
+    public function getEventRequiredParameters()
+    {
+        return array('tasks');
+    }
+
+    /**
+     * Execute the action (close the task)
+     *
+     * @access public
+     * @param  array   $data   Event data dictionary
+     * @return bool            True if the action was executed or false when not executed
+     */
+    public function doAction(array $data)
+    {
+        $results = array();
+        $max = $this->getParam('duration') * 86400;
+
+        foreach ($data['tasks'] as $task) {
+            $duration = time() - $task['date_modification'];
+			//echo $task['column_id']; 
+			//echo $this->getParam('column_id');
+
+            if ($duration > $max && $task['column_id'] == $this->getParam('column_id')) {
+                $results[] = $this->taskStatusModel->close($task['id']);
+            }
+        }
+
+        return in_array(true, $results, true);
+    }
+
+    /**
+     * Check if the event data meet the action condition
+     *
+     * @access public
+     * @param  array   $data   Event data dictionary
+     * @return bool
+     */
+    public function hasRequiredCondition(array $data)
+    {
+        return count($data['tasks']) > 0;
+    }
+}
-- 
cgit v1.2.3


From 95b553f5bfd15749573c273354f995e62b6564a0 Mon Sep 17 00:00:00 2001
From: i00171 <anton.delitsch@implema.se>
Date: Sun, 26 Jun 2016 22:00:40 +0200
Subject: Removed old debug code.

---
 app/Action/TaskCloseNoActivityColumn.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'app/Action')

diff --git a/app/Action/TaskCloseNoActivityColumn.php b/app/Action/TaskCloseNoActivityColumn.php
index 42043e1f..7af0b7fc 100644
--- a/app/Action/TaskCloseNoActivityColumn.php
+++ b/app/Action/TaskCloseNoActivityColumn.php
@@ -44,7 +44,7 @@ class TaskCloseNoActivityColumn extends Base
     {
         return array(
             'duration' => t('Duration in days'),
-			'column_id' => t('Column')
+            'column_id' => t('Column')
         );
     }
 
@@ -73,8 +73,6 @@ class TaskCloseNoActivityColumn extends Base
 
         foreach ($data['tasks'] as $task) {
             $duration = time() - $task['date_modification'];
-			//echo $task['column_id']; 
-			//echo $this->getParam('column_id');
 
             if ($duration > $max && $task['column_id'] == $this->getParam('column_id')) {
                 $results[] = $this->taskStatusModel->close($task['id']);
-- 
cgit v1.2.3


From 3fcc0cb9183f9ff32ce7a3c615258bcf53c385ed Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 2 Jul 2016 14:44:26 -0400
Subject: Handle tags and tasks move/duplication to another project

---
 app/Action/TaskDuplicateAnotherProject.php         |   2 +-
 app/Action/TaskMoveAnotherProject.php              |   2 +-
 app/Api/Procedure/TaskProcedure.php                |   4 +-
 app/Controller/TaskDuplicationController.php       |   4 +-
 app/Core/Base.php                                  |   4 +
 app/Model/TagDuplicationModel.php                  |  67 +++
 app/Model/TaskDuplicationModel.php                 | 156 +----
 app/Model/TaskModel.php                            |   2 +-
 app/Model/TaskProjectDuplicationModel.php          |  60 ++
 app/Model/TaskProjectMoveModel.php                 |  67 +++
 app/Model/TaskRecurrenceModel.php                  |  87 +++
 app/Model/TaskTagModel.php                         |  17 +
 app/ServiceProvider/ClassProvider.php              |   4 +
 app/Subscriber/RecurringTaskSubscriber.php         |   6 +-
 tests/units/Model/TaskDuplicationTest.php          | 667 ++-------------------
 .../Model/TaskProjectDuplicationModelTest.php      | 369 ++++++++++++
 tests/units/Model/TaskProjectMoveModelTest.php     | 269 +++++++++
 tests/units/Model/TaskRecurrenceModelTest.php      |  90 +++
 tests/units/Model/TaskTagModelTest.php             |  21 +
 19 files changed, 1121 insertions(+), 777 deletions(-)
 create mode 100644 app/Model/TagDuplicationModel.php
 create mode 100644 app/Model/TaskProjectDuplicationModel.php
 create mode 100644 app/Model/TaskProjectMoveModel.php
 create mode 100644 app/Model/TaskRecurrenceModel.php
 create mode 100644 tests/units/Model/TaskProjectDuplicationModelTest.php
 create mode 100644 tests/units/Model/TaskProjectMoveModelTest.php
 create mode 100644 tests/units/Model/TaskRecurrenceModelTest.php

(limited to 'app/Action')

diff --git a/app/Action/TaskDuplicateAnotherProject.php b/app/Action/TaskDuplicateAnotherProject.php
index 1d4a2f13..d70d2ee8 100644
--- a/app/Action/TaskDuplicateAnotherProject.php
+++ b/app/Action/TaskDuplicateAnotherProject.php
@@ -76,7 +76,7 @@ class TaskDuplicateAnotherProject extends Base
     public function doAction(array $data)
     {
         $destination_column_id = $this->columnModel->getFirstColumnId($this->getParam('project_id'));
-        return (bool) $this->taskDuplicationModel->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);
     }
 
     /**
diff --git a/app/Action/TaskMoveAnotherProject.php b/app/Action/TaskMoveAnotherProject.php
index 73ad4b69..66635a63 100644
--- a/app/Action/TaskMoveAnotherProject.php
+++ b/app/Action/TaskMoveAnotherProject.php
@@ -75,7 +75,7 @@ class TaskMoveAnotherProject extends Base
      */
     public function doAction(array $data)
     {
-        return $this->taskDuplicationModel->moveToProject($data['task_id'], $this->getParam('project_id'));
+        return $this->taskProjectMoveModel->moveToProject($data['task_id'], $this->getParam('project_id'));
     }
 
     /**
diff --git a/app/Api/Procedure/TaskProcedure.php b/app/Api/Procedure/TaskProcedure.php
index 2d29a4ef..8661deef 100644
--- a/app/Api/Procedure/TaskProcedure.php
+++ b/app/Api/Procedure/TaskProcedure.php
@@ -77,13 +77,13 @@ class TaskProcedure extends BaseProcedure
     public function moveTaskToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
     {
         ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'moveTaskToProject', $project_id);
-        return $this->taskDuplicationModel->moveToProject($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id);
+        return $this->taskProjectMoveModel->moveToProject($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id);
     }
 
     public function duplicateTaskToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
     {
         ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'duplicateTaskToProject', $project_id);
-        return $this->taskDuplicationModel->duplicateToProject($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id);
+        return $this->taskProjectDuplicationModel->duplicateToProject($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id);
     }
 
     public function createTask($title, $project_id, $color_id = '', $column_id = 0, $owner_id = 0, $creator_id = 0,
diff --git a/app/Controller/TaskDuplicationController.php b/app/Controller/TaskDuplicationController.php
index 6a475374..915bf8f8 100644
--- a/app/Controller/TaskDuplicationController.php
+++ b/app/Controller/TaskDuplicationController.php
@@ -50,7 +50,7 @@ class TaskDuplicationController extends BaseController
             $values = $this->request->getValues();
             list($valid, ) = $this->taskValidator->validateProjectModification($values);
 
-            if ($valid && $this->taskDuplicationModel->moveToProject($task['id'],
+            if ($valid && $this->taskProjectMoveModel->moveToProject($task['id'],
                                                                 $values['project_id'],
                                                                 $values['swimlane_id'],
                                                                 $values['column_id'],
@@ -80,7 +80,7 @@ class TaskDuplicationController extends BaseController
             list($valid, ) = $this->taskValidator->validateProjectModification($values);
 
             if ($valid) {
-                $task_id = $this->taskDuplicationModel->duplicateToProject(
+                $task_id = $this->taskProjectDuplicationModel->duplicateToProject(
                     $task['id'], $values['project_id'], $values['swimlane_id'],
                     $values['column_id'], $values['category_id'], $values['owner_id']
                 );
diff --git a/app/Core/Base.php b/app/Core/Base.php
index eacca65d..a8274152 100644
--- a/app/Core/Base.php
+++ b/app/Core/Base.php
@@ -90,11 +90,15 @@ use Pimple\Container;
  * @property \Kanboard\Model\SubtaskModel                        $subtaskModel
  * @property \Kanboard\Model\SubtaskTimeTrackingModel            $subtaskTimeTrackingModel
  * @property \Kanboard\Model\SwimlaneModel                       $swimlaneModel
+ * @property \Kanboard\Model\TagDuplicationModel                 $tagDuplicationModel
  * @property \Kanboard\Model\TagModel                            $tagModel
  * @property \Kanboard\Model\TaskModel                           $taskModel
  * @property \Kanboard\Model\TaskAnalyticModel                   $taskAnalyticModel
  * @property \Kanboard\Model\TaskCreationModel                   $taskCreationModel
  * @property \Kanboard\Model\TaskDuplicationModel                $taskDuplicationModel
+ * @property \Kanboard\Model\TaskProjectDuplicationModel         $taskProjectDuplicationModel
+ * @property \Kanboard\Model\TaskProjectMoveModel                $taskProjectMoveModel
+ * @property \Kanboard\Model\TaskRecurrenceModel                 $taskRecurrenceModel
  * @property \Kanboard\Model\TaskExternalLinkModel               $taskExternalLinkModel
  * @property \Kanboard\Model\TaskFinderModel                     $taskFinderModel
  * @property \Kanboard\Model\TaskLinkModel                       $taskLinkModel
diff --git a/app/Model/TagDuplicationModel.php b/app/Model/TagDuplicationModel.php
new file mode 100644
index 00000000..1876391d
--- /dev/null
+++ b/app/Model/TagDuplicationModel.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Kanboard\Model;
+
+use Kanboard\Core\Base;
+
+/**
+ * Tag Duplication
+ *
+ * @package  Kanboard\Model
+ * @author   Frederic Guillot
+ */
+class TagDuplicationModel extends Base
+{
+    /**
+     * Link tags to the new tasks
+     *
+     * @access public
+     * @param  integer $src_task_id
+     * @param  integer $dst_task_id
+     * @param  integer $dst_project_id
+     */
+    public function duplicateTaskTagsToAnotherProject($src_task_id, $dst_task_id, $dst_project_id)
+    {
+        $tags = $this->taskTagModel->getTagsByTask($src_task_id);
+
+        foreach ($tags as $tag) {
+            $tag_id = $this->tagModel->getIdByName($dst_project_id, $tag['name']);
+
+            if ($tag_id) {
+                $this->taskTagModel->associateTag($dst_task_id, $tag_id);
+            }
+        }
+    }
+
+    /**
+     * Duplicate tags to the new task
+     *
+     * @access public
+     * @param  integer $src_task_id
+     * @param  integer $dst_task_id
+     */
+    public function duplicateTaskTags($src_task_id, $dst_task_id)
+    {
+        $tags = $this->taskTagModel->getTagsByTask($src_task_id);
+
+        foreach ($tags as $tag) {
+            $this->taskTagModel->associateTag($dst_task_id, $tag['id']);
+        }
+    }
+
+    /**
+     * Remove tags that are not available in destination project
+     *
+     * @access public
+     * @param  integer $task_id
+     * @param  integer $dst_project_id
+     */
+    public function syncTaskTagsToAnotherProject($task_id, $dst_project_id)
+    {
+        $tag_ids = $this->taskTagModel->getTagIdsByTaskNotAvailableInProject($task_id, $dst_project_id);
+
+        foreach ($tag_ids as $tag_id) {
+            $this->taskTagModel->dissociateTag($task_id, $tag_id);
+        }
+    }
+}
diff --git a/app/Model/TaskDuplicationModel.php b/app/Model/TaskDuplicationModel.php
index 9a4613e2..0dce891f 100644
--- a/app/Model/TaskDuplicationModel.php
+++ b/app/Model/TaskDuplicationModel.php
@@ -2,10 +2,7 @@
 
 namespace Kanboard\Model;
 
-use DateTime;
-use DateInterval;
 use Kanboard\Core\Base;
-use Kanboard\Event\TaskEvent;
 
 /**
  * Task Duplication
@@ -18,10 +15,10 @@ class TaskDuplicationModel extends Base
     /**
      * Fields to copy when duplicating a task
      *
-     * @access private
-     * @var array
+     * @access protected
+     * @var string[]
      */
-    private $fields_to_duplicate = array(
+    protected $fields_to_duplicate = array(
         'title',
         'description',
         'date_due',
@@ -49,106 +46,13 @@ class TaskDuplicationModel extends Base
      */
     public function duplicate($task_id)
     {
-        return $this->save($task_id, $this->copyFields($task_id));
-    }
-
-    /**
-     * Duplicate recurring task
-     *
-     * @access public
-     * @param  integer             $task_id      Task id
-     * @return boolean|integer                   Recurrence task id
-     */
-    public function duplicateRecurringTask($task_id)
-    {
-        $values = $this->copyFields($task_id);
-
-        if ($values['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING) {
-            $values['recurrence_parent'] = $task_id;
-            $values['column_id'] = $this->columnModel->getFirstColumnId($values['project_id']);
-            $this->calculateRecurringTaskDueDate($values);
-
-            $recurring_task_id = $this->save($task_id, $values);
-
-            if ($recurring_task_id > 0) {
-                $parent_update = $this->db
-                    ->table(TaskModel::TABLE)
-                    ->eq('id', $task_id)
-                    ->update(array(
-                        'recurrence_status' => TaskModel::RECURRING_STATUS_PROCESSED,
-                        'recurrence_child' => $recurring_task_id,
-                    ));
-
-                if ($parent_update) {
-                    return $recurring_task_id;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Duplicate a task to another project
-     *
-     * @access public
-     * @param  integer    $task_id
-     * @param  integer    $project_id
-     * @param  integer    $swimlane_id
-     * @param  integer    $column_id
-     * @param  integer    $category_id
-     * @param  integer    $owner_id
-     * @return boolean|integer
-     */
-    public function duplicateToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
-    {
-        $values = $this->copyFields($task_id);
-        $values['project_id'] = $project_id;
-        $values['column_id'] = $column_id !== null ? $column_id : $values['column_id'];
-        $values['swimlane_id'] = $swimlane_id !== null ? $swimlane_id : $values['swimlane_id'];
-        $values['category_id'] = $category_id !== null ? $category_id : $values['category_id'];
-        $values['owner_id'] = $owner_id !== null ? $owner_id : $values['owner_id'];
-
-        $this->checkDestinationProjectValues($values);
-
-        return $this->save($task_id, $values);
-    }
+        $new_task_id = $this->save($task_id, $this->copyFields($task_id));
 
-    /**
-     * Move a task to another project
-     *
-     * @access public
-     * @param  integer    $task_id
-     * @param  integer    $project_id
-     * @param  integer    $swimlane_id
-     * @param  integer    $column_id
-     * @param  integer    $category_id
-     * @param  integer    $owner_id
-     * @return boolean
-     */
-    public function moveToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
-    {
-        $task = $this->taskFinderModel->getById($task_id);
-
-        $values = array();
-        $values['is_active'] = 1;
-        $values['project_id'] = $project_id;
-        $values['column_id'] = $column_id !== null ? $column_id : $task['column_id'];
-        $values['position'] = $this->taskFinderModel->countByColumnId($project_id, $values['column_id']) + 1;
-        $values['swimlane_id'] = $swimlane_id !== null ? $swimlane_id : $task['swimlane_id'];
-        $values['category_id'] = $category_id !== null ? $category_id : $task['category_id'];
-        $values['owner_id'] = $owner_id !== null ? $owner_id : $task['owner_id'];
-
-        $this->checkDestinationProjectValues($values);
-
-        if ($this->db->table(TaskModel::TABLE)->eq('id', $task['id'])->update($values)) {
-            $this->container['dispatcher']->dispatch(
-                TaskModel::EVENT_MOVE_PROJECT,
-                new TaskEvent(array_merge($task, $values, array('task_id' => $task['id'])))
-            );
+        if ($new_task_id !== false) {
+            $this->tagDuplicationModel->duplicateTaskTags($task_id, $new_task_id);
         }
 
-        return true;
+        return $new_task_id;
     }
 
     /**
@@ -194,50 +98,14 @@ class TaskDuplicationModel extends Base
         return $values;
     }
 
-    /**
-     * Calculate new due date for new recurrence task
-     *
-     * @access public
-     * @param  array   $values   Task fields
-     */
-    public function calculateRecurringTaskDueDate(array &$values)
-    {
-        if (! empty($values['date_due']) && $values['recurrence_factor'] != 0) {
-            if ($values['recurrence_basedate'] == TaskModel::RECURRING_BASEDATE_TRIGGERDATE) {
-                $values['date_due'] = time();
-            }
-
-            $factor = abs($values['recurrence_factor']);
-            $subtract = $values['recurrence_factor'] < 0;
-
-            switch ($values['recurrence_timeframe']) {
-                case TaskModel::RECURRING_TIMEFRAME_MONTHS:
-                    $interval = 'P' . $factor . 'M';
-                    break;
-                case TaskModel::RECURRING_TIMEFRAME_YEARS:
-                    $interval = 'P' . $factor . 'Y';
-                    break;
-                default:
-                    $interval = 'P' . $factor . 'D';
-            }
-
-            $date_due = new DateTime();
-            $date_due->setTimestamp($values['date_due']);
-
-            $subtract ? $date_due->sub(new DateInterval($interval)) : $date_due->add(new DateInterval($interval));
-
-            $values['date_due'] = $date_due->getTimestamp();
-        }
-    }
-
     /**
      * Duplicate fields for the new task
      *
-     * @access private
+     * @access protected
      * @param  integer       $task_id      Task id
      * @return array
      */
-    private function copyFields($task_id)
+    protected function copyFields($task_id)
     {
         $task = $this->taskFinderModel->getById($task_id);
         $values = array();
@@ -252,16 +120,16 @@ class TaskDuplicationModel extends Base
     /**
      * Create the new task and duplicate subtasks
      *
-     * @access private
+     * @access protected
      * @param  integer            $task_id      Task id
      * @param  array              $values       Form values
      * @return boolean|integer
      */
-    private function save($task_id, array $values)
+    protected function save($task_id, array $values)
     {
         $new_task_id = $this->taskCreationModel->create($values);
 
-        if ($new_task_id) {
+        if ($new_task_id !== false) {
             $this->subtaskModel->duplicate($task_id, $new_task_id);
         }
 
diff --git a/app/Model/TaskModel.php b/app/Model/TaskModel.php
index b0e7772a..b945ee44 100644
--- a/app/Model/TaskModel.php
+++ b/app/Model/TaskModel.php
@@ -215,7 +215,7 @@ class TaskModel extends Base
         $task_ids = $this->taskFinderModel->getAllIds($src_project_id, array(TaskModel::STATUS_OPEN, TaskModel::STATUS_CLOSED));
 
         foreach ($task_ids as $task_id) {
-            if (! $this->taskDuplicationModel->duplicateToProject($task_id, $dst_project_id)) {
+            if (! $this->taskProjectDuplicationModel->duplicateToProject($task_id, $dst_project_id)) {
                 return false;
             }
         }
diff --git a/app/Model/TaskProjectDuplicationModel.php b/app/Model/TaskProjectDuplicationModel.php
new file mode 100644
index 00000000..8ebed255
--- /dev/null
+++ b/app/Model/TaskProjectDuplicationModel.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Kanboard\Model;
+
+/**
+ * Task Project Duplication
+ *
+ * @package  Kanboard\Model
+ * @author   Frederic Guillot
+ */
+class TaskProjectDuplicationModel extends TaskDuplicationModel
+{
+    /**
+     * Duplicate a task to another project
+     *
+     * @access public
+     * @param  integer    $task_id
+     * @param  integer    $project_id
+     * @param  integer    $swimlane_id
+     * @param  integer    $column_id
+     * @param  integer    $category_id
+     * @param  integer    $owner_id
+     * @return boolean|integer
+     */
+    public function duplicateToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
+    {
+        $values = $this->prepare($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id);
+        $this->checkDestinationProjectValues($values);
+        $new_task_id = $this->save($task_id, $values);
+
+        if ($new_task_id !== false) {
+            $this->tagDuplicationModel->duplicateTaskTagsToAnotherProject($task_id, $new_task_id, $project_id);
+        }
+
+        return $new_task_id;
+    }
+
+    /**
+     * Prepare values before duplication
+     *
+     * @access protected
+     * @param  integer $task_id
+     * @param  integer $project_id
+     * @param  integer $swimlane_id
+     * @param  integer $column_id
+     * @param  integer $category_id
+     * @param  integer $owner_id
+     * @return array
+     */
+    protected function prepare($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id)
+    {
+        $values = $this->copyFields($task_id);
+        $values['project_id'] = $project_id;
+        $values['column_id'] = $column_id !== null ? $column_id : $values['column_id'];
+        $values['swimlane_id'] = $swimlane_id !== null ? $swimlane_id : $values['swimlane_id'];
+        $values['category_id'] = $category_id !== null ? $category_id : $values['category_id'];
+        $values['owner_id'] = $owner_id !== null ? $owner_id : $values['owner_id'];
+        return $values;
+    }
+}
diff --git a/app/Model/TaskProjectMoveModel.php b/app/Model/TaskProjectMoveModel.php
new file mode 100644
index 00000000..7e9714d6
--- /dev/null
+++ b/app/Model/TaskProjectMoveModel.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Kanboard\Model;
+
+use Kanboard\Event\TaskEvent;
+
+/**
+ * Task Project Move
+ *
+ * @package  Kanboard\Model
+ * @author   Frederic Guillot
+ */
+class TaskProjectMoveModel extends TaskDuplicationModel
+{
+    /**
+     * Move a task to another project
+     *
+     * @access public
+     * @param  integer    $task_id
+     * @param  integer    $project_id
+     * @param  integer    $swimlane_id
+     * @param  integer    $column_id
+     * @param  integer    $category_id
+     * @param  integer    $owner_id
+     * @return boolean
+     */
+    public function moveToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
+    {
+        $task = $this->taskFinderModel->getById($task_id);
+        $values = $this->prepare($project_id, $swimlane_id, $column_id, $category_id, $owner_id, $task);
+
+        $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);
+        }
+
+        return true;
+    }
+
+    /**
+     * Prepare new task values
+     *
+     * @access protected
+     * @param  integer $project_id
+     * @param  integer $swimlane_id
+     * @param  integer $column_id
+     * @param  integer $category_id
+     * @param  integer $owner_id
+     * @param  array   $task
+     * @return array
+     */
+    protected function prepare($project_id, $swimlane_id, $column_id, $category_id, $owner_id, array $task)
+    {
+        $values = array();
+        $values['is_active'] = 1;
+        $values['project_id'] = $project_id;
+        $values['column_id'] = $column_id !== null ? $column_id : $task['column_id'];
+        $values['position'] = $this->taskFinderModel->countByColumnId($project_id, $values['column_id']) + 1;
+        $values['swimlane_id'] = $swimlane_id !== null ? $swimlane_id : $task['swimlane_id'];
+        $values['category_id'] = $category_id !== null ? $category_id : $task['category_id'];
+        $values['owner_id'] = $owner_id !== null ? $owner_id : $task['owner_id'];
+        return $values;
+    }
+}
diff --git a/app/Model/TaskRecurrenceModel.php b/app/Model/TaskRecurrenceModel.php
new file mode 100644
index 00000000..a5f2ab90
--- /dev/null
+++ b/app/Model/TaskRecurrenceModel.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Kanboard\Model;
+
+use DateInterval;
+use DateTime;
+
+/**
+ * Task Recurrence
+ *
+ * @package  Kanboard\Model
+ * @author   Frederic Guillot
+ */
+class TaskRecurrenceModel extends TaskDuplicationModel
+{
+    /**
+     * Duplicate recurring task
+     *
+     * @access public
+     * @param  integer             $task_id      Task id
+     * @return boolean|integer                   Recurrence task id
+     */
+    public function duplicateRecurringTask($task_id)
+    {
+        $values = $this->copyFields($task_id);
+
+        if ($values['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING) {
+            $values['recurrence_parent'] = $task_id;
+            $values['column_id'] = $this->columnModel->getFirstColumnId($values['project_id']);
+            $this->calculateRecurringTaskDueDate($values);
+
+            $recurring_task_id = $this->save($task_id, $values);
+
+            if ($recurring_task_id > 0) {
+                $parent_update = $this->db
+                    ->table(TaskModel::TABLE)
+                    ->eq('id', $task_id)
+                    ->update(array(
+                        'recurrence_status' => TaskModel::RECURRING_STATUS_PROCESSED,
+                        'recurrence_child' => $recurring_task_id,
+                    ));
+
+                if ($parent_update) {
+                    return $recurring_task_id;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Calculate new due date for new recurrence task
+     *
+     * @access public
+     * @param  array   $values   Task fields
+     */
+    public function calculateRecurringTaskDueDate(array &$values)
+    {
+        if (! empty($values['date_due']) && $values['recurrence_factor'] != 0) {
+            if ($values['recurrence_basedate'] == TaskModel::RECURRING_BASEDATE_TRIGGERDATE) {
+                $values['date_due'] = time();
+            }
+
+            $factor = abs($values['recurrence_factor']);
+            $subtract = $values['recurrence_factor'] < 0;
+
+            switch ($values['recurrence_timeframe']) {
+                case TaskModel::RECURRING_TIMEFRAME_MONTHS:
+                    $interval = 'P' . $factor . 'M';
+                    break;
+                case TaskModel::RECURRING_TIMEFRAME_YEARS:
+                    $interval = 'P' . $factor . 'Y';
+                    break;
+                default:
+                    $interval = 'P' . $factor . 'D';
+            }
+
+            $date_due = new DateTime();
+            $date_due->setTimestamp($values['date_due']);
+
+            $subtract ? $date_due->sub(new DateInterval($interval)) : $date_due->add(new DateInterval($interval));
+
+            $values['date_due'] = $date_due->getTimestamp();
+        }
+    }
+}
diff --git a/app/Model/TaskTagModel.php b/app/Model/TaskTagModel.php
index 2a08e867..0553cc6c 100644
--- a/app/Model/TaskTagModel.php
+++ b/app/Model/TaskTagModel.php
@@ -19,6 +19,23 @@ class TaskTagModel extends Base
      */
     const TABLE = 'task_has_tags';
 
+    /**
+     * Get all tags not available in a project
+     *
+     * @access public
+     * @param  integer $task_id
+     * @param  integer $project_id
+     * @return array
+     */
+    public function getTagIdsByTaskNotAvailableInProject($task_id, $project_id)
+    {
+        return $this->db->table(TagModel::TABLE)
+            ->eq(self::TABLE.'.task_id', $task_id)
+            ->notIn(TagModel::TABLE.'.project_id', array(0, $project_id))
+            ->join(self::TABLE, 'tag_id', 'id')
+            ->findAllByColumn(TagModel::TABLE.'.id');
+    }
+
     /**
      * Get all tags associated to a task
      *
diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
index c0fb93bd..1f584fca 100644
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -60,11 +60,15 @@ class ClassProvider implements ServiceProviderInterface
             'SubtaskModel',
             'SubtaskTimeTrackingModel',
             'SwimlaneModel',
+            'TagDuplicationModel',
             'TagModel',
             'TaskModel',
             'TaskAnalyticModel',
             'TaskCreationModel',
             'TaskDuplicationModel',
+            'TaskProjectDuplicationModel',
+            'TaskProjectMoveModel',
+            'TaskRecurrenceModel',
             'TaskExternalLinkModel',
             'TaskFinderModel',
             'TaskFileModel',
diff --git a/app/Subscriber/RecurringTaskSubscriber.php b/app/Subscriber/RecurringTaskSubscriber.php
index 75b7ff76..21cd3996 100644
--- a/app/Subscriber/RecurringTaskSubscriber.php
+++ b/app/Subscriber/RecurringTaskSubscriber.php
@@ -22,9 +22,9 @@ class RecurringTaskSubscriber extends BaseSubscriber implements EventSubscriberI
 
         if ($event['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING) {
             if ($event['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_FIRST_COLUMN && $this->columnModel->getFirstColumnId($event['project_id']) == $event['src_column_id']) {
-                $this->taskDuplicationModel->duplicateRecurringTask($event['task_id']);
+                $this->taskRecurrenceModel->duplicateRecurringTask($event['task_id']);
             } elseif ($event['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_LAST_COLUMN && $this->columnModel->getLastColumnId($event['project_id']) == $event['dst_column_id']) {
-                $this->taskDuplicationModel->duplicateRecurringTask($event['task_id']);
+                $this->taskRecurrenceModel->duplicateRecurringTask($event['task_id']);
             }
         }
     }
@@ -34,7 +34,7 @@ class RecurringTaskSubscriber extends BaseSubscriber implements EventSubscriberI
         $this->logger->debug('Subscriber executed: '.__METHOD__);
 
         if ($event['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING && $event['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_CLOSE) {
-            $this->taskDuplicationModel->duplicateRecurringTask($event['task_id']);
+            $this->taskRecurrenceModel->duplicateRecurringTask($event['task_id']);
         }
     }
 }
diff --git a/tests/units/Model/TaskDuplicationTest.php b/tests/units/Model/TaskDuplicationTest.php
index 79b75e54..7ce851d0 100644
--- a/tests/units/Model/TaskDuplicationTest.php
+++ b/tests/units/Model/TaskDuplicationTest.php
@@ -2,31 +2,27 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Core\DateParser;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskDuplicationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
-use Kanboard\Model\ProjectUserRoleModel;
 use Kanboard\Model\CategoryModel;
-use Kanboard\Model\UserModel;
-use Kanboard\Model\SwimlaneModel;
-use Kanboard\Core\Security\Role;
+use Kanboard\Model\TaskTagModel;
 
 class TaskDuplicationTest extends Base
 {
     public function testThatDuplicateDefineCreator()
     {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
+        $taskDuplicationModel = new TaskDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
 
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertNotEmpty($task);
         $this->assertEquals(1, $task['position']);
         $this->assertEquals(1, $task['project_id']);
@@ -35,37 +31,41 @@ class TaskDuplicationTest extends Base
         $this->container['sessionStorage']->user = array('id' => 1);
 
         // We duplicate our task
-        $this->assertEquals(2, $td->duplicate(1));
+        $this->assertEquals(2, $taskDuplicationModel->duplicate(1));
 
         // Check the values of the duplicated task
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertNotEmpty($task);
         $this->assertEquals(1, $task['creator_id']);
     }
 
     public function testDuplicateSameProject()
     {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $c = new CategoryModel($this->container);
+        $taskDuplicationModel = new TaskDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $categoryModel = new CategoryModel($this->container);
 
         // We create a task and a project
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
 
         // Some categories
-        $this->assertNotFalse($c->create(array('name' => 'Category #1', 'project_id' => 1)));
-        $this->assertNotFalse($c->create(array('name' => 'Category #2', 'project_id' => 1)));
-        $this->assertTrue($c->exists(1));
-        $this->assertTrue($c->exists(2));
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #1', 'project_id' => 1)));
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #2', 'project_id' => 1)));
+        $this->assertTrue($categoryModel->exists(1));
+        $this->assertTrue($categoryModel->exists(2));
 
-        $this->assertEquals(
-            1,
-            $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1, 'category_id' => 2, 'time_spent' => 4.4)
-        ));
+        $this->assertEquals(1, $taskCreationModel->create(array(
+            'title' => 'test',
+            'project_id' => 1,
+            'column_id' => 3,
+            'owner_id' => 1,
+            'category_id' => 2,
+            'time_spent' => 4.4
+        )));
 
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertNotEmpty($task);
         $this->assertEquals(1, $task['position']);
         $this->assertEquals(1, $task['project_id']);
@@ -77,14 +77,14 @@ class TaskDuplicationTest extends Base
         $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE, function () {});
 
         // We duplicate our task
-        $this->assertEquals(2, $td->duplicate(1));
+        $this->assertEquals(2, $taskDuplicationModel->duplicate(1));
 
         $called = $this->container['dispatcher']->getCalledListeners();
         $this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
         $this->assertArrayHasKey(TaskModel::EVENT_CREATE.'.closure', $called);
 
         // Check the values of the duplicated task
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertNotEmpty($task);
         $this->assertEquals(TaskModel::STATUS_OPEN, $task['is_active']);
         $this->assertEquals(1, $task['project_id']);
@@ -97,604 +97,25 @@ class TaskDuplicationTest extends Base
         $this->assertEquals(0, $task['time_spent']);
     }
 
-    public function testDuplicateAnotherProject()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $c = new CategoryModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($c->create(array('name' => 'Category #1', 'project_id' => 1)));
-        $this->assertTrue($c->exists(1));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 1, 'category_id' => 1)));
-
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, function () {});
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE, function () {});
-
-        // We duplicate our task to the 2nd project
-        $this->assertEquals(2, $td->duplicateToProject(1, 2));
-
-        $called = $this->container['dispatcher']->getCalledListeners();
-        $this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
-        $this->assertArrayHasKey(TaskModel::EVENT_CREATE.'.closure', $called);
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(0, $task['category_id']);
-        $this->assertEquals(0, $task['swimlane_id']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals('test', $task['title']);
-    }
-
-    public function testDuplicateAnotherProjectWithCategory()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $c = new CategoryModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($c->create(array('name' => 'Category #1', 'project_id' => 1)));
-        $this->assertNotFalse($c->create(array('name' => 'Category #1', 'project_id' => 2)));
-        $this->assertTrue($c->exists(1));
-        $this->assertTrue($c->exists(2));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'category_id' => 1)));
-
-        // We duplicate our task to the 2nd project
-        $this->assertEquals(2, $td->duplicateToProject(1, 2));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(2, $task['category_id']);
-        $this->assertEquals(0, $task['swimlane_id']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals('test', $task['title']);
-    }
-
-    public function testDuplicateAnotherProjectWithPredefinedCategory()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $c = new CategoryModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($c->create(array('name' => 'Category #1', 'project_id' => 1)));
-        $this->assertNotFalse($c->create(array('name' => 'Category #1', 'project_id' => 2)));
-        $this->assertNotFalse($c->create(array('name' => 'Category #2', 'project_id' => 2)));
-        $this->assertTrue($c->exists(1));
-        $this->assertTrue($c->exists(2));
-        $this->assertTrue($c->exists(3));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'category_id' => 1)));
-
-        // We duplicate our task to the 2nd project with no category
-        $this->assertEquals(2, $td->duplicateToProject(1, 2, null, null, 0));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['category_id']);
-
-        // We duplicate our task to the 2nd project with a different category
-        $this->assertEquals(3, $td->duplicateToProject(1, 2, null, null, 3));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(3);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(3, $task['category_id']);
-    }
-
-    public function testDuplicateAnotherProjectWithSwimlane()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $s = new SwimlaneModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($s->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
-        $this->assertNotFalse($s->create(array('project_id' => 2, 'name' => 'Swimlane #1')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
-
-        // We duplicate our task to the 2nd project
-        $this->assertEquals(2, $td->duplicateToProject(1, 2));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(0, $task['category_id']);
-        $this->assertEquals(2, $task['swimlane_id']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals('test', $task['title']);
-    }
-
-    public function testDuplicateAnotherProjectWithoutSwimlane()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $s = new SwimlaneModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($s->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
-        $this->assertNotFalse($s->create(array('project_id' => 2, 'name' => 'Swimlane #2')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
-
-        // We duplicate our task to the 2nd project
-        $this->assertEquals(2, $td->duplicateToProject(1, 2));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(0, $task['category_id']);
-        $this->assertEquals(0, $task['swimlane_id']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals('test', $task['title']);
-    }
-
-    public function testDuplicateAnotherProjectWithPredefinedSwimlane()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $s = new SwimlaneModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($s->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
-        $this->assertNotFalse($s->create(array('project_id' => 2, 'name' => 'Swimlane #1')));
-        $this->assertNotFalse($s->create(array('project_id' => 2, 'name' => 'Swimlane #2')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
-
-        // We duplicate our task to the 2nd project
-        $this->assertEquals(2, $td->duplicateToProject(1, 2, 3));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(3, $task['swimlane_id']);
-    }
-
-    public function testDuplicateAnotherProjectWithPredefinedColumn()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2)));
-
-        // We duplicate our task to the 2nd project with a different column
-        $this->assertEquals(2, $td->duplicateToProject(1, 2, null, 7));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(7, $task['column_id']);
-    }
-
-    public function testDuplicateAnotherProjectWithUser()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $pp = new ProjectUserRoleModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 2)));
-
-        // We duplicate our task to the 2nd project
-        $this->assertEquals(2, $td->duplicateToProject(1, 2));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals('test', $task['title']);
-
-        // We create a new user for our project
-        $user = new UserModel($this->container);
-        $this->assertNotFalse($user->create(array('username' => 'unittest#1', 'password' => 'unittest')));
-        $this->assertTrue($pp->addUser(1, 2, Role::PROJECT_MEMBER));
-        $this->assertTrue($pp->addUser(2, 2, Role::PROJECT_MEMBER));
-
-        // We duplicate our task to the 2nd project
-        $this->assertEquals(3, $td->duplicateToProject(1, 2));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(3);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(2, $task['position']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(2, $task['owner_id']);
-        $this->assertEquals(2, $task['project_id']);
-
-        // We duplicate a task with a not allowed user
-        $this->assertEquals(4, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 3)));
-        $this->assertEquals(5, $td->duplicateToProject(4, 2));
-
-        $task = $tf->getById(5);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals(5, $task['column_id']);
-    }
-
-    public function testDuplicateAnotherProjectWithPredefinedUser()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $pr = new ProjectUserRoleModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 2)));
-        $this->assertTrue($pr->addUser(2, 1, Role::PROJECT_MEMBER));
-
-        // We duplicate our task to the 2nd project
-        $this->assertEquals(2, $td->duplicateToProject(1, 2, null, null, null, 1));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(1, $task['owner_id']);
-    }
-
-    public function onMoveProject($event)
-    {
-        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
-
-        $event_data = $event->getAll();
-        $this->assertNotEmpty($event_data);
-        $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals('test', $event_data['title']);
-    }
-
-    public function testMoveAnotherProject()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $user = new UserModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'owner_id' => 1, 'category_id' => 10, 'position' => 333)));
-
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_PROJECT, array($this, 'onMoveProject'));
-
-        // We duplicate our task to the 2nd project
-        $this->assertTrue($td->moveToProject(1, 2));
-
-        $called = $this->container['dispatcher']->getCalledListeners();
-        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_PROJECT.'.TaskDuplicationTest::onMoveProject', $called);
-
-        // Check the values of the moved task
-        $task = $tf->getById(1);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(0, $task['category_id']);
-        $this->assertEquals(0, $task['swimlane_id']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals(5, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals('test', $task['title']);
-    }
-
-    public function testMoveAnotherProjectWithCategory()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $c = new CategoryModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($c->create(array('name' => 'Category #1', 'project_id' => 1)));
-        $this->assertNotFalse($c->create(array('name' => 'Category #1', 'project_id' => 2)));
-        $this->assertTrue($c->exists(1));
-        $this->assertTrue($c->exists(2));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'category_id' => 1)));
-
-        // We move our task to the 2nd project
-        $this->assertTrue($td->moveToProject(1, 2));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(1);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(2, $task['category_id']);
-        $this->assertEquals(0, $task['swimlane_id']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals('test', $task['title']);
-    }
-
-    public function testMoveAnotherProjectWithUser()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $pp = new ProjectUserRoleModel($this->container);
-        $user = new UserModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        // We create a new user for our project
-        $this->assertNotFalse($user->create(array('username' => 'unittest#1', 'password' => 'unittest')));
-        $this->assertTrue($pp->addUser(1, 2, Role::PROJECT_MEMBER));
-        $this->assertTrue($pp->addUser(2, 2, Role::PROJECT_MEMBER));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 2)));
-
-        // We move our task to the 2nd project
-        $this->assertTrue($td->moveToProject(1, 2));
-
-        // Check the values of the moved task
-        $task = $tf->getById(1);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['owner_id']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals(6, $task['column_id']);
-    }
-
-    public function testMoveAnotherProjectWithForbiddenUser()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $pp = new ProjectUserRoleModel($this->container);
-        $user = new UserModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        // We create a new user for our project
-        $this->assertNotFalse($user->create(array('username' => 'unittest#1', 'password' => 'unittest')));
-        $this->assertTrue($pp->addUser(1, 2, Role::PROJECT_MEMBER));
-        $this->assertTrue($pp->addUser(2, 2, Role::PROJECT_MEMBER));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 3)));
-
-        // We move our task to the 2nd project
-        $this->assertTrue($td->moveToProject(1, 2));
-
-        // Check the values of the moved task
-        $task = $tf->getById(1);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals(6, $task['column_id']);
-    }
-
-    public function testMoveAnotherProjectWithSwimlane()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $s = new SwimlaneModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($s->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
-        $this->assertNotFalse($s->create(array('project_id' => 2, 'name' => 'Swimlane #1')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
-
-        // We move our task to the 2nd project
-        $this->assertTrue($td->moveToProject(1, 2));
-
-        // Check the values of the moved task
-        $task = $tf->getById(1);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(0, $task['category_id']);
-        $this->assertEquals(2, $task['swimlane_id']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals('test', $task['title']);
-    }
-
-    public function testMoveAnotherProjectWithoutSwimlane()
+    public function testDuplicateSameProjectWitTags()
     {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $s = new SwimlaneModel($this->container);
+        $taskDuplicationModel = new TaskDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
 
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($s->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
-        $this->assertNotFalse($s->create(array('project_id' => 2, 'name' => 'Swimlane #2')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
-
-        // We move our task to the 2nd project
-        $this->assertTrue($td->moveToProject(1, 2));
-
-        // Check the values of the moved task
-        $task = $tf->getById(1);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(0, $task['category_id']);
-        $this->assertEquals(0, $task['swimlane_id']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals('test', $task['title']);
-    }
-
-    public function testCalculateRecurringTaskDueDate()
-    {
-        $td = new TaskDuplicationModel($this->container);
-
-        $values = array('date_due' => 0);
-        $td->calculateRecurringTaskDueDate($values);
-        $this->assertEquals(0, $values['date_due']);
-
-        $values = array('date_due' => 0, 'recurrence_factor' => 0, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_TRIGGERDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
-        $td->calculateRecurringTaskDueDate($values);
-        $this->assertEquals(0, $values['date_due']);
-
-        $values = array('date_due' => 1431291376, 'recurrence_factor' => 1, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_TRIGGERDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
-        $td->calculateRecurringTaskDueDate($values);
-        $this->assertEquals(time() + 86400, $values['date_due'], '', 1);
-
-        $values = array('date_due' => 1431291376, 'recurrence_factor' => -2, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_TRIGGERDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
-        $td->calculateRecurringTaskDueDate($values);
-        $this->assertEquals(time() - 2 * 86400, $values['date_due'], '', 1);
-
-        $values = array('date_due' => 1431291376, 'recurrence_factor' => 1, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_DUEDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
-        $td->calculateRecurringTaskDueDate($values);
-        $this->assertEquals(1431291376 + 86400, $values['date_due'], '', 1);
-
-        $values = array('date_due' => 1431291376, 'recurrence_factor' => -1, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_DUEDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
-        $td->calculateRecurringTaskDueDate($values);
-        $this->assertEquals(1431291376 - 86400, $values['date_due'], '', 1);
-
-        $values = array('date_due' => 1431291376, 'recurrence_factor' => 2, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_DUEDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_MONTHS);
-        $td->calculateRecurringTaskDueDate($values);
-        $this->assertEquals(1436561776, $values['date_due'], '', 1);
-
-        $values = array('date_due' => 1431291376, 'recurrence_factor' => 2, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_DUEDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_YEARS);
-        $td->calculateRecurringTaskDueDate($values);
-        $this->assertEquals(1494449776, $values['date_due'], '', 1);
-    }
-
-    public function testDuplicateRecurringTask()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $dp = new DateParser($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-
-        $this->assertEquals(1, $tc->create(array(
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array(
             'title' => 'test',
             'project_id' => 1,
-            'date_due' => 1436561776,
-            'recurrence_status' => TaskModel::RECURRING_STATUS_PENDING,
-            'recurrence_trigger' => TaskModel::RECURRING_TRIGGER_CLOSE,
-            'recurrence_factor' => 2,
-            'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS,
-            'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_TRIGGERDATE,
+            'tags' => array('T1', 'T2')
         )));
 
-        $this->assertEquals(2, $td->duplicateRecurringTask(1));
+        $this->assertEquals(2, $taskDuplicationModel->duplicate(1));
 
-        $task = $tf->getById(1);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(TaskModel::RECURRING_STATUS_PROCESSED, $task['recurrence_status']);
-        $this->assertEquals(2, $task['recurrence_child']);
-        $this->assertEquals(1436486400, $task['date_due'], '', 2);
-
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(TaskModel::RECURRING_STATUS_PENDING, $task['recurrence_status']);
-        $this->assertEquals(TaskModel::RECURRING_TRIGGER_CLOSE, $task['recurrence_trigger']);
-        $this->assertEquals(TaskModel::RECURRING_TIMEFRAME_DAYS, $task['recurrence_timeframe']);
-        $this->assertEquals(TaskModel::RECURRING_BASEDATE_TRIGGERDATE, $task['recurrence_basedate']);
-        $this->assertEquals(1, $task['recurrence_parent']);
-        $this->assertEquals(2, $task['recurrence_factor']);
-        $this->assertEquals($dp->removeTimeFromTimestamp(strtotime('+2 days')), $task['date_due'], '', 2);
+        $tags = $taskTagModel->getList(2);
+        $this->assertCount(2, $tags);
+        $this->assertArrayHasKey(1, $tags);
+        $this->assertArrayHasKey(2, $tags);
     }
 }
diff --git a/tests/units/Model/TaskProjectDuplicationModelTest.php b/tests/units/Model/TaskProjectDuplicationModelTest.php
new file mode 100644
index 00000000..798257ba
--- /dev/null
+++ b/tests/units/Model/TaskProjectDuplicationModelTest.php
@@ -0,0 +1,369 @@
+<?php
+
+require_once __DIR__.'/../Base.php';
+
+use Kanboard\Core\Security\Role;
+use Kanboard\Model\CategoryModel;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\ProjectUserRoleModel;
+use Kanboard\Model\SwimlaneModel;
+use Kanboard\Model\TagModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\TaskProjectDuplicationModel;
+use Kanboard\Model\TaskTagModel;
+use Kanboard\Model\UserModel;
+
+class TaskProjectDuplicationModelTest extends Base
+{
+    public function testDuplicateAnotherProject()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $categoryModel = new CategoryModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #1', 'project_id' => 1)));
+        $this->assertTrue($categoryModel->exists(1));
+
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 1, 'category_id' => 1)));
+
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, function () {});
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE, function () {});
+
+        // We duplicate our task to the 2nd project
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
+        $this->assertArrayHasKey(TaskModel::EVENT_CREATE.'.closure', $called);
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(0, $task['category_id']);
+        $this->assertEquals(0, $task['swimlane_id']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals('test', $task['title']);
+    }
+
+    public function testDuplicateAnotherProjectWithCategory()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $categoryModel = new CategoryModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #1', 'project_id' => 1)));
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #1', 'project_id' => 2)));
+        $this->assertTrue($categoryModel->exists(1));
+        $this->assertTrue($categoryModel->exists(2));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'category_id' => 1)));
+
+        // We duplicate our task to the 2nd project
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(2, $task['category_id']);
+        $this->assertEquals(0, $task['swimlane_id']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals('test', $task['title']);
+    }
+
+    public function testDuplicateAnotherProjectWithPredefinedCategory()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $categoryModel = new CategoryModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #1', 'project_id' => 1)));
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #1', 'project_id' => 2)));
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #2', 'project_id' => 2)));
+        $this->assertTrue($categoryModel->exists(1));
+        $this->assertTrue($categoryModel->exists(2));
+        $this->assertTrue($categoryModel->exists(3));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'category_id' => 1)));
+
+        // We duplicate our task to the 2nd project with no category
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2, null, null, 0));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['category_id']);
+
+        // We duplicate our task to the 2nd project with a different category
+        $this->assertEquals(3, $taskProjectDuplicationModel->duplicateToProject(1, 2, null, null, 3));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(3);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(3, $task['category_id']);
+    }
+
+    public function testDuplicateAnotherProjectWithSwimlane()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $swimlaneModel = new SwimlaneModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 2, 'name' => 'Swimlane #1')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
+
+        // We duplicate our task to the 2nd project
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(0, $task['category_id']);
+        $this->assertEquals(2, $task['swimlane_id']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals('test', $task['title']);
+    }
+
+    public function testDuplicateAnotherProjectWithoutSwimlane()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $swimlaneModel = new SwimlaneModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 2, 'name' => 'Swimlane #2')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
+
+        // We duplicate our task to the 2nd project
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(0, $task['category_id']);
+        $this->assertEquals(0, $task['swimlane_id']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals('test', $task['title']);
+    }
+
+    public function testDuplicateAnotherProjectWithPredefinedSwimlane()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $swimlaneModel = new SwimlaneModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 2, 'name' => 'Swimlane #1')));
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 2, 'name' => 'Swimlane #2')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
+
+        // We duplicate our task to the 2nd project
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2, 3));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(3, $task['swimlane_id']);
+    }
+
+    public function testDuplicateAnotherProjectWithPredefinedColumn()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2)));
+
+        // We duplicate our task to the 2nd project with a different column
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2, null, 7));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(7, $task['column_id']);
+    }
+
+    public function testDuplicateAnotherProjectWithUser()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectUserRoleModel = new ProjectUserRoleModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 2)));
+
+        // We duplicate our task to the 2nd project
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals('test', $task['title']);
+
+        // We create a new user for our project
+        $user = new UserModel($this->container);
+        $this->assertNotFalse($user->create(array('username' => 'unittest#1', 'password' => 'unittest')));
+        $this->assertTrue($projectUserRoleModel->addUser(1, 2, Role::PROJECT_MEMBER));
+        $this->assertTrue($projectUserRoleModel->addUser(2, 2, Role::PROJECT_MEMBER));
+
+        // We duplicate our task to the 2nd project
+        $this->assertEquals(3, $taskProjectDuplicationModel->duplicateToProject(1, 2));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(3);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(2, $task['position']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(2, $task['owner_id']);
+        $this->assertEquals(2, $task['project_id']);
+
+        // We duplicate a task with a not allowed user
+        $this->assertEquals(4, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 3)));
+        $this->assertEquals(5, $taskProjectDuplicationModel->duplicateToProject(4, 2));
+
+        $task = $taskFinderModel->getById(5);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals(5, $task['column_id']);
+    }
+
+    public function testDuplicateAnotherProjectWithPredefinedUser()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectUserRoleModel = new ProjectUserRoleModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 2)));
+        $this->assertTrue($projectUserRoleModel->addUser(2, 1, Role::PROJECT_MEMBER));
+
+        // We duplicate our task to the 2nd project
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2, null, null, null, 1));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(1, $task['owner_id']);
+    }
+
+    public function testDuplicateAnotherProjectWithDifferentTags()
+    {
+        $taskProjectMoveModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $tagModel = new TagModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        // We create our tags for each projects
+        $this->assertEquals(1, $tagModel->create(1, 'T1'));
+        $this->assertEquals(2, $tagModel->create(1, 'T2'));
+        $this->assertEquals(3, $tagModel->create(2, 'T2'));
+        $this->assertEquals(4, $tagModel->create(2, 'T3'));
+        $this->assertEquals(5, $tagModel->create(0, 'T4'));
+        $this->assertEquals(6, $tagModel->create(0, 'T5'));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'tags' => array('T1', 'T2', 'T5'))));
+
+        // We move our task to the 2nd project
+        $this->assertEquals(2, $taskProjectMoveModel->duplicateToProject(1, 2));
+
+        // Check the values of the moved task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(2, $task['id']);
+        $this->assertEquals(2, $task['project_id']);
+
+        // Check tags
+        $tags = $taskTagModel->getList(2);
+        $this->assertCount(2, $tags);
+        $this->assertArrayHasKey(3, $tags);
+        $this->assertArrayHasKey(6, $tags);
+    }
+}
diff --git a/tests/units/Model/TaskProjectMoveModelTest.php b/tests/units/Model/TaskProjectMoveModelTest.php
new file mode 100644
index 00000000..ed6c0c3c
--- /dev/null
+++ b/tests/units/Model/TaskProjectMoveModelTest.php
@@ -0,0 +1,269 @@
+<?php
+
+require_once __DIR__.'/../Base.php';
+
+use Kanboard\Core\Security\Role;
+use Kanboard\Model\CategoryModel;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\ProjectUserRoleModel;
+use Kanboard\Model\SwimlaneModel;
+use Kanboard\Model\TagModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\TaskProjectMoveModel;
+use Kanboard\Model\TaskTagModel;
+use Kanboard\Model\UserModel;
+
+class TaskProjectMoveModelTest extends Base
+{
+    public function onMoveProject($event)
+    {
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+
+        $event_data = $event->getAll();
+        $this->assertNotEmpty($event_data);
+        $this->assertEquals(1, $event_data['task_id']);
+        $this->assertEquals('test', $event_data['title']);
+    }
+
+    public function testMoveAnotherProject()
+    {
+        $taskProjectMoveModel = new TaskProjectMoveModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'owner_id' => 1, 'category_id' => 10, 'position' => 333)));
+
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_PROJECT, array($this, 'onMoveProject'));
+
+        // We duplicate our task to the 2nd project
+        $this->assertTrue($taskProjectMoveModel->moveToProject(1, 2));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_PROJECT.'.TaskProjectMoveModelTest::onMoveProject', $called);
+
+        // Check the values of the moved task
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(0, $task['category_id']);
+        $this->assertEquals(0, $task['swimlane_id']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals(5, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals('test', $task['title']);
+    }
+
+    public function testMoveAnotherProjectWithCategory()
+    {
+        $taskProjectMoveModel = new TaskProjectMoveModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $categoryModel = new CategoryModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #1', 'project_id' => 1)));
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #1', 'project_id' => 2)));
+        $this->assertTrue($categoryModel->exists(1));
+        $this->assertTrue($categoryModel->exists(2));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'category_id' => 1)));
+
+        // We move our task to the 2nd project
+        $this->assertTrue($taskProjectMoveModel->moveToProject(1, 2));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(2, $task['category_id']);
+        $this->assertEquals(0, $task['swimlane_id']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals('test', $task['title']);
+    }
+
+    public function testMoveAnotherProjectWithUser()
+    {
+        $taskProjectMoveModel = new TaskProjectMoveModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectUserRoleModel = new ProjectUserRoleModel($this->container);
+        $userModel = new UserModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        // We create a new user for our project
+        $this->assertNotFalse($userModel->create(array('username' => 'unittest#1', 'password' => 'unittest')));
+        $this->assertTrue($projectUserRoleModel->addUser(1, 2, Role::PROJECT_MEMBER));
+        $this->assertTrue($projectUserRoleModel->addUser(2, 2, Role::PROJECT_MEMBER));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 2)));
+
+        // We move our task to the 2nd project
+        $this->assertTrue($taskProjectMoveModel->moveToProject(1, 2));
+
+        // Check the values of the moved task
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['owner_id']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals(6, $task['column_id']);
+    }
+
+    public function testMoveAnotherProjectWithForbiddenUser()
+    {
+        $taskProjectMoveModel = new TaskProjectMoveModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectUserRoleModel = new ProjectUserRoleModel($this->container);
+        $userModel = new UserModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        // We create a new user for our project
+        $this->assertNotFalse($userModel->create(array('username' => 'unittest#1', 'password' => 'unittest')));
+        $this->assertTrue($projectUserRoleModel->addUser(1, 2, Role::PROJECT_MEMBER));
+        $this->assertTrue($projectUserRoleModel->addUser(2, 2, Role::PROJECT_MEMBER));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 3)));
+
+        // We move our task to the 2nd project
+        $this->assertTrue($taskProjectMoveModel->moveToProject(1, 2));
+
+        // Check the values of the moved task
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals(6, $task['column_id']);
+    }
+
+    public function testMoveAnotherProjectWithSwimlane()
+    {
+        $taskProjectMoveModel = new TaskProjectMoveModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $swimlaneModel = new SwimlaneModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 2, 'name' => 'Swimlane #1')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
+
+        // We move our task to the 2nd project
+        $this->assertTrue($taskProjectMoveModel->moveToProject(1, 2));
+
+        // Check the values of the moved task
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(0, $task['category_id']);
+        $this->assertEquals(2, $task['swimlane_id']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals('test', $task['title']);
+    }
+
+    public function testMoveAnotherProjectWithoutSwimlane()
+    {
+        $taskProjectMoveModel = new TaskProjectMoveModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $swimlaneModel = new SwimlaneModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 2, 'name' => 'Swimlane #2')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
+
+        // We move our task to the 2nd project
+        $this->assertTrue($taskProjectMoveModel->moveToProject(1, 2));
+
+        // Check the values of the moved task
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(0, $task['category_id']);
+        $this->assertEquals(0, $task['swimlane_id']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals('test', $task['title']);
+    }
+
+    public function testMoveAnotherProjectWithDifferentTags()
+    {
+        $taskProjectMoveModel = new TaskProjectMoveModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $tagModel = new TagModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        // We create our tags for each projects
+        $this->assertEquals(1, $tagModel->create(1, 'T1'));
+        $this->assertEquals(2, $tagModel->create(1, 'T2'));
+        $this->assertEquals(3, $tagModel->create(2, 'T3'));
+        $this->assertEquals(4, $tagModel->create(2, 'T4'));
+        $this->assertEquals(5, $tagModel->create(0, 'T5'));
+        $this->assertEquals(6, $tagModel->create(0, 'T6'));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'tags' => array('T1', 'T5', 'T6'))));
+
+        // We move our task to the 2nd project
+        $this->assertTrue($taskProjectMoveModel->moveToProject(1, 2));
+
+        // Check the values of the moved task
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(2, $task['project_id']);
+
+        // Check tags
+        $tags = $taskTagModel->getList(1);
+        $this->assertCount(2, $tags);
+        $this->assertArrayHasKey(5, $tags);
+        $this->assertArrayHasKey(6, $tags);
+    }
+}
diff --git a/tests/units/Model/TaskRecurrenceModelTest.php b/tests/units/Model/TaskRecurrenceModelTest.php
new file mode 100644
index 00000000..6970e30f
--- /dev/null
+++ b/tests/units/Model/TaskRecurrenceModelTest.php
@@ -0,0 +1,90 @@
+<?php
+
+require_once __DIR__.'/../Base.php';
+
+use Kanboard\Core\DateParser;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\TaskRecurrenceModel;
+
+class TaskRecurrenceModelTest extends Base
+{
+    public function testCalculateRecurringTaskDueDate()
+    {
+        $taskRecurrenceModel = new TaskRecurrenceModel($this->container);
+
+        $values = array('date_due' => 0);
+        $taskRecurrenceModel->calculateRecurringTaskDueDate($values);
+        $this->assertEquals(0, $values['date_due']);
+
+        $values = array('date_due' => 0, 'recurrence_factor' => 0, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_TRIGGERDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
+        $taskRecurrenceModel->calculateRecurringTaskDueDate($values);
+        $this->assertEquals(0, $values['date_due']);
+
+        $values = array('date_due' => 1431291376, 'recurrence_factor' => 1, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_TRIGGERDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
+        $taskRecurrenceModel->calculateRecurringTaskDueDate($values);
+        $this->assertEquals(time() + 86400, $values['date_due'], '', 1);
+
+        $values = array('date_due' => 1431291376, 'recurrence_factor' => -2, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_TRIGGERDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
+        $taskRecurrenceModel->calculateRecurringTaskDueDate($values);
+        $this->assertEquals(time() - 2 * 86400, $values['date_due'], '', 1);
+
+        $values = array('date_due' => 1431291376, 'recurrence_factor' => 1, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_DUEDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
+        $taskRecurrenceModel->calculateRecurringTaskDueDate($values);
+        $this->assertEquals(1431291376 + 86400, $values['date_due'], '', 1);
+
+        $values = array('date_due' => 1431291376, 'recurrence_factor' => -1, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_DUEDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
+        $taskRecurrenceModel->calculateRecurringTaskDueDate($values);
+        $this->assertEquals(1431291376 - 86400, $values['date_due'], '', 1);
+
+        $values = array('date_due' => 1431291376, 'recurrence_factor' => 2, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_DUEDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_MONTHS);
+        $taskRecurrenceModel->calculateRecurringTaskDueDate($values);
+        $this->assertEquals(1436561776, $values['date_due'], '', 1);
+
+        $values = array('date_due' => 1431291376, 'recurrence_factor' => 2, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_DUEDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_YEARS);
+        $taskRecurrenceModel->calculateRecurringTaskDueDate($values);
+        $this->assertEquals(1494449776, $values['date_due'], '', 1);
+    }
+
+    public function testDuplicateRecurringTask()
+    {
+        $taskRecurrenceModel = new TaskRecurrenceModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $dateParser = new DateParser($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+
+        $this->assertEquals(1, $taskCreationModel->create(array(
+            'title' => 'test',
+            'project_id' => 1,
+            'date_due' => 1436561776,
+            'recurrence_status' => TaskModel::RECURRING_STATUS_PENDING,
+            'recurrence_trigger' => TaskModel::RECURRING_TRIGGER_CLOSE,
+            'recurrence_factor' => 2,
+            'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS,
+            'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_TRIGGERDATE,
+        )));
+
+        $this->assertEquals(2, $taskRecurrenceModel->duplicateRecurringTask(1));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(TaskModel::RECURRING_STATUS_PROCESSED, $task['recurrence_status']);
+        $this->assertEquals(2, $task['recurrence_child']);
+        $this->assertEquals(1436486400, $task['date_due'], '', 2);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(TaskModel::RECURRING_STATUS_PENDING, $task['recurrence_status']);
+        $this->assertEquals(TaskModel::RECURRING_TRIGGER_CLOSE, $task['recurrence_trigger']);
+        $this->assertEquals(TaskModel::RECURRING_TIMEFRAME_DAYS, $task['recurrence_timeframe']);
+        $this->assertEquals(TaskModel::RECURRING_BASEDATE_TRIGGERDATE, $task['recurrence_basedate']);
+        $this->assertEquals(1, $task['recurrence_parent']);
+        $this->assertEquals(2, $task['recurrence_factor']);
+        $this->assertEquals($dateParser->removeTimeFromTimestamp(strtotime('+2 days')), $task['date_due'], '', 2);
+    }
+}
diff --git a/tests/units/Model/TaskTagModelTest.php b/tests/units/Model/TaskTagModelTest.php
index 88055d5f..3485368e 100644
--- a/tests/units/Model/TaskTagModelTest.php
+++ b/tests/units/Model/TaskTagModelTest.php
@@ -124,4 +124,25 @@ class TaskTagModelTest extends Base
         $tags = $taskTagModel->getTagsByTasks(array());
         $this->assertEquals(array(), $tags);
     }
+
+    public function testGetTagIdNotAvailableInDestinationProject()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+        $tagModel = new TagModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'P2')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test1')));
+
+        $this->assertEquals(1, $tagModel->create(0, 'T0'));
+        $this->assertEquals(2, $tagModel->create(2, 'T1'));
+        $this->assertEquals(3, $tagModel->create(2, 'T3'));
+        $this->assertEquals(4, $tagModel->create(1, 'T2'));
+        $this->assertEquals(5, $tagModel->create(1, 'T3'));
+        $this->assertTrue($taskTagModel->save(1, 1, array('T0', 'T2', 'T3')));
+
+        $this->assertEquals(array(4, 5), $taskTagModel->getTagIdsByTaskNotAvailableInProject(1, 2));
+    }
 }
-- 
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/Action')

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


From b6119e7dee84869a619dedccd9c80df4422a4f5b Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 23 Jul 2016 14:05:15 -0400
Subject: Added internal task links to activity stream

---
 ChangeLog                                          |   1 +
 app/Action/TaskAssignCategoryLink.php              |  13 +-
 app/Action/TaskAssignColorLink.php                 |  10 +-
 app/Core/Base.php                                  |   1 +
 app/EventBuilder/TaskLinkEventBuilder.php          |  89 +++++++++++
 app/Helper/HookHelper.php                          |   2 +-
 app/Job/TaskLinkEventJob.php                       |  45 ++++++
 app/Model/NotificationModel.php                    |  39 ++---
 app/Model/TaskLinkModel.php                        | 173 ++++++++++++---------
 app/ServiceProvider/JobProvider.php                |   5 +
 app/Subscriber/NotificationSubscriber.php          |   3 +
 .../event/task_internal_link_create_update.php     |  16 ++
 app/Template/event/task_internal_link_delete.php   |  16 ++
 app/Template/notification/task_file_create.php     |   2 +-
 .../task_internal_link_create_update.php           |  11 ++
 .../notification/task_internal_link_delete.php     |  11 ++
 tests/units/Action/TaskAssignCategoryLinkTest.php  |  51 +++---
 tests/units/Action/TaskAssignColorLinkTest.php     |  45 ++++--
 .../EventBuilder/TaskLinkEventBuilderTest.php      |  70 +++++++++
 tests/units/Job/TaskLinkEventJobTest.php           |  65 ++++++++
 tests/units/Model/NotificationModelTest.php        |  39 ++---
 tests/units/Model/TaskLinkModelTest.php            |  28 ++++
 tests/units/Notification/MailNotificationTest.php  | 117 ++++++++++++++
 tests/units/Notification/MailTest.php              | 117 --------------
 .../units/Notification/WebhookNotificationTest.php |  29 ++++
 tests/units/Notification/WebhookTest.php           |  29 ----
 26 files changed, 705 insertions(+), 322 deletions(-)
 create mode 100644 app/EventBuilder/TaskLinkEventBuilder.php
 create mode 100644 app/Job/TaskLinkEventJob.php
 create mode 100644 app/Template/event/task_internal_link_create_update.php
 create mode 100644 app/Template/event/task_internal_link_delete.php
 create mode 100644 app/Template/notification/task_internal_link_create_update.php
 create mode 100644 app/Template/notification/task_internal_link_delete.php
 create mode 100644 tests/units/EventBuilder/TaskLinkEventBuilderTest.php
 create mode 100644 tests/units/Job/TaskLinkEventJobTest.php
 create mode 100644 tests/units/Notification/MailNotificationTest.php
 delete mode 100644 tests/units/Notification/MailTest.php
 create mode 100644 tests/units/Notification/WebhookNotificationTest.php
 delete mode 100644 tests/units/Notification/WebhookTest.php

(limited to 'app/Action')

diff --git a/ChangeLog b/ChangeLog
index a1e39436..ee57c86c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Version 1.0.32 (unreleased)
 New features:
 
 * New automated action to close tasks without activity in a specific column
+* Added internal task links to activity stream
 * Added new event for removed comments
 * Added search filter for task priority
 * Added the possibility to hide tasks in dashboard for a specific column
diff --git a/app/Action/TaskAssignCategoryLink.php b/app/Action/TaskAssignCategoryLink.php
index 6937edd1..d4a4c0ec 100644
--- a/app/Action/TaskAssignCategoryLink.php
+++ b/app/Action/TaskAssignCategoryLink.php
@@ -60,8 +60,10 @@ class TaskAssignCategoryLink extends Base
     public function getEventRequiredParameters()
     {
         return array(
-            'task_id',
-            'link_id',
+            'task_link' => array(
+                'task_id',
+                'link_id',
+            )
         );
     }
 
@@ -75,7 +77,7 @@ class TaskAssignCategoryLink extends Base
     public function doAction(array $data)
     {
         $values = array(
-            'id' => $data['task_id'],
+            'id' => $data['task_link']['task_id'],
             'category_id' => $this->getParam('category_id'),
         );
 
@@ -91,9 +93,8 @@ class TaskAssignCategoryLink extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        if ($data['link_id'] == $this->getParam('link_id')) {
-            $task = $this->taskFinderModel->getById($data['task_id']);
-            return empty($task['category_id']);
+        if ($data['task_link']['link_id'] == $this->getParam('link_id')) {
+            return empty($data['task']['category_id']);
         }
 
         return false;
diff --git a/app/Action/TaskAssignColorLink.php b/app/Action/TaskAssignColorLink.php
index 9ab5458b..9759f622 100644
--- a/app/Action/TaskAssignColorLink.php
+++ b/app/Action/TaskAssignColorLink.php
@@ -59,8 +59,10 @@ class TaskAssignColorLink extends Base
     public function getEventRequiredParameters()
     {
         return array(
-            'task_id',
-            'link_id',
+            'task_link' => array(
+                'task_id',
+                'link_id',
+            )
         );
     }
 
@@ -74,7 +76,7 @@ class TaskAssignColorLink extends Base
     public function doAction(array $data)
     {
         $values = array(
-            'id' => $data['task_id'],
+            'id' => $data['task_link']['task_id'],
             'color_id' => $this->getParam('color_id'),
         );
 
@@ -90,6 +92,6 @@ class TaskAssignColorLink extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $data['link_id'] == $this->getParam('link_id');
+        return $data['task_link']['link_id'] == $this->getParam('link_id');
     }
 }
diff --git a/app/Core/Base.php b/app/Core/Base.php
index 098bd880..20a2d391 100644
--- a/app/Core/Base.php
+++ b/app/Core/Base.php
@@ -154,6 +154,7 @@ use Pimple\Container;
  * @property \Kanboard\Job\SubtaskEventJob                       $subtaskEventJob
  * @property \Kanboard\Job\TaskEventJob                          $taskEventJob
  * @property \Kanboard\Job\TaskFileEventJob                      $taskFileEventJob
+ * @property \Kanboard\Job\TaskLinkEventJob                      $taskLinkEventJob
  * @property \Kanboard\Job\ProjectFileEventJob                   $projectFileEventJob
  * @property \Kanboard\Job\NotificationJob                       $notificationJob
  * @property \Psr\Log\LoggerInterface                            $logger
diff --git a/app/EventBuilder/TaskLinkEventBuilder.php b/app/EventBuilder/TaskLinkEventBuilder.php
new file mode 100644
index 00000000..8be5299f
--- /dev/null
+++ b/app/EventBuilder/TaskLinkEventBuilder.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Kanboard\EventBuilder;
+
+use Kanboard\Event\TaskLinkEvent;
+use Kanboard\Model\TaskLinkModel;
+
+/**
+ * Class TaskLinkEventBuilder
+ *
+ * @package Kanboard\EventBuilder
+ * @author  Frederic Guillot
+ */
+class TaskLinkEventBuilder extends BaseEventBuilder
+{
+    protected $taskLinkId = 0;
+
+    /**
+     * Set taskLinkId
+     *
+     * @param  int $taskLinkId
+     * @return $this
+     */
+    public function withTaskLinkId($taskLinkId)
+    {
+        $this->taskLinkId = $taskLinkId;
+        return $this;
+    }
+
+    /**
+     * Build event data
+     *
+     * @access public
+     * @return TaskLinkEvent|null
+     */
+    public function build()
+    {
+        $taskLink = $this->taskLinkModel->getById($this->taskLinkId);
+
+        if (empty($taskLink)) {
+            $this->logger->debug(__METHOD__.': TaskLink not found');
+            return null;
+        }
+
+        return new TaskLinkEvent(array(
+            'task_link' => $taskLink,
+            'task' => $this->taskFinderModel->getDetails($taskLink['task_id']),
+        ));
+    }
+
+    /**
+     * Get event title with author
+     *
+     * @access public
+     * @param  string $author
+     * @param  string $eventName
+     * @param  array  $eventData
+     * @return string
+     */
+    public function buildTitleWithAuthor($author, $eventName, array $eventData)
+    {
+        if ($eventName === TaskLinkModel::EVENT_CREATE_UPDATE) {
+            return e('%s set a new internal link for the task #%d', $author, $eventData['task']['id']);
+        } elseif ($eventName === TaskLinkModel::EVENT_DELETE) {
+            return e('%s removed an internal link for the task #%d', $author, $eventData['task']['id']);
+        }
+
+        return '';
+    }
+
+    /**
+     * Get event title without author
+     *
+     * @access public
+     * @param  string $eventName
+     * @param  array  $eventData
+     * @return string
+     */
+    public function buildTitleWithoutAuthor($eventName, array $eventData)
+    {
+        if ($eventName === TaskLinkModel::EVENT_CREATE_UPDATE) {
+            return e('A new internal link for the task #%d have been defined', $eventData['task']['id']);
+        } elseif ($eventName === TaskLinkModel::EVENT_DELETE) {
+            return e('Internal link removed for the task #%d', $eventData['task']['id']);
+        }
+
+        return '';
+    }
+}
diff --git a/app/Helper/HookHelper.php b/app/Helper/HookHelper.php
index 2d13ebcc..cb4dc1ef 100644
--- a/app/Helper/HookHelper.php
+++ b/app/Helper/HookHelper.php
@@ -56,7 +56,7 @@ class HookHelper extends Base
      * @access public
      * @param  string  $hook
      * @param  string  $template
-     * @return \Kanboard\Helper\Hook
+     * @return $this
      */
     public function attach($hook, $template)
     {
diff --git a/app/Job/TaskLinkEventJob.php b/app/Job/TaskLinkEventJob.php
new file mode 100644
index 00000000..669608ad
--- /dev/null
+++ b/app/Job/TaskLinkEventJob.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Kanboard\Job;
+
+use Kanboard\EventBuilder\TaskLinkEventBuilder;
+
+/**
+ * Class TaskLinkEventJob
+ *
+ * @package Kanboard\Job
+ * @author  Frederic Guillot
+ */
+class TaskLinkEventJob extends BaseJob
+{
+    /**
+     * Set job params
+     *
+     * @param  int    $taskLinkId
+     * @param  string $eventName
+     * @return $this
+     */
+    public function withParams($taskLinkId, $eventName)
+    {
+        $this->jobParams = array($taskLinkId, $eventName);
+        return $this;
+    }
+
+    /**
+     * Execute job
+     *
+     * @param  int    $taskLinkId
+     * @param  string $eventName
+     * @return $this
+     */
+    public function execute($taskLinkId, $eventName)
+    {
+        $event = TaskLinkEventBuilder::getInstance($this->container)
+            ->withTaskLinkId($taskLinkId)
+            ->build();
+
+        if ($event !== null) {
+            $this->dispatcher->dispatch($eventName, $event);
+        }
+    }
+}
diff --git a/app/Model/NotificationModel.php b/app/Model/NotificationModel.php
index 925d646e..39c1f581 100644
--- a/app/Model/NotificationModel.php
+++ b/app/Model/NotificationModel.php
@@ -3,6 +3,7 @@
 namespace Kanboard\Model;
 
 use Kanboard\Core\Base;
+use Kanboard\EventBuilder\TaskLinkEventBuilder;
 
 /**
  * Notification
@@ -85,7 +86,9 @@ class NotificationModel extends Base
             case CommentModel::EVENT_USER_MENTION:
                 return e('%s mentioned you in a comment on the task #%d', $event_author, $event_data['task']['id']);
             default:
-                return e('Notification');
+                return TaskLinkEventBuilder::getInstance($this->container)
+                    ->buildTitleWithAuthor($event_author, $event_name, $event_data) ?:
+                e('Notification');
         }
     }
 
@@ -138,7 +141,9 @@ class NotificationModel extends Base
             case CommentModel::EVENT_USER_MENTION:
                 return e('You were mentioned in a comment on the task #%d', $event_data['task']['id']);
             default:
-                return e('Notification');
+                return TaskLinkEventBuilder::getInstance($this->container)
+                    ->buildTitleWithoutAuthor($event_name, $event_data) ?:
+                    e('Notification');
         }
     }
 
@@ -152,32 +157,10 @@ class NotificationModel extends Base
      */
     public function getTaskIdFromEvent($event_name, array $event_data)
     {
-        switch ($event_name) {
-            case TaskFileModel::EVENT_CREATE:
-                return $event_data['file']['task_id'];
-            case CommentModel::EVENT_CREATE:
-            case CommentModel::EVENT_UPDATE:
-            case CommentModel::EVENT_DELETE:
-                return $event_data['comment']['task_id'];
-            case SubtaskModel::EVENT_CREATE:
-            case SubtaskModel::EVENT_UPDATE:
-            case SubtaskModel::EVENT_DELETE:
-                return $event_data['subtask']['task_id'];
-            case TaskModel::EVENT_CREATE:
-            case TaskModel::EVENT_UPDATE:
-            case TaskModel::EVENT_CLOSE:
-            case TaskModel::EVENT_OPEN:
-            case TaskModel::EVENT_MOVE_COLUMN:
-            case TaskModel::EVENT_MOVE_POSITION:
-            case TaskModel::EVENT_MOVE_SWIMLANE:
-            case TaskModel::EVENT_ASSIGNEE_CHANGE:
-            case CommentModel::EVENT_USER_MENTION:
-            case TaskModel::EVENT_USER_MENTION:
-                return $event_data['task']['id'];
-            case TaskModel::EVENT_OVERDUE:
-                return $event_data['tasks'][0]['id'];
-            default:
-                return 0;
+        if ($event_name === TaskModel::EVENT_OVERDUE) {
+            return $event_data['tasks'][0]['id'];
         }
+        
+        return isset($event_data['task']['id']) ? $event_data['task']['id'] : 0;
     }
 }
diff --git a/app/Model/TaskLinkModel.php b/app/Model/TaskLinkModel.php
index 09978eae..e8d3c5df 100644
--- a/app/Model/TaskLinkModel.php
+++ b/app/Model/TaskLinkModel.php
@@ -3,7 +3,6 @@
 namespace Kanboard\Model;
 
 use Kanboard\Core\Base;
-use Kanboard\Event\TaskLinkEvent;
 
 /**
  * TaskLink model
@@ -26,7 +25,8 @@ class TaskLinkModel extends Base
      *
      * @var string
      */
-    const EVENT_CREATE_UPDATE = 'tasklink.create_update';
+    const EVENT_CREATE_UPDATE = 'task_internal_link.create_update';
+    const EVENT_DELETE        = 'task_internal_link.delete';
 
     /**
      * Get projectId from $task_link_id
@@ -53,7 +53,19 @@ class TaskLinkModel extends Base
      */
     public function getById($task_link_id)
     {
-        return $this->db->table(self::TABLE)->eq('id', $task_link_id)->findOne();
+        return $this->db
+            ->table(self::TABLE)
+            ->columns(
+                self::TABLE.'.id',
+                self::TABLE.'.opposite_task_id',
+                self::TABLE.'.task_id',
+                self::TABLE.'.link_id',
+                LinkModel::TABLE.'.label',
+                LinkModel::TABLE.'.opposite_id AS opposite_link_id'
+            )
+            ->eq(self::TABLE.'.id', $task_link_id)
+            ->join(LinkModel::TABLE, 'id', 'link_id')
+            ->findOne();
     }
 
     /**
@@ -139,20 +151,6 @@ class TaskLinkModel extends Base
         return $result;
     }
 
-    /**
-     * Publish events
-     *
-     * @access private
-     * @param  array $events
-     */
-    private function fireEvents(array $events)
-    {
-        foreach ($events as $event) {
-            $event['project_id'] = $this->taskFinderModel->getProjectId($event['task_id']);
-            $this->container['dispatcher']->dispatch(self::EVENT_CREATE_UPDATE, new TaskLinkEvent($event));
-        }
-    }
-
     /**
      * Create a new link
      *
@@ -160,42 +158,25 @@ class TaskLinkModel extends Base
      * @param  integer   $task_id            Task id
      * @param  integer   $opposite_task_id   Opposite task id
      * @param  integer   $link_id            Link id
-     * @return integer                       Task link id
+     * @return integer|boolean
      */
     public function create($task_id, $opposite_task_id, $link_id)
     {
-        $events = array();
         $this->db->startTransaction();
 
-        // Get opposite link
         $opposite_link_id = $this->linkModel->getOppositeLinkId($link_id);
+        $task_link_id1 = $this->createTaskLink($task_id, $opposite_task_id, $link_id);
+        $task_link_id2 = $this->createTaskLink($opposite_task_id, $task_id, $opposite_link_id);
 
-        $values = array(
-            'task_id' => $task_id,
-            'opposite_task_id' => $opposite_task_id,
-            'link_id' => $link_id,
-        );
-
-        // Create the original task link
-        $this->db->table(self::TABLE)->insert($values);
-        $task_link_id = $this->db->getLastId();
-        $events[] = $values;
-
-        // Create the opposite task link
-        $values = array(
-            'task_id' => $opposite_task_id,
-            'opposite_task_id' => $task_id,
-            'link_id' => $opposite_link_id,
-        );
-
-        $this->db->table(self::TABLE)->insert($values);
-        $events[] = $values;
+        if ($task_link_id1 === false || $task_link_id2 === false) {
+            $this->db->cancelTransaction();
+            return false;
+        }
 
         $this->db->closeTransaction();
+        $this->fireEvents(array($task_link_id1, $task_link_id2), self::EVENT_CREATE_UPDATE);
 
-        $this->fireEvents($events);
-
-        return (int) $task_link_id;
+        return $task_link_id1;
     }
 
     /**
@@ -210,46 +191,24 @@ class TaskLinkModel extends Base
      */
     public function update($task_link_id, $task_id, $opposite_task_id, $link_id)
     {
-        $events = array();
         $this->db->startTransaction();
 
-        // Get original task link
         $task_link = $this->getById($task_link_id);
-
-        // Find opposite task link
         $opposite_task_link = $this->getOppositeTaskLink($task_link);
-
-        // Get opposite link
         $opposite_link_id = $this->linkModel->getOppositeLinkId($link_id);
 
-        // Update the original task link
-        $values = array(
-            'task_id' => $task_id,
-            'opposite_task_id' => $opposite_task_id,
-            'link_id' => $link_id,
-        );
-
-        $rs1 = $this->db->table(self::TABLE)->eq('id', $task_link_id)->update($values);
-        $events[] = $values;
+        $result1 = $this->updateTaskLink($task_link_id, $task_id, $opposite_task_id, $link_id);
+        $result2 = $this->updateTaskLink($opposite_task_link['id'], $opposite_task_id, $task_id, $opposite_link_id);
 
-        // Update the opposite link
-        $values = array(
-            'task_id' => $opposite_task_id,
-            'opposite_task_id' => $task_id,
-            'link_id' => $opposite_link_id,
-        );
-
-        $rs2 = $this->db->table(self::TABLE)->eq('id', $opposite_task_link['id'])->update($values);
-        $events[] = $values;
+        if ($result1 === false || $result2 === false) {
+            $this->db->cancelTransaction();
+            return false;
+        }
 
         $this->db->closeTransaction();
+        $this->fireEvents(array($task_link_id, $opposite_task_link['id']), self::EVENT_CREATE_UPDATE);
 
-        if ($rs1 && $rs2) {
-            $this->fireEvents($events);
-            return true;
-        }
-
-        return false;
+        return true;
     }
 
     /**
@@ -261,21 +220,83 @@ class TaskLinkModel extends Base
      */
     public function remove($task_link_id)
     {
+        $this->taskLinkEventJob->execute($task_link_id, self::EVENT_DELETE);
+
         $this->db->startTransaction();
 
         $link = $this->getById($task_link_id);
         $link_id = $this->linkModel->getOppositeLinkId($link['link_id']);
 
-        $this->db->table(self::TABLE)->eq('id', $task_link_id)->remove();
+        $result1 = $this->db
+            ->table(self::TABLE)
+            ->eq('id', $task_link_id)
+            ->remove();
 
-        $this->db
+        $result2 = $this->db
             ->table(self::TABLE)
             ->eq('opposite_task_id', $link['task_id'])
             ->eq('task_id', $link['opposite_task_id'])
-            ->eq('link_id', $link_id)->remove();
+            ->eq('link_id', $link_id)
+            ->remove();
+
+        if ($result1 === false || $result2 === false) {
+            $this->db->cancelTransaction();
+            return false;
+        }
 
         $this->db->closeTransaction();
 
         return true;
     }
+
+    /**
+     * Publish events
+     *
+     * @access protected
+     * @param  integer[] $task_link_ids
+     * @param  string    $eventName
+     */
+    protected function fireEvents(array $task_link_ids, $eventName)
+    {
+        foreach ($task_link_ids as $task_link_id) {
+            $this->queueManager->push($this->taskLinkEventJob->withParams($task_link_id, $eventName));
+        }
+    }
+
+    /**
+     * Create task link
+     *
+     * @access protected
+     * @param  integer $task_id
+     * @param  integer $opposite_task_id
+     * @param  integer $link_id
+     * @return integer|boolean
+     */
+    protected function createTaskLink($task_id, $opposite_task_id, $link_id)
+    {
+        return $this->db->table(self::TABLE)->persist(array(
+            'task_id'          => $task_id,
+            'opposite_task_id' => $opposite_task_id,
+            'link_id'          => $link_id,
+        ));
+    }
+
+    /**
+     * Update task link
+     *
+     * @access protected
+     * @param  integer $task_link_id
+     * @param  integer $task_id
+     * @param  integer $opposite_task_id
+     * @param  integer $link_id
+     * @return boolean
+     */
+    protected function updateTaskLink($task_link_id, $task_id, $opposite_task_id, $link_id)
+    {
+        return $this->db->table(self::TABLE)->eq('id', $task_link_id)->update(array(
+            'task_id' => $task_id,
+            'opposite_task_id' => $opposite_task_id,
+            'link_id' => $link_id,
+        ));
+    }
 }
diff --git a/app/ServiceProvider/JobProvider.php b/app/ServiceProvider/JobProvider.php
index c7f323f1..5b42794b 100644
--- a/app/ServiceProvider/JobProvider.php
+++ b/app/ServiceProvider/JobProvider.php
@@ -8,6 +8,7 @@ use Kanboard\Job\ProjectFileEventJob;
 use Kanboard\Job\SubtaskEventJob;
 use Kanboard\Job\TaskEventJob;
 use Kanboard\Job\TaskFileEventJob;
+use Kanboard\Job\TaskLinkEventJob;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 
@@ -44,6 +45,10 @@ class JobProvider implements ServiceProviderInterface
             return new TaskFileEventJob($c);
         });
 
+        $container['taskLinkEventJob'] = $container->factory(function ($c) {
+            return new TaskLinkEventJob($c);
+        });
+
         $container['projectFileEventJob'] = $container->factory(function ($c) {
             return new ProjectFileEventJob($c);
         });
diff --git a/app/Subscriber/NotificationSubscriber.php b/app/Subscriber/NotificationSubscriber.php
index 7de24e49..7cc68b26 100644
--- a/app/Subscriber/NotificationSubscriber.php
+++ b/app/Subscriber/NotificationSubscriber.php
@@ -3,6 +3,7 @@
 namespace Kanboard\Subscriber;
 
 use Kanboard\Event\GenericEvent;
+use Kanboard\Model\TaskLinkModel;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\CommentModel;
 use Kanboard\Model\SubtaskModel;
@@ -31,6 +32,8 @@ class NotificationSubscriber extends BaseSubscriber implements EventSubscriberIn
             CommentModel::EVENT_DELETE       => 'handleEvent',
             CommentModel::EVENT_USER_MENTION => 'handleEvent',
             TaskFileModel::EVENT_CREATE      => 'handleEvent',
+            TaskLinkModel::EVENT_CREATE_UPDATE      => 'handleEvent',
+            TaskLinkModel::EVENT_DELETE             => 'handleEvent',
         );
     }
 
diff --git a/app/Template/event/task_internal_link_create_update.php b/app/Template/event/task_internal_link_create_update.php
new file mode 100644
index 00000000..de257977
--- /dev/null
+++ b/app/Template/event/task_internal_link_create_update.php
@@ -0,0 +1,16 @@
+<p class="activity-title">
+    <?= e('%s set a new internal link for the task %s',
+        $this->text->e($author),
+        $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+    ) ?>
+    <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
+</p>
+<div class="activity-description">
+    <p class="activity-task-title">
+        <?= e(
+            'This task is now linked to the task %s with the relation "%s"',
+            $this->url->link(t('#%d', $task_link['opposite_task_id']), 'TaskViewController', 'show', array('task_id' => $task_link['opposite_task_id'])),
+            $this->text->e($task_link['label'])
+        ) ?>
+    </p>
+</div>
diff --git a/app/Template/event/task_internal_link_delete.php b/app/Template/event/task_internal_link_delete.php
new file mode 100644
index 00000000..e537bf81
--- /dev/null
+++ b/app/Template/event/task_internal_link_delete.php
@@ -0,0 +1,16 @@
+<p class="activity-title">
+    <?= e('%s removed an internal link for the task %s',
+        $this->text->e($author),
+        $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+    ) ?>
+    <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
+</p>
+<div class="activity-description">
+    <p class="activity-task-title">
+        <?= e(
+            'The link with the relation "%s" to the task %s have been removed',
+            $this->text->e($task_link['label']),
+            $this->url->link(t('#%d', $task_link['opposite_task_id']), 'TaskViewController', 'show', array('task_id' => $task_link['opposite_task_id']))
+        ) ?>
+    </p>
+</div>
diff --git a/app/Template/notification/task_file_create.php b/app/Template/notification/task_file_create.php
index feab8dd2..c19f7279 100644
--- a/app/Template/notification/task_file_create.php
+++ b/app/Template/notification/task_file_create.php
@@ -2,4 +2,4 @@
 
 <p><?= t('New attachment added "%s"', $file['name']) ?></p>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
diff --git a/app/Template/notification/task_internal_link_create_update.php b/app/Template/notification/task_internal_link_create_update.php
new file mode 100644
index 00000000..73cad84d
--- /dev/null
+++ b/app/Template/notification/task_internal_link_create_update.php
@@ -0,0 +1,11 @@
+<h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+
+<p>
+    <?= e(
+        'This task is now linked to the task %s with the relation "%s"',
+        $this->url->link(t('#%d', $task_link['opposite_task_id']), 'TaskViewController', 'show', array('task_id' => $task_link['opposite_task_id'])),
+        $this->text->e($task_link['label'])
+    ) ?>
+</p>
+
+<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
diff --git a/app/Template/notification/task_internal_link_delete.php b/app/Template/notification/task_internal_link_delete.php
new file mode 100644
index 00000000..bb54e0a7
--- /dev/null
+++ b/app/Template/notification/task_internal_link_delete.php
@@ -0,0 +1,11 @@
+<h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+
+<p>
+    <?= e(
+        'The link with the relation "%s" to the task %s have been removed',
+        $this->text->e($task_link['label']),
+        $this->url->link(t('#%d', $task_link['opposite_task_id']), 'TaskViewController', 'show', array('task_id' => $task_link['opposite_task_id']))
+    ) ?>
+</p>
+
+<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
diff --git a/tests/units/Action/TaskAssignCategoryLinkTest.php b/tests/units/Action/TaskAssignCategoryLinkTest.php
index d7e68f72..b9d7e9d9 100644
--- a/tests/units/Action/TaskAssignCategoryLinkTest.php
+++ b/tests/units/Action/TaskAssignCategoryLinkTest.php
@@ -2,12 +2,12 @@
 
 require_once __DIR__.'/../Base.php';
 
+use Kanboard\EventBuilder\TaskLinkEventBuilder;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
 use Kanboard\Model\TaskLinkModel;
 use Kanboard\Model\CategoryModel;
-use Kanboard\Event\TaskLinkEvent;
 use Kanboard\Action\TaskAssignCategoryLink;
 
 class TaskAssignCategoryLinkTest extends Base
@@ -18,6 +18,7 @@ class TaskAssignCategoryLinkTest extends Base
         $taskFinderModel = new TaskFinderModel($this->container);
         $projectModel = new ProjectModel($this->container);
         $categoryModel = new CategoryModel($this->container);
+        $taskLinkModel = new TaskLinkModel($this->container);
 
         $action = new TaskAssignCategoryLink($this->container);
         $action->setProjectId(1);
@@ -27,13 +28,12 @@ class TaskAssignCategoryLinkTest extends Base
         $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)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'T2', 'project_id' => 1)));
+        $this->assertEquals(1, $taskLinkModel->create(1, 2, 2));
 
-        $event = new TaskLinkEvent(array(
-            'project_id' => 1,
-            'task_id' => 1,
-            'opposite_task_id' => 2,
-            'link_id' => 2,
-        ));
+        $event = TaskLinkEventBuilder::getInstance($this->container)
+            ->withTaskLinkId(1)
+            ->build();
 
         $this->assertTrue($action->execute($event, TaskLinkModel::EVENT_CREATE_UPDATE));
 
@@ -44,51 +44,58 @@ class TaskAssignCategoryLinkTest extends Base
     public function testWhenLinkDontMatch()
     {
         $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
         $projectModel = new ProjectModel($this->container);
         $categoryModel = new CategoryModel($this->container);
+        $taskLinkModel = new TaskLinkModel($this->container);
 
         $action = new TaskAssignCategoryLink($this->container);
         $action->setProjectId(1);
         $action->setParam('category_id', 1);
-        $action->setParam('link_id', 1);
+        $action->setParam('link_id', 2);
 
         $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)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'T2', 'project_id' => 1)));
+        $this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
 
-        $event = new TaskLinkEvent(array(
-            'project_id' => 1,
-            'task_id' => 1,
-            'opposite_task_id' => 2,
-            'link_id' => 2,
-        ));
+        $event = TaskLinkEventBuilder::getInstance($this->container)
+            ->withTaskLinkId(1)
+            ->build();
 
         $this->assertFalse($action->execute($event, TaskLinkModel::EVENT_CREATE_UPDATE));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(0, $task['category_id']);
     }
 
     public function testThatExistingCategoryWillNotChange()
     {
         $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
         $projectModel = new ProjectModel($this->container);
         $categoryModel = new CategoryModel($this->container);
+        $taskLinkModel = new TaskLinkModel($this->container);
 
         $action = new TaskAssignCategoryLink($this->container);
         $action->setProjectId(1);
-        $action->setParam('category_id', 2);
+        $action->setParam('category_id', 1);
         $action->setParam('link_id', 2);
 
         $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)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'T2', 'project_id' => 1)));
+        $this->assertEquals(1, $taskLinkModel->create(1, 2, 2));
 
-        $event = new TaskLinkEvent(array(
-            'project_id' => 1,
-            'task_id' => 1,
-            'opposite_task_id' => 2,
-            'link_id' => 2,
-        ));
+        $event = TaskLinkEventBuilder::getInstance($this->container)
+            ->withTaskLinkId(1)
+            ->build();
 
         $this->assertFalse($action->execute($event, TaskLinkModel::EVENT_CREATE_UPDATE));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(1, $task['category_id']);
     }
 }
diff --git a/tests/units/Action/TaskAssignColorLinkTest.php b/tests/units/Action/TaskAssignColorLinkTest.php
index 07d0969b..27364bc9 100644
--- a/tests/units/Action/TaskAssignColorLinkTest.php
+++ b/tests/units/Action/TaskAssignColorLinkTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\EventBuilder\TaskLinkEventBuilder;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
@@ -13,42 +13,55 @@ class TaskAssignColorLinkTest extends Base
 {
     public function testChangeColor()
     {
-        $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')));
-
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'link_id' => 1));
+        $projectModel = new ProjectModel($this->container);
+        $taskLinkModel = new TaskLinkModel($this->container);
 
         $action = new TaskAssignColorLink($this->container);
         $action->setProjectId(1);
+        $action->setParam('link_id', 2);
         $action->setParam('color_id', 'red');
-        $action->setParam('link_id', 1);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'T1', 'project_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'T2', 'project_id' => 1)));
+        $this->assertEquals(1, $taskLinkModel->create(1, 2, 2));
+
+        $event = TaskLinkEventBuilder::getInstance($this->container)
+            ->withTaskLinkId(1)
+            ->build();
 
         $this->assertTrue($action->execute($event, TaskLinkModel::EVENT_CREATE_UPDATE));
 
         $task = $taskFinderModel->getById(1);
-        $this->assertNotEmpty($task);
         $this->assertEquals('red', $task['color_id']);
     }
 
     public function testWithWrongLink()
     {
-        $projectModel = new ProjectModel($this->container);
         $taskCreationModel = new TaskCreationModel($this->container);
-
-        $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, 'link_id' => 2));
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskLinkModel = new TaskLinkModel($this->container);
 
         $action = new TaskAssignColorLink($this->container);
         $action->setProjectId(1);
+        $action->setParam('link_id', 2);
         $action->setParam('color_id', 'red');
-        $action->setParam('link_id', 1);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'T1', 'project_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'T2', 'project_id' => 1)));
+        $this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
+
+        $event = TaskLinkEventBuilder::getInstance($this->container)
+            ->withTaskLinkId(1)
+            ->build();
 
         $this->assertFalse($action->execute($event, TaskLinkModel::EVENT_CREATE_UPDATE));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('yellow', $task['color_id']);
     }
 }
diff --git a/tests/units/EventBuilder/TaskLinkEventBuilderTest.php b/tests/units/EventBuilder/TaskLinkEventBuilderTest.php
new file mode 100644
index 00000000..7364d651
--- /dev/null
+++ b/tests/units/EventBuilder/TaskLinkEventBuilderTest.php
@@ -0,0 +1,70 @@
+<?php
+
+use Kanboard\EventBuilder\TaskLinkEventBuilder;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskLinkModel;
+
+require_once __DIR__.'/../Base.php';
+
+class TaskLinkEventBuilderTest extends Base
+{
+    public function testWithMissingLink()
+    {
+        $taskLinkEventBuilder = new TaskLinkEventBuilder($this->container);
+        $taskLinkEventBuilder->withTaskLinkId(42);
+        $this->assertNull($taskLinkEventBuilder->build());
+    }
+
+    public function testBuild()
+    {
+        $taskLinkModel = new TaskLinkModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskLinkEventBuilder = new TaskLinkEventBuilder($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'task 1', 'project_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'task 2', 'project_id' => 1)));
+        $this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
+
+        $event = $taskLinkEventBuilder->withTaskLinkId(1)->build();
+
+        $this->assertInstanceOf('Kanboard\Event\TaskLinkEvent', $event);
+        $this->assertNotEmpty($event['task_link']);
+        $this->assertNotEmpty($event['task']);
+    }
+
+    public function testBuildTitle()
+    {
+        $taskLinkModel = new TaskLinkModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskLinkEventBuilder = new TaskLinkEventBuilder($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'task 1', 'project_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'task 2', 'project_id' => 1)));
+        $this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
+
+        $eventData = $taskLinkEventBuilder->withTaskLinkId(1)->build();
+
+        $title = $taskLinkEventBuilder->buildTitleWithAuthor('Foobar', TaskLinkModel::EVENT_CREATE_UPDATE, $eventData->getAll());
+        $this->assertEquals('Foobar set a new internal link for the task #1', $title);
+
+        $title = $taskLinkEventBuilder->buildTitleWithAuthor('Foobar', TaskLinkModel::EVENT_DELETE, $eventData->getAll());
+        $this->assertEquals('Foobar removed an internal link for the task #1', $title);
+
+        $title = $taskLinkEventBuilder->buildTitleWithAuthor('Foobar', 'not found', $eventData->getAll());
+        $this->assertSame('', $title);
+
+        $title = $taskLinkEventBuilder->buildTitleWithoutAuthor(TaskLinkModel::EVENT_CREATE_UPDATE, $eventData->getAll());
+        $this->assertEquals('A new internal link for the task #1 have been defined', $title);
+
+        $title = $taskLinkEventBuilder->buildTitleWithoutAuthor(TaskLinkModel::EVENT_DELETE, $eventData->getAll());
+        $this->assertEquals('Internal link removed for the task #1', $title);
+
+        $title = $taskLinkEventBuilder->buildTitleWithoutAuthor('not found', $eventData->getAll());
+        $this->assertSame('', $title);
+    }
+}
diff --git a/tests/units/Job/TaskLinkEventJobTest.php b/tests/units/Job/TaskLinkEventJobTest.php
new file mode 100644
index 00000000..1949316a
--- /dev/null
+++ b/tests/units/Job/TaskLinkEventJobTest.php
@@ -0,0 +1,65 @@
+<?php
+
+use Kanboard\Job\TaskLinkEventJob;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskLinkModel;
+
+require_once __DIR__.'/../Base.php';
+
+class TaskLinkEventJobTest extends Base
+{
+    public function testJobParams()
+    {
+        $taskLinkEventJob = new TaskLinkEventJob($this->container);
+        $taskLinkEventJob->withParams(123, 'foobar');
+
+        $this->assertSame(array(123, 'foobar'), $taskLinkEventJob->getJobParams());
+    }
+
+    public function testWithMissingLink()
+    {
+        $this->container['dispatcher']->addListener(TaskLinkModel::EVENT_CREATE_UPDATE, function() {});
+
+        $taskLinkEventJob = new TaskLinkEventJob($this->container);
+        $taskLinkEventJob->execute(42, TaskLinkModel::EVENT_CREATE_UPDATE);
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertEmpty($called);
+    }
+
+    public function testTriggerCreationEvents()
+    {
+        $this->container['dispatcher']->addListener(TaskLinkModel::EVENT_CREATE_UPDATE, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskLinkModel = new TaskLinkModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'task 1', 'project_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'task 2', 'project_id' => 1)));
+        $this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskLinkModel::EVENT_CREATE_UPDATE.'.closure', $called);
+    }
+
+    public function testTriggerDeleteEvents()
+    {
+        $this->container['dispatcher']->addListener(TaskLinkModel::EVENT_DELETE, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskLinkModel = new TaskLinkModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'task 1', 'project_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'task 2', 'project_id' => 1)));
+        $this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
+        $this->assertTrue($taskLinkModel->remove(1));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskLinkModel::EVENT_DELETE.'.closure', $called);
+    }
+}
diff --git a/tests/units/Model/NotificationModelTest.php b/tests/units/Model/NotificationModelTest.php
index 889f3349..0bd9db6e 100644
--- a/tests/units/Model/NotificationModelTest.php
+++ b/tests/units/Model/NotificationModelTest.php
@@ -7,6 +7,7 @@ use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\SubtaskModel;
 use Kanboard\Model\CommentModel;
 use Kanboard\Model\TaskFileModel;
+use Kanboard\Model\TaskLinkModel;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\ProjectModel;
 use Kanboard\Model\NotificationModel;
@@ -23,47 +24,38 @@ class NotificationModelTest extends Base
         $subtaskModel = new SubtaskModel($this->container);
         $commentModel = new CommentModel($this->container);
         $taskFileModel = new TaskFileModel($this->container);
+        $taskLinkModel = new TaskLinkModel($this->container);
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
         $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
         $this->assertEquals(1, $subtaskModel->create(array('title' => 'test', 'task_id' => 1)));
         $this->assertEquals(1, $commentModel->create(array('comment' => 'test', 'task_id' => 1, 'user_id' => 1)));
         $this->assertEquals(1, $taskFileModel->create(1, 'test', 'blah', 123));
+        $this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
 
         $task = $taskFinderModel->getDetails(1);
         $subtask = $subtaskModel->getById(1, true);
         $comment = $commentModel->getById(1);
         $file = $commentModel->getById(1);
+        $tasklink = $taskLinkModel->getById(1);
 
-        $this->assertNotEmpty($task);
-        $this->assertNotEmpty($subtask);
-        $this->assertNotEmpty($comment);
-        $this->assertNotEmpty($file);
-
-        foreach (NotificationSubscriber::getSubscribedEvents() as $event_name => $values) {
-            $title = $notificationModel->getTitleWithoutAuthor($event_name, array(
-                'task' => $task,
-                'comment' => $comment,
-                'subtask' => $subtask,
-                'file' => $file,
-                'changes' => array()
-            ));
-
-            $this->assertNotEmpty($title);
-
-            $title = $notificationModel->getTitleWithAuthor('foobar', $event_name, array(
+        foreach (NotificationSubscriber::getSubscribedEvents() as $eventName => $values) {
+            $eventData = array(
                 'task' => $task,
                 'comment' => $comment,
                 'subtask' => $subtask,
                 'file' => $file,
+                'task_link' => $tasklink,
                 'changes' => array()
-            ));
+            );
 
-            $this->assertNotEmpty($title);
+            $this->assertNotEmpty($notificationModel->getTitleWithoutAuthor($eventName, $eventData));
+            $this->assertNotEmpty($notificationModel->getTitleWithAuthor('Foobar', $eventName, $eventData));
         }
 
         $this->assertNotEmpty($notificationModel->getTitleWithoutAuthor(TaskModel::EVENT_OVERDUE, array('tasks' => array(array('id' => 1)))));
-        $this->assertNotEmpty($notificationModel->getTitleWithoutAuthor('unkown', array()));
+        $this->assertNotEmpty($notificationModel->getTitleWithoutAuthor('unknown', array()));
     }
 
     public function testGetTaskIdFromEvent()
@@ -75,6 +67,7 @@ class NotificationModelTest extends Base
         $subtaskModel = new SubtaskModel($this->container);
         $commentModel = new CommentModel($this->container);
         $taskFileModel = new TaskFileModel($this->container);
+        $taskLinkModel = new TaskLinkModel($this->container);
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
         $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
@@ -86,18 +79,20 @@ class NotificationModelTest extends Base
         $subtask = $subtaskModel->getById(1, true);
         $comment = $commentModel->getById(1);
         $file = $commentModel->getById(1);
+        $tasklink = $taskLinkModel->getById(1);
 
         $this->assertNotEmpty($task);
         $this->assertNotEmpty($subtask);
         $this->assertNotEmpty($comment);
         $this->assertNotEmpty($file);
 
-        foreach (NotificationSubscriber::getSubscribedEvents() as $event_name => $values) {
-            $task_id = $notificationModel->getTaskIdFromEvent($event_name, array(
+        foreach (NotificationSubscriber::getSubscribedEvents() as $eventName => $values) {
+            $task_id = $notificationModel->getTaskIdFromEvent($eventName, array(
                 'task'    => $task,
                 'comment' => $comment,
                 'subtask' => $subtask,
                 'file'    => $file,
+                'task_link' => $tasklink,
                 'changes' => array()
             ));
 
diff --git a/tests/units/Model/TaskLinkModelTest.php b/tests/units/Model/TaskLinkModelTest.php
index 78590891..01a7888b 100644
--- a/tests/units/Model/TaskLinkModelTest.php
+++ b/tests/units/Model/TaskLinkModelTest.php
@@ -9,6 +9,34 @@ use Kanboard\Model\ProjectModel;
 
 class TaskLinkModelTest extends Base
 {
+    public function testGeyById()
+    {
+        $taskLinkModel = new TaskLinkModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'A')));
+        $this->assertEquals(2, $taskCreationModel->create(array('project_id' => 1, 'title' => 'B')));
+        $this->assertEquals(1, $taskLinkModel->create(1, 2, 6));
+
+        $taskLink = $taskLinkModel->getById(1);
+        $this->assertEquals(1, $taskLink['id']);
+        $this->assertEquals(1, $taskLink['task_id']);
+        $this->assertEquals(2, $taskLink['opposite_task_id']);
+        $this->assertEquals(6, $taskLink['link_id']);
+        $this->assertEquals(7, $taskLink['opposite_link_id']);
+        $this->assertEquals('is a child of', $taskLink['label']);
+
+        $taskLink = $taskLinkModel->getById(2);
+        $this->assertEquals(2, $taskLink['id']);
+        $this->assertEquals(2, $taskLink['task_id']);
+        $this->assertEquals(1, $taskLink['opposite_task_id']);
+        $this->assertEquals(7, $taskLink['link_id']);
+        $this->assertEquals(6, $taskLink['opposite_link_id']);
+        $this->assertEquals('is a parent of', $taskLink['label']);
+    }
+
     // Check postgres issue: "Cardinality violation: 7 ERROR:  more than one row returned by a subquery used as an expression"
     public function testGetTaskWithMultipleMilestoneLink()
     {
diff --git a/tests/units/Notification/MailNotificationTest.php b/tests/units/Notification/MailNotificationTest.php
new file mode 100644
index 00000000..6579d9bc
--- /dev/null
+++ b/tests/units/Notification/MailNotificationTest.php
@@ -0,0 +1,117 @@
+<?php
+
+require_once __DIR__.'/../Base.php';
+
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\SubtaskModel;
+use Kanboard\Model\CommentModel;
+use Kanboard\Model\TaskLinkModel;
+use Kanboard\Model\UserModel;
+use Kanboard\Model\TaskFileModel;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskModel;
+use Kanboard\Notification\MailNotification;
+use Kanboard\Subscriber\NotificationSubscriber;
+
+class MailNotificationTest extends Base
+{
+    public function testGetMailContent()
+    {
+        $mailNotification = new MailNotification($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $commentModel = new CommentModel($this->container);
+        $fileModel = new TaskFileModel($this->container);
+        $taskLinkModel = new TaskLinkModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'test', 'task_id' => 1)));
+        $this->assertEquals(1, $commentModel->create(array('comment' => 'test', 'task_id' => 1, 'user_id' => 1)));
+        $this->assertEquals(1, $fileModel->create(1, 'test', 'blah', 123));
+        $this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
+
+        $task = $taskFinderModel->getDetails(1);
+        $subtask = $subtaskModel->getById(1, true);
+        $comment = $commentModel->getById(1);
+        $file = $commentModel->getById(1);
+        $tasklink = $taskLinkModel->getById(1);
+
+        $this->assertNotEmpty($task);
+        $this->assertNotEmpty($subtask);
+        $this->assertNotEmpty($comment);
+        $this->assertNotEmpty($file);
+
+        foreach (NotificationSubscriber::getSubscribedEvents() as $eventName => $values) {
+            $eventData = array(
+                'task' => $task,
+                'comment' => $comment,
+                'subtask' => $subtask,
+                'file' => $file,
+                'task_link' => $tasklink,
+                'changes' => array()
+            );
+            $this->assertNotEmpty($mailNotification->getMailContent($eventName, $eventData));
+            $this->assertNotEmpty($mailNotification->getMailSubject($eventName, $eventData));
+        }
+    }
+
+    public function testSendWithEmailAddress()
+    {
+        $mailNotification = new MailNotification($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $userModel = new UserModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertTrue($userModel->update(array('id' => 1, 'email' => 'test@localhost')));
+
+        $this->container['emailClient'] = $this
+            ->getMockBuilder('\Kanboard\Core\Mail\Client')
+            ->setConstructorArgs(array($this->container))
+            ->setMethods(array('send'))
+            ->getMock();
+
+        $this->container['emailClient']
+            ->expects($this->once())
+            ->method('send')
+            ->with(
+                $this->equalTo('test@localhost'),
+                $this->equalTo('admin'),
+                $this->equalTo('[test][New task] test (#1)'),
+                $this->stringContains('test')
+            );
+
+        $mailNotification->notifyUser($userModel->getById(1), TaskModel::EVENT_CREATE, array('task' => $taskFinderModel->getDetails(1)));
+    }
+
+    public function testSendWithoutEmailAddress()
+    {
+        $mailNotification = new MailNotification($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $userModel = new UserModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $this->container['emailClient'] = $this
+            ->getMockBuilder('\Kanboard\Core\Mail\Client')
+            ->setConstructorArgs(array($this->container))
+            ->setMethods(array('send'))
+            ->getMock();
+
+        $this->container['emailClient']
+            ->expects($this->never())
+            ->method('send');
+
+        $mailNotification->notifyUser($userModel->getById(1), TaskModel::EVENT_CREATE, array('task' => $taskFinderModel->getDetails(1)));
+    }
+}
diff --git a/tests/units/Notification/MailTest.php b/tests/units/Notification/MailTest.php
deleted file mode 100644
index 9f077ac8..00000000
--- a/tests/units/Notification/MailTest.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-require_once __DIR__.'/../Base.php';
-
-use Kanboard\Model\TaskFinderModel;
-use Kanboard\Model\TaskCreationModel;
-use Kanboard\Model\SubtaskModel;
-use Kanboard\Model\CommentModel;
-use Kanboard\Model\UserModel;
-use Kanboard\Model\TaskFileModel;
-use Kanboard\Model\ProjectModel;
-use Kanboard\Model\TaskModel;
-use Kanboard\Notification\MailNotification;
-use Kanboard\Subscriber\NotificationSubscriber;
-
-class MailTest extends Base
-{
-    public function testGetMailContent()
-    {
-        $en = new MailNotification($this->container);
-        $p = new ProjectModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $s = new SubtaskModel($this->container);
-        $c = new CommentModel($this->container);
-        $f = new TaskFileModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-        $this->assertEquals(1, $s->create(array('title' => 'test', 'task_id' => 1)));
-        $this->assertEquals(1, $c->create(array('comment' => 'test', 'task_id' => 1, 'user_id' => 1)));
-        $this->assertEquals(1, $f->create(1, 'test', 'blah', 123));
-
-        $task = $tf->getDetails(1);
-        $subtask = $s->getById(1, true);
-        $comment = $c->getById(1);
-        $file = $c->getById(1);
-
-        $this->assertNotEmpty($task);
-        $this->assertNotEmpty($subtask);
-        $this->assertNotEmpty($comment);
-        $this->assertNotEmpty($file);
-
-        foreach (NotificationSubscriber::getSubscribedEvents() as $event => $values) {
-            $this->assertNotEmpty($en->getMailContent($event, array(
-                'task' => $task,
-                'comment' => $comment,
-                'subtask' => $subtask,
-                'file' => $file,
-                'changes' => array())
-            ));
-
-            $this->assertNotEmpty($en->getMailSubject($event, array(
-                'task' => $task,
-                'comment' => $comment,
-                'subtask' => $subtask,
-                'file' => $file,
-                'changes' => array())
-            ));
-        }
-    }
-
-    public function testSendWithEmailAddress()
-    {
-        $en = new MailNotification($this->container);
-        $p = new ProjectModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $u = new UserModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-        $this->assertTrue($u->update(array('id' => 1, 'email' => 'test@localhost')));
-
-        $this->container['emailClient'] = $this
-            ->getMockBuilder('\Kanboard\Core\Mail\Client')
-            ->setConstructorArgs(array($this->container))
-            ->setMethods(array('send'))
-            ->getMock();
-
-        $this->container['emailClient']
-            ->expects($this->once())
-            ->method('send')
-            ->with(
-                $this->equalTo('test@localhost'),
-                $this->equalTo('admin'),
-                $this->equalTo('[test][New task] test (#1)'),
-                $this->stringContains('test')
-            );
-
-        $en->notifyUser($u->getById(1), TaskModel::EVENT_CREATE, array('task' => $tf->getDetails(1)));
-    }
-
-    public function testSendWithoutEmailAddress()
-    {
-        $en = new MailNotification($this->container);
-        $p = new ProjectModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $u = new UserModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $this->container['emailClient'] = $this
-            ->getMockBuilder('\Kanboard\Core\Mail\Client')
-            ->setConstructorArgs(array($this->container))
-            ->setMethods(array('send'))
-            ->getMock();
-
-        $this->container['emailClient']
-            ->expects($this->never())
-            ->method('send');
-
-        $en->notifyUser($u->getById(1), TaskModel::EVENT_CREATE, array('task' => $tf->getDetails(1)));
-    }
-}
diff --git a/tests/units/Notification/WebhookNotificationTest.php b/tests/units/Notification/WebhookNotificationTest.php
new file mode 100644
index 00000000..6fbc349c
--- /dev/null
+++ b/tests/units/Notification/WebhookNotificationTest.php
@@ -0,0 +1,29 @@
+<?php
+
+require_once __DIR__.'/../Base.php';
+
+use Kanboard\Model\ConfigModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Subscriber\NotificationSubscriber;
+
+class WebhookNotificationTest extends Base
+{
+    public function testTaskCreation()
+    {
+        $configModel = new ConfigModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $this->container['dispatcher']->addSubscriber(new NotificationSubscriber($this->container));
+
+        $configModel->save(array('webhook_url' => 'http://localhost/?task-creation'));
+
+        $this->container['httpClient']
+            ->expects($this->once())
+            ->method('postJson')
+            ->with($this->stringContains('http://localhost/?task-creation&token='), $this->anything());
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
+    }
+}
diff --git a/tests/units/Notification/WebhookTest.php b/tests/units/Notification/WebhookTest.php
deleted file mode 100644
index 5a9eb1c7..00000000
--- a/tests/units/Notification/WebhookTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-require_once __DIR__.'/../Base.php';
-
-use Kanboard\Model\ConfigModel;
-use Kanboard\Model\TaskCreationModel;
-use Kanboard\Model\ProjectModel;
-use Kanboard\Subscriber\NotificationSubscriber;
-
-class WebhookTest extends Base
-{
-    public function testTaskCreation()
-    {
-        $c = new ConfigModel($this->container);
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $this->container['dispatcher']->addSubscriber(new NotificationSubscriber($this->container));
-
-        $c->save(array('webhook_url' => 'http://localhost/?task-creation'));
-
-        $this->container['httpClient']
-            ->expects($this->once())
-            ->method('postJson')
-            ->with($this->stringContains('http://localhost/?task-creation&token='), $this->anything());
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('project_id' => 1, 'title' => 'test')));
-    }
-}
-- 
cgit v1.2.3


From 2a42e0e1aae35a9bb7abf054155b516ffab701d4 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 23 Jul 2016 18:10:05 -0400
Subject: Added a new automatic action to set due date

---
 ChangeLog                                          |  5 +-
 app/Action/TaskAssignDueDateOnCreation.php         | 96 ++++++++++++++++++++++
 app/ServiceProvider/ActionProvider.php             |  2 +
 .../Action/TaskAssignDueDateOnCreationTest.php     | 37 +++++++++
 tests/units/Action/TaskUpdateStartDateTest.php     |  3 +-
 5 files changed, 140 insertions(+), 3 deletions(-)
 create mode 100644 app/Action/TaskAssignDueDateOnCreation.php
 create mode 100644 tests/units/Action/TaskAssignDueDateOnCreationTest.php

(limited to 'app/Action')

diff --git a/ChangeLog b/ChangeLog
index ee57c86c..01ad5fbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,9 @@ Version 1.0.32 (unreleased)
 
 New features:
 
-* New automated action to close tasks without activity in a specific column
+* New automated actions:
+    - Close tasks without activity in a specific column
+    - Set due date automatically
 * Added internal task links to activity stream
 * Added new event for removed comments
 * Added search filter for task priority
@@ -11,6 +13,7 @@ New features:
 
 Improvements:
 
+* Internal events management refactoring
 * Handle header X-Real-IP to get IP address
 * Display project name for task auto-complete fields
 * Make search attributes not case sensitive
diff --git a/app/Action/TaskAssignDueDateOnCreation.php b/app/Action/TaskAssignDueDateOnCreation.php
new file mode 100644
index 00000000..79ff765c
--- /dev/null
+++ b/app/Action/TaskAssignDueDateOnCreation.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Kanboard\Action;
+
+use Kanboard\Model\TaskModel;
+
+/**
+ * Set the due date of task
+ *
+ * @package action
+ * @author  Frederic Guillot
+ */
+class TaskAssignDueDateOnCreation extends Base
+{
+    /**
+     * Get automatic action description
+     *
+     * @access public
+     * @return string
+     */
+    public function getDescription()
+    {
+        return t('Automatically set the due date on task creation');
+    }
+
+    /**
+     * Get the list of compatible events
+     *
+     * @access public
+     * @return array
+     */
+    public function getCompatibleEvents()
+    {
+        return array(
+            TaskModel::EVENT_CREATE,
+        );
+    }
+
+    /**
+     * Get the required parameter for the action (defined by the user)
+     *
+     * @access public
+     * @return array
+     */
+    public function getActionRequiredParameters()
+    {
+        return array(
+            'duration' => t('Duration in days')
+        );
+    }
+
+    /**
+     * Get the required parameter for the event
+     *
+     * @access public
+     * @return string[]
+     */
+    public function getEventRequiredParameters()
+    {
+        return array(
+            'task_id',
+            'task' => array(
+                'project_id',
+            ),
+        );
+    }
+
+    /**
+     * Execute the action (set the task color)
+     *
+     * @access public
+     * @param  array   $data   Event data dictionary
+     * @return bool            True if the action was executed or false when not executed
+     */
+    public function doAction(array $data)
+    {
+        $values = array(
+            'id' => $data['task_id'],
+            'date_due' => strtotime('+'.$this->getParam('duration').'days'),
+        );
+
+        return $this->taskModificationModel->update($values, false);
+    }
+
+    /**
+     * Check if the event data meet the action condition
+     *
+     * @access public
+     * @param  array   $data   Event data dictionary
+     * @return bool
+     */
+    public function hasRequiredCondition(array $data)
+    {
+        return true;
+    }
+}
diff --git a/app/ServiceProvider/ActionProvider.php b/app/ServiceProvider/ActionProvider.php
index 9383be12..c76555fa 100644
--- a/app/ServiceProvider/ActionProvider.php
+++ b/app/ServiceProvider/ActionProvider.php
@@ -3,6 +3,7 @@
 namespace Kanboard\ServiceProvider;
 
 use Kanboard\Action\TaskAssignColorPriority;
+use Kanboard\Action\TaskAssignDueDateOnCreation;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use Kanboard\Core\Action\ActionManager;
@@ -80,6 +81,7 @@ class ActionProvider implements ServiceProviderInterface
         $container['actionManager']->register(new TaskMoveColumnUnAssigned($container));
         $container['actionManager']->register(new TaskOpen($container));
         $container['actionManager']->register(new TaskUpdateStartDate($container));
+        $container['actionManager']->register(new TaskAssignDueDateOnCreation($container));
 
         return $container;
     }
diff --git a/tests/units/Action/TaskAssignDueDateOnCreationTest.php b/tests/units/Action/TaskAssignDueDateOnCreationTest.php
new file mode 100644
index 00000000..26c0584e
--- /dev/null
+++ b/tests/units/Action/TaskAssignDueDateOnCreationTest.php
@@ -0,0 +1,37 @@
+<?php
+
+use Kanboard\Action\TaskAssignDueDateOnCreation;
+use Kanboard\EventBuilder\TaskEventBuilder;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskModel;
+
+require_once __DIR__.'/../Base.php';
+
+class TaskAssignDueDateOnCreationTest extends Base
+{
+    public function testAction()
+    {
+        $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')));
+
+        $event = TaskEventBuilder::getInstance($this->container)
+            ->withTaskId(1)
+            ->buildEvent();
+
+        $action = new TaskAssignDueDateOnCreation($this->container);
+        $action->setProjectId(1);
+        $action->setParam('duration', 4);
+
+        $this->assertTrue($action->execute($event, TaskModel::EVENT_CREATE));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(date('Y-m-d', strtotime('+4days')), date('Y-m-d', $task['date_due']));
+    }
+}
diff --git a/tests/units/Action/TaskUpdateStartDateTest.php b/tests/units/Action/TaskUpdateStartDateTest.php
index 8d609b3e..05fac100 100644
--- a/tests/units/Action/TaskUpdateStartDateTest.php
+++ b/tests/units/Action/TaskUpdateStartDateTest.php
@@ -2,7 +2,6 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
 use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
@@ -12,7 +11,7 @@ use Kanboard\Action\TaskUpdateStartDate;
 
 class TaskUpdateStartDateTest extends Base
 {
-    public function testClose()
+    public function testAction()
     {
         $projectModel = new ProjectModel($this->container);
         $taskCreationModel = new TaskCreationModel($this->container);
-- 
cgit v1.2.3


From 9b2a32af78ef8fb5424398dc57e3c3f906026272 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 23 Jul 2016 18:33:31 -0400
Subject: Add new automatic action to move a task to another column when closed

---
 ChangeLog                                       |   1 +
 app/Action/Base.php                             |   2 +-
 app/Action/CommentCreation.php                  |   2 +-
 app/Action/CommentCreationMoveTaskColumn.php    |   2 +-
 app/Action/TaskAssignCategoryColor.php          |   2 +-
 app/Action/TaskAssignCategoryLabel.php          |   2 +-
 app/Action/TaskAssignCategoryLink.php           |   2 +-
 app/Action/TaskAssignColorCategory.php          |   2 +-
 app/Action/TaskAssignColorColumn.php            |   2 +-
 app/Action/TaskAssignColorLink.php              |   2 +-
 app/Action/TaskAssignColorPriority.php          |   2 +-
 app/Action/TaskAssignColorUser.php              |   2 +-
 app/Action/TaskAssignCurrentUser.php            |   2 +-
 app/Action/TaskAssignCurrentUserColumn.php      |   2 +-
 app/Action/TaskAssignDueDateOnCreation.php      |   2 +-
 app/Action/TaskAssignSpecificUser.php           |   2 +-
 app/Action/TaskAssignUser.php                   |   2 +-
 app/Action/TaskClose.php                        |   2 +-
 app/Action/TaskCloseColumn.php                  |   2 +-
 app/Action/TaskCloseNoActivity.php              |   2 +-
 app/Action/TaskCloseNoActivityColumn.php        |   2 +-
 app/Action/TaskCreation.php                     |   2 +-
 app/Action/TaskDuplicateAnotherProject.php      |   2 +-
 app/Action/TaskEmail.php                        |   2 +-
 app/Action/TaskEmailNoActivity.php              |   2 +-
 app/Action/TaskMoveAnotherProject.php           |   2 +-
 app/Action/TaskMoveColumnAssigned.php           |   2 +-
 app/Action/TaskMoveColumnCategoryChange.php     |   2 +-
 app/Action/TaskMoveColumnClosed.php             | 102 ++++++++++++++++++++++++
 app/Action/TaskMoveColumnUnAssigned.php         |   2 +-
 app/Action/TaskOpen.php                         |   2 +-
 app/Action/TaskUpdateStartDate.php              |   2 +-
 app/Model/TaskPositionModel.php                 |  19 ++---
 app/ServiceProvider/ActionProvider.php          |   2 +
 tests/units/Action/TaskMoveColumnClosedTest.php |  91 +++++++++++++++++++++
 35 files changed, 236 insertions(+), 39 deletions(-)
 create mode 100644 app/Action/TaskMoveColumnClosed.php
 create mode 100644 tests/units/Action/TaskMoveColumnClosedTest.php

(limited to 'app/Action')

diff --git a/ChangeLog b/ChangeLog
index 01ad5fbd..c9aebc48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ New features:
 * New automated actions:
     - Close tasks without activity in a specific column
     - Set due date automatically
+    - Move a task to another column when closed
 * Added internal task links to activity stream
 * Added new event for removed comments
 * Added search filter for task priority
diff --git a/app/Action/Base.php b/app/Action/Base.php
index e0ed8bde..9a502a08 100644
--- a/app/Action/Base.php
+++ b/app/Action/Base.php
@@ -7,7 +7,7 @@ use Kanboard\Event\GenericEvent;
 /**
  * Base class for automatic actions
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 abstract class Base extends \Kanboard\Core\Base
diff --git a/app/Action/CommentCreation.php b/app/Action/CommentCreation.php
index 60ca24f7..301d2cf9 100644
--- a/app/Action/CommentCreation.php
+++ b/app/Action/CommentCreation.php
@@ -5,7 +5,7 @@ namespace Kanboard\Action;
 /**
  * Create automatically a comment from a webhook
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class CommentCreation extends Base
diff --git a/app/Action/CommentCreationMoveTaskColumn.php b/app/Action/CommentCreationMoveTaskColumn.php
index 8ab792ad..d5bdd807 100644
--- a/app/Action/CommentCreationMoveTaskColumn.php
+++ b/app/Action/CommentCreationMoveTaskColumn.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Add a comment of the triggering event to the task description.
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Oren Ben-Kiki
  */
 class CommentCreationMoveTaskColumn extends Base
diff --git a/app/Action/TaskAssignCategoryColor.php b/app/Action/TaskAssignCategoryColor.php
index 2df90b2c..9228e1ff 100644
--- a/app/Action/TaskAssignCategoryColor.php
+++ b/app/Action/TaskAssignCategoryColor.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Set a category automatically according to the color
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskAssignCategoryColor extends Base
diff --git a/app/Action/TaskAssignCategoryLabel.php b/app/Action/TaskAssignCategoryLabel.php
index 48299010..c390414e 100644
--- a/app/Action/TaskAssignCategoryLabel.php
+++ b/app/Action/TaskAssignCategoryLabel.php
@@ -5,7 +5,7 @@ namespace Kanboard\Action;
 /**
  * Set a category automatically according to a label
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskAssignCategoryLabel extends Base
diff --git a/app/Action/TaskAssignCategoryLink.php b/app/Action/TaskAssignCategoryLink.php
index d4a4c0ec..6c4b6c96 100644
--- a/app/Action/TaskAssignCategoryLink.php
+++ b/app/Action/TaskAssignCategoryLink.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskLinkModel;
 /**
  * Set a category automatically according to a task link
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Olivier Maridat
  * @author  Frederic Guillot
  */
diff --git a/app/Action/TaskAssignColorCategory.php b/app/Action/TaskAssignColorCategory.php
index 91860be4..a136ffd2 100644
--- a/app/Action/TaskAssignColorCategory.php
+++ b/app/Action/TaskAssignColorCategory.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Assign a color to a specific category
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskAssignColorCategory extends Base
diff --git a/app/Action/TaskAssignColorColumn.php b/app/Action/TaskAssignColorColumn.php
index 6c674b1f..da6e3aed 100644
--- a/app/Action/TaskAssignColorColumn.php
+++ b/app/Action/TaskAssignColorColumn.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Assign a color to a task
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskAssignColorColumn extends Base
diff --git a/app/Action/TaskAssignColorLink.php b/app/Action/TaskAssignColorLink.php
index 9759f622..19c37afe 100644
--- a/app/Action/TaskAssignColorLink.php
+++ b/app/Action/TaskAssignColorLink.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskLinkModel;
 /**
  * Assign a color to a specific task link
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskAssignColorLink extends Base
diff --git a/app/Action/TaskAssignColorPriority.php b/app/Action/TaskAssignColorPriority.php
index 57000ba8..37f7ffed 100644
--- a/app/Action/TaskAssignColorPriority.php
+++ b/app/Action/TaskAssignColorPriority.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Assign a color to a priority
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskAssignColorPriority extends Base
diff --git a/app/Action/TaskAssignColorUser.php b/app/Action/TaskAssignColorUser.php
index 385db793..468d0198 100644
--- a/app/Action/TaskAssignColorUser.php
+++ b/app/Action/TaskAssignColorUser.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Assign a color to a specific user
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskAssignColorUser extends Base
diff --git a/app/Action/TaskAssignCurrentUser.php b/app/Action/TaskAssignCurrentUser.php
index 997aa98f..dee5e7db 100644
--- a/app/Action/TaskAssignCurrentUser.php
+++ b/app/Action/TaskAssignCurrentUser.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Assign a task to the logged user
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskAssignCurrentUser extends Base
diff --git a/app/Action/TaskAssignCurrentUserColumn.php b/app/Action/TaskAssignCurrentUserColumn.php
index e4eade33..60ada7ef 100644
--- a/app/Action/TaskAssignCurrentUserColumn.php
+++ b/app/Action/TaskAssignCurrentUserColumn.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Assign a task to the logged user on column change
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskAssignCurrentUserColumn extends Base
diff --git a/app/Action/TaskAssignDueDateOnCreation.php b/app/Action/TaskAssignDueDateOnCreation.php
index 79ff765c..5c6e2b61 100644
--- a/app/Action/TaskAssignDueDateOnCreation.php
+++ b/app/Action/TaskAssignDueDateOnCreation.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Set the due date of task
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskAssignDueDateOnCreation extends Base
diff --git a/app/Action/TaskAssignSpecificUser.php b/app/Action/TaskAssignSpecificUser.php
index 2c7dcacd..daf9e1df 100644
--- a/app/Action/TaskAssignSpecificUser.php
+++ b/app/Action/TaskAssignSpecificUser.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Assign a task to a specific user
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskAssignSpecificUser extends Base
diff --git a/app/Action/TaskAssignUser.php b/app/Action/TaskAssignUser.php
index 9ea22986..8727b672 100644
--- a/app/Action/TaskAssignUser.php
+++ b/app/Action/TaskAssignUser.php
@@ -5,7 +5,7 @@ namespace Kanboard\Action;
 /**
  * Assign a task to someone
  *
- * @package action
+ * @package Kanboard\Actionv
  * @author  Frederic Guillot
  */
 class TaskAssignUser extends Base
diff --git a/app/Action/TaskClose.php b/app/Action/TaskClose.php
index 91e8cf43..e476e9ba 100644
--- a/app/Action/TaskClose.php
+++ b/app/Action/TaskClose.php
@@ -5,7 +5,7 @@ namespace Kanboard\Action;
 /**
  * Close automatically a task
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskClose extends Base
diff --git a/app/Action/TaskCloseColumn.php b/app/Action/TaskCloseColumn.php
index 4f1ffc92..523996f4 100644
--- a/app/Action/TaskCloseColumn.php
+++ b/app/Action/TaskCloseColumn.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Close automatically a task in a specific column
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskCloseColumn extends Base
diff --git a/app/Action/TaskCloseNoActivity.php b/app/Action/TaskCloseNoActivity.php
index 5a10510f..ea724d8c 100644
--- a/app/Action/TaskCloseNoActivity.php
+++ b/app/Action/TaskCloseNoActivity.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Close automatically a task after when inactive
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskCloseNoActivity extends Base
diff --git a/app/Action/TaskCloseNoActivityColumn.php b/app/Action/TaskCloseNoActivityColumn.php
index 7af0b7fc..b2ee5224 100644
--- a/app/Action/TaskCloseNoActivityColumn.php
+++ b/app/Action/TaskCloseNoActivityColumn.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Close automatically a task after inactive and in an defined column
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskCloseNoActivityColumn extends Base
diff --git a/app/Action/TaskCreation.php b/app/Action/TaskCreation.php
index 0620afd3..01d91228 100644
--- a/app/Action/TaskCreation.php
+++ b/app/Action/TaskCreation.php
@@ -5,7 +5,7 @@ namespace Kanboard\Action;
 /**
  * Create automatically a task from a webhook
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskCreation extends Base
diff --git a/app/Action/TaskDuplicateAnotherProject.php b/app/Action/TaskDuplicateAnotherProject.php
index d6d8d51f..0ad7713c 100644
--- a/app/Action/TaskDuplicateAnotherProject.php
+++ b/app/Action/TaskDuplicateAnotherProject.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Duplicate a task to another project
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskDuplicateAnotherProject extends Base
diff --git a/app/Action/TaskEmail.php b/app/Action/TaskEmail.php
index 526e9aa8..fdfe7987 100644
--- a/app/Action/TaskEmail.php
+++ b/app/Action/TaskEmail.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Email a task to someone
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskEmail extends Base
diff --git a/app/Action/TaskEmailNoActivity.php b/app/Action/TaskEmailNoActivity.php
index c60702fb..cac4281e 100644
--- a/app/Action/TaskEmailNoActivity.php
+++ b/app/Action/TaskEmailNoActivity.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Email a task with no activity
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskEmailNoActivity extends Base
diff --git a/app/Action/TaskMoveAnotherProject.php b/app/Action/TaskMoveAnotherProject.php
index 148b6b0c..0fa22b1b 100644
--- a/app/Action/TaskMoveAnotherProject.php
+++ b/app/Action/TaskMoveAnotherProject.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Move a task to another project
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskMoveAnotherProject extends Base
diff --git a/app/Action/TaskMoveColumnAssigned.php b/app/Action/TaskMoveColumnAssigned.php
index 1c1f657a..1cfe6743 100644
--- a/app/Action/TaskMoveColumnAssigned.php
+++ b/app/Action/TaskMoveColumnAssigned.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Move a task to another column when an assignee is set
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Francois Ferrand
  */
 class TaskMoveColumnAssigned extends Base
diff --git a/app/Action/TaskMoveColumnCategoryChange.php b/app/Action/TaskMoveColumnCategoryChange.php
index 4c2b289a..13d6ee4f 100644
--- a/app/Action/TaskMoveColumnCategoryChange.php
+++ b/app/Action/TaskMoveColumnCategoryChange.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Move a task to another column when the category is changed
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Francois Ferrand
  */
 class TaskMoveColumnCategoryChange extends Base
diff --git a/app/Action/TaskMoveColumnClosed.php b/app/Action/TaskMoveColumnClosed.php
new file mode 100644
index 00000000..3f3e2124
--- /dev/null
+++ b/app/Action/TaskMoveColumnClosed.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace Kanboard\Action;
+
+use Kanboard\Model\TaskModel;
+
+/**
+ * Move a task to another column when the task is closed
+ *
+ * @package Kanboard\Action
+ * @author  Frederic Guillot
+ */
+class TaskMoveColumnClosed extends Base
+{
+    /**
+     * Get automatic action description
+     *
+     * @access public
+     * @return string
+     */
+    public function getDescription()
+    {
+        return t('Move the task to another column when closed');
+    }
+
+    /**
+     * Get the list of compatible events
+     *
+     * @access public
+     * @return array
+     */
+    public function getCompatibleEvents()
+    {
+        return array(
+            TaskModel::EVENT_CLOSE,
+        );
+    }
+
+    /**
+     * Get the required parameter for the action (defined by the user)
+     *
+     * @access public
+     * @return array
+     */
+    public function getActionRequiredParameters()
+    {
+        return array(
+            'dest_column_id' => t('Destination column'),
+        );
+    }
+
+    /**
+     * Get the required parameter for the event
+     *
+     * @access public
+     * @return string[]
+     */
+    public function getEventRequiredParameters()
+    {
+        return array(
+            'task_id',
+            'task' => array(
+                'project_id',
+                'column_id',
+                'swimlane_id',
+                'is_active',
+            )
+        );
+    }
+
+    /**
+     * Execute the action (move the task to another column)
+     *
+     * @access public
+     * @param  array   $data   Event data dictionary
+     * @return bool            True if the action was executed or false when not executed
+     */
+    public function doAction(array $data)
+    {
+        return $this->taskPositionModel->movePosition(
+            $data['task']['project_id'],
+            $data['task']['id'],
+            $this->getParam('dest_column_id'),
+            1,
+            $data['task']['swimlane_id'],
+            false,
+            false
+        );
+    }
+
+    /**
+     * Check if the event data meet the action condition
+     *
+     * @access public
+     * @param  array   $data   Event data dictionary
+     * @return bool
+     */
+    public function hasRequiredCondition(array $data)
+    {
+        return $data['task']['column_id'] != $this->getParam('dest_column_id') && $data['task']['is_active'] == 0;
+    }
+}
diff --git a/app/Action/TaskMoveColumnUnAssigned.php b/app/Action/TaskMoveColumnUnAssigned.php
index 0e9a8a16..ab63d624 100644
--- a/app/Action/TaskMoveColumnUnAssigned.php
+++ b/app/Action/TaskMoveColumnUnAssigned.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Move a task to another column when an assignee is cleared
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Francois Ferrand
  */
 class TaskMoveColumnUnAssigned extends Base
diff --git a/app/Action/TaskOpen.php b/app/Action/TaskOpen.php
index 8e847b8e..49017831 100644
--- a/app/Action/TaskOpen.php
+++ b/app/Action/TaskOpen.php
@@ -5,7 +5,7 @@ namespace Kanboard\Action;
 /**
  * Open automatically a task
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskOpen extends Base
diff --git a/app/Action/TaskUpdateStartDate.php b/app/Action/TaskUpdateStartDate.php
index cc016da1..160f6ee5 100644
--- a/app/Action/TaskUpdateStartDate.php
+++ b/app/Action/TaskUpdateStartDate.php
@@ -7,7 +7,7 @@ use Kanboard\Model\TaskModel;
 /**
  * Set the start date of task
  *
- * @package action
+ * @package Kanboard\Action
  * @author  Frederic Guillot
  */
 class TaskUpdateStartDate extends Base
diff --git a/app/Model/TaskPositionModel.php b/app/Model/TaskPositionModel.php
index d6d2a0af..3d95a763 100644
--- a/app/Model/TaskPositionModel.php
+++ b/app/Model/TaskPositionModel.php
@@ -16,15 +16,16 @@ class TaskPositionModel extends Base
      * Move a task to another column or to another position
      *
      * @access public
-     * @param  integer    $project_id        Project id
-     * @param  integer    $task_id           Task id
-     * @param  integer    $column_id         Column id
-     * @param  integer    $position          Position (must be >= 1)
-     * @param  integer    $swimlane_id       Swimlane id
-     * @param  boolean    $fire_events       Fire events
-     * @return boolean
+     * @param  integer $project_id  Project id
+     * @param  integer $task_id     Task id
+     * @param  integer $column_id   Column id
+     * @param  integer $position    Position (must be >= 1)
+     * @param  integer $swimlane_id Swimlane id
+     * @param  boolean $fire_events Fire events
+     * @param  bool    $onlyOpen    Do not move closed tasks
+     * @return bool
      */
-    public function movePosition($project_id, $task_id, $column_id, $position, $swimlane_id = 0, $fire_events = true)
+    public function movePosition($project_id, $task_id, $column_id, $position, $swimlane_id = 0, $fire_events = true, $onlyOpen = true)
     {
         if ($position < 1) {
             return false;
@@ -32,7 +33,7 @@ class TaskPositionModel extends Base
 
         $task = $this->taskFinderModel->getById($task_id);
 
-        if ($task['is_active'] == TaskModel::STATUS_CLOSED) {
+        if ($onlyOpen && $task['is_active'] == TaskModel::STATUS_CLOSED) {
             return true;
         }
 
diff --git a/app/ServiceProvider/ActionProvider.php b/app/ServiceProvider/ActionProvider.php
index c76555fa..cbc60679 100644
--- a/app/ServiceProvider/ActionProvider.php
+++ b/app/ServiceProvider/ActionProvider.php
@@ -4,6 +4,7 @@ namespace Kanboard\ServiceProvider;
 
 use Kanboard\Action\TaskAssignColorPriority;
 use Kanboard\Action\TaskAssignDueDateOnCreation;
+use Kanboard\Action\TaskMoveColumnClosed;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use Kanboard\Core\Action\ActionManager;
@@ -78,6 +79,7 @@ class ActionProvider implements ServiceProviderInterface
         $container['actionManager']->register(new TaskMoveAnotherProject($container));
         $container['actionManager']->register(new TaskMoveColumnAssigned($container));
         $container['actionManager']->register(new TaskMoveColumnCategoryChange($container));
+        $container['actionManager']->register(new TaskMoveColumnClosed($container));
         $container['actionManager']->register(new TaskMoveColumnUnAssigned($container));
         $container['actionManager']->register(new TaskOpen($container));
         $container['actionManager']->register(new TaskUpdateStartDate($container));
diff --git a/tests/units/Action/TaskMoveColumnClosedTest.php b/tests/units/Action/TaskMoveColumnClosedTest.php
new file mode 100644
index 00000000..318b995d
--- /dev/null
+++ b/tests/units/Action/TaskMoveColumnClosedTest.php
@@ -0,0 +1,91 @@
+<?php
+
+use Kanboard\Action\TaskMoveColumnClosed;
+use Kanboard\EventBuilder\TaskEventBuilder;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskModel;
+
+require_once __DIR__.'/../Base.php';
+
+class TaskMoveColumnClosedTest extends Base
+{
+    public function testSuccess()
+    {
+        $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(2, $projectModel->create(array('name' => 'test2')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test', 'is_active' => 0)));
+
+        $event = TaskEventBuilder::getInstance($this->container)
+            ->withTaskId(1)
+            ->buildEvent();
+
+        $action = new TaskMoveColumnClosed($this->container);
+        $action->setProjectId(1);
+        $action->setParam('dest_column_id', 2);
+
+        $this->assertTrue($action->execute($event, TaskModel::EVENT_CLOSE));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals('test', $task['title']);
+        $this->assertEquals(2, $task['column_id']);
+    }
+
+    public function testWhenTaskIsOpen()
+    {
+        $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(2, $projectModel->create(array('name' => 'test2')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
+
+        $event = TaskEventBuilder::getInstance($this->container)
+            ->withTaskId(1)
+            ->buildEvent();
+
+        $action = new TaskMoveColumnClosed($this->container);
+        $action->setProjectId(1);
+        $action->setParam('dest_column_id', 2);
+
+        $this->assertFalse($action->execute($event, TaskModel::EVENT_CLOSE));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals('test', $task['title']);
+        $this->assertEquals(1, $task['column_id']);
+    }
+
+    public function testWhenTaskIsAlreadyInDestinationColumn()
+    {
+        $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(2, $projectModel->create(array('name' => 'test2')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test', 'is_active' => 0, 'column_id' => 2)));
+
+        $event = TaskEventBuilder::getInstance($this->container)
+            ->withTaskId(1)
+            ->buildEvent();
+
+        $action = new TaskMoveColumnClosed($this->container);
+        $action->setProjectId(1);
+        $action->setParam('dest_column_id', 2);
+
+        $this->assertFalse($action->execute($event, TaskModel::EVENT_CLOSE));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals('test', $task['title']);
+        $this->assertEquals(2, $task['column_id']);
+    }
+}
-- 
cgit v1.2.3


From ca45b5592b17d3675a22b7aca49ea49dd9dd57ea Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 23 Jul 2016 18:59:00 -0400
Subject: Add new automatic action to move the task to another column when not
 moved

---
 ChangeLog                                          |   1 +
 app/Action/TaskMoveColumnNotMovedPeriod.php        | 104 +++++++++++++++++++++
 app/ServiceProvider/ActionProvider.php             |   2 +
 .../Action/TaskMoveColumnNotMovedPeriodTest.php    |  50 ++++++++++
 4 files changed, 157 insertions(+)
 create mode 100644 app/Action/TaskMoveColumnNotMovedPeriod.php
 create mode 100644 tests/units/Action/TaskMoveColumnNotMovedPeriodTest.php

(limited to 'app/Action')

diff --git a/ChangeLog b/ChangeLog
index c9aebc48..1bc0eed3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ New features:
     - Close tasks without activity in a specific column
     - Set due date automatically
     - Move a task to another column when closed
+    - Move a task to another column when not moved during a given period
 * Added internal task links to activity stream
 * Added new event for removed comments
 * Added search filter for task priority
diff --git a/app/Action/TaskMoveColumnNotMovedPeriod.php b/app/Action/TaskMoveColumnNotMovedPeriod.php
new file mode 100644
index 00000000..87e7e405
--- /dev/null
+++ b/app/Action/TaskMoveColumnNotMovedPeriod.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Kanboard\Action;
+
+use Kanboard\Model\TaskModel;
+
+/**
+ * Move a task to another column when not moved during a given period
+ *
+ * @package Kanboard\Action
+ * @author  Frederic Guillot
+ */
+class TaskMoveColumnNotMovedPeriod extends Base
+{
+    /**
+     * Get automatic action description
+     *
+     * @access public
+     * @return string
+     */
+    public function getDescription()
+    {
+        return t('Move the task to another column when not moved during a given period');
+    }
+
+    /**
+     * Get the list of compatible events
+     *
+     * @access public
+     * @return array
+     */
+    public function getCompatibleEvents()
+    {
+        return array(TaskModel::EVENT_DAILY_CRONJOB);
+    }
+
+    /**
+     * Get the required parameter for the action (defined by the user)
+     *
+     * @access public
+     * @return array
+     */
+    public function getActionRequiredParameters()
+    {
+        return array(
+            'duration' => t('Duration in days'),
+            'src_column_id' => t('Source column'),
+            'dest_column_id' => t('Destination column'),
+        );
+    }
+
+    /**
+     * Get the required parameter for the event
+     *
+     * @access public
+     * @return string[]
+     */
+    public function getEventRequiredParameters()
+    {
+        return array('tasks');
+    }
+
+    /**
+     * Execute the action (close the task)
+     *
+     * @access public
+     * @param  array   $data   Event data dictionary
+     * @return bool            True if the action was executed or false when not executed
+     */
+    public function doAction(array $data)
+    {
+        $results = array();
+        $max = $this->getParam('duration') * 86400;
+
+        foreach ($data['tasks'] as $task) {
+            $duration = time() - $task['date_moved'];
+
+            if ($duration > $max && $task['column_id'] == $this->getParam('src_column_id')) {
+                $results[] = $this->taskPositionModel->movePosition(
+                    $task['project_id'],
+                    $task['id'],
+                    $this->getParam('dest_column_id'),
+                    1,
+                    $task['swimlane_id'],
+                    false
+                );
+            }
+        }
+
+        return in_array(true, $results, true);
+    }
+
+    /**
+     * Check if the event data meet the action condition
+     *
+     * @access public
+     * @param  array   $data   Event data dictionary
+     * @return bool
+     */
+    public function hasRequiredCondition(array $data)
+    {
+        return count($data['tasks']) > 0;
+    }
+}
diff --git a/app/ServiceProvider/ActionProvider.php b/app/ServiceProvider/ActionProvider.php
index cbc60679..946fbf41 100644
--- a/app/ServiceProvider/ActionProvider.php
+++ b/app/ServiceProvider/ActionProvider.php
@@ -5,6 +5,7 @@ namespace Kanboard\ServiceProvider;
 use Kanboard\Action\TaskAssignColorPriority;
 use Kanboard\Action\TaskAssignDueDateOnCreation;
 use Kanboard\Action\TaskMoveColumnClosed;
+use Kanboard\Action\TaskMoveColumnNotMovedPeriod;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use Kanboard\Core\Action\ActionManager;
@@ -80,6 +81,7 @@ class ActionProvider implements ServiceProviderInterface
         $container['actionManager']->register(new TaskMoveColumnAssigned($container));
         $container['actionManager']->register(new TaskMoveColumnCategoryChange($container));
         $container['actionManager']->register(new TaskMoveColumnClosed($container));
+        $container['actionManager']->register(new TaskMoveColumnNotMovedPeriod($container));
         $container['actionManager']->register(new TaskMoveColumnUnAssigned($container));
         $container['actionManager']->register(new TaskOpen($container));
         $container['actionManager']->register(new TaskUpdateStartDate($container));
diff --git a/tests/units/Action/TaskMoveColumnNotMovedPeriodTest.php b/tests/units/Action/TaskMoveColumnNotMovedPeriodTest.php
new file mode 100644
index 00000000..7fa16cf2
--- /dev/null
+++ b/tests/units/Action/TaskMoveColumnNotMovedPeriodTest.php
@@ -0,0 +1,50 @@
+<?php
+
+use Kanboard\Action\TaskMoveColumnNotMovedPeriod;
+use Kanboard\Event\TaskListEvent;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskModel;
+
+require_once __DIR__.'/../Base.php';
+
+class TaskMoveColumnNotMovedPeriodTest extends Base
+{
+    public function testAction()
+    {
+        $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->assertEquals(2, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test', 'column_id' => 3)));
+        $this->assertEquals(3, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test', 'column_id' => 2)));
+
+        $this->container['db']->table(TaskModel::TABLE)->in('id', array(2, 3))->update(array('date_moved' => strtotime('-10days')));
+
+        $tasks = $taskFinderModel->getAll(1);
+        $event = new TaskListEvent(array('tasks' => $tasks, 'project_id' => 1));
+
+        $action = new TaskMoveColumnNotMovedPeriod($this->container);
+        $action->setProjectId(1);
+        $action->setParam('duration', 2);
+        $action->setParam('src_column_id', 2);
+        $action->setParam('dest_column_id', 3);
+
+        $this->assertTrue($action->execute($event, TaskModel::EVENT_DAILY_CRONJOB));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(1, $task['column_id']);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(3, $task['column_id']);
+
+        $task = $taskFinderModel->getById(3);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(3, $task['column_id']);
+    }
+}
-- 
cgit v1.2.3