MAGETWO-55729: [Customer] Optimize performance for bundled products with lots of product options

- MAGETWO-60726: Bundle price range calculation is incorrect for products with Special Price

Author: mslabko

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

@@ -21,6 +21,11 @@ class DefaultSelectionPriceListProvider implements SelectionPriceListProviderInt
      */
     private $selectionFactory;
 
+    /**
+     * @var \Magento\Bundle\Pricing\Price\BundleSelectionPrice[]
+     */
+    private $priceList;
+
     /**
      * @param BundleSelectionFactory $bundleSelectionFactory
      */
@@ -39,7 +44,7 @@ public function getPriceList(Product $bundleProduct, $searchMin, $useRegularPric
 
         /** @var \Magento\Bundle\Model\Product\Type $typeInstance */
         $typeInstance = $bundleProduct->getTypeInstance();
-        $priceList = [];
+        $this->priceList = [];
 
         foreach ($this->getBundleOptions($bundleProduct) as $option) {
             /** @var Option $option */
@@ -54,24 +59,25 @@ public function getPriceList(Product $bundleProduct, $searchMin, $useRegularPric
             $selectionsCollection->removeAttributeToSelect();
             $selectionsCollection->addQuantityFilter();
 
+            if (!$useRegularPrice) {
+                $selectionsCollection->addAttributeToSelect('special_price');
+                $selectionsCollection->addAttributeToSelect('special_price_from');
+                $selectionsCollection->addAttributeToSelect('special_price_to');
+                $selectionsCollection->addAttributeToSelect('tax_class_id');
+            }
+
             if (!$searchMin && $option->isMultiSelection()) {
-                $priceList = array_merge(
-                    $priceList,
-                    $this->getMaximumMultiselectionPriceList($bundleProduct, $selectionsCollection, $useRegularPrice)
-                );
+                $this->addMaximumMultiSelectionPriceList($bundleProduct, $selectionsCollection, $useRegularPrice);
             } else {
-                $priceList = array_merge(
-                    $priceList,
-                    $this->getMiniMaxPriceList($bundleProduct, $selectionsCollection, $searchMin, $useRegularPrice)
-                );
+                $this->addMiniMaxPriceList($bundleProduct, $selectionsCollection, $searchMin, $useRegularPrice);
             }
         }
 
         if ($shouldFindMinOption) {
-            $priceList = $this->getMinPriceForNonRequiredOptions($priceList);
+            $this->processMinPriceForNonRequiredOptions();
         }
 
-        return $priceList;
+        return $this->priceList;
     }
 
     /**
@@ -95,31 +101,23 @@ private function isShouldFindMinOption(Product $bundleProduct, $searchMin)
     }
 
     /**
-     * Get minimum or maximum price for option
+     * Add minimum or maximum price for option
      *
      * @param Product $bundleProduct
      * @param \Magento\Bundle\Model\ResourceModel\Selection\Collection $selectionsCollection
      * @param bool $searchMin
      * @param bool $useRegularPrice
-     * @return \Magento\Bundle\Pricing\Price\BundleSelectionPrice[]
+     * @return void
      */
-    private function getMiniMaxPriceList(Product $bundleProduct, $selectionsCollection, $searchMin, $useRegularPrice)
+    private function addMiniMaxPriceList(Product $bundleProduct, $selectionsCollection, $searchMin, $useRegularPrice)
     {
-        $priceList = [];
-
         $selectionsCollection->addPriceFilter($bundleProduct, $searchMin, $useRegularPrice);
         $selectionsCollection->setPage(0, 1);
-        if (!$useRegularPrice) {
-            $selectionsCollection->addAttributeToSelect('special_price');
-            $selectionsCollection->addAttributeToSelect('special_price_from');
-            $selectionsCollection->addAttributeToSelect('special_price_to');
-            $selectionsCollection->addAttributeToSelect('tax_class_id');
-        }
 
         $selection = $selectionsCollection->getFirstItem();
 
         if (!$selection->isEmpty()) {
-            $priceList[] = $this->selectionFactory->create(
+            $this->priceList[] = $this->selectionFactory->create(
                 $bundleProduct,
                 $selection,
                 $selection->getSelectionQty(),
@@ -128,25 +126,22 @@ private function getMiniMaxPriceList(Product $bundleProduct, $selectionsCollecti
                 ]
             );
         }
-
-        return $priceList;
     }
 
     /**
-     * Get maximum price for multiselection option
+     * Add maximum price for multi selection option
      *
      * @param Product $bundleProduct
      * @param \Magento\Bundle\Model\ResourceModel\Selection\Collection $selectionsCollection
      * @param bool $useRegularPrice
-     * @return \Magento\Bundle\Pricing\Price\BundleSelectionPrice[]
+     * @return void
      */
-    private function getMaximumMultiselectionPriceList(Product $bundleProduct, $selectionsCollection, $useRegularPrice)
+    private function addMaximumMultiSelectionPriceList(Product $bundleProduct, $selectionsCollection, $useRegularPrice)
     {
-        $priceList = [];
-
         $selectionsCollection->addPriceData();
+
         foreach ($selectionsCollection as $selection) {
-            $priceList[] =  $this->selectionFactory->create(
+            $this->priceList[] =  $this->selectionFactory->create(
                 $bundleProduct,
                 $selection,
                 $selection->getSelectionQty(),
@@ -155,28 +150,23 @@ private function getMaximumMultiselectionPriceList(Product $bundleProduct, $sele
                 ]
             );
         }
-
-        return $priceList;
     }
 
     /**
-     * @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $priceList
-     * @return \Magento\Bundle\Pricing\Price\BundleSelectionPrice[]
+     * @return void
      */
-    private function getMinPriceForNonRequiredOptions($priceList)
+    private function processMinPriceForNonRequiredOptions()
     {
         $minPrice = null;
         $priceSelection = null;
-        foreach ($priceList as $price) {
+        foreach ($this->priceList as $price) {
             $minPriceTmp = $price->getAmount()->getValue() * $price->getQuantity();
             if (!$minPrice || $minPriceTmp < $minPrice) {
                 $minPrice = $minPriceTmp;
                 $priceSelection = $price;
             }
         }
-        $priceList = $priceSelection ? [$priceSelection] : [];
-
-        return $priceList;
+        $this->priceList = $priceSelection ? [$priceSelection] : [];
     }
 
     /**

dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithSpecialPriceCalculatorTest.php

@@ -89,14 +89,12 @@ public function getTestCases()
 
             '
                 #4 Testing price for dynamic bundle 
-                with one required multi type option, two simples and special price
+                with one required multi type option, two simples with special price
             ' => [
                 'strategy' => $this->getBundleConfiguration4(),
                 'expectedResults' => [
-                    // 0.5 * 1 * 10
-                    'minimalPrice' => 5,
-                    // 0.5 * (1 * 10 + 3 * 20)
-                    'maximalPrice' => 35
+                    'minimalPrice' => 9.99,
+                    'maximalPrice' => 21.97
                 ]
             ],
 
@@ -290,24 +288,28 @@ private function getBundleConfiguration4()
             [
                 'title' => 'Op1',
                 'required' => true,
-                'type' => 'multi',
+                'type' => 'checkbox',
                 'links' => [
                     [
                         'sku' => 'simple1',
                         'qty' => 1,
                     ],
                     [
                         'sku' => 'simple2',
-                        'qty' => 3,
+                        'qty' => 2,
                     ],
                 ]
             ]
         ];
 
         return [
             [
-                'modifierName' => 'addSpecialPrice',
-                'data' => [50]
+                'modifierName' => 'addSpecialPriceForSimple',
+                'data' => ['simple1', 9.99]
+            ],
+            [
+                'modifierName' => 'addSpecialPriceForSimple',
+                'data' => ['simple2', 5.99]
             ],
             [
                 'modifierName' => 'addSimpleProduct',