chore(): upgrade mikro orm (#13450)
This commit is contained in:
@@ -38,7 +38,7 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -48,9 +48,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -51,9 +51,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -51,9 +51,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -51,9 +51,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,10 +39,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -52,9 +52,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -51,9 +51,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,11 +38,11 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/knex": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/knex": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -52,10 +52,10 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/knex": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/knex": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,10 +25,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -38,9 +38,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
},
|
||||
"scripts": {
|
||||
|
||||
@@ -35,9 +35,9 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"cross-env": "^5.2.1",
|
||||
@@ -48,9 +48,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,10 +34,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -47,9 +47,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ import {
|
||||
ILockingModule,
|
||||
InternalModuleDeclaration,
|
||||
Logger,
|
||||
} from "@medusajs/types"
|
||||
} from "@medusajs/framework/types"
|
||||
import { EntityManager } from "@mikro-orm/core"
|
||||
import { LockingDefaultProvider } from "@types"
|
||||
import LockingProviderService from "./locking-provider"
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -51,9 +51,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
"resolve:aliases": "tsc --showConfig -p tsconfig.json > tsconfig.resolved.json && tsc-alias -p tsconfig.resolved.json && rimraf tsconfig.resolved.json",
|
||||
"build": "rimraf dist && tsc --build && npm run resolve:aliases",
|
||||
"test": "jest --bail --forceExit -- src/**/__tests__/**/*.ts",
|
||||
"test:integration": "jest --forceExit -- integration-tests/**/__tests__/**/*.spec.ts",
|
||||
"test:integration": "jest --forceExit -- integration-tests/__tests__/**/*.spec.ts",
|
||||
"migration:initial": "MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create --initial",
|
||||
"migration:create": "MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create",
|
||||
"migration:up": "MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:up",
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -51,9 +51,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,11 +20,7 @@ export function setFindMethods<T>(klass: Constructor<T>, entity: any) {
|
||||
if (!("strategy" in findOptions_.options)) {
|
||||
if (findOptions_.options.limit != null || findOptions_.options.offset) {
|
||||
Object.assign(findOptions_.options, {
|
||||
strategy: LoadStrategy.SELECT_IN,
|
||||
})
|
||||
} else {
|
||||
Object.assign(findOptions_.options, {
|
||||
strategy: LoadStrategy.JOINED,
|
||||
strategy: LoadStrategy.BALANCED,
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -103,7 +99,7 @@ export function setFindMethods<T>(klass: Constructor<T>, entity: any) {
|
||||
|
||||
if (!("strategy" in findOptions_.options)) {
|
||||
Object.assign(findOptions_.options, {
|
||||
strategy: LoadStrategy.SELECT_IN,
|
||||
strategy: LoadStrategy.BALANCED,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -51,9 +51,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -264,7 +264,7 @@ export default class PaymentModuleService
|
||||
)
|
||||
}
|
||||
|
||||
@InjectManager()
|
||||
@InjectTransactionManager()
|
||||
async updatePaymentCollections_(
|
||||
data: UpdatePaymentCollectionDTO[],
|
||||
@MedusaContext() sharedContext?: Context
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -51,9 +51,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -868,7 +868,8 @@ export default class PricingModuleService
|
||||
return {
|
||||
attribute,
|
||||
operator: customRule.operator,
|
||||
value: customRule.value,
|
||||
// TODO: we throw above if value is not a number, but the model expect the value to be a string
|
||||
value: customRule.value.toString(),
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
+6
-1
@@ -826,7 +826,12 @@ moduleIntegrationTestRunner<IProductModuleService>({
|
||||
await service.upsertProducts([updateData])
|
||||
|
||||
const product = await service.retrieveProduct(productTwo.id, {
|
||||
relations: ["*"],
|
||||
relations: [
|
||||
"options",
|
||||
"options.values",
|
||||
"variants",
|
||||
"variants.options",
|
||||
],
|
||||
})
|
||||
|
||||
expect(product.options).toHaveLength(1)
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"faker": "^5.5.3",
|
||||
@@ -52,9 +52,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ export class ProductCategoryRepository extends DALUtils.MikroOrmBaseTreeReposito
|
||||
}
|
||||
|
||||
Object.assign(findOptions_.options, {
|
||||
strategy: LoadStrategy.SELECT_IN,
|
||||
strategy: LoadStrategy.BALANCED,
|
||||
})
|
||||
|
||||
return findOptions_
|
||||
|
||||
@@ -1879,6 +1879,21 @@ export default class ProductModuleService
|
||||
productData.thumbnail = productData.images[0].url
|
||||
}
|
||||
|
||||
// TODO: these props are typed as number, the model expect a string, the API expect number etc
|
||||
// There is some inconsistency here, we should fix it
|
||||
if ("weight" in productData) {
|
||||
productData.weight = productData.weight?.toString() as any
|
||||
}
|
||||
if ("length" in productData) {
|
||||
productData.length = productData.length?.toString() as any
|
||||
}
|
||||
if ("height" in productData) {
|
||||
productData.height = productData.height?.toString() as any
|
||||
}
|
||||
if ("width" in productData) {
|
||||
productData.width = productData.width?.toString() as any
|
||||
}
|
||||
|
||||
if (productData.images?.length) {
|
||||
productData.images = productData.images.map((image, index) =>
|
||||
(image as { rank?: number }).rank != null
|
||||
|
||||
@@ -12,7 +12,7 @@ export async function createCampaigns(
|
||||
campaignsData?: CreateCampaignDTO[]
|
||||
): Promise<Campaign[]> {
|
||||
if (!campaignsData) {
|
||||
const cp = JSON.parse(JSON.stringify(defaultCampaignsData))
|
||||
const cp = structuredClone(defaultCampaignsData)
|
||||
|
||||
const starts_at = new Date(TODAY)
|
||||
starts_at.setDate(starts_at.getDate() - 1)
|
||||
|
||||
@@ -39,10 +39,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -52,9 +52,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -690,7 +690,9 @@ export default class PromotionModuleService
|
||||
sharedContext
|
||||
)
|
||||
|
||||
return Array.isArray(data) ? promotions : promotions[0]
|
||||
return await this.baseRepository_.serialize<
|
||||
PromotionTypes.PromotionDTO | PromotionTypes.PromotionDTO[]
|
||||
>(Array.isArray(data) ? promotions : promotions[0])
|
||||
}
|
||||
|
||||
@InjectTransactionManager()
|
||||
@@ -949,6 +951,7 @@ export default class PromotionModuleService
|
||||
): Promise<PromotionTypes.PromotionDTO[]>
|
||||
|
||||
@InjectManager()
|
||||
@EmitEvents()
|
||||
// @ts-expect-error
|
||||
async updatePromotions(
|
||||
data:
|
||||
@@ -1165,6 +1168,7 @@ export default class PromotionModuleService
|
||||
}
|
||||
|
||||
@InjectManager()
|
||||
@EmitEvents()
|
||||
async addPromotionRules(
|
||||
promotionId: string,
|
||||
rulesData: PromotionTypes.CreatePromotionRuleDTO[],
|
||||
@@ -1288,6 +1292,8 @@ export default class PromotionModuleService
|
||||
|
||||
validatePromotionRuleAttributes(rulesData)
|
||||
|
||||
const promotionRuleValuesDataToCreate: CreatePromotionRuleValueDTO[] = []
|
||||
|
||||
for (const ruleData of rulesData) {
|
||||
const { values, ...rest } = ruleData
|
||||
const promotionRuleData: CreatePromotionRuleDTO = {
|
||||
@@ -1308,12 +1314,14 @@ export default class PromotionModuleService
|
||||
promotion_rule: createdPromotionRule,
|
||||
}))
|
||||
|
||||
await this.promotionRuleValueService_.create(
|
||||
promotionRuleValuesData,
|
||||
sharedContext
|
||||
)
|
||||
promotionRuleValuesDataToCreate.push(...promotionRuleValuesData)
|
||||
}
|
||||
|
||||
await this.promotionRuleValueService_.create(
|
||||
promotionRuleValuesDataToCreate,
|
||||
sharedContext
|
||||
)
|
||||
|
||||
return createdPromotionRules
|
||||
}
|
||||
|
||||
@@ -1630,7 +1638,7 @@ export default class PromotionModuleService
|
||||
@EmitEvents()
|
||||
async addPromotionsToCampaign(
|
||||
data: PromotionTypes.AddPromotionsToCampaignDTO,
|
||||
@MedusaContext() sharedContext?: Context
|
||||
@MedusaContext() sharedContext: Context = {}
|
||||
): Promise<{ ids: string[] }> {
|
||||
const ids = await this.addPromotionsToCampaign_(data, sharedContext)
|
||||
|
||||
|
||||
@@ -21,10 +21,10 @@
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -51,9 +51,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -51,9 +51,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -51,9 +51,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,10 +25,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -38,9 +38,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
},
|
||||
"scripts": {
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -51,9 +51,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -51,9 +51,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -54,9 +54,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -55,9 +55,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@medusajs/test-utils": "2.10.3",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"jest": "^29.7.0",
|
||||
@@ -56,9 +56,9 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@medusajs/framework": "2.10.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user