Use global scope for active channel results

JeffreyWay · Feb 1, 2018 · 061b3eb · 061b3eb
1 parent b321a9d
commit 061b3eb
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/app/Channel.php b/app/Channel.php
@@ -20,6 +20,16 @@ class Channel extends Model
         'archived' => 'boolean'
     ];
 
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::addGlobalScope('active', function ($builder) {
+            $builder->where('archived', false)
+                ->orderBy('name', 'asc');
+        });
+    }
+
     /**
      * Get the route key name for Laravel.
      *

diff --git a/app/Http/Controllers/Admin/ChannelsController.php b/app/Http/Controllers/Admin/ChannelsController.php
@@ -15,7 +15,7 @@ class ChannelsController extends Controller
      */
     public function index()
     {
-        $channels = Channel::orderBy('name', 'asc')->with('threads')->get();
+        $channels = Channel::withoutGlobalScopes()->orderBy('name', 'asc')->with('threads')->get();
 
         return view('admin.channels.index', compact('channels'));
     }

diff --git a/app/Http/Controllers/Api/ChannelsController.php b/app/Http/Controllers/Api/ChannelsController.php
@@ -13,7 +13,7 @@ class ChannelsController extends Controller
     public function index()
     {
         return cache()->rememberForever('channels', function () {
-            return Channel::where('archived', false)->orderBy('name', 'asc')->get();
+            return Channel::all();
         });
     }
 }
diff --git a/app/Http/Controllers/ThreadsController.php b/app/Http/Controllers/ThreadsController.php
@@ -48,7 +48,7 @@ public function index(Channel $channel, ThreadFilters $filters, Trending $trendi
     public function create()
     {
         return view('threads.create', [
-            'channels' => Channel::where('archived', false)->orderBy('name', 'asc')->get()
+            'channels' => Channel::all()
         ]);
     }
 

diff --git a/tests/Unit/ChannelTest.php b/tests/Unit/ChannelTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Feature;
 
+use App\Channel;
 use Tests\TestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
@@ -29,4 +30,13 @@ public function a_channel_can_be_archived()
 
         $this->assertTrue($channel->archived);
     }
+
+    /** @test */
+    public function archived_channels_are_excluded_by_default()
+    {
+        create('App\Channel');
+        create('App\Channel', ['archived' => true]);
+
+        $this->assertEquals(1, Channel::count());
+    }
 }