AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull-request #1012

This commit is contained in:
Frederic Guillot 2015-07-18 11:42:54 -04:00
parent dfd7972227 0f2d57ca5b
commit 3260dfb049
2 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/Model/TaskFilter.php
View File

@ -340,10 +340,11 @@ class TaskFilter extends Base
$this->query->beginOr();
foreach ($values as $assignee) {
$subtaskQuery = $this->buildSubtaskQuery();
switch ($assignee) {
case 'me':
$this->query->eq(Task::TABLE.'.owner_id', $this->userSession->getId());
$subtaskQuery->eq(Subtask::TABLE.'.user_id',$this->userSession->getId() );
break;
case 'nobody':
$this->query->eq(Task::TABLE.'.owner_id', 0);
@ -351,6 +352,14 @@ 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();
$this->addTasksWithFoundSubtask($subtasks);
}
}
@ -787,4 +796,23 @@ class TaskFilter extends Base
return $this;
}
private function buildSubtaskQuery(){
return $this->db->table(Subtask::TABLE)
->columns(
Subtask::TABLE.'.user_id',
Subtask::TABLE.'.task_id',
User::TABLE.'.name',
User::TABLE.'.username')
->join(User::TABLE, 'id', 'user_id', Subtask::TABLE)
->neq(Subtask::TABLE.'.status', Subtask::STATUS_DONE);
}
private function addTasksWithFoundSubtask($subtasks) {
foreach ($subtasks as $subtask) {
$this->query->eq(Task::TABLE.'.id',$subtask['task_id']);
}
}
}

30
tests/units/TaskFilterTest.php
View File

@ -8,6 +8,7 @@ use Model\TaskFilter;
use Model\TaskCreation;
use Model\DateParser;
use Model\Category;
use Model\Subtask;
use Model\Config;
use Model\Swimlane;
@ -528,6 +529,35 @@ 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' => '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)));
$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);