Execute the callback that can be passed to the Builder in performSearch (ErickTamayo#56)

kronthto · ErickTamayo · commit 85bc852ca059 · 2017-08-21T10:07:01.000-04:00
Context: laravel/scout#111 Implementation analogical to the official AlgoliaEngine implementation: https://github.com/laravel/scout/blob/v3.0.3/src/Engines/AlgoliaEngine.php#L112-L119
diff --git a/src/ElasticsearchEngine.php b/src/ElasticsearchEngine.php
@@ -154,6 +154,15 @@ protected function performSearch(Builder $builder, array $options = [])
                 $options['numericFilters']);
         }
 
+        if ($builder->callback) {
+            return call_user_func(
+                $builder->callback,
+                $this->elastic,
+                $builder->query,
+                $params
+            );
+        }
+
         return $this->elastic->search($params);
     }
 
diff --git a/tests/ElasticsearchEngineTest.php b/tests/ElasticsearchEngineTest.php
@@ -82,6 +82,28 @@ public function test_search_sends_correct_parameters_to_elasticsearch()
         $engine->search($builder);
     }
 
+    public function test_builder_callback_can_manipulate_search_parameters_to_elasticsearch()
+    {
+        /** @var \Elasticsearch\Client|\Mockery\MockInterface $client */
+        $client = Mockery::mock(\Elasticsearch\Client::class);
+        $client->shouldReceive('search')->with('modified_by_callback');
+
+        $engine = new ElasticsearchEngine($client, 'scout');
+        $builder = new Laravel\Scout\Builder(
+            new ElasticsearchEngineTestModel(),
+            'huayra',
+            function (\Elasticsearch\Client $client, $query, $params) {
+                $this->assertNotEmpty($params);
+                $this->assertEquals('huayra', $query);
+                $params = 'modified_by_callback';
+
+                return $client->search($params);
+            }
+        );
+
+        $engine->search($builder);
+    }
+
     public function test_map_correctly_maps_results_to_models()
     {
         $client = Mockery::mock('Elasticsearch\Client');

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,15 @@ protected function performSearch(Builder $builder, array $options = [])`
`154`	`154`	`$options['numericFilters']);`
`155`	`155`	`}`
`156`	`156`
	`157`	`+ if ($builder->callback) {`
	`158`	`+ return call_user_func(`
	`159`	`+ $builder->callback,`
	`160`	`+ $this->elastic,`
	`161`	`+ $builder->query,`
	`162`	`+ $params`
	`163`	`+ );`
	`164`	`+ }`
	`165`	`+`
`157`	`166`	`return $this->elastic->search($params);`
`158`	`167`	`}`
`159`	`168`