MC-33710: Elasticsearch configuration fields are out of order

- Added partial search for "name" field

Author: Prabhu Ram

app/code/Magento/CatalogSearch/etc/search_request.xml

@@ -14,13 +14,17 @@
         <queries>
             <query xsi:type="boolQuery" name="quick_search_container" boost="1">
                 <queryReference clause="should" ref="search" />
+                <queryReference clause="should" ref="partial_search" />
                 <queryReference clause="must" ref="category"/>
                 <queryReference clause="must" ref="price"/>
                 <queryReference clause="must" ref="visibility"/>
             </query>
             <query xsi:type="matchQuery" value="$search_term$" name="search">
                 <match field="*"/>
             </query>
+            <query xsi:type="matchQuery" value="$search_term$" name="partial_search">
+                <match field="name" matchCondition="match_phrase_prefix"/>
+            </query>
             <query xsi:type="filteredQuery" name="category">
                 <filterReference clause="must" ref="category_filter"/>
             </query>

app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php

@@ -80,7 +80,7 @@ public function build(array $selectQuery, RequestQueryInterface $requestQuery, $
         $minimumShouldMatch = $this->config->getElasticsearchConfigData('minimum_should_match');
         foreach ($queries as $query) {
             $queryBody = $query['body'];
-            $matchKey = isset($queryBody['match_phrase']) ? 'match_phrase' : 'match';
+            $matchKey = array_keys($queryBody)[0];
             foreach ($queryBody[$matchKey] as $field => $matchQuery) {
                 $matchQuery['boost'] = $requestQueryBoost + $matchQuery['boost'];
                 if ($minimumShouldMatch) {
@@ -132,7 +132,7 @@ protected function buildQueries(array $matches, array $queryValue)
         // Checking for quoted phrase \"phrase test\", trim escaped surrounding quotes if found
         $count = 0;
         $value = preg_replace('#^"(.*)"$#m', '$1', $queryValue['value'], -1, $count);
-        $condition = ($count) ? 'match_phrase' : 'match';
+        $matchCondition = ($count) ? 'match_phrase' : 'match';
 
         $transformedTypes = [];
         foreach ($matches as $match) {
@@ -153,11 +153,11 @@ protected function buildQueries(array $matches, array $queryValue)
                 //Value is incompatible with this field type.
                 continue;
             }
-
+            $matchCondition = $match['matchCondition'] ?? $matchCondition;
             $conditions[] = [
                 'condition' => $queryValue['condition'],
                 'body' => [
-                    $condition => [
+                    $matchCondition => [
                         $resolvedField => [
                             'query' => $transformedValue,
                             'boost' => $match['boost'] ?? 1,

lib/internal/Magento/Framework/Search/etc/requests.xsd

@@ -225,6 +225,7 @@
     <xs:simpleContent>
       <xs:extension base="xs:string">
         <xs:attribute type="xs:string" name="field" use="required" />
+        <xs:attribute type="xs:string" name="matchCondition" />
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>