MAGETWO-49488: Refactor ResourceModel\Category children_count processing

Author: vkholoshenko

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

@@ -72,6 +72,10 @@ class Category extends AbstractResource
      * @var EntityManager
      */
     protected $entityManager;
+    /**
+     * @var Category\AggregateCount
+     */
+    private $aggregateCount;
 
     /**
      * Category constructor.
@@ -82,6 +86,7 @@ class Category extends AbstractResource
      * @param Category\TreeFactory $categoryTreeFactory
      * @param Category\CollectionFactory $categoryCollectionFactory
      * @param EntityManager $entityManager
+     * @param Category\AggregateCount $aggregateCount
      * @param array $data
      */
     public function __construct(
@@ -92,6 +97,7 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Category\TreeFactory $categoryTreeFactory,
         \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
         EntityManager $entityManager,
+        Category\AggregateCount $aggregateCount,
         $data = []
     ) {
         parent::__construct(
@@ -104,8 +110,8 @@ public function __construct(
         $this->_categoryCollectionFactory = $categoryCollectionFactory;
         $this->_eventManager = $eventManager;
         $this->entityManager = $entityManager;
-
         $this->connectionName  = 'catalog';
+        $this->aggregateCount = $aggregateCount;
     }
 
     /**
@@ -173,6 +179,21 @@ protected function _getTree()
         return $this->_tree;
     }
 
+    /**
+     * Process category data before delete
+     * update children count for parent category
+     * delete child categories
+     *
+     * @param \Magento\Framework\DataObject $object
+     * @return $this
+     */
+    protected function _beforeDelete(\Magento\Framework\DataObject $object)
+    {
+        parent::_beforeDelete($object);
+        $this->aggregateCount->processDelete($object);
+        $this->deleteChildren($object);
+    }
+
     /**
      * Delete children categories of specific category
      *

app/code/Magento/Catalog/Observer/CatalogCategoryRecalculateChildrenCount.php renamed to app/code/Magento/Catalog/Model/ResourceModel/Category/AggregateCount.php

@@ -1,27 +1,23 @@
 <?php
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Catalog\Observer;
+namespace Magento\Catalog\Model\ResourceModel\Category;
 
-use Magento\Framework\Event\ObserverInterface;
-use Magento\Framework\Event\Observer;
 use Magento\Catalog\Model\Category;
 
-class CatalogCategoryRecalculateChildrenCount implements ObserverInterface
+/**
+ * Class AggregateCount
+ */
+class AggregateCount
 {
     /**
-     * Recalculate children count for category
-     *
-     * @param Observer $observer
+     * @param Category $category
      * @return void
      */
-    public function execute(Observer $observer)
+    public function processDelete(Category $category)
     {
-        /** @var \Magento\Catalog\Model\Category $category */
-        $category = $observer->getEvent()->getData('category');
-
         /** @var \Magento\Catalog\Model\ResourceModel\Category $resourceModel */
         $resourceModel = $category->getResource();
         /**

app/code/Magento/Catalog/Observer/CatalogCategoryDeleteChildren.php

@@ -9,8 +9,4 @@
     <event name="cms_wysiwyg_images_static_urls_allowed">
         <observer name="catalog_wysiwyg" instance="Magento\Catalog\Observer\CatalogCheckIsUsingStaticUrlsAllowedObserver" />
     </event>
-    <event name="catalog_category_delete_before">
-        <observer name="catalog_category_recalculate_children_count" instance="Magento\Catalog\Observer\CatalogCategoryRecalculateChildrenCount" />
-        <observer name="catalog_category_delete_children" instance="Magento\Catalog\Observer\CatalogCategoryDeleteChildren" />
-    </event>
 </config>