MAGETWO-54682: Fast load of product options

- MAGETWO-55756: Porting to 2.1

Author: mslabko

app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/ReadHandler.php

@@ -27,17 +27,24 @@ public function afterExecute(
             $mediaGalleryReadHandler->getAttribute()
         );
 
-        if (!empty($mediaCollection)) {
-            $ids = $this->collectVideoEntriesIds($mediaCollection);
-            $videoDataCollection = $this->loadVideoDataById($ids, $product->getStoreId());
-            $mediaEntriesDataCollection = $this->addVideoDataToMediaEntries($mediaCollection, $videoDataCollection);
-
-            $product->setData(
-                $mediaGalleryReadHandler->getAttribute()->getAttributeCode(),
-                $mediaEntriesDataCollection
-            );
+        if (empty($mediaCollection)) {
+            return $product;
+        }
+
+        $ids = $this->collectVideoEntriesIds($mediaCollection);
+
+        if (empty($ids)) {
+            return $product;
         }
 
+        $videoDataCollection = $this->loadVideoDataById($ids, $product->getStoreId());
+        $mediaEntriesDataCollection = $this->addVideoDataToMediaEntries($mediaCollection, $videoDataCollection);
+
+        $product->setData(
+            $mediaGalleryReadHandler->getAttribute()->getAttributeCode(),
+            $mediaEntriesDataCollection
+        );
+
         return $product;
     }
 
@@ -49,7 +56,9 @@ protected function collectVideoEntriesIds(array $mediaCollection)
     {
         $ids = [];
         foreach ($mediaCollection as $item) {
-            if ($item['media_type'] == ExternalVideoEntryConverter::MEDIA_TYPE_CODE) {
+            if ($item['media_type'] == ExternalVideoEntryConverter::MEDIA_TYPE_CODE
+                && !array_key_exists('video_url', $item)
+            ) {
                 $ids[] = $item['value_id'];
             }
         }

app/code/Magento/ProductVideo/Model/Plugin/ExternalVideoResourceBackend.php

@@ -6,7 +6,6 @@
 namespace Magento\ProductVideo\Model\Plugin;
 
 use Magento\Catalog\Model\ResourceModel\Product\Gallery;
-use Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Media;
 use Magento\Framework\DB\Select;
 use Magento\ProductVideo\Setup\InstallSchema;
 
@@ -47,11 +46,11 @@ public function afterDuplicate(Gallery $originalResourceModel, array $valueIdMap
     }
 
     /**
-     * @param Media $originalResourceModel
+     * @param Gallery $originalResourceModel
      * @param Select $select
      * @return Select
      */
-    public function afterCreateBatchBaseSelect(Media $originalResourceModel, Select $select)
+    public function afterCreateBatchBaseSelect(Gallery $originalResourceModel, Select $select)
     {
         $select = $select->joinLeft(
             ['value_video' => $originalResourceModel->getTable(InstallSchema::GALLERY_VALUE_VIDEO_TABLE)],

app/code/Magento/ProductVideo/Test/Unit/Model/Plugin/Catalog/Product/Gallery/ReadHandlerTest.php

@@ -200,16 +200,12 @@ public function testAfterExecuteNoVideo()
             'values' => []
         ];
 
-        $resourceEntryResult = [];
-
         $this->product->expects($this->once())
             ->method('getData')
             ->with('media_gallery')
             ->willReturn($mediaData);
 
-        $this->resourceModel->expects($this->once())
-            ->method('loadDataFromTableByValueId')
-            ->willReturn($resourceEntryResult);
+        $this->resourceModel->expects($this->never())->method('loadDataFromTableByValueId');
 
         $this->mediaGalleryReadHandler->expects($this->any())
             ->method('getAttribute')