MAGETWO-66698: [Performance] Quotes Optimization

Author: nikshostko

app/code/Magento/Quote/Model/Quote.php

@@ -507,6 +507,7 @@ public function getCurrency()
                 ->setStoreToQuoteRate($this->getStoreToQuoteRate())
                 ->setBaseToGlobalRate($this->getBaseToGlobalRate())
                 ->setBaseToQuoteRate($this->getBaseToQuoteRate());
+            $this->setData(self::KEY_CURRENCY, $currency);
         }
         return $currency;
     }

app/code/Magento/Quote/Model/Quote/Item.php

@@ -171,6 +171,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
+     * @deprecated
      */
     protected $stockRegistry;
 
@@ -433,8 +434,8 @@ public function setProduct($product)
             ->setTaxClassId($product->getTaxClassId())
             ->setBaseCost($product->getCost());
 
-        $stockItem = $this->stockRegistry->getStockItem($product->getId(), $product->getStore()->getWebsiteId());
-        $this->setIsQtyDecimal($stockItem->getIsQtyDecimal());
+        $stockItem = $product->getExtensionAttributes()->getStockItem();
+        $this->setIsQtyDecimal($stockItem ? $stockItem->getIsQtyDecimal() : false);
 
         $this->_eventManager->dispatch(
             'sales_quote_item_set_product',

app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php

@@ -213,7 +213,9 @@ protected function _assignProducts()
             $this->_productIds
         )->addAttributeToSelect(
             $this->_quoteConfig->getProductAttributes()
-        )->addOptionsToResult()->addStoreFilter()->addUrlRewrite()->addTierPriceData();
+        )->addOptionsToResult()->addStoreFilter()->addUrlRewrite();
+
+        $productCollection = $this->addTierPriceData($productCollection);
 
         $this->_eventManager->dispatch(
             'prepare_catalog_product_collection_prices',
@@ -270,4 +272,20 @@ protected function _assignProducts()
 
         return $this;
     }
+
+    /**
+     * Add tier prices to product collection.
+     *
+     * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection
+     * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
+     */
+    private function addTierPriceData(\Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection)
+    {
+        if (empty($this->_quote)) {
+            $productCollection->addTierPriceData();
+        } else {
+            $productCollection->addTierPriceDataByGroupId($this->_quote->getCustomerGroupId());
+        }
+        return $productCollection;
+    }
 }

app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php

@@ -116,7 +116,14 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
         $store->expects($this->any())->method('getWebsiteId')->willReturn(10);
         $product->expects($this->any())->method('getStore')->willReturn($store);
         $product->expects($this->any())->method('isVisibleInCatalog')->will($this->returnValue(true));
-
+        $extensionAttribute = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductExtensionInterface::class)
+            ->setMethods(['getStockItem'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $extensionAttribute->expects($this->atLeastOnce())
+            ->method('getStockItem')
+            ->will($this->returnValue($this->stockItemMock));
+        $product->expects($this->atLeastOnce())->method('getExtensionAttributes')->willReturn($extensionAttribute);
         $quote->expects($this->any())->method('getStore')->will($this->returnValue($store));
         $quoteItem->setProduct($product)->setQuote($quote);
 

app/code/Magento/Quote/Test/Unit/Model/Quote/ItemTest.php

@@ -56,11 +56,6 @@ class ItemTest extends \PHPUnit_Framework_TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject */
     protected $stockItemMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $stockRegistry;
-
     /**
      * @var \Magento\Framework\Serialize\Serializer\Json
      */
@@ -131,14 +126,6 @@ protected function setUp()
             false
         );
 
-        $this->stockRegistry = $this->getMockBuilder(\Magento\CatalogInventory\Model\StockRegistry::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getStockItem', '__wakeup'])
-            ->getMock();
-        $this->stockRegistry->expects($this->any())
-            ->method('getStockItem')
-            ->will($this->returnValue($this->stockItemMock));
-
         $this->serializer = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)
             ->setMethods(['unserialize'])
             ->getMockForAbstractClass();
@@ -151,7 +138,6 @@ protected function setUp()
                 'statusListFactory' => $statusListFactory,
                 'itemOptionFactory' => $this->itemOptionFactory,
                 'quoteItemCompare' => $this->compareHelper,
-                'stockRegistry' => $this->stockRegistry,
                 'serializer' => $this->serializer
             ]
         );
@@ -383,9 +369,6 @@ public function testSetProductWithQuoteAndStockItem()
             ->with('sales_quote_item_set_product', ['product' => $productMock, 'quote_item' => $this->model]);
 
         $isQtyDecimal = true;
-        $this->stockItemMock->expects($this->any())
-            ->method('getStockId')
-            ->will($this->returnValue(99));
         $this->stockItemMock->expects($this->once())
             ->method('getIsQtyDecimal')
             ->will($this->returnValue($isQtyDecimal));
@@ -424,6 +407,18 @@ public function testSetProductWithQuoteAndStockItem()
         $this->assertEquals($isQtyDecimal, $this->model->getIsQtyDecimal());
     }
 
+    /**
+     * Generate product mock.
+     *
+     * @param int $productId
+     * @param string $productType
+     * @param string $productSku
+     * @param string $productName
+     * @param string $productWeight
+     * @param int $productTaxClassId
+     * @param float $productCost
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function generateProductMock(
         $productId,
         $productType,
@@ -449,6 +444,7 @@ private function generateProductMock(
                     'getTypeInstance',
                     'getStickWithinParent',
                     'getCustomOptions',
+                    'getExtensionAttributes',
                     'toArray',
                     '__wakeup',
                     'getStore',
@@ -485,7 +481,14 @@ private function generateProductMock(
         $productMock->expects($this->any())
             ->method('getStore')
             ->will($this->returnValue($store));
-
+        $extensionAttribute = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductExtensionInterface::class)
+            ->setMethods(['getStockItem'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $extensionAttribute->expects($this->atLeastOnce())
+            ->method('getStockItem')
+            ->will($this->returnValue($this->stockItemMock));
+        $productMock->expects($this->atLeastOnce())->method('getExtensionAttributes')->willReturn($extensionAttribute);
         return $productMock;
     }
 
@@ -784,6 +787,7 @@ public function testGetQtyOptions()
             self::PRODUCT_COST
         );
 
+        $this->model->setProduct($productMock);
         $this->model->setProduct($productMock2);
         $this->model->setOptions([$optionCode1 => $optionMock1, $optionCode2 => $optionMock2]);
 

app/code/Magento/Tax/Model/Config/Notification.php

@@ -13,6 +13,11 @@
  */
 class Notification extends \Magento\Framework\App\Config\Value
 {
+    /**
+     * @var string
+     */
+    protected $_eventPrefix = 'tax_config_notification';
+
     /**
      * @var \Magento\Config\Model\ResourceModel\Config
      */