chore: remove container registration name (#9137)

This commit is contained in:
Carlos R. L. Rodrigues authored and GitHub committed 2024-09-16 06:22:24 -03:00
1 parent ab4a422fc8
commit 950cf9af79
421 files changed
+1523 -2491

No files matched your search

+4 -12
View File
@@ -5,11 +5,7 @@ import {
IUserModuleService, IUserModuleService,
MedusaContainer, MedusaContainer,
} from "@medusajs/types" } from "@medusajs/types"
import { import { ApiKeyType, Modules, PUBLISHABLE_KEY_HEADER } from "@medusajs/utils"
ApiKeyType,
ModuleRegistrationName,
PUBLISHABLE_KEY_HEADER,
} from "@medusajs/utils"
import jwt from "jsonwebtoken" import jwt from "jsonwebtoken"
import Scrypt from "scrypt-kdf" import Scrypt from "scrypt-kdf"
import { getContainer } from "../environment-helpers/use-container" import { getContainer } from "../environment-helpers/use-container"
@@ -25,12 +21,8 @@ export const createAdminUser = async (
) => { ) => {
const appContainer = container ?? getContainer()! const appContainer = container ?? getContainer()!
const userModule: IUserModuleService = appContainer.resolve( const userModule: IUserModuleService = appContainer.resolve(Modules.USER)
ModuleRegistrationName.USER const authModule: IAuthModuleService = appContainer.resolve(Modules.AUTH)
)
const authModule: IAuthModuleService = appContainer.resolve(
ModuleRegistrationName.AUTH
)
const user = await userModule.createUsers({ const user = await userModule.createUsers({
first_name: "Admin", first_name: "Admin",
last_name: "User", last_name: "User",
@@ -75,7 +67,7 @@ export const createAdminUser = async (
export const generatePublishableKey = async (container?: MedusaContainer) => { export const generatePublishableKey = async (container?: MedusaContainer) => {
const appContainer = container ?? getContainer()! const appContainer = container ?? getContainer()!
const apiKeyModule = appContainer.resolve<IApiKeyModuleService>( const apiKeyModule = appContainer.resolve<IApiKeyModuleService>(
ModuleRegistrationName.API_KEY Modules.API_KEY
) )
return await apiKeyModule.createApiKeys({ return await apiKeyModule.createApiKeys({
@@ -4,18 +4,14 @@ import {
IStoreModuleService, IStoreModuleService,
MedusaContainer, MedusaContainer,
} from "@medusajs/types" } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
export const seedStorefrontDefaults = async ( export const seedStorefrontDefaults = async (
container: MedusaContainer, container: MedusaContainer,
defaultCurrency: string = "usd" defaultCurrency: string = "usd"
) => { ) => {
const regionModule: IRegionModuleService = container.resolve( const regionModule: IRegionModuleService = container.resolve(Modules.REGION)
ModuleRegistrationName.REGION const storeModule: IStoreModuleService = container.resolve(Modules.STORE)
)
const storeModule: IStoreModuleService = container.resolve(
ModuleRegistrationName.STORE
)
// Creates the stores & default sales channel // Creates the stores & default sales channel
await createDefaultsWorkflow(container).run() await createDefaultsWorkflow(container).run()
@@ -2,7 +2,6 @@ import {
ClaimReason, ClaimReason,
ClaimType, ClaimType,
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
RuleOperator, RuleOperator,
} from "@medusajs/utils" } from "@medusajs/utils"
@@ -122,7 +121,7 @@ medusaIntegrationTestRunner({
) )
).data.return_reason ).data.return_reason
const orderModule = container.resolve(ModuleRegistrationName.ORDER) const orderModule = container.resolve(Modules.ORDER)
order = await orderModule.createOrders({ order = await orderModule.createOrders({
region_id: region.id, region_id: region.id,
@@ -401,7 +400,7 @@ medusaIntegrationTestRunner({
item = order.items[0] item = order.items[0]
await setupTaxStructure(container.resolve(ModuleRegistrationName.TAX)) await setupTaxStructure(container.resolve(Modules.TAX))
}) })
describe("Claims lifecycle", () => { describe("Claims lifecycle", () => {
@@ -1,5 +1,5 @@
import { IAuthModuleService } from "@medusajs/types" import { IAuthModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import jwt from "jsonwebtoken" import jwt from "jsonwebtoken"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { import {
@@ -443,9 +443,7 @@ medusaIntegrationTestRunner({
const { auth_identity_id } = jwt.decode(registeredCustomerToken) const { auth_identity_id } = jwt.decode(registeredCustomerToken)
const authModule: IAuthModuleService = container.resolve( const authModule: IAuthModuleService = container.resolve(Modules.AUTH)
ModuleRegistrationName.AUTH
)
const authIdentity = await authModule.retrieveAuthIdentity( const authIdentity = await authModule.retrieveAuthIdentity(
auth_identity_id auth_identity_id
@@ -1,6 +1,5 @@
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
RuleOperator, RuleOperator,
} from "@medusajs/utils" } from "@medusajs/utils"
@@ -118,7 +117,7 @@ medusaIntegrationTestRunner({
) )
).data.return_reason ).data.return_reason
const orderModule = container.resolve(ModuleRegistrationName.ORDER) const orderModule = container.resolve(Modules.ORDER)
order = await orderModule.createOrders({ order = await orderModule.createOrders({
region_id: region.id, region_id: region.id,
@@ -420,7 +419,7 @@ medusaIntegrationTestRunner({
adminHeaders adminHeaders
) )
await setupTaxStructure(container.resolve(ModuleRegistrationName.TAX)) await setupTaxStructure(container.resolve(Modules.TAX))
}) })
describe("Exchanges lifecycle", () => { describe("Exchanges lifecycle", () => {
@@ -1,5 +1,5 @@
import { IFulfillmentModuleService } from "@medusajs/types" import { IFulfillmentModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { import {
adminHeaders, adminHeaders,
createAdminUser, createAdminUser,
@@ -29,7 +29,7 @@ medusaIntegrationTestRunner({
// TODO: Add support for creating fulfillment sets through HTTP // TODO: Add support for creating fulfillment sets through HTTP
const fulfillmentModule: IFulfillmentModuleService = const fulfillmentModule: IFulfillmentModuleService =
getContainer().resolve(ModuleRegistrationName.FULFILLMENT) getContainer().resolve(Modules.FULFILLMENT)
fulfillmentSet1 = await fulfillmentModule.createFulfillmentSets({ fulfillmentSet1 = await fulfillmentModule.createFulfillmentSets({
name: "Test fulfillment set", name: "Test fulfillment set",
@@ -1,6 +1,5 @@
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
OrderChangeStatus, OrderChangeStatus,
RuleOperator, RuleOperator,
@@ -130,7 +129,7 @@ medusaIntegrationTestRunner({
) )
).data.product ).data.product
const orderModule = container.resolve(ModuleRegistrationName.ORDER) const orderModule = container.resolve(Modules.ORDER)
order = await orderModule.createOrders({ order = await orderModule.createOrders({
region_id: region.id, region_id: region.id,
@@ -1,8 +1,4 @@
import { import { ClaimType, Modules, RuleOperator } from "@medusajs/utils"
ClaimType,
ModuleRegistrationName,
RuleOperator,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { import {
adminHeaders, adminHeaders,
@@ -26,7 +22,7 @@ medusaIntegrationTestRunner({
beforeEach(async () => { beforeEach(async () => {
const container = getContainer() const container = getContainer()
await setupTaxStructure(container.resolve(ModuleRegistrationName.TAX)) await setupTaxStructure(container.resolve(Modules.TAX))
await createAdminUser(dbConnection, adminHeaders, container) await createAdminUser(dbConnection, adminHeaders, container)
order = await createOrderSeeder({ api, container }) order = await createOrderSeeder({ api, container })
@@ -1,13 +1,13 @@
import { IEventBusModuleService } from "@medusajs/types" import { IEventBusModuleService } from "@medusajs/types"
import { CommonEvents, Modules } from "@medusajs/utils"
import fs from "fs/promises"
import { TestEventUtils, medusaIntegrationTestRunner } from "medusa-test-utils" import { TestEventUtils, medusaIntegrationTestRunner } from "medusa-test-utils"
import path from "path"
import { import {
adminHeaders, adminHeaders,
createAdminUser, createAdminUser,
} from "../../../../helpers/create-admin-user" } from "../../../../helpers/create-admin-user"
import { getProductFixture } from "../../../../helpers/fixtures" import { getProductFixture } from "../../../../helpers/fixtures"
import fs from "fs/promises"
import path from "path"
import { ModuleRegistrationName } from "@medusajs/utils"
jest.setTimeout(50000) jest.setTimeout(50000)
@@ -56,7 +56,7 @@ medusaIntegrationTestRunner({
let eventBus: IEventBusModuleService let eventBus: IEventBusModuleService
beforeAll(async () => { beforeAll(async () => {
eventBus = getContainer().resolve(ModuleRegistrationName.EVENT_BUS) eventBus = getContainer().resolve(Modules.EVENT_BUS)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -201,7 +201,7 @@ medusaIntegrationTestRunner({
describe("POST /admin/products/export", () => { describe("POST /admin/products/export", () => {
it("should export a csv file containing the expected products", async () => { it("should export a csv file containing the expected products", async () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution( const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created", `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus eventBus
) )
@@ -243,7 +243,7 @@ medusaIntegrationTestRunner({
it("should export a csv file with categories", async () => { it("should export a csv file with categories", async () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution( const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created", `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus eventBus
) )
@@ -269,7 +269,7 @@ medusaIntegrationTestRunner({
it("should export a csv file with region prices", async () => { it("should export a csv file with region prices", async () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution( const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created", `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus eventBus
) )
@@ -328,7 +328,7 @@ medusaIntegrationTestRunner({
it("should export a csv file filtered by specific products", async () => { it("should export a csv file filtered by specific products", async () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution( const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created", `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus eventBus
) )
@@ -1,13 +1,13 @@
import { IEventBusModuleService } from "@medusajs/types" import { IEventBusModuleService } from "@medusajs/types"
import { CommonEvents, Modules } from "@medusajs/utils"
import FormData from "form-data"
import fs from "fs/promises"
import { TestEventUtils, medusaIntegrationTestRunner } from "medusa-test-utils" import { TestEventUtils, medusaIntegrationTestRunner } from "medusa-test-utils"
import path from "path"
import { import {
adminHeaders, adminHeaders,
createAdminUser, createAdminUser,
} from "../../../../helpers/create-admin-user" } from "../../../../helpers/create-admin-user"
import FormData from "form-data"
import fs from "fs/promises"
import path from "path"
import { ModuleRegistrationName } from "@medusajs/utils"
import { getProductFixture } from "../../../../helpers/fixtures" import { getProductFixture } from "../../../../helpers/fixtures"
jest.setTimeout(50000) jest.setTimeout(50000)
@@ -40,7 +40,7 @@ medusaIntegrationTestRunner({
let eventBus: IEventBusModuleService let eventBus: IEventBusModuleService
beforeAll(async () => { beforeAll(async () => {
eventBus = getContainer().resolve(ModuleRegistrationName.EVENT_BUS) eventBus = getContainer().resolve(Modules.EVENT_BUS)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -127,7 +127,7 @@ medusaIntegrationTestRunner({
].forEach((testcase) => { ].forEach((testcase) => {
it(`should import a previously exported products CSV file ${testcase.name}`, async () => { it(`should import a previously exported products CSV file ${testcase.name}`, async () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution( const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created", `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus eventBus
) )
@@ -383,7 +383,7 @@ medusaIntegrationTestRunner({
it("should import product with categories", async () => { it("should import product with categories", async () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution( const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created", `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus eventBus
) )
@@ -452,7 +452,7 @@ medusaIntegrationTestRunner({
it("should ignore non-existent fields being present in the CSV that don't start with Product or Variant", async () => { it("should ignore non-existent fields being present in the CSV that don't start with Product or Variant", async () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution( const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created", `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus eventBus
) )
@@ -502,7 +502,7 @@ medusaIntegrationTestRunner({
it("should fail on non-existent product fields being present in the CSV", async () => { it("should fail on non-existent product fields being present in the CSV", async () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution( const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created", `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus eventBus
) )
@@ -552,7 +552,7 @@ medusaIntegrationTestRunner({
it("supports importing the v1 template", async () => { it("supports importing the v1 template", async () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution( const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created", `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus eventBus
) )
@@ -781,6 +781,7 @@ medusaIntegrationTestRunner({
created_at: expect.any(String), created_at: expect.any(String),
updated_at: expect.any(String), updated_at: expect.any(String),
}), }),
expect.objectContaining({ expect.objectContaining({
id: expect.any(String), id: expect.any(String),
title: "Test product", title: "Test product",
@@ -1,9 +1,5 @@
import { IStoreModuleService } from "@medusajs/types" import { IStoreModuleService } from "@medusajs/types"
import { import { ApiKeyType, Modules, ProductStatus } from "@medusajs/utils"
ApiKeyType,
ModuleRegistrationName,
ProductStatus,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { import {
adminHeaders, adminHeaders,
@@ -91,7 +87,7 @@ medusaIntegrationTestRunner({
await createAdminUser(dbConnection, adminHeaders, appContainer) await createAdminUser(dbConnection, adminHeaders, appContainer)
const storeModule: IStoreModuleService = appContainer.resolve( const storeModule: IStoreModuleService = appContainer.resolve(
ModuleRegistrationName.STORE Modules.STORE
) )
// A default store is created when the app is started, so we want to delete that one and create one specifically for our tests. // A default store is created when the app is started, so we want to delete that one and create one specifically for our tests.
const defaultId = (await api.get("/admin/stores", adminHeaders)).data const defaultId = (await api.get("/admin/stores", adminHeaders)).data
@@ -540,7 +536,7 @@ medusaIntegrationTestRunner({
adminHeaders adminHeaders
) )
const service = appContainer.resolve(ModuleRegistrationName.STORE) const service = appContainer.resolve(Modules.STORE)
const [store] = await service.listStores() const [store] = await service.listStores()
if (store) { if (store) {
@@ -1158,7 +1154,7 @@ medusaIntegrationTestRunner({
adminHeaders adminHeaders
) )
const service = appContainer.resolve(ModuleRegistrationName.STORE) const service = appContainer.resolve(Modules.STORE)
const [store] = await service.listStores() const [store] = await service.listStores()
if (store) { if (store) {
@@ -1,6 +1,5 @@
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
RuleOperator, RuleOperator,
} from "@medusajs/utils" } from "@medusajs/utils"
@@ -60,7 +59,7 @@ medusaIntegrationTestRunner({
) )
).data.return_reason ).data.return_reason
const orderModule = container.resolve(ModuleRegistrationName.ORDER) const orderModule = container.resolve(Modules.ORDER)
order = await orderModule.createOrders({ order = await orderModule.createOrders({
region_id: "test_region_id", region_id: "test_region_id",
@@ -1,4 +1,4 @@
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { import {
adminHeaders, adminHeaders,
createAdminUser, createAdminUser,
@@ -298,9 +298,7 @@ medusaIntegrationTestRunner({
await api.delete(`/admin/stock-locations/${location1.id}`, adminHeaders) await api.delete(`/admin/stock-locations/${location1.id}`, adminHeaders)
// TODO: Ideally we use HTTP here, maybe we should have a get endpoint for fulfillment sets? // TODO: Ideally we use HTTP here, maybe we should have a get endpoint for fulfillment sets?
const fulfillmentModule = getContainer().resolve( const fulfillmentModule = getContainer().resolve(Modules.FULFILLMENT)
ModuleRegistrationName.FULFILLMENT
)
const sets = await fulfillmentModule.listFulfillmentSets() const sets = await fulfillmentModule.listFulfillmentSets()
expect(sets).toHaveLength(0) expect(sets).toHaveLength(0)
}) })
@@ -1,10 +1,10 @@
import { IStoreModuleService } from "@medusajs/types"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { import {
adminHeaders, adminHeaders,
createAdminUser, createAdminUser,
} from "../../../../helpers/create-admin-user" } from "../../../../helpers/create-admin-user"
import { ModuleRegistrationName } from "@medusajs/utils"
import { IStoreModuleService } from "@medusajs/types"
jest.setTimeout(90000) jest.setTimeout(90000)
@@ -17,7 +17,7 @@ medusaIntegrationTestRunner({
beforeEach(async () => { beforeEach(async () => {
container = getContainer() container = getContainer()
const storeModule: IStoreModuleService = container.resolve( const storeModule: IStoreModuleService = container.resolve(
ModuleRegistrationName.STORE Modules.STORE
) )
await createAdminUser(dbConnection, adminHeaders, container) await createAdminUser(dbConnection, adminHeaders, container)
@@ -1,5 +1,5 @@
import { IAuthModuleService } from "@medusajs/types" import { IAuthModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { import {
adminHeaders, adminHeaders,
@@ -118,9 +118,7 @@ medusaIntegrationTestRunner({
deleted: true, deleted: true,
}) })
const authModule: IAuthModuleService = container.resolve( const authModule: IAuthModuleService = container.resolve(Modules.AUTH)
ModuleRegistrationName.AUTH
)
const updatedAuthIdentity = await authModule.retrieveAuthIdentity( const updatedAuthIdentity = await authModule.retrieveAuthIdentity(
authIdentity.id authIdentity.id
@@ -159,7 +157,7 @@ medusaIntegrationTestRunner({
}) })
it("throws if you attempt to delete another user", async () => { it("throws if you attempt to delete another user", async () => {
const userModule = container.resolve(ModuleRegistrationName.USER) const userModule = container.resolve(Modules.USER)
const userTwo = await userModule.createUsers({ const userTwo = await userModule.createUsers({
email: "test@test.com", email: "test@test.com",
@@ -1,5 +1,5 @@
import { IAuthModuleService } from "@medusajs/types" import { IAuthModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import Scrypt from "scrypt-kdf" import Scrypt from "scrypt-kdf"
import { import {
@@ -32,7 +32,7 @@ medusaIntegrationTestRunner({
await Scrypt.kdf(password, { logN: 15, r: 8, p: 1 }) await Scrypt.kdf(password, { logN: 15, r: 8, p: 1 })
).toString("base64") ).toString("base64")
const authService: IAuthModuleService = appContainer.resolve( const authService: IAuthModuleService = appContainer.resolve(
ModuleRegistrationName.AUTH Modules.AUTH
) )
await authService.createAuthIdentities({ await authService.createAuthIdentities({
@@ -67,7 +67,7 @@ medusaIntegrationTestRunner({
await Scrypt.kdf(password, { logN: 15, r: 8, p: 1 }) await Scrypt.kdf(password, { logN: 15, r: 8, p: 1 })
).toString("base64") ).toString("base64")
const authService: IAuthModuleService = appContainer.resolve( const authService: IAuthModuleService = appContainer.resolve(
ModuleRegistrationName.AUTH Modules.AUTH
) )
await authService.createAuthIdentities({ await authService.createAuthIdentities({
@@ -2,7 +2,6 @@ import { RemoteLink } from "@medusajs/modules-sdk"
import { ICartModuleService, IPromotionModuleService } from "@medusajs/types" import { ICartModuleService, IPromotionModuleService } from "@medusajs/types"
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
PromotionType, PromotionType,
} from "@medusajs/utils" } from "@medusajs/utils"
@@ -30,10 +29,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
cartModuleService = appContainer.resolve(ModuleRegistrationName.CART) cartModuleService = appContainer.resolve(Modules.CART)
promotionModuleService = appContainer.resolve( promotionModuleService = appContainer.resolve(Modules.PROMOTION)
ModuleRegistrationName.PROMOTION
)
remoteLinkService = appContainer.resolve( remoteLinkService = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_LINK ContainerRegistrationKeys.REMOTE_LINK
) )
@@ -26,7 +26,6 @@ import {
} from "@medusajs/types" } from "@medusajs/types"
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
RuleOperator, RuleOperator,
} from "@medusajs/utils" } from "@medusajs/utils"
@@ -62,24 +61,16 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
cartModuleService = appContainer.resolve(ModuleRegistrationName.CART) cartModuleService = appContainer.resolve(Modules.CART)
regionModuleService = appContainer.resolve( regionModuleService = appContainer.resolve(Modules.REGION)
ModuleRegistrationName.REGION scModuleService = appContainer.resolve(Modules.SALES_CHANNEL)
) customerModule = appContainer.resolve(Modules.CUSTOMER)
scModuleService = appContainer.resolve( productModule = appContainer.resolve(Modules.PRODUCT)
ModuleRegistrationName.SALES_CHANNEL pricingModule = appContainer.resolve(Modules.PRICING)
) paymentModule = appContainer.resolve(Modules.PAYMENT)
customerModule = appContainer.resolve(ModuleRegistrationName.CUSTOMER) inventoryModule = appContainer.resolve(Modules.INVENTORY)
productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT) stockLocationModule = appContainer.resolve(Modules.STOCK_LOCATION)
pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING) fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT)
paymentModule = appContainer.resolve(ModuleRegistrationName.PAYMENT)
inventoryModule = appContainer.resolve(ModuleRegistrationName.INVENTORY)
stockLocationModule = appContainer.resolve(
ModuleRegistrationName.STOCK_LOCATION
)
fulfillmentModule = appContainer.resolve(
ModuleRegistrationName.FULFILLMENT
)
remoteLink = appContainer.resolve(ContainerRegistrationKeys.REMOTE_LINK) remoteLink = appContainer.resolve(ContainerRegistrationKeys.REMOTE_LINK)
remoteQuery = appContainer.resolve( remoteQuery = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_QUERY ContainerRegistrationKeys.REMOTE_QUERY
@@ -17,7 +17,6 @@ import {
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
MedusaError, MedusaError,
ModuleRegistrationName,
Modules, Modules,
ProductStatus, ProductStatus,
PromotionRuleOperator, PromotionRuleOperator,
@@ -66,22 +65,20 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
cartModule = appContainer.resolve(ModuleRegistrationName.CART) cartModule = appContainer.resolve(Modules.CART)
regionModule = appContainer.resolve(ModuleRegistrationName.REGION) regionModule = appContainer.resolve(Modules.REGION)
scModule = appContainer.resolve(ModuleRegistrationName.SALES_CHANNEL) scModule = appContainer.resolve(Modules.SALES_CHANNEL)
customerModule = appContainer.resolve(ModuleRegistrationName.CUSTOMER) customerModule = appContainer.resolve(Modules.CUSTOMER)
productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT) productModule = appContainer.resolve(Modules.PRODUCT)
pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING) pricingModule = appContainer.resolve(Modules.PRICING)
apiKeyModule = appContainer.resolve(ModuleRegistrationName.API_KEY) apiKeyModule = appContainer.resolve(Modules.API_KEY)
remoteLink = appContainer.resolve(ContainerRegistrationKeys.REMOTE_LINK) remoteLink = appContainer.resolve(ContainerRegistrationKeys.REMOTE_LINK)
promotionModule = appContainer.resolve(ModuleRegistrationName.PROMOTION) promotionModule = appContainer.resolve(Modules.PROMOTION)
taxModule = appContainer.resolve(ModuleRegistrationName.TAX) taxModule = appContainer.resolve(Modules.TAX)
regionService = appContainer.resolve(ModuleRegistrationName.REGION) regionService = appContainer.resolve(Modules.REGION)
paymentService = appContainer.resolve(ModuleRegistrationName.PAYMENT) paymentService = appContainer.resolve(Modules.PAYMENT)
storeService = appContainer.resolve(ModuleRegistrationName.STORE) storeService = appContainer.resolve(Modules.STORE)
fulfillmentModule = appContainer.resolve( fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT)
ModuleRegistrationName.FULFILLMENT
)
remoteLinkService = appContainer.resolve( remoteLinkService = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_LINK ContainerRegistrationKeys.REMOTE_LINK
) )
@@ -148,18 +145,18 @@ medusaIntegrationTestRunner({
await remoteLink.create([ await remoteLink.create([
{ {
productService: { Product: {
variant_id: product.variants[0].id, variant_id: product.variants[0].id,
}, },
pricingService: { Pricing: {
price_set_id: priceSet.id, price_set_id: priceSet.id,
}, },
}, },
{ {
productService: { Product: {
variant_id: product.variants[1].id, variant_id: product.variants[1].id,
}, },
pricingService: { Pricing: {
price_set_id: priceSetTwo.id, price_set_id: priceSetTwo.id,
}, },
}, },
@@ -236,8 +233,8 @@ medusaIntegrationTestRunner({
await remoteLink.create([ await remoteLink.create([
{ {
productService: { variant_id: product.variants[0].id }, Product: { variant_id: product.variants[0].id },
pricingService: { price_set_id: priceSet.id }, Pricing: { price_set_id: priceSet.id },
}, },
]) ])
@@ -1414,16 +1411,16 @@ medusaIntegrationTestRunner({
await remoteLink.create([ await remoteLink.create([
{ {
productService: { Product: {
variant_id: productWithSpecialTax.variants[0].id, variant_id: productWithSpecialTax.variants[0].id,
}, },
pricingService: { price_set_id: priceSet.id }, Pricing: { price_set_id: priceSet.id },
}, },
{ {
productService: { Product: {
variant_id: productWithDefaultTax.variants[0].id, variant_id: productWithDefaultTax.variants[0].id,
}, },
pricingService: { price_set_id: priceSetDefaultTax.id }, Pricing: { price_set_id: priceSetDefaultTax.id },
}, },
{ {
[Modules.CART]: { cart_id: cart.id }, [Modules.CART]: { cart_id: cart.id },
@@ -2,7 +2,6 @@ import { RemoteLink } from "@medusajs/modules-sdk"
import { ICartModuleService, IPromotionModuleService } from "@medusajs/types" import { ICartModuleService, IPromotionModuleService } from "@medusajs/types"
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
PromotionType, PromotionType,
} from "@medusajs/utils" } from "@medusajs/utils"
@@ -30,13 +29,11 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
cartModuleService = appContainer.resolve(ModuleRegistrationName.CART) cartModuleService = appContainer.resolve(Modules.CART)
remoteLinkService = appContainer.resolve( remoteLinkService = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_LINK ContainerRegistrationKeys.REMOTE_LINK
) )
promotionModuleService = appContainer.resolve( promotionModuleService = appContainer.resolve(Modules.PROMOTION)
ModuleRegistrationName.PROMOTION
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,10 +1,10 @@
import { Modules } from "@medusajs/utils"
import { import {
adminHeaders, adminHeaders,
createAdminUser, createAdminUser,
} from "../../../../helpers/create-admin-user" } from "../../../../helpers/create-admin-user"
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
const { medusaIntegrationTestRunner } = require("medusa-test-utils") const { medusaIntegrationTestRunner } = require("medusa-test-utils")
@@ -22,9 +22,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { import {
generatePublishableKey, generatePublishableKey,
@@ -21,9 +21,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,9 +1,6 @@
import { IAuthModuleService } from "@medusajs/types" import { IAuthModuleService } from "@medusajs/types"
import { import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
ContainerRegistrationKeys,
ModuleRegistrationName,
} from "@medusajs/utils"
import jwt from "jsonwebtoken" import jwt from "jsonwebtoken"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { import {
@@ -37,7 +34,7 @@ medusaIntegrationTestRunner({
// TODO: Reenable once the customer authentication is fixed, and use the HTTP endpoints instead. // TODO: Reenable once the customer authentication is fixed, and use the HTTP endpoints instead.
it.skip("should create a customer", async () => { it.skip("should create a customer", async () => {
const authService: IAuthModuleService = appContainer.resolve( const authService: IAuthModuleService = appContainer.resolve(
ModuleRegistrationName.AUTH Modules.AUTH
) )
const { http } = appContainer.resolve( const { http } = appContainer.resolve(
ContainerRegistrationKeys.CONFIG_MODULE ContainerRegistrationKeys.CONFIG_MODULE
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { import {
generatePublishableKey, generatePublishableKey,
@@ -21,9 +21,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { import {
generatePublishableKey, generatePublishableKey,
@@ -21,9 +21,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types" import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { import {
generatePublishableKey, generatePublishableKey,
@@ -21,9 +21,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
customerModuleService = appContainer.resolve( customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,6 +1,6 @@
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { MedusaContainer } from "@medusajs/types" import { MedusaContainer } from "@medusajs/types"
import { composeMessage, ModuleRegistrationName } from "@medusajs/utils" import { Modules, composeMessage } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import testEventPayloadHandlerMock from "../../dist/subscribers/test-event-payload" import testEventPayloadHandlerMock from "../../dist/subscribers/test-event-payload"
jest.setTimeout(30000) jest.setTimeout(30000)
@@ -15,7 +15,7 @@ medusaIntegrationTestRunner({
}) })
it(`should emit event with the expected shape to be received by the subscribers`, async () => { it(`should emit event with the expected shape to be received by the subscribers`, async () => {
const eventBus = container.resolve(ModuleRegistrationName.EVENT_BUS) const eventBus = container.resolve(Modules.EVENT_BUS)
const eventName = "test-event-payload" const eventName = "test-event-payload"
await eventBus.emit( await eventBus.emit(
@@ -1,5 +1,5 @@
import { IFulfillmentModuleService } from "@medusajs/types" import { IFulfillmentModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../helpers/create-admin-user" import { createAdminUser } from "../../../helpers/create-admin-user"
@@ -18,7 +18,7 @@ medusaIntegrationTestRunner({
beforeAll(() => { beforeAll(() => {
container = getContainer() container = getContainer()
service = container.resolve(ModuleRegistrationName.FULFILLMENT) service = container.resolve(Modules.FULFILLMENT)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -7,7 +7,7 @@ import {
updateFulfillmentWorkflowId, updateFulfillmentWorkflowId,
} from "@medusajs/core-flows" } from "@medusajs/core-flows"
import { IFulfillmentModuleService } from "@medusajs/types" import { IFulfillmentModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { import {
generateCreateFulfillmentData, generateCreateFulfillmentData,
@@ -27,7 +27,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
service = appContainer.resolve(ModuleRegistrationName.FULFILLMENT) service = appContainer.resolve(Modules.FULFILLMENT)
}) })
describe("createFulfillmentWorkflow", () => { describe("createFulfillmentWorkflow", () => {
@@ -1,5 +1,5 @@
import { IFulfillmentModuleService } from "@medusajs/types" import { IFulfillmentModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../helpers/create-admin-user" import { createAdminUser } from "../../../helpers/create-admin-user"
import { import {
@@ -24,7 +24,7 @@ medusaIntegrationTestRunner({
beforeAll(() => { beforeAll(() => {
container = getContainer() container = getContainer()
service = container.resolve(ModuleRegistrationName.FULFILLMENT) service = container.resolve(Modules.FULFILLMENT)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { IUserModuleService } from "@medusajs/types" import { IUserModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../helpers/create-admin-user" import { createAdminUser } from "../../../helpers/create-admin-user"
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
userModuleService = appContainer.resolve(ModuleRegistrationName.USER) userModuleService = appContainer.resolve(Modules.USER)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { IUserModuleService } from "@medusajs/types" import { IUserModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../helpers/create-admin-user" import { createAdminUser } from "../../../helpers/create-admin-user"
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
userModuleService = appContainer.resolve(ModuleRegistrationName.USER) userModuleService = appContainer.resolve(Modules.USER)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { IUserModuleService } from "@medusajs/types" import { IUserModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../helpers/create-admin-user" import { createAdminUser } from "../../../helpers/create-admin-user"
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
userModuleService = appContainer.resolve(ModuleRegistrationName.USER) userModuleService = appContainer.resolve(Modules.USER)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { IUserModuleService } from "@medusajs/types" import { IUserModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../helpers/create-admin-user" import { createAdminUser } from "../../../helpers/create-admin-user"
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
userModuleService = appContainer.resolve(ModuleRegistrationName.USER) userModuleService = appContainer.resolve(Modules.USER)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { IUserModuleService } from "@medusajs/types" import { IUserModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../helpers/create-admin-user" import { createAdminUser } from "../../../helpers/create-admin-user"
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
userModuleService = appContainer.resolve(ModuleRegistrationName.USER) userModuleService = appContainer.resolve(Modules.USER)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -5,7 +5,7 @@ import {
IRegionModuleService, IRegionModuleService,
ISalesChannelModuleService, ISalesChannelModuleService,
} from "@medusajs/types" } from "@medusajs/types"
import { ModuleRegistrationName, Modules } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(50000) jest.setTimeout(50000)
@@ -26,16 +26,12 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
cartModuleService = appContainer.resolve(ModuleRegistrationName.CART) cartModuleService = appContainer.resolve(Modules.CART)
regionModule = appContainer.resolve(ModuleRegistrationName.REGION) regionModule = appContainer.resolve(Modules.REGION)
customerModule = appContainer.resolve(ModuleRegistrationName.CUSTOMER) customerModule = appContainer.resolve(Modules.CUSTOMER)
scModuleService = appContainer.resolve( scModuleService = appContainer.resolve(Modules.SALES_CHANNEL)
ModuleRegistrationName.SALES_CHANNEL regionModule = appContainer.resolve(Modules.REGION)
) paymentModuleService = appContainer.resolve(Modules.PAYMENT)
regionModule = appContainer.resolve(ModuleRegistrationName.REGION)
paymentModuleService = appContainer.resolve(
ModuleRegistrationName.PAYMENT
)
remoteQuery = appContainer.resolve("remoteQuery") remoteQuery = appContainer.resolve("remoteQuery")
remoteLink = appContainer.resolve("remoteLink") remoteLink = appContainer.resolve("remoteLink")
}) })
@@ -1,5 +1,5 @@
import { ICartModuleService, IRegionModuleService } from "@medusajs/types" import { ICartModuleService, IRegionModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(50000) jest.setTimeout(50000)
@@ -17,8 +17,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
cartModuleService = appContainer.resolve(ModuleRegistrationName.CART) cartModuleService = appContainer.resolve(Modules.CART)
regionModule = appContainer.resolve(ModuleRegistrationName.REGION) regionModule = appContainer.resolve(Modules.REGION)
remoteQuery = appContainer.resolve("remoteQuery") remoteQuery = appContainer.resolve("remoteQuery")
}) })
@@ -29,7 +29,7 @@ medusaIntegrationTestRunner({
expect(link.serviceName).toEqual(linkDefinition.serviceName) expect(link.serviceName).toEqual(linkDefinition.serviceName)
expect(link.entryPoint).toEqual(linkDefinition.alias[0].name[0]) expect(link.entryPoint).toEqual(linkDefinition.alias[0].name[0])
expect(linkDefinition).toEqual({ expect(linkDefinition).toEqual({
serviceName: "currencyCurrencyRegionRegionLink", serviceName: "CurrencyCurrencyRegionRegionLink",
isLink: true, isLink: true,
alias: [ alias: [
{ {
@@ -42,7 +42,7 @@ medusaIntegrationTestRunner({
primaryKeys: ["id", "currency_code", "region_id"], primaryKeys: ["id", "currency_code", "region_id"],
relationships: [ relationships: [
{ {
serviceName: "currency", serviceName: "Currency",
entity: "Currency", entity: "Currency",
primaryKey: "code", primaryKey: "code",
foreignKey: "currency_code", foreignKey: "currency_code",
@@ -53,7 +53,7 @@ medusaIntegrationTestRunner({
deleteCascade: false, deleteCascade: false,
}, },
{ {
serviceName: "region", serviceName: "Region",
entity: "Region", entity: "Region",
primaryKey: "id", primaryKey: "id",
foreignKey: "region_id", foreignKey: "region_id",
@@ -66,7 +66,7 @@ medusaIntegrationTestRunner({
], ],
extends: [ extends: [
{ {
serviceName: "currency", serviceName: "Currency",
fieldAlias: { fieldAlias: {
region: { region: {
path: "region_link.region", path: "region_link.region",
@@ -75,7 +75,7 @@ medusaIntegrationTestRunner({
}, },
}, },
relationship: { relationship: {
serviceName: "currencyCurrencyRegionRegionLink", serviceName: "CurrencyCurrencyRegionRegionLink",
primaryKey: "currency_code", primaryKey: "currency_code",
foreignKey: "code", foreignKey: "code",
alias: "region_link", alias: "region_link",
@@ -83,7 +83,7 @@ medusaIntegrationTestRunner({
}, },
}, },
{ {
serviceName: "region", serviceName: "Region",
fieldAlias: { fieldAlias: {
currency: { currency: {
path: "currency_link.currency", path: "currency_link.currency",
@@ -92,7 +92,7 @@ medusaIntegrationTestRunner({
}, },
}, },
relationship: { relationship: {
serviceName: "currencyCurrencyRegionRegionLink", serviceName: "CurrencyCurrencyRegionRegionLink",
primaryKey: "region_id", primaryKey: "region_id",
foreignKey: "id", foreignKey: "id",
alias: "currency_link", alias: "currency_link",
@@ -124,20 +124,20 @@ medusaIntegrationTestRunner({
expect(link.serviceName).toEqual(linkDefinition.serviceName) expect(link.serviceName).toEqual(linkDefinition.serviceName)
expect(link.entryPoint).toEqual(linkDefinition.alias[0].name[0]) expect(link.entryPoint).toEqual(linkDefinition.alias[0].name[0])
expect(linkDefinition).toEqual({ expect(linkDefinition).toEqual({
serviceName: "productProductVariantRegionRegionLink", serviceName: "ProductProductVariantRegionRegionLink",
isLink: true, isLink: true,
alias: [ alias: [
{ {
name: ["product_variant_region"], name: ["product_variant_region"],
args: { args: {
entity: "LinkProductServiceProductVariantRegionRegion", entity: "LinkProductProductVariantRegionRegion",
}, },
}, },
], ],
primaryKeys: ["id", "product_variant_id", "region_id"], primaryKeys: ["id", "product_variant_id", "region_id"],
relationships: [ relationships: [
{ {
serviceName: "productService", serviceName: "Product",
entity: "ProductVariant", entity: "ProductVariant",
primaryKey: "id", primaryKey: "id",
foreignKey: "product_variant_id", foreignKey: "product_variant_id",
@@ -148,7 +148,7 @@ medusaIntegrationTestRunner({
deleteCascade: false, deleteCascade: false,
}, },
{ {
serviceName: "region", serviceName: "Region",
entity: "Region", entity: "Region",
primaryKey: "id", primaryKey: "id",
foreignKey: "region_id", foreignKey: "region_id",
@@ -161,7 +161,7 @@ medusaIntegrationTestRunner({
], ],
extends: [ extends: [
{ {
serviceName: "productService", serviceName: "Product",
fieldAlias: { fieldAlias: {
region: { region: {
path: "region_link.region", path: "region_link.region",
@@ -170,7 +170,7 @@ medusaIntegrationTestRunner({
}, },
}, },
relationship: { relationship: {
serviceName: "productProductVariantRegionRegionLink", serviceName: "ProductProductVariantRegionRegionLink",
primaryKey: "product_variant_id", primaryKey: "product_variant_id",
foreignKey: "id", foreignKey: "id",
alias: "region_link", alias: "region_link",
@@ -178,7 +178,7 @@ medusaIntegrationTestRunner({
}, },
}, },
{ {
serviceName: "region", serviceName: "Region",
fieldAlias: { fieldAlias: {
product_variant: { product_variant: {
path: "product_variant_link.product_variant", path: "product_variant_link.product_variant",
@@ -189,7 +189,7 @@ medusaIntegrationTestRunner({
}, },
}, },
relationship: { relationship: {
serviceName: "productProductVariantRegionRegionLink", serviceName: "ProductProductVariantRegionRegionLink",
primaryKey: "region_id", primaryKey: "region_id",
foreignKey: "id", foreignKey: "id",
alias: "product_variant_link", alias: "product_variant_link",
@@ -224,7 +224,7 @@ medusaIntegrationTestRunner({
expect(link.serviceName).toEqual(linkDefinition.serviceName) expect(link.serviceName).toEqual(linkDefinition.serviceName)
expect(link.entryPoint).toEqual(linkDefinition.alias[0].name[0]) expect(link.entryPoint).toEqual(linkDefinition.alias[0].name[0])
expect(linkDefinition).toEqual({ expect(linkDefinition).toEqual({
serviceName: "currencyCurrencyRegionRegionLink", serviceName: "CurrencyCurrencyRegionRegionLink",
isLink: true, isLink: true,
alias: [ alias: [
{ {
@@ -237,7 +237,7 @@ medusaIntegrationTestRunner({
primaryKeys: ["id", "currency_code", "region_id"], primaryKeys: ["id", "currency_code", "region_id"],
relationships: [ relationships: [
{ {
serviceName: "currency", serviceName: "Currency",
entity: "Currency", entity: "Currency",
primaryKey: "code", primaryKey: "code",
foreignKey: "currency_code", foreignKey: "currency_code",
@@ -248,7 +248,7 @@ medusaIntegrationTestRunner({
deleteCascade: true, deleteCascade: true,
}, },
{ {
serviceName: "region", serviceName: "Region",
entity: "Region", entity: "Region",
primaryKey: "id", primaryKey: "id",
foreignKey: "region_id", foreignKey: "region_id",
@@ -261,7 +261,7 @@ medusaIntegrationTestRunner({
], ],
extends: [ extends: [
{ {
serviceName: "currency", serviceName: "Currency",
fieldAlias: { fieldAlias: {
region: { region: {
path: "region_link.region", path: "region_link.region",
@@ -270,7 +270,7 @@ medusaIntegrationTestRunner({
}, },
}, },
relationship: { relationship: {
serviceName: "currencyCurrencyRegionRegionLink", serviceName: "CurrencyCurrencyRegionRegionLink",
primaryKey: "currency_code", primaryKey: "currency_code",
foreignKey: "code", foreignKey: "code",
alias: "region_link", alias: "region_link",
@@ -278,7 +278,7 @@ medusaIntegrationTestRunner({
}, },
}, },
{ {
serviceName: "region", serviceName: "Region",
fieldAlias: { fieldAlias: {
currency: { currency: {
path: "currency_link.currency", path: "currency_link.currency",
@@ -287,7 +287,7 @@ medusaIntegrationTestRunner({
}, },
}, },
relationship: { relationship: {
serviceName: "currencyCurrencyRegionRegionLink", serviceName: "CurrencyCurrencyRegionRegionLink",
primaryKey: "region_id", primaryKey: "region_id",
foreignKey: "id", foreignKey: "id",
alias: "currency_link", alias: "currency_link",
@@ -316,9 +316,9 @@ medusaIntegrationTestRunner({
}) })
.filter(Boolean)[0] .filter(Boolean)[0]
expect(link.serviceName).toEqual("currencyCurrencyRegionRegionLink") expect(link.serviceName).toEqual("CurrencyCurrencyRegionRegionLink")
expect(linkDefinition).toEqual({ expect(linkDefinition).toEqual({
serviceName: "currencyCurrencyRegionRegionLink", serviceName: "CurrencyCurrencyRegionRegionLink",
isLink: true, isLink: true,
alias: [ alias: [
{ {
@@ -331,7 +331,7 @@ medusaIntegrationTestRunner({
primaryKeys: ["id", "currency_code", "region_id"], primaryKeys: ["id", "currency_code", "region_id"],
relationships: [ relationships: [
{ {
serviceName: "currency", serviceName: "Currency",
entity: "Currency", entity: "Currency",
primaryKey: "code", primaryKey: "code",
foreignKey: "currency_code", foreignKey: "currency_code",
@@ -342,7 +342,7 @@ medusaIntegrationTestRunner({
deleteCascade: false, deleteCascade: false,
}, },
{ {
serviceName: "region", serviceName: "Region",
entity: "Region", entity: "Region",
primaryKey: "id", primaryKey: "id",
foreignKey: "region_id", foreignKey: "region_id",
@@ -355,7 +355,7 @@ medusaIntegrationTestRunner({
], ],
extends: [ extends: [
{ {
serviceName: "currency", serviceName: "Currency",
fieldAlias: { fieldAlias: {
regions: { regions: {
path: "region_link.region", path: "region_link.region",
@@ -364,7 +364,7 @@ medusaIntegrationTestRunner({
}, },
}, },
relationship: { relationship: {
serviceName: "currencyCurrencyRegionRegionLink", serviceName: "CurrencyCurrencyRegionRegionLink",
primaryKey: "currency_code", primaryKey: "currency_code",
foreignKey: "code", foreignKey: "code",
alias: "region_link", alias: "region_link",
@@ -372,7 +372,7 @@ medusaIntegrationTestRunner({
}, },
}, },
{ {
serviceName: "region", serviceName: "Region",
fieldAlias: { fieldAlias: {
currency: { currency: {
path: "currency_link.currency", path: "currency_link.currency",
@@ -381,7 +381,7 @@ medusaIntegrationTestRunner({
}, },
}, },
relationship: { relationship: {
serviceName: "currencyCurrencyRegionRegionLink", serviceName: "CurrencyCurrencyRegionRegionLink",
primaryKey: "region_id", primaryKey: "region_id",
foreignKey: "id", foreignKey: "id",
alias: "currency_link", alias: "currency_link",
@@ -4,7 +4,6 @@ import {
} from "@medusajs/types" } from "@medusajs/types"
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
remoteQueryObjectFromString, remoteQueryObjectFromString,
} from "@medusajs/utils" } from "@medusajs/utils"
@@ -26,12 +25,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
fulfillmentModule = appContainer.resolve( fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT)
ModuleRegistrationName.FULFILLMENT locationModule = appContainer.resolve(Modules.STOCK_LOCATION)
)
locationModule = appContainer.resolve(
ModuleRegistrationName.STOCK_LOCATION
)
remoteQuery = appContainer.resolve( remoteQuery = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_QUERY ContainerRegistrationKeys.REMOTE_QUERY
) )
@@ -1,7 +1,6 @@
import { IPricingModuleService, IProductModuleService } from "@medusajs/types" import { IPricingModuleService, IProductModuleService } from "@medusajs/types"
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
remoteQueryObjectFromString, remoteQueryObjectFromString,
} from "@medusajs/utils" } from "@medusajs/utils"
@@ -23,8 +22,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT) productModule = appContainer.resolve(Modules.PRODUCT)
pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING) pricingModule = appContainer.resolve(Modules.PRICING)
remoteQuery = appContainer.resolve( remoteQuery = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_QUERY ContainerRegistrationKeys.REMOTE_QUERY
) )
@@ -2,11 +2,7 @@ import {
IApiKeyModuleService, IApiKeyModuleService,
ISalesChannelModuleService, ISalesChannelModuleService,
} from "@medusajs/types" } from "@medusajs/types"
import { import { Modules, remoteQueryObjectFromString } from "@medusajs/utils"
ModuleRegistrationName,
Modules,
remoteQueryObjectFromString,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(50000) jest.setTimeout(50000)
@@ -25,10 +21,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
apiKeyModule = appContainer.resolve(ModuleRegistrationName.API_KEY) apiKeyModule = appContainer.resolve(Modules.API_KEY)
scModuleService = appContainer.resolve( scModuleService = appContainer.resolve(Modules.SALES_CHANNEL)
ModuleRegistrationName.SALES_CHANNEL
)
remoteQuery = appContainer.resolve("remoteQuery") remoteQuery = appContainer.resolve("remoteQuery")
remoteLink = appContainer.resolve("remoteLink") remoteLink = appContainer.resolve("remoteLink")
}) })
@@ -1,9 +1,5 @@
import { IRegionModuleService } from "@medusajs/types" import { IRegionModuleService } from "@medusajs/types"
import { import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(50000) jest.setTimeout(50000)
@@ -21,7 +17,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
regionModule = appContainer.resolve(ModuleRegistrationName.REGION) regionModule = appContainer.resolve(Modules.REGION)
remoteQuery = appContainer.resolve( remoteQuery = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_QUERY ContainerRegistrationKeys.REMOTE_QUERY
) )
@@ -2,11 +2,7 @@ import {
ISalesChannelModuleService, ISalesChannelModuleService,
IStockLocationService, IStockLocationService,
} from "@medusajs/types" } from "@medusajs/types"
import { import { Modules, remoteQueryObjectFromString } from "@medusajs/utils"
ModuleRegistrationName,
Modules,
remoteQueryObjectFromString,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(50000) jest.setTimeout(50000)
@@ -24,10 +20,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
scService = appContainer.resolve(ModuleRegistrationName.SALES_CHANNEL) scService = appContainer.resolve(Modules.SALES_CHANNEL)
locationService = appContainer.resolve( locationService = appContainer.resolve(Modules.STOCK_LOCATION)
ModuleRegistrationName.STOCK_LOCATION
)
remoteQuery = appContainer.resolve("remoteQuery") remoteQuery = appContainer.resolve("remoteQuery")
remoteLink = appContainer.resolve("remoteLink") remoteLink = appContainer.resolve("remoteLink")
}) })
@@ -2,11 +2,7 @@ import {
IFulfillmentModuleService, IFulfillmentModuleService,
IPricingModuleService, IPricingModuleService,
} from "@medusajs/types" } from "@medusajs/types"
import { import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { import {
adminHeaders, adminHeaders,
@@ -28,10 +24,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
fulfillmentModule = appContainer.resolve( fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT)
ModuleRegistrationName.FULFILLMENT pricingModule = appContainer.resolve(Modules.PRICING)
)
pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING)
remoteQuery = appContainer.resolve( remoteQuery = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_QUERY ContainerRegistrationKeys.REMOTE_QUERY
) )
@@ -1,8 +1,5 @@
import { ICurrencyModuleService, IStoreModuleService } from "@medusajs/types" import { ICurrencyModuleService, IStoreModuleService } from "@medusajs/types"
import { import { Modules, remoteQueryObjectFromString } from "@medusajs/utils"
ModuleRegistrationName,
remoteQueryObjectFromString,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(50000) jest.setTimeout(50000)
@@ -20,10 +17,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
storeModuleService = appContainer.resolve(ModuleRegistrationName.STORE) storeModuleService = appContainer.resolve(Modules.STORE)
currencyModuleService = appContainer.resolve( currencyModuleService = appContainer.resolve(Modules.CURRENCY)
ModuleRegistrationName.CURRENCY
)
remoteQuery = appContainer.resolve("remoteQuery") remoteQuery = appContainer.resolve("remoteQuery")
}) })
@@ -1,9 +1,5 @@
import { IRegionModuleService } from "@medusajs/types" import { IRegionModuleService } from "@medusajs/types"
import { import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../..//helpers/create-admin-user" import { createAdminUser } from "../../..//helpers/create-admin-user"
import { adminHeaders } from "../../../helpers/create-admin-user" import { adminHeaders } from "../../../helpers/create-admin-user"
@@ -23,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
regionModule = appContainer.resolve(ModuleRegistrationName.REGION) regionModule = appContainer.resolve(Modules.REGION)
remoteQuery = appContainer.resolve( remoteQuery = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_QUERY ContainerRegistrationKeys.REMOTE_QUERY
) )
@@ -131,7 +127,7 @@ medusaIntegrationTestRunner({
} }
) )
).rejects.toThrow( ).rejects.toThrow(
`regionRegionPaymentPaymentProviderLink region_id not found: ${regionNoLink.id}` `RegionRegionPaymentPaymentProviderLink region_id not found: ${regionNoLink.id}`
) )
// Only validate the relations with Payment. It doesn't fail because the link didn't return any data // Only validate the relations with Payment. It doesn't fail because the link didn't return any data
@@ -174,7 +170,7 @@ medusaIntegrationTestRunner({
} }
) )
).rejects.toThrow( ).rejects.toThrow(
"payment id not found: pp_system_default_non_existent" "Payment id not found: pp_system_default_non_existent"
) )
// everything is fine // everything is fine
@@ -4,11 +4,8 @@ import {
INotificationModuleService, INotificationModuleService,
Logger, Logger,
} from "@medusajs/types" } from "@medusajs/types"
import { import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
ContainerRegistrationKeys, import { TestEventUtils, medusaIntegrationTestRunner } from "medusa-test-utils"
ModuleRegistrationName,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner, TestEventUtils } from "medusa-test-utils"
jest.setTimeout(50000) jest.setTimeout(50000)
@@ -19,7 +16,7 @@ medusaIntegrationTestRunner({
let logger: Logger let logger: Logger
beforeAll(async () => { beforeAll(async () => {
service = getContainer().resolve(ModuleRegistrationName.NOTIFICATION) service = getContainer().resolve(Modules.NOTIFICATION)
logger = getContainer().resolve(ContainerRegistrationKeys.LOGGER) logger = getContainer().resolve(ContainerRegistrationKeys.LOGGER)
}) })
@@ -166,7 +163,7 @@ medusaIntegrationTestRunner({
describe("Configurable notification subscriber", () => { describe("Configurable notification subscriber", () => {
let eventBus: IEventBusModuleService let eventBus: IEventBusModuleService
beforeAll(async () => { beforeAll(async () => {
eventBus = getContainer().resolve(ModuleRegistrationName.EVENT_BUS) eventBus = getContainer().resolve(Modules.EVENT_BUS)
}) })
it("should successfully sent a notification when an order is created (based on configuration)", async () => { it("should successfully sent a notification when an order is created (based on configuration)", async () => {
@@ -9,11 +9,7 @@ import {
IStockLocationServiceNext, IStockLocationServiceNext,
ITaxModuleService, ITaxModuleService,
} from "@medusajs/types" } from "@medusajs/types"
import { import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { import {
adminHeaders, adminHeaders,
@@ -42,21 +38,15 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
cartModuleService = appContainer.resolve(ModuleRegistrationName.CART) cartModuleService = appContainer.resolve(Modules.CART)
regionModuleService = appContainer.resolve(ModuleRegistrationName.REGION) regionModuleService = appContainer.resolve(Modules.REGION)
scModuleService = appContainer.resolve( scModuleService = appContainer.resolve(Modules.SALES_CHANNEL)
ModuleRegistrationName.SALES_CHANNEL productModule = appContainer.resolve(Modules.PRODUCT)
) pricingModule = appContainer.resolve(Modules.PRICING)
productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT) inventoryModule = appContainer.resolve(Modules.INVENTORY)
pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING) stockLocationModule = appContainer.resolve(Modules.STOCK_LOCATION)
inventoryModule = appContainer.resolve(ModuleRegistrationName.INVENTORY) fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT)
stockLocationModule = appContainer.resolve( taxModule = appContainer.resolve(Modules.TAX)
ModuleRegistrationName.STOCK_LOCATION
)
fulfillmentModule = appContainer.resolve(
ModuleRegistrationName.FULFILLMENT
)
taxModule = appContainer.resolve(ModuleRegistrationName.TAX)
remoteLink = appContainer.resolve(ContainerRegistrationKeys.REMOTE_LINK) remoteLink = appContainer.resolve(ContainerRegistrationKeys.REMOTE_LINK)
remoteQuery = appContainer.resolve(ContainerRegistrationKeys.REMOTE_QUERY) remoteQuery = appContainer.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
}) })
@@ -1,5 +1,5 @@
import { IOrderModuleService } from "@medusajs/types" import { IOrderModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { import {
adminHeaders, adminHeaders,
@@ -18,7 +18,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
orderModule = appContainer.resolve(ModuleRegistrationName.ORDER) orderModule = appContainer.resolve(Modules.ORDER)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -8,24 +8,19 @@ import {
} from "@medusajs/types" } from "@medusajs/types"
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
remoteQueryObjectFromString, remoteQueryObjectFromString,
} from "@medusajs/utils" } from "@medusajs/utils"
const providerId = "manual_test-provider" const providerId = "manual_test-provider"
export async function prepareDataFixtures({ container }) { export async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve( const fulfillmentService = container.resolve(Modules.FULFILLMENT)
ModuleRegistrationName.FULFILLMENT const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const stockLocationModule: IStockLocationService = container.resolve( const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION Modules.STOCK_LOCATION
) )
const productModule = container.resolve(ModuleRegistrationName.PRODUCT) const productModule = container.resolve(Modules.PRODUCT)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) const inventoryModule = container.resolve(Modules.INVENTORY)
const shippingProfile = await fulfillmentService.createShippingProfiles({ const shippingProfile = await fulfillmentService.createShippingProfiles({
name: "test", name: "test",
@@ -49,7 +44,7 @@ export async function prepareDataFixtures({ container }) {
}) })
const regionService = container.resolve( const regionService = container.resolve(
ModuleRegistrationName.REGION Modules.REGION
) as IRegionModuleService ) as IRegionModuleService
const [region] = await regionService.createRegions([ const [region] = await regionService.createRegions([
@@ -211,9 +206,7 @@ export async function createOrderFixture({
location, location,
inventoryItem, inventoryItem,
}) { }) {
const orderService: IOrderModuleService = container.resolve( const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
ModuleRegistrationName.ORDER
)
let order = await orderService.createOrders({ let order = await orderService.createOrders({
region_id: "test_region_id", region_id: "test_region_id",
@@ -287,7 +280,7 @@ export async function createOrderFixture({
customer_id: "joe", customer_id: "joe",
}) })
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) const inventoryModule = container.resolve(Modules.INVENTORY)
await inventoryModule.createReservationItems([ await inventoryModule.createReservationItems([
{ {
line_item_id: order.items![0].id, line_item_id: order.items![0].id,
@@ -15,7 +15,6 @@ import {
import { import {
ClaimType, ClaimType,
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
RuleOperator, RuleOperator,
remoteQueryObjectFromString, remoteQueryObjectFromString,
@@ -28,18 +27,14 @@ const env = { MEDUSA_FF_MEDUSA_V2: true }
const providerId = "manual_test-provider" const providerId = "manual_test-provider"
async function prepareDataFixtures({ container }) { async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve( const fulfillmentService = container.resolve(Modules.FULFILLMENT)
ModuleRegistrationName.FULFILLMENT const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const stockLocationModule: IStockLocationService = container.resolve( const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION Modules.STOCK_LOCATION
) )
const productModule = container.resolve(ModuleRegistrationName.PRODUCT) const productModule = container.resolve(Modules.PRODUCT)
const pricingModule = container.resolve(ModuleRegistrationName.PRICING) const pricingModule = container.resolve(Modules.PRICING)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) const inventoryModule = container.resolve(Modules.INVENTORY)
const shippingProfile = await fulfillmentService.createShippingProfiles({ const shippingProfile = await fulfillmentService.createShippingProfiles({
name: "test", name: "test",
@@ -63,7 +58,7 @@ async function prepareDataFixtures({ container }) {
}) })
const regionService = container.resolve( const regionService = container.resolve(
ModuleRegistrationName.REGION Modules.REGION
) as IRegionModuleService ) as IRegionModuleService
const [region] = await regionService.createRegions([ const [region] = await regionService.createRegions([
@@ -237,9 +232,7 @@ async function prepareDataFixtures({ container }) {
} }
async function createOrderFixture({ container, product }) { async function createOrderFixture({ container, product }) {
const orderService: IOrderModuleService = container.resolve( const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
ModuleRegistrationName.ORDER
)
let order = await orderService.createOrders({ let order = await orderService.createOrders({
region_id: "test_region_id", region_id: "test_region_id",
email: "foo@bar.com", email: "foo@bar.com",
@@ -17,7 +17,6 @@ import {
} from "@medusajs/types" } from "@medusajs/types"
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
RuleOperator, RuleOperator,
remoteQueryObjectFromString, remoteQueryObjectFromString,
@@ -30,19 +29,15 @@ const env = { MEDUSA_FF_MEDUSA_V2: true }
const providerId = "manual_test-provider" const providerId = "manual_test-provider"
async function prepareDataFixtures({ container }) { async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve( const fulfillmentService = container.resolve(Modules.FULFILLMENT)
ModuleRegistrationName.FULFILLMENT const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const stockLocationModule: IStockLocationService = container.resolve( const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION Modules.STOCK_LOCATION
) )
const productModule = container.resolve(ModuleRegistrationName.PRODUCT) const productModule = container.resolve(Modules.PRODUCT)
const pricingModule = container.resolve(ModuleRegistrationName.PRICING) const pricingModule = container.resolve(Modules.PRICING)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) const inventoryModule = container.resolve(Modules.INVENTORY)
const customerService = container.resolve(ModuleRegistrationName.CUSTOMER) const customerService = container.resolve(Modules.CUSTOMER)
const remoteLink = container.resolve(ContainerRegistrationKeys.REMOTE_LINK) const remoteLink = container.resolve(ContainerRegistrationKeys.REMOTE_LINK)
const customer = await customerService.createCustomers({ const customer = await customerService.createCustomers({
@@ -72,7 +67,7 @@ async function prepareDataFixtures({ container }) {
}) })
const regionService = container.resolve( const regionService = container.resolve(
ModuleRegistrationName.REGION Modules.REGION
) as IRegionModuleService ) as IRegionModuleService
const [region] = await regionService.createRegions([ const [region] = await regionService.createRegions([
@@ -292,7 +287,7 @@ async function createOrderFixture({
customer, customer,
region, region,
}) { }) {
const orderService = container.resolve(ModuleRegistrationName.ORDER) const orderService = container.resolve(Modules.ORDER)
let order = await orderService.createOrders({ let order = await orderService.createOrders({
region_id: region.id, region_id: region.id,
email: "foo@bar.com", email: "foo@bar.com",
@@ -13,7 +13,6 @@ import {
} from "@medusajs/types" } from "@medusajs/types"
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
RuleOperator, RuleOperator,
remoteQueryObjectFromString, remoteQueryObjectFromString,
@@ -26,18 +25,14 @@ const env = { MEDUSA_FF_MEDUSA_V2: true }
const providerId = "manual_test-provider" const providerId = "manual_test-provider"
async function prepareDataFixtures({ container }) { async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve( const fulfillmentService = container.resolve(Modules.FULFILLMENT)
ModuleRegistrationName.FULFILLMENT const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const stockLocationModule: IStockLocationService = container.resolve( const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION Modules.STOCK_LOCATION
) )
const productModule = container.resolve(ModuleRegistrationName.PRODUCT) const productModule = container.resolve(Modules.PRODUCT)
const pricingModule = container.resolve(ModuleRegistrationName.PRICING) const pricingModule = container.resolve(Modules.PRICING)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) const inventoryModule = container.resolve(Modules.INVENTORY)
const shippingProfile = await fulfillmentService.createShippingProfiles({ const shippingProfile = await fulfillmentService.createShippingProfiles({
name: "test", name: "test",
@@ -61,7 +56,7 @@ async function prepareDataFixtures({ container }) {
}) })
const regionService = container.resolve( const regionService = container.resolve(
ModuleRegistrationName.REGION Modules.REGION
) as IRegionModuleService ) as IRegionModuleService
const [region] = await regionService.createRegions([ const [region] = await regionService.createRegions([
@@ -238,9 +233,7 @@ async function prepareDataFixtures({ container }) {
} }
async function createOrderFixture({ container, product }) { async function createOrderFixture({ container, product }) {
const orderService: IOrderModuleService = container.resolve( const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
ModuleRegistrationName.ORDER
)
let order = await orderService.createOrders({ let order = await orderService.createOrders({
region_id: "test_region_id", region_id: "test_region_id",
email: "foo@bar.com", email: "foo@bar.com",
@@ -4,8 +4,8 @@ import {
createOrderFulfillmentWorkflow, createOrderFulfillmentWorkflow,
} from "@medusajs/core-flows" } from "@medusajs/core-flows"
import { import {
InventoryItemDTO,
IOrderModuleService, IOrderModuleService,
InventoryItemDTO,
OrderWorkflow, OrderWorkflow,
ProductDTO, ProductDTO,
RegionDTO, RegionDTO,
@@ -14,7 +14,7 @@ import {
} from "@medusajs/types" } from "@medusajs/types"
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName, Modules,
remoteQueryObjectFromString, remoteQueryObjectFromString,
} from "@medusajs/utils" } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
@@ -52,7 +52,7 @@ medusaIntegrationTestRunner({
product = fixtures.product product = fixtures.product
inventoryItem = fixtures.inventoryItem inventoryItem = fixtures.inventoryItem
orderService = container.resolve(ModuleRegistrationName.ORDER) orderService = container.resolve(Modules.ORDER)
}) })
it("should cancel an order", async () => { it("should cancel an order", async () => {
@@ -17,7 +17,6 @@ import {
} from "@medusajs/types" } from "@medusajs/types"
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
RuleOperator, RuleOperator,
remoteQueryObjectFromString, remoteQueryObjectFromString,
@@ -30,18 +29,14 @@ const env = { MEDUSA_FF_MEDUSA_V2: true }
const providerId = "manual_test-provider" const providerId = "manual_test-provider"
async function prepareDataFixtures({ container }) { async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve( const fulfillmentService = container.resolve(Modules.FULFILLMENT)
ModuleRegistrationName.FULFILLMENT const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const stockLocationModule: IStockLocationService = container.resolve( const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION Modules.STOCK_LOCATION
) )
const productModule = container.resolve(ModuleRegistrationName.PRODUCT) const productModule = container.resolve(Modules.PRODUCT)
const pricingModule = container.resolve(ModuleRegistrationName.PRICING) const pricingModule = container.resolve(Modules.PRICING)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) const inventoryModule = container.resolve(Modules.INVENTORY)
const remoteLink = container.resolve(ContainerRegistrationKeys.REMOTE_LINK) const remoteLink = container.resolve(ContainerRegistrationKeys.REMOTE_LINK)
const shippingProfile = await fulfillmentService.createShippingProfiles({ const shippingProfile = await fulfillmentService.createShippingProfiles({
@@ -66,7 +61,7 @@ async function prepareDataFixtures({ container }) {
}) })
const regionService = container.resolve( const regionService = container.resolve(
ModuleRegistrationName.REGION Modules.REGION
) as IRegionModuleService ) as IRegionModuleService
const [region] = await regionService.createRegions([ const [region] = await regionService.createRegions([
@@ -241,9 +236,7 @@ async function prepareDataFixtures({ container }) {
} }
async function createOrderFixture({ container, product }) { async function createOrderFixture({ container, product }) {
const orderService: IOrderModuleService = container.resolve( const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
ModuleRegistrationName.ORDER
)
let order = await orderService.createOrders({ let order = await orderService.createOrders({
region_id: "test_region_id", region_id: "test_region_id",
email: "foo@bar.com", email: "foo@bar.com",
@@ -390,7 +383,7 @@ medusaIntegrationTestRunner({
product = fixtures.product product = fixtures.product
fulfillmentSet = fixtures.fulfillmentSet fulfillmentSet = fixtures.fulfillmentSet
orderService = container.resolve(ModuleRegistrationName.ORDER) orderService = container.resolve(Modules.ORDER)
}) })
it("should create a return order", async () => { it("should create a return order", async () => {
@@ -17,7 +17,6 @@ import {
import { import {
BigNumber, BigNumber,
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
remoteQueryObjectFromString, remoteQueryObjectFromString,
} from "@medusajs/utils" } from "@medusajs/utils"
@@ -31,17 +30,13 @@ const variantSkuWithInventory = "test-variant"
let inventoryItem let inventoryItem
async function prepareDataFixtures({ container }) { async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve( const fulfillmentService = container.resolve(Modules.FULFILLMENT)
ModuleRegistrationName.FULFILLMENT const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const stockLocationModule: IStockLocationService = container.resolve( const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION Modules.STOCK_LOCATION
) )
const productModule = container.resolve(ModuleRegistrationName.PRODUCT) const productModule = container.resolve(Modules.PRODUCT)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) const inventoryModule = container.resolve(Modules.INVENTORY)
const shippingProfile = await fulfillmentService.createShippingProfiles({ const shippingProfile = await fulfillmentService.createShippingProfiles({
name: "test", name: "test",
@@ -65,7 +60,7 @@ async function prepareDataFixtures({ container }) {
}) })
const regionService = container.resolve( const regionService = container.resolve(
ModuleRegistrationName.REGION Modules.REGION
) as IRegionModuleService ) as IRegionModuleService
const [region] = await regionService.createRegions([ const [region] = await regionService.createRegions([
@@ -226,9 +221,7 @@ async function prepareDataFixtures({ container }) {
} }
async function createOrderFixture({ container, product, location }) { async function createOrderFixture({ container, product, location }) {
const orderService: IOrderModuleService = container.resolve( const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
ModuleRegistrationName.ORDER
)
let order = await orderService.createOrders({ let order = await orderService.createOrders({
region_id: "test_region_id", region_id: "test_region_id",
email: "foo@bar.com", email: "foo@bar.com",
@@ -310,7 +303,7 @@ async function createOrderFixture({ container, product, location }) {
customer_id: "joe", customer_id: "joe",
}) })
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) const inventoryModule = container.resolve(Modules.INVENTORY)
const reservation = await inventoryModule.createReservationItems([ const reservation = await inventoryModule.createReservationItems([
{ {
@@ -355,13 +348,11 @@ medusaIntegrationTestRunner({
location = fixtures.location location = fixtures.location
product = fixtures.product product = fixtures.product
orderService = container.resolve(ModuleRegistrationName.ORDER) orderService = container.resolve(Modules.ORDER)
}) })
it("should create a order fulfillment and cancel it", async () => { it("should create a order fulfillment and cancel it", async () => {
const inventoryModule = container.resolve( const inventoryModule = container.resolve(Modules.INVENTORY)
ModuleRegistrationName.INVENTORY
)
const order = await createOrderFixture({ container, product, location }) const order = await createOrderFixture({ container, product, location })
const itemWithInventory = order.items!.find( const itemWithInventory = order.items!.find(
@@ -534,9 +525,7 @@ medusaIntegrationTestRunner({
expect(orderFulfill.fulfillments).toHaveLength(1) expect(orderFulfill.fulfillments).toHaveLength(1)
expect(orderFulfill.items[0].detail.fulfilled_quantity).toEqual(1) expect(orderFulfill.items[0].detail.fulfilled_quantity).toEqual(1)
const inventoryModule = container.resolve( const inventoryModule = container.resolve(Modules.INVENTORY)
ModuleRegistrationName.INVENTORY
)
const reservation = await inventoryModule.listReservationItems({ const reservation = await inventoryModule.listReservationItems({
line_item_id: order.items![0].id, line_item_id: order.items![0].id,
}) })
@@ -16,7 +16,6 @@ import {
} from "@medusajs/types" } from "@medusajs/types"
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
RuleOperator, RuleOperator,
remoteQueryObjectFromString, remoteQueryObjectFromString,
@@ -30,17 +29,13 @@ const providerId = "manual_test-provider"
let inventoryItem let inventoryItem
async function prepareDataFixtures({ container }) { async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve( const fulfillmentService = container.resolve(Modules.FULFILLMENT)
ModuleRegistrationName.FULFILLMENT const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const stockLocationModule: IStockLocationService = container.resolve( const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION Modules.STOCK_LOCATION
) )
const productModule = container.resolve(ModuleRegistrationName.PRODUCT) const productModule = container.resolve(Modules.PRODUCT)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) const inventoryModule = container.resolve(Modules.INVENTORY)
const shippingProfile = await fulfillmentService.createShippingProfiles({ const shippingProfile = await fulfillmentService.createShippingProfiles({
name: "test", name: "test",
@@ -64,7 +59,7 @@ async function prepareDataFixtures({ container }) {
}) })
const regionService = container.resolve( const regionService = container.resolve(
ModuleRegistrationName.REGION Modules.REGION
) as IRegionModuleService ) as IRegionModuleService
const [region] = await regionService.createRegions([ const [region] = await regionService.createRegions([
@@ -227,9 +222,7 @@ async function prepareDataFixtures({ container }) {
} }
async function createOrderFixture({ container, product, location }) { async function createOrderFixture({ container, product, location }) {
const orderService: IOrderModuleService = container.resolve( const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
ModuleRegistrationName.ORDER
)
let order = await orderService.createOrders({ let order = await orderService.createOrders({
region_id: "test_region_id", region_id: "test_region_id",
email: "foo@bar.com", email: "foo@bar.com",
@@ -302,7 +295,7 @@ async function createOrderFixture({ container, product, location }) {
customer_id: "joe", customer_id: "joe",
}) })
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) const inventoryModule = container.resolve(Modules.INVENTORY)
const reservation = await inventoryModule.createReservationItems([ const reservation = await inventoryModule.createReservationItems([
{ {
line_item_id: order.items![0].id, line_item_id: order.items![0].id,
@@ -346,7 +339,7 @@ medusaIntegrationTestRunner({
location = fixtures.location location = fixtures.location
product = fixtures.product product = fixtures.product
orderService = container.resolve(ModuleRegistrationName.ORDER) orderService = container.resolve(Modules.ORDER)
}) })
it("should create a order fulfillment", async () => { it("should create a order fulfillment", async () => {
@@ -417,9 +410,7 @@ medusaIntegrationTestRunner({
expect(orderFulfill.fulfillments).toHaveLength(1) expect(orderFulfill.fulfillments).toHaveLength(1)
expect(orderFulfill.items[0].detail.fulfilled_quantity).toEqual(1) expect(orderFulfill.items[0].detail.fulfilled_quantity).toEqual(1)
const inventoryModule = container.resolve( const inventoryModule = container.resolve(Modules.INVENTORY)
ModuleRegistrationName.INVENTORY
)
const reservation = await inventoryModule.listReservationItems({ const reservation = await inventoryModule.listReservationItems({
line_item_id: order.items![0].id, line_item_id: order.items![0].id,
}) })
@@ -13,7 +13,7 @@ import {
OrderChangeDTO, OrderChangeDTO,
OrderDTO, OrderDTO,
} from "@medusajs/types" } from "@medusajs/types"
import { ChangeActionType, ModuleRegistrationName } from "@medusajs/utils" import { ChangeActionType, Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createOrderFixture, prepareDataFixtures } from "./__fixtures__" import { createOrderFixture, prepareDataFixtures } from "./__fixtures__"
@@ -48,7 +48,7 @@ medusaIntegrationTestRunner({
}) })
orderChange = result orderChange = result
service = container.resolve(ModuleRegistrationName.ORDER) service = container.resolve(Modules.ORDER)
}) })
describe("createOrderChangeActionsWorkflow", () => { describe("createOrderChangeActionsWorkflow", () => {
@@ -8,7 +8,7 @@ import {
deleteOrderChangeWorkflowId, deleteOrderChangeWorkflowId,
} from "@medusajs/core-flows" } from "@medusajs/core-flows"
import { IOrderModuleService, OrderChangeDTO, OrderDTO } from "@medusajs/types" import { IOrderModuleService, OrderChangeDTO, OrderDTO } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createOrderFixture, prepareDataFixtures } from "./__fixtures__" import { createOrderFixture, prepareDataFixtures } from "./__fixtures__"
@@ -100,7 +100,7 @@ medusaIntegrationTestRunner({
}) })
orderChange = result orderChange = result
service = container.resolve(ModuleRegistrationName.ORDER) service = container.resolve(Modules.ORDER)
}) })
it("should successfully cancel an order change", async () => { it("should successfully cancel an order change", async () => {
@@ -179,7 +179,7 @@ medusaIntegrationTestRunner({
}) })
orderChange = result orderChange = result
service = container.resolve(ModuleRegistrationName.ORDER) service = container.resolve(Modules.ORDER)
}) })
it("should successfully delete an order change", async () => { it("should successfully delete an order change", async () => {
@@ -256,7 +256,7 @@ medusaIntegrationTestRunner({
}) })
orderChange = result orderChange = result
service = container.resolve(ModuleRegistrationName.ORDER) service = container.resolve(Modules.ORDER)
}) })
it("should successfully decline an order change", async () => { it("should successfully decline an order change", async () => {
@@ -5,7 +5,7 @@ import {
import { IFulfillmentModuleService, OrderDTO, ReturnDTO } from "@medusajs/types" import { IFulfillmentModuleService, OrderDTO, ReturnDTO } from "@medusajs/types"
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName, Modules,
remoteQueryObjectFromString, remoteQueryObjectFromString,
} from "@medusajs/utils" } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
@@ -54,7 +54,7 @@ medusaIntegrationTestRunner({
fields: ["order_id", "id", "status", "order_change_id"], fields: ["order_id", "id", "status", "order_change_id"],
}) })
service = container.resolve(ModuleRegistrationName.FULFILLMENT) service = container.resolve(Modules.FULFILLMENT)
;[returnOrder] = await remoteQuery(remoteQueryObject) ;[returnOrder] = await remoteQuery(remoteQueryObject)
}) })
@@ -6,7 +6,7 @@ import {
import { IOrderModuleService, OrderDTO, ReturnDTO } from "@medusajs/types" import { IOrderModuleService, OrderDTO, ReturnDTO } from "@medusajs/types"
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName, Modules,
remoteQueryObjectFromString, remoteQueryObjectFromString,
} from "@medusajs/utils" } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
@@ -65,7 +65,7 @@ medusaIntegrationTestRunner({
fields: ["order_id", "id", "status", "order_change_id"], fields: ["order_id", "id", "status", "order_change_id"],
}) })
service = container.resolve(ModuleRegistrationName.ORDER) service = container.resolve(Modules.ORDER)
;[returnOrder] = await remoteQuery(remoteQueryObject) ;[returnOrder] = await remoteQuery(remoteQueryObject)
}) })
@@ -3,7 +3,7 @@ import {
createPaymentSessionsWorkflowId, createPaymentSessionsWorkflowId,
} from "@medusajs/core-flows" } from "@medusajs/core-flows"
import { IPaymentModuleService, IRegionModuleService } from "@medusajs/types" import { IPaymentModuleService, IRegionModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(50000) jest.setTimeout(50000)
@@ -21,8 +21,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
paymentModule = appContainer.resolve(ModuleRegistrationName.PAYMENT) paymentModule = appContainer.resolve(Modules.PAYMENT)
regionModule = appContainer.resolve(ModuleRegistrationName.REGION) regionModule = appContainer.resolve(Modules.REGION)
remoteLink = appContainer.resolve("remoteLink") remoteLink = appContainer.resolve("remoteLink")
}) })
@@ -4,11 +4,7 @@ import {
IProductModuleService, IProductModuleService,
IRegionModuleService, IRegionModuleService,
} from "@medusajs/types" } from "@medusajs/types"
import { import { Modules, PriceListStatus, PriceListType } from "@medusajs/utils"
ModuleRegistrationName,
PriceListStatus,
PriceListType,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
import { createVariantPriceSet } from "../../../helpers/create-variant-price-set" import { createVariantPriceSet } from "../../../helpers/create-variant-price-set"
@@ -37,10 +33,10 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING) pricingModule = appContainer.resolve(Modules.PRICING)
productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT) productModule = appContainer.resolve(Modules.PRODUCT)
customerModule = appContainer.resolve(ModuleRegistrationName.CUSTOMER) customerModule = appContainer.resolve(Modules.CUSTOMER)
regionModule = appContainer.resolve(ModuleRegistrationName.REGION) regionModule = appContainer.resolve(Modules.REGION)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -5,11 +5,7 @@ import {
ProductDTO, ProductDTO,
ProductVariantDTO, ProductVariantDTO,
} from "@medusajs/types" } from "@medusajs/types"
import { import { Modules, PriceListStatus, PriceListType } from "@medusajs/utils"
ModuleRegistrationName,
PriceListStatus,
PriceListType,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
import { createVariantPriceSet } from "../../../helpers/create-variant-price-set" import { createVariantPriceSet } from "../../../helpers/create-variant-price-set"
@@ -54,8 +50,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING) pricingModule = appContainer.resolve(Modules.PRICING)
productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT) productModule = appContainer.resolve(Modules.PRODUCT)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -5,7 +5,7 @@ import {
batchProductVariantsWorkflowId, batchProductVariantsWorkflowId,
} from "@medusajs/core-flows" } from "@medusajs/core-flows"
import { IProductModuleService } from "@medusajs/types" import { IProductModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(50000) jest.setTimeout(50000)
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
service = appContainer.resolve(ModuleRegistrationName.PRODUCT) service = appContainer.resolve(Modules.PRODUCT)
}) })
describe("batchProductWorkflow", () => { describe("batchProductWorkflow", () => {
@@ -1,5 +1,5 @@
import { IRegionModuleService } from "@medusajs/types" import { IRegionModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
service = appContainer.resolve(ModuleRegistrationName.REGION) service = appContainer.resolve(Modules.REGION)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -2,11 +2,7 @@ import {
IFulfillmentModuleService, IFulfillmentModuleService,
IRegionModuleService, IRegionModuleService,
} from "@medusajs/types" } from "@medusajs/types"
import { import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { import {
createAdminUser, createAdminUser,
@@ -39,10 +35,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
fulfillmentModule = appContainer.resolve( fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT)
ModuleRegistrationName.FULFILLMENT regionService = appContainer.resolve(Modules.REGION)
)
regionService = appContainer.resolve(ModuleRegistrationName.REGION)
const publishableKey = await generatePublishableKey(appContainer) const publishableKey = await generatePublishableKey(appContainer)
storeHeaders = generateStoreHeaders({ publishableKey }) storeHeaders = generateStoreHeaders({ publishableKey })
}) })
@@ -15,7 +15,6 @@ import {
} from "@medusajs/types" } from "@medusajs/types"
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
RuleOperator, RuleOperator,
remoteQueryObjectFromString, remoteQueryObjectFromString,
@@ -33,7 +32,7 @@ async function createShippingOptionFixture({
shippingProfile, shippingProfile,
}) { }) {
const regionService = container.resolve( const regionService = container.resolve(
ModuleRegistrationName.REGION Modules.REGION
) as IRegionModuleService ) as IRegionModuleService
const [region] = await regionService.createRegions([ const [region] = await regionService.createRegions([
@@ -123,7 +122,7 @@ medusaIntegrationTestRunner({
beforeAll(() => { beforeAll(() => {
container = getContainer() container = getContainer()
service = container.resolve(ModuleRegistrationName.FULFILLMENT) service = container.resolve(Modules.FULFILLMENT)
}) })
describe("Fulfillment workflows", () => { describe("Fulfillment workflows", () => {
@@ -153,9 +152,7 @@ medusaIntegrationTestRunner({
], ],
}) })
const stockLocationModule = container.resolve( const stockLocationModule = container.resolve(Modules.STOCK_LOCATION)
ModuleRegistrationName.STOCK_LOCATION
)
const location = await stockLocationModule.createStockLocations({ const location = await stockLocationModule.createStockLocations({
name: "Europe", name: "Europe",
@@ -9,7 +9,6 @@ import {
} from "@medusajs/types" } from "@medusajs/types"
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
RuleOperator, RuleOperator,
remoteQueryObjectFromString, remoteQueryObjectFromString,
@@ -29,7 +28,7 @@ medusaIntegrationTestRunner({
beforeAll(() => { beforeAll(() => {
container = getContainer() container = getContainer()
service = container.resolve(ModuleRegistrationName.FULFILLMENT) service = container.resolve(Modules.FULFILLMENT)
}) })
describe("Fulfillment workflows", () => { describe("Fulfillment workflows", () => {
@@ -59,9 +58,7 @@ medusaIntegrationTestRunner({
], ],
}) })
const stockLocationModule = container.resolve( const stockLocationModule = container.resolve(Modules.STOCK_LOCATION)
ModuleRegistrationName.STOCK_LOCATION
)
const location = await stockLocationModule.createStockLocations({ const location = await stockLocationModule.createStockLocations({
name: "Europe", name: "Europe",
@@ -93,7 +90,7 @@ medusaIntegrationTestRunner({
it("should create shipping options and prices", async () => { it("should create shipping options and prices", async () => {
const regionService = container.resolve( const regionService = container.resolve(
ModuleRegistrationName.REGION Modules.REGION
) as IRegionModuleService ) as IRegionModuleService
const [region] = await regionService.createRegions([ const [region] = await regionService.createRegions([
@@ -209,7 +206,7 @@ medusaIntegrationTestRunner({
it("should revert the shipping options and prices", async () => { it("should revert the shipping options and prices", async () => {
const regionService = container.resolve( const regionService = container.resolve(
ModuleRegistrationName.REGION Modules.REGION
) as IRegionModuleService ) as IRegionModuleService
const [region] = await regionService.createRegions([ const [region] = await regionService.createRegions([
@@ -12,7 +12,6 @@ import {
} from "@medusajs/types" } from "@medusajs/types"
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
RuleOperator, RuleOperator,
remoteQueryObjectFromString, remoteQueryObjectFromString,
@@ -32,7 +31,7 @@ medusaIntegrationTestRunner({
beforeAll(() => { beforeAll(() => {
container = getContainer() container = getContainer()
service = container.resolve(ModuleRegistrationName.FULFILLMENT) service = container.resolve(Modules.FULFILLMENT)
}) })
describe("Fulfillment workflows", () => { describe("Fulfillment workflows", () => {
@@ -62,9 +61,7 @@ medusaIntegrationTestRunner({
], ],
}) })
const stockLocationModule = container.resolve( const stockLocationModule = container.resolve(Modules.STOCK_LOCATION)
ModuleRegistrationName.STOCK_LOCATION
)
const location = await stockLocationModule.createStockLocations({ const location = await stockLocationModule.createStockLocations({
name: "Europe", name: "Europe",
@@ -96,7 +93,7 @@ medusaIntegrationTestRunner({
it("should delete shipping options", async () => { it("should delete shipping options", async () => {
const regionService = container.resolve( const regionService = container.resolve(
ModuleRegistrationName.REGION Modules.REGION
) as IRegionModuleService ) as IRegionModuleService
const [region] = await regionService.createRegions([ const [region] = await regionService.createRegions([
@@ -179,7 +176,7 @@ medusaIntegrationTestRunner({
it("should revert the deleted shipping options", async () => { it("should revert the deleted shipping options", async () => {
const regionService = container.resolve( const regionService = container.resolve(
ModuleRegistrationName.REGION Modules.REGION
) as IRegionModuleService ) as IRegionModuleService
const [region] = await regionService.createRegions([ const [region] = await regionService.createRegions([
@@ -13,7 +13,6 @@ import {
} from "@medusajs/types" } from "@medusajs/types"
import { import {
ContainerRegistrationKeys, ContainerRegistrationKeys,
ModuleRegistrationName,
Modules, Modules,
RuleOperator, RuleOperator,
remoteQueryObjectFromString, remoteQueryObjectFromString,
@@ -33,7 +32,7 @@ medusaIntegrationTestRunner({
beforeAll(() => { beforeAll(() => {
container = getContainer() container = getContainer()
service = container.resolve(ModuleRegistrationName.FULFILLMENT) service = container.resolve(Modules.FULFILLMENT)
}) })
describe("Fulfillment workflows", () => { describe("Fulfillment workflows", () => {
@@ -63,9 +62,7 @@ medusaIntegrationTestRunner({
], ],
}) })
const stockLocationModule = container.resolve( const stockLocationModule = container.resolve(Modules.STOCK_LOCATION)
ModuleRegistrationName.STOCK_LOCATION
)
const location = await stockLocationModule.createStockLocations({ const location = await stockLocationModule.createStockLocations({
name: "Europe", name: "Europe",
@@ -97,7 +94,7 @@ medusaIntegrationTestRunner({
it("should update shipping options", async () => { it("should update shipping options", async () => {
const regionService = container.resolve( const regionService = container.resolve(
ModuleRegistrationName.REGION Modules.REGION
) as IRegionModuleService ) as IRegionModuleService
const [region] = await regionService.createRegions([ const [region] = await regionService.createRegions([
@@ -262,7 +259,7 @@ medusaIntegrationTestRunner({
it("should revert the shipping options", async () => { it("should revert the shipping options", async () => {
const regionService = container.resolve( const regionService = container.resolve(
ModuleRegistrationName.REGION Modules.REGION
) as IRegionModuleService ) as IRegionModuleService
const [region] = await regionService.createRegions([ const [region] = await regionService.createRegions([
@@ -1,5 +1,5 @@
import { IStoreModuleService } from "@medusajs/types" import { IStoreModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
service = appContainer.resolve(ModuleRegistrationName.STORE) service = appContainer.resolve(Modules.STORE)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,6 +1,6 @@
import { ITaxModuleService } from "@medusajs/types" import { ITaxModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -20,7 +20,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
service = appContainer.resolve(ModuleRegistrationName.TAX) service = appContainer.resolve(Modules.TAX)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,10 +1,10 @@
import { ITaxModuleService } from "@medusajs/types" import { ITaxModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { import {
createTaxRateRulesStepId, createTaxRateRulesStepId,
updateTaxRatesWorkflow, updateTaxRatesWorkflow,
} from "@medusajs/core-flows" } from "@medusajs/core-flows"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user" import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -24,7 +24,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
service = appContainer.resolve(ModuleRegistrationName.TAX) service = appContainer.resolve(Modules.TAX)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,5 +1,5 @@
import { IUserModuleService } from "@medusajs/types" import { IUserModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils" import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../helpers/create-admin-user" import { createAdminUser } from "../../../helpers/create-admin-user"
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => { beforeAll(async () => {
appContainer = getContainer() appContainer = getContainer()
userModuleService = appContainer.resolve(ModuleRegistrationName.USER) userModuleService = appContainer.resolve(Modules.USER)
}) })
beforeEach(async () => { beforeEach(async () => {
@@ -1,6 +1,6 @@
import { CreateCustomerDTO, MedusaContainer } from "@medusajs/types" import { CreateCustomerDTO, MedusaContainer } from "@medusajs/types"
import { Modules } from "@medusajs/utils"
import { ModuleRegistrationName } from "@medusajs/utils"
import jwt from "jsonwebtoken" import jwt from "jsonwebtoken"
export const createAuthenticatedCustomer = async ( export const createAuthenticatedCustomer = async (
@@ -8,10 +8,8 @@ export const createAuthenticatedCustomer = async (
customerData: Partial<CreateCustomerDTO> = {} customerData: Partial<CreateCustomerDTO> = {}
) => { ) => {
const { http } = appContainer.resolve("configModule").projectConfig const { http } = appContainer.resolve("configModule").projectConfig
const authService = appContainer.resolve(ModuleRegistrationName.AUTH) const authService = appContainer.resolve(Modules.AUTH)
const customerModuleService = appContainer.resolve( const customerModuleService = appContainer.resolve(Modules.CUSTOMER)
ModuleRegistrationName.CUSTOMER
)
const customer = await customerModuleService.createCustomers({ const customer = await customerModuleService.createCustomers({
first_name: "John", first_name: "John",
@@ -24,7 +24,7 @@ export const createVariantPriceSet = async ({
}): Promise<PriceSetDTO> => { }): Promise<PriceSetDTO> => {
const remoteLink = container.resolve("remoteLink") const remoteLink = container.resolve("remoteLink")
const pricingModuleService: IPricingModuleService = container.resolve( const pricingModuleService: IPricingModuleService = container.resolve(
"pricingModuleService" Modules.PRICING
) )
const priceSet = await pricingModuleService.createPriceSets({ const priceSet = await pricingModuleService.createPriceSets({
@@ -1,5 +1,5 @@
import { CreateApiKeyDTO, IApiKeyModuleService } from "@medusajs/types" import { CreateApiKeyDTO, IApiKeyModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { StepResponse, createStep } from "@medusajs/workflows-sdk" import { StepResponse, createStep } from "@medusajs/workflows-sdk"
export type CreateApiKeysStepInput = { export type CreateApiKeysStepInput = {
@@ -13,9 +13,7 @@ export const createApiKeysStepId = "create-api-keys"
export const createApiKeysStep = createStep( export const createApiKeysStep = createStep(
createApiKeysStepId, createApiKeysStepId,
async (data: CreateApiKeysStepInput, { container }) => { async (data: CreateApiKeysStepInput, { container }) => {
const service = container.resolve<IApiKeyModuleService>( const service = container.resolve<IApiKeyModuleService>(Modules.API_KEY)
ModuleRegistrationName.API_KEY
)
const created = await service.createApiKeys(data.api_keys) const created = await service.createApiKeys(data.api_keys)
return new StepResponse( return new StepResponse(
created, created,
@@ -27,9 +25,7 @@ export const createApiKeysStep = createStep(
return return
} }
const service = container.resolve<IApiKeyModuleService>( const service = container.resolve<IApiKeyModuleService>(Modules.API_KEY)
ModuleRegistrationName.API_KEY
)
await service.deleteApiKeys(createdIds) await service.deleteApiKeys(createdIds)
} }
@@ -1,5 +1,5 @@
import { IApiKeyModuleService } from "@medusajs/types" import { IApiKeyModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { StepResponse, createStep } from "@medusajs/workflows-sdk" import { StepResponse, createStep } from "@medusajs/workflows-sdk"
export const deleteApiKeysStepId = "delete-api-keys" export const deleteApiKeysStepId = "delete-api-keys"
@@ -9,9 +9,7 @@ export const deleteApiKeysStepId = "delete-api-keys"
export const deleteApiKeysStep = createStep( export const deleteApiKeysStep = createStep(
{ name: deleteApiKeysStepId, noCompensation: true }, { name: deleteApiKeysStepId, noCompensation: true },
async (ids: string[], { container }) => { async (ids: string[], { container }) => {
const service = container.resolve<IApiKeyModuleService>( const service = container.resolve<IApiKeyModuleService>(Modules.API_KEY)
ModuleRegistrationName.API_KEY
)
await service.deleteApiKeys(ids) await service.deleteApiKeys(ids)
return new StepResponse(void 0) return new StepResponse(void 0)
@@ -3,7 +3,7 @@ import {
IApiKeyModuleService, IApiKeyModuleService,
RevokeApiKeyDTO, RevokeApiKeyDTO,
} from "@medusajs/types" } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { StepResponse, createStep } from "@medusajs/workflows-sdk" import { StepResponse, createStep } from "@medusajs/workflows-sdk"
export type RevokeApiKeysStepInput = { export type RevokeApiKeysStepInput = {
@@ -18,9 +18,7 @@ export const revokeApiKeysStepId = "revoke-api-keys"
export const revokeApiKeysStep = createStep( export const revokeApiKeysStep = createStep(
{ name: revokeApiKeysStepId, noCompensation: true }, { name: revokeApiKeysStepId, noCompensation: true },
async (data: RevokeApiKeysStepInput, { container }) => { async (data: RevokeApiKeysStepInput, { container }) => {
const service = container.resolve<IApiKeyModuleService>( const service = container.resolve<IApiKeyModuleService>(Modules.API_KEY)
ModuleRegistrationName.API_KEY
)
const apiKeys = await service.revoke(data.selector, data.revoke) const apiKeys = await service.revoke(data.selector, data.revoke)
return new StepResponse(apiKeys) return new StepResponse(apiKeys)
@@ -3,10 +3,7 @@ import {
IApiKeyModuleService, IApiKeyModuleService,
UpdateApiKeyDTO, UpdateApiKeyDTO,
} from "@medusajs/types" } from "@medusajs/types"
import { import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils"
ModuleRegistrationName,
getSelectsAndRelationsFromObjectArray,
} from "@medusajs/utils"
import { StepResponse, createStep } from "@medusajs/workflows-sdk" import { StepResponse, createStep } from "@medusajs/workflows-sdk"
export type UpdateApiKeysStepInput = { export type UpdateApiKeysStepInput = {
@@ -21,9 +18,7 @@ export const updateApiKeysStepId = "update-api-keys"
export const updateApiKeysStep = createStep( export const updateApiKeysStep = createStep(
updateApiKeysStepId, updateApiKeysStepId,
async (data: UpdateApiKeysStepInput, { container }) => { async (data: UpdateApiKeysStepInput, { container }) => {
const service = container.resolve<IApiKeyModuleService>( const service = container.resolve<IApiKeyModuleService>(Modules.API_KEY)
ModuleRegistrationName.API_KEY
)
const { selects, relations } = getSelectsAndRelationsFromObjectArray([ const { selects, relations } = getSelectsAndRelationsFromObjectArray([
data.update, data.update,
@@ -42,9 +37,7 @@ export const updateApiKeysStep = createStep(
return return
} }
const service = container.resolve<IApiKeyModuleService>( const service = container.resolve<IApiKeyModuleService>(Modules.API_KEY)
ModuleRegistrationName.API_KEY
)
await service.upsertApiKeys( await service.upsertApiKeys(
prevData.map((r) => ({ prevData.map((r) => ({
@@ -1,9 +1,5 @@
import { ISalesChannelModuleService } from "@medusajs/types" import { ISalesChannelModuleService } from "@medusajs/types"
import { import { MedusaError, Modules, arrayDifference } from "@medusajs/utils"
MedusaError,
ModuleRegistrationName,
arrayDifference,
} from "@medusajs/utils"
import { StepResponse, createStep } from "@medusajs/workflows-sdk" import { StepResponse, createStep } from "@medusajs/workflows-sdk"
export interface ValidateSalesChannelsExistStepInput { export interface ValidateSalesChannelsExistStepInput {
@@ -18,9 +14,7 @@ export const validateSalesChannelsExistStep = createStep(
validateSalesChannelsExistStepId, validateSalesChannelsExistStepId,
async (data: ValidateSalesChannelsExistStepInput, { container }) => { async (data: ValidateSalesChannelsExistStepInput, { container }) => {
const salesChannelModuleService = const salesChannelModuleService =
container.resolve<ISalesChannelModuleService>( container.resolve<ISalesChannelModuleService>(Modules.SALES_CHANNEL)
ModuleRegistrationName.SALES_CHANNEL
)
const salesChannels = await salesChannelModuleService.listSalesChannels( const salesChannels = await salesChannelModuleService.listSalesChannels(
{ id: data.sales_channel_ids }, { id: data.sales_channel_ids },
@@ -1,7 +1,7 @@
import { createStep, StepResponse } from "@medusajs/workflows-sdk" import { createStep, StepResponse } from "@medusajs/workflows-sdk"
import { IAuthModuleService } from "@medusajs/types" import { IAuthModuleService } from "@medusajs/types"
import { isDefined, ModuleRegistrationName } from "@medusajs/utils" import { isDefined, Modules } from "@medusajs/utils"
export type SetAuthAppMetadataStepInput = { export type SetAuthAppMetadataStepInput = {
authIdentityId: string authIdentityId: string
@@ -16,9 +16,7 @@ export const setAuthAppMetadataStepId = "set-auth-app-metadata"
export const setAuthAppMetadataStep = createStep( export const setAuthAppMetadataStep = createStep(
setAuthAppMetadataStepId, setAuthAppMetadataStepId,
async (data: SetAuthAppMetadataStepInput, { container }) => { async (data: SetAuthAppMetadataStepInput, { container }) => {
const service = container.resolve<IAuthModuleService>( const service = container.resolve<IAuthModuleService>(Modules.AUTH)
ModuleRegistrationName.AUTH
)
const key = `${data.actorType}_id` const key = `${data.actorType}_id`
const authIdentity = await service.retrieveAuthIdentity(data.authIdentityId) const authIdentity = await service.retrieveAuthIdentity(data.authIdentityId)
@@ -52,9 +50,7 @@ export const setAuthAppMetadataStep = createStep(
const { id, key, oldValue, value } = idAndKeyAndValue const { id, key, oldValue, value } = idAndKeyAndValue
const service = container.resolve<IAuthModuleService>( const service = container.resolve<IAuthModuleService>(Modules.AUTH)
ModuleRegistrationName.AUTH
)
const authIdentity = await service.retrieveAuthIdentity(id) const authIdentity = await service.retrieveAuthIdentity(id)
@@ -1,5 +1,5 @@
import { CreateShippingMethodDTO, ICartModuleService } from "@medusajs/types" import { CreateShippingMethodDTO, ICartModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { StepResponse, createStep } from "@medusajs/workflows-sdk" import { StepResponse, createStep } from "@medusajs/workflows-sdk"
export interface AddShippingMethodToCartStepInput { export interface AddShippingMethodToCartStepInput {
@@ -13,18 +13,14 @@ export const addShippingMethodToCartStepId = "add-shipping-method-to-cart-step"
export const addShippingMethodToCartStep = createStep( export const addShippingMethodToCartStep = createStep(
addShippingMethodToCartStepId, addShippingMethodToCartStepId,
async (data: AddShippingMethodToCartStepInput, { container }) => { async (data: AddShippingMethodToCartStepInput, { container }) => {
const cartService = container.resolve<ICartModuleService>( const cartService = container.resolve<ICartModuleService>(Modules.CART)
ModuleRegistrationName.CART
)
const methods = await cartService.addShippingMethods(data.shipping_methods) const methods = await cartService.addShippingMethods(data.shipping_methods)
return new StepResponse(methods, methods) return new StepResponse(methods, methods)
}, },
async (methods, { container }) => { async (methods, { container }) => {
const cartService: ICartModuleService = container.resolve( const cartService: ICartModuleService = container.resolve(Modules.CART)
ModuleRegistrationName.CART
)
if (!methods?.length) { if (!methods?.length) {
return return
} }
@@ -1,10 +1,5 @@
import { IInventoryService } from "@medusajs/types" import { IInventoryService } from "@medusajs/types"
import { import { MathBN, MedusaError, Modules, promiseAll } from "@medusajs/utils"
MathBN,
MedusaError,
ModuleRegistrationName,
promiseAll,
} from "@medusajs/utils"
import { StepResponse, createStep } from "@medusajs/workflows-sdk" import { StepResponse, createStep } from "@medusajs/workflows-sdk"
export interface ConfirmVariantInventoryStepInput { export interface ConfirmVariantInventoryStepInput {
@@ -25,7 +20,7 @@ export const confirmInventoryStep = createStep(
confirmInventoryStepId, confirmInventoryStepId,
async (data: ConfirmVariantInventoryStepInput, { container }) => { async (data: ConfirmVariantInventoryStepInput, { container }) => {
const inventoryService = container.resolve<IInventoryService>( const inventoryService = container.resolve<IInventoryService>(
ModuleRegistrationName.INVENTORY Modules.INVENTORY
) )
// TODO: Should be bulk // TODO: Should be bulk
@@ -1,5 +1,5 @@
import { CreateCartDTO, ICartModuleService } from "@medusajs/types" import { CreateCartDTO, ICartModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { StepResponse, createStep } from "@medusajs/workflows-sdk" import { StepResponse, createStep } from "@medusajs/workflows-sdk"
export const createCartsStepId = "create-carts" export const createCartsStepId = "create-carts"
@@ -9,9 +9,7 @@ export const createCartsStepId = "create-carts"
export const createCartsStep = createStep( export const createCartsStep = createStep(
createCartsStepId, createCartsStepId,
async (data: CreateCartDTO[], { container }) => { async (data: CreateCartDTO[], { container }) => {
const service = container.resolve<ICartModuleService>( const service = container.resolve<ICartModuleService>(Modules.CART)
ModuleRegistrationName.CART
)
const createdCarts = await service.createCarts(data) const createdCarts = await service.createCarts(data)
@@ -25,9 +23,7 @@ export const createCartsStep = createStep(
return return
} }
const service = container.resolve<ICartModuleService>( const service = container.resolve<ICartModuleService>(Modules.CART)
ModuleRegistrationName.CART
)
await service.deleteCarts(createdCartsIds) await service.deleteCarts(createdCartsIds)
} }
@@ -2,7 +2,7 @@ import {
CreateLineItemAdjustmentDTO, CreateLineItemAdjustmentDTO,
ICartModuleService, ICartModuleService,
} from "@medusajs/types" } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils" import { Modules } from "@medusajs/utils"
import { StepResponse, createStep } from "@medusajs/workflows-sdk" import { StepResponse, createStep } from "@medusajs/workflows-sdk"
export interface CreateLineItemAdjustmentsCartStepInput { export interface CreateLineItemAdjustmentsCartStepInput {
@@ -18,7 +18,7 @@ export const createLineItemAdjustmentsStep = createStep(
async (data: CreateLineItemAdjustmentsCartStepInput, { container }) => { async (data: CreateLineItemAdjustmentsCartStepInput, { container }) => {
const { lineItemAdjustmentsToCreate = [] } = data const { lineItemAdjustmentsToCreate = [] } = data
const cartModuleService: ICartModuleService = container.resolve( const cartModuleService: ICartModuleService = container.resolve(
ModuleRegistrationName.CART Modules.CART
) )
const createdLineItemAdjustments = const createdLineItemAdjustments =
@@ -30,7 +30,7 @@ export const createLineItemAdjustmentsStep = createStep(
}, },
async (createdLineItemAdjustments, { container }) => { async (createdLineItemAdjustments, { container }) => {
const cartModuleService: ICartModuleService = container.resolve( const cartModuleService: ICartModuleService = container.resolve(
ModuleRegistrationName.CART Modules.CART
) )
if (!createdLineItemAdjustments?.length) { if (!createdLineItemAdjustments?.length) {
Loaded 100 of 421 files, more files were not shown because too many files have changed in this diff. Show more