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

Author: le0n4eg

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

@@ -147,21 +147,6 @@ public function resetJoinQuotes($quotesTableName, $productId = null)
         return $this;
     }
 
-    /**
-     * Join product entities to select existing products items only
-     *
-     * @return void
-     */
-    protected function _beforeLoad()
-    {
-        parent::_beforeLoad();
-        $this->join(
-            ['cpe' => $this->getResource()->getTable('catalog_product_entity')],
-            "cpe.entity_id = main_table.product_id",
-            []
-        );
-    }
-
     /**
      * After load processing
      *
@@ -171,16 +156,29 @@ protected function _afterLoad()
     {
         parent::_afterLoad();
 
-        /**
-         * Assign parent items
-         */
+        $productIds = [];
         foreach ($this as $item) {
+            // Assign parent items
             if ($item->getParentItemId()) {
                 $item->setParentItem($this->getItemById($item->getParentItemId()));
             }
             if ($this->_quote) {
                 $item->setQuote($this->_quote);
             }
+            // Collect quote products ids
+            $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());
+            }
         }
 
         /**

dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php

@@ -8,18 +8,22 @@
 use Magento\Catalog\Model\Product\Type;
 use Magento\TestFramework\Helper\Bootstrap;
 
+/**
+ * Class for testing QuoteManagement model
+ */
 class QuoteManagementTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Create order with product that has child items
      *
+     * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Sales/_files/quote_with_bundle.php
      */
     public function testSubmit()
     {
         /**
          * Preconditions:
-         * Load quote with Bundle product that has at least to child products
+         * Load quote with Bundle product that has at least two child products
          */
         $objectManager = Bootstrap::getObjectManager();
         /** @var \Magento\Quote\Model\Quote $quote */
@@ -28,8 +32,11 @@ public function testSubmit()
 
         /** Execute SUT */
         /** @var \Magento\Quote\Api\CartManagementInterface $model */
-        $model = $objectManager->create(\Magento\Quote\Api\CartManagementInterface::class);
-        $order = $model->submit($quote);
+        $cartManagement = $objectManager->create(\Magento\Quote\Api\CartManagementInterface::class);
+        /** @var \Magento\Sales\Api\OrderRepositoryInterface $orderRepository */
+        $orderRepository = $objectManager->create(\Magento\Sales\Api\OrderRepositoryInterface::class);
+        $orderId = $cartManagement->placeOrder($quote->getId());
+        $order = $orderRepository->get($orderId);
 
         /** Check if SUT caused expected effects */
         $orderItems = $order->getItems();
@@ -41,4 +48,45 @@ public function testSubmit()
             }
         }
     }
+
+    /**
+     * Create order with product that has child items and one of them was deleted
+     *
+     * @magentoAppArea adminhtml
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Sales/_files/quote_with_bundle.php
+     */
+    public function testSubmitWithDeletedItem()
+    {
+        /**
+         * Preconditions:
+         * Load quote with Bundle product that have at least to child products
+         */
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get('simple-2');
+        $productRepository->delete($product);
+        /** @var \Magento\Quote\Model\Quote $quote */
+        $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+        $quote->load('test01', 'reserved_order_id');
+
+        /** Execute SUT */
+        /** @var \Magento\Quote\Api\CartManagementInterface $model */
+        $cartManagement = $objectManager->create(\Magento\Quote\Api\CartManagementInterface::class);
+        /** @var \Magento\Sales\Api\OrderRepositoryInterface $orderRepository */
+        $orderRepository = $objectManager->create(\Magento\Sales\Api\OrderRepositoryInterface::class);
+        $orderId = $cartManagement->placeOrder($quote->getId());
+        $order = $orderRepository->get($orderId);
+
+        /** Check if SUT caused expected effects */
+        $orderItems = $order->getItems();
+        $this->assertCount(2, $orderItems);
+        foreach ($orderItems as $orderItem) {
+            if ($orderItem->getProductType() == Type::TYPE_SIMPLE) {
+                $this->assertNotEmpty($orderItem->getParentItem(), 'Parent is not set for child product');
+                $this->assertNotEmpty($orderItem->getParentItemId(), 'Parent is not set for child product');
+            }
+        }
+    }
 }

dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_bundle_rollback.php

@@ -4,25 +4,29 @@
  * See COPYING.txt for license details.
  */
 
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 /** @var \Magento\Framework\Registry $registry */
-$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
+// Delete quote
 /** @var $quote \Magento\Quote\Model\Quote */
-$quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
 $quote->load('test01', 'reserved_order_id');
 if ($quote->getId()) {
     $quote->delete();
 }
-
-/** @var $product \Magento\Catalog\Model\Product */
-$productIds = [1, 2, 3];
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-foreach ($productIds as $productId) {
-    $product->load($productId);
-    if ($product->getId()) {
-        $product->delete();
+// Delete products
+$productSkus = ['simple-1', 'simple-2', 'bundle-product'];
+/** @var Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(Magento\Catalog\Api\ProductRepositoryInterface::class);
+foreach ($productSkus as $sku) {
+    try {
+        $product = $productRepository->get($sku, false, null, true);
+        $productRepository->delete($product);
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
     }
 }