diff --git a/app/JsonApi/Adapters/FoodAdapter.php b/app/JsonApi/Adapters/FoodAdapter.php index 591372a..413751b 100644 --- a/app/JsonApi/Adapters/FoodAdapter.php +++ b/app/JsonApi/Adapters/FoodAdapter.php @@ -43,14 +43,12 @@ class FoodAdapter extends AbstractAdapter */ protected function filter($query, Collection $filters) { + $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}%"); } - else { - $this->filterWithScopes($query, $filters); - } } /** diff --git a/app/JsonApi/Adapters/RecipeAdapter.php b/app/JsonApi/Adapters/RecipeAdapter.php index 87833da..174da17 100644 --- a/app/JsonApi/Adapters/RecipeAdapter.php +++ b/app/JsonApi/Adapters/RecipeAdapter.php @@ -44,14 +44,12 @@ class RecipeAdapter extends AbstractAdapter */ protected function filter($query, Collection $filters) { + $this->filterWithScopes($query, $filters->except('search')); if ($term = $filters->get('search')) { $query->where('recipes.name', 'like', "%{$term}%") ->orWhere('recipes.description', 'like', "%{$term}%") ->orWhere('recipes.source', 'like', "%{$term}%"); } - else { - $this->filterWithScopes($query, $filters); - } } /**