MAGETWO-85296: #7720: Product Repository saves attribute values for existing product always on "Default Store Level" #967

Author: Stanislav Idolov

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

@@ -467,7 +467,9 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO
         if (!$ignoreLinksFlag && $ignoreLinksFlag !== null) {
             $productLinks = $product->getProductLinks();
         }
-        $productDataArray['store_id'] = (int)$this->storeManager->getStore()->getId();
+        if (!isset($productDataArray['store_id'])) {
+            $productDataArray['store_id'] = (int)$this->storeManager->getStore()->getId();
+        }
         $product = $this->initializeProductData($productDataArray, empty($existingProduct));
 
         $this->processLinks($product, $productLinks);

dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php

@@ -12,6 +12,9 @@
 
 /**
  * Provide tests for ProductRepository model.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
  */
 class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
 {
@@ -122,4 +125,23 @@ public function testCreateWithoutSpecifiedType()
         self::assertSame('1.2300', $product->getWeight());
         self::assertSame('simple', $product->getTypeId());
     }
+
+    /**
+     * Tests product repository update should use provided store code.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testProductUpdate()
+    {
+        $sku = 'simple';
+        $nameUpdated = 'updated';
+        $product = $this->productRepository->get($sku, false, 0);
+        $product->setName($nameUpdated);
+        $this->productRepository->save($product);
+        $product = $this->productRepository->get($sku, false, 0);
+        self::assertEquals(
+            $nameUpdated,
+            $product->getName()
+        );
+    }
 }