Merge remote-tracking branch 'tango/MC-29530' into DEC-PR-01

Author: dhorytskyi

app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php

@@ -77,6 +77,13 @@ class ProductDataMapper implements BatchDataMapperInterface
         'tax_class_id'
     ];
 
+    /**
+     * @var string[]
+     */
+    private $sortableAttributesValuesToImplode = [
+        'name'
+    ];
+
     /**
      * Construction for DocumentDataMapper
      *
@@ -86,19 +93,25 @@ class ProductDataMapper implements BatchDataMapperInterface
      * @param AdditionalFieldsProviderInterface $additionalFieldsProvider
      * @param DataProvider $dataProvider
      * @param array $excludedAttributes
+     * @param array $sortableAttributesValuesToImplode
      */
     public function __construct(
         Builder $builder,
         FieldMapperInterface $fieldMapper,
         DateFieldType $dateFieldType,
         AdditionalFieldsProviderInterface $additionalFieldsProvider,
         DataProvider $dataProvider,
-        array $excludedAttributes = []
+        array $excludedAttributes = [],
+        array $sortableAttributesValuesToImplode = []
     ) {
         $this->builder = $builder;
         $this->fieldMapper = $fieldMapper;
         $this->dateFieldType = $dateFieldType;
         $this->excludedAttributes = array_merge($this->defaultExcludedAttributes, $excludedAttributes);
+        $this->sortableAttributesValuesToImplode = array_merge(
+            $this->sortableAttributesValuesToImplode,
+            $sortableAttributesValuesToImplode
+        );
         $this->additionalFieldsProvider = $additionalFieldsProvider;
         $this->dataProvider = $dataProvider;
         $this->attributeOptionsCache = [];
@@ -241,6 +254,13 @@ private function prepareAttributeValues(
             }
         }
 
+        if ($attribute->getUsedForSortBy()
+            && in_array($attribute->getAttributeCode(), $this->sortableAttributesValuesToImplode)
+            && count($attributeValues) > 1
+        ) {
+            $attributeValues = [$productId => implode(' ', $attributeValues)];
+        }
+
         return $attributeValues;
     }
 

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

@@ -79,6 +79,42 @@ public function testSearchAll()
         self::assertGreaterThanOrEqual(2, $result);
     }
 
+    /**
+     * Test sorting of all products after full reindex
+     *
+     * @magentoDbIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
+     */
+    public function testSort()
+    {
+        /** @var $productFifth \Magento\Catalog\Model\Product */
+        $productSimple = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+        $productSimple->setTypeId('simple')
+            ->setAttributeSetId(4)
+            ->setWebsiteIds([1])
+            ->setName('ABC')
+            ->setSku('abc-first-in-sort')
+            ->setPrice(20)
+            ->setMetaTitle('meta title')
+            ->setMetaKeyword('meta keyword')
+            ->setMetaDescription('meta description')
+            ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+            ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+            ->setStockData(['use_config_manage_stock' => 0])
+            ->save();
+        $productConfigurableOption = $this->productRepository->get('simple_10');
+        $productConfigurableOption->setName('1ABC');
+        $this->productRepository->save($productConfigurableOption);
+        $this->reindexAll();
+        $productSimple = $this->productRepository->get('abc-first-in-sort');
+        $result = $this->sortByName();
+        $firstInSearchResults = (int) $result[0]['_id'];
+        $productSimpleId = (int) $productSimple->getId();
+        $this->assertEquals($productSimpleId, $firstInSearchResults);
+    }
+
     /**
      * Test search of specific product after full reindex
      *
@@ -125,6 +161,38 @@ private function searchByName($text)
         return isset($queryResult['hits']['hits']) ? $queryResult['hits']['hits'] : [];
     }
 
+    /**
+     * @return array
+     */
+    private function sortByName()
+    {
+        $storeId = $this->storeManager->getDefaultStoreView()->getId();
+        $searchQuery = [
+            'index' => $this->searchIndexNameResolver->getIndexName($storeId, 'catalogsearch_fulltext'),
+            'type' => $this->clientConfig->getEntityType(),
+            'body' => [
+                'sort' => [
+                    'name.sort_name' => [
+                        'order' => 'asc'
+                    ],
+                ],
+                'query' => [
+                    'bool' => [
+                        'must' => [
+                            [
+                                'terms' => [
+                                    'visibility' => [2, 4],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $queryResult = $this->client->query($searchQuery);
+        return isset($queryResult['hits']['hits']) ? $queryResult['hits']['hits'] : [];
+    }
+
     /**
      * Make fulltext catalog search reindex
      *