AC-700 Fixed ElasticSearch sort order incorrect for Custom attribute

Author: mahesh-singh-rajawat

app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php

@@ -150,7 +150,7 @@ public function getField(AbstractAttribute $attribute): array
             $fieldMapping[$fieldName]['index'] = $index;
         }
 
-        if ($attributeAdapter->isSortable()) {
+        if ($attributeAdapter->isSortable() && !$attributeAdapter->isComplexType()) {
             $sortFieldName = $this->fieldNameResolver->getFieldName(
                 $attributeAdapter,
                 ['type' => FieldMapperInterface::TYPE_SORT]
@@ -188,6 +188,20 @@ public function getField(AbstractAttribute $attribute): array
             $fieldMapping[$childFieldName] = [
                 'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING)
             ];
+            if ($attributeAdapter->isSortable()) {
+                $sortFieldName = $this->fieldNameResolver->getFieldName(
+                    $attributeAdapter,
+                    ['type' => FieldMapperInterface::TYPE_SORT]
+                );
+                $fieldMapping[$childFieldName]['fields'][$sortFieldName] = [
+                    'type' => $this->fieldTypeConverter->convert(
+                        FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD
+                    ),
+                    'index' => $this->indexTypeConverter->convert(
+                        IndexTypeConverterInterface::INTERNAL_NO_ANALYZE_VALUE
+                    )
+                ];
+            }
         }
 
         return $fieldMapping;

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php

@@ -278,6 +278,34 @@ public function attributeProvider(): array
                     ],
                 ],
             ],
+            [
+                'attr_code',
+                'select',
+                false,
+                false,
+                'select',
+                true,
+                false,
+                'attr_code_value',
+                '',
+                'sort_attr_code',
+                [
+                    'attr_code_value' => [
+                        'type' => 'select',
+                        'index' => false,
+                        'fields' => [
+                            'sort_attr_code' => [
+                                'type' => 'string',
+                                'index' => 'not_analyzed',
+                            ],
+                        ],
+                    ],
+                    'store_id' => [
+                        'type' => 'string',
+                        'index' => 'no',
+                    ],
+                ],
+            ],
             [
                 'attr_code',
                 'text',