Merge remote-tracking branch 'l3/ACP2E-2257' into Tier4-PR-Delivery-12-1-23

Author: veloraven

app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php

@@ -316,6 +316,9 @@ public function getNewEmptyItem()
     public function addPriceFilter($product, $searchMin, $useRegularPrice = false)
     {
         if ($product->getPriceType() == \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC) {
+            if (!$this->getStoreId()) {
+                $this->setStoreId($this->_storeManager->getStore()->getId());
+            }
             $this->addPriceData();
             if ($useRegularPrice) {
                 $minimalPriceExpression = self::INDEX_TABLE_ALIAS . '.price';

dev/tests/integration/testsuite/Magento/Bundle/Model/ResourceModel/Selection/CollectionTest.php

@@ -0,0 +1,109 @@
+<?php
+/************************************************************************
+ *
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ************************************************************************
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Model\ResourceModel\Selection;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class CollectionTest extends \Magento\Bundle\Model\Product\BundlePriceAbstract
+{
+    /**
+     * @var CollectionFactory
+     */
+    protected $collectionFactory;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->collectionFactory = Bootstrap::getObjectManager()->create(CollectionFactory::class);
+    }
+
+    /**
+     * @magentoIndexerDimensionMode catalog_product_price website
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation disabled
+     * @group indexer_dimension
+     * @dataProvider getTestCases
+     */
+    public function testAddPriceDataWithIndexerDimensionMode(array $strategy, int $expectedCount)
+    {
+        $this->prepareFixture($strategy, 'bundle_product');
+
+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get('bundle_product', false, null, true);
+
+        /** @var Collection $collection */
+        $collection = $this->collectionFactory->create();
+        $collection->setStoreId(0);
+        $collection->addPriceFilter($product, true);
+        $items = $collection->getItems();
+
+        $this->assertCount($expectedCount, $items);
+    }
+
+    public function getTestCases()
+    {
+        return [
+            'Dynamic bundle product with three Simple products' => [
+                'variation' => $this->getBundleConfiguration(),
+                'expectedCount' => 1
+            ]
+        ];
+    }
+
+    private function getBundleConfiguration()
+    {
+        $optionsData = [
+            [
+                'title' => 'op1',
+                'required' => true,
+                'type' => 'checkbox',
+                'links' => [
+                    [
+                        'sku' => 'simple1',
+                        'qty' => 3,
+                        'price' => 100,
+                        'price_type' => 0,
+                    ],
+                    [
+                        'sku' => 'simple2',
+                        'qty' => 2,
+                        'price' => 100,
+                        'price_type' => 0,
+                    ],
+                    [
+                        'sku' => 'simple3',
+                        'qty' => 1,
+                        'price' => 100,
+                        'price_type' => 0,
+                    ],
+                ]
+            ]
+        ];
+
+        return [
+            [
+                'modifierName' => 'addSimpleProduct',
+                'data' => [$optionsData]
+            ],
+        ];
+    }
+}