Merge pull request #345 from magento/magento-tango-MC-23252

[Support] MC-23252: Pagebuilder products list doesn't work with anchor category

Author: omiroshnichenko

app/code/Magento/PageBuilder/Model/Catalog/ProductTotals.php

@@ -8,19 +8,23 @@
 
 namespace Magento\PageBuilder\Model\Catalog;
 
+use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\CatalogWidget\Model\Rule;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Rule\Model\Condition\Combine;
 use Magento\Rule\Model\Condition\Sql\Builder;
 use Magento\Widget\Helper\Conditions;
 use Zend_Db_Select_Exception;
 
 /**
  * Product totals for Products content type
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ProductTotals
 {
@@ -44,22 +48,30 @@ class ProductTotals
      */
     private $conditionsHelper;
 
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
     /**
      * @param CollectionFactory $productCollectionFactory
      * @param Builder $sqlBuilder
      * @param Rule $rule
      * @param Conditions $conditionsHelper
+     * @param CategoryRepositoryInterface $categoryRepository
      */
     public function __construct(
         CollectionFactory $productCollectionFactory,
         Builder $sqlBuilder,
         Rule $rule,
-        Conditions $conditionsHelper
+        Conditions $conditionsHelper,
+        CategoryRepositoryInterface $categoryRepository
     ) {
         $this->productCollectionFactory = $productCollectionFactory;
         $this->sqlBuilder = $sqlBuilder;
         $this->rule = $rule;
         $this->conditionsHelper = $conditionsHelper;
+        $this->categoryRepository = $categoryRepository;
     }
 
     /**
@@ -75,17 +87,49 @@ private function decodeConditions(string $conditions): Combine
         }
 
         foreach ($conditions as $key => $condition) {
-            if (!empty($condition['attribute'])
-                && in_array($condition['attribute'], ['special_from_date', 'special_to_date'])
-            ) {
-                $conditions[$key]['value'] = date('Y-m-d H:i:s', strtotime($condition['value']));
+            if (!empty($condition['attribute'])) {
+                if (in_array($condition['attribute'], ['special_from_date', 'special_to_date'])) {
+                    $conditions[$key]['value'] = date('Y-m-d H:i:s', strtotime($condition['value']));
+                }
+
+                if ($condition['attribute'] == 'category_ids') {
+                    $conditions[$key] = $this->updateAnchorCategoryConditions($condition);
+                }
             }
         }
 
         $this->rule->loadPost(['conditions' => $conditions]);
         return $this->rule->getConditions();
     }
 
+    /**
+     * Update conditions if the category is an anchor category
+     *
+     * @param array $condition
+     * @return array
+     */
+    private function updateAnchorCategoryConditions(array $condition): array
+    {
+        if (array_key_exists('value', $condition)) {
+            $categoryId = $condition['value'];
+
+            try {
+                $category = $this->categoryRepository->get($categoryId);
+            } catch (NoSuchEntityException $e) {
+                return $condition;
+            }
+
+            if ($category->getIsAnchor() && $category->getChildren(true)) {
+                $children = explode(',', $category->getChildren(true));
+
+                $condition['operator'] = "()";
+                $condition['value'] = array_merge([$categoryId], $children);
+            }
+        }
+
+        return $condition;
+    }
+
     /**
      * Retrieve product collection based on provided conditions
      *