MAGETWO-47698: [Github] Custom options not displayed correctly on a store view level magento#2908 magento#5885

- CR changes

Author: Yurii Hryhoriev

app/code/Magento/Catalog/Model/Product/Option/Repository.php

@@ -144,10 +144,16 @@ public function save(\Magento\Catalog\Api\Data\ProductCustomOptionInterface $opt
         $option->setData('store_id', $product->getStoreId());
 
         if ($option->getOptionId()) {
-            if (!$product->getOptions()) {
-                $product->getResource()->load($product, $product->getId());
+            $options = $product->getOptions();
+            if (!$options) {
+                $options = $this->getProductOptions($product);
             }
-            $persistedOption = $product->getOptionById($option->getOptionId());
+
+            $persistedOption = array_filter($options, function ($iOption) use ($option) {
+                return $option->getOptionId() == $iOption->getOptionId();
+            });
+            $persistedOption = reset($persistedOption);
+
             if (!$persistedOption) {
                 throw new NoSuchEntityException();
             }

app/code/Magento/Catalog/Test/Unit/Model/Product/Option/RepositoryTest.php

@@ -244,15 +244,17 @@ public function testSaveNoSuchEntityException()
     {
         $productSku = 'simple_product';
         $optionId = 1;
+        $productOptionId = 2;
         $this->optionMock->expects($this->once())->method('getProductSku')->willReturn($productSku);
         $this->productRepositoryMock
             ->expects($this->once())
             ->method('get')
             ->with($productSku)
             ->willReturn($this->productMock);
+        $productOption = clone $this->optionMock;
         $this->optionMock->expects($this->any())->method('getOptionId')->willReturn($optionId);
-        $this->productMock->expects($this->once())->method('getOptions')->willReturn(['some options']);
-        $this->productMock->expects($this->once())->method('getOptionById')->with($optionId)->willReturn(null);
+        $productOption->expects($this->any())->method('getOptionId')->willReturn($productOptionId);
+        $this->productMock->expects($this->once())->method('getOptions')->willReturn([$productOption]);
         $this->optionRepository->save($this->optionMock);
     }