MC-13958: Additional Permissions for Design settings

Author: Oleksandr Gorkun

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

@@ -102,6 +102,9 @@ public function save(\Magento\Catalog\Api\Data\CategoryInterface $category)
                 }
             }
         } else {
+            //Clearing all redundant data and using only properly extracted data for the entity.
+            /** @var Category $category */
+            $category = $this->categoryFactory->create();
             $parentId = $category->getParentId() ?: $this->storeManager->getStore()->getRootCategoryId();
             $parentCategory = $this->get($parentId, $storeId);
             $existingData['path'] = $parentCategory->getPath();

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

@@ -1134,19 +1134,4 @@ private function getAggregateCount()
         }
         return $this->aggregateCount;
     }
-
-    /**
-     * @inheritDoc
-     *
-     * @param CategoryEntity|object $object
-     */
-    public function validate($object)
-    {
-        $isValid = parent::validate($object);
-        if ($isValid !== true) {
-            return $isValid;
-        }
-
-        return true;
-    }
 }

dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php

@@ -9,6 +9,8 @@
 
 use Magento\Backend\Model\Auth;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Api\Data\CategoryInterfaceFactory;
 use Magento\Framework\Acl\Builder;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
@@ -36,6 +38,11 @@ class CategoryRepositoryTest extends TestCase
      */
     private $aclBuilder;
 
+    /**
+     * @var CategoryInterfaceFactory
+     */
+    private $categoryFactory;
+
     /**
      * Sets up common objects.
      *
@@ -46,6 +53,7 @@ protected function setUp()
         $this->repo = Bootstrap::getObjectManager()->create(CategoryRepositoryInterface::class);
         $this->auth = Bootstrap::getObjectManager()->get(Auth::class);
         $this->aclBuilder = Bootstrap::getObjectManager()->get(Builder::class);
+        $this->categoryFactory = Bootstrap::getObjectManager()->get(CategoryInterfaceFactory::class);
     }
 
     /**
@@ -87,5 +95,16 @@ public function testSaveDesign()
         $category = $this->repo->save($category);
         $this->assertNotEmpty($category->getCustomAttribute('custom_design'));
         $this->assertEquals(2, $category->getCustomAttribute('custom_design')->getValue());
+
+        //Creating a new one
+        /** @var CategoryInterface $newCategory */
+        $newCategory = $this->categoryFactory->create();
+        $newCategory->setName('new category without design');
+        $newCategory->setParentId($category->getParentId());
+        $newCategory->setIsActive(true);
+        $this->aclBuilder->getAcl()->deny(null, 'Magento_Catalog::edit_category_design');
+        $newCategory->setCustomAttribute('custom_design', 2);
+        $newCategory = $this->repo->save($newCategory);
+        $this->assertEmpty($newCategory->getCustomAttribute('custom_design'));
     }
 }