[EngCom] Public Pull Requests - develop

 - merged latest code from mainline branch

Author: magento-team

app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php

@@ -7,7 +7,9 @@
  */
 namespace Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute;
 
+use Magento\Catalog\Model\Product;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute as Model;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable as ConfigurableResource;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
@@ -39,6 +41,8 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Product instance
      *
      * @var \Magento\Catalog\Model\Product
+     * @deprecated Now collection supports fetching options for multiple products. This field will be set to first
+     * element of products array.
      */
     protected $_product;
 
@@ -68,6 +72,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      */
     private $metadataPool;
 
+    /**
+     * @var \Magento\Catalog\Model\Product[]
+     */
+    private $products;
+
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Psr\Log\LoggerInterface $logger
@@ -122,9 +131,10 @@ protected function _construct()
      */
     public function setProductFilter($product)
     {
-        $metadata = $this->getMetadataPool()->getMetadata(ProductInterface::class);
-        $this->_product = $product;
-        return $this->addFieldToFilter('product_id', $product->getData($metadata->getLinkField()));
+        $this->products[] = $product;
+        $this->_product = reset($this->products);
+
+        return $this;
     }
 
     /**
@@ -156,7 +166,24 @@ public function orderByPosition($dir = self::SORT_ORDER_ASC)
      */
     public function getStoreId()
     {
-        return (int)$this->_product->getStoreId();
+        return reset($this->products)->getStoreId();
+    }
+
+    /**
+     * Add product ids to `in` filter before load
+     *
+     * @return $this
+     * @throws \Exception
+     */
+    protected function _beforeLoad()
+    {
+        parent::_beforeLoad();
+        $metadata = $this->getMetadataPool()->getMetadata(ProductInterface::class);
+        $productIds = [];
+        foreach ($this->products as $product) {
+            $productIds[] = $product->getData($metadata->getLinkField());
+        }
+        return $this->addFieldToFilter('product_id', ['in (?)' => $productIds]);
     }
 
     /**
@@ -186,16 +213,34 @@ protected function _afterLoad()
      */
     protected function _addProductAttributes()
     {
+        /** @var Model $item */
         foreach ($this->_items as $item) {
             $productAttribute = $this->getProductType()->getAttributeById(
                 $item->getAttributeId(),
-                $this->getProduct()
+                $this->getAttributeParentProduct($item)
             );
             $item->setProductAttribute($productAttribute);
         }
         return $this;
     }
 
+    /**
+     * Get product that has given attribute
+     *
+     * @param Model $attribute
+     * @return Product
+     */
+    private function getAttributeParentProduct($attribute)
+    {
+        $targetProduct = null;
+        foreach ($this->products as $product) {
+            if ($product->getId() === $attribute->getProductId()) {
+                $targetProduct = $product;
+            }
+        }
+        return $targetProduct ?: reset($this->products);
+    }
+
     /**
      * Add Associated Product Filters (From Product Type Instance)
      *
@@ -204,10 +249,12 @@ protected function _addProductAttributes()
      */
     public function _addAssociatedProductFilters()
     {
-        $this->getProductType()->getUsedProducts(
-            $this->getProduct(),
-            $this->getColumnValues('attribute_id') // Filter associated products
-        );
+        foreach ($this->products as $product) {
+            $this->getProductType()->getUsedProducts(
+                $product,
+                $this->getColumnValues('attribute_id') // Filter associated products
+            );
+        }
         return $this;
     }
 
@@ -261,6 +308,7 @@ protected function loadOptions()
     {
         /** @var ConfigurableResource $configurableResource */
         $configurableResource = $this->getConfigurableResource();
+        /** @var Model $item */
         foreach ($this->_items as $item) {
             $values = [];
 
@@ -269,9 +317,7 @@ protected function loadOptions()
             $itemId = $item->getId();
             $options = $configurableResource->getAttributeOptions(
                 $productAttribute,
-                $this->getProduct()->getData(
-                    $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField()
-                )
+                $item->getProductId()
             );
             foreach ($options as $option) {
                 $values[$itemId . ':' . $option['value_index']] = [
@@ -305,16 +351,6 @@ protected function getIncludedOptions(array $usedProducts, AbstractAttribute $pr
         return $options;
     }
 
-    /**
-     * Retrieve product instance
-     *
-     * @return \Magento\Catalog\Model\Product
-     */
-    private function getProduct()
-    {
-        return $this->_product;
-    }
-
     /**
      * @inheritdoc
      * @since 100.0.6

app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php

@@ -23,6 +23,11 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      */
     protected $_linkTable;
 
+    /**
+     * @var \Magento\Catalog\Model\Product[]
+     */
+    private $products;
+
     /**
      * Assign link table name
      *
@@ -59,9 +64,26 @@ protected function _initSelect()
      */
     public function setProductFilter($product)
     {
+        $this->products[] = $product;
+        return $this;
+    }
+
+    /**
+     * Add parent ids to `in` filter before load.
+     *
+     * @return $this
+     */
+    protected function _beforeLoad()
+    {
+        parent::_beforeLoad();
         $metadata = $this->getProductEntityMetadata();
+        $parentIds = [];
+        foreach ($this->products as $product) {
+            $parentIds[] = $product->getData($metadata->getLinkField());
+        }
+
+        $this->getSelect()->where('link_table.parent_id in (?)', $parentIds);
 
-        $this->getSelect()->where('link_table.parent_id = ?', $product->getData($metadata->getLinkField()));
         return $this;
     }
 

app/code/Magento/Customer/etc/graphql/di.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Authorization\Model\CompositeUserContext">
+        <arguments>
+            <argument name="userContexts" xsi:type="array">
+                <item name="customerSessionUserContext" xsi:type="array">
+                    <item name="type" xsi:type="object">Magento\Customer\Model\Authorization\CustomerSessionUserContext</item>
+                    <item name="sortOrder" xsi:type="string">20</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+</config>

app/code/Magento/GraphQl/Controller/GraphQl.php

@@ -7,6 +7,7 @@
 namespace Magento\GraphQl\Controller;
 
 use Magento\Framework\App\FrontControllerInterface;
+use Magento\Framework\App\Request\Http;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Exception\LocalizedException;
@@ -15,6 +16,7 @@
 use Magento\GraphQl\Model\SchemaGeneratorInterface;
 use Magento\Framework\GraphQl\RequestProcessor;
 use Magento\Framework\GraphQl\ExceptionFormatter;
+use Magento\GraphQl\Model\ResolverContext;
 
 /**
  * Front controller for web API GraphQL area.
@@ -44,25 +46,31 @@ class GraphQl implements FrontControllerInterface
     /** @var ExceptionFormatter */
     private $graphQlError;
 
+    /** @var ResolverContext */
+    private $context;
+
     /**
      * @param Response $response
      * @param SchemaGeneratorInterface $schemaGenerator
      * @param SerializerInterface $jsonSerializer
      * @param RequestProcessor $requestProcessor
      * @param ExceptionFormatter $graphQlError
+     * @param ResolverContext $context
      */
     public function __construct(
         Response $response,
         SchemaGeneratorInterface $schemaGenerator,
         SerializerInterface $jsonSerializer,
         RequestProcessor $requestProcessor,
-        ExceptionFormatter $graphQlError
+        ExceptionFormatter $graphQlError,
+        ResolverContext $context
     ) {
         $this->response = $response;
         $this->schemaGenerator = $schemaGenerator;
         $this->jsonSerializer = $jsonSerializer;
         $this->requestProcessor = $requestProcessor;
         $this->graphQlError = $graphQlError;
+        $this->context = $context;
     }
 
     /**
@@ -74,6 +82,7 @@ public function __construct(
     public function dispatch(RequestInterface $request)
     {
         try {
+            /** @var $request Http */
             if ($request->getHeader('Content-Type')
                 && strpos($request->getHeader('Content-Type'), 'application/json') !== false
             ) {
@@ -87,7 +96,7 @@ public function dispatch(RequestInterface $request)
                 $schema,
                 isset($data['query']) ? $data['query'] : '',
                 null,
-                null,
+                $this->context,
                 isset($data['variables']) ? $data['variables'] : []
             );
         } catch (\Exception $error) {

app/code/Magento/GraphQl/Model/EntityAttributeList.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\GraphQl\Model;
+
+use Magento\Eav\Api\AttributeManagementInterface;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Eav\Setup\EavSetup;
+
+class EntityAttributeList
+{
+    /**
+     * @var AttributeManagementInterface
+     */
+    private $management;
+
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * @var EavSetup
+     */
+    private $eavSetup;
+
+    /**
+     * @param AttributeManagementInterface $management
+     * @param EavSetupFactory $eavSetupFactory
+     */
+    public function __construct(
+        AttributeManagementInterface $management,
+        EavSetupFactory $eavSetupFactory
+    ) {
+        $this->management =  $management;
+        $this->eavSetupFactory = $eavSetupFactory;
+        $this->eavSetup = $this->eavSetupFactory->create();
+    }
+
+    public function getDefaultEntityAttributes(string $entityCode)
+    {
+        $defaultAttributeSetId = $this->eavSetup->getDefaultAttributeSetId($entityCode);
+        return $this->management->getAttributes($entityCode, $defaultAttributeSetId);
+    }
+}