Make sure that project daily column stats works when score is null
This commit is contained in:
@@ -186,15 +186,11 @@ class ProjectDailyColumnStats extends Base
|
|||||||
$columns = array();
|
$columns = array();
|
||||||
|
|
||||||
foreach ($totals as $column_id => $total) {
|
foreach ($totals as $column_id => $total) {
|
||||||
$columns[$column_id] = array('total' => $total);
|
$columns[$column_id] = array('total' => $total, 'score' => 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($scores as $column_id => $score) {
|
foreach ($scores as $column_id => $score) {
|
||||||
if (isset($columns[$column_id])) {
|
$columns[$column_id]['score'] = (int) $score;
|
||||||
$columns[$column_id]['score'] = $score;
|
|
||||||
} else {
|
|
||||||
$columns[$column_id] = array('score' => $score);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $columns;
|
return $columns;
|
||||||
@@ -213,6 +209,7 @@ class ProjectDailyColumnStats extends Base
|
|||||||
->columns('column_id', 'SUM(score) AS score')
|
->columns('column_id', 'SUM(score) AS score')
|
||||||
->eq('project_id', $project_id)
|
->eq('project_id', $project_id)
|
||||||
->eq('is_active', Task::STATUS_OPEN)
|
->eq('is_active', Task::STATUS_OPEN)
|
||||||
|
->notNull('score')
|
||||||
->groupBy('column_id')
|
->groupBy('column_id')
|
||||||
->findAll();
|
->findAll();
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,39 @@ use Kanboard\Model\TaskStatus;
|
|||||||
|
|
||||||
class ProjectDailyColumnStatsTest extends Base
|
class ProjectDailyColumnStatsTest extends Base
|
||||||
{
|
{
|
||||||
|
public function testUpdateTotalsWithScoreAtNull()
|
||||||
|
{
|
||||||
|
$projectModel = new Project($this->container);
|
||||||
|
$projectDailyColumnStats = new ProjectDailyColumnStats($this->container);
|
||||||
|
$taskCreationModel = new TaskCreation($this->container);
|
||||||
|
|
||||||
|
$this->assertEquals(1, $projectModel->create(array('name' => 'UnitTest')));
|
||||||
|
$this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
|
||||||
|
|
||||||
|
$projectDailyColumnStats->updateTotals(1, '2016-01-16');
|
||||||
|
|
||||||
|
$task = $this->container['db']->table(Task::TABLE)->findOne();
|
||||||
|
$this->assertNull($task['score']);
|
||||||
|
|
||||||
|
$stats = $this->container['db']->table(ProjectDailyColumnStats::TABLE)
|
||||||
|
->asc('day')
|
||||||
|
->asc('column_id')
|
||||||
|
->columns('day', 'project_id', 'column_id', 'total', 'score')
|
||||||
|
->findAll();
|
||||||
|
|
||||||
|
$expected = array(
|
||||||
|
array(
|
||||||
|
'day' => '2016-01-16',
|
||||||
|
'project_id' => 1,
|
||||||
|
'column_id' => 1,
|
||||||
|
'total' => 1,
|
||||||
|
'score' => 0,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertEquals($expected, $stats);
|
||||||
|
}
|
||||||
|
|
||||||
public function testUpdateTotals()
|
public function testUpdateTotals()
|
||||||
{
|
{
|
||||||
$projectModel = new Project($this->container);
|
$projectModel = new Project($this->container);
|
||||||
|
|||||||
Reference in New Issue
Block a user