Always add sku to product url format params (#876)

Author: buuhuu

bundles/core/src/main/java/com/adobe/cq/commerce/core/components/internal/services/UrlProviderImpl.java

@@ -255,6 +255,7 @@ public String toProductUrl(SlingHttpServletRequest request, Page page, String pr
                     ProductInterface product = retriever.fetchProduct();
                     if (product != null) {
                         params = new ProductUrlFormat.Params(product);
+                        params.setSku(productIdentifier);
                     } else {
                         LOGGER.debug("Could not generate product page URL for {}.", productIdentifier);
                     }

bundles/core/src/test/java/com/adobe/cq/commerce/core/components/internal/services/UrlProviderImplTest.java

@@ -44,6 +44,7 @@
 import com.adobe.cq.commerce.core.components.internal.services.urlformats.CategoryPageWithUrlKey;
 import com.adobe.cq.commerce.core.components.internal.services.urlformats.ProductPageWithCategoryAndUrlKey;
 import com.adobe.cq.commerce.core.components.internal.services.urlformats.ProductPageWithSku;
+import com.adobe.cq.commerce.core.components.internal.services.urlformats.ProductPageWithSkuAndUrlKey;
 import com.adobe.cq.commerce.core.components.internal.services.urlformats.ProductPageWithUrlPath;
 import com.adobe.cq.commerce.core.components.services.ComponentsConfiguration;
 import com.adobe.cq.commerce.core.components.services.urls.CategoryUrlFormat;
@@ -93,6 +94,8 @@ public void setup() throws Exception {
 
         Utils.setupHttpResponse("graphql/magento-graphql-product-result.json", httpClient, HttpStatus.SC_OK,
             "{products(filter:{sku:{eq:\"MJ01\"}}");
+        Utils.setupHttpResponse("graphql/magento-graphql-product-result-url-parameters.json", httpClient, HttpStatus.SC_OK,
+            "{products(filter:{sku:{eq:\"MJ03\"}}");
         Utils.setupHttpResponse("graphql/magento-graphql-product-not-found-result.json", httpClient, HttpStatus.SC_OK,
             "{products(filter:{sku:{eq:\"MJ02\"}}");
         Utils.setupHttpResponse("graphql/magento-graphql-product-sku.json", httpClient, HttpStatus.SC_OK,
@@ -224,6 +227,21 @@ public void testProductUrlOnlySKU() {
         verify(graphqlClient, never()).execute(any(), any(), any(), any());
     }
 
+    @Test
+    public void testProductUrlWithSKUProductNotFound() {
+        Page page = context.currentPage("/content/product-page");
+        MockOsgi.deactivate(urlProvider, context.bundleContext());
+        MockOsgi.activate(urlProvider, context.bundleContext(), "productPageUrlFormat", ProductPageWithSkuAndUrlKey.PATTERN);
+
+        // Not found, sku set
+        String url = urlProvider.toProductUrl(request, page, "MJ02");
+        assertEquals("/content/product-page.html/MJ02.html", url);
+
+        // found, parameters queried without sku set
+        url = urlProvider.toProductUrl(request, page, "MJ03");
+        assertEquals("/content/product-page.html/MJ03/test-url-key.html", url);
+    }
+
     @Test
     public void testProductPageWithinAnotherProductPagesContext() {
         Page page = context.currentPage("/content/product-page");

bundles/core/src/test/resources/graphql/magento-graphql-product-result-url-parameters.json

@@ -0,0 +1,15 @@
+{
+  "data": {
+    "products": {
+      "items": [
+        {
+          "__typename": "ConfigurableProduct",
+          "url_key": "test-url-key",
+          "url_rewrites": [{
+            "url": "test-url-key"
+          }]
+        }
+      ]
+    }
+  }
+}