MAGETWO-28254: ConfigurableProduct Integration API

    - Improve performance

Author: Yu Tang

app/code/Magento/Catalog/Model/Product/Type/AbstractType.php

@@ -100,6 +100,13 @@ abstract class AbstractType
      */
     protected $_fileStorageDb;
 
+    /**
+     * Cache key for Product Attributes
+     *
+     * @var string
+     */
+    protected $_cacheProductSetAttributes = '_cache_instance_product_set_attributes';
+
     /**
      * Delete data specific for this product type
      *
@@ -249,9 +256,13 @@ public function getParentIdsByChild($childId)
      */
     public function getSetAttributes($product)
     {
-        return $product->getResource()
-            ->loadAllAttributes($product)
-            ->getSortedAttributes($product->getAttributeSetId());
+        if (!$product->hasData($this->_cacheProductSetAttributes)) {
+            $setAttributes = $product->getResource()
+                ->loadAllAttributes($product)
+                ->getSortedAttributes($product->getAttributeSetId());
+            $product->setData($this->_cacheProductSetAttributes, $setAttributes);
+        }
+        return $product->getData($this->_cacheProductSetAttributes);
     }
 
     /**

app/code/Magento/Catalog/Test/Unit/Model/Product/Type/AbstractTypeTest.php

@@ -119,11 +119,12 @@ public function attributeCompareProvider()
 
     public function testGetSetAttributes()
     {
-        $this->productResource->expects($this->any())->method('loadAllAttributes')->will(
+        $this->productResource->expects($this->once())->method('loadAllAttributes')->will(
             $this->returnValue($this->productResource)
         );
-        $this->productResource->expects($this->any())->method('getSortedAttributes')->will($this->returnValue(5));
-        $this->model->getSetAttributes($this->product);
+        $this->productResource->expects($this->once())->method('getSortedAttributes')->will($this->returnValue(5));
+        $this->assertEquals(5, $this->model->getSetAttributes($this->product));
+        //Call the method for a second time, the cached copy should be used
         $this->assertEquals(5, $this->model->getSetAttributes($this->product));
     }
 

app/code/Magento/CatalogInventory/Model/StockManagement.php

@@ -84,7 +84,7 @@ public function registerProductsSale($items, $websiteId = null)
             $orderedQty = $items[$productId];
             $stockItem = $this->stockRegistryProvider->getStockItem($productId, $websiteId);
             $canSubtractQty = $stockItem->getItemId() && $this->canSubtractQty($stockItem);
-            if (!$canSubtractQty || !$this->stockConfiguration->isQty($this->getProductType($productId))) {
+            if (!$canSubtractQty || !$this->stockConfiguration->isQty($lockedItemRecord['type_id'])) {
                 continue;
             }
             if (!$stockItem->hasAdminArea()

app/code/Magento/ConfigurableProduct/Model/Plugin/AfterProductLoad.php

@@ -63,9 +63,9 @@ protected function getOptions(\Magento\Catalog\Model\Product $product)
         $options = [];
         /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable $typeInstance */
         $typeInstance = $product->getTypeInstance();
-        $optionCollection = $typeInstance->getConfigurableAttributeCollection($product);
+        $attributeCollection = $typeInstance->getConfigurableAttributes($product);
         /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute $option */
-        foreach ($optionCollection as $option) {
+        foreach ($attributeCollection as $option) {
             $values = [];
             $prices = $option->getPrices();
             if (is_array($prices)) {

app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/AfterProductLoadTest.php

@@ -141,7 +141,7 @@ protected function setupOptions()
         $options = [$optionMock1, $optionMock2];
 
         $this->configurableProductTypeInstanceMock->expects($this->once())
-            ->method('getConfigurableAttributeCollection')
+            ->method('getConfigurableAttributes')
             ->with($this->productMock)
             ->willReturn($options);
         return $options;

app/code/Magento/Downloadable/Model/Observer.php

@@ -114,10 +114,10 @@ public function saveDownloadableOrderItem($observer)
             //order not saved in the database
             return $this;
         }
-        $product = $orderItem->getProduct();
-        if ($product && $product->getTypeId() != \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE) {
+        if ($orderItem->getProductType() != \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE) {
             return $this;
         }
+        $product = $orderItem->getProduct();
         $purchasedLink = $this->_createPurchasedModel()->load($orderItem->getId(), 'order_item_id');
         if ($purchasedLink->getId()) {
             return $this;

app/code/Magento/Downloadable/Test/Unit/Model/ObserverTest.php

@@ -497,6 +497,33 @@ public function testSetLinkStatusEmptyOrder()
         $this->assertInstanceOf('\Magento\Downloadable\Model\Observer', $result);
     }
 
+    public function testSaveDownloadableOrderItemNotDownloadableItem()
+    {
+        $itemId = 100;
+        $itemMock = $this->getMockBuilder('\Magento\Sales\Model\Order\Item')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $itemMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($itemId);
+        $itemMock->expects($this->any())
+            ->method('getProductType')
+            ->willReturn('simple');
+        $itemMock->expects($this->never())
+            ->method('getProduct');
+        $event = new \Magento\Framework\Object(
+            [
+                'item' => $itemMock,
+            ]
+        );
+        $observer = new \Magento\Framework\Object(
+            [
+                'event' => $event
+            ]
+        );
+        $this->observer->saveDownloadableOrderItem($observer);
+    }
+
     /**
      * @param $id
      * @param int $statusId

app/code/Magento/Review/Block/Form.php

@@ -163,7 +163,11 @@ protected function _construct()
      */
     public function getProductInfo()
     {
-        return $this->productRepository->getById($this->getProductId());
+        return $this->productRepository->getById(
+            $this->getProductId(),
+            false,
+            $this->_storeManager->getStore()->getId()
+        );
     }
 
     /**

app/code/Magento/Review/Test/Unit/Block/FormTest.php

@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Review\Test\Unit\Block;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class FormTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \Magento\Review\Block\Form */
+    protected $object;
+
+    /** @var ObjectManagerHelper */
+    protected $objectManagerHelper;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $requestMock;
+
+    /** @var \Magento\Framework\View\Element\Template\Context|\PHPUnit_Framework_MockObject_MockObject */
+    protected $context;
+
+    /**
+     * @var \Magento\Review\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $reviewDataMock;
+
+    /** @var \Magento\Catalog\Api\ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $productRepository;
+
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $storeManager;
+
+    protected function setUp()
+    {
+        $this->storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+        $this->requestMock = $this->getMock('\Magento\Framework\App\RequestInterface');
+        $this->reviewDataMock = $this->getMockBuilder('\Magento\Review\Helper\Data')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->reviewDataMock->expects($this->once())
+            ->method('getIsGuestAllowToWrite')
+            ->willReturn(true);
+
+        $this->context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
+        $this->context->expects(
+            $this->any()
+        )->method(
+            'getStoreManager'
+        )->will(
+            $this->returnValue($this->storeManager)
+        );
+        $this->context->expects($this->any())
+            ->method('getRequest')
+            ->willReturn($this->requestMock);
+        $this->productRepository = $this->getMock('\Magento\Catalog\Api\ProductRepositoryInterface');
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->object = $this->objectManagerHelper->getObject(
+            'Magento\Review\Block\Form',
+            [
+                'context' => $this->context,
+                'reviewData' => $this->reviewDataMock,
+                'productRepository' => $this->productRepository,
+            ]
+        );
+    }
+
+    public function testGetProductInfo()
+    {
+        $productId = 3;
+        $storeId = 1;
+
+        $this->storeManager->expects(
+            $this->any()
+        )->method(
+            'getStore'
+        )->will(
+            $this->returnValue(new \Magento\Framework\Object(['id' => $storeId]))
+        );
+
+        $this->requestMock->expects($this->once())
+            ->method('getParam')
+            ->with('id', false)
+            ->willReturn($productId);
+
+        $productMock = $this->getMock('Magento\Catalog\Api\Data\ProductInterface');
+        $this->productRepository->expects($this->once())
+            ->method('getById')
+            ->with($productId, false, $storeId)
+            ->willReturn($productMock);
+
+        $this->assertSame($productMock, $this->object->getProductInfo());
+    }
+}