Merge remote-tracking branch 'origin/BUG#AC-700' into GL_Mainline_PR_03012022

Author: glo71317

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

@@ -127,6 +127,9 @@ public function getFields(array $context = []): array
      *
      * @param AbstractAttribute $attribute
      * @return array
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function getField(AbstractAttribute $attribute): array
     {
@@ -150,7 +153,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 +191,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/SearchAdapter/Query/Builder/Sort.php

@@ -74,6 +74,9 @@ public function __construct(
      *
      * @param RequestInterface $request
      * @return array
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function getSort(RequestInterface $request)
     {
@@ -94,7 +97,18 @@ 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/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',

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

@@ -59,6 +59,7 @@ protected function setUp(): void
 
     /**
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @dataProvider getSortProvider
      * @param array $sortItems
      * @param $isSortable
@@ -72,6 +73,7 @@ public function testGetSort(
         $isSortable,
         $isFloatType,
         $isIntegerType,
+        $isComplexType,
         $fieldName,
         array $expected
     ) {
@@ -85,7 +87,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 +98,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 +141,7 @@ public function getSortProvider()
                 false,
                 false,
                 false,
+                false,
                 null,
                 []
             ],
@@ -153,6 +159,7 @@ public function getSortProvider()
                 false,
                 false,
                 false,
+                false,
                 'price',
                 [
                     [
@@ -176,6 +183,7 @@ public function getSortProvider()
                 true,
                 true,
                 true,
+                false,
                 'price',
                 [
                     [
@@ -199,6 +207,7 @@ public function getSortProvider()
                 true,
                 false,
                 false,
+                false,
                 'name',
                 [
                     [
@@ -222,6 +231,7 @@ public function getSortProvider()
                 false,
                 false,
                 false,
+                false,
                 'not_eav_attribute',
                 [
                     [
@@ -230,6 +240,30 @@ public function getSortProvider()
                         ]
                     ]
                 ]
+            ],
+            [
+                [
+                    [
+                        'field' => 'entity_id',
+                        'direction' => 'DESC'
+                    ],
+                    [
+                        'field' => 'color',
+                        'direction' => 'DESC'
+                    ],
+                ],
+                true,
+                false,
+                false,
+                true,
+                'color',
+                [
+                    [
+                        'color_value.sort_color' => [
+                            'order' => 'desc'
+                        ]
+                    ]
+                ]
             ]
         ];
     }