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

Filtering by category does not show results when the category name is a number 

Fixes #4789
This commit is contained in:
Frédéric Guillot 2023-03-04 13:59:27 -08:00 committed by Frédéric Guillot
parent d3694294a0
commit 18ed87cbd3
2 changed files with 108 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Filter/TaskCategoryFilter.php
View File

@ -34,7 +34,10 @@ class TaskCategoryFilter extends BaseFilter implements FilterInterface
public function apply()
{
if (is_int($this->value) || ctype_digit((string) $this->value)) {
$this->query->beginOr();
$this->query->eq(TaskModel::TABLE.'.category_id', $this->value);
$this->query->eq(CategoryModel::TABLE.'.name', $this->value);
$this->query->closeOr();
} elseif ($this->value === 'none') {
$this->query->eq(TaskModel::TABLE.'.category_id', 0);
} else {

105
tests/units/Filter/TaskCategoryFilterTest.php Normal file
View File

@ -0,0 +1,105 @@
<?php
use Kanboard\Filter\TaskCategoryFilter;
use Kanboard\Model\ProjectModel;
use Kanboard\Model\CategoryModel;
use Kanboard\Model\TaskCreationModel;
use Kanboard\Model\TaskFinderModel;
use Kanboard\Model\TaskModel;
require_once __DIR__.'/../Base.php';
class TaskCategoryFilterTest extends Base
{
public function testFilterByCategoryName()
{
$taskFinderModel = new TaskFinderModel($this->container);
$projectModel = new ProjectModel($this->container);
$taskCreationModel = new TaskCreationModel($this->container);
$categoryModel = new CategoryModel($this->container);
$query = $taskFinderModel->getExtendedQuery();
$this->assertEquals(1, $projectModel->create(['name' => 'Test']));
$this->assertEquals(1, $categoryModel->create(['name' => 'Some category', 'project_id' => 1]));
$this->assertEquals(1, $taskCreationModel->create(['project_id' => 1, 'title' => 'test1']));
$this->assertEquals(2, $taskCreationModel->create(['project_id' => 1, 'title' => 'test2', 'category_id' => 1]));
$filter = new TaskCategoryFilter();
$filter->withQuery($query);
$filter->withValue('Some category');
$filter->apply();
$tasks = $query->findAll();
$this->assertCount(1, $tasks);
$this->assertEquals('test2', $tasks[0]['title']);
}
public function testFilterByCategoryID()
{
$taskFinderModel = new TaskFinderModel($this->container);
$projectModel = new ProjectModel($this->container);
$taskCreationModel = new TaskCreationModel($this->container);
$categoryModel = new CategoryModel($this->container);
$query = $taskFinderModel->getExtendedQuery();
$this->assertEquals(1, $projectModel->create(['name' => 'Test']));
$this->assertEquals(1, $categoryModel->create(['name' => 'Some category', 'project_id' => 1]));
$this->assertEquals(1, $taskCreationModel->create(['project_id' => 1, 'title' => 'test1']));
$this->assertEquals(2, $taskCreationModel->create(['project_id' => 1, 'title' => 'test2', 'category_id' => 1]));
$filter = new TaskCategoryFilter();
$filter->withQuery($query);
$filter->withValue('1');
$filter->apply();
$tasks = $query->findAll();
$this->assertCount(1, $tasks);
$this->assertEquals('test2', $tasks[0]['title']);
}
public function testFilterByNoCategory()
{
$taskFinderModel = new TaskFinderModel($this->container);
$projectModel = new ProjectModel($this->container);
$taskCreationModel = new TaskCreationModel($this->container);
$categoryModel = new CategoryModel($this->container);
$query = $taskFinderModel->getExtendedQuery();
$this->assertEquals(1, $projectModel->create(['name' => 'Test']));
$this->assertEquals(1, $categoryModel->create(['name' => 'Some category', 'project_id' => 1]));
$this->assertEquals(1, $taskCreationModel->create(['project_id' => 1, 'title' => 'test1']));
$this->assertEquals(2, $taskCreationModel->create(['project_id' => 1, 'title' => 'test2', 'category_id' => 1]));
$filter = new TaskCategoryFilter();
$filter->withQuery($query);
$filter->withValue('none');
$filter->apply();
$tasks = $query->findAll();
$this->assertCount(1, $tasks);
$this->assertEquals('test1', $tasks[0]['title']);
}
public function testFilterByNumericCategoryName()
{
$taskFinderModel = new TaskFinderModel($this->container);
$projectModel = new ProjectModel($this->container);
$taskCreationModel = new TaskCreationModel($this->container);
$categoryModel = new CategoryModel($this->container);
$query = $taskFinderModel->getExtendedQuery();
$this->assertEquals(1, $projectModel->create(['name' => 'Test']));
$this->assertEquals(1, $categoryModel->create(['name' => '1234', 'project_id' => 1]));
$this->assertEquals(1, $taskCreationModel->create(['project_id' => 1, 'title' => 'test1']));
$this->assertEquals(2, $taskCreationModel->create(['project_id' => 1, 'title' => 'test2', 'category_id' => 1]));
$filter = new TaskCategoryFilter();
$filter->withQuery($query);
$filter->withValue('1234');
$filter->apply();
$tasks = $query->findAll();
$this->assertCount(1, $tasks);
$this->assertEquals('test2', $tasks[0]['title']);
}
}