MAGETWO-94427: [2.3] Mini cart not getting updated if product disabled from backed

Author: rostyslav-hymon

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMiniCartSection.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontMiniCartSection">
+        <element name="quantity" type="button" selector="span.counter-number"/>
+        <element name="show" type="button" selector="a.showcart"/>
+        <element name="goToCheckout" type="button" selector="#top-cart-btn-checkout" timeout="30"/>
+    </section>
+</sections>

app/code/Magento/Quote/Model/Product/Plugin/MarkQuotesRecollectMassDisabled.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Product\Plugin;
+
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Action as ProductAction;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+
+/**
+ * Remove quote items after mass disabling products
+ */
+class MarkQuotesRecollectMassDisabled
+{
+    /** @var QuoteResource$quoteResource */
+    private $quoteResource;
+
+    /**
+     * @param QuoteResource $quoteResource
+     */
+    public function __construct(
+        QuoteResource $quoteResource
+    ) {
+        $this->quoteResource = $quoteResource;
+    }
+
+    /**
+     * Clean quote items after mass disabling product
+     *
+     * @param \Magento\Catalog\Model\Product\Action $subject
+     * @param \Magento\Catalog\Model\Product\Action $result
+     * @param int[] $productIds
+     * @param int[] $attrData
+     * @param int $storeId
+     * @return \Magento\Catalog\Model\Product\Action
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterUpdateAttributes(
+        ProductAction $subject,
+        ProductAction $result,
+        $productIds,
+        $attrData,
+        $storeId
+    ): ProductAction {
+        if (isset($attrData['status']) && $attrData['status'] === Status::STATUS_DISABLED) {
+            $this->quoteResource->markQuotesRecollect($productIds);
+        }
+
+        return $result;
+    }
+}

app/code/Magento/Quote/Model/Quote/TotalsCollector.php

@@ -103,6 +103,8 @@ public function __construct(
     }
 
     /**
+     * Collect quote totals.
+     *
      * @param \Magento\Quote\Model\Quote $quote
      * @return Address\Total
      */
@@ -115,6 +117,8 @@ public function collectQuoteTotals(\Magento\Quote\Model\Quote $quote)
     }
 
     /**
+     * Collect quote.
+     *
      * @param \Magento\Quote\Model\Quote $quote
      * @return \Magento\Quote\Model\Quote\Address\Total
      */
@@ -172,6 +176,8 @@ public function collect(\Magento\Quote\Model\Quote $quote)
     }
 
     /**
+     * Validate coupon code.
+     *
      * @param \Magento\Quote\Model\Quote $quote
      * @return $this
      */
@@ -203,11 +209,12 @@ protected function _validateCouponCode(\Magento\Quote\Model\Quote $quote)
      */
     protected function _collectItemsQtys(\Magento\Quote\Model\Quote $quote)
     {
+        $quoteItems = $quote->getAllVisibleItems();
         $quote->setItemsCount(0);
         $quote->setItemsQty(0);
         $quote->setVirtualItemsQty(0);
 
-        foreach ($quote->getAllVisibleItems() as $item) {
+        foreach ($quoteItems as $item) {
             if ($item->getParentItem()) {
                 continue;
             }
@@ -231,6 +238,8 @@ protected function _collectItemsQtys(\Magento\Quote\Model\Quote $quote)
     }
 
     /**
+     * Collect address total.
+     *
      * @param \Magento\Quote\Model\Quote $quote
      * @param Address $address
      * @return Address\Total

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

@@ -3,9 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Quote\Model\ResourceModel\Quote\Item;
 
-use \Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
+use Magento\Quote\Model\ResourceModel\Quote\Item as ResourceQuoteItem;
 
 /**
  * Quote item resource collection
@@ -50,6 +57,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      */
     private $storeManager;
 
+    /**
+     * @var bool $recollectQuote
+     */
+    private $recollectQuote = false;
+
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Psr\Log\LoggerInterface $logger
@@ -102,15 +114,15 @@ public function __construct(
      */
     protected function _construct()
     {
-        $this->_init(\Magento\Quote\Model\Quote\Item::class, \Magento\Quote\Model\ResourceModel\Quote\Item::class);
+        $this->_init(QuoteItem::class, ResourceQuoteItem::class);
     }
 
     /**
      * Retrieve store Id (From Quote)
      *
      * @return int
      */
-    public function getStoreId()
+    public function getStoreId(): int
     {
         // Fallback to current storeId if no quote is provided
         // (see https://github.com/magento/magento2/commit/9d3be732a88884a66d667b443b3dc1655ddd0721)
@@ -119,12 +131,12 @@ public function getStoreId()
     }
 
     /**
-     * Set Quote object to Collection
+     * Set Quote object to Collection.
      *
-     * @param \Magento\Quote\Model\Quote $quote
+     * @param Quote $quote
      * @return $this
      */
-    public function setQuote($quote)
+    public function setQuote($quote): self
     {
         $this->_quote = $quote;
         $quoteId = $quote->getId();
@@ -138,13 +150,15 @@ public function setQuote($quote)
     }
 
     /**
-     * Reset the collection and join it to quotes table. Optionally can select items with specified product id only.
+     * Reset the collection and inner join it to quotes table.
+     *
+     * Optionally can select items with specified product id only
      *
      * @param string $quotesTableName
      * @param int $productId
      * @return $this
      */
-    public function resetJoinQuotes($quotesTableName, $productId = null)
+    public function resetJoinQuotes($quotesTableName, $productId = null): self
     {
         $this->getSelect()->reset()->from(
             ['qi' => $this->getResource()->getMainTable()],
@@ -161,11 +175,11 @@ public function resetJoinQuotes($quotesTableName, $productId = null)
     }
 
     /**
-     * After load processing
+     * After load processing.
      *
      * @return $this
      */
-    protected function _afterLoad()
+    protected function _afterLoad(): self
     {
         parent::_afterLoad();
 
@@ -194,11 +208,11 @@ protected function _afterLoad()
     }
 
     /**
-     * Add options to items
+     * Add options to items.
      *
      * @return $this
      */
-    protected function _assignOptions()
+    protected function _assignOptions(): self
     {
         $itemIds = array_keys($this->_items);
         $optionCollection = $this->_itemOptionCollectionFactory->create()->addItemFilter($itemIds);
@@ -212,12 +226,12 @@ protected function _assignOptions()
     }
 
     /**
-     * Add products to items and item options
+     * Add products to items and item options.
      *
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    protected function _assignProducts()
+    protected function _assignProducts(): self
     {
         \Magento\Framework\Profiler::start('QUOTE:' . __METHOD__, ['group' => 'QUOTE', 'method' => __METHOD__]);
         $productCollection = $this->_productCollectionFactory->create()->setStoreId(
@@ -239,53 +253,88 @@ protected function _assignProducts()
             ['collection' => $productCollection]
         );
 
-        $recollectQuote = false;
         foreach ($this as $item) {
+            /** @var ProductInterface $product */
             $product = $productCollection->getItemById($item->getProductId());
-            if ($product) {
+            $isValidProduct = $this->isValidProduct($product);
+            $qtyOptions = [];
+            if ($isValidProduct) {
                 $product->setCustomOptions([]);
-                $qtyOptions = [];
-                $optionProductIds = [];
-                foreach ($item->getOptions() as $option) {
-                    /**
-                     * Call type-specific logic for product associated with quote item
-                     */
-                    $product->getTypeInstance()->assignProductToOption(
-                        $productCollection->getItemById($option->getProductId()),
-                        $option,
-                        $product
-                    );
-
-                    if (is_object($option->getProduct()) && $option->getProduct()->getId() != $product->getId()) {
-                        $optionProductIds[$option->getProduct()->getId()] = $option->getProduct()->getId();
-                    }
-                }
-
-                if ($optionProductIds) {
-                    foreach ($optionProductIds as $optionProductId) {
-                        $qtyOption = $item->getOptionByCode('product_qty_' . $optionProductId);
-                        if ($qtyOption) {
-                            $qtyOptions[$optionProductId] = $qtyOption;
-                        }
+                $optionProductIds = $this->getOptionProductIds($item, $product, $productCollection);
+                foreach ($optionProductIds as $optionProductId) {
+                    $qtyOption = $item->getOptionByCode('product_qty_' . $optionProductId);
+                    if ($qtyOption) {
+                        $qtyOptions[$optionProductId] = $qtyOption;
                     }
                 }
-
-                $item->setQtyOptions($qtyOptions)->setProduct($product);
             } else {
                 $item->isDeleted(true);
-                $recollectQuote = true;
+                $this->recollectQuote = true;
+            }
+            if (!$item->isDeleted()) {
+                $item->setQtyOptions($qtyOptions)->setProduct($product);
+                $item->checkData();
             }
-            $item->checkData();
         }
-
-        if ($recollectQuote && $this->_quote) {
+        if ($this->recollectQuote && $this->_quote) {
             $this->_quote->collectTotals();
         }
         \Magento\Framework\Profiler::stop('QUOTE:' . __METHOD__);
 
         return $this;
     }
 
+    /**
+     * Get product Ids from option.
+     *
+     * @param QuoteItem $item
+     * @param ProductInterface $product
+     * @param ProductCollection $productCollection
+     * @return array
+     */
+    private function getOptionProductIds(
+        QuoteItem $item,
+        ProductInterface $product,
+        ProductCollection $productCollection
+    ): array {
+        $optionProductIds = [];
+        foreach ($item->getOptions() as $option) {
+            /**
+             * Call type-specific logic for product associated with quote item
+             */
+            $product->getTypeInstance()->assignProductToOption(
+                $productCollection->getItemById($option->getProductId()),
+                $option,
+                $product
+            );
+
+            if (is_object($option->getProduct()) && $option->getProduct()->getId() != $product->getId()) {
+                $isValidProduct = $this->isValidProduct($option->getProduct());
+                if (!$isValidProduct && !$item->isDeleted()) {
+                    $item->isDeleted(true);
+                    $this->recollectQuote = true;
+                    continue;
+                }
+                $optionProductIds[$option->getProduct()->getId()] = $option->getProduct()->getId();
+            }
+        }
+
+        return $optionProductIds;
+    }
+
+    /**
+     * Check is valid product.
+     *
+     * @param ProductInterface $product
+     * @return bool
+     */
+    private function isValidProduct(ProductInterface $product): bool
+    {
+        $result = ($product && (int)$product->getStatus() !== ProductStatus::STATUS_DISABLED);
+
+        return $result;
+    }
+
     /**
      * Prevents adding stock status filter to the collection of products.
      *
@@ -294,7 +343,7 @@ protected function _assignProducts()
      *
      * @see \Magento\CatalogInventory\Helper\Stock::addIsInStockFilterToCollection
      */
-    private function skipStockStatusFilter(ProductCollection $productCollection)
+    private function skipStockStatusFilter(ProductCollection $productCollection): void
     {
         $productCollection->setFlag('has_stock_status_filter', true);
     }
@@ -304,7 +353,7 @@ private function skipStockStatusFilter(ProductCollection $productCollection)
      *
      * @return void
      */
-    private function removeItemsWithAbsentProducts()
+    private function removeItemsWithAbsentProducts(): void
     {
         if (count($this->_productIds) === 0) {
             return;