Merge pull request #780 from algolia/quickfix-class-alias

Change Category class alias in CategoryObserver to pass code check

Author: Jan Petr

.circleci/config.yml

@@ -40,25 +40,25 @@ shared: &shared
                 php -dmemory_limit=-1 ../../../vendor/bin/phpunit ../../../vendor/algolia/algoliasearch-magento-2/Test
 
 jobs:
-    "magento-2.1.17":
+    "magento-2.1":
         <<: *shared
         docker:
-            - image: garrgysek/magento2_circleci:2.1.17
+            - image: algolia/magento2-circleci:2.1.17
 
-    "magento-2.2.8":
+    "magento-2.2":
         <<: *shared
         docker:
-            - image: garrgysek/magento2_circleci:2.2.8
+            - image: algolia/magento2-circleci:2.2.8
 
-    "magento-2.3.0":
+    "magento-2.3":
         <<: *shared
         docker:
-            - image: garrgysek/magento2_circleci:2.3.0
+            - image: algolia/magento2-circleci:2.3.0
 
 workflows:
     version: 2
     build:
         jobs:
-            - "magento-2.1.17"
-            - "magento-2.2.8"
-            - "magento-2.3.0"
+            - "magento-2.1"
+            - "magento-2.2"
+            - "magento-2.3"

Helper/Entity/CategoryHelper.php

@@ -179,7 +179,7 @@ public function getCategoryCollectionQuery($storeId, $categoryIds = null)
             ->addAttributeToFilter('level', ['gt' => 1])
             ->setStoreId($storeId)
             ->addPathFilter($storeRootCategoryPath)
-            ->addAttributeToSelect(array_merge(['name', 'is_active', 'include_in_menu'], $additionalAttr))
+            ->addAttributeToSelect(array_merge(['name', 'is_active', 'include_in_menu', 'image'], $additionalAttr))
             ->addOrderField('entity_id');
 
         if ($categoryIds) {

Model/Indexer/CategoryObserver.php

@@ -3,10 +3,8 @@
 namespace Algolia\AlgoliaSearch\Model\Indexer;
 
 use Algolia\AlgoliaSearch\Model\Indexer\Category as CategoryIndexer;
-use Closure;
-use Magento\Catalog\Model\Category as Category;
+use Magento\Catalog\Model\Category as CategoryModel;
 use Magento\Catalog\Model\ResourceModel\Category as CategoryResourceModel;
-use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\Framework\Indexer\IndexerRegistry;
 
 class CategoryObserver
@@ -18,53 +16,30 @@ public function __construct(IndexerRegistry $indexerRegistry)
         $this->indexer = $indexerRegistry->get('algolia_categories');
     }
 
-    /**
-     * @param CategoryResourceModel $categoryResource
-     * @param Closure $proceed
-     * @param Category $category
-     *
-     * @return mixed
-     */
-    public function aroundSave(
+    public function afterSave(
         CategoryResourceModel $categoryResource,
-        Closure $proceed,
-        Category $category
+        $result,
+        CategoryModel $category
     ) {
-        $categoryResource->addCommitCallback(function () use ($category) {
-            if (!$this->indexer->isScheduled()) {
-                /** @var ProductCollection $productCollection */
-                $productCollection = $category->getProductCollection();
-                CategoryIndexer::$affectedProductIds = (array) $productCollection->getAllIds();
+        if (!$this->indexer->isScheduled()) {
+            /** @var Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection */
+            $productCollection = $category->getProductCollection();
+            CategoryIndexer::$affectedProductIds = (array) $productCollection->getColumnValues('entity_id');
 
-                $this->indexer->reindexRow($category->getId());
-            }
-        });
-
-        return $proceed($category);
+            $this->indexer->reindexRow($category->getId());
+        }
     }
 
-    /**
-     * @param CategoryResourceModel $categoryResource
-     * @param Closure $proceed
-     * @param Category $category
-     *
-     * @return mixed
-     */
-    public function aroundDelete(
+    public function beforeDelete(
         CategoryResourceModel $categoryResource,
-        Closure $proceed,
-        Category $category
+        CategoryModel $category
     ) {
-        $categoryResource->addCommitCallback(function () use ($category) {
-            if (!$this->indexer->isScheduled()) {
-                /** @var ProductCollection $productCollection */
-                $productCollection = $category->getProductCollection();
-                CategoryIndexer::$affectedProductIds = (array) $productCollection->getAllIds();
-
-                $this->indexer->reindexRow($category->getId());
-            }
-        });
+        if (!$this->indexer->isScheduled()) {
+            /* we are using products position because getProductCollection() does use correct store */
+            $productCollection = $category->getProductsPosition();
+            CategoryIndexer::$affectedProductIds = array_keys($productCollection);
 
-        return $proceed($category);
+            $this->indexer->reindexRow($category->getId());
+        }
     }
 }