Merge pull request #989 from SlovakNationalGallery/MG-74

[item] prioritize suggestions with images
SlovakNationalGallery · Apr 9, 2024 · f19f16f · f19f16f
2 parents 8654a60 + 04d9a92
commit f19f16f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/app/Elasticsearch/Repositories/ItemRepository.php b/app/Elasticsearch/Repositories/ItemRepository.php
@@ -86,6 +86,9 @@ public static function buildSuggestionsQuery(string $search): array
                         'operator' => 'and',
                     ],
                 ],
+                'should' => [
+                    ['term' => ['has_image' => true]],
+                ],
                 'filter' => [
                     ['term' => ['frontend' => Frontend::get()]],
                 ],

diff --git a/tests/Elasticsearch/Repositories/ItemRepositoryTest.php b/tests/Elasticsearch/Repositories/ItemRepositoryTest.php
@@ -88,4 +88,29 @@ public function testSimilarByColor()
         $this->assertTrue($similar_by_color->first()->is($similar_item));
         $this->assertFalse($similar_by_color->contains($dissimilar_item));
     }
+
+    public function testSuggestions()
+    {
+        $withImage = Item::factory()->make([
+            'title' => 'apple',
+            'has_image' => true,
+        ]);
+
+        $withoutImage = Item::factory()->make([
+            'title' => 'apple apple',
+            'has_image' => false,
+        ]);
+
+        foreach ([$withImage, $withoutImage] as $item) {
+            $this->repository->index($item);
+        }
+        $this->repository->refreshIndex();
+
+        $suggestions = $this->repository
+            ->getSuggestions(2, 'apple')
+            ->getCollection();
+
+        $this->assertTrue($suggestions[0]->is($withImage));
+        $this->assertTrue($suggestions[1]->is($withoutImage));
+    }
 }