MC-15941: Product media_gallery_entries / types only present if image, thumbnail, small_image is requested

Author: danielrenaud

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php

@@ -86,9 +86,6 @@ public function getList(
         $collection->load();
 
         // Methods that perform extra fetches post-load
-        if (in_array('media_gallery_entries', $attributes)) {
-            $collection->addMediaGalleryData();
-        }
         if (in_array('options', $attributes)) {
             $collection->addOptionsToResult();
         }

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/MediaGalleryProcessor.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Catalog\Model\Product\Media\Config as MediaConfig;
+
+/**
+ * Add attributes required for every GraphQL product resolution process.
+ *
+ * {@inheritdoc}
+ */
+class MediaGalleryProcessor implements CollectionProcessorInterface
+{
+    /**
+     * @var MediaConfig
+     */
+    private $mediaConfig;
+
+    /**
+     * Add media gallery attributes to collection
+     *
+     * @param MediaConfig $mediaConfig
+     */
+    public function __construct(MediaConfig $mediaConfig)
+    {
+        $this->mediaConfig = $mediaConfig;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(
+        Collection $collection,
+        SearchCriteriaInterface $searchCriteria,
+        array $attributeNames
+    ): Collection {
+        if (in_array('media_gallery_entries', $attributeNames)) {
+            $mediaAttributes = $this->mediaConfig->getMediaAttributeCodes();
+            foreach ($mediaAttributes as $mediaAttribute) {
+                if (!in_array($mediaAttribute, $attributeNames)) {
+                    $collection->addAttributeToSelect($mediaAttribute);
+                }
+            }
+            $collection->addMediaGalleryData();
+        }
+
+        return $collection;
+    }
+}

app/code/Magento/CatalogGraphQl/etc/di.xml

@@ -46,6 +46,7 @@
                 <item name="search" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor\SearchCriteriaProcessor</item>
                 <item name="stock" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor\StockProcessor</item>
                 <item name="visibility" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor\VisibilityStatusProcessor</item>
+                <item name="mediaGallery" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor\MediaGalleryProcessor</item>
             </argument>
         </arguments>
     </type>