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

Create TaskStatus model

This commit is contained in:
Frédéric Guillot 2014-11-21 21:41:26 -05:00
parent 2a850757ee
commit 8f0e544cd9
10 changed files with 189 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Action/Base.php
View File

@ -16,6 +16,7 @@ use Core\Tool;
* @property \Model\Comment $comment
* @property \Model\Task $task
* @property \Model\TaskFinder $taskFinder
* @property \Model\TaskStatus $taskStatus
*/
abstract class Base implements Listener
{

2
app/Action/TaskClose.php
View File

@ -71,7 +71,7 @@ class TaskClose extends Base
*/
public function doAction(array $data)
{
return $this->task->close($data['task_id']);
return $this->taskStatus->close($data['task_id']);
}
/**

2
app/Action/TaskOpen.php
View File

@ -56,7 +56,7 @@ class TaskOpen extends Base
*/
public function doAction(array $data)
{
return $this->task->open($data['task_id']);
return $this->taskStatus->open($data['task_id']);
}
/**

1
app/Controller/Base.php
View File

@ -37,6 +37,7 @@ use Model\LastLogin;
* @property \Model\TaskExport $taskExport
* @property \Model\TaskFinder $taskFinder
* @property \Model\TaskPermission $taskPermission
* @property \Model\TaskStatus $taskStatus
* @property \Model\TaskValidator $taskValidator
* @property \Model\CommentHistory $commentHistory
* @property \Model\SubtaskHistory $subtaskHistory

4
app/Controller/Task.php
View File

@ -268,7 +268,7 @@ class Task extends Base
$this->checkCSRFParam();
if ($this->task->close($task['id'])) {
if ($this->taskStatus->close($task['id'])) {
$this->session->flash(t('Task closed successfully.'));
} else {
$this->session->flashError(t('Unable to close this task.'));
@ -295,7 +295,7 @@ class Task extends Base
$this->checkCSRFParam();
if ($this->task->open($task['id'])) {
if ($this->taskStatus->open($task['id'])) {
$this->session->flash(t('Task opened successfully.'));
} else {
$this->session->flashError(t('Unable to open this task.'));

56
app/Model/Task.php
View File

@ -181,62 +181,6 @@ class Task extends Base
}
}
/**
* Mark a task closed
*
* @access public
* @param integer $task_id Task id
* @return boolean
*/
public function close($task_id)
{
if (! $this->taskFinder->exists($task_id)) {
return false;
}
$result = $this->db
->table(self::TABLE)
->eq('id', $task_id)
->update(array(
'is_active' => 0,
'date_completed' => time()
));
if ($result) {
$this->event->trigger(self::EVENT_CLOSE, array('task_id' => $task_id) + $this->taskFinder->getById($task_id));
}
return $result;
}
/**
* Mark a task open
*
* @access public
* @param integer $task_id Task id
* @return boolean
*/
public function open($task_id)
{
if (! $this->taskFinder->exists($task_id)) {
return false;
}
$result = $this->db
->table(self::TABLE)
->eq('id', $task_id)
->update(array(
'is_active' => 1,
'date_completed' => 0
));
if ($result) {
$this->event->trigger(self::EVENT_OPEN, array('task_id' => $task_id) + $this->taskFinder->getById($task_id));
}
return $result;
}
/**
* Remove a task
*

112
app/Model/TaskStatus.php Normal file
View File

@ -0,0 +1,112 @@
<?php
namespace Model;
/**
* Task Status
*
* @package model
* @author Frederic Guillot
*/
class TaskStatus extends Base
{
/**
* Return true if the task is closed
*
* @access public
* @param integer $task_id Task id
* @return boolean
*/
public function isClosed($task_id)
{
return $this->checkStatus($task_id, Task::STATUS_CLOSED);
}
/**
* Return true if the task is open
*
* @access public
* @param integer $task_id Task id
* @return boolean
*/
public function isOpen($task_id)
{
return $this->checkStatus($task_id, Task::STATUS_OPEN);
}
/**
* Mark a task closed
*
* @access public
* @param integer $task_id Task id
* @return boolean
*/
public function close($task_id)
{
return $this->changeStatus($task_id, Task::STATUS_CLOSED, time(), Task::EVENT_CLOSE);
}
/**
* Mark a task open
*
* @access public
* @param integer $task_id Task id
* @return boolean
*/
public function open($task_id)
{
return $this->changeStatus($task_id, Task::STATUS_OPEN, 0, Task::EVENT_OPEN);
}
/**
* Common method to change the status of task
*
* @access private
* @param integer $task_id Task id
* @param integer $status Task status
* @param integer $date_completed Timestamp
* @param string $event Event name
* @return boolean
*/
private function changeStatus($task_id, $status, $date_completed, $event)
{
if (! $this->taskFinder->exists($task_id)) {
return false;
}
$result = $this->db
->table(Task::TABLE)
->eq('id', $task_id)
->update(array(
'is_active' => $status,
'date_completed' => $date_completed,
'date_modification' => time(),
));
if ($result) {
$this->event->trigger(
$event,
array('task_id' => $task_id) + $this->taskFinder->getById($task_id)
);
}
return $result;
}
/**
* Check the status of task
*
* @access private
* @param integer $task_id Task id
* @param integer $status Task status
* @return boolean
*/
private function checkStatus($task_id, $status)
{
return $this->db
->table(Task::TABLE)
->eq('id', $task_id)
->eq('is_active', $status)
->count() === 1;
}
}

10
jsonrpc.php
View File

@ -7,6 +7,7 @@ use Model\Project;
use Model\ProjectPermission;
use Model\Task;
use Model\TaskFinder;
use Model\TaskStatus;
use Model\TaskValidator;
use Model\User;
use Model\Config;
@ -26,6 +27,7 @@ $project = new Project($container);
$projectPermission = new ProjectPermission($container);
$task = new Task($container);
$taskFinder = new TaskFinder($container);
$taskStatus = new TaskStatus($container);
$taskValidator = new TaskValidator($container);
$user = new User($container);
$category = new Category($container);
@ -214,12 +216,12 @@ $server->register('updateTask', function($id, $title = null, $project_id = null,
return $valid && $task->update($values);
});
$server->register('openTask', function($task_id) use ($task) {
return $task->open($task_id);
$server->register('openTask', function($task_id) use ($taskStatus) {
return $taskStatus->open($task_id);
});
$server->register('closeTask', function($task_id) use ($task) {
return $task->close($task_id);
$server->register('closeTask', function($task_id) use ($taskStatus) {
return $taskStatus->close($task_id);
});
$server->register('removeTask', function($task_id) use ($task) {

61
tests/units/TaskStatusTest.php Normal file
View File

@ -0,0 +1,61 @@
<?php
require_once __DIR__.'/Base.php';
use Model\Task;
use Model\TaskFinder;
use Model\TaskStatus;
use Model\Project;
use Model\ProjectPermission;
class TaskStatusTest extends Base
{
public function testStatus()
{
$t = new Task($this->container);
$tf = new TaskFinder($this->container);
$ts = new TaskStatus($this->container);
$p = new Project($this->container);
$this->assertEquals(1, $p->create(array('name' => 'test')));
$this->assertEquals(1, $t->create(array('title' => 'test', 'project_id' => 1)));
// The task must be open
$this->assertTrue($ts->isOpen(1));
$task = $tf->getById(1);
$this->assertNotEmpty($task);
$this->assertEquals(Task::STATUS_OPEN, $task['is_active']);
$this->assertEquals(0, $task['date_completed']);
$this->assertEquals(time(), $task['date_modification']);
// We close the task
$ts->close(1);
$this->assertTrue($ts->isClosed(1));
$task = $tf->getById(1);
$this->assertNotEmpty($task);
$this->assertEquals(Task::STATUS_CLOSED, $task['is_active']);
$this->assertEquals(time(), $task['date_completed']);
$this->assertEquals(time(), $task['date_modification']);
$this->assertTrue($this->container['event']->isEventTriggered(Task::EVENT_CLOSE));
// We open the task again
$ts->open(1);
$this->assertTrue($ts->isOpen(1));
$task = $tf->getById(1);
$this->assertNotEmpty($task);
$this->assertEquals(Task::STATUS_OPEN, $task['is_active']);
$this->assertEquals(0, $task['date_completed']);
$this->assertEquals(time(), $task['date_modification']);
$this->assertTrue($this->container['event']->isEventTriggered(Task::EVENT_OPEN));
}
}

6
tests/units/TaskTest.php
View File

@ -4,6 +4,7 @@ require_once __DIR__.'/Base.php';
use Model\Task;
use Model\TaskFinder;
use Model\TaskStatus;
use Model\Project;
use Model\ProjectPermission;
use Model\Category;
@ -605,6 +606,7 @@ class TaskTest extends Base
public function testEvents()
{
$t = new Task($this->container);
$ts = new TaskStatus($this->container);
$p = new Project($this->container);
// We create a project
@ -620,11 +622,11 @@ class TaskTest extends Base
$this->assertTrue($this->container['event']->isEventTriggered(Task::EVENT_CREATE_UPDATE));
// We close our task
$this->assertTrue($t->close(1));
$this->assertTrue($ts->close(1));
$this->assertTrue($this->container['event']->isEventTriggered(Task::EVENT_CLOSE));
// We open our task
$this->assertTrue($t->open(1));
$this->assertTrue($ts->open(1));
$this->assertTrue($this->container['event']->isEventTriggered(Task::EVENT_OPEN));
// We change the column of our task