From f9acb655f01565c58d1df26643b4446407c4eb0a Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Thu, 8 Nov 2018 15:18:58 +0100
Subject: [PATCH 1/4] Added a separate resolver for returning category products
 count

---
 app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php     | 1 -
 .../Magento/CatalogGraphQl/Model/Resolver/Category/Products.php | 2 +-
 app/code/Magento/CatalogGraphQl/etc/schema.graphqls             | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php b/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php
index f0cdab9498ab..e783c749fdc6 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php
@@ -52,7 +52,6 @@ public function hydrateCategory(Category $category, $basicFieldsOnly = false) :
             $categoryData = $category->getData();
         } else {
             $categoryData = $this->dataObjectProcessor->buildOutputDataArray($category, CategoryInterface::class);
-            $categoryData['product_count'] = $category->getProductCount();
         }
         $categoryData['id'] = $category->getId();
         $categoryData['children'] = [];
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php
index 557c7e08ff43..59c21b6b0109 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php
@@ -65,7 +65,7 @@ public function resolve(
                 'eq' => $value['id']
             ]
         ];
-        $searchCriteria = $this->searchCriteriaBuilder->build($field->getName(), $args);
+            $searchCriteria = $this->searchCriteriaBuilder->build($field->getName(), $args);
         $searchCriteria->setCurrentPage($args['currentPage']);
         $searchCriteria->setPageSize($args['pageSize']);
         $searchResult = $this->filterQuery->getResult($searchCriteria, $info);
diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
index 5d62cb63f166..7f31266ebf26 100644
--- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -379,7 +379,7 @@ interface CategoryInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model
     level: Int @doc(description: "Indicates the depth of the category within the tree")
     created_at: String @doc(description: "Timestamp indicating when the category was created")
     updated_at: String @doc(description: "Timestamp indicating when the category was updated")
-    product_count: Int @doc(description: "The number of products in the category")
+    product_count: Int @doc(description: "The number of products in the category") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\ProductsCount")
     default_sort_by: String @doc(description: "The attribute to use for sorting")
     products(
         pageSize: Int = 20 @doc(description: "Specifies the maximum number of results to return at once. This attribute is optional."),

From 9aacf0e0f9044c133786de725fbe5d926c0223d5 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Thu, 8 Nov 2018 15:29:11 +0100
Subject: [PATCH 2/4] Missing resolver added

---
 .../Model/Resolver/Category/Products.php      |  2 +-
 .../Model/Resolver/Category/ProductsCount.php | 70 +++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php
index 59c21b6b0109..557c7e08ff43 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php
@@ -65,7 +65,7 @@ public function resolve(
                 'eq' => $value['id']
             ]
         ];
-            $searchCriteria = $this->searchCriteriaBuilder->build($field->getName(), $args);
+        $searchCriteria = $this->searchCriteriaBuilder->build($field->getName(), $args);
         $searchCriteria->setCurrentPage($args['currentPage']);
         $searchCriteria->setPageSize($args['pageSize']);
         $searchResult = $this->filterQuery->getResult($searchCriteria, $info);
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php
new file mode 100644
index 000000000000..397fd12b7e71
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Category;
+
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor\StockProcessor;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * Retrieves products count for a category
+ */
+class ProductsCount implements ResolverInterface
+{
+    /**
+     * @var Visibility
+     */
+    private $catalogProductVisibility;
+
+    /**
+     * @var StockProcessor
+     */
+    private $stockProcessor;
+
+    /**
+     * @var SearchCriteriaInterface
+     */
+    private $searchCriteria;
+
+    /**
+     * @param Visibility $catalogProductVisibility
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param StockProcessor $stockProcessor
+     */
+    public function __construct(
+        Visibility $catalogProductVisibility,
+        SearchCriteriaInterface $searchCriteria,
+        StockProcessor $stockProcessor
+    ) {
+        $this->catalogProductVisibility = $catalogProductVisibility;
+        $this->searchCriteria = $searchCriteria;
+        $this->stockProcessor = $stockProcessor;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['model'])) {
+            throw new GraphQlInputException(__('"model" value should be specified'));
+        }
+        /** @var Category $category */
+        $category = $value['model'];
+        $productsCollection = $category->getProductCollection();
+        $productsCollection->setVisibility($this->catalogProductVisibility->getVisibleInSiteIds());
+        $productsCollection = $this->stockProcessor->process($productsCollection, $this->searchCriteria, []);
+
+        return $productsCollection->getSize();
+    }
+}

From 19c1f871b6bb1853ad960edfc3f6c8372c8a3e4f Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Tue, 13 Nov 2018 11:40:06 +0100
Subject: [PATCH 3/4] API-functional tests coverage

---
 .../Catalog/CategoryProductsCountTest.php     | 143 ++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsCountTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsCountTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsCountTest.php
new file mode 100644
index 000000000000..eddd456a7b86
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsCountTest.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\Product\Attribute\Source\Status as productStatus;
+
+/**
+ * Class CategoryProductsCountTest
+ *
+ * Test for Magento\CatalogGraphQl\Model\Resolver\Category\ProductsCount resolver
+ */
+class CategoryProductsCountTest extends GraphQlAbstract
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $objectManager->create(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testCategoryWithSaleableProduct()
+    {
+        $categoryId = 2;
+
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+      id
+      product_count
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertEquals(1, $response['category']['product_count']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/category_product.php
+     */
+    public function testCategoryWithInvisibleProduct()
+    {
+        $categoryId = 333;
+        $sku = 'simple333';
+
+        $product = $this->productRepository->get($sku);
+        $product->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE);
+        $this->productRepository->save($product);
+
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+      id
+      product_count
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertEquals(0, $response['category']['product_count']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
+     */
+    public function testCategoryWithOutOfStockProductManageStockEnabled()
+    {
+        $categoryId = 2;
+
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+      id
+      product_count
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertEquals(0, $response['category']['product_count']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/category_product.php
+     */
+    public function testCategoryWithOutOfStockProductManageStockDisabled()
+    {
+        $categoryId = 333;
+
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+      id
+      product_count
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertEquals(1, $response['category']['product_count']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/category_product.php
+     */
+    public function testCategoryWithDisabledProduct()
+    {
+        $categoryId = 333;
+        $sku = 'simple333';
+
+        $product = $this->productRepository->get($sku);
+        $product->setStatus(ProductStatus::STATUS_DISABLED);
+        $this->productRepository->save($product);
+
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+      id
+      product_count
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertEquals(0, $response['category']['product_count']);
+    }
+}

From 3694c65e95fa12258afdfc561ff29ad23fb00969 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Tue, 20 Nov 2018 12:12:37 +0100
Subject: [PATCH 4/4] Added model to category data upon the hydration

---
 app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php b/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php
index e783c749fdc6..d2c1fc8f7be9 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php
@@ -56,6 +56,7 @@ public function hydrateCategory(Category $category, $basicFieldsOnly = false) :
         $categoryData['id'] = $category->getId();
         $categoryData['children'] = [];
         $categoryData['available_sort_by'] = $category->getAvailableSortBy();
+        $categoryData['model'] = $category;
         return $this->flattener->flatten($categoryData);
     }
 }