ACP2E-1388, refactor solution using an interceptor

Author: aplapana

app/code/Magento/Bundle/etc/di.xml

@@ -96,6 +96,9 @@
     <type name="Magento\Sales\Model\Order\Item">
         <plugin name="bundle" type="Magento\Bundle\Model\Sales\Order\Plugin\Item" sortOrder="100" />
     </type>
+    <type name="Magento\CatalogInventory\Model\Indexer\ProductPriceIndexFilter">
+        <plugin name="price_modifier" type="Magento\Bundle\Model\Plugin\ProductPriceIndexModifier" sortOrder="100" />
+    </type>
     <type name="Magento\Framework\EntityManager\Operation\ExtensionPool">
         <arguments>
             <argument name="extensionActions" xsi:type="array">

app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php

@@ -121,9 +121,7 @@ public function modifyPrice(IndexTableStructure $priceTable, array $entityIds =
         foreach ($batchSelectIterator as $select) {
             $productIds = null;
             foreach ($connection->query($select)->fetchAll() as $row) {
-                if ($row['product_id'] &&
-                    $this->isWithinDynamicPriceBundle($priceTable->getTableName(), (int) $row['product_id'])
-                ) {
+                if ($row['product_id']) {
                     $productIds[] = (int) $row['product_id'];
                 }
             }
@@ -133,33 +131,4 @@ public function modifyPrice(IndexTableStructure $priceTable, array $entityIds =
             }
         }
     }
-
-    /**
-     * Check if the product is part of a dynamic price bundle configuration
-     *
-     * @param string $priceTableName
-     * @param int $productId
-     * @return bool
-     */
-    private function isWithinDynamicPriceBundle(string $priceTableName, int $productId): bool
-    {
-        $connection = $this->resourceConnection->getConnection($this->connectionName);
-        $select = $connection->select();
-        $select->from(['selection' => 'catalog_product_bundle_selection'], 'selection_id');
-        $select->joinInner(
-            ['entity' => 'catalog_product_entity'],
-            implode(' AND ', ['selection.parent_product_id = entity.entity_id']),
-            null
-        );
-        $select->joinInner(
-            ['price' => $priceTableName],
-            implode(' AND ', ['price.entity_id = selection.product_id']),
-            null
-        );
-        $select->where('selection.product_id = ?', $productId);
-        $select->where('entity.type_id = ?', \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE);
-        $select->where('price.tax_class_id = ?', \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC);
-
-        return (int) $connection->fetchOne($select) != 0;
-    }
 }

app/code/Magento/CatalogInventory/composer.json

@@ -13,8 +13,7 @@
         "magento/module-eav": "*",
         "magento/module-quote": "*",
         "magento/module-store": "*",
-        "magento/module-ui": "*",
-        "magento/module-bundle": "*"
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
     "license": [