chore: Remove typeORM (#9005)
* chore: rename js files to txt * chore: rename ts files to txt * chore: delete environment helpers * chore: convert global setup & teardown to txt * chore: rename helper js/ts files to txt * chore: rename seeder js/ts files to txt * chore: remove typeorm * chore: reintroduce used helpers
This commit is contained in:
@@ -29,6 +29,6 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
setupFiles: ["../setup-env.js"],
|
setupFiles: ["../setup-env.js"],
|
||||||
setupFilesAfterEnv: ["../setup.js"],
|
setupFilesAfterEnv: ["../setup.js"],
|
||||||
globalSetup: "../globalSetup.js",
|
// globalSetup: "../globalSetup.js",
|
||||||
globalTeardown: "../globalTeardown.js",
|
// globalTeardown: "../globalTeardown.js",
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,6 @@
|
|||||||
"@medusajs/cache-inmemory": "workspace:*",
|
"@medusajs/cache-inmemory": "workspace:*",
|
||||||
"@medusajs/customer": "workspace:^",
|
"@medusajs/customer": "workspace:^",
|
||||||
"@medusajs/event-bus-local": "workspace:*",
|
"@medusajs/event-bus-local": "workspace:*",
|
||||||
"@medusajs/inventory": "latest",
|
|
||||||
"@medusajs/medusa": "workspace:*",
|
"@medusajs/medusa": "workspace:*",
|
||||||
"@medusajs/modules-sdk": "workspace:^",
|
"@medusajs/modules-sdk": "workspace:^",
|
||||||
"@medusajs/pricing": "workspace:^",
|
"@medusajs/pricing": "workspace:^",
|
||||||
@@ -28,8 +27,7 @@
|
|||||||
"@medusajs/utils": "workspace:^",
|
"@medusajs/utils": "workspace:^",
|
||||||
"@medusajs/workflow-engine-inmemory": "workspace:*",
|
"@medusajs/workflow-engine-inmemory": "workspace:*",
|
||||||
"faker": "^5.5.3",
|
"faker": "^5.5.3",
|
||||||
"pg": "^8.11.3",
|
"pg": "^8.11.3"
|
||||||
"typeorm": "^0.3.16"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@swc/core": "^1.4.8",
|
"@swc/core": "^1.4.8",
|
||||||
|
|||||||
@@ -1,180 +0,0 @@
|
|||||||
const path = require("path")
|
|
||||||
|
|
||||||
const { getConfigFile } = require("@medusajs/utils")
|
|
||||||
const { asValue } = require("awilix")
|
|
||||||
const { isObject, MedusaV2Flag } = require("@medusajs/utils")
|
|
||||||
const { dropDatabase } = require("pg-god")
|
|
||||||
const { DataSource } = require("typeorm")
|
|
||||||
const dbFactory = require("./use-template-db")
|
|
||||||
const { ContainerRegistrationKeys } = require("@medusajs/utils")
|
|
||||||
const {
|
|
||||||
runMedusaAppMigrations,
|
|
||||||
} = require("@medusajs/medusa/dist/loaders/medusa-app")
|
|
||||||
|
|
||||||
const DB_HOST = process.env.DB_HOST
|
|
||||||
const DB_USERNAME = process.env.DB_USERNAME
|
|
||||||
const DB_PASSWORD = process.env.DB_PASSWORD
|
|
||||||
const DB_NAME = process.env.DB_TEMP_NAME
|
|
||||||
const DB_URL = `postgres://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}/${DB_NAME}`
|
|
||||||
|
|
||||||
const pgGodCredentials = {
|
|
||||||
user: DB_USERNAME,
|
|
||||||
password: DB_PASSWORD,
|
|
||||||
host: DB_HOST,
|
|
||||||
}
|
|
||||||
|
|
||||||
const keepTables = [
|
|
||||||
"store",
|
|
||||||
"staged_job",
|
|
||||||
"shipping_profile",
|
|
||||||
"fulfillment_provider",
|
|
||||||
"payment_provider",
|
|
||||||
"country",
|
|
||||||
"region_country",
|
|
||||||
"currency",
|
|
||||||
"migrations",
|
|
||||||
"mikro_orm_migrations",
|
|
||||||
]
|
|
||||||
|
|
||||||
const DbTestUtil = {
|
|
||||||
db_: null,
|
|
||||||
pgConnection_: null,
|
|
||||||
|
|
||||||
setDb: function (dataSource) {
|
|
||||||
this.db_ = dataSource
|
|
||||||
},
|
|
||||||
|
|
||||||
setPgConnection: function (pgConnection) {
|
|
||||||
this.pgConnection_ = pgConnection
|
|
||||||
},
|
|
||||||
|
|
||||||
clear: function () {
|
|
||||||
this.db_.synchronize(true)
|
|
||||||
},
|
|
||||||
|
|
||||||
teardown: async function ({ forceDelete } = {}) {
|
|
||||||
forceDelete = forceDelete || []
|
|
||||||
const manager = this.db_.manager
|
|
||||||
|
|
||||||
await manager.query(`SET session_replication_role = 'replica';`)
|
|
||||||
const tableNames = await manager.query(`SELECT table_name
|
|
||||||
FROM information_schema.tables
|
|
||||||
WHERE table_schema = 'public';`)
|
|
||||||
|
|
||||||
for (const { table_name } of tableNames) {
|
|
||||||
if (
|
|
||||||
keepTables.includes(table_name) &&
|
|
||||||
!forceDelete.includes(table_name)
|
|
||||||
) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
await manager.query(`DELETE
|
|
||||||
FROM "${table_name}";`)
|
|
||||||
}
|
|
||||||
|
|
||||||
await manager.query(`SET session_replication_role = 'origin';`)
|
|
||||||
},
|
|
||||||
|
|
||||||
shutdown: async function () {
|
|
||||||
await this.db_?.destroy()
|
|
||||||
await this.pgConnection_?.context?.destroy()
|
|
||||||
|
|
||||||
return await dropDatabase({ databaseName: DB_NAME }, pgGodCredentials)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
const instance = DbTestUtil
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
initDb: async function ({
|
|
||||||
cwd,
|
|
||||||
databaseExtra,
|
|
||||||
env,
|
|
||||||
force_modules_migration,
|
|
||||||
}) {
|
|
||||||
if (isObject(env)) {
|
|
||||||
Object.entries(env).forEach(([k, v]) => (process.env[k] = v))
|
|
||||||
}
|
|
||||||
|
|
||||||
const {
|
|
||||||
featureFlagsLoader,
|
|
||||||
configLoader,
|
|
||||||
container,
|
|
||||||
pgConnectionLoader,
|
|
||||||
} = require("@medusajs/framework")
|
|
||||||
|
|
||||||
const configModule = configLoader(cwd, `medusa-config`)
|
|
||||||
const featureFlagRouter = await featureFlagsLoader()
|
|
||||||
const modelsLoader = require("@medusajs/medusa/dist/loaders/models").default
|
|
||||||
const entities = modelsLoader({}, { register: false })
|
|
||||||
|
|
||||||
await dbFactory.createFromTemplate(DB_NAME)
|
|
||||||
|
|
||||||
// get migrations with enabled featureflags
|
|
||||||
const migrationDir = path.resolve(
|
|
||||||
path.join(
|
|
||||||
__dirname,
|
|
||||||
`../../`,
|
|
||||||
`node_modules`,
|
|
||||||
`@medusajs`,
|
|
||||||
`medusa`,
|
|
||||||
`dist`,
|
|
||||||
`migrations`,
|
|
||||||
`*.js`
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
const {
|
|
||||||
getEnabledMigrations,
|
|
||||||
getModuleSharedResources,
|
|
||||||
} = require("@medusajs/medusa/dist/commands/utils/get-migrations")
|
|
||||||
|
|
||||||
const { migrations: moduleMigrations, models: moduleModels } =
|
|
||||||
getModuleSharedResources(configModule, featureFlagRouter)
|
|
||||||
|
|
||||||
const enabledMigrations = getEnabledMigrations([migrationDir], (flag) =>
|
|
||||||
featureFlagRouter.isFeatureEnabled(flag)
|
|
||||||
)
|
|
||||||
|
|
||||||
const enabledEntities = entities.filter(
|
|
||||||
(e) => typeof e.isFeatureEnabled === "undefined" || e.isFeatureEnabled()
|
|
||||||
)
|
|
||||||
|
|
||||||
const dbDataSource = new DataSource({
|
|
||||||
type: "postgres",
|
|
||||||
url: DB_URL,
|
|
||||||
entities: enabledEntities.concat(moduleModels),
|
|
||||||
migrations: enabledMigrations.concat(moduleMigrations),
|
|
||||||
extra: databaseExtra ?? {},
|
|
||||||
name: "integration-tests",
|
|
||||||
})
|
|
||||||
|
|
||||||
await dbDataSource.initialize()
|
|
||||||
|
|
||||||
await dbDataSource.runMigrations()
|
|
||||||
|
|
||||||
instance.setDb(dbDataSource)
|
|
||||||
|
|
||||||
if (
|
|
||||||
force_modules_migration ||
|
|
||||||
featureFlagRouter.isFeatureEnabled(MedusaV2Flag.key)
|
|
||||||
) {
|
|
||||||
const pgConnection = pgConnectionLoader()
|
|
||||||
|
|
||||||
container.register({
|
|
||||||
[ContainerRegistrationKeys.LOGGER]: asValue(console),
|
|
||||||
[ContainerRegistrationKeys.MANAGER]: asValue(dbDataSource.manager),
|
|
||||||
})
|
|
||||||
|
|
||||||
instance.setPgConnection(pgConnection)
|
|
||||||
|
|
||||||
await runMedusaAppMigrations({ configModule, container })
|
|
||||||
}
|
|
||||||
|
|
||||||
return dbDataSource
|
|
||||||
},
|
|
||||||
useDb: function () {
|
|
||||||
return instance
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -1,117 +0,0 @@
|
|||||||
const path = require("path")
|
|
||||||
|
|
||||||
require("dotenv").config({ path: path.join(__dirname, "../.env.test") })
|
|
||||||
|
|
||||||
const { getConfigFile } = require("@medusajs/utils")
|
|
||||||
const { createDatabase, dropDatabase } = require("pg-god")
|
|
||||||
const { DataSource } = require("typeorm")
|
|
||||||
|
|
||||||
const DB_HOST = process.env.DB_HOST
|
|
||||||
const DB_USERNAME = process.env.DB_USERNAME
|
|
||||||
const DB_PASSWORD = process.env.DB_PASSWORD
|
|
||||||
const DB_URL = `postgres://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}`
|
|
||||||
|
|
||||||
let masterDataSource
|
|
||||||
|
|
||||||
const pgGodCredentials = {
|
|
||||||
user: DB_USERNAME,
|
|
||||||
password: DB_PASSWORD,
|
|
||||||
host: DB_HOST,
|
|
||||||
}
|
|
||||||
|
|
||||||
class DatabaseFactory {
|
|
||||||
constructor() {
|
|
||||||
this.masterDataSourceName = "master"
|
|
||||||
this.templateDbName = "medusa-integration-template"
|
|
||||||
}
|
|
||||||
|
|
||||||
async createTemplateDb_({ cwd }) {
|
|
||||||
const { configModule } = getConfigFile(cwd, `medusa-config`)
|
|
||||||
|
|
||||||
const migrationDir = path.resolve(
|
|
||||||
path.join(
|
|
||||||
__dirname,
|
|
||||||
`../../`,
|
|
||||||
`node_modules`,
|
|
||||||
`@medusajs`,
|
|
||||||
`medusa`,
|
|
||||||
`dist`,
|
|
||||||
`migrations`,
|
|
||||||
`*.js`
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
const {
|
|
||||||
getEnabledMigrations,
|
|
||||||
getModuleSharedResources,
|
|
||||||
} = require("@medusajs/medusa/dist/commands/utils/get-migrations")
|
|
||||||
|
|
||||||
// filter migrations to only include those that don't have feature flags
|
|
||||||
const enabledMigrations = getEnabledMigrations(
|
|
||||||
[migrationDir],
|
|
||||||
(flag) => false
|
|
||||||
)
|
|
||||||
|
|
||||||
const { migrations: moduleMigrations } =
|
|
||||||
getModuleSharedResources(configModule)
|
|
||||||
|
|
||||||
await dropDatabase(
|
|
||||||
{
|
|
||||||
databaseName: this.templateDbName,
|
|
||||||
errorIfNonExist: false,
|
|
||||||
},
|
|
||||||
pgGodCredentials
|
|
||||||
)
|
|
||||||
await createDatabase(
|
|
||||||
{ databaseName: this.templateDbName },
|
|
||||||
pgGodCredentials
|
|
||||||
)
|
|
||||||
|
|
||||||
const templateDbDataSource = new DataSource({
|
|
||||||
type: "postgres",
|
|
||||||
name: "templateDataSource",
|
|
||||||
url: `${DB_URL}/${this.templateDbName}`,
|
|
||||||
migrations: enabledMigrations.concat(moduleMigrations),
|
|
||||||
})
|
|
||||||
|
|
||||||
await templateDbDataSource.initialize()
|
|
||||||
|
|
||||||
await templateDbDataSource.runMigrations()
|
|
||||||
|
|
||||||
await templateDbDataSource.destroy()
|
|
||||||
}
|
|
||||||
|
|
||||||
async getMasterDataSource() {
|
|
||||||
masterDataSource = masterDataSource || (await this.createMasterDataSource())
|
|
||||||
return masterDataSource
|
|
||||||
}
|
|
||||||
|
|
||||||
async createMasterDataSource() {
|
|
||||||
const dataSource = new DataSource({
|
|
||||||
type: "postgres",
|
|
||||||
name: this.masterDataSourceName,
|
|
||||||
url: `${DB_URL}`,
|
|
||||||
})
|
|
||||||
await dataSource.initialize()
|
|
||||||
|
|
||||||
return dataSource
|
|
||||||
}
|
|
||||||
|
|
||||||
async createFromTemplate(dbName) {
|
|
||||||
const dataSource = await this.getMasterDataSource()
|
|
||||||
|
|
||||||
await dropDatabase({ databaseName: dbName }, pgGodCredentials)
|
|
||||||
await dataSource.query(
|
|
||||||
`CREATE DATABASE "${dbName}" TEMPLATE "${this.templateDbName}";`
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
async destroy() {
|
|
||||||
const dataSource = await this.getMasterDataSource()
|
|
||||||
|
|
||||||
await dataSource.query(`DROP DATABASE IF EXISTS "${this.templateDbName}";`)
|
|
||||||
await dataSource.destroy()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = new DatabaseFactory()
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user