CIF-1464 - The FeaturedCategoryList component does not use the UrlPro… (

#309) * CIF-1464 - The FeaturedCategoryList component does not use the UrlProvider service - replaced hard-coded String format with urlProvider * CIF-1464 - The FeaturedCategoryList component does not use the UrlProvider service - also pass url_path to UrlProvider Co-authored-by: Mark J. Becker <[email protected]>
adobe · Jun 18, 2020 · 6356b21 · 6356b21
1 parent f374f88
commit 6356b21
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/...cq/commerce/core/components/internal/models/v1/categorylist/FeaturedCategoryListImpl.java b/...cq/commerce/core/components/internal/models/v1/categorylist/FeaturedCategoryListImpl.java
@@ -28,12 +28,15 @@
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.models.annotations.Model;
+import org.apache.sling.models.annotations.injectorspecific.Self;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.adobe.cq.commerce.core.components.client.MagentoGraphqlClient;
 import com.adobe.cq.commerce.core.components.models.categorylist.FeaturedCategoryList;
 import com.adobe.cq.commerce.core.components.models.retriever.AbstractCategoriesRetriever;
+import com.adobe.cq.commerce.core.components.services.UrlProvider;
+import com.adobe.cq.commerce.core.components.services.UrlProvider.ParamsBuilder;
 import com.adobe.cq.commerce.core.components.utils.SiteNavigation;
 import com.adobe.cq.commerce.magento.graphql.CategoryTree;
 import com.day.cq.dam.api.Asset;
@@ -61,10 +64,14 @@ public class FeaturedCategoryListImpl implements FeaturedCategoryList {
     @Inject
     private Page currentPage;
 
-    private Map<String, Asset> assetOverride;
+    @Inject
+    private UrlProvider urlProvider;
 
-    private Page categoryPage;
+    @Self
+    private SlingHttpServletRequest request;
 
+    private Map<String, Asset> assetOverride;
+    private Page categoryPage;
     private AbstractCategoriesRetriever categoriesRetriever;
 
     @PostConstruct
@@ -120,7 +127,11 @@ public List<CategoryTree> getCategories() {
         }
         List<CategoryTree> categories = categoriesRetriever.fetchCategories();
         for (CategoryTree category : categories) {
-            category.setPath(String.format("%s.%s.html", categoryPage.getPath(), category.getId()));
+            Map<String, String> params = new ParamsBuilder()
+                .id(category.getId().toString())
+                .urlPath(category.getUrlPath())
+                .map();
+            category.setPath(urlProvider.toCategoryUrl(request, categoryPage, params));
 
             // Replace image if there is an asset override
             String id = category.getId().toString();

diff --git a/...ommerce/core/components/internal/models/v1/categorylist/FeaturedCategoryListImplTest.java b/...ommerce/core/components/internal/models/v1/categorylist/FeaturedCategoryListImplTest.java
@@ -27,6 +27,9 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import com.adobe.cq.commerce.core.components.internal.services.MockUrlProviderConfiguration;
+import com.adobe.cq.commerce.core.components.internal.services.UrlProviderImpl;
+import com.adobe.cq.commerce.core.components.services.UrlProvider;
 import com.adobe.cq.commerce.core.components.testing.Utils;
 import com.adobe.cq.commerce.graphql.client.GraphqlClient;
 import com.adobe.cq.commerce.magento.graphql.CategoryTree;
@@ -201,6 +204,9 @@ public void verifyIgnoreInvalidAsset() {
     private AemContext createContext(String contentPath) {
         return new AemContext((AemContextCallback) context -> {
             context.load().json(contentPath, "/content");
+            UrlProviderImpl urlProvider = new UrlProviderImpl();
+            urlProvider.activate(new MockUrlProviderConfiguration());
+            context.registerService(UrlProvider.class, urlProvider);
         }, ResourceResolverType.JCR_MOCK);
     }
 }