Rewrite the entire scheduled maintenance implementation

This commit is contained in:
James Brooks
2016-10-30 20:54:12 +00:00
parent a2cded299d
commit ebed68a7d8
57 changed files with 1989 additions and 512 deletions
+4 -45
View File
@@ -15,7 +15,6 @@ use AltThree\Validator\ValidatingTrait;
use CachetHQ\Cachet\Models\Traits\SearchableTrait;
use CachetHQ\Cachet\Models\Traits\SortableTrait;
use CachetHQ\Cachet\Presenters\IncidentPresenter;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
@@ -75,11 +74,10 @@ class Incident extends Model implements HasPresenter
* @var string[]
*/
protected $casts = [
'visible' => 'int',
'stickied' => 'bool',
'scheduled_at' => 'date',
'occurred_at' => 'date',
'deleted_at' => 'date',
'visible' => 'int',
'stickied' => 'bool',
'occurred_at' => 'date',
'deleted_at' => 'date',
];
/**
@@ -94,7 +92,6 @@ class Incident extends Model implements HasPresenter
'visible',
'stickied',
'message',
'scheduled_at',
'occurred_at',
'created_at',
'updated_at',
@@ -194,44 +191,6 @@ class Incident extends Model implements HasPresenter
return $query->where('stickied', '=', true);
}
/**
* Finds all scheduled incidents (maintenance).
*
* @param \Illuminate\Database\Eloquent\Builder $query
*
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeScheduled(Builder $query)
{
return $query->where('status', '=', 0)->where('scheduled_at', '>=', Carbon::now());
}
/**
* Finds all non-scheduled incidents.
*
* @param \Illuminate\Database\Eloquent\Builder $query
*
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeNotScheduled(Builder $query)
{
return $query->where('status', '>', 0)->orWhere(function ($query) {
$query->where('status', '=', 0)->where(function ($query) {
$query->whereNull('scheduled_at')->orWhere('scheduled_at', '<=', Carbon::now());
});
});
}
/**
* Returns whether the "incident" is scheduled or not.
*
* @return bool
*/
public function getIsScheduledAttribute()
{
return $this->getOriginal('scheduled_at') !== null;
}
/**
* Is the incident resolved?
*