Merge pull request #14 from vtex-apps/fix/categoryTree

in categoryTree, prevent empty answer when categoryId is not found

CHANGELOG.md

@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Prevents empty answer in categoryTree if categoryId for product is not found in categoriesIds.
 
 ## [0.6.1] - 2019-10-15
 ### Fixed

node/resolvers/catalog/product.test.ts

@@ -27,8 +27,8 @@ describe('tests related to product resolver', () => {
         mockContext as any
       )
       expect(mockContext.clients.catalog.category).toBeCalledTimes(2)
-      expect(mockContext.clients.catalog.category.mock.calls[0][0]).toBe(10)
-      expect(mockContext.clients.catalog.category.mock.calls[1][0]).toBe(25)
+      expect(mockContext.clients.catalog.category.mock.calls[0][0]).toBe(25)
+      expect(mockContext.clients.catalog.category.mock.calls[1][0]).toBe(10)
     })
 
     test('get correct main category tree for product with more than one tree', async () => {
@@ -53,11 +53,11 @@ describe('tests related to product resolver', () => {
         mockContext as any
       )
       expect(mockContext.clients.catalog.category).toBeCalledTimes(3)
-      expect(mockContext.clients.catalog.category.mock.calls[0][0]).toBe(
+      expect(mockContext.clients.catalog.category.mock.calls[0][0]).toBe(101)
+      expect(mockContext.clients.catalog.category.mock.calls[1][0]).toBe(101003)
+      expect(mockContext.clients.catalog.category.mock.calls[2][0]).toBe(
         101003009
       )
-      expect(mockContext.clients.catalog.category.mock.calls[1][0]).toBe(101003)
-      expect(mockContext.clients.catalog.category.mock.calls[2][0]).toBe(101)
     })
 
     test('ensure that GC account calls the category tree API ', async () => {
@@ -87,5 +87,23 @@ describe('tests related to product resolver', () => {
       expect(mockContext.clients.catalog.categories.mock.calls[0][0]).toBe(2) //ensure maximum level was correct
       expect(result!.length).toBe(2)
     })
+
+    test('if categoryId does not match any id in categoriesIds, find biggest tree', async () => {
+      const catalogProduct = getProduct()
+      catalogProduct.categoryId = '1'
+      catalogProduct.categoriesIds = ['/2064927469/', '/2064927469/630877787/']
+      await resolvers.Product.categoryTree(
+        catalogProduct as any,
+        {},
+        mockContext as any
+      )
+      expect(mockContext.clients.catalog.category).toBeCalledTimes(2)
+      expect(mockContext.clients.catalog.category.mock.calls[0][0]).toBe(
+        2064927469
+      )
+      expect(mockContext.clients.catalog.category.mock.calls[1][0]).toBe(
+        630877787
+      )
+    })
   })
 })

node/resolvers/catalog/product.ts

@@ -6,7 +6,6 @@ import {
   prop,
   propOr,
   reject,
-  reverse,
   split,
   toPairs,
 } from 'ramda'
@@ -61,6 +60,25 @@ const treeStringToArray = compose(
   removeStartingSlashes
 )
 
+const findMainTree = (categoriesIds: string[], prodCategoryId: string) => {
+  const mainTree = categoriesIds.find(
+    treeIdString => getLastCategory(treeIdString) === prodCategoryId
+  )
+  if (mainTree) {
+    return treeStringToArray(mainTree)
+  }
+
+  // If we are here, did not find the specified main category ID in given strings. It is probably a bug.
+  // We will return the biggest tree we find
+
+  const trees = categoriesIds.map(treeStringToArray)
+
+  return trees.reduce(
+    (acc, currTree) => (currTree.length > acc.length ? currTree : acc),
+    []
+  )
+}
+
 const productCategoriesToCategoryTree = async (
   { categories, categoriesIds, categoryId: prodCategoryId }: CatalogProduct,
   _: any,
@@ -70,22 +88,14 @@ const productCategoriesToCategoryTree = async (
     return []
   }
 
-  const mainTree = categoriesIds.find(
-    treeIdString => getLastCategory(treeIdString) === prodCategoryId
-  )
-
-  if (!mainTree) {
-    return []
-  }
-  const mainTreeIds = treeStringToArray(mainTree)
-  const reversedIds = reverse(mainTreeIds)
+  const mainTreeIds = findMainTree(categoriesIds, prodCategoryId)
 
   if (platform === 'vtex') {
-    return reversedIds.map(categoryId => catalog.category(Number(categoryId)))
+    return mainTreeIds.map(categoryId => catalog.category(Number(categoryId)))
   }
-  const categoriesTree = await catalog.categories(reversedIds.length)
+  const categoriesTree = await catalog.categories(mainTreeIds.length)
   const categoryMap = buildCategoryMap(categoriesTree)
-  const mappedCategories = reversedIds
+  const mappedCategories = mainTreeIds
     .map(id => categoryMap[id])
     .filter(Boolean)