MAGETWO-45142: product API with "all" store code does not work in RC 2.0 after all dependent tickets are fixed

Author: vzabaznov

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

@@ -301,10 +301,29 @@ protected function initializeProductData(array $productData, $createNew)
         foreach ($productData as $key => $value) {
             $product->setData($key, $value);
         }
+        $this->assignProductToWebsites($product);
 
         return $product;
     }
 
+    /**
+     * @param \Magento\Catalog\Model\Product $product
+     * @return void
+     */
+    private function assignProductToWebsites(\Magento\Catalog\Model\Product $product)
+    {
+        if (!$this->storeManager->hasSingleStore()) {
+
+            if ($this->storeManager->getStore()->getCode() == \Magento\Store\Model\Store::ADMIN_CODE) {
+                $websiteIds = array_keys($this->storeManager->getWebsites());
+            } else {
+                $websiteIds = [$this->storeManager->getStore()->getWebsiteId()];
+            }
+
+            $product->setWebsiteIds(array_unique(array_merge($product->getWebsiteIds(), $websiteIds)));
+        }
+    }
+
     /**
      * Process product options, creating new options, updating and deleting existing options
      *

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -146,6 +146,7 @@ protected function setUp()
         $this->initializedProductMock = $this->getMock(
             'Magento\Catalog\Model\Product',
             [
+                'getWebsiteIds',
                 'setProductOptions',
                 'load',
                 'getOptions',
@@ -444,6 +445,8 @@ public function testSaveExisting()
             ->expects($this->once())
             ->method('toNestedArray')
             ->will($this->returnValue($this->productData));
+        $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
+
         $this->assertEquals($this->productMock, $this->model->save($this->productMock));
     }
 
@@ -462,6 +465,8 @@ public function testSaveNew()
             ->expects($this->once())
             ->method('toNestedArray')
             ->will($this->returnValue($this->productData));
+        $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
+
         $this->assertEquals($this->productMock, $this->model->save($this->productMock));
     }
 
@@ -484,6 +489,8 @@ public function testSaveUnableToSaveException()
             ->expects($this->once())
             ->method('toNestedArray')
             ->will($this->returnValue($this->productData));
+        $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
+
         $this->model->save($this->productMock);
     }
 
@@ -507,6 +514,8 @@ public function testSaveException()
             ->expects($this->once())
             ->method('toNestedArray')
             ->will($this->returnValue($this->productData));
+        $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
+
         $this->model->save($this->productMock);
     }
 
@@ -528,6 +537,8 @@ public function testSaveInvalidProductException()
             ->expects($this->once())
             ->method('toNestedArray')
             ->will($this->returnValue($this->productData));
+        $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
+
         $this->model->save($this->productMock);
     }
 
@@ -732,6 +743,8 @@ public function testSaveExistingWithOptions(array $newOptions, array $existingOp
             ->method('setProductOptions')
             ->with($expectedData);
 
+        $this->initializedProductMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
+
         $this->assertEquals($this->initializedProductMock, $this->model->save($this->productMock));
     }
 
@@ -963,6 +976,7 @@ public function testSaveWithLinks(array $newLinks, array $existingLinks, array $
                 $outputLinks[] = $outputLink;
             }
         }
+        $this->initializedProductMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
 
         $results = $this->model->save($this->initializedProductMock);
         $this->assertEquals($this->initializedProductMock, $results);
@@ -1131,6 +1145,7 @@ public function testSaveExistingWithNewMediaGalleryEntries()
                     'media_type' => 'media_type',
                 ]
             );
+        $this->initializedProductMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
 
         $this->model->save($this->productMock);
     }
@@ -1206,6 +1221,7 @@ public function testSaveExistingWithMediaGalleryEntries()
         $galleryAttributeBackendMock->expects($this->once())
             ->method('setMediaAttribute')
             ->with($this->initializedProductMock, ['image', 'small_image'], 'filename1');
+        $this->initializedProductMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
 
         $this->model->save($this->productMock);
         $this->assertEquals($expectedResult, $this->initializedProductMock->getMediaGallery('images'));