ACP2E-1388:Bundle Products Not Combining Simple Product Prices When Set to Dynamic Pricing

 fixed CR feedback

Author: aplapana

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

@@ -7,9 +7,9 @@
 
 namespace Magento\Bundle\Model\Plugin;
 
+use Magento\Bundle\Model\Link;
 use Magento\Bundle\Model\Product\Price;
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
@@ -38,11 +38,6 @@ class ProductPriceIndexModifier
      */
     private MetadataPool $metadataPool;
 
-    /**
-     * @var ProductRepositoryInterface
-     */
-    private ProductRepositoryInterface $productRepository;
-
     /**
      * @var string
      */
@@ -52,22 +47,18 @@ class ProductPriceIndexModifier
      * @param StockConfigurationInterface $stockConfiguration
      * @param ResourceConnection $resourceConnection
      * @param MetadataPool $metadataPool
-     * @param ProductRepositoryInterface|null $productRepository
      * @param string $connectionName
      */
     public function __construct(
         StockConfigurationInterface $stockConfiguration,
         ResourceConnection $resourceConnection,
         MetadataPool $metadataPool,
-        ?ProductRepositoryInterface $productRepository = null,
         string $connectionName = 'indexer'
     ) {
         $this->stockConfiguration = $stockConfiguration;
         $this->resourceConnection = $resourceConnection;
         $this->metadataPool = $metadataPool;
         $this->connectionName = $connectionName;
-        $this->productRepository = $productRepository ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(ProductRepositoryInterface::class);
     }
 
     /**
@@ -110,28 +101,45 @@ private function filterProductsFromDynamicPriceBundle(string $priceTableName, ar
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         $connection = $this->resourceConnection->getConnection($this->connectionName);
         $select = $connection->select();
-        $select->from(['selection' => $this->resourceConnection->getTableName('catalog_product_bundle_selection')]);
-        $select->columns(['product.entity_id AS bundle_id', 'selection.product_id AS child_product_id']);
+        $select->from(['selection' => $this->resourceConnection->getTableName('catalog_product_bundle_selection')],
+            [
+                'product.entity_id AS bundle_id',
+                'selection.product_id AS child_product_id',
+                'pei.value AS bundle_price_type'
+            ]
+        );
         $select->joinInner(
             ['price' => $this->resourceConnection->getTableName($priceTableName)],
-            implode(' AND ', ['price.entity_id = selection.product_id'])
+            implode(' AND ', ['price.entity_id = selection.product_id']),
+            null
         );
         $select->joinInner(
             ['product' => $this->resourceConnection->getTableName('catalog_product_entity')],
-            "product.$linkField = selection.parent_product_id"
+            "product.$linkField = selection.parent_product_id",
+            null
+        );
+        $select->joinInner(
+            ['pei' => $this->resourceConnection->getTableName('catalog_product_entity_int')],
+            "product.$linkField = pei.$linkField",
+            null
+        );
+        $select->joinInner(
+            ['ea' => $this->resourceConnection->getTableName('eav_attribute')],
+            "pei.attribute_id = ea.attribute_id AND ea.attribute_code = '" . Link::KEY_PRICE_TYPE . "'",
+            null
         );
         $select->where('selection.product_id IN (?)', $productIds);
         $select->where('product.type_id = ?', Type::TYPE_BUNDLE);
+        $select->group('selection.product_id');
         $bundleProducts = $connection->fetchAll($select);
 
         if (empty($bundleProducts)) {
-            return [];
+            return $productIds;
         }
 
         $filteredProducts = [];
-        foreach ($bundleProducts as $bundle) {
-            $bundleProduct = $this->productRepository->getById($bundle['bundle_id']);
-            if ($bundleProduct->getPriceType() != Price::PRICE_TYPE_DYNAMIC) {
+        foreach($bundleProducts as $bundle) {
+            if ($bundle['bundle_price_type'] !== Price::PRICE_TYPE_DYNAMIC) {
                 $filteredProducts[] = $bundle['child_product_id'];
             }
         }

app/code/Magento/Bundle/Test/Unit/Model/Plugin/ProductPriceIndexModifierTest.php

@@ -50,11 +50,6 @@ class ProductPriceIndexModifierTest extends TestCase
      */
     private IndexTableStructure $table;
 
-    /**
-     * @var ProductRepositoryInterface|ProductRepositoryInterface&MockObject|MockObject
-     */
-    private ProductRepositoryInterface $productRepository;
-
     /**
      * @var ProductPriceIndexFilter|MockObject
      */
@@ -67,12 +62,10 @@ protected function setUp(): void
         $this->subject = $this->createMock(ProductPriceIndexFilter::class);
         $this->resourceConnection = $this->createMock(ResourceConnection::class);
         $this->metadataPool = $this->createMock(MetadataPool::class);
-        $this->productRepository = $this->createMock(ProductRepositoryInterface::class);
         $this->plugin = new ProductPriceIndexModifier(
             $this->stockConfiguration,
             $this->resourceConnection,
             $this->metadataPool,
-            $this->productRepository,
             self::CONNECTION_NAME
         );
     }
@@ -101,10 +94,11 @@ public function testAroundModifyPriceFilteredEntities()
         $select = $this->createMock(Select::class);
         $select->expects($this->once())
             ->method('from');
-        $select->expects($this->exactly(2))
+        $select->expects($this->exactly(4))
             ->method('joinInner');
         $select->expects($this->exactly(2))
             ->method('where');
+        $select->expects($this->once())->method('group')->with('selection.product_id');
         $connection = $this->createMock(AdapterInterface::class);
         $connection->expects($this->once())
             ->method('select')
@@ -115,42 +109,27 @@ public function testAroundModifyPriceFilteredEntities()
             ->willReturn([
                 [
                     'bundle_id' => 1,
-                    'child_product_id' => 1
+                    'child_product_id' => 1,
+                    'bundle_price_type' => 0
                 ],
                 [
                     'bundle_id' => 1,
-                    'child_product_id' => 2
+                    'child_product_id' => 2,
+                    'bundle_price_type' => 1
                 ]
             ]);
         $this->resourceConnection->expects($this->once())
             ->method('getConnection')
             ->with(self::CONNECTION_NAME)
             ->willReturn($connection);
 
-        $bundleProduct1 = $this->getMockBuilder(ProductInterface::class)
-            ->disableOriginalConstructor()
-            ->addMethods(['getPriceType'])
-            ->getMockForAbstractClass();
-        $bundleProduct1->expects($this->once())->method('getPriceType')
-            ->willReturn(1);
-        $bundleProduct2 = $this->getMockBuilder(ProductInterface::class)
-            ->disableOriginalConstructor()
-            ->addMethods(['getPriceType'])
-            ->getMockForAbstractClass();
-        $bundleProduct2->expects($this->once())->method('getPriceType')
-            ->willReturn(1);
-
-        $this->productRepository->expects($this->exactly(2))
-            ->method('getById')
-            ->willReturnOnConsecutiveCalls($bundleProduct1, $bundleProduct2);
-
         $calledPriceTable = '';
         $calledEntities = [];
         $callable = function () use (&$calledPriceTable, &$calledEntities, $priceTableName, $entities) {
             $calledPriceTable = $priceTableName;
             $calledEntities = $entities;
         };
-        $this->plugin->aroundModifyPrice($this->subject, $callable, $this->table, [1, 2]);
+        $this->plugin->aroundModifyPrice($this->subject, $callable, $this->table, $entities);
         $this->assertSame($calledPriceTable, $priceTableName);
         $this->assertSame($calledEntities, $entities);
     }