Added lazy tests.

Author: olsgreen

src/ElasticsearchEngine.php

@@ -6,6 +6,7 @@
 use Illuminate\Database\Eloquent\Collection;
 use Laravel\Scout\Builder;
 use Laravel\Scout\Engines\Engine;
+use Illuminate\Support\LazyCollection;
 
 class ElasticsearchEngine extends Engine
 {
@@ -234,14 +235,79 @@ public function map(Builder $builder, $results, $model)
         if ($results['hits']['total'] === 0) {
             return $model->newCollection();
         }
+
         $keys = collect($results['hits']['hits'])->pluck('_id')->values()->all();
 
         return $model->getScoutModelsByIds(
             $builder,
             $keys
         )->filter(function ($model) use ($keys) {
-                return in_array($model->getScoutKey(), $keys);
-            });
+            return in_array($model->getScoutKey(), $keys);
+        });
+    }
+
+    /**
+     * Map the given results to instances of the given model via a lazy collection.
+     *
+     * @param  \Laravel\Scout\Builder  $builder
+     * @param  mixed  $results
+     * @param  \Illuminate\Database\Eloquent\Model  $model
+     * @return \Illuminate\Support\LazyCollection
+     */
+    public function lazyMap(Builder $builder, $results, $model)
+    {
+        if (intval($results['hits']['total']) === 0) {
+            return LazyCollection::make($model->newCollection());
+        }
+
+        $objectIds = collect($results['hits']['hits'])->pluck('_id')->values()->all();
+
+        $objectIdPositions = array_flip($objectIds);
+
+        return $model->queryScoutModelsByIds(
+                $builder, $objectIds
+            )->cursor()->filter(function ($model) use ($objectIds) {
+                return in_array($model->getScoutKey(), $objectIds);
+            })->sortBy(function ($model) use ($objectIdPositions) {
+                return $objectIdPositions[$model->getScoutKey()];
+            })->values();
+    }
+
+    /**
+     * Create a search index.
+     *
+     * @param  string  $name
+     * @param  array  $options
+     * @return mixed
+     */
+    public function createIndex($name, array $options = [])
+    {
+        throw new Exception('Database indexes are created automatically upon adding objects.');
+    }
+
+    /**
+     * Delete a search index.
+     *
+     * @param  string  $name
+     * @return mixed
+     */
+    public function deleteIndex($name)
+    {
+        $this->elastic->bulk([
+            'body' => [
+                [
+                    'delete' => [
+                        '_index' => $name,
+                        /**
+                         * @deprecated Document mapping types scheduled deprecated in
+                         * elasticsearch 6.0 will be removed in 8.0.
+                         * https://bit.ly/2TZVZvq
+                         */
+                        '_type' => $name,
+                    ],
+                ]
+            ]
+        ]);
     }
 
     /**

tests/ElasticsearchEngineTest.php

@@ -7,6 +7,7 @@
 use Laravel\Scout\Builder;
 use Mockery;
 use Tests\Fixtures\TestModel;
+use Illuminate\Support\LazyCollection;
 
 class ElasticsearchEngineTest extends AbstractTestCase
 {
@@ -88,7 +89,7 @@ public function test_builder_callback_can_manipulate_search_parameters_to_elasti
     {
         /** @var \Elasticsearch\Client|\Mockery\MockInterface $client */
         $client = Mockery::mock(\Elasticsearch\Client::class);
-        $client->shouldReceive('search')->with('modified_by_callback');
+        $client->shouldReceive('search')->with(['modified_by_callback']);
 
         $engine = new ElasticsearchEngine($client);
         $builder = new \Laravel\Scout\Builder(
@@ -97,7 +98,7 @@ public function test_builder_callback_can_manipulate_search_parameters_to_elasti
             function (\Elasticsearch\Client $client, $query, $params) {
                 $this->assertNotEmpty($params);
                 $this->assertEquals('huayra', $query);
-                $params = 'modified_by_callback';
+                $params = ['modified_by_callback'];
 
                 return $client->search($params);
             }
@@ -131,4 +132,53 @@ public function test_map_correctly_maps_results_to_models()
 
         $this->assertEquals(1, count($results));
     }
+
+    public function test_lazy_map_correctly_maps_results_to_models()
+    {
+        $client = Mockery::mock('Elasticsearch\Client');
+        $engine = new ElasticsearchEngine($client);
+
+        $builder = Mockery::mock(Builder::class);
+
+        $model = Mockery::mock('Illuminate\Database\Eloquent\Model');
+        $model->shouldReceive('getScoutKey')->andReturn('1');
+        $model->shouldReceive('queryScoutModelsByIds')->andReturn($model);
+        $model->shouldReceive('cursor')->andReturn($model);
+        $model->shouldReceive('filter')->andReturn($model);
+        $model->shouldReceive('sortBy')->andReturn($model);
+        $model->shouldReceive('values')->andReturn(LazyCollection::make([1]));
+
+        $results = $engine->lazyMap($builder, [
+            'hits' => [
+                'total' => 1,
+                'hits'  => [
+                    [
+                        '_id' => '1',
+                    ],
+                ],
+            ],
+        ], $model);
+
+        $this->assertCount(1, $results);
+    }
+
+    public function test_lazy_map_correctly_maps_empty()
+    {
+        $client = Mockery::mock('Elasticsearch\Client');
+        $engine = new ElasticsearchEngine($client);
+
+        $builder = Mockery::mock(Builder::class);
+
+        $model = Mockery::mock('Illuminate\Database\Eloquent\Model');
+        $model->shouldReceive('newCollection')->andReturn(collect([]));
+
+        $results = $engine->lazyMap($builder, [
+            'hits' => [
+                'total' => 0,
+                'hits'  => [],
+            ],
+        ], $model);
+
+        $this->assertCount(0, $results);
+    }
 }