MAGETWO-58764: [GitHub] Minimal Query Length For Catalog Search #6681

Author: eugene-petrov

app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php

@@ -9,8 +9,9 @@
 
 use Magento\Framework\DB\Helper\Mysql\Fulltext;
 use Magento\Framework\Search\Adapter\Mysql\Field\ResolverInterface;
-use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
 use Magento\Framework\Search\Adapter\Mysql\Query\Builder\Match as BuilderMatch;
+use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
+use Magento\Framework\Search\Request\Query\BoolExpression;
 use Magento\Search\Helper\Data;
 
 /**
@@ -23,6 +24,11 @@ class Match extends BuilderMatch
      */
     private $searchHelper;
 
+    /**
+     * @var string[]
+     */
+    private $replaceSymbols = [];
+
     /**
      * @param ResolverInterface $resolver
      * @param Fulltext $fulltextHelper
@@ -44,8 +50,33 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    protected function getMinimalCharacterLength()
+    protected function prepareQuery($queryValue, $conditionType)
     {
-        return $this->searchHelper->getMinQueryLength();
+        $queryValue = str_replace($this->replaceSymbols, ' ', $queryValue);
+        foreach ($this->preprocessors as $preprocessor) {
+            $queryValue = $preprocessor->process($queryValue);
+        }
+
+        $stringPrefix = '';
+        if ($conditionType === BoolExpression::QUERY_CONDITION_MUST) {
+            $stringPrefix = '+';
+        } elseif ($conditionType === BoolExpression::QUERY_CONDITION_NOT) {
+            $stringPrefix = '-';
+        }
+
+        $queryValues = explode(' ', $queryValue);
+
+        foreach ($queryValues as $queryKey => $queryValue) {
+            if (empty($queryValue)) {
+                unset($queryValues[$queryKey]);
+            } else {
+                $stringSuffix = $this->searchHelper->getMinQueryLength() > strlen($queryValue) ? '' : '*';
+                $queryValues[$queryKey] = $stringPrefix . $queryValue . $stringSuffix;
+            }
+        }
+
+        $queryValue = implode(' ', $queryValues);
+
+        return $queryValue;
     }
 }

lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php

@@ -148,7 +148,7 @@ protected function prepareQuery($queryValue, $conditionType)
             if (empty($queryValue)) {
                 unset($queryValues[$queryKey]);
             } else {
-                $stringSuffix = $this->getMinimalCharacterLength() > strlen($queryValue) ? '' : '*';
+                $stringSuffix = self::MINIMAL_CHARACTER_LENGTH > strlen($queryValue) ? '' : '*';
                 $queryValues[$queryKey] = $stringPrefix . $queryValue . $stringSuffix;
             }
         }
@@ -157,14 +157,4 @@ protected function prepareQuery($queryValue, $conditionType)
 
         return $queryValue;
     }
-
-    /**
-     * Retrieves minimal character length
-     *
-     * @return int
-     */
-    protected function getMinimalCharacterLength()
-    {
-        return self::MINIMAL_CHARACTER_LENGTH;
-    }
 }