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

Remove workaround for 'INSERT ON DUPLICATE KEY UPDATE...'

Browse Source
This commit is contained in:
Frederic Guillot
2015-11-21 18:41:15 -05:00
parent 9deeaa4ef1
commit 0a7370b9e5
4 changed files with 103 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -18,6 +18,7 @@ Improvements:
* Use PHP7 function random_bytes() to generate tokens if available
* CSV task export show the assignee name in addition to the assignee username
* Add new hooks for plugins
* Remove workaround for "INSERT ON DUPLICATE KEY UPDATE..."
Internal code refactoring:

63
app/Model/ProjectDailyColumnStats.php
View File

@@ -34,40 +34,51 @@ class ProjectDailyColumnStats extends Base
{
$status = $this->config->get('cfd_include_closed_tasks') == 1 ? array(Task::STATUS_OPEN, Task::STATUS_CLOSED) : array(Task::STATUS_OPEN);
return $this->db->transaction(function (Database $db) use ($project_id, $date, $status) {
$this->db->startTransaction();
$column_ids = $db->table(Board::TABLE)->eq('project_id', $project_id)->findAllByColumn('id');
$column_ids = $this->db->table(Board::TABLE)->eq('project_id', $project_id)->findAllByColumn('id');
foreach ($column_ids as $column_id) {
foreach ($column_ids as $column_id) {
// This call will fail if the record already exists
// (cross database driver hack for INSERT..ON DUPLICATE KEY UPDATE)
$db->table(ProjectDailyColumnStats::TABLE)->insert(array(
'day' => $date,
'project_id' => $project_id,
'column_id' => $column_id,
'total' => 0,
'score' => 0,
));
$exists = $this->db->table(ProjectDailyColumnStats::TABLE)
->eq('project_id', $project_id)
->eq('column_id', $column_id)
->eq('day', $date)
->exists();
$db->table(ProjectDailyColumnStats::TABLE)
$score = $this->db->table(Task::TABLE)
->eq('project_id', $project_id)
->eq('column_id', $column_id)
->eq('is_active', Task::STATUS_OPEN)
->sum('score');
$total = $this->db->table(Task::TABLE)
->eq('project_id', $project_id)
->eq('column_id', $column_id)
->in('is_active', $status)
->count();
if ($exists) {
$this->db->table(ProjectDailyColumnStats::TABLE)
->eq('project_id', $project_id)
->eq('column_id', $column_id)
->eq('day', $date)
->update(array(
'score' => $db->table(Task::TABLE)
->eq('project_id', $project_id)
->eq('column_id', $column_id)
->eq('is_active', Task::STATUS_OPEN)
->sum('score'),
'total' => $db->table(Task::TABLE)
->eq('project_id', $project_id)
->eq('column_id', $column_id)
->in('is_active', $status)
->count()
));
->update(array('score' => $score, 'total' => $total));
} else {
$this->db->table(ProjectDailyColumnStats::TABLE)->insert(array(
'day' => $date,
'project_id' => $project_id,
'column_id' => $column_id,
'total' => $total,
'score' => $score,
));
}
});
}
$this->db->closeTransaction();
return true;
}
/**

32
app/Model/ProjectDailyStats.php
View File

@@ -29,27 +29,35 @@ class ProjectDailyStats extends Base
*/
public function updateTotals($project_id, $date)
{
$this->db->startTransaction();
$lead_cycle_time = $this->projectAnalytic->getAverageLeadAndCycleTime($project_id);
return $this->db->transaction(function (Database $db) use ($project_id, $date, $lead_cycle_time) {
$exists = $this->db->table(ProjectDailyStats::TABLE)
->eq('day', $date)
->eq('project_id', $project_id)
->exists();
// This call will fail if the record already exists
// (cross database driver hack for INSERT..ON DUPLICATE KEY UPDATE)
$db->table(ProjectDailyStats::TABLE)->insert(array(
'day' => $date,
'project_id' => $project_id,
'avg_lead_time' => 0,
'avg_cycle_time' => 0,
));
$db->table(ProjectDailyStats::TABLE)
if ($exists) {
$this->db->table(ProjectDailyStats::TABLE)
->eq('project_id', $project_id)
->eq('day', $date)
->update(array(
'avg_lead_time' => $lead_cycle_time['avg_lead_time'],
'avg_cycle_time' => $lead_cycle_time['avg_cycle_time'],
));
});
} else {
$this->db->table(ProjectDailyStats::TABLE)->insert(array(
'day' => $date,
'project_id' => $project_id,
'avg_lead_time' => $lead_cycle_time['avg_lead_time'],
'avg_cycle_time' => $lead_cycle_time['avg_cycle_time'],
));
}
$this->db->closeTransaction();
return true;
}
/**

45
tests/units/Model/ProjectDailyStatsTest.php Normal file
View File

@@ -0,0 +1,45 @@
<?php
require_once __DIR__.'/../Base.php';
use Kanboard\Model\Project;
use Kanboard\Model\ProjectDailyStats;
use Kanboard\Model\Task;
use Kanboard\Model\TaskCreation;
use Kanboard\Model\TaskStatus;
class ProjectDailyStatsTest extends Base
{
public function testUpdateTotals()
{
$p = new Project($this->container);
$pds = new ProjectDailyStats($this->container);
$tc = new TaskCreation($this->container);
$ts = new TaskStatus($this->container);
$this->assertEquals(1, $p->create(array('name' => 'UnitTest')));
$this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'date_started' => strtotime('-1 day'))));
$this->assertEquals(2, $tc->create(array('title' => 'Task #1', 'project_id' => 1)));
$pds->updateTotals(1, date('Y-m-d', strtotime('-1 day')));
$this->assertTrue($ts->close(1));
$pds->updateTotals(1, date('Y-m-d'));
$metrics = $pds->getRawMetrics(1, date('Y-m-d', strtotime('-1days')), date('Y-m-d'));
$expected = array(
array(
'day' => '2015-11-20',
'avg_lead_time' => 0,
'avg_cycle_time' => 43200,
),
array(
'day' => '2015-11-21',
'avg_lead_time' => 0,
'avg_cycle_time' => 43200,
)
);
$this->assertEquals($expected, $metrics);
}
}