Merge remote-tracking branch 'origin/2.3-develop' into fix/typos/batch

Author: akiojalehto

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php

@@ -87,6 +87,7 @@ public function build($productId)
             ->where('t.website_id = ?', $this->storeManager->getStore()->getWebsiteId())
             ->where('t.customer_group_id = ?', $this->customerSession->getCustomerGroupId())
             ->order('t.min_price ' . Select::SQL_ASC)
+            ->order(BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS . '.' . $linkField . ' ' . Select::SQL_ASC)
             ->limit(1);
         $priceSelect = $this->baseSelectProcessor->process($priceSelect);
 

app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php

@@ -95,6 +95,7 @@ public function build($productId)
             ->where('t.attribute_id = ?', $priceAttribute->getAttributeId())
             ->where('t.value IS NOT NULL')
             ->order('t.value ' . Select::SQL_ASC)
+            ->order(BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS . '.' . $linkField . ' ' . Select::SQL_ASC)
             ->limit(1);
         $priceSelect = $this->baseSelectProcessor->process($priceSelect);
 

app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php

@@ -139,6 +139,7 @@ public function build($productId)
                 'special_to.value IS NULL OR ' . $connection->getDatePartSql('special_to.value') .' >= ?',
                 $currentDate
             )->order('t.value ' . Select::SQL_ASC)
+            ->order(BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS . '.' . $linkField . ' ' . Select::SQL_ASC)
             ->limit(1);
         $specialPrice = $this->baseSelectProcessor->process($specialPrice);
 

app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php

@@ -97,6 +97,7 @@ public function build($productId)
             ->where('t.all_groups = 1 OR customer_group_id = ?', $this->customerSession->getCustomerGroupId())
             ->where('t.qty = ?', 1)
             ->order('t.value ' . Select::SQL_ASC)
+            ->order(BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS . '.' . $linkField . ' ' . Select::SQL_ASC)
             ->limit(1);
         $priceSelect = $this->baseSelectProcessor->process($priceSelect);
 

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPriceTest.php

@@ -84,7 +84,7 @@ public function testBuild()
         $select->expects($this->any())->method('from')->willReturnSelf();
         $select->expects($this->any())->method('joinInner')->willReturnSelf();
         $select->expects($this->any())->method('where')->willReturnSelf();
-        $select->expects($this->once())->method('order')->willReturnSelf();
+        $select->expects($this->exactly(2))->method('order')->willReturnSelf();
         $select->expects($this->once())->method('limit')->willReturnSelf();
         $this->resourceMock->expects($this->any())->method('getConnection')->willReturn($connection);
         $this->metadataPoolMock->expects($this->once())->method('getMetadata')->willReturn($metadata);

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

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogGraphQl\Model;
+
+use Magento\Framework\GraphQl\Config\Data\TypeResolverInterface;
+use Magento\Framework\Exception\InputException;
+
+/**
+ * {@inheritdoc}
+ */
+class ConcreteTypeResolver implements TypeResolverInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function resolveType(array $data)
+    {
+        if (!isset($data['type_id'])) {
+            throw new InputException(
+                __('%1 key doesn\'t exist in product data', [$data['type_id']])
+            );
+        }
+
+        if ($data['type_id'] == 'simple') {
+            return 'SimpleProduct';
+        }
+
+        return null;
+    }
+}

app/code/Magento/CatalogGraphQl/Model/Config/AttributeReader.php

@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogGraphQl\Model\Config;
+
+use Magento\Framework\Config\ReaderInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Type\Entity\MapperInterface;
+use Magento\Framework\Reflection\TypeProcessor;
+use Magento\EavGraphQl\Model\Resolver\Query\Type;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection;
+
+/**
+ * Adds custom/eav attribute to Catalog product types in the GraphQL config.
+ */
+class AttributeReader implements ReaderInterface
+{
+    /**
+     * @var MapperInterface
+     */
+    private $mapper;
+
+    /**
+     * @var Type
+     */
+    private $typeLocator;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @param MapperInterface $mapper
+     * @param Type $typeLocator
+     * @param CollectionFactory $collectionFactory
+     */
+    public function __construct(
+        MapperInterface $mapper,
+        Type $typeLocator,
+        CollectionFactory $collectionFactory
+    ) {
+        $this->mapper = $mapper;
+        $this->typeLocator = $typeLocator;
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * Read configuration scope
+     *
+     * @param string|null $scope
+     * @return array
+     * @throws GraphQlInputException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function read($scope = null)
+    {
+        $targetStructures = $this->mapper->getMappedTypes(\Magento\Catalog\Model\Product::ENTITY);
+        $config =[];
+        /** @var Collection $collection */
+        $collection = $this->collectionFactory->create();
+        $collection->addFieldToFilter('is_user_defined', '1');
+        $collection->addFieldToFilter('attribute_code', ['neq' => 'cost']);
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
+        foreach ($collection as $attribute) {
+            $attributeCode = $attribute->getAttributeCode();
+            $locatedType = $this->typeLocator->getType(
+                $attributeCode,
+                \Magento\Catalog\Model\Product::ENTITY
+            ) ?: 'String';
+            $locatedType = $locatedType === TypeProcessor::NORMALIZED_ANY_TYPE ? 'String' : ucfirst($locatedType);
+            foreach ($targetStructures as $structure) {
+                $config[$structure]['fields'][$attributeCode] = [
+                    'name' => $attributeCode,
+                    'type' => $locatedType,
+                    'arguments' => []
+                ];
+            }
+        }
+
+        return $config;
+    }
+}

app/code/Magento/GraphQlCatalog/Model/Resolver/Products.php renamed to app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php

@@ -4,16 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\GraphQlCatalog\Model\Resolver;
+namespace Magento\CatalogGraphQl\Model\Resolver;
 
-use Magento\Framework\Api\Search\SearchCriteriaInterfaceFactory;
 use Magento\GraphQl\Model\ResolverContextInterface;
 use Magento\GraphQl\Model\ResolverInterface;
 use Magento\Framework\GraphQl\Argument\SearchCriteria\Builder;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\GraphQl\Model\ContextInterface;
-use Magento\GraphQlCatalog\Model\Resolver\Products\Query\Filter;
-use Magento\GraphQlCatalog\Model\Resolver\Products\Query\Search;
+use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Filter;
+use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Search;
 
 /**
  * Products field resolver, used for GraphQL request processing.
@@ -63,7 +61,12 @@ public function resolve(array $args, ResolverContextInterface $context)
             $searchResult = $this->filterQuery->getResult($searchCriteria);
         }
 
-        $maxPages = ceil($searchResult->getTotalCount() / $searchCriteria->getPageSize());
+        //possible division by 0
+        if ($searchCriteria->getPageSize()) {
+            $maxPages = ceil($searchResult->getTotalCount() / $searchCriteria->getPageSize());
+        } else {
+            $maxPages = 0;
+        }
         if ($searchCriteria->getCurrentPage() > $maxPages && $searchResult->getTotalCount() > 0) {
             throw new GraphQlInputException(
                 __(

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

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider;
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Option;

app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product/Formatter/BaseModelData.php renamed to app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/Formatter/BaseModelData.php

@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter;
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\Formatter;
 
 use Magento\Catalog\Model\Product;
-use Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\FormatterInterface;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\FormatterInterface;
 
 /**
  * Grabs the data from the product