IBX-7236: Suggestions only work with entire words (#37)

* Fixed min search query lenght in autocomplete * Added asterix to search query * Fixed strlen to mb_strlen * Fixed phpstan * Added wildcards on both ends of token * Fixed query wildcard --------- Co-authored-by: Krzysztof Słomka <[email protected]> Co-authored-by: Maciej Kobus <[email protected]>
ibexa · Jan 8, 2024 · 740d01f · 740d01f
1 parent f252988
commit 740d01f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/bundle/Controller/SuggestionController.php b/src/bundle/Controller/SuggestionController.php
@@ -8,6 +8,7 @@
 
 namespace Ibexa\Bundle\Search\Controller;
 
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Search\Model\SuggestionQuery;
 use Ibexa\Search\Service\SuggestionService;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -17,14 +18,23 @@ final class SuggestionController extends AbstractController
 {
     private SuggestionService $suggestionService;
 
+    private ConfigResolverInterface $configResolver;
+
     public function __construct(
-        SuggestionService $suggestionService
+        SuggestionService $suggestionService,
+        ConfigResolverInterface $configResolver
     ) {
         $this->suggestionService = $suggestionService;
+        $this->configResolver = $configResolver;
     }
 
     public function suggestAction(SuggestionQuery $suggestionQuery): JsonResponse
     {
+        $minQueryLength = $this->configResolver->getParameter('search.suggestion.min_query_length');
+        if (mb_strlen($suggestionQuery->getQuery()) < $minQueryLength) {
+            return $this->json([]);
+        }
+
         $result = $this->suggestionService->suggest($suggestionQuery);
 
         return $this->json($result);

diff --git a/src/lib/EventDispatcher/EventListener/ContentSuggestionSubscriber.php b/src/lib/EventDispatcher/EventListener/ContentSuggestionSubscriber.php
@@ -51,7 +51,7 @@ public function onBuildSuggestionCollectionEvent(
 
         $query = new Query(
             [
-                'query' => new Query\Criterion\FullText($value),
+                'query' => new Query\Criterion\FullText($value . '*'),
                 'limit' => $limit,
             ]
         );

diff --git a/src/lib/View/SearchViewFilter.php b/src/lib/View/SearchViewFilter.php
@@ -93,6 +93,7 @@ public function handleSearchForm(FilterViewBuilderParametersEvent $event): void
         if (!empty($search['section'])) {
             $section = $this->sectionService->loadSection($search['section']);
         }
+
         if (!empty($search['content_types']) && \is_array($search['content_types'])) {
             foreach ($search['content_types'] as $identifier) {
                 $contentTypes[] = $this->contentTypeService->loadContentTypeByIdentifier($identifier);