From a32cb2e72d1868bbcefaf5f136ec00a666b4ddc0 Mon Sep 17 00:00:00 2001
From: "Christopher C. Wells" <git@chris-wells.net>
Date: Sat, 27 Feb 2021 13:28:05 -0800
Subject: [PATCH] Maintain other scopes when using the custom "search" filter

---
 app/JsonApi/Adapters/FoodAdapter.php   | 8 +++++---
 app/JsonApi/Adapters/RecipeAdapter.php | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/JsonApi/Adapters/FoodAdapter.php b/app/JsonApi/Adapters/FoodAdapter.php
index 413751b..af7e17a 100644
--- a/app/JsonApi/Adapters/FoodAdapter.php
+++ b/app/JsonApi/Adapters/FoodAdapter.php
@@ -45,9 +45,11 @@ class FoodAdapter extends AbstractAdapter
     {
         $this->filterWithScopes($query, $filters->except('search'));
         if ($term = $filters->get('search')) {
-            $query->where('foods.name', 'like', "%{$term}%")
-                ->orWhere('foods.detail', 'like', "%{$term}%")
-                ->orWhere('foods.brand', 'like', "%{$term}%");
+            $query->where(function ($query) use ($term) {
+                $query->where('foods.name', 'like', "%{$term}%")
+                    ->orWhere('foods.detail', 'like', "%{$term}%")
+                    ->orWhere('foods.brand', 'like', "%{$term}%");
+            });
         }
     }
 
diff --git a/app/JsonApi/Adapters/RecipeAdapter.php b/app/JsonApi/Adapters/RecipeAdapter.php
index 174da17..b6d08ad 100644
--- a/app/JsonApi/Adapters/RecipeAdapter.php
+++ b/app/JsonApi/Adapters/RecipeAdapter.php
@@ -46,9 +46,11 @@ class RecipeAdapter extends AbstractAdapter
     {
         $this->filterWithScopes($query, $filters->except('search'));
         if ($term = $filters->get('search')) {
-            $query->where('recipes.name', 'like', "%{$term}%")
+            $query->where(function ($query) use ($term) {
+                $query->where('recipes.name', 'like', "%{$term}%")
                 ->orWhere('recipes.description', 'like', "%{$term}%")
                 ->orWhere('recipes.source', 'like', "%{$term}%");
+            });
         }
     }