ACP2E-1388, skipping price removal if product is out of stock, but part of a dynamic price bundle

Author: aplapana

app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php

@@ -86,7 +86,6 @@ public function getPriceList(Product $bundleProduct, $searchMin, $useRegularPric
             );
             $selectionsCollection->setFlag('has_stock_status_filter', true);
             $selectionsCollection->removeAttributeToSelect();
-            //$selectionsCollection->addQuantityFilter();
 
             if (!$useRegularPrice) {
                 $selectionsCollection->addAttributeToSelect('special_price');

app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php

@@ -411,7 +411,7 @@ function ($type) use ($productsTypes) {
                     $indexer->executeByDimensions($dimensions, \SplFixedArray::fromArray($entityIds, false));
                     $mainTable = $this->tableMaintainer->getMainTableByDimensions($dimensions);
                     $this->_insertFromTable($temporaryTable, $mainTable);
-                    //$this->deleteOutdatedData($entityIds, $temporaryTable, $mainTable); //here be the problem
+                    $this->deleteOutdatedData($entityIds, $temporaryTable, $mainTable);
                 }
             } else {
                 // handle 3d-party indexers for backward compatibility

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

@@ -121,12 +121,35 @@ public function modifyPrice(IndexTableStructure $priceTable, array $entityIds =
         foreach ($batchSelectIterator as $select) {
             $productIds = null;
             foreach ($connection->query($select)->fetchAll() as $row) {
-                $productIds[] = (int) $row['product_id'];
+                if ($row['product_id'] && $this->isWithinDynamicPriceBundle($priceTable->getTableName(), (int) $row['product_id'])) {
+                    $productIds[] = (int) $row['product_id'];
+                }
             }
             if ($productIds !== null) {
                 $where = [$priceTable->getEntityField() .' IN (?)' => $productIds];
                 $connection->delete($priceTable->getTableName(), $where);
             }
         }
     }
+
+    /**
+     * Check if the product is used within 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 intval($connection->fetchOne($select)) != 0;
+    }
 }