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

Update task time spent/estimated when removing a subtask 

Fixes #3811
This commit is contained in:
Frédéric Guillot 2023-02-13 20:29:33 -08:00 committed by Frédéric Guillot
parent 277357277f
commit d0941ccd4e
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Model/SubtaskModel.php
View File

@ -267,7 +267,13 @@ class SubtaskModel extends Base
public function remove($subtaskId) public function remove($subtaskId)
{ {
$this->subtaskEventJob->execute($subtaskId, array(self::EVENT_DELETE)); $this->subtaskEventJob->execute($subtaskId, array(self::EVENT_DELETE));
return $this->db->table(self::TABLE)->eq('id', $subtaskId)->remove();
$subtask = $this->getById($subtaskId);
$result = $this->db->table(self::TABLE)->eq('id', $subtaskId)->remove();
$this->subtaskTimeTrackingModel->updateTaskTimeTracking($subtask['task_id']);
return $result;
} }
/** /**

30
tests/units/Model/SubtaskModelTest.php
View File

@ -113,6 +113,36 @@ class SubtaskModelTest extends Base
$this->assertEmpty($subtask); $this->assertEmpty($subtask);
} }
public function testRemoveUpdateTaskTimeTracking()
{
$taskCreationModel = new TaskCreationModel($this->container);
$subtaskModel = new SubtaskModel($this->container);
$projectModel = new ProjectModel($this->container);
$taskFinderModel = new TaskFinderModel($this->container);
$this->assertEquals(1, $projectModel->create(array('name' => 'test')));
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
$this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1, 'time_estimated' => 1, 'time_spent' => 2)));
$this->assertEquals(2, $subtaskModel->create(array('title' => 'subtask #2', 'task_id' => 1, 'time_estimated' => 3, 'time_spent' => 4)));
$task = $taskFinderModel->getById(1);
$this->assertEquals(4, $task['time_estimated']);
$this->assertEquals(6, $task['time_spent']);
$this->assertTrue($subtaskModel->remove(1));
$task = $taskFinderModel->getById(1);
$this->assertEquals(3, $task['time_estimated']);
$this->assertEquals(4, $task['time_spent']);
$this->assertTrue($subtaskModel->remove(2));
$task = $taskFinderModel->getById(1);
$this->assertEquals(0, $task['time_estimated']);
$this->assertEquals(0, $task['time_spent']);
}
public function testDuplicate() public function testDuplicate()
{ {
$taskCreationModel = new TaskCreationModel($this->container); $taskCreationModel = new TaskCreationModel($this->container);