issue 31043: update code

Author: Roger

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

@@ -6,14 +6,14 @@
 
 namespace Magento\Elasticsearch\Model\Adapter\BatchDataMapper;
 
+use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider;
+use Magento\Eav\Api\Data\AttributeOptionInterface;
 use Magento\Eav\Model\Entity\Attribute;
+use Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface;
 use Magento\Elasticsearch\Model\Adapter\Document\Builder;
 use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
-use Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface;
 use Magento\Elasticsearch\Model\Adapter\FieldType\Date as DateFieldType;
-use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
-use Magento\Eav\Api\Data\AttributeOptionInterface;
 
 /**
  * Map product index data to search engine metadata
@@ -151,6 +151,7 @@ public function map(array $documentData, $storeId, array $context = [])
 
         foreach ($documentData as $productId => $indexData) {
             $this->builder->addField('store_id', $storeId);
+            $this->builder->addField('entity_id', $productId);
             $productIndexData = $this->convertToProductData($productId, $indexData, $storeId);
             foreach ($productIndexData as $attributeCode => $value) {
                 // Prepare processing attribute info

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

@@ -119,6 +119,10 @@ public function getFields(array $context = []): array
             'index' => $this->indexTypeConverter->convert(IndexTypeConverterInterface::INTERNAL_NO_INDEX_VALUE),
         ];
 
+        $allAttributes['entity_id'] = [
+            'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_INT),
+            'index' => $this->indexTypeConverter->convert(IndexTypeConverterInterface::INTERNAL_NO_INDEX_VALUE),
+        ];
         return $allAttributes;
     }
 

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

@@ -124,7 +124,7 @@ public function getSort(RequestInterface $request)
 
         if (!empty($sorts)) {
             $sorts[] = [
-                '_id' => [
+                'entity_id' => [
                     'order' => 'desc'
                 ]
             ];

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

@@ -168,7 +168,7 @@ public function getSortProvider()
                         ]
                     ],
                     [
-                        '_id' => [
+                        'entity_id' => [
                             'order' => 'desc'
                         ]
                     ]
@@ -197,7 +197,7 @@ public function getSortProvider()
                         ]
                     ],
                     [
-                        '_id' => [
+                        'entity_id' => [
                             'order' => 'desc'
                         ]
                     ]
@@ -226,7 +226,7 @@ public function getSortProvider()
                         ]
                     ],
                     [
-                        '_id' => [
+                        'entity_id' => [
                             'order' => 'desc'
                         ]
                     ]
@@ -255,7 +255,7 @@ public function getSortProvider()
                         ]
                     ],
                     [
-                        '_id' => [
+                        'entity_id' => [
                             'order' => 'desc'
                         ]
                     ]
@@ -284,7 +284,7 @@ public function getSortProvider()
                         ]
                     ],
                     [
-                        '_id' => [
+                        'entity_id' => [
                             'order' => 'desc'
                         ]
                     ]