ACP2E-1388, refactor solution using an interceptor

Author: aplapana

app/code/Magento/Bundle/Model/Plugin/ProductPriceIndexModifier.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace Magento\Bundle\Model\Plugin;
+
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
+use Magento\CatalogInventory\Model\Indexer\ProductPriceIndexFilter;
+use Magento\Framework\App\ResourceConnection;
+
+class ProductPriceIndexModifier
+{
+    /**
+     * @var ResourceConnection
+     */
+    private ResourceConnection $resourceConnection;
+
+    /**
+     * @var string|null
+     */
+    private ?string $connectionName;
+
+    public function __construct(ResourceConnection $resourceConnection, string $connectionName = 'indexer')
+    {
+        $this->resourceConnection = $resourceConnection;
+        $this->connectionName = $connectionName;
+    }
+
+
+    /**
+     * Skip entity price index that are part of a dynamic price bundle
+     *
+     * @param ProductPriceIndexFilter $subject
+     * @param callable $proceed
+     * @param IndexTableStructure $priceTable
+     * @param array $entityIds
+     */
+    public function aroundModifyPrice(ProductPriceIndexFilter $subject, callable $proceed, IndexTableStructure $priceTable, array $entityIds = [])
+    {
+        if (empty($entityIds)) {
+            $proceed($priceTable, []);
+        }
+
+        foreach ($entityIds as $id) {
+            if (!$this->isWithinDynamicPriceBundle($priceTable->getTableName(), $id)) {
+                $proceed($priceTable, [$id]);
+            }
+        }
+    }
+
+    /**
+     * 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.row_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/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']) {
-                    $productIds[] = (int) $row['product_id'];
-                }
+                $productIds[] = (int) $row['product_id'];
             }
             if ($productIds !== null) {
                 $where = [$priceTable->getEntityField() .' IN (?)' => $productIds];