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

@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewriteGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\LocalizedException;
+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
+ */
+class CategoryUrlSuffix implements ResolverInterface
+{
+    const XML_PATH_PRODUCT_URL_SUFFIX = 'catalog/seo/category_url_suffix';
+
+    /**
+     * Cache for product rewrite suffix
+     *
+     * @var array
+     */
+    private $productUrlSuffix = [];
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     * @param array $productUrlSuffix
+     */
+    public function __construct(ScopeConfigInterface $scopeConfig, array $productUrlSuffix = [])
+    {
+        $this->productUrlSuffix = $productUrlSuffix;
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ): string {
+        $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
+        return $this->getProductUrlSuffix($storeId);
+    }
+
+    /**
+     * Retrieve product 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(
+                self::XML_PATH_PRODUCT_URL_SUFFIX,
+                ScopeInterface::SCOPE_STORE,
+                $storeId
+            );
+        }
+        return $this->productUrlSuffix[$storeId];
+    }
+}

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

@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewriteGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\LocalizedException;
+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 product
+ */
+class ProductUrlSuffix implements ResolverInterface
+{
+    const XML_PATH_PRODUCT_URL_SUFFIX = 'catalog/seo/product_url_suffix';
+
+    /**
+     * Cache for product rewrite suffix
+     *
+     * @var array
+     */
+    private $productUrlSuffix = [];
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     * @param array $productUrlSuffix
+     */
+    public function __construct(ScopeConfigInterface $scopeConfig, array $productUrlSuffix = [])
+    {
+        $this->productUrlSuffix = $productUrlSuffix;
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ): string {
+        $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
+        return $this->getProductUrlSuffix($storeId);
+    }
+
+    /**
+     * Retrieve product 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(
+                self::XML_PATH_PRODUCT_URL_SUFFIX,
+                ScopeInterface::SCOPE_STORE,
+                $storeId
+            );
+        }
+        return $this->productUrlSuffix[$storeId];
+    }
+}

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

@@ -3,10 +3,15 @@
 
 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_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")
+}
+
 input ProductFilterInput {
     url_key: FilterTypeInput @doc(description: "The part of the URL that identifies the product")
     url_path: FilterTypeInput @deprecated(reason: "Use product's `canonical_url` or url rewrites instead")