asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: Medusa service base method transaction (#7758)

Browse Source 
**What**
Remove transaction decorator from the base medusa service method, the transaction will always be coming from the shared context. It fixes the issue that when you consume a base method directly it will return a proper tuple from the DB instead of the one from the entity map cc @VariableVic 

**NOTE**
This pr also fix some categories issues in the product module which was preventing the tests from working. if @sradevski you could have a look later, in the mean time we can still merge it

FIXES CORE-2342
This commit is contained in:
Adrien de Peretti
2024-06-18 12:58:54 +02:00
committed by GitHub
parent 8410592239
commit e0b14519f1
8 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/utils/src/modules-sdk/__tests__/medusa-service.spec.ts
View File

@@ -9,7 +9,7 @@ const baseRepoMock = {
const defaultContext = { __type: "MedusaContext", manager: baseRepoMock }
const defaultTransactionContext = {
__type: "MedusaContext",
transactionManager: "transactionManager",
manager: baseRepoMock,
}
describe("Abstract Module Service Factory", () => {

40
packages/core/utils/src/modules-sdk/medusa-service.ts
View File

@@ -20,11 +20,7 @@ import {
pluralize,
upperCaseFirst,
} from "../common"
import {
InjectManager,
InjectTransactionManager,
MedusaContext,
} from "./decorators"
import { InjectManager, MedusaContext } from "./decorators"
import { ModuleRegistrationName } from "./definition"
type BaseMethods =
@@ -384,11 +380,7 @@ export function MedusaService<
MedusaContext()(klassPrototype, methodName, contextIndex)
const ManagerDecorator = readMethods.includes(method as BaseMethods)
? InjectManager
: InjectTransactionManager
ManagerDecorator("baseRepository_")(
InjectManager("baseRepository_")(
klassPrototype,
methodName,
descriptorMockRef
@@ -413,9 +405,7 @@ export function MedusaService<
serviceRegistrationName
].retrieve(id, config, sharedContext)
return await this.baseRepository_.serialize<T>(entities, {
populate: true,
})
return await this.baseRepository_.serialize<T>(entities)
}
applyMethod(methodImplementation, 2)
@@ -432,9 +422,7 @@ export function MedusaService<
const entities = await service.create(serviceData, sharedContext)
const response = Array.isArray(data) ? entities : entities[0]
return await this.baseRepository_.serialize<T | T[]>(response, {
populate: true,
})
return await this.baseRepository_.serialize<T | T[]>(response)
}
applyMethod(methodImplementation, 1)
@@ -451,9 +439,7 @@ export function MedusaService<
const entities = await service.update(serviceData, sharedContext)
const response = Array.isArray(data) ? entities : entities[0]
return await this.baseRepository_.serialize<T | T[]>(response, {
populate: true,
})
return await this.baseRepository_.serialize<T | T[]>(response)
}
applyMethod(methodImplementation, 1)
@@ -469,9 +455,7 @@ export function MedusaService<
const service = this.__container__[serviceRegistrationName]
const entities = await service.list(filters, config, sharedContext)
return await this.baseRepository_.serialize<T[]>(entities, {
populate: true,
})
return await this.baseRepository_.serialize<T[]>(entities)
}
applyMethod(methodImplementation, 2)
@@ -488,12 +472,7 @@ export function MedusaService<
serviceRegistrationName
].listAndCount(filters, config, sharedContext)
return [
await this.baseRepository_.serialize<T[]>(entities, {
populate: true,
}),
count,
]
return [await this.baseRepository_.serialize<T[]>(entities), count]
}
applyMethod(methodImplementation, 2)
@@ -542,10 +521,7 @@ export function MedusaService<
].softDelete(primaryKeyValues_, sharedContext)
const softDeletedEntities = await this.baseRepository_.serialize<T[]>(
entities,
{
populate: true,
}
entities
)
await this.eventBusModuleService_?.emit(

4
packages/modules/product/integration-tests/__tests__/product-category.ts
View File

@@ -1015,7 +1015,7 @@ moduleIntegrationTestRunner<Service>({
}
expect(error.message).toEqual(
`ProductCategory not found ({ id: 'does-not-exist' })`
`ProductCategory with id: does-not-exist was not found`
)
})
@@ -1162,7 +1162,7 @@ moduleIntegrationTestRunner<Service>({
}
expect(error.message).toEqual(
`ProductCategory not found ({ id: 'does-not-exist' })`
`ProductCategory with id: does-not-exist was not found`
)
})

2
packages/modules/product/integration-tests/__tests__/product-module-service/product-categories.spec.ts
View File

@@ -565,7 +565,7 @@ moduleIntegrationTestRunner<IProductModuleService>({
}
expect(error.message).toEqual(
`ProductCategory not found ({ id: 'does-not-exist' })`
`ProductCategory with id: does-not-exist was not found`
)
})

28
packages/modules/product/src/repositories/product-category.ts
View File

@@ -274,9 +274,17 @@ export class ProductCategoryRepository extends DALUtils.MikroOrmBaseTreeReposito
const categories = await Promise.all(
ids.map(async (id) => {
const productCategory = await manager.findOneOrFail(ProductCategory, {
const productCategory = await manager.findOne(ProductCategory, {
id,
})
if (!productCategory) {
throw new MedusaError(
MedusaError.Types.NOT_FOUND,
`ProductCategory with id: ${id} was not found`
)
}
manager.assign(productCategory, { deleted_at: new Date() })
return productCategory
})
@@ -310,7 +318,7 @@ export class ProductCategoryRepository extends DALUtils.MikroOrmBaseTreeReposito
await Promise.all(
ids.map(async (id) => {
const productCategory = await manager.findOneOrFail(
const productCategory = await manager.findOne(
ProductCategory,
{ id },
{
@@ -318,6 +326,13 @@ export class ProductCategoryRepository extends DALUtils.MikroOrmBaseTreeReposito
}
)
if (!productCategory) {
throw new MedusaError(
MedusaError.Types.NOT_FOUND,
`ProductCategory with id: ${id} was not found`
)
}
if (productCategory.category_children.length > 0) {
throw new MedusaError(
MedusaError.Types.NOT_ALLOWED,
@@ -389,10 +404,17 @@ export class ProductCategoryRepository extends DALUtils.MikroOrmBaseTreeReposito
const categories = await Promise.all(
data.map(async (entry, i) => {
const categoryData: Partial<ProductCategory> = { ...entry }
const productCategory = await manager.findOneOrFail(ProductCategory, {
const productCategory = await manager.findOne(ProductCategory, {
id: categoryData.id,
})
if (!productCategory) {
throw new MedusaError(
MedusaError.Types.NOT_FOUND,
`ProductCategory with id: ${categoryData.id} was not found`
)
}
// If the parent or rank are not changed, no need to reorder anything.
if (
!isDefined(categoryData.parent_category_id) &&

4
packages/modules/product/src/services/product-category.ts
View File

@@ -3,10 +3,10 @@ import {
FreeTextSearchFilterKey,
InjectManager,
InjectTransactionManager,
isDefined,
MedusaContext,
MedusaError,
ModulesSdkUtils,
isDefined,
} from "@medusajs/utils"
import { ProductCategory } from "@models"
import { ProductCategoryRepository } from "@repositories"
@@ -169,6 +169,7 @@ export default class ProductCategoryService<
await this.productCategoryRepository_.delete(ids, sharedContext)
}
@InjectTransactionManager("productCategoryRepository_")
async softDelete(
ids: string[],
@MedusaContext() sharedContext?: Context
@@ -178,6 +179,7 @@ export default class ProductCategoryService<
).softDelete(ids, sharedContext)) as any
}
@InjectTransactionManager("productCategoryRepository_")
async restore(
ids: string[],
@MedusaContext() sharedContext?: Context

2
packages/modules/workflow-engine-inmemory/integration-tests/__tests__/index.spec.ts
View File

@@ -31,7 +31,7 @@ const afterEach_ = async () => {
await TestDatabase.clearTables(sharedPgConnection)
}
jest.setTimeout(50000)
jest.setTimeout(100000)
describe("Workflow Orchestrator module", function () {
let workflowOrcModule: IWorkflowEngineService

2
packages/modules/workflow-engine-redis/integration-tests/__tests__/index.spec.ts
View File

@@ -12,7 +12,7 @@ import "../__fixtures__"
import { createScheduled } from "../__fixtures__/workflow_scheduled"
import { DB_URL, TestDatabase } from "../utils"
jest.setTimeout(50000)
jest.setTimeout(100000)
const sharedPgConnection = knex<any, any>({
client: "pg",