From 160c0b885eb4f1a1a1baa2b6b9fc6d99fdb80d0c Mon Sep 17 00:00:00 2001
From: Christopher Geelen <christopher.geelen@vinotion.nl>
Date: Thu, 14 Jul 2016 14:13:19 +0200
Subject: FIX: empty eventData retrieval (issue #2406)

---
 app/Job/NotificationJob.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Job/NotificationJob.php b/app/Job/NotificationJob.php
index 904a9273..907e543b 100644
--- a/app/Job/NotificationJob.php
+++ b/app/Job/NotificationJob.php
@@ -58,10 +58,6 @@ class NotificationJob extends BaseJob
     {
         $values = array();
 
-        if (! empty($event['changes'])) {
-            $values['changes'] = $event['changes'];
-        }
-
         switch ($eventObjectName) {
             case 'Kanboard\Event\TaskEvent':
                 $values['task'] = $this->taskFinderModel->getDetails($event['task_id']);
@@ -80,6 +76,13 @@ class NotificationJob extends BaseJob
                 break;
         }
 
+        // Need to use an array filter to remove any unset/null values in $values. This can happen e.g.
+        // when receiving an event for a task, but the task is already removed. This can happen when
+        // using the Kanboard background worker thread.
+        $values = array_filter($values);
+        if (!empty($values) && !empty($event['changes'])) {
+          $values['changes'] = $event['changes'];
+        }
         return $values;
     }
 }
-- 
cgit v1.2.3


From 2363da274c412cdd0dc2fc68b8f45222f4467a0a Mon Sep 17 00:00:00 2001
From: Christopher Geelen <christopher.geelen@vinotion.nl>
Date: Wed, 27 Jul 2016 15:06:01 +0200
Subject: ADD: TaskMovedDateFilter

---
 app/Filter/TaskMovedDateFilter.php             | 38 +++++++++++++++++++++++
 app/ServiceProvider/FilterProvider.php         |  4 +++
 tests/units/Filter/TaskMovedDateFilterTest.php | 43 ++++++++++++++++++++++++++
 3 files changed, 85 insertions(+)
 create mode 100644 app/Filter/TaskMovedDateFilter.php
 create mode 100644 tests/units/Filter/TaskMovedDateFilterTest.php

diff --git a/app/Filter/TaskMovedDateFilter.php b/app/Filter/TaskMovedDateFilter.php
new file mode 100644
index 00000000..d57b7d23
--- /dev/null
+++ b/app/Filter/TaskMovedDateFilter.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Kanboard\Filter;
+
+use Kanboard\Core\Filter\FilterInterface;
+use Kanboard\Model\TaskModel;
+
+/**
+ * Filter tasks by modification date
+ *
+ * @package filter
+ * @author  Frederic Guillot
+ */
+class TaskMovedDateFilter extends BaseDateFilter implements FilterInterface
+{
+    /**
+     * Get search attribute
+     *
+     * @access public
+     * @return string[]
+     */
+    public function getAttributes()
+    {
+        return array('moved');
+    }
+
+    /**
+     * Apply filter
+     *
+     * @access public
+     * @return FilterInterface
+     */
+    public function apply()
+    {
+        $this->applyDateFilter(TaskModel::TABLE.'.date_moved');
+        return $this;
+    }
+}
diff --git a/app/ServiceProvider/FilterProvider.php b/app/ServiceProvider/FilterProvider.php
index 436288dc..443d3588 100644
--- a/app/ServiceProvider/FilterProvider.php
+++ b/app/ServiceProvider/FilterProvider.php
@@ -21,6 +21,7 @@ use Kanboard\Filter\TaskDueDateFilter;
 use Kanboard\Filter\TaskIdFilter;
 use Kanboard\Filter\TaskLinkFilter;
 use Kanboard\Filter\TaskModificationDateFilter;
+use Kanboard\Filter\TaskMovedDateFilter;
 use Kanboard\Filter\TaskPriorityFilter;
 use Kanboard\Filter\TaskProjectFilter;
 use Kanboard\Filter\TaskReferenceFilter;
@@ -158,6 +159,9 @@ class FilterProvider implements ServiceProviderInterface
                 ->withFilter(TaskModificationDateFilter::getInstance()
                     ->setDateParser($c['dateParser'])
                 )
+                ->withFilter(TaskMovedDateFilter::getInstance()
+                    ->setDateParser($c['dateParser'])
+                )
                 ->withFilter(new TaskProjectFilter())
                 ->withFilter(new TaskReferenceFilter())
                 ->withFilter(new TaskStatusFilter())
diff --git a/tests/units/Filter/TaskMovedDateFilterTest.php b/tests/units/Filter/TaskMovedDateFilterTest.php
new file mode 100644
index 00000000..9b721913
--- /dev/null
+++ b/tests/units/Filter/TaskMovedDateFilterTest.php
@@ -0,0 +1,43 @@
+<?php
+
+use Kanboard\Filter\TaskMovedDateFilter;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskModificationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\UserModel;
+
+require_once __DIR__.'/../Base.php';
+
+class TaskMovedDateFilterTest extends Base
+{
+    public function test()
+    {
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $taskModification = new TaskModificationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $taskCreation->create(array('title' => 'Test1', 'project_id' => 1)));
+        $this->assertTrue($taskModification->update(array('id' => 1, 'date_moved' => time())));
+        $this->assertEquals(2, $taskCreation->create(array('title' => 'Test2', 'project_id' => 1)));
+        $this->assertTrue($taskModification->update(array('id' => 2, 'date_moved' => strtotime('-1days'))));
+        $this->assertEquals(3, $taskCreation->create(array('title' => 'Test3', 'project_id' => 1)));
+        $this->assertTrue($taskModification->update(array('id' => 3, 'date_moved' => strtotime('-3days'))));
+
+        $query = $taskFinder->getExtendedQuery();
+        $filter = new TaskMovedDateFilter('>='.date('Y-m-d', strtotime('-1days')));
+        $filter->setDateParser($this->container['dateParser']);
+        $filter->withQuery($query)->apply();
+
+        $this->assertCount(2, $query->findAll());
+
+        $query = $taskFinder->getExtendedQuery();
+        $filter = new TaskMovedDateFilter('<yesterday');
+        $filter->setDateParser($this->container['dateParser']);
+        $filter->withQuery($query)->apply();
+
+        $this->assertCount(1, $query->findAll());
+    }
+}
-- 
cgit v1.2.3