MAGETWO-28256: Bundle Integration API Refactoring

    - Added api-functional tests and fixed bugs

Author: Yu Tang

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

@@ -9,6 +9,9 @@
 
 interface LinkInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
+    const PRICE_TYPE_FIXED = 0;
+    const PRICE_TYPE_PERCENT = 1;
+
     /**
      * Get the identifier
      *

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

@@ -14,12 +14,20 @@ class BundleSaveOptions
      */
     protected $optionRepository;
 
+    /**
+     * @var \Magento\Catalog\Api\Data\ProductInterfaceFactory
+     */
+    protected $productInterfaceFactory;
+
     /**
      * @param \Magento\Bundle\Api\ProductOptionRepositoryInterface $optionRepository
      */
-    public function __construct(\Magento\Bundle\Api\ProductOptionRepositoryInterface $optionRepository)
-    {
+    public function __construct(
+        \Magento\Bundle\Api\ProductOptionRepositoryInterface $optionRepository,
+        \Magento\Catalog\Api\Data\ProductInterfaceFactory $productInterfaceFactory
+    ) {
         $this->optionRepository = $optionRepository;
+        $this->productInterfaceFactory = $productInterfaceFactory;
     }
 
     /**
@@ -72,6 +80,7 @@ public function aroundSave(
         foreach ($optionIdsToDelete as $optionId) {
             $this->optionRepository->delete($existingOptionsMap[$optionId]);
         }
-        return $result;
+        $product = $this->productInterfaceFactory->create()->setSku($result->getSku());
+        return $subject->save($product);
     }
 }

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/Plugin/BundleLoadOptionsTest.php

@@ -60,7 +60,6 @@ public function testAroundLoadIfProductTypeNotBundle()
 
     public function testAroundLoad()
     {
-        $this->markTestSkipped('MAGETWO-34577');
         $productMock = $this->getMock(
             '\Magento\Catalog\Model\Product',
             ['getTypeId', 'setExtensionAttributes'],

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/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php

@@ -64,6 +64,8 @@ public function __construct(
     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'] : [];