MAGETWO-83169: Loaded quote items collection contains removed product items

Author: le0n4eg

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

@@ -169,18 +169,7 @@ protected function _afterLoad()
             $productIds[] = (int)$item->getProductId();
         }
         $this->_productIds = array_merge($this->_productIds, $productIds);
-        $productCollection = $this->_productCollectionFactory->create()->addIdFilter($this->_productIds);
-        $existingProductsIds = $productCollection->getAllIds();
-        $absentProductsIds = array_diff($this->_productIds, $existingProductsIds);
-        // Remove not existing products from items collection
-        if (!empty($absentProductsIds)) {
-            foreach ($absentProductsIds as $productIdToExclude) {
-                /** @var \Magento\Quote\Model\Quote\Item $quoteItem */
-                $quoteItem = $this->getItemByColumnValue('product_id', $productIdToExclude);
-                $this->removeItemByKey($quoteItem->getId());
-            }
-        }
-
+        $this->removeItemsWithAbsentProducts();
         /**
          * Assign options and products
          */
@@ -218,12 +207,6 @@ protected function _assignOptions()
     protected function _assignProducts()
     {
         \Magento\Framework\Profiler::start('QUOTE:' . __METHOD__, ['group' => 'QUOTE', 'method' => __METHOD__]);
-        $productIds = [];
-        foreach ($this as $item) {
-            $productIds[] = (int)$item->getProductId();
-        }
-        $this->_productIds = array_merge($this->_productIds, $productIds);
-
         $productCollection = $this->_productCollectionFactory->create()->setStoreId(
             $this->getStoreId()
         )->addIdFilter(
@@ -318,4 +301,24 @@ private function addTierPriceData(ProductCollection $productCollection)
             $productCollection->addTierPriceDataByGroupId($this->_quote->getCustomerGroupId());
         }
     }
+
+    /**
+     * Find and remove quote items with non existing products
+     *
+     * @return void
+     */
+    private function removeItemsWithAbsentProducts()
+    {
+        $productCollection = $this->_productCollectionFactory->create()->addIdFilter($this->_productIds);
+        $existingProductsIds = $productCollection->getAllIds();
+        $absentProductsIds = array_diff($this->_productIds, $existingProductsIds);
+        // Remove not existing products from items collection
+        if (!empty($absentProductsIds)) {
+            foreach ($absentProductsIds as $productIdToExclude) {
+                /** @var \Magento\Quote\Model\Quote\Item $quoteItem */
+                $quoteItem = $this->getItemByColumnValue('product_id', $productIdToExclude);
+                $this->removeItemByKey($quoteItem->getId());
+            }
+        }
+    }
 }