Merge remote-tracking branch 'mainline/develop' into MAGETWO-36298

app/code/Magento/AdminNotification/Setup/InstallSchema.php

@@ -45,7 +45,7 @@ class InstallSchema implements InstallSchemaInterface
             'date_added',
             \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
             null,
-            ['nullable' => false],
+            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
             'Create date'
         )->addColumn(
             'title',
@@ -112,7 +112,7 @@ class InstallSchema implements InstallSchemaInterface
             'created_at',
             \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
             null,
-            ['nullable' => false],
+            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
             'Create date'
         )->setComment(
             'Admin System Messages'

app/code/Magento/Bundle/Api/Data/LinkInterface.php

@@ -9,6 +9,24 @@ namespace Magento\Bundle\Api\Data;
 
 interface LinkInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
+    const PRICE_TYPE_FIXED = 0;
+    const PRICE_TYPE_PERCENT = 1;
+
+    /**
+     * Get the identifier
+     *
+     * @return string|null
+     */
+    public function getId();
+
+    /**
+     * Set id
+     *
+     * @param string $id
+     * @return $this
+     */
+    public function setId($id);
+
     /**
      * Get linked product sku
      *
@@ -69,21 +87,6 @@ interface LinkInterface extends \Magento\Framework\Api\ExtensibleDataInterface
      */
     public function setPosition($position);
 
-    /**
-     * Get is defined
-     *
-     * @return bool|null
-     */
-    public function getIsDefined();
-
-    /**
-     * Set is defined
-     *
-     * @param bool $isDefined
-     * @return $this
-     */
-    public function setIsDefined($isDefined);
-
     /**
      * Get is default
      *

app/code/Magento/Bundle/Api/ProductLinkManagementInterface.php

@@ -11,12 +11,13 @@ interface ProductLinkManagementInterface
     /**
      * Get all children for Bundle product
      *
-     * @param string $productId
+     * @param string $productSku
+     * @param int $optionId
      * @return \Magento\Bundle\Api\Data\LinkInterface[]
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
      */
-    public function getChildren($productId);
+    public function getChildren($productSku, $optionId = null);
 
     /**
      * Add child product to specified Bundle option by product sku
@@ -31,10 +32,23 @@ interface ProductLinkManagementInterface
      */
     public function addChildByProductSku($sku, $optionId, \Magento\Bundle\Api\Data\LinkInterface $linkedProduct);
 
+    /**
+     * @param string $sku
+     * @param \Magento\Bundle\Api\Data\LinkInterface $linkedProduct
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @return bool
+     */
+    public function saveChild(
+        $sku,
+        \Magento\Bundle\Api\Data\LinkInterface $linkedProduct
+    );
+
     /**
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @param int $optionId
-     * @param Data\LinkInterface $linkedProduct
+     * @param \Magento\Bundle\Api\Data\LinkInterface $linkedProduct
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\InputException

app/code/Magento/Bundle/Model/Link.php

@@ -16,17 +16,34 @@ class Link extends \Magento\Framework\Model\AbstractExtensibleModel implements
     /**#@+
      * Constants
      */
+    const KEY_ID = 'id';
     const KEY_SKU = 'sku';
     const KEY_OPTION_ID = 'option_id';
     const KEY_QTY = 'qty';
     const KEY_POSITION = 'position';
-    const KEY_IS_DEFINED = 'is_defined';
     const KEY_IS_DEFAULT = 'is_default';
     const KEY_PRICE = 'price';
     const KEY_PRICE_TYPE = 'price_type';
-    const KEY_CAN_CHANGE_QUANTITY = 'can_change_quantity';
+    const KEY_CAN_CHANGE_QUANTITY = 'selection_can_change_quantity';
     /**#@-*/
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return $this->getData(self::KEY_ID);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setId($id)
+    {
+        return $this->setData(self::KEY_ID, $id);
+    }
+
+
     /**
      * {@inheritdoc}
      */
@@ -59,14 +76,6 @@ class Link extends \Magento\Framework\Model\AbstractExtensibleModel implements
         return $this->getData(self::KEY_POSITION);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getIsDefined()
-    {
-        return $this->getData(self::KEY_IS_DEFINED);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -143,17 +152,6 @@ class Link extends \Magento\Framework\Model\AbstractExtensibleModel implements
         return $this->setData(self::KEY_POSITION, $position);
     }
 
-    /**
-     * Set is defined
-     *
-     * @param bool $isDefined
-     * @return $this
-     */
-    public function setIsDefined($isDefined)
-    {
-        return $this->setData(self::KEY_IS_DEFINED, $isDefined);
-    }
-
     /**
      * Set is default
      *

app/code/Magento/Bundle/Model/LinkManagement.php

@@ -75,15 +75,18 @@ class LinkManagement implements \Magento\Bundle\Api\ProductLinkManagementInterfa
     /**
      * {@inheritdoc}
      */
-    public function getChildren($productId)
+    public function getChildren($productSku, $optionId = null)
     {
-        $product = $this->productRepository->get($productId);
+        $product = $this->productRepository->get($productSku);
         if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
             throw new InputException(__('Only implemented for bundle product'));
         }
 
         $childrenList = [];
         foreach ($this->getOptions($product) as $option) {
+            if ($optionId !== null && $option->getOptionId() != $optionId) {
+                continue;
+            }
             /** @var \Magento\Catalog\Model\Product $selection */
             foreach ($option->getSelections() as $selection) {
                 $childrenList[] = $this->buildLink($selection, $product);
@@ -107,6 +110,93 @@ class LinkManagement implements \Magento\Bundle\Api\ProductLinkManagementInterfa
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
+    public function saveChild(
+        $sku,
+        \Magento\Bundle\Api\Data\LinkInterface $linkedProduct
+    ) {
+        $product = $this->productRepository->get($sku);
+        if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
+            throw new InputException(
+                __('Product with specified sku: "%1" is not a bundle product', [$product->getSku()])
+            );
+        }
+
+        /** @var \Magento\Catalog\Model\Product $linkProductModel */
+        $linkProductModel = $this->productRepository->get($linkedProduct->getSku());
+        if ($linkProductModel->isComposite()) {
+            throw new InputException(__('Bundle product could not contain another composite product'));
+        }
+
+        if (!$linkedProduct->getId()) {
+            throw new InputException(__('Id field of product link is required'));
+        }
+
+        /** @var \Magento\Bundle\Model\Selection $selectionModel */
+        $selectionModel = $this->bundleSelection->create();
+        $selectionModel->load($linkedProduct->getId());
+        if (!$selectionModel->getId()) {
+            throw new InputException(__('Can not find product link with id "%1"', [$linkedProduct->getId()]));
+        }
+
+        $selectionModel = $this->mapProductLinkToSelectionModel(
+            $selectionModel,
+            $linkedProduct,
+            $linkProductModel->getId(),
+            $product->getId()
+        );
+
+        try {
+            $selectionModel->save();
+        } catch (\Exception $e) {
+            throw new CouldNotSaveException(__('Could not save child: "%1"', $e->getMessage()), $e);
+        }
+
+        return true;
+    }
+
+    /**
+     * @param \Magento\Bundle\Model\Selection $selectionModel
+     * @param \Magento\Bundle\Api\Data\LinkInterface $productLink
+     * @param string $linkedProductId
+     * @param string $parentProductId
+     * @return \Magento\Bundle\Model\Selection
+     */
+    protected function mapProductLinkToSelectionModel(
+        \Magento\Bundle\Model\Selection $selectionModel,
+        \Magento\Bundle\Api\Data\LinkInterface $productLink,
+        $linkedProductId,
+        $parentProductId
+    ) {
+        $selectionModel->setProductId($linkedProductId);
+        $selectionModel->setParentProductId($parentProductId);
+        if (($productLink->getOptionId() !== null)) {
+            $selectionModel->setOptionId($productLink->getOptionId());
+        }
+        if ($productLink->getPosition() !== null) {
+            $selectionModel->setPosition($productLink->getPosition());
+        }
+        if ($productLink->getQty() !== null) {
+            $selectionModel->setSelectionQty($productLink->getQty());
+        }
+        if ($productLink->getPriceType() !== null) {
+            $selectionModel->setSelectionPriceType($productLink->getPriceType());
+        }
+        if ($productLink->getPrice() !== null) {
+            $selectionModel->setSelectionPriceValue($productLink->getPrice());
+        }
+        if ($productLink->getCanChangeQuantity() !== null) {
+            $selectionModel->setSelectionCanChangeQty($productLink->getCanChangeQuantity());
+        }
+        if ($productLink->getIsDefault() !== null) {
+            $selectionModel->setIsDefault($productLink->getIsDefault());
+        }
+
+        return $selectionModel;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
     public function addChild(
         \Magento\Catalog\Api\Data\ProductInterface $product,
         $optionId,
@@ -119,17 +209,10 @@ class LinkManagement implements \Magento\Bundle\Api\ProductLinkManagementInterfa
         }
 
         $options = $this->optionCollection->create();
-        $options->setProductIdFilter($product->getId())->joinValues($this->storeManager->getStore()->getId());
-        $isNewOption = true;
-        /** @var \Magento\Bundle\Model\Option $option */
-        foreach ($options as $option) {
-            if ($option->getOptionId() == $optionId) {
-                $isNewOption = false;
-                break;
-            }
-        }
+        $options->setIdFilter($optionId);
+        $existingOption = $options->getFirstItem();
 
-        if ($isNewOption) {
+        if (!$existingOption->getId()) {
             throw new InputException(
                 __(
                     'Product with specified sku: "%1" does not contain option: "%2"',
@@ -161,16 +244,13 @@ class LinkManagement implements \Magento\Bundle\Api\ProductLinkManagementInterfa
         }
 
         $selectionModel = $this->bundleSelection->create();
-        $selectionModel->setOptionId($optionId)
-            ->setPosition($linkedProduct->getPosition())
-            ->setSelectionQty($linkedProduct->getQty())
-            ->setSelectionPriceType($linkedProduct->getPriceType())
-            ->setSelectionPriceValue($linkedProduct->getPrice())
-            ->setSelectionCanChangeQty($linkedProduct->getCanChangeQuantity())
-            ->setProductId($linkProductModel->getId())
-            ->setParentProductId($product->getId())
-            ->setIsDefault($linkedProduct->getIsDefault())
-            ->setWebsiteId($this->storeManager->getStore()->getWebsiteId());
+        $selectionModel = $this->mapProductLinkToSelectionModel(
+            $selectionModel,
+            $linkedProduct,
+            $linkProductModel->getId(),
+            $product->getId()
+        );
+        $selectionModel->setOptionId($optionId);
 
         try {
             $selectionModel->save();
@@ -242,8 +322,9 @@ class LinkManagement implements \Magento\Bundle\Api\ProductLinkManagementInterfa
             '\Magento\Bundle\Api\Data\LinkInterface'
         );
         $link->setIsDefault($selection->getIsDefault())
+            ->setId($selection->getSelectionId())
             ->setQty($selection->getSelectionQty())
-            ->setIsDefined($selection->getSelectionCanChangeQty())
+            ->setCanChangeQuantity($selection->getSelectionCanChangeQty())
             ->setPrice($selectionPrice)
             ->setPriceType($selectionPriceType);
         return $link;
@@ -251,7 +332,7 @@ class LinkManagement implements \Magento\Bundle\Api\ProductLinkManagementInterfa
 
     /**
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
-     * @return \Magento\Bundle\Api\Data\OptionTypeInterface[]
+     * @return \Magento\Bundle\Api\Data\OptionInterface[]
      */
     private function getOptions(\Magento\Catalog\Api\Data\ProductInterface $product)
     {

app/code/Magento/Bundle/Model/OptionRepository.php

@@ -161,7 +161,6 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
 
     /**
      * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function save(
         \Magento\Catalog\Api\Data\ProductInterface $product,
@@ -170,35 +169,25 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
         $option->setStoreId($this->storeManager->getStore()->getId());
         $option->setParentId($product->getId());
 
-        if (!$option->getOptionId()) {
+        $optionId = $option->getOptionId();
+        $linksToAdd = [];
+        if (!$optionId) {
             $option->setDefaultTitle($option->getTitle());
-            $linksToAdd = is_array($option->getProductLinks()) ? $option->getProductLinks() : [];
+            if (is_array($option->getProductLinks())) {
+                $linksToAdd = $option->getProductLinks();
+            }
         } else {
             $optionCollection = $this->type->getOptionsCollection($product);
-            $optionCollection->setIdFilter($option->getOptionId());
 
             /** @var \Magento\Bundle\Model\Option $existingOption */
-            $existingOption = $optionCollection->getFirstItem();
+            $existingOption = $optionCollection->getItemById($option->getOptionId());
 
-            if (!$existingOption->getOptionId()) {
+            if (!isset($existingOption) || !$existingOption->getOptionId()) {
                 throw new NoSuchEntityException(__('Requested option doesn\'t exist'));
             }
 
             $option->setData(array_merge($existingOption->getData(), $option->getData()));
-
-            /** @var \Magento\Bundle\Api\Data\LinkInterface[] $existingLinks */
-            $existingLinks = is_array($existingOption->getProductLinks()) ? $existingOption->getProductLinks() : [];
-
-            /** @var \Magento\Bundle\Api\Data\LinkInterface[] $newProductLinks */
-            $newProductLinks = is_array($option->getProductLinks()) ? $option->getProductLinks() : [];
-
-            /** @var \Magento\Bundle\Api\Data\LinkInterface[] $linksToDelete */
-            $linksToDelete = array_udiff($existingLinks, $newProductLinks, [$this, 'compareLinks']);
-            foreach ($linksToDelete as $link) {
-                $this->linkManagement->removeChild($product->getSku(), $option->getOptionId(), $link->getSku());
-            }
-            /** @var \Magento\Bundle\Api\Data\LinkInterface[] $linksToAdd */
-            $linksToAdd = array_udiff($newProductLinks, $existingLinks, [$this, 'compareLinks']);
+            $this->updateOptionSelection($product, $option);
         }
 
         try {
@@ -215,6 +204,50 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
         return $option->getOptionId();
     }
 
+    /**
+     * Update option selections
+     *
+     * @param \Magento\Catalog\Api\Data\ProductInterface $product
+     * @param \Magento\Bundle\Api\Data\OptionInterface $option
+     * @return $this
+     */
+    protected function updateOptionSelection(
+        \Magento\Catalog\Api\Data\ProductInterface $product,
+        \Magento\Bundle\Api\Data\OptionInterface $option
+    ) {
+        $optionId = $option->getOptionId();
+        $existingLinks = $this->linkManagement->getChildren($product->getSku(), $optionId);
+        $linksToAdd = [];
+        $linksToUpdate = [];
+        $linksToDelete = [];
+        if (is_array($option->getProductLinks())) {
+            $productLinks = $option->getProductLinks();
+            foreach ($productLinks as $productLink) {
+                if (!$productLink->getId()) {
+                    $linksToAdd[] = $productLink;
+                } else {
+                    $linksToUpdate[] = $productLink;
+                }
+            }
+            /** @var \Magento\Bundle\Api\Data\LinkInterface[] $linksToDelete */
+            $linksToDelete = array_udiff($existingLinks, $linksToUpdate, [$this, 'compareLinks']);
+        }
+        foreach ($linksToUpdate as $linkedProduct) {
+            $this->linkManagement->saveChild($product->getSku(), $linkedProduct);
+        }
+        foreach ($linksToDelete as $linkedProduct) {
+            $this->linkManagement->removeChild(
+                $product->getSku(),
+                $option->getOptionId(),
+                $linkedProduct->getSku()
+            );
+        }
+        foreach ($linksToAdd as $linkedProduct) {
+            $this->linkManagement->addChild($product, $option->getOptionId(), $linkedProduct);
+        }
+        return $this;
+    }
+
     /**
      * @param string $sku
      * @return \Magento\Catalog\Api\Data\ProductInterface
@@ -241,7 +274,7 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
         \Magento\Bundle\Api\Data\LinkInterface $firstLink,
         \Magento\Bundle\Api\Data\LinkInterface $secondLink
     ) {
-        if ($firstLink->getSku() == $secondLink->getSku()) {
+        if ($firstLink->getId() == $secondLink->getId()) {
             return 0;
         } else {
             return 1;

app/code/Magento/Bundle/Model/Plugin/BundleLoadOptions.php

@@ -52,7 +52,10 @@ class BundleLoadOptions
             return $product;
         }
 
-        $productExtension = $this->productExtensionFactory->create();
+        $productExtension = $product->getExtensionAttributes();
+        if ($productExtension === null) {
+            $productExtension = $this->productExtensionFactory->create();
+        }
         $productExtension->setBundleProductOptions($this->productOptionList->getItems($product));
 
         $product->setExtensionAttributes($productExtension);

app/code/Magento/Bundle/Model/Plugin/BundleSaveOptions.php

@@ -17,8 +17,9 @@ class BundleSaveOptions
     /**
      * @param \Magento\Bundle\Api\ProductOptionRepositoryInterface $optionRepository
      */
-    public function __construct(\Magento\Bundle\Api\ProductOptionRepositoryInterface $optionRepository)
-    {
+    public function __construct(
+        \Magento\Bundle\Api\ProductOptionRepositoryInterface $optionRepository
+    ) {
         $this->optionRepository = $optionRepository;
     }
 
@@ -45,13 +46,37 @@ class BundleSaveOptions
         }
 
         /* @var \Magento\Bundle\Api\Data\OptionInterface[] $options */
-        $bundleProductOptions = $product->getExtensionAttributes()->getBundleProductOptions();
+        $extendedAttributes = $product->getExtensionAttributes();
+        if ($extendedAttributes === null) {
+            return $result;
+        }
+        $bundleProductOptions = $extendedAttributes->getBundleProductOptions();
+        if ($bundleProductOptions == null) {
+            return $result;
+        }
 
-        if (is_array($bundleProductOptions)) {
-            foreach ($bundleProductOptions as $option) {
-                $this->optionRepository->save($result, $option);
+        /** @var \Magento\Bundle\Api\Data\OptionInterface[] $bundleProductOptions */
+        $existingOptions = $this->optionRepository->getList($product->getSku());
+        $existingOptionsMap = [];
+        foreach ($existingOptions as $existingOption) {
+            $existingOptionsMap[$existingOption->getOptionId()] = $existingOption;
+        }
+        $updatedOptionIds = [];
+        foreach ($bundleProductOptions as $bundleOption) {
+            $optionId = $bundleOption->getOptionId();
+            if ($optionId) {
+                $updatedOptionIds[] = $optionId;
             }
         }
-        return $result;
+        $optionIdsToDelete = array_diff(array_keys($existingOptionsMap), $updatedOptionIds);
+        //Handle new and existing options
+        foreach ($bundleProductOptions as $option) {
+            $this->optionRepository->save($result, $option);
+        }
+        //Delete options that are not in the list
+        foreach ($optionIdsToDelete as $optionId) {
+            $this->optionRepository->delete($existingOptionsMap[$optionId]);
+        }
+        return $subject->get($result->getSku(), false, $result->getStoreId(), true);
     }
 }

app/code/Magento/Bundle/Model/Product/LinksList.php

@@ -61,8 +61,9 @@ class LinksList
                 '\Magento\Bundle\Api\Data\LinkInterface'
             );
             $productLink->setIsDefault($selection->getIsDefault())
+                ->setId($selection->getSelectionId())
                 ->setQty($selection->getSelectionQty())
-                ->setIsDefined($selection->getSelectionCanChangeQty())
+                ->setCanChangeQuantity($selection->getSelectionCanChangeQty())
                 ->setPrice($selectionPrice)
                 ->setPriceType($selectionPriceType);
             $productLinks[] = $productLink;

app/code/Magento/Bundle/Model/Selection.php

@@ -8,6 +8,8 @@ namespace Magento\Bundle\Model;
 /**
  * Bundle Selection Model
  *
+ * @method int getSelectionId()
+ * @method \Magento\Bundle\Model\Selection setSelectionId(int $value)
  * @method int getOptionId()
  * @method \Magento\Bundle\Model\Selection setOptionId(int $value)
  * @method int getParentProductId()

app/code/Magento/Bundle/Model/Source/Option/Selection/Price/Type.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Bundle\Model\Source\Option\Selection\Price;
 
+use Magento\Bundle\Api\Data\LinkInterface;
+
 /**
  * Extended Attributes Source Model
  *
@@ -17,6 +19,9 @@ class Type implements \Magento\Framework\Option\ArrayInterface
      */
     public function toOptionArray()
     {
-        return [['value' => '0', 'label' => __('Fixed')], ['value' => '1', 'label' => __('Percent')]];
+        return [
+            ['value' => LinkInterface::PRICE_TYPE_FIXED, 'label' => __('Fixed')],
+            ['value' => LinkInterface::PRICE_TYPE_PERCENT, 'label' => __('Percent')]
+        ];
     }
 }

app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php

@@ -335,8 +335,9 @@ class OptionRepositoryTest extends \PHPUnit_Framework_TestCase
             ->willReturn($optCollectionMock);
 
         $existingOptionMock = $this->getMock('\Magento\Bundle\Model\Option', ['getOptionId'], [], '', false);
-        $optCollectionMock->expects($this->once())->method('setIdFilter')->with($optionId)->willReturnSelf();
-        $optCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($existingOptionMock);
+        $optCollectionMock->expects($this->once())->method('getItemById')
+            ->with($optionId)
+            ->willReturn($existingOptionMock);
         $existingOptionMock->expects($this->once())->method('getOptionId')->willReturn(null);
 
         $this->assertEquals($optionId, $this->model->save($productMock, $optionMock));
@@ -345,13 +346,16 @@ class OptionRepositoryTest extends \PHPUnit_Framework_TestCase
     /**
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
-    public function testUpdate()
+    public function testSaveExistingOption()
     {
         $productId = 1;
+        $productSku = 'bundle_sku';
         $storeId = 2;
         $optionId = 5;
         $existingOptionId = 5;
-        $existingOptionTitle = 'option_title';
+        $existingLinkToUpdateId = '23';
+        $existingLinkToDeleteId = '24';
+        $productSkuToDelete = 'simple2';
 
         $storeMock = $this->getMock('\Magento\Store\Model\Store', ['getId'], [], '', false);
         $storeMock->expects($this->once())->method('getId')->willReturn($storeId);
@@ -359,6 +363,7 @@ class OptionRepositoryTest extends \PHPUnit_Framework_TestCase
 
         $productMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);
         $productMock->expects($this->once())->method('getId')->willReturn($productId);
+        $productMock->expects($this->any())->method('getSku')->willReturn($productSku);
         $optionMock = $this->getMock(
             '\Magento\Bundle\Model\Option',
             [
@@ -378,6 +383,17 @@ class OptionRepositoryTest extends \PHPUnit_Framework_TestCase
         $optionMock->expects($this->once())->method('setParentId')->with($productId)->willReturnSelf();
         $optionMock->expects($this->any())->method('getOptionId')->willReturn($optionId);
 
+        $existingLinkToUpdate = $this->getMock('\Magento\Bundle\Api\Data\LinkInterface');
+        $existingLinkToUpdate->expects($this->any())->method('getId')->willReturn($existingLinkToUpdateId);
+        $existingLinkToDelete = $this->getMock('\Magento\Bundle\Api\Data\LinkInterface');
+        $existingLinkToDelete->expects($this->any())->method('getId')->willReturn($existingLinkToDeleteId);
+        $existingLinkToDelete->expects($this->once())->method('getSku')->willReturn($productSkuToDelete);
+        $existingLinks = [$existingLinkToUpdate, $existingLinkToDelete];
+        $this->linkManagementMock->expects($this->once())
+            ->method('getChildren')
+            ->with($productSku, $optionId)
+            ->willReturn($existingLinks);
+
         $optCollectionMock = $this->getMock('\Magento\Bundle\Model\Resource\Option\Collection', [], [], '', false);
         $this->typeMock->expects($this->once())
             ->method('getOptionsCollection')
@@ -390,22 +406,183 @@ class OptionRepositoryTest extends \PHPUnit_Framework_TestCase
             '',
             false
         );
-        $optCollectionMock->expects($this->once())->method('setIdFilter')->with($optionId)->willReturnSelf();
-        $optCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($existingOptionMock);
+        $optCollectionMock->expects($this->once())->method('getItemById')
+            ->with($optionId)
+            ->willReturn($existingOptionMock);
         $existingOptionMock->expects($this->any())->method('getOptionId')->willReturn($existingOptionId);
-        $existingOptionMock->expects($this->once())->method('getProductLinks')->willReturn(null);
 
-        $linkedProductMock = $this->getMock('\Magento\Bundle\Api\Data\LinkInterface');
-        $optionMock->expects($this->exactly(2))->method('getProductLinks')->willReturn([$linkedProductMock]);
+        $productLinkUpdate = $this->getMock('\Magento\Bundle\Api\Data\LinkInterface');
+        $productLinkUpdate->expects($this->any())->method('getId')->willReturn($existingLinkToUpdateId);
+        $productLinkNew = $this->getMock('\Magento\Bundle\Api\Data\LinkInterface');
+        $productLinkNew->expects($this->any())->method('getId')->willReturn(null);
+        $optionMock->expects($this->exactly(2))
+            ->method('getProductLinks')
+            ->willReturn([$productLinkUpdate, $productLinkNew]);
 
         $this->optionResourceMock->expects($this->once())->method('save')->with($optionMock)->willReturnSelf();
         $this->linkManagementMock->expects($this->once())
             ->method('addChild')
-            ->with($productMock, $optionId, $linkedProductMock)
-            ->willReturn(1);
+            ->with($productMock, $optionId, $productLinkNew);
+        $this->linkManagementMock->expects($this->once())
+            ->method('saveChild')
+            ->with($productSku, $productLinkUpdate);
+        $this->linkManagementMock->expects($this->once())
+            ->method('removeChild')
+            ->with($productSku, $optionId, $productSkuToDelete);
+        $this->assertEquals($optionId, $this->model->save($productMock, $optionMock));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+     * @expectedExceptionMessage Requested option doesn't exist
+     */
+    public function testSaveExistingOptionNoSuchOption()
+    {
+        $productId = 1;
+        $productSku = 'bundle_sku';
+        $storeId = 2;
+        $optionId = 5;
+
+        $storeMock = $this->getMock('\Magento\Store\Model\Store', ['getId'], [], '', false);
+        $storeMock->expects($this->once())->method('getId')->willReturn($storeId);
+        $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+
+        $productMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);
+        $productMock->expects($this->once())->method('getId')->willReturn($productId);
+        $productMock->expects($this->any())->method('getSku')->willReturn($productSku);
+        $optionMock = $this->getMock(
+            '\Magento\Bundle\Model\Option',
+            [
+                'setStoreId',
+                'setParentId',
+                'getOptionId',
+            ],
+            [],
+            '',
+            false
+        );
+        $optionMock->expects($this->once())->method('setStoreId')->with($storeId)->willReturnSelf();
+        $optionMock->expects($this->once())->method('setParentId')->with($productId)->willReturnSelf();
+        $optionMock->expects($this->any())->method('getOptionId')->willReturn($optionId);
+
+        $optCollectionMock = $this->getMock('\Magento\Bundle\Model\Resource\Option\Collection', [], [], '', false);
+        $this->typeMock->expects($this->once())
+            ->method('getOptionsCollection')
+            ->with($productMock)
+            ->willReturn($optCollectionMock);
+        $existingOptionMock = $this->getMock(
+            '\Magento\Bundle\Model\Option',
+            ['getOptionId', 'getTitle', 'getProductLinks'],
+            [],
+            '',
+            false
+        );
+        $optCollectionMock->expects($this->once())->method('getItemById')
+            ->with($optionId)
+            ->willReturn($existingOptionMock);
+        $existingOptionMock->expects($this->any())->method('getOptionId')->willReturn(null);
+
+        $this->model->save($productMock, $optionMock);
+    }
+
+    public function testSaveNewOption()
+    {
+        $productId = 1;
+        $productSku = 'bundle_sku';
+        $storeId = 2;
+        $optionId = 5;
+
+        $storeMock = $this->getMock('\Magento\Store\Model\Store', ['getId'], [], '', false);
+        $storeMock->expects($this->once())->method('getId')->willReturn($storeId);
+        $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+
+        $productMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);
+        $productMock->expects($this->once())->method('getId')->willReturn($productId);
+        $productMock->expects($this->any())->method('getSku')->willReturn($productSku);
+        $optionMock = $this->getMock(
+            '\Magento\Bundle\Model\Option',
+            [
+                'setStoreId',
+                'setParentId',
+                'getProductLinks',
+                'getOptionId',
+                'setOptionId',
+                'setDefaultTitle',
+                'getTitle'
+            ],
+            [],
+            '',
+            false
+        );
+        $optionMock->expects($this->once())->method('setStoreId')->with($storeId)->willReturnSelf();
+        $optionMock->expects($this->once())->method('setParentId')->with($productId)->willReturnSelf();
+        $optionMock->method('getOptionId')
+            ->will($this->onConsecutiveCalls(null, $optionId, $optionId, $optionId, $optionId));
+
+        $productLink1 = $this->getMock('\Magento\Bundle\Api\Data\LinkInterface');
+        $productLink2 = $this->getMock('\Magento\Bundle\Api\Data\LinkInterface');
+        $optionMock->expects($this->exactly(2))
+            ->method('getProductLinks')
+            ->willReturn([$productLink1, $productLink2]);
+
+        $this->optionResourceMock->expects($this->once())->method('save')->with($optionMock)->willReturnSelf();
+        $this->linkManagementMock->expects($this->at(0))
+            ->method('addChild')
+            ->with($productMock, $optionId, $productLink1);
+        $this->linkManagementMock->expects($this->at(1))
+            ->method('addChild')
+            ->with($productMock, $optionId, $productLink2);
         $this->assertEquals($optionId, $this->model->save($productMock, $optionMock));
     }
 
+    /**
+     * @expectedException \Magento\Framework\Exception\CouldNotSaveException
+     * @expectedExceptionMessage Could not save option
+     */
+    public function testSaveCanNotSave()
+    {
+        $productId = 1;
+        $productSku = 'bundle_sku';
+        $storeId = 2;
+        $optionId = 5;
+
+        $storeMock = $this->getMock('\Magento\Store\Model\Store', ['getId'], [], '', false);
+        $storeMock->expects($this->once())->method('getId')->willReturn($storeId);
+        $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+
+        $productMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);
+        $productMock->expects($this->once())->method('getId')->willReturn($productId);
+        $productMock->expects($this->any())->method('getSku')->willReturn($productSku);
+        $optionMock = $this->getMock(
+            '\Magento\Bundle\Model\Option',
+            [
+                'setStoreId',
+                'setParentId',
+                'getProductLinks',
+                'getOptionId',
+                'setOptionId',
+                'setDefaultTitle',
+                'getTitle'
+            ],
+            [],
+            '',
+            false
+        );
+        $optionMock->expects($this->once())->method('setStoreId')->with($storeId)->willReturnSelf();
+        $optionMock->expects($this->once())->method('setParentId')->with($productId)->willReturnSelf();
+        $optionMock->method('getOptionId')->will($this->onConsecutiveCalls(null, $optionId, $optionId, $optionId));
+
+        $productLink1 = $this->getMock('\Magento\Bundle\Api\Data\LinkInterface');
+        $productLink2 = $this->getMock('\Magento\Bundle\Api\Data\LinkInterface');
+        $optionMock->expects($this->exactly(2))
+            ->method('getProductLinks')
+            ->willReturn([$productLink1, $productLink2]);
+
+        $this->optionResourceMock->expects($this->once())->method('save')->with($optionMock)
+            ->willThrowException($this->getMock('\Exception'));
+        $this->model->save($productMock, $optionMock);
+    }
+
     public function testGetList()
     {
         $productSku = 'simple';

app/code/Magento/Bundle/Test/Unit/Model/Plugin/BundleLoadOptionsTest.php

@@ -60,7 +60,6 @@ class BundleLoadOptionsTest extends \PHPUnit_Framework_TestCase
 
     public function testAroundLoad()
     {
-        $this->markTestSkipped('MAGETWO-34577');
         $productMock = $this->getMock(
             '\Magento\Catalog\Model\Product',
             ['getTypeId', 'setExtensionAttributes'],
@@ -82,6 +81,7 @@ class BundleLoadOptionsTest extends \PHPUnit_Framework_TestCase
             ->willReturn([$optionMock]);
         $productExtensionMock = $this->getMockBuilder('\Magento\Catalog\Api\Data\ProductExtension')
             ->disableOriginalConstructor()
+            ->setMethods(['setBundleProductOptions', 'getBundleProductOptions'])
             ->getMock();
         $this->productExtensionFactory->expects($this->once())
             ->method('create')

app/code/Magento/Bundle/Test/Unit/Model/Plugin/BundleSaveOptionsTest.php

@@ -43,6 +43,11 @@ class BundleSaveOptionsTest extends \PHPUnit_Framework_TestCase
      */
     protected $productBundleOptionsMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $productInterfaceFactoryMock;
+
     /**
      * @var \Closure
      */
@@ -54,7 +59,7 @@ class BundleSaveOptionsTest extends \PHPUnit_Framework_TestCase
         $this->productOptionRepositoryMock = $this->getMock('Magento\Bundle\Api\ProductOptionRepositoryInterface');
         $this->productMock = $this->getMock(
             'Magento\Catalog\Model\Product',
-            ['getExtensionAttributes', 'getTypeId'],
+            ['getExtensionAttributes', 'getTypeId', 'getSku', 'getStoreId'],
             [],
             '',
             false
@@ -62,10 +67,12 @@ class BundleSaveOptionsTest extends \PHPUnit_Framework_TestCase
         $this->closureMock = function () {
             return $this->productMock;
         };
-        $this->plugin = new BundleSaveOptions($this->productOptionRepositoryMock);
+        $this->plugin = new BundleSaveOptions(
+            $this->productOptionRepositoryMock
+        );
         $this->productExtensionMock = $this->getMock(
             'Magento\Catalog\Api\Data\ProductExtension',
-            ['getBundleProductOptions'],
+            ['getBundleProductOptions', 'setBundleProductOptions'],
             [],
             '',
             false
@@ -98,7 +105,7 @@ class BundleSaveOptionsTest extends \PHPUnit_Framework_TestCase
             ->willReturn($this->productExtensionMock);
         $this->productExtensionMock->expects($this->once())
             ->method('getBundleProductOptions')
-            ->willReturn([]);
+            ->willReturn(null);
 
         $this->productOptionRepositoryMock->expects($this->never())->method('save');
 
@@ -110,20 +117,105 @@ class BundleSaveOptionsTest extends \PHPUnit_Framework_TestCase
 
     public function testAroundSaveWhenProductIsBundleWithOptions()
     {
+        $productSku = "bundle_sku";
+        $option = $this->getMock('\Magento\Bundle\Api\Data\OptionInterface');
+        $this->productMock->expects($this->once())->method('getTypeId')->willReturn('bundle');
+        $this->productMock->expects($this->once())
+            ->method('getExtensionAttributes')
+            ->willReturn($this->productExtensionMock);
+        $this->productExtensionMock->expects($this->once())
+            ->method('getBundleProductOptions')
+            ->willReturn([$option]);
+
+        $this->productOptionRepositoryMock->expects($this->once())->method('save')->with($this->productMock, $option);
+
+        $this->productMock->expects($this->exactly(2))->method('getSku')
+            ->will($this->returnValue($productSku));
+
+        $this->productOptionRepositoryMock->expects($this->once())
+            ->method('getList')
+            ->with($productSku)
+            ->will($this->returnValue([]));
+
+        $newProductMock = $this->getMockBuilder('Magento\Catalog\Api\Data\ProductInterface')
+            ->disableOriginalConstructor()->getMock();
+        $this->productRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($productSku, false, null, true)
+            ->willReturn($newProductMock);
+
+        $this->assertEquals(
+            $newProductMock,
+            $this->plugin->aroundSave($this->productRepositoryMock, $this->closureMock, $this->productMock)
+        );
+    }
+
+    /**
+     * Test the case where the product has existing options
+     */
+    public function testAroundSaveWhenProductIsBundleWithOptionsAndExistingOptions()
+    {
+        $existOption1Id = 10;
+        $existOption2Id = 11;
+        $productSku = 'bundle_sku';
+        $existingOption1 = $this->getMock('\Magento\Bundle\Api\Data\OptionInterface');
+        $existingOption1->expects($this->once())
+            ->method('getOptionId')
+            ->will($this->returnValue($existOption1Id));
+        $existingOption2 = $this->getMock('\Magento\Bundle\Api\Data\OptionInterface');
+        $existingOption2->expects($this->once())
+            ->method('getOptionId')
+            ->will($this->returnValue($existOption2Id));
+
+        $bundleOptionExisting = $this->getMock('\Magento\Bundle\Api\Data\OptionInterface');
+        $bundleOptionExisting->expects($this->once())
+            ->method('getOptionId')
+            ->will($this->returnValue($existOption1Id));
+
+        $bundleOptionNew = $this->getMock('\Magento\Bundle\Api\Data\OptionInterface');
+        $bundleOptionNew->expects($this->once())
+            ->method('getOptionId')
+            ->will($this->returnValue(null));
+
         $this->productMock->expects($this->once())->method('getTypeId')->willReturn('bundle');
         $this->productMock->expects($this->once())
             ->method('getExtensionAttributes')
             ->willReturn($this->productExtensionMock);
         $this->productExtensionMock->expects($this->once())
             ->method('getBundleProductOptions')
-            ->willReturn([$this->productBundleOptionsMock]);
+            ->willReturn([$bundleOptionExisting, $bundleOptionNew]);
+        $this->productMock->expects($this->exactly(2))->method('getSku')
+            ->will($this->returnValue($productSku));
 
         $this->productOptionRepositoryMock->expects($this->once())
+            ->method('getList')
+            ->with($productSku)
+            ->will($this->returnValue([$existingOption1, $existingOption2]));
+
+        $this->productOptionRepositoryMock
+            ->expects($this->at(1))
+            ->method('save')
+            ->with($this->productMock, $bundleOptionExisting);
+
+        $this->productOptionRepositoryMock
+            ->expects($this->at(1))
             ->method('save')
-            ->with($this->productMock, $this->productBundleOptionsMock);
+            ->with($this->productMock, $bundleOptionNew);
+
+        $this->productOptionRepositoryMock
+            ->expects($this->once())
+            ->method('delete')
+            ->with($existingOption2);
+
+        $newProductMock = $this->getMockBuilder('Magento\Catalog\Api\Data\ProductInterface')
+            ->disableOriginalConstructor()->getMock();
+        $this->productRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($productSku, false, null, true)
+            ->willReturn($newProductMock);
 
         $this->assertEquals(
-            $this->productMock,
+            $newProductMock,
             $this->plugin->aroundSave($this->productRepositoryMock, $this->closureMock, $this->productMock)
         );
     }

app/code/Magento/Bundle/Test/Unit/Model/Product/LinksListTest.php

@@ -64,6 +64,7 @@ class LinksListTest extends \PHPUnit_Framework_TestCase
                 'getIsDefault',
                 'getSelectionQty',
                 'getSelectionCanChangeQty',
+                'getSelectionId',
                 '__wakeup'
             ],
             [],
@@ -89,6 +90,7 @@ class LinksListTest extends \PHPUnit_Framework_TestCase
     public function testLinksList()
     {
         $optionId = 665;
+        $selectionId = 1345;
         $this->productTypeMock->expects($this->once())
             ->method('getSelectionsCollection')
             ->with([$optionId], $this->productMock)
@@ -99,6 +101,7 @@ class LinksListTest extends \PHPUnit_Framework_TestCase
             ->willReturn('selection_price_type');
         $this->selectionMock->expects($this->once())->method('getSelectionPriceValue')->willReturn(12);
         $this->selectionMock->expects($this->once())->method('getData')->willReturn(['some data']);
+        $this->selectionMock->expects($this->once())->method('getSelectionId')->willReturn($selectionId);
         $this->selectionMock->expects($this->once())->method('getIsDefault')->willReturn(true);
         $this->selectionMock->expects($this->once())->method('getSelectionQty')->willReturn(66);
         $this->selectionMock->expects($this->once())->method('getSelectionCanChangeQty')->willReturn(22);
@@ -108,8 +111,9 @@ class LinksListTest extends \PHPUnit_Framework_TestCase
             ->with($linkMock, ['some data'], '\Magento\Bundle\Api\Data\LinkInterface')->willReturnSelf();
         $linkMock->expects($this->once())->method('setIsDefault')->with(true)->willReturnSelf();
         $linkMock->expects($this->once())->method('setQty')->with(66)->willReturnSelf();
-        $linkMock->expects($this->once())->method('setIsDefined')->with(22)->willReturnSelf();
+        $linkMock->expects($this->once())->method('setCanChangeQuantity')->with(22)->willReturnSelf();
         $linkMock->expects($this->once())->method('setPrice')->with(12)->willReturnSelf();
+        $linkMock->expects($this->once())->method('setId')->with($selectionId)->willReturnSelf();
         $linkMock->expects($this->once())
             ->method('setPriceType')->with('selection_price_type')->willReturnSelf();
         $this->linkFactoryMock->expects($this->once())->method('create')->willReturn($linkMock);

app/code/Magento/Bundle/etc/data_object.xml

@@ -8,7 +8,5 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Api/etc/data_object.xsd">
     <custom_attributes for="Magento\Catalog\Api\Data\ProductInterface">
         <attribute code="bundle_product_options" type="Magento\Bundle\Api\Data\OptionInterface[]" />
-        <attribute code="price_type" type="integer" />
-        <attribute code="price_view" type="string" />
     </custom_attributes>
 </config>

app/code/Magento/Bundle/etc/webapi.xml

@@ -13,7 +13,13 @@
             <resource ref="Magento_Catalog::products"/>
         </resources>
     </route>
-    <route url="/V1/bundle-products/:productId/children" method="GET">
+    <route url="/V1/bundle-products/:sku/links/:id" method="PUT">
+        <service class="Magento\Bundle\Api\ProductLinkManagementInterface" method="saveChild"/>
+        <resources>
+            <resource ref="Magento_Catalog::products"/>
+        </resources>
+    </route>
+    <route url="/V1/bundle-products/:productSku/children" method="GET">
         <service class="Magento\Bundle\Api\ProductLinkManagementInterface" method="getChildren"/>
         <resources>
             <resource ref="Magento_Catalog::products"/>

app/code/Magento/Catalog/Api/ProductRepositoryInterface.php

@@ -27,10 +27,11 @@ interface ProductRepositoryInterface
      * @param string $sku
      * @param bool $editMode
      * @param null|int $storeId
+     * @param bool $forceReload
      * @return \Magento\Catalog\Api\Data\ProductInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function get($sku, $editMode = false, $storeId = null);
+    public function get($sku, $editMode = false, $storeId = null, $forceReload = false);
 
     /**
      * Get info about product by product id
@@ -38,10 +39,11 @@ interface ProductRepositoryInterface
      * @param int $productId
      * @param bool $editMode
      * @param null|int $storeId
+     * @param bool $forceReload
      * @return \Magento\Catalog\Api\Data\ProductInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function getById($productId, $editMode = false, $storeId = null);
+    public function getById($productId, $editMode = false, $storeId = null, $forceReload = false);
 
     /**
      * Delete product

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php

@@ -64,6 +64,8 @@ class Helper
     public function initialize(\Magento\Catalog\Model\Product $product)
     {
         $productData = $this->request->getPost('product');
+        unset($productData['custom_attributes']);
+        unset($productData['extension_attributes']);
 
         if ($productData) {
             $stockData = isset($productData['stock_data']) ? $productData['stock_data'] : [];