Rewrite the entire scheduled maintenance implementation

app/Models/Incident.php

@@ -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?
      *

app/Models/Schedule.php

@@ -0,0 +1,162 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Models;
+
+use AltThree\Validator\ValidatingTrait;
+use CachetHQ\Cachet\Models\Traits\SearchableTrait;
+use CachetHQ\Cachet\Models\Traits\SortableTrait;
+use CachetHQ\Cachet\Presenters\SchedulePresenter;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Model;
+use McCool\LaravelAutoPresenter\HasPresenter;
+
+class Schedule extends Model implements HasPresenter
+{
+    use SearchableTrait, SortableTrait, ValidatingTrait;
+
+    /**
+     * The upcoming status.
+     *
+     * @var int
+     */
+    const UPCOMING = 0;
+
+    /**
+     * The in progress status.
+     *
+     * @var int
+     */
+    const IN_PROGRESS = 1;
+
+    /**
+     * The complete status.
+     *
+     * @var int
+     */
+    const COMPLETE = 2;
+
+    /**
+     * The attributes that should be casted to native types.
+     *
+     * @var string[]
+     */
+    protected $casts = [
+        'name'         => 'string',
+        'message'      => 'string',
+        'status'       => 'int',
+        'scheduled_at' => 'date',
+        'completed_at' => 'date',
+    ];
+
+    /**
+     * The fillable properties.
+     *
+     * @var string[]
+     */
+    protected $fillable = [
+        'name',
+        'message',
+        'status',
+        'scheduled_at',
+        'completed_at',
+        'created_at',
+        'updated_at',
+    ];
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'name'         => 'required|string',
+        'message'      => 'nullable|string',
+        'status'       => 'required|int|between:0,2',
+    ];
+
+    /**
+     * The searchable fields.
+     *
+     * @var string[]
+     */
+    protected $searchable = [
+        'id',
+        'name',
+        'status',
+    ];
+
+    /**
+     * The sortable fields.
+     *
+     * @var string[]
+     */
+    protected $sortable = [
+        'id',
+        'name',
+        'status',
+        'scheduled_at',
+        'completed_at',
+        'created_at',
+        'updated_at',
+    ];
+
+    /**
+     * The relations to eager load on every query.
+     *
+     * @var string[]
+     */
+    protected $with = ['components'];
+
+    /**
+     * Scopes schedules to those in the future.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeFutureSchedules($query)
+    {
+        return $query->whereIn('status', [self::UPCOMING, self::IN_PROGRESS])->where('scheduled_at', '>=', Carbon::now());
+    }
+
+    /**
+     * Scopes schedules to those in the past.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopePastSchedules($query)
+    {
+        return $query->where('status', '<', self::COMPLETE)->where('scheduled_at', '<=', Carbon::now());
+    }
+
+    /**
+     * Get the components relation.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function components()
+    {
+        return $this->hasMany(ScheduleComponent::class);
+    }
+
+    /**
+     * Get the presenter class.
+     *
+     * @return string
+     */
+    public function getPresenterClass()
+    {
+        return SchedulePresenter::class;
+    }
+}

app/Models/ScheduleComponent.php

@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Models;
+
+use AltThree\Validator\ValidatingTrait;
+use Illuminate\Database\Eloquent\Model;
+
+class ScheduleComponent extends Model
+{
+    use ValidatingTrait;
+
+    /**
+     * The attributes that should be casted to native types.
+     *
+     * @var string[]
+     */
+    protected $casts = [
+        'schedule_id'      => 'int',
+        'component_id'     => 'int',
+        'component_status' => 'int',
+    ];
+
+    /**
+     * The fillable properties.
+     *
+     * @var string[]
+     */
+    protected $fillable = [
+        'schedule_id',
+        'component_id',
+        'component_status',
+    ];
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'schedule_id'      => 'required|int',
+        'component_id'     => 'required|int',
+        'component_status' => 'required|int',
+    ];
+
+    /**
+     * Get the schedule relation.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function schedule()
+    {
+        return $this->belongsTo(Schedule::class);
+    }
+
+    /**
+     * Get the component relation.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function component()
+    {
+        return $this->hasOne(Component::class);
+    }
+}