chore: fixed specs

medusajs · Mar 2, 2023 · de5b5d9 · de5b5d9
1 parent d5996f2
commit de5b5d9
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 7 deletions.
diff --git a/packages/medusa/src/api/routes/admin/product-categories/update-product-category.ts b/packages/medusa/src/api/routes/admin/product-categories/update-product-category.ts
@@ -115,6 +115,9 @@ export default async (req: Request, res: Response) => {
  * parent_category_id:
  * type: string
  * description: The ID of the parent product category
+ * position:
+ * type: number
+ * description: The position of the category in the tree node (starting from 0)
  */
 // eslint-disable-next-line max-len
 export class AdminPostProductCategoriesCategoryReq extends AdminProductCategoriesReqBase {

diff --git a/packages/medusa/src/repositories/__mocks__/product-category.ts b/packages/medusa/src/repositories/__mocks__/product-category.ts
@@ -45,6 +45,7 @@ export const productCategoryRepositoryMock = {
  if (query.where.id === IdMap.getId(validProdCategoryIdWithChildren)) {
  return Promise.resolve({
  id: IdMap.getId(validProdCategoryIdWithChildren),
+ parent_category_id: null,
  category_children: [{
  id: IdMap.getId(validProdCategoryId),
  }]
@@ -53,6 +54,7 @@ export const productCategoryRepositoryMock = {
 
  return Promise.resolve({
  id: IdMap.getId(validProdCategoryId),
+ parent_category_id: null,
  category_children: []
  })
  },
@@ -74,10 +76,12 @@ export const productCategoryRepositoryMock = {
 
  return Promise.resolve([{
  id: IdMap.getId(validProdCategoryWithSiblings),
+ parent_category_id: null,
  category_children: [],
  position: 0
  }, {
  id: IdMap.getId(validProdCategoryId),
+ parent_category_id: null,
  category_children: [],
  position: 1
  }])

diff --git a/packages/medusa/src/services/__tests__/product-category.ts b/packages/medusa/src/services/__tests__/product-category.ts
@@ -62,14 +62,15 @@ describe("ProductCategoryService", () => {
  expect(productCategoryRepository.getFreeTextSearchResultsAndCount).toHaveBeenCalledWith(
  {
  order: {
- created_at: "DESC",
+ position: "ASC",
  },
  skip: 0,
  take: 100,
  where: {},
  },
  validID,
- {}
+ {},
+ false,
  )
  })
 
@@ -89,7 +90,19 @@ describe("ProductCategoryService", () => {
 
  expect(result[0].id).toEqual(validID)
  expect(productCategoryRepository.getFreeTextSearchResultsAndCount).toHaveBeenCalledTimes(1)
- expect(productCategoryRepository.findDescendantsTree).toHaveBeenCalledTimes(1)
+ expect(productCategoryRepository.getFreeTextSearchResultsAndCount).toHaveBeenCalledWith(
+ {
+ order: {
+ position: "ASC",
+ },
+ skip: 0,
+ take: 100,
+ where: {},
+ },
+ undefined,
+ {},
+ true,
+ )
  })
  })
 
@@ -168,6 +181,7 @@ describe("ProductCategoryService", () => {
  expect(productCategoryRepository.save).toBeCalledWith({
  id: IdMap.getId(validProdCategoryId),
  category_children: [],
+ parent_category_id: null,
  position: 0,
  })
  })

diff --git a/packages/medusa/src/services/product-category.ts b/packages/medusa/src/services/product-category.ts
@@ -61,7 +61,7 @@ class ProductCategoryService extends TransactionBaseService {
  config: FindConfig<ProductCategory> = {
  skip: 0,
  take: 100,
- order: { created_at: "DESC" },
+ order: { position: "ASC" },
  },
  treeSelector: QuerySelector<ProductCategory> = {}
  ): Promise<[ProductCategory[], number]> {
@@ -304,7 +304,7 @@ class ProductCategoryService extends TransactionBaseService {
  shouldDeleteElement = false
  ): ReorderConditions {
  const originalParentId = productCategory.parent_category_id
- const targetParentId = input.parent_category_id || null
+ const targetParentId = input.parent_category_id
  const originalPosition = productCategory.position
  const targetPosition = input.position
  const shouldChangeParent =
@@ -436,7 +436,7 @@ class ProductCategoryService extends TransactionBaseService {
  // Depending on the condition, we could also have the targetCategory
  // in the siblings list, we skip shifting the target until all other siblings
  // have been shifted.
- if (targetCategoryId === sibling.id) {
+ if (sibling.id === targetCategoryId) {
  continue
  }
 

diff --git a/packages/medusa/src/types/product-category.ts b/packages/medusa/src/types/product-category.ts
@@ -50,7 +50,7 @@ export class ProductBatchProductCategory {
 export type ReorderConditions = {
  targetCategoryId: string
  originalParentId: string | null
- targetParentId: string | null
+ targetParentId: string | null | undefined
  originalPosition: number
  targetPosition: number | undefined
  shouldChangeParent: boolean