Merge branch 'MAGETWO-39255' of github.corp.magento.com:magento-firedrakes/magento2ce into MAGETWO-39255

Author: mlogvin

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

@@ -10,6 +10,7 @@
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
+use Magento\Catalog\Api\Data\CategoryInterface;
 
 class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInterface
 {
@@ -33,6 +34,11 @@ class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInter
      */
     protected $categoryResource;
 
+    /**
+     * @var \Magento\Framework\Model\Entity\MetadataPool
+     */
+    protected $metadataPool;
+
     /**
      * List of fields that can used config values in case when value does not defined directly
      *
@@ -44,15 +50,18 @@ class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInter
      * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
      * @param \Magento\Catalog\Model\ResourceModel\Category $categoryResource
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Model\Entity\MetadataPool $metadataPool
      */
     public function __construct(
         \Magento\Catalog\Model\CategoryFactory $categoryFactory,
         \Magento\Catalog\Model\ResourceModel\Category $categoryResource,
-        \Magento\Store\Model\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\Model\Entity\MetadataPool $metadataPool
     ) {
         $this->categoryFactory = $categoryFactory;
         $this->categoryResource = $categoryResource;
         $this->storeManager = $storeManager;
+        $this->metadataPool = $metadataPool;
     }
 
     /**
@@ -61,10 +70,21 @@ public function __construct(
     public function save(\Magento\Catalog\Api\Data\CategoryInterface $category)
     {
         $existingData = $category->toFlatArray();
+
         /** 'available_sort_by' should be set separately because fields of array type are destroyed by toFlatArray() */
         $existingData['available_sort_by'] = $category->getAvailableSortBy();
+
         if ($category->getId()) {
+            $metadata = $this->metadataPool->getMetadata(
+                CategoryInterface::class
+            );
+
             $existingCategory = $this->get($category->getId());
+
+            $existingData[$metadata->getLinkField()] = $existingCategory->getData(
+                $metadata->getLinkField()
+            );
+
             if (isset($existingData['image']) && is_array($existingData['image'])) {
                 $existingData['image_additional_data'] = $existingData['image'];
                 unset($existingData['image']);

app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php

@@ -27,6 +27,11 @@ class CategoryRepositoryTest extends \PHPUnit_Framework_TestCase
      */
     protected $storeManagerMock;
 
+    /**
+     * @var \Magento\Framework\Model\Entity\MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $metadataPoolMock;
+
     protected function setUp()
     {
         $this->categoryFactoryMock = $this->getMock(
@@ -40,10 +45,34 @@ protected function setUp()
             $this->getMock('\Magento\Catalog\Model\ResourceModel\Category', [], [], '', false);
         $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
 
+        $metadataMock = $this->getMock(
+            'Magento\Framework\Model\Entity\EntityMetadata',
+            [],
+            [],
+            '',
+            false
+        );
+        $metadataMock->expects($this->any())
+            ->method('getLinkField')
+            ->willReturn('entity_id');
+
+        $this->metadataPoolMock = $this->getMock(
+            'Magento\Framework\Model\Entity\MetadataPool',
+            [],
+            [],
+            '',
+            false
+        );
+        $this->metadataPoolMock->expects($this->any())
+            ->method('getMetadata')
+            ->with(\Magento\Catalog\Api\Data\CategoryInterface::class)
+            ->willReturn($metadataMock);
+
         $this->model = new \Magento\Catalog\Model\CategoryRepository(
             $this->categoryFactoryMock,
             $this->categoryResourceMock,
-            $this->storeManagerMock
+            $this->storeManagerMock,
+            $this->metadataPoolMock
         );
     }