MAGETWO-45311: Remove dependency on Website for Cataloginventory

 - Some fixes for web-api

Author: aohorodnyk

dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/LowStockItemsTest.php

@@ -26,7 +26,7 @@ class LowStockItemsTest extends WebapiAbstract
      */
     public function testGetLowStockItems($qty, $currentPage, $pageSize, $result)
     {
-        $requestData = ['websiteId' => 1, 'qty' => $qty, 'pageSize' => $pageSize, 'currentPage' => $currentPage];
+        $requestData = ['qty' => $qty, 'pageSize' => $pageSize, 'currentPage' => $currentPage];
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($requestData),
@@ -58,15 +58,13 @@ public function getLowStockItemsDataProvider()
                     'items' => [
                         [
                             'product_id' => 10,
-                            'website_id' => 1,
                             'stock_id' => 1,
                             'qty' => 100,
                             'stock_status' => null,
                             'stock_item' => null,
                         ],
                         [
                             'product_id' => 12,
-                            'website_id' => 1,
                             'stock_id' => 1,
                             'qty' => 140,
                             'stock_status' => null,

dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/ProductRepositoryInterfaceTest.php

@@ -21,7 +21,6 @@ class ProductRepositoryInterfaceTest extends WebapiAbstract
     const KEY_QTY = StockStatusInterface::QTY;
     const KEY_ITEM_ID = 'item_id';
     const KEY_PRODUCT_ID = StockStatusInterface::PRODUCT_ID;
-    const KEY_WEBSITE_ID = StockStatusInterface::WEBSITE_ID;
     const KEY_CUSTOM_ATTRIBUTES = 'custom_attributes';
     const KEY_ATTRIBUTE_CODE = \Magento\Eav\Api\Data\AttributeInterface::ATTRIBUTE_CODE;
     const CODE_QUANTITY_AND_STOCK_STATUS = 'quantity_and_stock_status';
@@ -38,7 +37,6 @@ public function testCatalogInventory()
         $productData = $this->getSimpleProductData($qty);
         $stockItemData = $this->getStockItemData($qty);
         $this->assertArrayNotHasKey(self::KEY_ITEM_ID, $stockItemData);
-        $this->assertArrayNotHasKey(self::KEY_WEBSITE_ID, $stockItemData);
         $this->assertArrayNotHasKey(self::KEY_PRODUCT_ID, $stockItemData);
         $productData[self::KEY_EXTENSION_ATTRIBUTES] = $stockItemData;
 
@@ -51,7 +49,6 @@ public function testCatalogInventory()
         $this->assertEquals($qty, $returnedQty, 'CREATE: Expected qty to be same: ' . $qty .', '. $returnedQty);
         $this->assertArrayHasKey(self::KEY_ITEM_ID, $stockItemData);
         $this->assertArrayHasKey(self::KEY_PRODUCT_ID, $stockItemData);
-        $this->assertArrayHasKey(self::KEY_WEBSITE_ID, $stockItemData);
 
         // officially get the product
         $response = $this->getProduct($productData[ProductInterface::SKU]);
@@ -100,7 +97,6 @@ public function testCatalogInventoryWithBogusData()
         $productData = $this->getSimpleProductData($qty);
         $stockItemData = $this->getStockItemData($qty);
         $this->assertArrayNotHasKey(self::KEY_ITEM_ID, $stockItemData);
-        $this->assertArrayNotHasKey(self::KEY_WEBSITE_ID, $stockItemData);
         $this->assertArrayNotHasKey(self::KEY_PRODUCT_ID, $stockItemData);
         $productData[self::KEY_EXTENSION_ATTRIBUTES] = $stockItemData;
 
@@ -113,7 +109,6 @@ public function testCatalogInventoryWithBogusData()
         $this->assertEquals($qty, $returnedQty, 'POST 1: Expected qty to be same: ' . $qty .', '. $returnedQty);
         $this->assertArrayHasKey(self::KEY_ITEM_ID, $stockItemData);
         $this->assertArrayHasKey(self::KEY_PRODUCT_ID, $stockItemData);
-        $this->assertArrayHasKey(self::KEY_WEBSITE_ID, $stockItemData);
 
         // re-save the catalog inventory:
         // -- update quantity (which should be honored)
@@ -126,9 +121,7 @@ public function testCatalogInventoryWithBogusData()
         $bogusProductId = $this->getDifferent($originalProductId);
         $response[self::KEY_EXTENSION_ATTRIBUTES][self::KEY_STOCK_ITEM][self::KEY_PRODUCT_ID] = $bogusProductId;
 
-        $originalWebsiteId = $stockItemData[self::KEY_WEBSITE_ID];
         $bogusWebsiteId = $this->getDifferent($originalWebsiteId);
-        $response[self::KEY_EXTENSION_ATTRIBUTES][self::KEY_STOCK_ITEM][self::KEY_WEBSITE_ID] = $bogusWebsiteId;
 
         $response = $this->saveProduct($response);
 
@@ -139,7 +132,6 @@ public function testCatalogInventoryWithBogusData()
         $returnedProductId = $stockItemData[self::KEY_PRODUCT_ID];
         $this->assertEquals($originalProductId, $returnedProductId);
 
-        $returnedWebsiteId = $stockItemData[self::KEY_WEBSITE_ID];
         $this->assertEquals($originalWebsiteId, $returnedWebsiteId);
 
         // delete the product; expect that all goes well
@@ -165,7 +157,6 @@ public function testSimpleProductCreationWithoutSpecifyingCatalogInventory()
         $stockItemData = $response[self::KEY_EXTENSION_ATTRIBUTES][self::KEY_STOCK_ITEM];
         $this->assertArrayHasKey(self::KEY_ITEM_ID, $stockItemData);
         $this->assertArrayHasKey(self::KEY_PRODUCT_ID, $stockItemData);
-        $this->assertArrayHasKey(self::KEY_WEBSITE_ID, $stockItemData);
 
         // delete the product; expect that all goes well
         $response = $this->deleteProduct($productData[ProductInterface::SKU]);

dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/StockItemTest.php

@@ -136,7 +136,6 @@ public function saveStockItemBySkuWithWrongInputDataProvider()
                     'item_id' => 222,
                     'product_id' => 222,
                     'stock_id' => 1,
-                    'website_id' => 1,
                     'qty' => '111.0000',
                     'min_qty' => '0.0000',
                     'use_config_min_qty' => 1,
@@ -186,13 +185,11 @@ public function saveStockItemBySkuWithWrongInputDataProvider()
                     'use_config_enable_qty_inc' => '1',
                     'enable_qty_increments' => '0',
                     'is_decimal_divided' => '0',
-                    'website_id' => '1',
                     'type_id' => 'simple',
                 ],
                 [
                     'item_id' => 1,
                     'product_id' => 10,
-                    'website_id' => 1,
                     'stock_id' => 1,
                     'qty' => 100,
                     'is_in_stock' => 1,