MC-37954: PLP sort by name is case-sensitive with ElasticSearch

Author: tsviklinskyi

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

@@ -90,6 +90,13 @@ class ProductDataMapper implements BatchDataMapperInterface
      */
     private $filterableAttributeTypes;
 
+    /**
+     * @var string[]
+     */
+    private $sortableCaseSensitiveAttributes = [
+        'name',
+    ];
+
     /**
      * @param Builder $builder
      * @param FieldMapperInterface $fieldMapper
@@ -99,6 +106,7 @@ class ProductDataMapper implements BatchDataMapperInterface
      * @param array $excludedAttributes
      * @param array $sortableAttributesValuesToImplode
      * @param array $filterableAttributeTypes
+     * @param array $sortableCaseSensitiveAttributes
      */
     public function __construct(
         Builder $builder,
@@ -108,7 +116,8 @@ public function __construct(
         DataProvider $dataProvider,
         array $excludedAttributes = [],
         array $sortableAttributesValuesToImplode = [],
-        array $filterableAttributeTypes = []
+        array $filterableAttributeTypes = [],
+        array $sortableCaseSensitiveAttributes = []
     ) {
         $this->builder = $builder;
         $this->fieldMapper = $fieldMapper;
@@ -122,6 +131,10 @@ public function __construct(
         $this->dataProvider = $dataProvider;
         $this->attributeOptionsCache = [];
         $this->filterableAttributeTypes = $filterableAttributeTypes;
+        $this->sortableCaseSensitiveAttributes = array_merge(
+            $this->sortableCaseSensitiveAttributes,
+            $sortableCaseSensitiveAttributes
+        );
     }
 
     /**
@@ -298,6 +311,12 @@ function (string $valueId) {
             $attributeValues = [$productId => implode(' ', $attributeValues)];
         }
 
+        if (in_array($attribute->getAttributeCode(), $this->sortableCaseSensitiveAttributes)) {
+            foreach ($attributeValues as $key => $attributeValue) {
+                $attributeValues[$key] = strtolower($attributeValue);
+            }
+        }
+
         return $attributeValues;
     }