update searchable trait

Author: daniel-cintra

stubs/modules/Support/Traits/Searchable.php

@@ -13,8 +13,12 @@ public function scopeSearch(Builder $query, ?string $searchColumn, ?string $sear
     {
         $searchTerm = preg_replace('/[^A-Za-z0-9 ]/', '', $searchTerm);
 
-        $query->when($searchTerm, function ($query, $searchTerm) use ($searchColumn) {
-            $query->where($searchColumn, 'like', "%{$searchTerm}%");
+        $columns = array_map('trim', explode(',', $searchColumn));
+
+        $query->when($searchTerm, function ($query, $searchTerm) use ($columns) {
+            foreach ($columns as $column) {
+                $query->orWhere($column, 'like', "%{$searchTerm}%");
+            }
         });
     }
 }

stubs/tests/Feature/Support/SearchableTraitTest.php

@@ -0,0 +1,43 @@
+<?php
+
+use Modules\Support\Traits\Searchable;
+use Illuminate\Database\Eloquent\Model;
+use Modules\User\Models\User;
+
+uses(Searchable::class);
+
+beforeEach(function () {
+    $this->user = User::factory()->create([
+        'name' => 'John Doe',
+        'email' => 'doe@gmail.com',
+        'password' => 'secret',
+    ]);
+});
+
+afterEach(function () {
+    $this->user->delete();
+});
+
+it('returns empty collection if no result is found', function () {
+    $result = User::search('name,email', 'Jane')->get();
+
+    expect($result)->toHaveCount(0);
+});
+
+it('can search a single database column', function () {
+    $stringToSearch = 'John';
+
+    $result = User::search('name', $stringToSearch)->get();
+
+    expect($result)->toHaveCount(1);
+    expect($result->first()->name)->toBe('John Doe');
+});
+
+it('can search multiple database columns', function () {
+    $stringToSearch = 'doe';
+
+    $result = User::search('name,email', $stringToSearch)->get();
+
+    expect($result)->toHaveCount(1);
+    expect($result->first()->name)->toBe('John Doe');
+});

stubs/tests/Feature/Support/UpdateOrderTraitTest.php

@@ -0,0 +1,44 @@
+<?php
+
+use Modules\Support\Traits\UpdateOrder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+
+uses(UpdateOrder::class);
+
+beforeEach(function () {
+    Schema::create('items', function (Blueprint $table) {
+        $table->id();
+        $table->string('name')->nullable();
+        $table->unsignedTinyInteger('order')->nullable();
+        $table->timestamps();
+    });
+});
+
+afterEach(function () {
+    Schema::dropIfExists('items');
+});
+
+it('can update the order of the model items', function () {
+
+    $model = new class extends Model
+    {
+        use UpdateOrder;
+        protected $table = 'items';
+        protected $guarded = [];
+    };
+
+    $item1 = $model->create(['name' => 'Item 1', 'order' => 0]);
+    $item2 = $model->create(['name' => 'Item 2', 'order' => 1]);
+
+    $newOrder = [
+        ['id' => $item2->id],
+        ['id' => $item1->id]
+    ];
+
+    $model->updateOrder($newOrder);
+
+    $this->assertEquals(0, $model->find($item2->id)->order);
+    $this->assertEquals(1, $model->find($item1->id)->order);
+});