feat(medusa): integrate pricing module to core (#5304)

* add pricing integraiton feature flag * init * first endpoint * cleanup * remove console.logs * refactor to util and implement across endpoints * add changeset * rename variables * remove mistype * feat(medusa): move price module integration to pricing service (#5322) * initial changes * chore: make product service always internal for pricing module * add notes --------- Co-authored-by: Riqwan Thamir <rmthamir@gmail.com> * nit * cleanup * update to object querying * update cart integration test * remove uppercase currency_code * nit * Feat/admin product pricing module reads (#5354) * initial changes to list prices for admin * working price module implementation of list prices * nit * variant pricing * redo integration test changes * cleanup * cleanup * fix unit tests * [wip] Core <> Pricing - price updates (#5364) * chore: update medusa-app * wip * get links and modules working with migration * wip * chore: make test pass * Feat/rule type utils (#5371) * initial rule type utils * update migration script * chore: cleanup * ensure prices are always decorated * chore: use seed instead * chore: fix oas conflict * region id add to admin price read! --------- Co-authored-by: Philip Korsholm <88927411+pKorsholm@users.noreply.github.com> Co-authored-by: Philip Korsholm <philip.korsholm@hotmail.com> * pr feedback * create remoteQueryFunction type * fix merge * fix loaders issue * Feat(medusa, types, pricing): pricing module migration script (#5409) * add migration script for money amounts in pricing module * add changeset * rename file * cleanup imports * update changeset * add check for pricing module and ff * feat(medusa,workflows,types): update prices on product and variant update (#5412) * wip * chore: update product prices through workflow * chore: cleanup * chore: update product handler updates prices for variants * chore: handle reverts * chore: address pr comments * chore: scope workflow handlers to flag handlers * chore: update return * chore: update db url * chore: remove migration * chore: increase jest timeout * Feat(medusa): update migration and initDb to run link-migrations (#5437) * initial * loader update * more progress on loaders * update integration tests and remote-query loader * remove helper * migrate isolated modules * fix test * fix integration test * update with pr feedback * unregister medusa-app * re-register medusaApp * fix featureflag * set timeout * set timeout * conditionally run link-module migrations * pr feedback 1 * add driver options for db * throw if link is not defined in migration script * pass config module directly * include container in migrate command * chore: increase timeout * rm redis from api integration tests to test * chore: temporarily skip tests * chore: undo skips + add timeout for workflow tests * chore: increase timeout for order edits * re-add redis * include final resolution * add sharedcontainer to medusaapp loader * chore: move migration under run command * try removing redis_url from api tests * chore: cleanup server on process exit * chore: clear container on exit * chore: adjustments * chore: remove consoles * chore: close express app on finish * chore: destroy pg connection on shutdown * chore: skip * chore: unskip test * chore: cleanup container pg connection * chore: skip --------- Co-authored-by: Riqwan Thamir <rmthamir@gmail.com>
2023-10-30 14:42:17 +01:00
1 parent b69f182571
commit 148f537b47
@@ -1,11 +1,16 @@
 const path = require("path")
 const express = require("express")
 const getPort = require("get-port")
+const { isObject } = require("@medusajs/utils")

 module.exports = {
-  bootstrapApp: async ({ cwd } = {}) => {
+  bootstrapApp: async ({ cwd, env = {} } = {}) => {
    const app = express()

+    if (isObject(env)) {
+      Object.entries(env).forEach(([k, v]) => (process.env[k] = v))
+    }
+
    const loaders = require("@medusajs/medusa/dist/loaders").default

    const { container, dbConnection } = await loaders({
@@ -1,10 +1,22 @@
 const path = require("path")
 const { spawn } = require("child_process")
-const { setPort } = require("./use-api")
+const { setPort, useExpressServer } = require("./use-api")
+const { setContainer } = require("./use-container")

-module.exports = ({ cwd, redisUrl, uploadDir, verbose, env }) => {
+module.exports = ({
+  cwd,
+  redisUrl,
+  uploadDir,
+  verbose,
+  env,
+  bootstrapApp = false,
+}) => {
  const serverPath = path.join(__dirname, "test-server.js")

+  if (bootstrapApp) {
+    require(serverPath)
+  }
+
  // in order to prevent conflicts in redis, use a different db for each worker
  // same fix as for databases (works with up to 15)
  // redis dbs are 0-indexed and jest worker ids are indexed from 1
@@ -44,5 +56,15 @@ module.exports = ({ cwd, redisUrl, uploadDir, verbose, env }) => {
      setPort(port)
      resolve(medusaProcess)
    })
+
+    medusaProcess.on("exit", () => {
+      const expressServer = useExpressServer()
+
+      setContainer(null)
+
+      if (expressServer) {
+        expressServer.close()
+      }
+    })
  })
 }
@@ -1,11 +1,18 @@
 const { bootstrapApp } = require("./bootstrap-app")
+const { setContainer } = require("./use-container")
+const { setPort, setExpressServer } = require("./use-api")

 const setup = async () => {
-  const { app, port } = await bootstrapApp()
+  const { app, port, container } = await bootstrapApp()

-  app.listen(port, (err) => {
+  setContainer(container)
+
+  const expressServer = app.listen(port, (err) => {
+    setPort(port)
    process.send(port)
  })
+
+  setExpressServer(expressServer)
 }

 setup()
@@ -3,10 +3,15 @@ const axios = require("axios").default
 const ServerTestUtil = {
  port_: null,
  client_: null,
+  expressServer_: null,

  setPort: function (port) {
    this.client_ = axios.create({ baseURL: `http://localhost:${port}` })
  },
+
+  setExpressServer: function (expressServer) {
+    this.expressServer_ = expressServer
+  },
 }

 const instance = ServerTestUtil
@@ -15,7 +20,13 @@ module.exports = {
  setPort: function (port) {
    instance.setPort(port)
  },
+  setExpressServer: function (expressServer) {
+    instance.setExpressServer(expressServer)
+  },
  useApi: function () {
    return instance.client_
  },
+  useExpressServer: function () {
+    return instance.expressServer_
+  },
 }
@@ -0,0 +1,23 @@
+const path = require("path")
+const express = require("express")
+const getPort = require("get-port")
+const { isObject } = require("@medusajs/utils")
+
+const AppUtils = {
+  container_: null,
+
+  setContainer: function (container) {
+    this.container_ = container
+  },
+}
+
+const instance = AppUtils
+
+module.exports = {
+  setContainer: (container) => {
+    instance.setContainer(container)
+  },
+  getContainer: () => {
+    return instance.container_
+  },
+}
@@ -1,9 +1,12 @@
 const path = require("path")

 const { getConfigFile } = require("medusa-core-utils")
+const { isObject, createMedusaContainer } = require("@medusajs/utils")
 const { dropDatabase } = require("pg-god")
 const { DataSource } = require("typeorm")
 const dbFactory = require("./use-template-db")
+const { getContainer } = require("./use-container")
+const { ContainerRegistrationKeys } = require("@medusajs/utils")

 const DB_HOST = process.env.DB_HOST
 const DB_USERNAME = process.env.DB_USERNAME
@@ -29,20 +32,23 @@ const keepTables = [

 const DbTestUtil = {
  db_: null,
+  pgConnection_: null,

  setDb: function (dataSource) {
    this.db_ = dataSource
  },

+  setPgConnection: function (pgConnection) {
+    this.pgConnection_ = pgConnection
+  },
+
  clear: async function () {
    this.db_.synchronize(true)
  },

  teardown: async function ({ forceDelete } = {}) {
    forceDelete = forceDelete || []
-
    const entities = this.db_.entityMetadatas
-
    const manager = this.db_.manager

    await manager.query(`SET session_replication_role = 'replica';`)
@@ -63,7 +69,15 @@ const DbTestUtil = {
  },

  shutdown: async function () {
+    const container = getContainer()
+    const containerPgConnection = container.resolve(
+      ContainerRegistrationKeys.PG_CONNECTION
+    )
+
    await this.db_.destroy()
+    await this.pgConnection_?.context?.destroy()
+    await containerPgConnection?.context?.destroy()
+
    return await dropDatabase({ DB_NAME }, pgGodCredentials)
  },
 }
@@ -71,14 +85,17 @@ const DbTestUtil = {
 const instance = DbTestUtil

 module.exports = {
-  initDb: async function ({ cwd, database_extra }) {
+  initDb: async function ({ cwd, database_extra, env }) {
+    if (isObject(env)) {
+      Object.entries(env).forEach(([k, v]) => (process.env[k] = v))
+    }
+
    const { configModule } = getConfigFile(cwd, `medusa-config`)
-    const { featureFlags } = configModule

    const featureFlagsLoader =
      require("@medusajs/medusa/dist/loaders/feature-flags").default

-    const featureFlagsRouter = featureFlagsLoader({ featureFlags })
+    const featureFlagRouter = featureFlagsLoader(configModule)
    const modelsLoader = require("@medusajs/medusa/dist/loaders/models").default
    const entities = modelsLoader({}, { register: false })

@@ -104,10 +121,10 @@ module.exports = {
    } = require("@medusajs/medusa/dist/commands/utils/get-migrations")

    const { migrations: moduleMigrations, models: moduleModels } =
-      getModuleSharedResources(configModule, featureFlagsRouter)
+      getModuleSharedResources(configModule, featureFlagRouter)

    const enabledMigrations = getEnabledMigrations([migrationDir], (flag) =>
-      featureFlagsRouter.isFeatureEnabled(flag)
+      featureFlagRouter.isFeatureEnabled(flag)
    )

    const enabledEntities = entities.filter(
@@ -128,6 +145,40 @@ module.exports = {
    await dbDataSource.runMigrations()

    instance.setDb(dbDataSource)
+
+    const IsolateProductDomainFeatureFlag =
+      require("@medusajs/medusa/dist/loaders/feature-flags/isolate-product-domain").default
+    const IsolatePricingDomainFeatureFlag =
+      require("@medusajs/medusa/dist/loaders/feature-flags/isolate-pricing-domain").default
+
+    if (
+      featureFlagRouter.isFeatureEnabled(IsolateProductDomainFeatureFlag.key) ||
+      featureFlagRouter.isFeatureEnabled(IsolatePricingDomainFeatureFlag.key)
+    ) {
+      const pgConnectionLoader =
+        require("@medusajs/medusa/dist/loaders/pg-connection").default
+
+      const medusaAppLoader =
+        require("@medusajs/medusa/dist/loaders/medusa-app").default
+
+      const container = createMedusaContainer()
+
+      const pgConnection = await pgConnectionLoader({ configModule, container })
+      instance.setPgConnection(pgConnection)
+
+      const { runMigrations } = await medusaAppLoader(
+        { configModule, container },
+        { registerInContainer: false }
+      )
+
+      const options = {
+        database: {
+          clientUrl: DB_URL,
+        },
+      }
+      await runMigrations(options)
+    }
+
    return dbDataSource
  },
  useDb: function () {