Merge branch 'MAGETWO-92163' of github.com:magento-qwerty/magento2ce into MAGETWO-92163

Author: roman

app/code/Magento/Catalog/Model/Product/Media/Config.php

@@ -10,11 +10,9 @@
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * Catalog product media config
+ * Catalog product media config.
  *
  * @api
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Config implements ConfigInterface
@@ -31,6 +29,11 @@ class Config implements ConfigInterface
      */
     private $attributeHelper;
 
+    /**
+     * @var string[]
+     */
+    private $mediaAttributeCodes;
+
     /**
      * @param StoreManagerInterface $storeManager
      */
@@ -40,8 +43,7 @@ public function __construct(StoreManagerInterface $storeManager)
     }
 
     /**
-     * Filesystem directory path of product images
-     * relatively to media folder
+     * Get filesystem directory path for product images relative to the media directory.
      *
      * @return string
      */
@@ -51,8 +53,7 @@ public function getBaseMediaPathAddition()
     }
 
     /**
-     * Web-based directory path of product images
-     * relatively to media folder
+     * Get web-based directory path for product images relative to the media directory.
      *
      * @return string
      */
@@ -62,15 +63,15 @@ public function getBaseMediaUrlAddition()
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
     public function getBaseMediaPath()
     {
         return 'catalog/product';
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
     public function getBaseMediaUrl()
     {
@@ -79,8 +80,7 @@ public function getBaseMediaUrl()
     }
 
     /**
-     * Filesystem directory path of temporary product images
-     * relatively to media folder
+     * Filesystem directory path of temporary product images relative to the media directory.
      *
      * @return string
      */
@@ -90,6 +90,8 @@ public function getBaseTmpMediaPath()
     }
 
     /**
+     * Get temporary base media URL.
+     *
      * @return string
      */
     public function getBaseTmpMediaUrl()
@@ -100,24 +102,24 @@ public function getBaseTmpMediaUrl()
     }
 
     /**
-     * @param string $file
-     * @return string
+     * @inheritdoc
      */
     public function getMediaUrl($file)
     {
         return $this->getBaseMediaUrl() . '/' . $this->_prepareFile($file);
     }
 
     /**
-     * @param string $file
-     * @return string
+     * @inheritdoc
      */
     public function getMediaPath($file)
     {
         return $this->getBaseMediaPath() . '/' . $this->_prepareFile($file);
     }
 
     /**
+     * Get temporary media URL.
+     *
      * @param string $file
      * @return string
      */
@@ -127,8 +129,7 @@ public function getTmpMediaUrl($file)
     }
 
     /**
-     * Part of URL of temporary product images
-     * relatively to media folder
+     * Part of URL of temporary product images relative to the media directory.
      *
      * @param string $file
      * @return string
@@ -139,7 +140,7 @@ public function getTmpMediaShortUrl($file)
     }
 
     /**
-     * Part of URL of product images relatively to media folder
+     * Part of URL of product images relatively to media folder.
      *
      * @param string $file
      * @return string
@@ -150,6 +151,8 @@ public function getMediaShortUrl($file)
     }
 
     /**
+     * Get path to the temporary media.
+     *
      * @param string $file
      * @return string
      */
@@ -159,6 +162,8 @@ public function getTmpMediaPath($file)
     }
 
     /**
+     * Process file path.
+     *
      * @param string $file
      * @return string
      */
@@ -168,15 +173,23 @@ protected function _prepareFile($file)
     }
 
     /**
+     * Get codes of media attribute.
+     *
      * @return array
      * @since 100.0.4
      */
     public function getMediaAttributeCodes()
     {
-        return $this->getAttributeHelper()->getAttributeCodesByFrontendType('media_image');
+        if (!isset($this->mediaAttributeCodes)) {
+            // the in-memory object-level caching allows to prevent unnecessary calls to the DB
+            $this->mediaAttributeCodes = $this->getAttributeHelper()->getAttributeCodesByFrontendType('media_image');
+        }
+        return $this->mediaAttributeCodes;
     }
 
     /**
+     * Get attribute helper.
+     *
      * @return Attribute
      */
     private function getAttributeHelper()

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/Metadata/image_content-meta.xml renamed to app/code/Magento/Catalog/Test/Mftf/Metadata/image_content-meta.xml

@@ -15,6 +15,11 @@
  */
 class AttributesJoiner
 {
+    /**
+     * @var array
+     */
+    private $queryFields = [];
+
     /**
      * Join fields attached to field node to collection's select.
      *
@@ -24,17 +29,33 @@ class AttributesJoiner
      */
     public function join(FieldNode $fieldNode, AbstractCollection $collection) : void
     {
-        $query = $fieldNode->selectionSet->selections;
-
-        /** @var FieldNode $field */
-        foreach ($query as $field) {
-            if ($field->kind === 'InlineFragment') {
-                continue;
+        foreach ($this->getQueryFields($fieldNode) as $field) {
+            if (!$collection->isAttributeAdded($field)) {
+                $collection->addAttributeToSelect($field);
             }
+        }
+    }
 
-            if (!$collection->isAttributeAdded($field->name->value)) {
-                $collection->addAttributeToSelect($field->name->value);
+    /**
+     * Get an array of queried fields.
+     *
+     * @param FieldNode $fieldNode
+     * @return string[]
+     */
+    public function getQueryFields(FieldNode $fieldNode)
+    {
+        if (!isset($this->queryFields[$fieldNode->name->value])) {
+            $this->queryFields[$fieldNode->name->value] = [];
+            $query = $fieldNode->selectionSet->selections;
+            /** @var FieldNode $field */
+            foreach ($query as $field) {
+                if ($field->kind === 'InlineFragment') {
+                    continue;
+                }
+                $this->queryFields[$fieldNode->name->value][] = $field->name->value;
             }
         }
+
+        return $this->queryFields[$fieldNode->name->value];
     }
 }

app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php

@@ -8,6 +8,7 @@
 namespace Magento\CatalogGraphQl\Model\Category;
 
 use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\Category;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CustomAttributesFlattener;
 use Magento\Framework\Reflection\DataObjectProcessor;
 
@@ -41,14 +42,19 @@ public function __construct(
     /**
      * Hydrate and flatten category object to flat array
      *
-     * @param CategoryInterface $category
+     * @param Category $category
+     * @param bool $basicFieldsOnly Set to false to avoid expensive hydration, used for performance optimization
      * @return array
      */
-    public function hydrateCategory(CategoryInterface $category) : array
+    public function hydrateCategory(Category $category, $basicFieldsOnly = false) : array
     {
-        $categoryData = $this->dataObjectProcessor->buildOutputDataArray($category, CategoryInterface::class);
+        if ($basicFieldsOnly) {
+            $categoryData = $category->getData();
+        } else {
+            $categoryData = $this->dataObjectProcessor->buildOutputDataArray($category, CategoryInterface::class);
+            $categoryData['product_count'] = $category->getProductCount();
+        }
         $categoryData['id'] = $category->getId();
-        $categoryData['product_count'] = $category->getProductCount();
         $categoryData['children'] = [];
         $categoryData['available_sort_by'] = $category->getAvailableSortBy();
         return $this->flattener->flatten($categoryData);

app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php

@@ -17,7 +17,7 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
-use Magento\Framework\Reflection\DataObjectProcessor;
+use Magento\CatalogGraphQl\Model\Category\Hydrator as CategoryHydrator;
 
 /**
  * Resolver for category objects the product is assigned to.
@@ -36,11 +36,6 @@ class Categories implements ResolverInterface
      */
     private $categoryIds = [];
 
-    /**
-     * @var DataObjectProcessor
-     */
-    private $dataObjectProcessor;
-
     /**
      * @var AttributesJoiner
      */
@@ -57,29 +52,34 @@ class Categories implements ResolverInterface
     private $valueFactory;
 
     /**
-     * Category constructor.
+     * @var CategoryHydrator
+     */
+    private $categoryHydrator;
+
+    /**
      * @param CollectionFactory $collectionFactory
-     * @param DataObjectProcessor $dataObjectProcessor
      * @param AttributesJoiner $attributesJoiner
      * @param CustomAttributesFlattener $customAttributesFlattener
      * @param ValueFactory $valueFactory
+     * @param CategoryHydrator $categoryHydrator
      */
     public function __construct(
         CollectionFactory $collectionFactory,
-        DataObjectProcessor $dataObjectProcessor,
         AttributesJoiner $attributesJoiner,
         CustomAttributesFlattener $customAttributesFlattener,
-        ValueFactory $valueFactory
+        ValueFactory $valueFactory,
+        CategoryHydrator $categoryHydrator
     ) {
         $this->collection = $collectionFactory->create();
-        $this->dataObjectProcessor = $dataObjectProcessor;
         $this->attributesJoiner = $attributesJoiner;
         $this->customAttributesFlattener = $customAttributesFlattener;
         $this->valueFactory = $valueFactory;
+        $this->categoryHydrator = $categoryHydrator;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
@@ -107,13 +107,17 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             /** @var CategoryInterface | \Magento\Catalog\Model\Category $item */
             foreach ($this->collection as $item) {
                 if (in_array($item->getId(), $categoryIds)) {
-                    $categories[$item->getId()] = $this->dataObjectProcessor->buildOutputDataArray(
-                        $item,
-                        CategoryInterface::class
-                    );
-                    $categories[$item->getId()] = $this->customAttributesFlattener
-                        ->flatten($categories[$item->getId()]);
-                    $categories[$item->getId()]['product_count'] = $item->getProductCount();
+                    // Try to extract all requested fields from the loaded collection data
+                    $categories[$item->getId()] = $this->categoryHydrator->hydrateCategory($item, true);
+                    $requestedFields = $that->attributesJoiner->getQueryFields($info->fieldNodes[0]);
+                    $extractedFields = array_keys($categories[$item->getId()]);
+                    $foundFields = array_intersect($requestedFields, $extractedFields);
+                    if (count($requestedFields) === count($foundFields)) {
+                        continue;
+                    }
+
+                    // If not all requested fields were extracted from the collection, start more complex extraction
+                    $categories[$item->getId()] = $this->categoryHydrator->hydrateCategory($item);
                 }
             }
 

app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Layered navigation filters resolver, used for GraphQL request processing.
+ */
+class LayerFilters implements ResolverInterface
+{
+    /**
+     * @var Layer\DataProvider\Filters
+     */
+    private $filtersDataProvider;
+
+    /**
+     * @param \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider
+     */
+    public function __construct(
+        \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider
+    ) {
+        $this->filtersDataProvider = $filtersDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['layer_type'])) {
+            return null;
+        }
+
+        return $this->filtersDataProvider->getData($value['layer_type']);
+    }
+}