ACP2E-465: Bundle product special price is not updated via REST API at store view scope

Author: bubasuma

app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php

@@ -15,7 +15,6 @@
 use Magento\Framework\App\ResourceConnection;
 
 /**
- * Class ScopeOverriddenValue
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ScopeOverriddenValue
@@ -187,4 +186,14 @@ private function getAttributes($entityType)
         );
         return $searchResult->getItems();
     }
+
+    /**
+     * Clear attributes values cache
+     *
+     * @return void
+     */
+    public function clearAttributeValues(): void
+    {
+        $this->attributesValues = null;
+    }
 }

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

@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Model\ResourceModel;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
 use Magento\Catalog\Model\ResourceModel\Product\Website\Link as ProductWebsiteLink;
 use Magento\Eav\Api\AttributeManagementInterface;
 use Magento\Framework\App\ObjectManager;
@@ -40,15 +42,11 @@ class Product extends AbstractResource
     protected $_productCategoryTable;
 
     /**
-     * Catalog category
-     *
      * @var Category
      */
     protected $_catalogCategory;
 
     /**
-     * Category collection factory
-     *
      * @var Category\CollectionFactory
      */
     protected $_categoryCollectionFactory;
@@ -105,6 +103,11 @@ class Product extends AbstractResource
      */
     private $mediaImageDeleteProcessor;
 
+    /**
+     * @var ScopeOverriddenValue
+     */
+    private $scopeOverriddenValue;
+
     /**
      * @param \Magento\Eav\Model\Entity\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -120,6 +123,7 @@ class Product extends AbstractResource
      * @param UniqueValidationInterface|null $uniqueValidator
      * @param AttributeManagementInterface|null $eavAttributeManagement
      * @param MediaImageDeleteProcessor|null $mediaImageDeleteProcessor
+     * @param ScopeOverriddenValue|null $scopeOverriddenValue
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -136,7 +140,8 @@ public function __construct(
         TableMaintainer $tableMaintainer = null,
         UniqueValidationInterface $uniqueValidator = null,
         AttributeManagementInterface $eavAttributeManagement = null,
-        ?MediaImageDeleteProcessor $mediaImageDeleteProcessor = null
+        ?MediaImageDeleteProcessor $mediaImageDeleteProcessor = null,
+        ?ScopeOverriddenValue $scopeOverriddenValue = null
     ) {
         $this->_categoryCollectionFactory = $categoryCollectionFactory;
         $this->_catalogCategory = $catalogCategory;
@@ -157,6 +162,8 @@ public function __construct(
             ?? ObjectManager::getInstance()->get(AttributeManagementInterface::class);
         $this->mediaImageDeleteProcessor = $mediaImageDeleteProcessor
             ?? ObjectManager::getInstance()->get(MediaImageDeleteProcessor::class);
+        $this->scopeOverriddenValue = $scopeOverriddenValue
+            ?? ObjectManager::getInstance()->get(ScopeOverriddenValue::class);
     }
 
     /**
@@ -316,6 +323,7 @@ protected function _afterSave(DataObject $product)
     {
         $this->removeNotInSetAttributeValues($product);
         $this->_saveWebsiteIds($product)->_saveCategories($product);
+        $this->scopeOverriddenValue->clearAttributeValues();
         return parent::_afterSave($product);
     }
 

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryMultiWebsiteTest.php

@@ -10,6 +10,8 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
 use Magento\Store\Model\Store;
+use Magento\TestFramework\Fixture\DataFixtureStorage;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
@@ -26,9 +28,9 @@
  */
 class ProductRepositoryMultiWebsiteTest extends WebapiAbstract
 {
-    const SERVICE_NAME = 'catalogProductRepositoryV1';
-    const SERVICE_VERSION = 'V1';
-    const RESOURCE_PATH = '/V1/products';
+    private const SERVICE_NAME = 'catalogProductRepositoryV1';
+    private const SERVICE_VERSION = 'V1';
+    private const RESOURCE_PATH = '/V1/products';
 
     /**
      * @var array
@@ -40,13 +42,19 @@ class ProductRepositoryMultiWebsiteTest extends WebapiAbstract
      */
     private $objectManager;
 
+    /**
+     * @var DataFixtureStorage
+     */
+    private $fixtures;
+
     /**
      * @inheritDoc
      */
     protected function setUp(): void
     {
         parent::setUp();
         $this->objectManager = Bootstrap::getObjectManager();
+        $this->fixtures = $this->objectManager->get(DataFixtureStorageManager::class)->getStorage();
     }
 
     /**
@@ -329,6 +337,52 @@ public function testPartialUpdate(): void
         );
     }
 
+    /**
+     * @magentoApiDataFixture Magento\Store\Test\Fixture\Website as:website2
+     * @magentoApiDataFixture Magento\Store\Test\Fixture\Group with:{"website_id":"$website2.id$"} as:store_group2
+     * @magentoApiDataFixture Magento\Store\Test\Fixture\Store with:{"store_group_id":"$store_group2.id$"} as:store2
+     * @magentoApiDataFixture Magento\Store\Test\Fixture\Store with:{"store_group_id":"$store_group2.id$"} as:store3
+     * @magentoApiDataFixture Magento\Catalog\Test\Fixture\Product with:{"website_ids":[1,"$website2.id$"]} as:product
+     * @magentoConfigFixture catalog/price/scope 1
+     */
+    public function testUpdatePrice(): void
+    {
+        $store = $this->objectManager->get(Store::class);
+        $defaultWebsiteStore1 = $store->load('default', 'code')->getCode();
+        $secondWebsiteStore1 = $this->fixtures->get('store2')->getCode();
+        $secondWebsiteStore2 = $this->fixtures->get('store3')->getCode();
+        $sku = $this->fixtures->get('product')->getSku();
+
+        // change any attribute value in second store
+        $request = [
+            ProductInterface::SKU => $sku,
+            'name' => 'updated product name for storeview'
+        ];
+        $this->saveProduct($request, $secondWebsiteStore1);
+
+        // now update prices in second website
+        $request = [
+            ProductInterface::SKU => $sku,
+            'price' => 9,
+            ProductInterface::CUSTOM_ATTRIBUTES => [
+                [
+                    'attribute_code' => 'special_price',
+                    'value' => 8,
+                ]
+            ],
+        ];
+        $this->saveProduct($request, $secondWebsiteStore1);
+        $defaultWebsiteStore1Response = $this->flattenCustomAttributes($this->getProduct($sku, $defaultWebsiteStore1));
+        $this->assertEquals(10, $defaultWebsiteStore1Response['price']);
+        $this->assertArrayNotHasKey('special_price', $defaultWebsiteStore1Response);
+        $secondWebsiteStore1Response = $this->flattenCustomAttributes($this->getProduct($sku, $secondWebsiteStore1));
+        $this->assertEquals(9, $secondWebsiteStore1Response['price']);
+        $this->assertEquals(8, $secondWebsiteStore1Response['special_price']);
+        $secondWebsiteStore2Response = $this->flattenCustomAttributes($this->getProduct($sku, $secondWebsiteStore2));
+        $this->assertEquals(9, $secondWebsiteStore2Response['price']);
+        $this->assertEquals(8, $secondWebsiteStore2Response['special_price']);
+    }
+
     /**
      * @param array $expected
      * @param array $actual
@@ -381,4 +435,39 @@ private function updateAttribute(string $code, array $data): void
         $attribute->addData($data);
         $attributeRepository->save($attribute);
     }
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    private function flattenCustomAttributes(array $data): array
+    {
+        $customAttributes = $data[ProductInterface::CUSTOM_ATTRIBUTES] ?? [];
+        unset($data[ProductInterface::CUSTOM_ATTRIBUTES]);
+        return array_merge(array_column($customAttributes, 'value', 'attribute_code'), $data);
+    }
+
+    /**
+     * Get product
+     *
+     * @param string $sku
+     * @param string|null $storeCode
+     * @return array|bool|float|int|string
+     */
+    private function getProduct($sku, $storeCode = null)
+    {
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '/' . $sku,
+                'httpMethod' => Request::HTTP_METHOD_GET,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'Get',
+            ],
+        ];
+
+        return $this->_webApiCall($serviceInfo, ['sku' => $sku], null, $storeCode);
+    }
 }