Bugfix for empty search terms

Author: pascalbaljet

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-cross-eloquent-search` will be documented in this file
 
+## 2.2.2 - 2021-09-21
+
+- Bugfix for empty search terms
+
 ## 2.2.1 - 2021-09-17
 
 - Bugfix for JSON columns

src/Searcher.php

@@ -351,7 +351,7 @@ public function addSearchQueryToBuilder(Builder $builder, ModelToSearchThrough $
      */
     private function addRelevanceQueryToBuilder($builder, $modelToSearchThrough)
     {
-        if ($this->orderByDirection !== 'relevance') {
+        if (!$this->isOrderingByRelevance() || $this->termsWithoutWildcards->isEmpty()) {
             return;
         }
 
@@ -428,6 +428,16 @@ protected function buildQueries(): Collection
         });
     }
 
+    /**
+     * Returns a boolean wether the ordering is set to 'relevance'.
+     *
+     * @return boolean
+     */
+    private function isOrderingByRelevance(): bool
+    {
+        return $this->orderByDirection === 'relevance';
+    }
+
     /**
       * Compiles all queries to one big one which binds everything together
       * using UNION statements.
@@ -444,12 +454,15 @@ protected function getCompiledQueryBuilder(): QueryBuilder
         // union the other queries together
         $queries->each(fn (Builder $query) => $firstQuery->union($query));
 
-        if ($this->orderByDirection === 'relevance') {
+        if ($this->isOrderingByRelevance() && $this->termsWithoutWildcards->isNotEmpty()) {
             return $firstQuery->orderBy('terms_count', 'desc');
         }
 
         // sort by the given columns and direction
-        return $firstQuery->orderBy(DB::raw($this->makeOrderBy()), $this->orderByDirection);
+        return $firstQuery->orderBy(
+            DB::raw($this->makeOrderBy()),
+            $this->isOrderingByRelevance() ? 'asc' : $this->orderByDirection
+        );
     }
 
     /**

tests/SearchTest.php

@@ -324,6 +324,20 @@ public function it_can_sort_by_word_occurrence()
         $this->assertTrue($results->first()->is($videoB));
     }
 
+    /** @test */
+    public function it_doesnt_fail_when_the_terms_are_empty()
+    {
+        Video::create(['title' => 'bar']);
+        Video::create(['title' => 'foo']);
+
+        $results = Search::new()
+            ->add(Video::class)
+            ->orderByRelevance()
+            ->get();
+
+        $this->assertCount(2, $results);
+    }
+
     /** @test */
     public function it_uses_length_aware_paginator_by_default()
     {