Fix MetricPoint changes
This commit is contained in:
committed by
James Brooks
parent
db627f6e86
commit
3e5dc6a3f9
@@ -14,9 +14,17 @@ namespace CachetHQ\Cachet\Models;
|
|||||||
use AltThree\Validator\ValidatingTrait;
|
use AltThree\Validator\ValidatingTrait;
|
||||||
use CachetHQ\Cachet\Presenters\MetricPointPresenter;
|
use CachetHQ\Cachet\Presenters\MetricPointPresenter;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
|
use DateTime;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use McCool\LaravelAutoPresenter\HasPresenter;
|
use McCool\LaravelAutoPresenter\HasPresenter;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is the metric point model class.
|
||||||
|
*
|
||||||
|
* @author James Brooks <james@alt-three.com>
|
||||||
|
* @author Joseph Cohen <joe@alt-three.com>
|
||||||
|
* @author Graham Campbell <graham@alt-three.com>
|
||||||
|
*/
|
||||||
class MetricPoint extends Model implements HasPresenter
|
class MetricPoint extends Model implements HasPresenter
|
||||||
{
|
{
|
||||||
use ValidatingTrait;
|
use ValidatingTrait;
|
||||||
@@ -102,7 +110,9 @@ class MetricPoint extends Model implements HasPresenter
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$createdAt = Carbon::parse($createdAt);
|
if (!$createdAt instanceof DateTime) {
|
||||||
|
$createdAt = Carbon::parse($createdAt);
|
||||||
|
}
|
||||||
|
|
||||||
$timestamp = $createdAt->format('U');
|
$timestamp = $createdAt->format('U');
|
||||||
$timestamp = 30 * round($timestamp / 30);
|
$timestamp = 30 * round($timestamp / 30);
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ class MetricPointTest extends AbstractApiTestCase
|
|||||||
$this->beUser();
|
$this->beUser();
|
||||||
|
|
||||||
$metric = factory(Metric::class)->create();
|
$metric = factory(Metric::class)->create();
|
||||||
$timestamp = 1434369116;
|
$timestamp = strtotime('now');
|
||||||
$metricPoint = factory(MetricPoint::class)->make([
|
$metricPoint = factory(MetricPoint::class)->make([
|
||||||
'metric_id' => $metric->id,
|
'metric_id' => $metric->id,
|
||||||
]);
|
]);
|
||||||
@@ -81,7 +81,7 @@ class MetricPointTest extends AbstractApiTestCase
|
|||||||
$response->assertStatus(200);
|
$response->assertStatus(200);
|
||||||
$response->assertJsonFragment([
|
$response->assertJsonFragment([
|
||||||
'value' => $metricPoint->value,
|
'value' => $metricPoint->value,
|
||||||
'created_at' => date('Y-m-d H:i:00', 1434369116),
|
'created_at' => date('Y-m-d H:i:s', $timestamp),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user