Merge remote-tracking branch 'github-magento/MC-21426' into EPAM-PR-83

Author: nikshostko

app/code/Magento/Catalog/Model/ResourceModel/Category.php

@@ -18,6 +18,8 @@
 use Magento\Framework\DataObject;
 use Magento\Framework\EntityManager\EntityManager;
 use Magento\Catalog\Setup\CategorySetup;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
  * Resource model for category entity
@@ -95,6 +97,11 @@ class Category extends AbstractResource
      */
     private $indexerProcessor;
 
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * Category constructor.
      * @param \Magento\Eav\Model\Entity\Context $context
@@ -106,6 +113,7 @@ class Category extends AbstractResource
      * @param Processor $indexerProcessor
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @param MetadataPool|null $metadataPool
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -117,7 +125,8 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
         Processor $indexerProcessor,
         $data = [],
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
+        MetadataPool $metadataPool = null
     ) {
         parent::__construct(
             $context,
@@ -132,6 +141,7 @@ public function __construct(
         $this->indexerProcessor = $indexerProcessor;
         $this->serializer = $serializer ?: ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
     }
 
     /**
@@ -1160,13 +1170,14 @@ public function getCategoryWithChildren(int $categoryId): array
             return [];
         }
 
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         $select = $connection->select()
             ->from(
                 ['cce' => $this->getTable('catalog_category_entity')],
-                ['entity_id', 'parent_id', 'path']
+                [$linkField, 'parent_id', 'path']
             )->join(
                 ['cce_int' => $this->getTable('catalog_category_entity_int')],
-                'cce.entity_id = cce_int.entity_id',
+                'cce.' . $linkField . ' = cce_int.' . $linkField,
                 ['is_anchor' => 'cce_int.value']
             )->where(
                 'cce_int.attribute_id = ?',

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -2113,13 +2113,14 @@ private function getChildrenCategories(int $categoryId): array
 
         $firstCategory = array_shift($categories);
         if ($firstCategory['is_anchor'] == 1) {
-            $anchorCategory[] = (int)$firstCategory['entity_id'];
+            $linkField = $this->getProductEntityMetadata()->getLinkField();
+            $anchorCategory[] = (int)$firstCategory[$linkField];
             foreach ($categories as $category) {
                 if (in_array($category['parent_id'], $categoryIds)
                     && in_array($category['parent_id'], $anchorCategory)) {
-                    $categoryIds[] = (int)$category['entity_id'];
+                    $categoryIds[] = (int)$category[$linkField];
                     if ($category['is_anchor'] == 1) {
-                        $anchorCategory[] = (int)$category['entity_id'];
+                        $anchorCategory[] = (int)$category[$linkField];
                     }
                 }
             }