0.1.0-rc.1 (#570)

Author: actions-user

.github/workflows/mysql_tests.yml

@@ -4,6 +4,7 @@
 
 use Exception;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Arr;
 use Illuminate\Support\LazyCollection;
 use Laravel\Scout\Builder;
 use Laravel\Scout\Engines\Engine;
@@ -50,14 +51,22 @@ public function update($models)
                 return;
             }
 
-            $indexes = collect($searchableData)->map(function ($data, $field) use ($model) {
-                return [
-                    'key' => $model->getScoutKey(),
-                    'index' => $model->searchableAs(),
-                    'field' => $field,
-                    'content' => $data,
-                ];
-            });
+            $indexes = collect($searchableData)
+                ->filter(function ($data) {
+                    return ! is_null($data);
+                })
+                ->map(function ($data, $field) use ($model) {
+                    if (is_iterable($data)) {
+                        $data = implode(' , ', Arr::flatten($data));
+                    }
+
+                    return [
+                        'key' => $model->getScoutKey(),
+                        'index' => $model->searchableAs(),
+                        'field' => $field,
+                        'content' => $data,
+                    ];
+                });
 
             SearchIndex::insert($indexes->values()->all());
 

.github/workflows/postgres_tests.yml

@@ -34,10 +34,11 @@ public function searchableAs()
      */
     public function toSearchableArray()
     {
-        $array = $this->toArray();
-
-        // Customize the data array...
-
-        return Arr::only($array, ['title', 'body']);
+        return [
+            'id' => $this->id,
+            'title' => $this->title,
+            'body' => $this->body,
+            'array' => ['one', 'two', 'three' => ['four', 'five', 'six']],
+        ];
     }
 }

src/DatabaseEngine.php

@@ -2,8 +2,8 @@
 
 namespace Lunar\ScoutDatabaseEngine\Tests;
 
-use Lunar\ScoutDatabaseEngine\ScoutDatabaseServiceProvider;
 use Laravel\Scout\ScoutServiceProvider;
+use Lunar\ScoutDatabaseEngine\ScoutDatabaseServiceProvider;
 
 class TestCase extends \Orchestra\Testbench\TestCase
 {
@@ -36,7 +36,6 @@ protected function defineEnvironment($app)
      * Get package providers.
      *
      * @param  \Illuminate\Foundation\Application  $app
-     *
      * @return array<int, string>
      */
     protected function getPackageProviders($app)

tests/Stubs/Post.php

@@ -2,11 +2,11 @@
 
 namespace Lunar\ScoutDatabaseEngine\Tests\Unit;
 
-use Lunar\ScoutDatabaseEngine\SearchIndex;
-use Lunar\ScoutDatabaseEngine\Tests\TestCase;
-use Lunar\ScoutDatabaseEngine\Tests\Stubs\Post;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Artisan;
+use Lunar\ScoutDatabaseEngine\SearchIndex;
+use Lunar\ScoutDatabaseEngine\Tests\Stubs\Post;
+use Lunar\ScoutDatabaseEngine\Tests\TestCase;
 
 class IndexerTest extends TestCase
 {
@@ -22,7 +22,7 @@ public function can_index_a_post()
 
         $this->assertInstanceOf(Post::class, $post);
 
-        $this->assertDatabaseCount('search_index', 2);
+        $this->assertDatabaseCount('search_index', 4);
 
         $this->assertDatabaseHas('search_index', [
             'key' => $post->getScoutKey(),
@@ -32,6 +32,26 @@ public function can_index_a_post()
         ]);
     }
 
+    /** @test */
+    public function can_index_a_post_with_nulls()
+    {
+        $post = new Post();
+        $post->title = 'Example Post';
+        $post->body = null;
+        $post->save();
+
+        $this->assertInstanceOf(Post::class, $post);
+
+        $this->assertDatabaseCount('search_index', 3);
+
+        $this->assertDatabaseMissing('search_index', [
+            'key' => $post->getScoutKey(),
+            'index' => $post->searchableAs(),
+            'field' => 'body',
+            'content' => '',
+        ]);
+    }
+
     /** @test */
     public function deletes_outdated_index_data()
     {
@@ -101,7 +121,7 @@ public function can_flush_data()
         $post->save();
 
         // 3 models x 2 fields = 6
-        $this->assertDatabaseCount('search_index', 6);
+        $this->assertDatabaseCount('search_index', 12);
 
         Artisan::call('scout:flush "Lunar\\\ScoutDatabaseEngine\\\Tests\\\Stubs\\\Post"');
 

tests/TestCase.php

@@ -2,9 +2,9 @@
 
 namespace Lunar\ScoutDatabaseEngine\Tests\Unit;
 
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Lunar\ScoutDatabaseEngine\SearchIndex;
 use Lunar\ScoutDatabaseEngine\Tests\TestCase;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class SearchIndexTest extends TestCase
 {

tests/Unit/IndexerTest.php

@@ -2,10 +2,10 @@
 
 namespace Lunar\ScoutDatabaseEngine\Tests\Unit;
 
+use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Lunar\ScoutDatabaseEngine\SearchIndex;
-use Lunar\ScoutDatabaseEngine\Tests\TestCase;
 use Lunar\ScoutDatabaseEngine\Tests\Stubs\Post;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Lunar\ScoutDatabaseEngine\Tests\TestCase;
 
 class SearchTest extends TestCase
 {

tests/Unit/SearchIndexTest.php

@@ -16,7 +16,7 @@ public function up()
         Schema::create('posts', function (Blueprint $table) {
             $table->id();
             $table->string('title');
-            $table->text('body');
+            $table->text('body')->nullable();
             $table->timestamps();
         });
     }