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

- fix code review in category class

Author: cpartica

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

@@ -19,14 +19,19 @@
  */
 class CategoryUrlSuffix implements ResolverInterface
 {
-    const XML_PATH_PRODUCT_URL_SUFFIX = 'catalog/seo/category_url_suffix';
+    /**
+     * System setting for the url suffix for categories
+     *
+     * @var string
+     */
+    private static $xml_path_category_url_suffix = 'catalog/seo/category_url_suffix';
 
     /**
      * Cache for product rewrite suffix
      *
      * @var array
      */
-    private $cateogryUrlSuffix = [];
+    private $categoryUrlSuffix = [];
 
     /**
      * @var ScopeConfigInterface
@@ -35,11 +40,9 @@ class CategoryUrlSuffix implements ResolverInterface
 
     /**
      * @param ScopeConfigInterface $scopeConfig
-     * @param array $cateogryUrlSuffix
      */
-    public function __construct(ScopeConfigInterface $scopeConfig, array $cateogryUrlSuffix = [])
+    public function __construct(ScopeConfigInterface $scopeConfig)
     {
-        $this->cateogryUrlSuffix = $cateogryUrlSuffix;
         $this->scopeConfig = $scopeConfig;
     }
 
@@ -56,7 +59,7 @@ public function resolve(
         /** @var StoreInterface $store */
         $store = $context->getExtensionAttributes()->getStore();
         $storeId = (int)$store->getId();
-        return $this->getProductUrlSuffix($storeId);
+        return $this->getCategoryUrlSuffix($storeId);
     }
 
     /**
@@ -65,15 +68,15 @@ public function resolve(
      * @param int $storeId
      * @return string
      */
-    private function getProductUrlSuffix(int $storeId): string
+    private function getCategoryUrlSuffix(int $storeId): string
     {
-        if (!isset($this->cateogryUrlSuffix[$storeId])) {
-            $this->cateogryUrlSuffix[$storeId] = $this->scopeConfig->getValue(
-                self::XML_PATH_PRODUCT_URL_SUFFIX,
+        if (!isset($this->categoryUrlSuffix[$storeId])) {
+            $this->categoryUrlSuffix[$storeId] = $this->scopeConfig->getValue(
+                self::$xml_path_category_url_suffix,
                 ScopeInterface::SCOPE_STORE,
                 $storeId
             );
         }
-        return $this->cateogryUrlSuffix[$storeId];
+        return $this->categoryUrlSuffix[$storeId];
     }
 }

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

@@ -19,7 +19,12 @@
  */
 class ProductUrlSuffix implements ResolverInterface
 {
-    const XML_PATH_PRODUCT_URL_SUFFIX = 'catalog/seo/product_url_suffix';
+    /**
+     * System setting for the url suffix for products
+     *
+     * @var string
+     */
+    private static $xml_path_product_url_suffix = 'catalog/seo/product_url_suffix';
 
     /**
      * Cache for product rewrite suffix
@@ -35,11 +40,9 @@ class ProductUrlSuffix implements ResolverInterface
 
     /**
      * @param ScopeConfigInterface $scopeConfig
-     * @param array $productUrlSuffix
      */
-    public function __construct(ScopeConfigInterface $scopeConfig, array $productUrlSuffix = [])
+    public function __construct(ScopeConfigInterface $scopeConfig)
     {
-        $this->productUrlSuffix = $productUrlSuffix;
         $this->scopeConfig = $scopeConfig;
     }
 
@@ -69,7 +72,7 @@ private function getProductUrlSuffix(int $storeId): string
     {
         if (!isset($this->productUrlSuffix[$storeId])) {
             $this->productUrlSuffix[$storeId] = $this->scopeConfig->getValue(
-                self::XML_PATH_PRODUCT_URL_SUFFIX,
+                self::$xml_path_product_url_suffix,
                 ScopeInterface::SCOPE_STORE,
                 $storeId
             );

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

@@ -2,7 +2,7 @@
 # See COPYING.txt for license details.
 
 type Query {
-    urlResolver(url: String!): EntityUrl @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\EntityUrl") @doc(description: "The urlResolver query returns the relative URL for a specified product, category or CMS page, using as input a url_key prepended by the url_suffix, if one exists") @cache(cacheIdentity: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\UrlRewrite\\UrlResolverIdentity")
+    urlResolver(url: String!): EntityUrl @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\EntityUrl") @doc(description: "The urlResolver query returns the relative URL for a specified product, category or CMS page, using as input a url_key appended by the url_suffix, if one exists") @cache(cacheIdentity: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\UrlRewrite\\UrlResolverIdentity")
 }
 
 type EntityUrl @doc(description: "EntityUrl is an output object containing the `id`, `relative_url`, and `type` attributes") {