Fix Search Parameters Issue (#795)

laravel · Jan 23, 2024 · 1a89c3d · 1a89c3d
1 parent f6c5887
commit 1a89c3d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 28 deletions.
diff --git a/src/Engines/TypesenseEngine.php b/src/Engines/TypesenseEngine.php
@@ -34,7 +34,7 @@ class TypesenseEngine extends Engine
     /**
      * Create new Typesense engine instance.
      *
-     * @param  \Typesense  $typesense
+     * @param  Typesense  $typesense
      */
     public function __construct(Typesense $typesense)
     {
@@ -261,8 +261,8 @@ public function buildSearchParameters(Builder $builder, int $page, int|null $per
             'highlight_affix_num_tokens' => 4,
         ];
 
-        if (! empty($this->searchParameters)) {
-            $parameters = array_merge($parameters, $this->searchParameters);
+        if (! empty($builder->options)) {
+            $parameters = array_merge($parameters, $builder->options);
         }
 
         if (! empty($builder->orders)) {
@@ -522,30 +522,6 @@ protected function usesSoftDelete($model): bool
         return in_array(SoftDeletes::class, class_uses_recursive($model), true);
     }
 
-    /**
-     * Set the search options provided by user.
-     *
-     * @param  array  $options
-     * @return $this
-     */
-    public function withSearchParameters(array $options): static
-    {
-        return $this->setSearchParameters($options);
-    }
-
-    /**
-     * Set the search options provided by user.
-     *
-     * @param  array  $options
-     * @return $this
-     */
-    public function setSearchParameters(array $options): static
-    {
-        $this->searchParameters = $options;
-
-        return $this;
-    }
-
     /**
      * Dynamically proxy missing methods to the Typesense client instance.
      *

diff --git a/tests/Unit/TypesenseEngineTest.php b/tests/Unit/TypesenseEngineTest.php
@@ -2,6 +2,7 @@
 
 namespace Laravel\Scout\Tests\Unit;
 
+use Http\Client\Exception;
 use Illuminate\Container\Container;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
@@ -13,6 +14,7 @@
 use Typesense\Client as TypesenseClient;
 use Typesense\Collection as TypesenseCollection;
 use Typesense\Documents;
+use Typesense\Exceptions\TypesenseClientError;
 
 class TypesenseEngineTest extends TestCase
 {
@@ -234,6 +236,10 @@ public function test_create_index_method_throws_exception(): void
         $this->engine->createIndex('test_index');
     }
 
+    /**
+     * @throws Exception
+     * @throws TypesenseClientError
+     */
     public function test_set_search_params_method(): void
     {
         // Mock the Builder
@@ -260,8 +266,10 @@ public function test_set_search_params_method(): void
                 'highlight_affix_num_tokens' => 4,
             ]);
 
+        // Set search options
+        $builder->options(['query_by' => 'id']);
         // Call the search method
-        $this->engine->setSearchParameters(['query_by' => 'id'])->search($builder);
+        $this->engine->search($builder);
     }
 
     public function test_soft_deleted_objects_are_returned_with_only_trashed_method()