[Magento Community Engineering] Community Contributions - 2.4-develop-fast-lane-prs

 - merged with '2.4-develop-prs' branch

Author: magento-engcom-team

app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php

@@ -85,10 +85,16 @@ public function execute($id = null)
         $ids = [$id];
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
 
+        $storeIds = $this->getAssignedStoreIdsOfProduct($id);
+
         $stores = $this->_storeManager->getStores();
         foreach ($stores as $store) {
             $tableExists = $this->_isFlatTableExists($store->getId());
             if ($tableExists) {
+                if (!in_array($store->getId(), $storeIds)) {
+                    $this->flatItemEraser->deleteProductsFromStore($id, $store->getId());
+                    continue;
+                }
                 $this->flatItemEraser->removeDeletedProducts($ids, $store->getId());
                 $this->flatItemEraser->removeDisabledProducts($ids, $store->getId());
             }
@@ -129,4 +135,23 @@ public function execute($id = null)
 
         return $this;
     }
+
+    /**
+     * Get list store id where the product is enable
+     *
+     * @param int $productId
+     * @return array
+     */
+    private function getAssignedStoreIdsOfProduct($productId)
+    {
+        $select = $this->_connection->select();
+        $select->from(['e' => $this->_productIndexerHelper->getTable('store')], ['e.store_id'])
+            ->where('c.product_id = ' . $productId)
+            ->joinLeft(
+                ['c' => $this->_productIndexerHelper->getTable('catalog_product_website')],
+                'e.website_id = c.website_id',
+                []
+            );
+        return $this->_connection->fetchCol($select);
+    }
 }

app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php

@@ -160,8 +160,24 @@ public function testExecuteWithExistingFlatTablesCreatesTables()
             ->willReturn('store_flat_table');
         $this->connection->expects($this->any())->method('isTableExists')->with('store_flat_table')
             ->willReturn(true);
+        $this->connection->expects($this->any())->method('fetchCol')
+            ->willReturn(['store_id_1']);
         $this->flatItemEraser->expects($this->once())->method('removeDeletedProducts');
         $this->flatTableBuilder->expects($this->never())->method('build')->with('store_id_1', ['product_id_1']);
         $this->model->execute('product_id_1');
     }
+
+    public function testExecuteWithExistingFlatTablesRemoveProductFromStore()
+    {
+        $this->productIndexerHelper->expects($this->any())->method('getFlatTableName')
+            ->willReturn('store_flat_table');
+        $this->connection->expects($this->any())->method('isTableExists')->with('store_flat_table')
+            ->willReturn(true);
+        $this->connection->expects($this->any())->method('fetchCol')
+            ->willReturn([1]);
+        $this->flatItemEraser->expects($this->once())->method('deleteProductsFromStore');
+        $this->flatItemEraser->expects($this->never())->method('removeDeletedProducts');
+        $this->flatTableBuilder->expects($this->never())->method('build')->with('store_id_1', ['product_id_1']);
+        $this->model->execute('product_id_1');
+    }
 }

app/code/Magento/Quote/Model/Cart/CartTotalRepository.php

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Quote\Model\Cart;
 
 use Magento\Quote\Api;
@@ -12,9 +15,11 @@
 use Magento\Framework\Api\ExtensibleDataInterface;
 use Magento\Quote\Model\Cart\Totals\ItemConverter;
 use Magento\Quote\Api\CouponManagementInterface;
+use Magento\Quote\Api\Data\TotalsInterface as QuoteTotalsInterface;
 
 /**
  * Cart totals data object.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CartTotalRepository implements CartTotalRepositoryInterface
@@ -79,11 +84,8 @@ public function __construct(
 
     /**
      * @inheritdoc
-     *
-     * @param int $cartId The cart ID.
-     * @return Totals Quote totals data.
      */
-    public function get($cartId)
+    public function get($cartId): QuoteTotalsInterface
     {
         /** @var \Magento\Quote\Model\Quote $quote */
         $quote = $this->quoteRepository->getActive($cartId);
@@ -96,17 +98,14 @@ public function get($cartId)
         }
         unset($addressTotalsData[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]);
 
-        /** @var \Magento\Quote\Api\Data\TotalsInterface $quoteTotals */
+        /** @var QuoteTotalsInterface $quoteTotals */
         $quoteTotals = $this->totalsFactory->create();
         $this->dataObjectHelper->populateWithArray(
             $quoteTotals,
             $addressTotalsData,
-            \Magento\Quote\Api\Data\TotalsInterface::class
+            QuoteTotalsInterface::class
         );
-        $items = [];
-        foreach ($quote->getAllVisibleItems() as $index => $item) {
-            $items[$index] = $this->itemConverter->modelToDataObject($item);
-        }
+        $items = array_map([$this->itemConverter, 'modelToDataObject'], $quote->getAllVisibleItems());
         $calculatedTotals = $this->totalsConverter->process($addressTotals);
         $quoteTotals->setTotalSegments($calculatedTotals);