Revert "Merge branch 'ACP2E-3389' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-31-10-2024"

This reverts commit af11885, reversing
changes made to 771fd00.

Author: o-iegorov

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright 2011 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Model\ResourceModel\Category;
 
@@ -337,63 +337,16 @@ public function loadProductCount($items, $countRegular = true, $countAnchor = tr
             $categoryIds = array_keys($anchor);
             $countSelect = $this->getProductsCountQuery($categoryIds, (bool)$websiteId);
             $categoryProductsCount = $this->_conn->fetchPairs($countSelect);
-            $countFromCategoryTable = $this->getCountFromCategoryTable($categoryIds, (int)$websiteId);
-
             foreach ($anchor as $item) {
-                $productsCount = 0;
-                if (isset($categoryProductsCount[$item->getId()])) {
-                    $productsCount = (int)$categoryProductsCount[$item->getId()];
-                } elseif (isset($countFromCategoryTable[$item->getId()])) {
-                    $productsCount = (int)$countFromCategoryTable[$item->getId()];
-                }
+                $productsCount = isset($categoryProductsCount[$item->getId()])
+                    ? (int)$categoryProductsCount[$item->getId()]
+                    : $this->getProductsCountFromCategoryTable($item, $websiteId);
                 $item->setProductCount($productsCount);
             }
         }
         return $this;
     }
 
-    /**
-     * Get products number for each category with bulk query
-     *
-     * @param array $categoryIds
-     * @param int $websiteId
-     * @return array
-     */
-    private function getCountFromCategoryTable(
-        array $categoryIds,
-        int $websiteId
-    ) : array {
-        $subSelect = clone $this->_conn->select();
-        $subSelect->from(['ce2' => $this->getTable('catalog_category_entity')], 'ce2.entity_id')
-            ->where("ce2.path LIKE CONCAT(ce.path, '/%')");
-
-        $select = clone $this->_conn->select();
-        $select->from(
-            ['ce' => $this->getTable('catalog_category_entity')],
-            'ce.entity_id'
-        );
-        $joinCondition =  new \Zend_Db_Expr("ce.entity_id=cp.category_id OR cp.category_id IN ({$subSelect})");
-        $select->joinLeft(
-            ['cp' => $this->getProductTable()],
-            $joinCondition,
-            'COUNT(DISTINCT cp.product_id) AS product_count'
-        );
-        if ($websiteId) {
-            $select->join(
-                ['w' => $this->getProductWebsiteTable()],
-                'cp.product_id = w.product_id',
-                []
-            )->where(
-                'w.website_id = ?',
-                $websiteId
-            );
-        }
-        $select->where('ce.entity_id IN(?)', $categoryIds);
-        $select->group('ce.entity_id');
-
-        return $this->_conn->fetchPairs($select);
-    }
-
     /**
      * Add category path filter
      *
@@ -566,6 +519,45 @@ public function getProductTable()
         return $this->_productTable;
     }
 
+    /**
+     * Get products count using catalog_category_entity table
+     *
+     * @param Category $item
+     * @param string $websiteId
+     * @return int
+     */
+    private function getProductsCountFromCategoryTable(Category $item, string $websiteId): int
+    {
+        $productCount = 0;
+
+        if ($item->getAllChildren()) {
+            $bind = ['entity_id' => $item->getId(), 'c_path' => $item->getPath() . '/%'];
+            $select = $this->_conn->select();
+            $select->from(
+                ['main_table' => $this->getProductTable()],
+                new \Zend_Db_Expr('COUNT(DISTINCT main_table.product_id)')
+            )->joinInner(
+                ['e' => $this->getTable('catalog_category_entity')],
+                'main_table.category_id=e.entity_id',
+                []
+            )->where(
+                '(e.entity_id = :entity_id OR e.path LIKE :c_path)'
+            );
+            if ($websiteId) {
+                $select->join(
+                    ['w' => $this->getProductWebsiteTable()],
+                    'main_table.product_id = w.product_id',
+                    []
+                )->where(
+                    'w.website_id = ?',
+                    $websiteId
+                );
+            }
+            $productCount = (int)$this->_conn->fetchOne($select, $bind);
+        }
+        return $productCount;
+    }
+
     /**
      * Get query for retrieve count of products per category
      *