switch from service to plugin

Author: damcou

Block/Adminhtml/Category/Merchandising.php

@@ -6,15 +6,15 @@
 use Algolia\AlgoliaSearch\Helper\Data;
 use Magento\Backend\Block\Template\Context;
 use Magento\Catalog\Model\Category;
-use Algolia\AlgoliaSearch\Service\GetCurrentCategoryService;
+use Algolia\AlgoliaSearch\Registry\CurrentCategory;
 
 class Merchandising extends \Magento\Backend\Block\Template
 {
     /** @var string */
     protected $_template = 'catalog/category/edit/merchandising.phtml';
 
-    /** @var GetCurrentCategoryService */
-    protected $getCurrentCategoryService;
+    /** @var CurrentCategory */
+    protected $currentCategory;
 
     /** @var ConfigHelper */
     private $configHelper;
@@ -27,19 +27,19 @@ class Merchandising extends \Magento\Backend\Block\Template
 
     /**
      * @param Context $context
-     * @param GetCurrentCategoryService $getCurrentCategoryService
+     * @param CurrentCategory $currentCategory
      * @param ConfigHelper $configHelper
      * @param Data $coreHelper
      * @param array $data
      */
     public function __construct(
         Context $context,
-        GetCurrentCategoryService $getCurrentCategoryService,
+        CurrentCategory $currentCategory,
         ConfigHelper $configHelper,
         Data $coreHelper,
         array $data = []
     ) {
-        $this->getCurrentCategoryService = $getCurrentCategoryService;
+        $this->currentCategory = $currentCategory;
         $this->configHelper = $configHelper;
         $this->coreHelper = $coreHelper;
         $this->storeManager = $context->getStoreManager();
@@ -50,11 +50,7 @@ public function __construct(
     /** @return Category | null */
     public function getCategory()
     {
-        $categoryId = $this->getRequest()->getParam('id');
-        if (!$categoryId) {
-            return null;
-        }
-        return $this->getCurrentCategoryService->getCategory($categoryId);
+        return $this->currentCategory->get();
     }
 
     /** @return bool */

Plugin/SetAdminCurrentCategory.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Plugin;
+
+use Algolia\AlgoliaSearch\Registry\CurrentCategory;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Controller\Adminhtml\Category\Edit as EditController;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\View\Result\Page;
+
+class SetAdminCurrentCategory
+{
+    /** @var CurrentCategory */
+    protected $currentCategory;
+
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
+    /**
+     * @param CurrentCategory $currentCategory
+     * @param CategoryRepositoryInterface $categoryRepository
+     */
+    public function __construct(
+        CurrentCategory $currentCategory,
+        CategoryRepositoryInterface $categoryRepository
+    ) {
+        $this->currentCategory = $currentCategory;
+        $this->categoryRepository = $categoryRepository;
+    }
+
+    /**
+     * Set the current category in adminhtml area in the Algolia registry without using Magento registry
+     * (which is deprecated)
+     *
+     * @param EditController $subject
+     * @param Page $result
+     *
+     * @return Page
+     */
+    public function afterExecute(EditController $subject, $result)
+    {
+        $categoryId = $subject->getRequest()->getParam('id');
+        try {
+            $currentCategory = $this->categoryRepository->get($categoryId);
+            $this->currentCategory->set($currentCategory);
+        } catch (NoSuchEntityException $e) {
+            return null;
+        }
+
+        return $result;
+    }
+}

Service/GetCurrentCategoryService.php

@@ -5,6 +5,9 @@
     <type name="Magento\Catalog\Model\Category">
         <plugin name="algolia_algoliasearch_plugin_category_url" type="Algolia\AlgoliaSearch\Plugin\CategoryUrlPlugin"/>
     </type>
+    <type name="Magento\Catalog\Controller\Adminhtml\Category\Edit">
+        <plugin name="algolia_algoliasearch_plugin_set_admin_current_category" type="Algolia\AlgoliaSearch\Plugin\SetAdminCurrentCategory"/>
+    </type>
     <type name="Algolia\AlgoliaSearch\Block\Adminhtml\LandingPage\Renderer\UrlBuilder">
         <arguments>
             <argument name="frontendUrlBuilder" xsi:type="object">Magento\Framework\Url</argument>