Merge pull request #6805 from magento-honey-badgers/PWA-1654

Prabhu Ram · web-flow · commit d4f3adfeeb81 · 2021-04-30T16:19:50.000-05:00
[honey] PWA-1654: Staged upcoming products don't show up in categoryList query
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoriesQuery.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoriesQuery.php
@@ -85,8 +85,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__($e->getMessage()));
         }
 
-        $rootCategoryIds = $filterResult['category_ids'];
-        $filterResult['items'] = $this->fetchCategories($rootCategoryIds, $info);
+        $rootCategoryIds = $filterResult['category_ids'] ?? [];
+
+        $filterResult['items'] = $this->fetchCategories($rootCategoryIds, $info, (int) $store->getId());
         return $filterResult;
     }
 
@@ -95,13 +96,14 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
      *
      * @param array $categoryIds
      * @param ResolveInfo $info
+     * @param int $storeId
      * @return array
      */
-    private function fetchCategories(array $categoryIds, ResolveInfo $info)
+    private function fetchCategories(array $categoryIds, ResolveInfo $info, int $storeId)
     {
         $fetchedCategories = [];
         foreach ($categoryIds as $categoryId) {
-            $categoryTree = $this->categoryTree->getTree($info, $categoryId);
+            $categoryTree = $this->categoryTree->getTree($info, $categoryId, $storeId);
             if (empty($categoryTree)) {
                 continue;
             }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryList.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryList.php
@@ -81,22 +81,22 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         } catch (InputException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
         }
-
-        return $this->fetchCategories($rootCategoryIds, $info);
+        return $this->fetchCategories($rootCategoryIds, $info, (int) $store->getId());
     }
 
     /**
      * Fetch category tree data
      *
      * @param array $categoryIds
      * @param ResolveInfo $info
+     * @param int $storeId
      * @return array
      */
-    private function fetchCategories(array $categoryIds, ResolveInfo $info)
+    private function fetchCategories(array $categoryIds, ResolveInfo $info, int $storeId)
     {
         $fetchedCategories = [];
         foreach ($categoryIds as $categoryId) {
-            $categoryTree = $this->categoryTree->getTree($info, $categoryId);
+            $categoryTree = $this->categoryTree->getTree($info, $categoryId, $storeId);
             if (empty($categoryTree)) {
                 continue;
             }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
@@ -71,7 +71,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         if ($rootCategoryId !== Category::TREE_ROOT_ID) {
             $this->checkCategoryIsActive->execute($rootCategoryId);
         }
-        $categoriesTree = $this->categoryTree->getTree($info, $rootCategoryId);
+        $store = $context->getExtensionAttributes()->getStore();
+        $categoriesTree = $this->categoryTree->getTree($info, $rootCategoryId, (int)$store->getId());
 
         if (empty($categoriesTree) || ($categoriesTree->count() == 0)) {
             throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
@@ -80,9 +80,11 @@ public function __construct(
      *
      * @param ResolveInfo $resolveInfo
      * @param int $rootCategoryId
+     * @param int $storeId
      * @return \Iterator
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId): \Iterator
+    public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId, int $storeId): \Iterator
     {
         $categoryQuery = $resolveInfo->fieldNodes[0];
         $collection = $this->collectionFactory->create();
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/Model/DataProvider/UrlRewrite/CatalogTreeDataProvider.php b/app/code/Magento/CatalogUrlRewriteGraphQl/Model/DataProvider/UrlRewrite/CatalogTreeDataProvider.php
@@ -52,16 +52,18 @@ public function __construct(
      * @param string $entity_type
      * @param int $id
      * @param ResolveInfo|null $info
+     * @param int|null $storeId
      * @return array
      * @throws GraphQlNoSuchEntityException
      */
     public function getData(
         string $entity_type,
         int $id,
-        ResolveInfo $info = null
+        ResolveInfo $info = null,
+        int $storeId = null
     ): array {
         $categoryId = (int)$id;
-        $categoriesTree = $this->categoryTree->getTree($info, $categoryId);
+        $categoriesTree = $this->categoryTree->getTree($info, $categoryId, $storeId);
         if (empty($categoriesTree) || ($categoriesTree->count() == 0)) {
             throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
         }
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/Model/DataProvider/UrlRewrite/ProductDataProvider.php b/app/code/Magento/CatalogUrlRewriteGraphQl/Model/DataProvider/UrlRewrite/ProductDataProvider.php
@@ -8,6 +8,7 @@
 namespace Magento\CatalogUrlRewriteGraphQl\Model\DataProvider\UrlRewrite;
 
 use Magento\Catalog\Model\ProductRepository;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\UrlRewriteGraphQl\Model\DataProvider\EntityDataProviderInterface;
 
@@ -28,17 +29,23 @@ public function __construct(
     }
 
     /**
-     * Get product data
+     * Get catalog tree data
      *
      * @param string $entity_type
      * @param int $id
      * @param ResolveInfo|null $info
+     * @param int|null $storeId
      * @return array
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getData(string $entity_type, int $id, ResolveInfo $info = null): array
-    {
-        $product = $this->productRepository->getById($id);
+    public function getData(
+        string $entity_type,
+        int $id,
+        ResolveInfo $info = null,
+        int $storeId = null
+    ): array {
+        $product = $this->productRepository->getById($id, false, $storeId);
         $result = $product->getData();
         $result['model'] = $product;
         return $result;
diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/Model/DataProvider/UrlRewrite/Page.php b/app/code/Magento/CmsUrlRewriteGraphQl/Model/DataProvider/UrlRewrite/Page.php
@@ -35,11 +35,17 @@ public function __construct(
      * @param string $entity_type
      * @param int $id
      * @param ResolveInfo|null $info
+     * @param int|null $storeId
      * @return array
      * @throws NoSuchEntityException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getData(string $entity_type, int $id, ResolveInfo $info = null): array
-    {
+    public function getData(
+        string $entity_type,
+        int $id,
+        ResolveInfo $info = null,
+        int $storeId = null
+    ): array {
         $result = $this->pageDataProvider->getDataByPageId((int)$id);
         $result['type_id'] = $entity_type;
         return $result;
diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/DataProvider/EntityDataProviderComposite.php b/app/code/Magento/UrlRewriteGraphQl/Model/DataProvider/EntityDataProviderComposite.php
@@ -33,14 +33,20 @@ public function __construct(array $dataProviders = [])
      * @param string $entity_type
      * @param int $id
      * @param ResolveInfo|null $info
+     * @param int|null $storeId
      * @return array
      */
-    public function getData(string $entity_type, int $id, ResolveInfo $info = null): array
-    {
+    public function getData(
+        string $entity_type,
+        int $id,
+        ResolveInfo $info = null,
+        int $storeId = null
+    ): array {
         return $this->dataProviders[strtolower($entity_type)]->getData(
             $entity_type,
             $id,
-            $info
+            $info,
+            $storeId
         );
     }
 }
diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/DataProvider/EntityDataProviderInterface.php b/app/code/Magento/UrlRewriteGraphQl/Model/DataProvider/EntityDataProviderInterface.php
@@ -17,11 +17,13 @@ interface EntityDataProviderInterface
      * @param string $entity_type
      * @param int $id
      * @param ResolveInfo|null $info
+     * @param int|null $storeId
      * @return array
      */
     public function getData(
         string $entity_type,
         int $id,
-        ResolveInfo $info = null
+        ResolveInfo $info = null,
+        int $storeId = null
     ): array;
 }
diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/Route.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/Route.php
@@ -56,9 +56,14 @@ public function resolve(
             $value,
             $args
         );
-
+        $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
         if ($resultArray) {
-            $result = $this->entityDataProviderComposite->getData($resultArray['type'], (int)$resultArray['id'], $info);
+            $result = $this->entityDataProviderComposite->getData(
+                $resultArray['type'],
+                (int)$resultArray['id'],
+                $info,
+                $storeId
+            );
             $result['redirect_code'] = $resultArray['redirect_code'];
             $result['relative_url'] = $resultArray['relative_url'];
             $result['type'] = $resultArray['type'];

Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value`
`85`	`85`	`throw new GraphQlInputException(__($e->getMessage()));`
`86`	`86`	`}`
`87`	`87`
`88`		`- $rootCategoryIds = $filterResult['category_ids'];`
`89`		`- $filterResult['items'] = $this->fetchCategories($rootCategoryIds, $info);`
	`88`	`+ $rootCategoryIds = $filterResult['category_ids'] ?? [];`
	`89`	`+`
	`90`	`+ $filterResult['items'] = $this->fetchCategories($rootCategoryIds, $info, (int) $store->getId());`
`90`	`91`	`return $filterResult;`
`91`	`92`	`}`
`92`	`93`
`@@ -95,13 +96,14 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value`
`95`	`96`	`*`
`96`	`97`	`* @param array $categoryIds`
`97`	`98`	`* @param ResolveInfo $info`
	`99`	`+ * @param int $storeId`
`98`	`100`	`* @return array`
`99`	`101`	`*/`
`100`		`- private function fetchCategories(array $categoryIds, ResolveInfo $info)`
	`102`	`+ private function fetchCategories(array $categoryIds, ResolveInfo $info, int $storeId)`
`101`	`103`	`{`
`102`	`104`	`$fetchedCategories = [];`
`103`	`105`	`foreach ($categoryIds as $categoryId) {`
`104`		`- $categoryTree = $this->categoryTree->getTree($info, $categoryId);`
	`106`	`+ $categoryTree = $this->categoryTree->getTree($info, $categoryId, $storeId);`
`105`	`107`	`if (empty($categoryTree)) {`
`106`	`108`	`continue;`
`107`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,22 +81,22 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value`
`81`	`81`	`} catch (InputException $e) {`
`82`	`82`	`throw new GraphQlInputException(__($e->getMessage()));`
`83`	`83`	`}`
`84`		`-`
`85`		`- return $this->fetchCategories($rootCategoryIds, $info);`
	`84`	`+ return $this->fetchCategories($rootCategoryIds, $info, (int) $store->getId());`
`86`	`85`	`}`
`87`	`86`
`88`	`87`	`/**`
`89`	`88`	`* Fetch category tree data`
`90`	`89`	`*`
`91`	`90`	`* @param array $categoryIds`
`92`	`91`	`* @param ResolveInfo $info`
	`92`	`+ * @param int $storeId`
`93`	`93`	`* @return array`
`94`	`94`	`*/`
`95`		`- private function fetchCategories(array $categoryIds, ResolveInfo $info)`
	`95`	`+ private function fetchCategories(array $categoryIds, ResolveInfo $info, int $storeId)`
`96`	`96`	`{`
`97`	`97`	`$fetchedCategories = [];`
`98`	`98`	`foreach ($categoryIds as $categoryId) {`
`99`		`- $categoryTree = $this->categoryTree->getTree($info, $categoryId);`
	`99`	`+ $categoryTree = $this->categoryTree->getTree($info, $categoryId, $storeId);`
`100`	`100`	`if (empty($categoryTree)) {`
`101`	`101`	`continue;`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value`
`71`	`71`	`if ($rootCategoryId !== Category::TREE_ROOT_ID) {`
`72`	`72`	`$this->checkCategoryIsActive->execute($rootCategoryId);`
`73`	`73`	`}`
`74`		`- $categoriesTree = $this->categoryTree->getTree($info, $rootCategoryId);`
	`74`	`+ $store = $context->getExtensionAttributes()->getStore();`
	`75`	`+ $categoriesTree = $this->categoryTree->getTree($info, $rootCategoryId, (int)$store->getId());`
`75`	`76`
`76`	`77`	`if (empty($categoriesTree) \|\| ($categoriesTree->count() == 0)) {`
`77`	`78`	`throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));`
Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,11 @@ public function __construct(`
`80`	`80`	`*`
`81`	`81`	`* @param ResolveInfo $resolveInfo`
`82`	`82`	`* @param int $rootCategoryId`
	`83`	`+ * @param int $storeId`
`83`	`84`	`* @return \Iterator`
	`85`	`+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)`
`84`	`86`	`*/`
`85`		`- public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId): \Iterator`
	`87`	`+ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId, int $storeId): \Iterator`
`86`	`88`	`{`
`87`	`89`	`$categoryQuery = $resolveInfo->fieldNodes[0];`
`88`	`90`	`$collection = $this->collectionFactory->create();`