MC-34217: Sku search and Partial search by name in Advanced Search not working correctly

Author: viktorpetryk

app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php

@@ -186,6 +186,7 @@ private function generateAdvancedSearchRequest()
                                 [
                                     'field' => $attribute->getAttributeCode(),
                                     'boost' => $attribute->getSearchWeight() ?: 1,
+                                    'matchCondition' => 'match_phrase_prefix',
                                 ],
                             ],
                         ];

app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialNameTest.xml

@@ -10,17 +10,15 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontAdvancedSearchByPartialNameTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
         <annotations>
+            <features value="CatalogSearch"/>
             <stories value="Use Advanced Search"/>
             <title value="Search product in advanced search by partial name"/>
             <description value="Search product in advanced search by partial name"/>
-            <testCaseId value="MAGETWO-24729"/>
             <severity value="CRITICAL"/>
+            <testCaseId value="MC-40416"/>
             <group value="searchFrontend"/>
             <group value="mtf_migrated"/>
             <group value="SearchEngineElasticsearch"/>
-            <skip>
-                <issueId value="MC-34217"/>
-            </skip>
         </annotations>
         <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
             <argument name="productName" value="abc"/>

dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php

@@ -101,6 +101,39 @@ public function testExecuteSkuWithHyphen(): void
         $this->assertStringContainsString('Simple product name', $responseBody);
     }
 
+    /**
+     * Advanced search with an underscore in product attributes.
+     *
+     * @magentoAppArea frontend
+     * @magentoDataFixture Magento/CatalogSearch/_files/product_for_search_with_underscore.php
+     * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php
+     *
+     * @return void
+     */
+    public function testExecuteWithUnderscore(): void
+    {
+        $this->getRequest()->setQuery(
+            $this->_objectManager->create(
+                Parameters::class,
+                [
+                    'values' => [
+                        'name' => 'name',
+                        'sku' => 'sku',
+                        'description' => 'description',
+                        'short_description' => 'short',
+                        'price' => [
+                            'from' => '',
+                            'to' => '',
+                        ],
+                    ],
+                ]
+            )
+        );
+        $this->dispatch('catalogsearch/advanced/result');
+        $responseBody = $this->getResponse()->getBody();
+        $this->assertStringContainsString('name_simple_product', $responseBody);
+    }
+
     /**
      * Data provider with strings for quick search.
      *

dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_underscore.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$baseWebsite = $websiteRepository->get('base');
+/** @var ProductInterfaceFactory $productFactory */
+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+$product = $productFactory->create();
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([$baseWebsite->getId()])
+    ->setName('name_simple_product')
+    ->setSku('sku_simple_product')
+    ->setShortDescription('short_description_simple_product')
+    ->setDescription('description_simple_product')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setPrice(100)
+    ->setWeight(1)
+    ->setTaxClassId(0)
+    ->setStockData(
+        [
+            'use_config_manage_stock' => 1,
+            'qty' => 100,
+            'is_qty_decimal' => 0,
+            'is_in_stock' => 1,
+        ]
+    );
+$productRepository->save($product);

dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_underscore_rollback.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $product = $productRepository->get('sku_simple_product', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+    //product already deleted.
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);