Merge remote-tracking branch 'origin/ACP2E-3897' into PR_2025_08_25_muntianu

Author: katmoon

app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php

@@ -38,6 +38,7 @@ class SearchCriteriaBuilder
      * @param RequestDataBuilder $localData
      * @param SearchCriteriaResolverFactory $criteriaResolverFactory
      * @param ArgumentApplierPool $argumentApplierPool
+     * @param array $partialSearchAnalyzers
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -51,6 +52,7 @@ public function __construct(
         private readonly RequestDataBuilder $localData,
         private readonly SearchCriteriaResolverFactory $criteriaResolverFactory,
         private readonly ArgumentApplierPool $argumentApplierPool,
+        private readonly array $partialSearchAnalyzers = []
     ) {
     }
 
@@ -117,6 +119,10 @@ private function updateMatchTypeRequestConfig(string $requestName, array $partia
             foreach ($query['match'] ?? [] as $index => $matchItem) {
                 if (in_array($matchItem['field'] ?? null, $partialMatchFilters, true)) {
                     $data['queries'][$queryName]['match'][$index]['matchCondition'] = 'match_phrase_prefix';
+                    if (array_key_exists($matchItem['field'], $this->partialSearchAnalyzers)) {
+                        $data['queries'][$queryName]['match'][$index]['analyzer']
+                            = $this->partialSearchAnalyzers[$matchItem['field']];
+                    }
                 }
             }
         }

app/code/Magento/CatalogGraphQl/etc/di.xml

@@ -150,4 +150,12 @@
             </argument>
         </arguments>
     </type>
+
+    <type name="Magento\CatalogGraphQl\DataProvider\Product\SearchCriteriaBuilder">
+        <arguments>
+            <argument name="partialSearchAnalyzers" xsi:type="array">
+                <item name="name" xsi:type="string">prefix_search</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -204,6 +204,64 @@ public function sortByPriceAndNameDataProvider(): array
         ];
     }
 
+    /**
+     * @dataProvider filterByNameWithMatchTypeSpecifiedDataProvider
+     */
+    #[
+        DataFixture(ProductFixture::class, ['price' => 10, 'name' => 'Cronus Yoga Pant'], 'prod1'),
+        DataFixture(ProductFixture::class, ['price' => 10, 'name' => 'Lucia Cross-Fit Bra'], 'prod2'),
+        DataFixture(ProductFixture::class, ['price' => 20, 'name' => 'Crown Summit Backpack'], 'prod3'),
+    ]
+    public function testFilterByNameWithMatchTypeSpecified($matchType, $expectedReturns, $expectedTotalCount): void
+    {
+        $expectedNames = [];
+        foreach ($expectedReturns as $productName) {
+            $expectedNames[] = $this->fixture->get($productName)->getName();
+        }
+        $query = <<<'QUERY'
+query GetProductsQuery(
+    $searchWord: String,
+    $matchType: FilterMatchTypeEnum
+) {
+    products(
+        filter: {name: {match: $searchWord, match_type: $matchType} },
+    ) {
+        total_count
+        page_info{total_pages}
+        items{
+            __typename
+            url_key
+            sku
+            name
+        }
+    }
+}
+QUERY;
+        $variables = [
+            'searchWord' => 'Cros',
+            'matchType' => $matchType,
+        ];
+
+        $response = $this->graphQlQuery($query, $variables);
+        $this->assertArrayNotHasKey('errors', $response);
+        $this->assertEquals($expectedTotalCount, $response['products']['total_count']);
+        $this->assertEquals($expectedNames, array_column($response['products']['items'], 'name'));
+    }
+
+    /**
+     * @return array
+     */
+    public function filterByNameWithMatchTypeSpecifiedDataProvider(): array
+    {
+        return [
+            [
+                'PARTIAL',
+                ['prod2'],
+                1
+            ],
+        ];
+    }
+
     /**
      * Verify that filters for non-existing category are empty
      *