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

Simplify class ProjectDailyStats

Browse Source
This commit is contained in:
Frederic Guillot
2016-01-16 19:46:23 -05:00
parent 81e4c3199e
commit c603cb5949
2 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/Model/ProjectDailyStats.php
View File

@@ -31,27 +31,14 @@ class ProjectDailyStats extends Base
$lead_cycle_time = $this->averageLeadCycleTimeAnalytic->build($project_id); $lead_cycle_time = $this->averageLeadCycleTimeAnalytic->build($project_id);
$exists = $this->db->table(ProjectDailyStats::TABLE) $this->db->table(self::TABLE)->eq('day', $date)->eq('project_id', $project_id)->remove();
->eq('day', $date)
->eq('project_id', $project_id)
->exists();
if ($exists) { $this->db->table(self::TABLE)->insert(array(
$this->db->table(ProjectDailyStats::TABLE) 'day' => $date,
->eq('project_id', $project_id) 'project_id' => $project_id,
->eq('day', $date) 'avg_lead_time' => $lead_cycle_time['avg_lead_time'],
->update(array( 'avg_cycle_time' => $lead_cycle_time['avg_cycle_time'],
'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(); $this->db->closeTransaction();
@@ -70,11 +57,11 @@ class ProjectDailyStats extends Base
public function getRawMetrics($project_id, $from, $to) public function getRawMetrics($project_id, $from, $to)
{ {
return $this->db->table(self::TABLE) return $this->db->table(self::TABLE)
->columns('day', 'avg_lead_time', 'avg_cycle_time') ->columns('day', 'avg_lead_time', 'avg_cycle_time')
->eq(self::TABLE.'.project_id', $project_id) ->eq('project_id', $project_id)
->gte('day', $from) ->gte('day', $from)
->lte('day', $to) ->lte('day', $to)
->asc(self::TABLE.'.day') ->asc('day')
->findAll(); ->findAll();
} }
} }

5
tests/units/Model/ProjectDailyStatsTest.php
View File

@@ -18,9 +18,12 @@ class ProjectDailyStatsTest extends Base
$ts = new TaskStatus($this->container); $ts = new TaskStatus($this->container);
$this->assertEquals(1, $p->create(array('name' => 'UnitTest'))); $this->assertEquals(1, $p->create(array('name' => 'UnitTest')));
$this->assertEquals(2, $p->create(array('name' => 'UnitTest')));
$this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'date_started' => strtotime('-1 day')))); $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))); $this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1)));
$this->assertEquals(3, $tc->create(array('title' => 'Task #3', 'project_id' => 2)));
$pds->updateTotals(1, date('Y-m-d', strtotime('-1 day'))); $pds->updateTotals(1, date('Y-m-d', strtotime('-1 day')));
$this->assertTrue($ts->close(1)); $this->assertTrue($ts->close(1));