revert CategoryRepository, added plugin

Author: engcom-Echo

app/code/Magento/Catalog/Model/CategoryRepository.php

@@ -7,10 +7,10 @@
 
 namespace Magento\Catalog\Model;
 
-use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
+use Magento\Catalog\Api\Data\CategoryInterface;
 
 /**
  * Repository for categories.
@@ -77,7 +77,10 @@ public function __construct(
     public function save(\Magento\Catalog\Api\Data\CategoryInterface $category)
     {
         $storeId = (int)$this->storeManager->getStore()->getId();
-        $existingData = $this->getExistingData($category, $storeId);
+        $existingData = $this->getExtensibleDataObjectConverter()
+            ->toNestedArray($category, [], \Magento\Catalog\Api\Data\CategoryInterface::class);
+        $existingData = array_diff_key($existingData, array_flip(['path', 'level', 'parent_id']));
+        $existingData['store_id'] = $storeId;
 
         if ($category->getId()) {
             $metadata = $this->getMetadataPool()->getMetadata(
@@ -236,25 +239,4 @@ private function getMetadataPool()
         }
         return $this->metadataPool;
     }
-
-    /**
-     * Get existing data category
-     *
-     * @param CategoryInterface $category
-     * @param int $storeId
-     * @return array
-     */
-    private function getExistingData(CategoryInterface $category, int $storeId)
-    {
-        $existingData = $this->getExtensibleDataObjectConverter()
-            ->toNestedArray($category, [], \Magento\Catalog\Api\Data\CategoryInterface::class);
-        $existingData = array_diff_key($existingData, array_flip(['path', 'level', 'parent_id']));
-        $existingData['store_id'] = $storeId;
-
-        if ($category->getData('save_rewrites_history') !== null) {
-            $existingData['save_rewrites_history'] = $category->getData('save_rewrites_history');
-        }
-
-        return $existingData;
-    }
 }

app/code/Magento/CatalogUrlRewrite/Plugin/Model/UpdateCategoryDataList.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Plugin\Model;
+
+use Magento\Catalog\Model\Category;
+use Magento\Framework\Webapi\Rest\Request as RestRequest;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+
+class UpdateCategoryDataList
+{
+    private const SAVE_REWRITES_HISTORY = 'save_rewrites_history';
+
+    /**
+     * @var RestRequest
+     */
+    private $request;
+
+    /**
+     * @param RestRequest $request
+     */
+    public function __construct(RestRequest $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * Add 'save_rewrites_history' param to the category for list
+     *
+     * @param CategoryUrlRewriteGenerator $subject
+     * @param Category $category
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeGenerate(CategoryUrlRewriteGenerator $subject, Category $category)
+    {
+        $requestBodyParams = $this->request->getBodyParams();
+
+        if ($this->isCustomAttributesExists($requestBodyParams, CategoryUrlRewriteGenerator::ENTITY_TYPE)) {
+            foreach ($requestBodyParams[CategoryUrlRewriteGenerator::ENTITY_TYPE]['custom_attributes'] as $attribute) {
+                if ($attribute['attribute_code'] === self::SAVE_REWRITES_HISTORY) {
+                    $category->setData(self::SAVE_REWRITES_HISTORY, (bool)$attribute['value']);
+                }
+            }
+        }
+    }
+
+    /**
+     * Check is any custom options exists in data
+     *
+     * @param array $requestBodyParams
+     * @param string $entityCode
+     * @return bool
+     */
+    private function isCustomAttributesExists(array $requestBodyParams, string $entityCode): bool
+    {
+        return !empty($requestBodyParams[$entityCode]['custom_attributes']);
+    }
+}

app/code/Magento/CatalogUrlRewrite/etc/webapi_rest/di.xml

@@ -10,4 +10,7 @@
         <plugin name="product_save_rewrites_history_rest_plugin" type="Magento\CatalogUrlRewrite\Plugin\Webapi\Controller\Rest\ProductInputParamsResolver" disabled="false" />
         <plugin name="category_save_rewrites_history_rest_plugin" type="Magento\CatalogUrlRewrite\Plugin\Webapi\Controller\Rest\CategoryInputParamsResolver" disabled="false" />
     </type>
+    <type name="Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator">
+        <plugin name="category_set_save_rewrites_history_rest_plugin" type="Magento\CatalogUrlRewrite\Plugin\Model\UpdateCategoryDataList" disabled="false" />
+    </type>
 </config>