Refactoring of internal task events

31 files changed, 408 insertions, 181 deletions

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']);
     }
 }