Replace SQL query by a PicoDB query
This commit is contained in:
Frederic Guillot
parent
010199e8f8
commit
4520026e91
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace Kanboard\Model;
|
||||
|
||||
use PDO;
|
||||
use Kanboard\Core\Base;
|
||||
|
||||
/**
|
||||
|
|
@ -298,59 +297,30 @@ class TaskFinderModel extends Base
|
|||
*/
|
||||
public function getDetails($task_id)
|
||||
{
|
||||
$sql = '
|
||||
SELECT
|
||||
tasks.id,
|
||||
tasks.reference,
|
||||
tasks.title,
|
||||
tasks.description,
|
||||
tasks.date_creation,
|
||||
tasks.date_completed,
|
||||
tasks.date_modification,
|
||||
tasks.date_due,
|
||||
tasks.date_started,
|
||||
tasks.time_estimated,
|
||||
tasks.time_spent,
|
||||
tasks.color_id,
|
||||
tasks.project_id,
|
||||
tasks.column_id,
|
||||
tasks.owner_id,
|
||||
tasks.creator_id,
|
||||
tasks.position,
|
||||
tasks.is_active,
|
||||
tasks.score,
|
||||
tasks.category_id,
|
||||
tasks.priority,
|
||||
tasks.swimlane_id,
|
||||
tasks.date_moved,
|
||||
tasks.recurrence_status,
|
||||
tasks.recurrence_trigger,
|
||||
tasks.recurrence_factor,
|
||||
tasks.recurrence_timeframe,
|
||||
tasks.recurrence_basedate,
|
||||
tasks.recurrence_parent,
|
||||
tasks.recurrence_child,
|
||||
project_has_categories.name AS category_name,
|
||||
swimlanes.name AS swimlane_name,
|
||||
projects.name AS project_name,
|
||||
projects.default_swimlane,
|
||||
columns.title AS column_title,
|
||||
users.username AS assignee_username,
|
||||
users.name AS assignee_name,
|
||||
creators.username AS creator_username,
|
||||
creators.name AS creator_name
|
||||
FROM tasks
|
||||
LEFT JOIN users ON users.id = tasks.owner_id
|
||||
LEFT JOIN users AS creators ON creators.id = tasks.creator_id
|
||||
LEFT JOIN project_has_categories ON project_has_categories.id = tasks.category_id
|
||||
LEFT JOIN projects ON projects.id = tasks.project_id
|
||||
LEFT JOIN columns ON columns.id = tasks.column_id
|
||||
LEFT JOIN swimlanes ON swimlanes.id = tasks.swimlane_id
|
||||
WHERE tasks.id = ?
|
||||
';
|
||||
|
||||
$rq = $this->db->execute($sql, array($task_id));
|
||||
return $rq->fetch(PDO::FETCH_ASSOC);
|
||||
return $this->db->table(TaskModel::TABLE)
|
||||
->columns(
|
||||
TaskModel::TABLE.'.*',
|
||||
CategoryModel::TABLE.'.name AS category_name',
|
||||
SwimlaneModel::TABLE.'.name AS swimlane_name',
|
||||
ProjectModel::TABLE.'.name AS project_name',
|
||||
ProjectModel::TABLE.'.default_swimlane',
|
||||
ColumnModel::TABLE.'.title AS column_title',
|
||||
UserModel::TABLE.'.username AS assignee_username',
|
||||
UserModel::TABLE.'.name AS assignee_name',
|
||||
'uc.username AS creator_username',
|
||||
'uc.name AS creator_name',
|
||||
CategoryModel::TABLE.'.description AS category_description',
|
||||
ColumnModel::TABLE.'.position AS column_position',
|
||||
ProjectModel::TABLE.'.default_swimlane'
|
||||
)
|
||||
->join(UserModel::TABLE, 'id', 'owner_id', TaskModel::TABLE)
|
||||
->left(UserModel::TABLE, 'uc', 'id', TaskModel::TABLE, 'creator_id')
|
||||
->join(CategoryModel::TABLE, 'id', 'category_id', TaskModel::TABLE)
|
||||
->join(ColumnModel::TABLE, 'id', 'column_id', TaskModel::TABLE)
|
||||
->join(SwimlaneModel::TABLE, 'id', 'swimlane_id', TaskModel::TABLE)
|
||||
->join(ProjectModel::TABLE, 'id', 'project_id', TaskModel::TABLE)
|
||||
->eq(TaskModel::TABLE.'.id', $task_id)
|
||||
->findOne();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -6,9 +6,70 @@ use Kanboard\Model\ColumnModel;
|
|||
use Kanboard\Model\TaskCreationModel;
|
||||
use Kanboard\Model\TaskFinderModel;
|
||||
use Kanboard\Model\ProjectModel;
|
||||
use Kanboard\Model\TaskModel;
|
||||
|
||||
class TaskFinderModelTest extends Base
|
||||
{
|
||||
public function testGetDetails()
|
||||
{
|
||||
$taskCreationModel = new TaskCreationModel($this->container);
|
||||
$taskFinderModel = new TaskFinderModel($this->container);
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$categoryModel = new \Kanboard\Model\CategoryModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
|
||||
$this->assertEquals(1, $categoryModel->create(array('project_id' => 1, 'name' => 'C1')));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array(
|
||||
'project_id' => 1,
|
||||
'title' => 'Task #1',
|
||||
'reference' => 'test',
|
||||
'description' => 'desc',
|
||||
'owner_id' => 1,
|
||||
'category_id' => 1,
|
||||
)));
|
||||
|
||||
$task = $taskFinderModel->getDetails(1);
|
||||
$this->assertEquals(1, $task['id']);
|
||||
$this->assertEquals('test', $task['reference']);
|
||||
$this->assertEquals('Task #1', $task['title']);
|
||||
$this->assertEquals('desc', $task['description']);
|
||||
$this->assertEquals(time(), $task['date_creation'], 'Delta', 1);
|
||||
$this->assertEquals(time(), $task['date_modification'], 'Delta', 1);
|
||||
$this->assertEquals(time(), $task['date_moved'], 'Delta', 1);
|
||||
$this->assertEquals(0, $task['date_completed']);
|
||||
$this->assertEquals(0, $task['date_due']);
|
||||
$this->assertEquals(0, $task['date_started']);
|
||||
$this->assertEquals(0, $task['time_estimated']);
|
||||
$this->assertEquals(0, $task['time_spent']);
|
||||
$this->assertEquals('yellow', $task['color_id']);
|
||||
$this->assertEquals(1, $task['project_id']);
|
||||
$this->assertEquals(1, $task['column_id']);
|
||||
$this->assertEquals(1, $task['owner_id']);
|
||||
$this->assertEquals(0, $task['creator_id']);
|
||||
$this->assertEquals(1, $task['position']);
|
||||
$this->assertEquals(TaskModel::STATUS_OPEN, $task['is_active']);
|
||||
$this->assertEquals(0, $task['score']);
|
||||
$this->assertEquals(1, $task['category_id']);
|
||||
$this->assertEquals(0, $task['priority']);
|
||||
$this->assertEquals(0, $task['swimlane_id']);
|
||||
$this->assertEquals(TaskModel::RECURRING_STATUS_NONE, $task['recurrence_status']);
|
||||
$this->assertEquals(TaskModel::RECURRING_TRIGGER_FIRST_COLUMN, $task['recurrence_trigger']);
|
||||
$this->assertEquals(0, $task['recurrence_factor']);
|
||||
$this->assertEquals(TaskModel::RECURRING_TIMEFRAME_DAYS, $task['recurrence_timeframe']);
|
||||
$this->assertEquals(TaskModel::RECURRING_BASEDATE_DUEDATE, $task['recurrence_basedate']);
|
||||
$this->assertEquals(0, $task['recurrence_parent']);
|
||||
$this->assertEquals(0, $task['recurrence_child']);
|
||||
$this->assertEquals('C1', $task['category_name']);
|
||||
$this->assertNull($task['swimlane_name']);
|
||||
$this->assertEquals('Default swimlane', $task['default_swimlane']);
|
||||
$this->assertEquals('Project #1', $task['project_name']);
|
||||
$this->assertEquals('Backlog', $task['column_title']);
|
||||
$this->assertEquals('admin', $task['assignee_username']);
|
||||
$this->assertEquals('', $task['assignee_name']);
|
||||
$this->assertEquals('', $task['creator_username']);
|
||||
$this->assertEquals('', $task['creator_name']);
|
||||
}
|
||||
|
||||
public function testGetTasksForDashboardWithHiddenColumn()
|
||||
{
|
||||
$taskCreationModel = new TaskCreationModel($this->container);
|
||||
|
|
|
|||
Loading…
Reference in New Issue