Merge pull request #508 from cachethq/fix-scheduled-scope

Use Carbon to query scheduled incidents

app/routes/auth.php

@@ -2,7 +2,7 @@
 
 Route::group([
     'prefix'    => 'auth',
-    'namespace' => 'CachetHQ\Cachet\Http\Controllers'
+    'namespace' => 'CachetHQ\Cachet\Http\Controllers',
 ], function () {
     Route::group(['before' => 'has_setting:app_name'], function () {
         // Login routes

src/Http/Controllers/DashScheduleController.php

@@ -2,10 +2,9 @@
 
 namespace CachetHQ\Cachet\Http\Controllers;
 
+use CachetHQ\Cachet\Facades\Setting;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Models\IncidentTemplate;
-use CachetHQ\Cachet\Facades\Setting;
-use Carbon\Carbon;
 use GrahamCampbell\Binput\Facades\Binput;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;

src/Models/Incident.php

@@ -2,7 +2,7 @@
 
 namespace CachetHQ\Cachet\Models;
 
-use CachetHQ\Cachet\Facades\Setting as SettingFacade;
+use Carbon\Carbon;
 use CachetHQ\Cachet\Transformers\IncidentTransformer;
 use Dingo\Api\Transformer\TransformableInterface;
 use Illuminate\Database\Eloquent\Model;
@@ -70,9 +70,7 @@ class Incident extends Model implements TransformableInterface, PresenterInterfa
      */
     public function scopeScheduled($query)
     {
-        $timestamp = (new Date())->setTimezone(SettingFacade::get('app_timezone'))->format('Y-m-d H:i:s');
-
-        return $query->where('status', 0)->where('scheduled_at', '>=', $timestamp);
+        return $query->where('status', 0)->where('scheduled_at', '>=', Carbon::now());
     }
 
     /**
@@ -85,9 +83,7 @@ class Incident extends Model implements TransformableInterface, PresenterInterfa
     public function scopeNotScheduled($query)
     {
         return $query->where(function ($query) {
-            $timestamp = (new Date())->setTimezone(SettingFacade::get('app_timezone'))->format('Y-m-d H:i:s');
-
-            return $query->whereNull('scheduled_at')->orWhere('scheduled_at', '<=', $timestamp);
+            return $query->whereNull('scheduled_at')->orWhere('scheduled_at', '<=', Carbon::now());
         });
     }