MC-18996: GraphQl Url Resolver doesn't return any results if the url_key doesn't have the extension

- add url prefix to schema

Author: cpartica

app/code/Magento/CatalogUrlRewriteGraphQl/Model/Resolver/CategoryUrlSuffix.php

@@ -7,15 +7,15 @@
 
 namespace Magento\CatalogUrlRewriteGraphQl\Model\Resolver;
 
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Store\Api\Data\StoreInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
- * Returns the url suffix for catalog
+ * Returns the url suffix for category
  */
 class CategoryUrlSuffix implements ResolverInterface
 {
@@ -26,7 +26,7 @@ class CategoryUrlSuffix implements ResolverInterface
      *
      * @var array
      */
-    private $productUrlSuffix = [];
+    private $cateogryUrlSuffix = [];
 
     /**
      * @var ScopeConfigInterface
@@ -35,11 +35,11 @@ class CategoryUrlSuffix implements ResolverInterface
 
     /**
      * @param ScopeConfigInterface $scopeConfig
-     * @param array $productUrlSuffix
+     * @param array $cateogryUrlSuffix
      */
-    public function __construct(ScopeConfigInterface $scopeConfig, array $productUrlSuffix = [])
+    public function __construct(ScopeConfigInterface $scopeConfig, array $cateogryUrlSuffix = [])
     {
-        $this->productUrlSuffix = $productUrlSuffix;
+        $this->cateogryUrlSuffix = $cateogryUrlSuffix;
         $this->scopeConfig = $scopeConfig;
     }
 
@@ -53,25 +53,27 @@ public function resolve(
         array $value = null,
         array $args = null
     ): string {
-        $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
+        /** @var StoreInterface $store */
+        $store = $context->getExtensionAttributes()->getStore();
+        $storeId = (int)$store->getId();
         return $this->getProductUrlSuffix($storeId);
     }
 
     /**
-     * Retrieve product url suffix by store
+     * Retrieve category url suffix by store
      *
      * @param int $storeId
      * @return string
      */
     private function getProductUrlSuffix(int $storeId): string
     {
-        if (!isset($this->productUrlSuffix[$storeId])) {
-            $this->productUrlSuffix[$storeId] = $this->scopeConfig->getValue(
+        if (!isset($this->cateogryUrlSuffix[$storeId])) {
+            $this->cateogryUrlSuffix[$storeId] = $this->scopeConfig->getValue(
                 self::XML_PATH_PRODUCT_URL_SUFFIX,
                 ScopeInterface::SCOPE_STORE,
                 $storeId
             );
         }
-        return $this->productUrlSuffix[$storeId];
+        return $this->cateogryUrlSuffix[$storeId];
     }
 }

app/code/Magento/CatalogUrlRewriteGraphQl/Model/Resolver/ProductUrlSuffix.php

@@ -7,7 +7,7 @@
 
 namespace Magento\CatalogUrlRewriteGraphQl\Model\Resolver;
 
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Store\Api\Data\StoreInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -53,7 +53,9 @@ public function resolve(
         array $value = null,
         array $args = null
     ): string {
-        $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
+        /** @var StoreInterface $store */
+        $store = $context->getExtensionAttributes()->getStore();
+        $storeId = (int)$store->getId();
         return $this->getProductUrlSuffix($storeId);
     }
 

app/code/Magento/CatalogUrlRewriteGraphQl/composer.json

@@ -4,6 +4,7 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
+        "magento/module-store": "*",
         "magento/module-catalog": "*",
         "magento/framework": "*"
     },

app/code/Magento/CatalogUrlRewriteGraphQl/etc/schema.graphqls

@@ -3,13 +3,13 @@
 
 interface ProductInterface {
     url_key: String @doc(description: "The part of the URL that identifies the product")
-    url_suffix: String @doc(description: "The part of the URL that is appended after the url key") @resolver(class: "Magento\\CatalogUrlRewriteGraphQl\\Model\\Resolver\\ProductUrlSuffix")
+    url_suffix: String @doc(description: "The part of the product URL that is appended after the url key") @resolver(class: "Magento\\CatalogUrlRewriteGraphQl\\Model\\Resolver\\ProductUrlSuffix")
     url_path: String @deprecated(reason: "Use product's `canonical_url` or url rewrites instead")
     url_rewrites: [UrlRewrite] @doc(description: "URL rewrites list") @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\UrlRewrite")
 }
 
 interface CategoryInterface {
-    url_suffix: String @doc(description: "The part of the URL that is appended after the url key") @resolver(class: "Magento\\CatalogUrlRewriteGraphQl\\Model\\Resolver\\CategoryUrlSuffix")
+    url_suffix: String @doc(description: "The part of the category URL that is appended after the url key") @resolver(class: "Magento\\CatalogUrlRewriteGraphQl\\Model\\Resolver\\CategoryUrlSuffix")
 }
 
 input ProductFilterInput {