Subtasks events refactoring and show delete in activity stream

2 files changed, 48 insertions, 4 deletions

diff --git a/app/Job/NotificationJob.php b/app/Job/NotificationJob.php
index ed568e47..5a52eb31 100644
--- a/app/Job/NotificationJob.php
+++ b/app/Job/NotificationJob.php
@@ -66,10 +66,6 @@ class NotificationJob extends BaseJob
             case 'Kanboard\Event\TaskEvent':
                 $values['task'] = $this->taskFinderModel->getDetails($event['task_id']);
                 break;
-            case 'Kanboard\Event\SubtaskEvent':
-                $values['subtask'] = $this->subtaskModel->getById($event['id'], true);
-                $values['task'] = $this->taskFinderModel->getDetails($values['subtask']['task_id']);
-                break;
             default:
                 $values = $event;
         }
diff --git a/app/Job/SubtaskEventJob.php b/app/Job/SubtaskEventJob.php
new file mode 100644
index 00000000..1dc243ef
--- /dev/null
+++ b/app/Job/SubtaskEventJob.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Kanboard\Job;
+
+use Kanboard\EventBuilder\SubtaskEventBuilder;
+
+/**
+ * Class SubtaskEventJob
+ *
+ * @package Kanboard\Job
+ * @author  Frederic Guillot
+ */
+class SubtaskEventJob extends BaseJob
+{
+    /**
+     * Set job params
+     *
+     * @param  int     $subtaskId
+     * @param  string  $eventName
+     * @param  array   $values
+     * @return $this
+     */
+    public function withParams($subtaskId, $eventName, array $values = array())
+    {
+        $this->jobParams = array($subtaskId, $eventName, $values);
+        return $this;
+    }
+
+    /**
+     * Execute job
+     *
+     * @param  int    $subtaskId
+     * @param  string $eventName
+     * @param  array  $values
+     * @return $this
+     */
+    public function execute($subtaskId, $eventName, array $values = array())
+    {
+        $event = SubtaskEventBuilder::getInstance($this->container)
+            ->withSubtaskId($subtaskId)
+            ->withValues($values)
+            ->build();
+
+        if ($event !== null) {
+            $this->dispatcher->dispatch($eventName, $event);
+        }
+    }
+}