Skip to content

fix(product): Category repository missing ontext #9688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 5 commits into from
Oct 21, 2024
+35 −37
Merged

fix(product): Category repository missing ontext #9688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b419a43
fix(product): Category repository missing ontext
adrien2p Oct 21, 2024
b1ae253
fix tests
adrien2p Oct 21, 2024
3b5faf9
Update packages/modules/product/integration-tests/__tests__/product-c…
adrien2p Oct 21, 2024
3a86bbf
FIX tests
adrien2p Oct 21, 2024
b7092ec
Merge branch 'develop' into fix/product-category-repository
adrien2p Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/core/utils/src/dal/mikro-orm/mikro-orm-repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class MikroOrmBase<T = any> {
transactionManager,
manager,
}: Context = {}): TManager {
return (transactionManager ?? manager ?? this.manager_) as TManager
return (transactionManager ?? manager ?? this.getFreshManager()) as TManager
}

async transaction<TManager = unknown>(
Expand Down
62 changes: 29 additions & 33 deletions packages/modules/product/integration-tests/__tests__/product-category.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,38 +235,38 @@ moduleIntegrationTestRunner<Service>({
mpath:
"electronics.computers.laptops.gaming-laptops.high-performance.4k-gaming",
parent_category_id: "high-performance",
parent_category: {
parent_category: expect.objectContaining({
id: "high-performance",
parent_category_id: "gaming-laptops",
handle: "high-performance-gaming-laptops",
mpath:
"electronics.computers.laptops.gaming-laptops.high-performance",
parent_category: {
parent_category: expect.objectContaining({
id: "gaming-laptops",
handle: "gaming-laptops",
mpath: "electronics.computers.laptops.gaming-laptops",
parent_category_id: "laptops",
parent_category: {
parent_category: expect.objectContaining({
id: "laptops",
parent_category_id: "computers",
handle: "laptops",
mpath: "electronics.computers.laptops",
parent_category: {
parent_category: expect.objectContaining({
id: "computers",
handle: "computers-&-accessories",
mpath: "electronics.computers",
parent_category_id: "electronics",
parent_category: {
parent_category: expect.objectContaining({
id: "electronics",
parent_category_id: null,
handle: "electronics",
mpath: "electronics",
parent_category: null,
},
},
},
},
},
}),
}),
}),
}),
}),
},
])
})
Expand Down Expand Up @@ -421,38 +421,38 @@ moduleIntegrationTestRunner<Service>({
handle: "category-1-a",
mpath: "category-0.category-1.category-1-a",
parent_category_id: "category-1",
parent_category: {
parent_category: expect.objectContaining({
id: "category-1",
handle: "category-1",
mpath: "category-0.category-1",
parent_category_id: "category-0",
parent_category: {
parent_category: expect.objectContaining({
id: "category-0",
handle: "category-0",
mpath: "category-0",
parent_category_id: null,
parent_category: null,
},
},
}),
}),
},
{
id: "category-1-b",
handle: "category-1-b",
mpath: "category-0.category-1.category-1-b",
parent_category_id: "category-1",
parent_category: {
parent_category: expect.objectContaining({
id: "category-1",
handle: "category-1",
mpath: "category-0.category-1",
parent_category_id: "category-0",
parent_category: {
parent_category: expect.objectContaining({
id: "category-0",
handle: "category-0",
mpath: "category-0",
parent_category_id: null,
parent_category: null,
},
},
}),
}),
},
])
})
Expand All @@ -469,56 +469,52 @@ moduleIntegrationTestRunner<Service>({
}
)

const serializedObject = JSON.parse(
JSON.stringify(productCategoryResults)
)

expect(serializedObject).toEqual([
expect(productCategoryResults).toEqual([
{
id: "category-1-a",
handle: "category-1-a",
mpath: "category-0.category-1.category-1-a",
parent_category_id: "category-1",
parent_category: {
parent_category: expect.objectContaining({
id: "category-1",
handle: "category-1",
mpath: "category-0.category-1",
parent_category_id: "category-0",
parent_category: {
parent_category: expect.objectContaining({
id: "category-0",
handle: "category-0",
mpath: "category-0",
parent_category_id: null,
parent_category: null,
},
},
}),
}),
category_children: [],
},
{
id: "category-1-b",
handle: "category-1-b",
mpath: "category-0.category-1.category-1-b",
parent_category_id: "category-1",
parent_category: {
parent_category: expect.objectContaining({
id: "category-1",
handle: "category-1",
mpath: "category-0.category-1",
parent_category_id: "category-0",
parent_category: {
parent_category: expect.objectContaining({
id: "category-0",
handle: "category-0",
mpath: "category-0",
parent_category_id: null,
parent_category: null,
},
},
}),
}),
category_children: [
{
expect.objectContaining({
id: "category-1-b-1",
handle: "category-1-b-1",
mpath: "category-0.category-1.category-1-b.category-1-b-1",
parent_category_id: "category-1-b",
},
}),
],
},
])
Expand Down
8 changes: 5 additions & 3 deletions packages/modules/product/src/repositories/product-category.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import {
} from "@medusajs/framework/types"
import { DALUtils, isDefined, MedusaError } from "@medusajs/framework/utils"
import {
LoadStrategy,
FilterQuery as MikroFilterQuery,
FindOptions as MikroOptions,
LoadStrategy,
} from "@mikro-orm/core"
import { SqlEntityManager } from "@mikro-orm/postgresql"
import { ProductCategory } from "@models"
Expand Down Expand Up @@ -93,7 +93,8 @@ export class ProductCategoryRepository extends DALUtils.MikroOrmBaseTreeReposito
ancestors: transformOptions.includeAncestorsTree,
},
productCategories,
findOptions_
findOptions_,
context
)

return this.sortCategoriesByRank(categoriesTree)
Expand Down Expand Up @@ -250,7 +251,8 @@ export class ProductCategoryRepository extends DALUtils.MikroOrmBaseTreeReposito
ancestors: transformOptions.includeAncestorsTree,
},
productCategories,
findOptions_
findOptions_,
context
)

return [this.sortCategoriesByRank(categoriesTree), count]
Expand Down