Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/Job/NotificationJob.php

7 files changed, 20 insertions, 96 deletions

diff --git a/app/Subscriber/BaseSubscriber.php b/app/Subscriber/BaseSubscriber.php
index fdea29f6..92441962 100644
--- a/app/Subscriber/BaseSubscriber.php
+++ b/app/Subscriber/BaseSubscriber.php
@@ -12,28 +12,4 @@ use Kanboard\Core\Base;
  */
 class BaseSubscriber extends Base
 {
-    /**
-     * Method called
-     *
-     * @access private
-     * @var array
-     */
-    private $called = array();
-
-    /**
-     * Check if a listener has been executed
-     *
-     * @access public
-     * @param  string  $key
-     * @return boolean
-     */
-    public function isExecuted($key = '')
-    {
-        if (isset($this->called[$key])) {
-            return true;
-        }
-
-        $this->called[$key] = true;
-        return false;
-    }
 }
diff --git a/app/Subscriber/BootstrapSubscriber.php b/app/Subscriber/BootstrapSubscriber.php
index 7d12e9ae..3618f30f 100644
--- a/app/Subscriber/BootstrapSubscriber.php
+++ b/app/Subscriber/BootstrapSubscriber.php
@@ -21,7 +21,7 @@ class BootstrapSubscriber extends BaseSubscriber implements EventSubscriberInter
         $this->actionManager->attachEvents();
 
         if ($this->userSession->isLogged()) {
-            $this->sessionStorage->hasSubtaskInProgress = $this->subtaskModel->hasSubtaskInProgress($this->userSession->getId());
+            $this->sessionStorage->hasSubtaskInProgress = $this->subtaskStatusModel->hasSubtaskInProgress($this->userSession->getId());
         }
     }
 
diff --git a/app/Subscriber/NotificationSubscriber.php b/app/Subscriber/NotificationSubscriber.php
index db11e585..7cc68b26 100644
--- a/app/Subscriber/NotificationSubscriber.php
+++ b/app/Subscriber/NotificationSubscriber.php
@@ -3,7 +3,7 @@
 namespace Kanboard\Subscriber;
 
 use Kanboard\Event\GenericEvent;
-use Kanboard\Job\NotificationJob;
+use Kanboard\Model\TaskLinkModel;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\CommentModel;
 use Kanboard\Model\SubtaskModel;
@@ -26,21 +26,20 @@ class NotificationSubscriber extends BaseSubscriber implements EventSubscriberIn
             TaskModel::EVENT_ASSIGNEE_CHANGE => 'handleEvent',
             SubtaskModel::EVENT_CREATE       => 'handleEvent',
             SubtaskModel::EVENT_UPDATE       => 'handleEvent',
+            SubtaskModel::EVENT_DELETE       => 'handleEvent',
             CommentModel::EVENT_CREATE       => 'handleEvent',
             CommentModel::EVENT_UPDATE       => 'handleEvent',
+            CommentModel::EVENT_DELETE       => 'handleEvent',
             CommentModel::EVENT_USER_MENTION => 'handleEvent',
             TaskFileModel::EVENT_CREATE      => 'handleEvent',
+            TaskLinkModel::EVENT_CREATE_UPDATE      => 'handleEvent',
+            TaskLinkModel::EVENT_DELETE             => 'handleEvent',
         );
     }
 
     public function handleEvent(GenericEvent $event, $eventName)
     {
-        if (!$this->isExecuted($eventName)) {
-            $this->logger->debug('Subscriber executed: ' . __METHOD__);
-
-            $this->queueManager->push(NotificationJob::getInstance($this->container)
-                ->withParams($event, $eventName, get_class($event))
-            );
-        }
+        $this->logger->debug('Subscriber executed: ' . __METHOD__);
+        $this->queueManager->push($this->notificationJob->withParams($event, $eventName));
     }
 }
diff --git a/app/Subscriber/ProjectDailySummarySubscriber.php b/app/Subscriber/ProjectDailySummarySubscriber.php
index 6971a121..eaa9d468 100644
--- a/app/Subscriber/ProjectDailySummarySubscriber.php
+++ b/app/Subscriber/ProjectDailySummarySubscriber.php
@@ -3,7 +3,6 @@
 namespace Kanboard\Subscriber;
 
 use Kanboard\Event\TaskEvent;
-use Kanboard\Job\ProjectMetricJob;
 use Kanboard\Model\TaskModel;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -22,9 +21,7 @@ class ProjectDailySummarySubscriber extends BaseSubscriber implements EventSubsc
 
     public function execute(TaskEvent $event)
     {
-        if (isset($event['project_id']) && !$this->isExecuted()) {
-            $this->logger->debug('Subscriber executed: '.__METHOD__);
-            $this->queueManager->push(ProjectMetricJob::getInstance($this->container)->withParams($event['project_id']));
-        }
+        $this->logger->debug('Subscriber executed: '.__METHOD__);
+        $this->queueManager->push($this->projectMetricJob->withParams($event['task']['project_id']));
     }
 }
diff --git a/app/Subscriber/ProjectModificationDateSubscriber.php b/app/Subscriber/ProjectModificationDateSubscriber.php
index fee04eaa..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->isExecuted()) {
-            $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/app/Subscriber/RecurringTaskSubscriber.php b/app/Subscriber/RecurringTaskSubscriber.php
index 21cd3996..3e2848f8 100644
--- a/app/Subscriber/RecurringTaskSubscriber.php
+++ b/app/Subscriber/RecurringTaskSubscriber.php
@@ -19,12 +19,13 @@ class RecurringTaskSubscriber extends BaseSubscriber implements EventSubscriberI
     public function onMove(TaskEvent $event)
     {
         $this->logger->debug('Subscriber executed: '.__METHOD__);
+        $task = $event['task'];
 
-        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->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->taskRecurrenceModel->duplicateRecurringTask($event['task_id']);
+        if ($task['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING) {
+            if ($task['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_FIRST_COLUMN && $this->columnModel->getFirstColumnId($task['project_id']) == $event['src_column_id']) {
+                $this->taskRecurrenceModel->duplicateRecurringTask($task['id']);
+            } elseif ($task['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_LAST_COLUMN && $this->columnModel->getLastColumnId($task['project_id']) == $event['dst_column_id']) {
+                $this->taskRecurrenceModel->duplicateRecurringTask($task['id']);
             }
         }
     }
@@ -32,8 +33,9 @@ class RecurringTaskSubscriber extends BaseSubscriber implements EventSubscriberI
     public function onClose(TaskEvent $event)
     {
         $this->logger->debug('Subscriber executed: '.__METHOD__);
+        $task = $event['task'];
 
-        if ($event['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING && $event['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_CLOSE) {
+        if ($task['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING && $task['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_CLOSE) {
             $this->taskRecurrenceModel->duplicateRecurringTask($event['task_id']);
         }
     }
diff --git a/app/Subscriber/SubtaskTimeTrackingSubscriber.php b/app/Subscriber/SubtaskTimeTrackingSubscriber.php
deleted file mode 100644
index 7e39c126..00000000
--- a/app/Subscriber/SubtaskTimeTrackingSubscriber.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Kanboard\Subscriber;
-
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Kanboard\Model\SubtaskModel;
-use Kanboard\Event\SubtaskEvent;
-
-class SubtaskTimeTrackingSubscriber extends BaseSubscriber implements EventSubscriberInterface
-{
-    public static function getSubscribedEvents()
-    {
-        return array(
-            SubtaskModel::EVENT_CREATE => 'updateTaskTime',
-            SubtaskModel::EVENT_DELETE => 'updateTaskTime',
-            SubtaskModel::EVENT_UPDATE => array(
-                array('logStartEnd', 10),
-                array('updateTaskTime', 0),
-            )
-        );
-    }
-
-    public function updateTaskTime(SubtaskEvent $event)
-    {
-        if (isset($event['task_id'])) {
-            $this->logger->debug('Subscriber executed: '.__METHOD__);
-            $this->subtaskTimeTrackingModel->updateTaskTimeTracking($event['task_id']);
-        }
-    }
-
-    public function logStartEnd(SubtaskEvent $event)
-    {
-        if (isset($event['status']) && $this->configModel->get('subtask_time_tracking') == 1) {
-            $this->logger->debug('Subscriber executed: '.__METHOD__);
-            $subtask = $this->subtaskModel->getById($event['id']);
-
-            if (empty($subtask['user_id'])) {
-                return false;
-            }
-
-            if ($subtask['status'] == SubtaskModel::STATUS_INPROGRESS) {
-                return $this->subtaskTimeTrackingModel->logStartTime($subtask['id'], $subtask['user_id']);
-            } else {
-                return $this->subtaskTimeTrackingModel->logEndTime($subtask['id'], $subtask['user_id']);
-            }
-        }
-    }
-}