Merge pull request #25 from magefan/11182-remede-logic-to-get-current-category

Used GetCategoryByProductInterface to get current category

Author: magefan

Model/RuleManager.php

@@ -64,11 +64,6 @@ class RuleManager
      */
     protected $ruleValidator;
 
-    /**
-     * @var \Magento\Catalog\Api\CategoryRepositoryInterface|mixed
-     */
-    protected $categoryRepository;
-
     /**
      * @var
      */
@@ -79,6 +74,11 @@ class RuleManager
      */
     protected $ruleCollectionFactory;
 
+    /**
+     * @var
+     */
+    protected $getCategoryByProduct;
+
     /**
      * @param ProductCollectionFactory $productCollectionFactory
      * @param CatalogConfig $catalogConfig
@@ -88,7 +88,6 @@ class RuleManager
      * @param RuleRepositoryInterface $ruleRepository
      * @param StoreManagerInterface $storeManager
      * @param \Magefan\AutoRelatedProduct\Model\ActionValidator $ruleValidator
-     * @param \Magento\Catalog\Api\CategoryRepositoryInterface|null $categoryRepository
      */
     public function __construct
     (
@@ -101,7 +100,7 @@ public function __construct
         StoreManagerInterface $storeManager,
         ActionValidator $ruleValidator,
         RuleCollectionFactory $ruleCollectionFactory,
-        \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository = null
+        \Magefan\Community\Api\GetCategoryByProductInterface $getCategoryByProduct = null
     ) {
         $this->productCollectionFactory = $productCollectionFactory;
         $this->catalogConfig = $catalogConfig;
@@ -112,8 +111,8 @@ public function __construct
         $this->storeManager = $storeManager;
         $this->ruleValidator = $ruleValidator;
         $this->ruleCollectionFactory = $ruleCollectionFactory;
-        $this->categoryRepository = $categoryRepository ?:\Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Catalog\Api\CategoryRepositoryInterface::class);
+        $this->getCategoryByProduct = $getCategoryByProduct ?:\Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magefan\Community\Api\GetCategoryByProductInterface::class);
     }
 
     /**
@@ -204,40 +203,11 @@ protected function addOutOfStockFilter(RuleInterface $rule): void
      */
     protected function addProductsFromTheSameCategoryFilter($currentCategory, $currentProduct, RuleInterface $rule): void
     {
-        $productCategoryId = false;
-
-        if ($currentCategory) {
-            $productCategoryId = $currentCategory->getId();
-        } elseif ($currentProduct) {
-            $categoryIds = $currentProduct->getCategoryIds();
-
-            if ($categoryIds) {
-
-                $productCategory = null;
-                $level = -1;
-                $rootCategoryId = $this->storeManager->getStore()->getRootCategoryId();
-
-                foreach ($categoryIds as $categoryId) {
-                    try {
-                        $category = $this->categoryRepository->get($categoryId);
-                        if ($category->getIsActive()
-                            && $category->getLevel() > $level
-                            && in_array($rootCategoryId, $category->getPathIds())
-                        ) {
-                            $level = $category->getLevel();
-                            $productCategory = $category;
-                        }
-                    } catch (\Exception $e) {}
-                }
-
-                if ($productCategory) {
-                    $productCategoryId = $productCategory->getId();
-                }
-            }
-        }
+        $category = $this->getCategoryByProduct->execute($currentProduct);
+        $productCategoryId = $category ? $category->getId() : false;
 
         if ($productCategoryId) {
-            $this->_itemCollection->addCategoriesFilter(['eq' => $productCategoryId]);
+            $this->_itemCollection->addCategoriesFilter(['in' => [$productCategoryId]]);
         }
     }