Merge pull request magento#764 from magento-engcom/msi743

"Could not receive Stock Item data" Line Appear Instead of Admin Product Grid.
fe-lix- · Mar 28, 2018 · e665fca · e665fca
2 parents 50bfa8b + 40a2beb
commit e665fca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/app/code/Magento/InventoryIndexer/Model/GetStockItemData.php b/app/code/Magento/InventoryIndexer/Model/GetStockItemData.php
@@ -58,7 +58,11 @@ public function execute(string $sku, int $stockId)
             ->where(IndexStructure::SKU . ' = ?', $sku);
 
         try {
-            return $connection->fetchRow($select) ?: null;
+            if ($connection->isTableExists($stockItemTableName)) {
+                return $connection->fetchRow($select) ?: null;
+            }
+
+            return null;
         } catch (\Exception $e) {
             throw new LocalizedException(__(
                 'Could not receive Stock Item data'

diff --git a/app/code/Magento/InventorySales/Test/Integration/GetStockItemData/GetStockItemDataTest.php b/app/code/Magento/InventorySales/Test/Integration/GetStockItemData/GetStockItemDataTest.php
@@ -48,13 +48,10 @@ public function testGetStockItemData(string $sku, int $stockId, $expectedData)
         self::assertEquals($expectedData, $stockItemData);
     }
 
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Could not receive Stock Item data
-     */
-    public function testGetStockItemDataException()
+    public function testGetStockItemDataReturnNullWhenTableDoesNotExist()
     {
-        $this->getStockItemData->execute('SKU-1', 10);
+        $stockItemData = $this->getStockItemData->execute('SKU-1', 10);
+        self::assertNull($stockItemData);
     }
 
     /**