Add basic search term filter and use it for products

Author: maximehuran

dist/src/Resources/config/services.yaml

@@ -75,7 +75,7 @@ services:
 
     # Define the taxon query filters
     app.search.request.query_filter.taxon_instant_search.search_term_filter:
-        class: App\Search\Request\QueryFilter\Taxon\SearchTermFilter
+        class: MonsieurBiz\SyliusSearchPlugin\Search\Request\QueryFilter\SearchTermFilter
         arguments:
             $fieldsToSearch:
                 - 'name^5'
@@ -85,7 +85,7 @@ services:
             - { name: app.search.request.taxon_instant_search_filter }
 
     app.search.request.query_filter.taxon_search.search_term_filter:
-        class: App\Search\Request\QueryFilter\Taxon\SearchTermFilter
+        class: MonsieurBiz\SyliusSearchPlugin\Search\Request\QueryFilter\SearchTermFilter
         arguments:
             $fieldsToSearch:
                 - 'name^5'

src/Search/Request/QueryFilter/Product/SearchTermFilter.php

@@ -18,55 +18,29 @@
 use Elastica\QueryBuilder;
 use MonsieurBiz\SyliusSearchPlugin\Repository\ProductAttributeRepositoryInterface;
 use MonsieurBiz\SyliusSearchPlugin\Repository\ProductOptionRepositoryInterface;
-use MonsieurBiz\SyliusSearchPlugin\Search\Request\QueryFilter\QueryFilterInterface;
+use MonsieurBiz\SyliusSearchPlugin\Search\Request\QueryFilter\SearchTermFilter as BaseSearchTermFilter;
 use MonsieurBiz\SyliusSearchPlugin\Search\Request\RequestConfiguration;
 
-final class SearchTermFilter implements QueryFilterInterface
+final class SearchTermFilter extends BaseSearchTermFilter
 {
     private ProductAttributeRepositoryInterface $productAttributeRepository;
 
     private ProductOptionRepositoryInterface $productOptionRepository;
 
-    private array $fieldsToSearch;
-
     public function __construct(
         ProductAttributeRepositoryInterface $productAttributeRepository,
         ProductOptionRepositoryInterface $productOptionRepository,
         array $fieldsToSearch
     ) {
+        parent::__construct($fieldsToSearch);
         $this->productAttributeRepository = $productAttributeRepository;
         $this->productOptionRepository = $productOptionRepository;
-        $this->fieldsToSearch = $fieldsToSearch;
     }
 
-    public function apply(BoolQuery $boolQuery, RequestConfiguration $requestConfiguration): void
+    protected function addCustomFilters(BoolQuery $searchQuery, RequestConfiguration $requestConfiguration): void
     {
-        $qb = new QueryBuilder();
-
-        $searchCode = $qb->query()->term(['code' => $requestConfiguration->getQueryText()]);
-
-        $searchQuery = $qb->query()->bool();
-        $searchQuery->addShould($searchCode);
-        $this->addFieldsToSearchCondition($searchQuery, $requestConfiguration);
-
         $this->addAttributesQueries($searchQuery, $requestConfiguration);
         $this->addOptionsQueries($searchQuery, $requestConfiguration);
-
-        $boolQuery->addMust($searchQuery);
-    }
-
-    private function addFieldsToSearchCondition(BoolQuery $searchQuery, RequestConfiguration $requestConfiguration): void
-    {
-        if (0 === \count($this->fieldsToSearch)) {
-            return;
-        }
-        $qb = new QueryBuilder();
-        $nameAndDescriptionQuery = $qb->query()->multi_match();
-        $nameAndDescriptionQuery->setFields($this->fieldsToSearch);
-        $nameAndDescriptionQuery->setQuery($requestConfiguration->getQueryText());
-        $nameAndDescriptionQuery->setType(MultiMatch::TYPE_MOST_FIELDS);
-        $nameAndDescriptionQuery->setFuzziness(MultiMatch::FUZZINESS_AUTO);
-        $searchQuery->addShould($nameAndDescriptionQuery);
     }
 
     private function addAttributesQueries(BoolQuery $searchQuery, RequestConfiguration $requestConfiguration): void

dist/src/Search/Request/QueryFilter/Taxon/SearchTermFilter.php src/Search/Request/QueryFilter/SearchTermFilter.php

@@ -11,17 +11,16 @@
 
 declare(strict_types=1);
 
-namespace App\Search\Request\QueryFilter\Taxon;
+namespace MonsieurBiz\SyliusSearchPlugin\Search\Request\QueryFilter;
 
 use Elastica\Query\BoolQuery;
 use Elastica\Query\MultiMatch;
 use Elastica\QueryBuilder;
-use MonsieurBiz\SyliusSearchPlugin\Search\Request\QueryFilter\QueryFilterInterface;
 use MonsieurBiz\SyliusSearchPlugin\Search\Request\RequestConfiguration;
 
-final class SearchTermFilter implements QueryFilterInterface
+class SearchTermFilter implements QueryFilterInterface
 {
-    private array $fieldsToSearch;
+    protected array $fieldsToSearch;
 
     public function __construct(
         array $fieldsToSearch
@@ -39,10 +38,12 @@ public function apply(BoolQuery $boolQuery, RequestConfiguration $requestConfigu
         $searchQuery->addShould($searchCode);
         $this->addFieldsToSearchCondition($searchQuery, $requestConfiguration);
 
+        $this->addCustomFilters($searchQuery, $requestConfiguration);
+
         $boolQuery->addMust($searchQuery);
     }
 
-    private function addFieldsToSearchCondition(BoolQuery $searchQuery, RequestConfiguration $requestConfiguration): void
+    protected function addFieldsToSearchCondition(BoolQuery $searchQuery, RequestConfiguration $requestConfiguration): void
     {
         if (0 === \count($this->fieldsToSearch)) {
             return;
@@ -55,4 +56,9 @@ private function addFieldsToSearchCondition(BoolQuery $searchQuery, RequestConfi
         $nameAndDescriptionQuery->setFuzziness(MultiMatch::FUZZINESS_AUTO);
         $searchQuery->addShould($nameAndDescriptionQuery);
     }
+
+    protected function addCustomFilters(BoolQuery $searchQuery, RequestConfiguration $requestConfiguration): void
+    {
+        // Used by children classes
+    }
 }