MC-41706: Catalog Search is not accent insensitive

- fix
- modify test

Author: o-dubovyk

app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php

@@ -58,7 +58,7 @@ public function build()
                         'type' => 'custom',
                         'tokenizer' => key($tokenizer),
                         'filter' => array_merge(
-                            ['lowercase', 'keyword_repeat'],
+                            ['lowercase', 'keyword_repeat', 'asciifolding'],
                             array_keys($filter)
                         ),
                         'char_filter' => array_keys($charFilter)
@@ -67,26 +67,22 @@ public function build()
                     'prefix_search' => [
                         'type' => 'custom',
                         'tokenizer' => key($tokenizer),
-                        'filter' => array_merge(
-                            ['lowercase', 'keyword_repeat']
-                        ),
+                        'filter' => ['lowercase', 'keyword_repeat', 'asciifolding'],
                         'char_filter' => array_keys($charFilter)
                     ],
                     'sku' => [
                         'type' => 'custom',
                         'tokenizer' => 'keyword',
                         'filter' => array_merge(
-                            ['lowercase', 'keyword_repeat'],
+                            ['lowercase', 'keyword_repeat', 'asciifolding'],
                             array_keys($filter)
                         ),
                     ],
                     // this analyzer must not include stemmer filter
                     'sku_prefix_search' => [
                         'type' => 'custom',
                         'tokenizer' => 'keyword',
-                        'filter' => array_merge(
-                            ['lowercase', 'keyword_repeat']
-                        ),
+                        'filter' => ['lowercase', 'keyword_repeat', 'asciifolding']
                     ]
                 ],
                 'tokenizer' => $tokenizer,

dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php

@@ -174,17 +174,30 @@ public function testSortCaseSensitive(): void
      *
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     * @dataProvider searchSpecificProductDataProvider
+     * @param string $searchName
+     * @param string $sku
+     * @param int $expectedCount
      */
-    public function testSearchSpecificProduct()
+    public function testSearchSpecificProduct(string $searchName, string $sku, int $expectedCount)
     {
         $this->reindexAll();
-        $result = $this->searchByName('12345');
-        self::assertCount(1, $result);
+        $result = $this->searchByName($searchName);
+        self::assertCount($expectedCount, $result);
 
-        $specificProduct = $this->productRepository->get('configurable_12345');
+        $specificProduct = $this->productRepository->get($sku);
         self::assertEquals($specificProduct->getId(), $result[0]['_id']);
     }
 
+    public function searchSpecificProductDataProvider(): array
+    {
+        return [
+            'search by numeric name' => ['12345', 'configurable_12345', 1],
+            'search by name with diacritics' => ['Cùstöm Dèsign', 'custom-design-simple-product', 1],
+        ];
+    }
+
     /**
      * @param string $text
      * @return array