Update

Author: joepdooper

src/Shared/Infrastructure/Service/PaginationService.php

@@ -4,18 +4,22 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use Ivy\Shared\Domain\Data\PaginationResult;
+use Ivy\Shared\Traits\ResolvesRequestInput;
 use Symfony\Component\HttpFoundation\Request;
 
 class PaginationService
 {
+    use ResolvesRequestInput;
+
     public function apply(
         Builder $query,
         Request $request,
-        int $perPage = 25
+        int $defaultPerPage = 25
     ): Builder {
 
-        $page = max(1, (int) $request->query->get('page', 1));
-        $perPage = max(1, (int) $request->query->get('per_page', $perPage));
+        $page = max(1, $this->int($request, 'page', 1));
+
+        $perPage = max(1, $this->int($request, 'per_page', $defaultPerPage));
 
         $total = (clone $query)->count();
 

src/Shared/Infrastructure/Service/SearchService.php

@@ -3,51 +3,43 @@
 namespace Ivy\Shared\Infrastructure\Service;
 
 use Illuminate\Database\Eloquent\Builder;
+use Ivy\Shared\Traits\ResolvesRequestInput;
+use Symfony\Component\HttpFoundation\Request;
 
 class SearchService
 {
+    use ResolvesRequestInput;
+
     public function apply(
         Builder $query,
-        string $term,
-        array $columns
+        Request $request,
+        array $columns = []
     ): Builder {
 
+        $term = $this->string($request, 'search');
+
         if ($term === '' || empty($columns)) {
             return $query;
         }
 
         $model = $query->getModel();
-        $baseTable = $model->getTable();
-
-        $query->where(function (Builder $q) use ($baseTable, $term, $columns) {
+        $table = $model->getTable();
 
-            $isFirst = true;
+        $query->where(function (Builder $q) use ($table, $term, $columns) {
 
             foreach ($columns as $column) {
 
                 if (!str_contains($column, '.')) {
+                    $q->orWhere(
+                        "{$table}.{$column}",
+                        'LIKE',
+                        "%{$term}%"
+                    );
 
-                    if ($isFirst) {
-                        $q->where(
-                            "$baseTable.$column",
-                            'LIKE',
-                            "%{$term}%"
-                        );
-                    } else {
-                        $q->orWhere(
-                            "$baseTable.$column",
-                            'LIKE',
-                            "%{$term}%"
-                        );
-                    }
-
-                    $isFirst = false;
                     continue;
                 }
 
-                $this->applyRelationSearch($q, $column, $term, $isFirst);
-
-                $isFirst = false;
+                $this->applyRelationSearch($q, $column, $term);
             }
         });
 
@@ -57,17 +49,14 @@ public function apply(
     protected function applyRelationSearch(
         Builder $query,
         string $path,
-        string $term,
-        bool $useWhereInsteadOfOr = false
+        string $term
     ): void {
 
         $segments = explode('.', $path);
         $field = array_pop($segments);
-        $relationPath = implode('.', $segments);
-
-        $method = $useWhereInsteadOfOr ? 'whereHas' : 'orWhereHas';
+        $relation = implode('.', $segments);
 
-        $query->{$method}($relationPath, function (Builder $q) use ($field, $term) {
+        $query->orWhereHas($relation, function (Builder $q) use ($field, $term) {
             $q->where($field, 'LIKE', "%{$term}%");
         });
     }

src/Shared/Traits/HasSearching.php

@@ -13,17 +13,8 @@ public function scopeSearch(
         Builder $query,
         Request $request,
     ): Builder {
-
         $columns = static::$searchable ?? [];
 
-        $term = trim((string) (
-            $request->query->get('search') ?? $request->request->get('search') ?? ''
-        ));
-
-        if ($term === '' || empty($columns)) {
-            return $query;
-        }
-
-        return Container::getInstance()->get(SearchService::class)->apply($query, $term, $columns);
+        return Container::getInstance()->get(SearchService::class)->apply($query, $request, $columns);
     }
 }