MAGETWO-58345: [Github] Product dissapear from cart when "out of stock"

Author: viktym

app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Quote\Model\ResourceModel\Quote\Item;
 
+use \Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+
 /**
  * Quote item resource collection
  *
@@ -213,9 +215,10 @@ protected function _assignProducts()
             $this->_productIds
         )->addAttributeToSelect(
             $this->_quoteConfig->getProductAttributes()
-        )->addOptionsToResult()->addStoreFilter()->addUrlRewrite();
-
-        $productCollection = $this->addTierPriceData($productCollection);
+        );
+        $this->skipStockStatusFilter($productCollection);
+        $productCollection->addOptionsToResult()->addStoreFilter()->addUrlRewrite();
+        $this->addTierPriceData($productCollection);
 
         $this->_eventManager->dispatch(
             'prepare_catalog_product_collection_prices',
@@ -273,19 +276,31 @@ protected function _assignProducts()
         return $this;
     }
 
+    /**
+     * Prevents adding stock status filter to the collection of products.
+     *
+     * @param ProductCollection $productCollection
+     * @return void
+     *
+     * @see \Magento\CatalogInventory\Helper\Stock::addIsInStockFilterToCollection
+     */
+    private function skipStockStatusFilter(ProductCollection $productCollection)
+    {
+        $productCollection->setFlag('has_stock_status_filter', true);
+    }
+
     /**
      * Add tier prices to product collection.
      *
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection
-     * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
+     * @param ProductCollection $productCollection
+     * @return void
      */
-    private function addTierPriceData(\Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection)
+    private function addTierPriceData(ProductCollection $productCollection)
     {
         if (empty($this->_quote)) {
             $productCollection->addTierPriceData();
         } else {
             $productCollection->addTierPriceDataByGroupId($this->_quote->getCustomerGroupId());
         }
-        return $productCollection;
     }
 }

dev/tests/integration/testsuite/Magento/Checkout/Block/Cart/AbstractCartTest.php

@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Block\Cart;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
+use Magento\CatalogInventory\Model\StockRegistryProvider;
+use Magento\Checkout\Model\Session;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class AbstractCartTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Tests that product in shopping cart remains visible even after it becomes out of stock.
+     *
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     */
+    public function testProductsOutOfStockIsVisibleInShoppingCart()
+    {
+        $productSku = 'simple';
+        $reservedOrderId = 'test01';
+        $objectManager = Bootstrap::getObjectManager();
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($productSku);
+
+        $this->setProductOutOfStock($product->getId());
+
+        $quote = $this->getStoredQuote($reservedOrderId);
+
+        $checkoutSession = $this->getMockBuilder(Session::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $checkoutSession->method('getQuote')->willReturn($quote);
+
+        $abstractCart = $objectManager->create(
+            AbstractCart::class,
+            ['checkoutSession' => $checkoutSession]
+        );
+
+        $items = array_filter(
+            $abstractCart->getItems(),
+            function (\Magento\Quote\Model\Quote\Item $item) use ($productSku) {
+                return $item->getSku() === $productSku;
+            }
+        );
+
+        $this->assertNotEmpty(
+            $items,
+            'Product disappeared from shopping cart after it had become out of stock.'
+        );
+    }
+
+    /**
+     * @param int $productId
+     * @return void
+     */
+    private function setProductOutOfStock($productId)
+    {
+        /** @var $stockRegistryProvider StockRegistryProvider */
+        $stockRegistryProvider = Bootstrap::getObjectManager()->get(StockRegistryProvider::class);
+        $stockItem = $stockRegistryProvider->getStockItem($productId, 0);
+        $stockItem->setIsInStock(false);
+
+        /** @var $stockItemRepository StockItemRepositoryInterface */
+        $stockItemRepository = Bootstrap::getObjectManager()->get(StockItemRepositoryInterface::class);
+        $stockItemRepository->save($stockItem);
+    }
+
+    /**
+     * @param string $reservedOrderId
+     * @return \Magento\Quote\Api\Data\CartInterface
+     */
+    private function getStoredQuote($reservedOrderId)
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
+        $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId);
+
+        /** @var CartRepositoryInterface $cartRepository */
+        $cartRepository = Bootstrap::getObjectManager()->create(CartRepositoryInterface::class);
+        $quoteItems = $cartRepository->getList($searchCriteriaBuilder->create())->getItems();
+
+        return current($quoteItems);
+    }
+}