AC-700 Update elasticsearch sort for complex attribute

Author: mahesh-singh-rajawat

app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Sort.php

@@ -94,7 +94,15 @@ public function getSort(RequestInterface $request)
             if (isset($this->map[$fieldName])) {
                 $fieldName = $this->map[$fieldName];
             }
-            if ($attribute->isSortable() && !($attribute->isFloatType() || $attribute->isIntegerType())) {
+            if ($attribute->isSortable() && !$attribute->isComplexType() && !($attribute->isFloatType() || $attribute->isIntegerType())) {
+                $suffix = $this->fieldNameResolver->getFieldName(
+                    $attribute,
+                    ['type' => FieldMapperInterface::TYPE_SORT]
+                );
+                $fieldName .= '.' . $suffix;
+            }
+            if ($attribute->isComplexType() && $attribute->isSortable()) {
+                $fieldName .= '_value';
                 $suffix = $this->fieldNameResolver->getFieldName(
                     $attribute,
                     ['type' => FieldMapperInterface::TYPE_SORT]

app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/SortTest.php

@@ -72,6 +72,7 @@ public function testGetSort(
         $isSortable,
         $isFloatType,
         $isIntegerType,
+        $isComplexType,
         $fieldName,
         array $expected
     ) {
@@ -85,7 +86,7 @@ public function testGetSort(
             ->willReturn($sortItems);
         $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
             ->disableOriginalConstructor()
-            ->setMethods(['isSortable', 'isFloatType', 'isIntegerType'])
+            ->setMethods(['isSortable', 'isFloatType', 'isIntegerType', 'isComplexType'])
             ->getMock();
         $attributeMock->expects($this->any())
             ->method('isSortable')
@@ -96,6 +97,9 @@ public function testGetSort(
         $attributeMock->expects($this->any())
             ->method('isIntegerType')
             ->willReturn($isIntegerType);
+        $attributeMock->expects($this->any())
+            ->method('isComplexType')
+            ->willReturn($isComplexType);
         $this->attributeAdapterProvider->expects($this->any())
             ->method('getByAttributeCode')
             ->with($this->anything())
@@ -136,6 +140,7 @@ public function getSortProvider()
                 false,
                 false,
                 false,
+                false,
                 null,
                 []
             ],
@@ -153,6 +158,7 @@ public function getSortProvider()
                 false,
                 false,
                 false,
+                false,
                 'price',
                 [
                     [
@@ -176,6 +182,7 @@ public function getSortProvider()
                 true,
                 true,
                 true,
+                false,
                 'price',
                 [
                     [
@@ -199,6 +206,7 @@ public function getSortProvider()
                 true,
                 false,
                 false,
+                false,
                 'name',
                 [
                     [
@@ -222,6 +230,7 @@ public function getSortProvider()
                 false,
                 false,
                 false,
+                false,
                 'not_eav_attribute',
                 [
                     [
@@ -230,6 +239,30 @@ public function getSortProvider()
                         ]
                     ]
                 ]
+            ],
+            [
+                [
+                    [
+                        'field' => 'entity_id',
+                        'direction' => 'DESC'
+                    ],
+                    [
+                        'field' => 'color',
+                        'direction' => 'DESC'
+                    ],
+                ],
+                true,
+                false,
+                false,
+                true,
+                'color',
+                [
+                    [
+                        'color_value.sort_color' => [
+                            'order' => 'desc'
+                        ]
+                    ]
+                ]
             ]
         ];
     }