From 5101eaa8060ce3c75a81a26f6e47aae40e3d4ac3 Mon Sep 17 00:00:00 2001
From: Lesstat <florianbarth@gmx.de>
Date: Sat, 11 Jul 2015 11:38:04 +0200
Subject: Included Subtask when filtering Tasks by Assignee
I wrote some unit test specifing the behaviour.
I think only Substask with a Status != Done and an assigned user should be taken into account. The search for "nobody" should not reveal tasks with assigned users when these tasks have a subtask without an user.
---
tests/units/TaskFilterTest.php | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
(limited to 'tests')
diff --git a/tests/units/TaskFilterTest.php b/tests/units/TaskFilterTest.php
index af00b6fa..80d15484 100644
--- a/tests/units/TaskFilterTest.php
+++ b/tests/units/TaskFilterTest.php
@@ -8,6 +8,7 @@ use Model\TaskFilter;
use Model\TaskCreation;
use Model\DateParser;
use Model\Category;
+use Model\Subtask;
class TaskFilterTest extends Base
{
@@ -418,6 +419,41 @@ class TaskFilterTest extends Base
$this->assertEquals('Bob at work', $tasks[1]['title']);
}
+ public function testSearchWithAssigneeIncludingSubtasks()
+ {
+ $p = new Project($this->container);
+ $u = new User($this->container);
+ $tc = new TaskCreation($this->container);
+ $s = new Subtask($this->container);
+ $tf = new TaskFilter($this->container);
+
+ $this->assertEquals(1, $p->create(array('name' => 'test')));
+ $this->assertEquals(2, $u->create(array('username' => 'bob', 'name' => 'Bob Ryan')));
+ $this->assertEquals(1,$tc->create(array('project_id' => 1, 'title' => 'my task title is awesome', 'owner_id' => 2)));
+ $this->assertEquals(1, $s->create(array('title' => 'subtask #1', 'task_id' => 1, 'status' => 1, 'another_subtask' => 'on', 'user_id' => 0)));
+ $this->assertEquals(2,$tc->create(array('project_id' => 1, 'title' => 'my task title is amazing', 'owner_id' => 0)));
+ $this->assertEquals(2, $s->create(array('title' => 'subtask #1', 'task_id' => 2, 'status' => 1, 'another_subtask' => 'on', 'user_id' => 2)));
+
+ $tf->search('assignee:bob');
+ $tasks = $tf->findAll();
+ $this->assertNotEmpty($tasks);
+ $this->assertCount(2, $tasks);
+ $this->assertEquals('my task title is awesome', $tasks[0]['title']);
+ $this->assertEquals('my task title is amazing', $tasks[1]['title']);
+
+
+ $tf->search('assignee:nobody');
+ $tasks = $tf->findAll();
+ $this->assertNotEmpty($tasks);
+ $this->assertCount(1, $tasks);
+ $this->assertEquals('my task title is amazing', $tasks[0]['title']);
+
+
+
+ }
+
+
+
public function testCopy()
{
$tf = new TaskFilter($this->container);
--
cgit v1.2.3
From 0f2d57ca5b00fb58e5b3baadb64fcd011c666ff6 Mon Sep 17 00:00:00 2001
From: Lesstat <florianbarth@gmx.de>
Date: Sun, 12 Jul 2015 09:52:44 +0200
Subject: Corrected some SQL Spelling Erorrs
---
app/Model/TaskFilter.php | 10 +++++-----
tests/units/TaskFilterTest.php | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'tests')
diff --git a/app/Model/TaskFilter.php b/app/Model/TaskFilter.php
index dfd97d9d..8d7bdb44 100644
--- a/app/Model/TaskFilter.php
+++ b/app/Model/TaskFilter.php
@@ -317,7 +317,7 @@ class TaskFilter extends Base
switch ($assignee) {
case 'me':
$this->query->eq(Task::TABLE.'.owner_id', $this->userSession->getId());
- $subtaskQuery->eq(Subtask::TABLE.'user_id',$this->userSession->getId() );
+ $subtaskQuery->eq(Subtask::TABLE.'.user_id',$this->userSession->getId() );
break;
case 'nobody':
$this->query->eq(Task::TABLE.'.owner_id', 0);
@@ -325,8 +325,10 @@ class TaskFilter extends Base
default:
$this->query->ilike(User::TABLE.'.username', '%'.$assignee.'%');
$this->query->ilike(User::TABLE.'.name', '%'.$assignee.'%');
+ $subtaskQuery->beginOr();
$subtaskQuery->ilike(User::TABLE.'.username', '%'.$assignee.'%');
$subtaskQuery->ilike(User::TABLE.'.name', '%'.$assignee.'%');
+ $subtaskQuery->closeOr();
}
if ($assignee != 'nobody'){
$subtasks = $subtaskQuery->findAll();
@@ -776,10 +778,8 @@ class TaskFilter extends Base
User::TABLE.'.name',
User::TABLE.'.username')
->join(User::TABLE, 'id', 'user_id', Subtask::TABLE)
- ->beginOr()
- ->eq(Subtask::TABLE.'.status', Subtask::STATUS_TODO)
- ->eq(Subtask::TABLE.'.status', Subtask::STATUS_INPROGRESS)
- ->closeOr();
+ ->neq(Subtask::TABLE.'.status', Subtask::STATUS_DONE);
+
}
private function addTasksWithFoundSubtask($subtasks) {
diff --git a/tests/units/TaskFilterTest.php b/tests/units/TaskFilterTest.php
index 98142ec7..fede157e 100644
--- a/tests/units/TaskFilterTest.php
+++ b/tests/units/TaskFilterTest.php
@@ -479,7 +479,7 @@ class TaskFilterTest extends Base
$tf = new TaskFilter($this->container);
$this->assertEquals(1, $p->create(array('name' => 'test')));
- $this->assertEquals(2, $u->create(array('username' => 'bob', 'name' => 'Bob Ryan')));
+ $this->assertEquals(2, $u->create(array('username' => 'bob', 'name' => 'Paul Ryan')));
$this->assertEquals(1,$tc->create(array('project_id' => 1, 'title' => 'my task title is awesome', 'owner_id' => 2)));
$this->assertEquals(1, $s->create(array('title' => 'subtask #1', 'task_id' => 1, 'status' => 1, 'another_subtask' => 'on', 'user_id' => 0)));
$this->assertEquals(2,$tc->create(array('project_id' => 1, 'title' => 'my task title is amazing', 'owner_id' => 0)));
--
cgit v1.2.3