MCP-272: [Checkout start] Optimize Images URL retrieving (#6748)

Author: magento-mts-svc

app/code/Magento/Checkout/Model/Cart/ImageProvider.php

@@ -32,19 +32,37 @@ class ImageProvider
      */
     protected $customerDataItem;
 
+    /**
+     * @var \Magento\Catalog\Helper\Image
+     */
+    private $imageHelper;
+
+    /**
+     * @var \Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface
+     */
+    private $itemResolver;
+
     /**
      * @param \Magento\Quote\Api\CartItemRepositoryInterface $itemRepository
      * @param \Magento\Checkout\CustomerData\ItemPoolInterface $itemPool
      * @param DefaultItem|null $customerDataItem
+     * @param \Magento\Catalog\Helper\Image $imageHelper
+     * @param \Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface $itemResolver
      */
     public function __construct(
         \Magento\Quote\Api\CartItemRepositoryInterface $itemRepository,
         \Magento\Checkout\CustomerData\ItemPoolInterface $itemPool,
-        \Magento\Checkout\CustomerData\DefaultItem $customerDataItem = null
+        \Magento\Checkout\CustomerData\DefaultItem $customerDataItem = null,
+        \Magento\Catalog\Helper\Image $imageHelper = null,
+        \Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface $itemResolver = null
     ) {
         $this->itemRepository = $itemRepository;
         $this->itemPool = $itemPool;
         $this->customerDataItem = $customerDataItem ?: ObjectManager::getInstance()->get(DefaultItem::class);
+        $this->imageHelper = $imageHelper ?: ObjectManager::getInstance()->get(\Magento\Catalog\Helper\Image::class);
+        $this->itemResolver = $itemResolver ?: ObjectManager::getInstance()->get(
+            \Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface::class
+        );
     }
 
     /**
@@ -58,9 +76,30 @@ public function getImages($cartId)
         $items = $this->itemRepository->getList($cartId);
         /** @var \Magento\Quote\Model\Quote\Item $cartItem */
         foreach ($items as $cartItem) {
-            $allData = $this->customerDataItem->getItemData($cartItem);
-            $itemData[$cartItem->getItemId()] = $allData['product_image'];
+            $itemData[$cartItem->getItemId()] = $this->getProductImageData($cartItem);
         }
         return $itemData;
     }
+
+    /**
+     * Get product image data
+     *
+     * @param \Magento\Quote\Model\Quote\Item $cartItem
+     *
+     * @return array
+     */
+    private function getProductImageData($cartItem)
+    {
+        $imageHelper = $this->imageHelper->init(
+            $this->itemResolver->getFinalProduct($cartItem),
+            'mini_cart_product_thumbnail'
+        );
+        $imageData = [
+            'src' => $imageHelper->getUrl(),
+            'alt' => $imageHelper->getLabel(),
+            'width' => $imageHelper->getWidth(),
+            'height' => $imageHelper->getHeight(),
+        ];
+        return $imageData;
+    }
 }

app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php

@@ -37,32 +37,59 @@ class ImageProviderTest extends TestCase
      */
     private $customerItem;
 
+    /**
+     * @var MockObject|\Magento\Catalog\Helper\Image
+     */
+    private $imageHelper;
+
+    /**
+     * @var MockObject|\Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface
+     */
+    private $itemResolver;
+
     protected function setUp(): void
     {
         $this->itemRepositoryMock = $this->getMockForAbstractClass(CartItemRepositoryInterface::class);
         $this->itemPoolMock = $this->getMockForAbstractClass(ItemPoolInterface::class);
         $this->customerItem = $this->getMockBuilder(DefaultItem::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->imageHelper = $this->getMockBuilder(\Magento\Catalog\Helper\Image::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->itemResolver = $this->getMockForAbstractClass(
+            \Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface::class
+        );
         $this->model = new ImageProvider(
             $this->itemRepositoryMock,
             $this->itemPoolMock,
-            $this->customerItem
+            $this->customerItem,
+            $this->imageHelper,
+            $this->itemResolver
         );
     }
 
     public function testGetImages()
     {
         $cartId = 42;
         $itemId = 74;
-        $itemData = ['product_image' => 'Magento.png', 'random' => '3.1415926535'];
+        $itemData = [
+            'src' => 'Url',
+            'alt' => 'Label',
+            'width' => 'Width',
+            'height' => 'Height'
+        ];
         $itemMock = $this->createMock(Item::class);
         $itemMock->expects($this->once())->method('getItemId')->willReturn($itemId);
 
-        $expectedResult = [$itemId => $itemData['product_image']];
+        $expectedResult = [$itemId => $itemData];
 
         $this->itemRepositoryMock->expects($this->once())->method('getList')->with($cartId)->willReturn([$itemMock]);
-        $this->customerItem->expects($this->once())->method('getItemData')->with($itemMock)->willReturn($itemData);
+        $this->imageHelper->expects($this->once())->method('init')->willReturnSelf();
+        $this->imageHelper->expects($this->once())->method('getUrl')->willReturn('Url');
+        $this->imageHelper->expects($this->once())->method('getLabel')->willReturn('Label');
+        $this->imageHelper->expects($this->once())->method('getWidth')->willReturn('Width');
+        $this->imageHelper->expects($this->once())->method('getHeight')->willReturn('Height');
 
         $this->assertEquals($expectedResult, $this->model->getImages($cartId));
     }