adding searchable() tests

Author: bdelamatre

src/Traits/WithFilters.php

@@ -236,8 +236,15 @@ public function applySearchFilter(Builder $query): Builder
                     // if the column isn't a relation or if it was previously selected
                     } elseif (! $hasRelation || $selectedColumn) {
 
+                        $whereColumn = $selectedColumn ?? $column->column();
+
+                        // @todo: skip aggregates
+                        if (!$hasRelation && $query instanceof Builder) {
+                            $whereColumn = $query->getModel()->getTable() . '.' . $whereColumn;
+                        }
+
                         // we can use a simple where clause
-                        $subQuery->orWhere($selectedColumn ?? $column->column(), 'like', '%' . $search . '%');
+                        $subQuery->orWhere($whereColumn, 'like', '%' . $search . '%');
 
                     } else {
 

tests/DataTableComponentTest.php

@@ -5,17 +5,20 @@
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use Rappasoft\LaravelLivewireTables\DataTableComponent;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsAltQueryTable;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 
 class DataTableComponentTest extends TestCase
 {
     protected DataTableComponent $table;
+    protected DataTableComponent $tableAltQuery;
 
     public function setUp(): void
     {
         parent::setUp();
 
         $this->table = new PetsTable();
+        $this->tableAltQuery = new PetsAltQueryTable();
     }
 
     /** @test */
@@ -90,4 +93,16 @@ public function test_search_filter_remove(): void
         $this->table->removeFilter('search');
         $this->assertEquals(5, $this->table->rows->total());
     }
+
+    public function test_search_filter_alt_query()
+    {
+        $this->tableAltQuery->filters['search'] = 'Cartman';
+        $this->assertEquals(1, $this->tableAltQuery->rows->total());
+    }
+
+    public function test_search_filter_alt_query_relation()
+    {
+        $this->tableAltQuery->filters['search'] = 'Cat';
+        $this->assertEquals(2, $this->tableAltQuery->rows->total());
+    }
 }

tests/Http/Livewire/PetsAltQueryTable.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Http\Livewire;
+
+use Illuminate\Database\Eloquent\Builder;
+use Rappasoft\LaravelLivewireTables\DataTableComponent;
+use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
+use Rappasoft\LaravelLivewireTables\Views\Column;
+
+class PetsAltQueryTable extends DataTableComponent
+{
+    /**
+     * @return Builder
+     */
+    public function query() : Builder
+    {
+        return Pet::query()->select('pets.name', 'pets.age', 'pets.last_visit', 'species.name', 'breeds.name')
+                            ->join('species', 'pets.species_id', '=', 'species.id')
+                            ->join('breeds', 'breed_id', '=', 'breeds.id');
+    }
+
+    public function columns(): array
+    {
+        return [
+            Column::make('Name', 'name')
+                ->searchable(),
+            Column::make('Age', 'age')
+                ->searchable(),
+            Column::make('Last Visit', 'last_visit')
+                ->searchable(),
+            Column::make('Species', 'species.name')
+                ->searchable(),
+            Column::make('Breed', 'breed.name')
+                ->searchable(),
+        ];
+    }
+}

tests/Http/Livewire/PetsTable.php

@@ -14,19 +14,24 @@ class PetsTable extends DataTableComponent
      */
     public function query() : Builder
     {
-        return Pet::query()->when($this->getFilter('search'), function (Builder $query, $search) {
-            $query->where('name', 'like', '%'.$search.'%');
-        });
+        return Pet::query()
+            ->with('species')
+            ->with('breed');
     }
 
     public function columns(): array
     {
         return [
-            Column::make('Name', 'name'),
-            Column::make('Age', 'age'),
-            Column::make('Last Visit', 'last_visit'),
-            Column::make('Species', 'species.name'),
-            Column::make('Breed', 'breed.name'),
+            Column::make('Name', 'name')
+                ->searchable(),
+            Column::make('Age', 'age')
+                ->searchable(),
+            Column::make('Last Visit', 'last_visit')
+                ->searchable(),
+            Column::make('Species', 'species.name')
+                ->searchable(),
+            Column::make('Breed', 'breed.name')
+                ->searchable(),
         ];
     }
 }