Add "ek" option for Filter-Content header

app/Elastic/SongLyricSearchableTrait.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use App\Scopes\EvangelicalSongsScope;
+use App\Scopes\EKSongsScope;
 use App\Scopes\ExcludeEvangelicalOnlySongsScope;
 
 
@@ -271,7 +272,9 @@ function ($q) {
             },
         ]);
 
-        $q = $q->withoutGlobalScope(ExcludeEvangelicalOnlySongsScope::class)->withoutGlobalScope(EvangelicalSongsScope::class);
+        $q = $q->withoutGlobalScope(ExcludeEvangelicalOnlySongsScope::class)
+            ->withoutGlobalScope(EvangelicalSongsScope::class)
+            ->withoutGlobalScope(EKSongsScope::class);
 
         return $q;
     }

app/GraphQL/Queries/SearchSongLyrics.php

@@ -44,11 +44,11 @@ public function __invoke($rootValue, array $args, GraphQLContext $context, Resol
         // We need to manually apply the same filter that is implied by the song lyric (global) scope,
         // (see ExcludeEvangelicalOnlySongsScope and EvangelicalSongsScope)
         // because they work only for Eloquent, not Elasticsearch, which confuses Scout.
-        $filter_ez = Request::header('Filter-Content') == 'ez';
-        if ($filter_ez) {
-            $ez_songbook_id = Songbook::where('shortcut', 'ez')->first()->id;
+        $filter_shortcut = Request::header('Filter-Content');
+        if ($filter_shotcut == 'ez' || $filter_shortcut == 'ek') {
+            $songbook_id = Songbook::where('shortcut', $filter_shortcut)->first()->id;
             $searchParams['query']['bool']['filter'][] = [
-                'terms' => ['songbook_records.songbook_id' => [$ez_songbook_id]]
+                'terms' => ['songbook_records.songbook_id' => [$songbook_id]]
             ];
         } else {
             $searchParams['query']['bool']['must_not'] = [

app/Scopes/EKSongsScope.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Scopes;
+
+use Illuminate\Database\Eloquent\Scope;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Builder;
+
+class EKSongsScope implements Scope
+{
+    /**
+     * Apply the scope to a given Eloquent query builder.
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder  $builder
+     * @param  \Illuminate\Database\Eloquent\Model  $model
+     * @return void
+     */
+    public function apply(Builder $builder, Model $model)
+    {
+        $builder->whereHas('songbook_records', function ($q) {
+            $q->where('shortcut', "EK");
+        });
+    }
+}

app/SongLyric.php

@@ -34,6 +34,7 @@
 
 use App\Elastic\SongLyricSearchableTrait;
 use App\Scopes\EvangelicalSongsScope;
+use App\Scopes\EKSongsScope;
 use Illuminate\Support\Facades\Request;
 
 /**
@@ -188,6 +189,8 @@ protected static function booted()
         if (Request::header('Filter-Content') == 'ez') {
             // limit the songs to only those that are in the Evangelical songbook
             static::addGlobalScope(new EvangelicalSongsScope);
+        } else if (Request::header('Filter-Content') == 'ek') {
+            static::addGlobalScope(new EKSongsScope);
         } else {
             static::addGlobalScope(new ExcludeEvangelicalOnlySongsScope);
         }