ACP2E-906: Bundle product option title is overwritten by API

Author: bubasuma

app/code/Magento/Bundle/Model/Option/SaveAction.php

@@ -50,6 +50,7 @@ class SaveAction
      * @param Type $type
      * @param ProductLinkManagementInterface $linkManagement
      * @param StoreManagerInterface|null $storeManager
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         Option $optionResource,
@@ -84,11 +85,10 @@ public function save(ProductInterface $bundleProduct, OptionInterface $option)
         $optionId = $option->getOptionId();
         $linksToAdd = [];
         $optionCollection = $this->type->getOptionsCollection($bundleProduct);
-        $optionCollection->setIdFilter($option->getOptionId());
-        $optionCollection->setProductLinkFilter($parentId);
 
         /** @var \Magento\Bundle\Model\Option $existingOption */
-        $existingOption = $optionCollection->getFirstItem();
+        $existingOption = $optionCollection->getItemById($option->getOptionId())
+            ?? $optionCollection->getNewEmptyItem();
         if (!$optionId || $existingOption->getParentId() != $parentId) {
             //If option ID is empty or existing option's parent ID is different
             //we'd need a new ID for the option.

dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductServiceTest.php

@@ -6,8 +6,14 @@
 
 namespace Magento\Bundle\Api;
 
+use Magento\Bundle\Test\Fixture\Option as BundleOptionFixture;
+use Magento\Bundle\Test\Fixture\Product as BundleProductFixture;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 use Magento\Framework\Api\ExtensibleDataInterface;
+use Magento\Store\Test\Fixture\Store as StoreFixture;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 use Magento\Bundle\Api\Data\LinkInterface;
@@ -17,31 +23,39 @@
  */
 class ProductServiceTest extends WebapiAbstract
 {
-    const SERVICE_NAME = 'catalogProductRepositoryV1';
-    const SERVICE_VERSION = 'V1';
-    const RESOURCE_PATH = '/V1/products';
-    const BUNDLE_PRODUCT_ID = 'sku-test-product-bundle';
+    private const SERVICE_NAME = 'catalogProductRepositoryV1';
+    private const SERVICE_VERSION = 'V1';
+    private const RESOURCE_PATH = '/V1/products';
+    private const BUNDLE_PRODUCT_ID = 'sku-test-product-bundle';
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Collection
      */
     protected $productCollection;
 
+    /**
+     * @var bool
+     */
+    private $cleanUpOnTearDown = true;
+
     /**
      * Execute per test initialization
      */
     protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->productCollection = $objectManager->get(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
+        $this->cleanUpOnTearDown = true;
     }
 
     /**
      * Execute per test cleanup
      */
     protected function tearDown(): void
     {
-        $this->deleteProductBySku(self::BUNDLE_PRODUCT_ID);
+        if ($this->cleanUpOnTearDown) {
+            $this->deleteProductBySku(self::BUNDLE_PRODUCT_ID);
+        }
         parent::tearDown();
     }
 
@@ -269,7 +283,6 @@ public function testUpdateFixedPriceBundleProductOptionSelectionPrice()
         $bundleProduct = $this->createFixedPriceBundleProduct();
         $bundleProductOptions = $this->getBundleProductOptions($bundleProduct);
 
-        $oldOptionId = $bundleProductOptions[0]['option_id'];
         //replace current option with a new option
         $bundleProductOptions[0] = [
             'title' => 'new option',
@@ -295,6 +308,52 @@ public function testUpdateFixedPriceBundleProductOptionSelectionPrice()
         $this->assertEquals($optionPrice, $bundleOptions[0]['product_links'][0]['price']);
     }
 
+    #[
+        DataFixture(StoreFixture::class, as: 'store2'),
+        DataFixture(ProductFixture::class, ['price' => 10], 'p1'),
+        DataFixture(ProductFixture::class, ['price' => 20], 'p2'),
+        DataFixture(BundleOptionFixture::class, ['product_links' => ['$p1$']], 'opt1'),
+        DataFixture(BundleOptionFixture::class, ['product_links' => ['$p2$']], 'opt2'),
+        DataFixture(
+            BundleProductFixture::class,
+            ['_options' => ['$opt1$', '$opt2$']],
+            'bundle1'
+        ),
+    ]
+
+    public function testUpdateBundleProductOptionsTitleOnStoreView(): void
+    {
+        $this->cleanUpOnTearDown = false;
+        $fixtures = DataFixtureStorageManager::getStorage();
+        $product = $fixtures->get('bundle1');
+        $store2 = $fixtures->get('store2');
+        $data = $this->getProduct($product->getSku());
+        $defaultOptions = $this->getBundleProductOptions($data);
+        $store2Options = $defaultOptions;
+        $store2Options[0]['title'] .= ' - custom';
+        $store2Options[1]['title'] .= ' - custom';
+        $this->setBundleProductOptions($data, $store2Options);
+        $this->saveProduct($data, $store2->getCode());
+
+        // check that option titles are updated on store 2
+        $data = $this->getProduct($product->getSku(), $store2->getCode());
+        $options = $this->getBundleProductOptions($data);
+        $this->assertEquals($store2Options[0]['title'], $options[0]['title']);
+        $this->assertEquals($store2Options[1]['title'], $options[1]['title']);
+
+        // check that option titles have not changed on default store
+        $data = $this->getProduct($product->getSku(), 'default');
+        $options = $this->getBundleProductOptions($data);
+        $this->assertEquals($defaultOptions[0]['title'], $options[0]['title']);
+        $this->assertEquals($defaultOptions[1]['title'], $options[1]['title']);
+
+        // check that option titles have not changed in global scope
+        $data = $this->getProduct($product->getSku(), 'all');
+        $options = $this->getBundleProductOptions($data);
+        $this->assertEquals($defaultOptions[0]['title'], $options[0]['title']);
+        $this->assertEquals($defaultOptions[1]['title'], $options[1]['title']);
+    }
+
     /**
      * Get the bundle_product_options custom attribute from product, null if the attribute is not set
      *
@@ -457,7 +516,7 @@ protected function convertCustomAttributes($customAttributes)
      * @param string $productSku
      * @return array the product data
      */
-    protected function getProduct($productSku)
+    protected function getProduct($productSku, ?string $storeCode = null)
     {
         $serviceInfo = [
             'rest' => [
@@ -471,10 +530,9 @@ protected function getProduct($productSku)
             ],
         ];
 
-        $response = (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) ?
-            $this->_webApiCall($serviceInfo, ['sku' => $productSku]) : $this->_webApiCall($serviceInfo);
-
-        return $response;
+        return TESTS_WEB_API_ADAPTER === self::ADAPTER_SOAP
+            ? $this->_webApiCall($serviceInfo, ['sku' => $productSku], storeCode: $storeCode)
+            : $this->_webApiCall($serviceInfo, storeCode: $storeCode);
     }
 
     /**
@@ -530,9 +588,10 @@ protected function deleteProductBySku($productSku)
      * Save product
      *
      * @param array $product
+     * @param string|null $storeCode
      * @return array the created product data
      */
-    protected function saveProduct($product)
+    protected function saveProduct($product, ?string $storeCode = null)
     {
         if (isset($product['custom_attributes'])) {
             $count = count($product['custom_attributes']);
@@ -557,7 +616,7 @@ protected function saveProduct($product)
             ],
         ];
         $requestData = ['product' => $product];
-        $response = $this->_webApiCall($serviceInfo, $requestData);
+        $response = $this->_webApiCall($serviceInfo, $requestData, storeCode: $storeCode);
         return $response;
     }
 }