Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove container registration name #9137

Merged
merged 13 commits into from
Sep 16, 2024
  •  
  •  
  •  
16 changes: 4 additions & 12 deletions integration-tests/helpers/create-admin-user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ import {
IUserModuleService,
MedusaContainer,
} from "@medusajs/types"
import {
ApiKeyType,
ModuleRegistrationName,
PUBLISHABLE_KEY_HEADER,
} from "@medusajs/utils"
import { ApiKeyType, Modules, PUBLISHABLE_KEY_HEADER } from "@medusajs/utils"
import jwt from "jsonwebtoken"
import Scrypt from "scrypt-kdf"
import { getContainer } from "../environment-helpers/use-container"
Expand All @@ -25,12 +21,8 @@ export const createAdminUser = async (
) => {
const appContainer = container ?? getContainer()!

const userModule: IUserModuleService = appContainer.resolve(
ModuleRegistrationName.USER
)
const authModule: IAuthModuleService = appContainer.resolve(
ModuleRegistrationName.AUTH
)
const userModule: IUserModuleService = appContainer.resolve(Modules.USER)
const authModule: IAuthModuleService = appContainer.resolve(Modules.AUTH)
const user = await userModule.createUsers({
first_name: "Admin",
last_name: "User",
Expand Down Expand Up @@ -75,7 +67,7 @@ export const createAdminUser = async (
export const generatePublishableKey = async (container?: MedusaContainer) => {
const appContainer = container ?? getContainer()!
const apiKeyModule = appContainer.resolve<IApiKeyModuleService>(
ModuleRegistrationName.API_KEY
Modules.API_KEY
)

return await apiKeyModule.createApiKeys({
Expand Down
10 changes: 3 additions & 7 deletions integration-tests/helpers/seed-storefront-defaults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,14 @@ import {
IStoreModuleService,
MedusaContainer,
} from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"

export const seedStorefrontDefaults = async (
container: MedusaContainer,
defaultCurrency: string = "usd"
) => {
const regionModule: IRegionModuleService = container.resolve(
ModuleRegistrationName.REGION
)
const storeModule: IStoreModuleService = container.resolve(
ModuleRegistrationName.STORE
)
const regionModule: IRegionModuleService = container.resolve(Modules.REGION)
const storeModule: IStoreModuleService = container.resolve(Modules.STORE)

// Creates the stores & default sales channel
await createDefaultsWorkflow(container).run()
Expand Down
5 changes: 2 additions & 3 deletions integration-tests/http/__tests__/claims/claims.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import {
ClaimReason,
ClaimType,
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
} from "@medusajs/utils"
Expand Down Expand Up @@ -122,7 +121,7 @@ medusaIntegrationTestRunner({
)
).data.return_reason

const orderModule = container.resolve(ModuleRegistrationName.ORDER)
const orderModule = container.resolve(Modules.ORDER)

order = await orderModule.createOrders({
region_id: region.id,
Expand Down Expand Up @@ -401,7 +400,7 @@ medusaIntegrationTestRunner({

item = order.items[0]

await setupTaxStructure(container.resolve(ModuleRegistrationName.TAX))
await setupTaxStructure(container.resolve(Modules.TAX))
})

describe("Claims lifecycle", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { IAuthModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import jwt from "jsonwebtoken"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import {
Expand Down Expand Up @@ -443,9 +443,7 @@ medusaIntegrationTestRunner({

const { auth_identity_id } = jwt.decode(registeredCustomerToken)

const authModule: IAuthModuleService = container.resolve(
ModuleRegistrationName.AUTH
)
const authModule: IAuthModuleService = container.resolve(Modules.AUTH)

const authIdentity = await authModule.retrieveAuthIdentity(
auth_identity_id
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
} from "@medusajs/utils"
Expand Down Expand Up @@ -118,7 +117,7 @@ medusaIntegrationTestRunner({
)
).data.return_reason

const orderModule = container.resolve(ModuleRegistrationName.ORDER)
const orderModule = container.resolve(Modules.ORDER)

order = await orderModule.createOrders({
region_id: region.id,
Expand Down Expand Up @@ -420,7 +419,7 @@ medusaIntegrationTestRunner({
adminHeaders
)

await setupTaxStructure(container.resolve(ModuleRegistrationName.TAX))
await setupTaxStructure(container.resolve(Modules.TAX))
})

describe("Exchanges lifecycle", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { IFulfillmentModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import {
adminHeaders,
createAdminUser,
Expand Down Expand Up @@ -29,7 +29,7 @@ medusaIntegrationTestRunner({

// TODO: Add support for creating fulfillment sets through HTTP
const fulfillmentModule: IFulfillmentModuleService =
getContainer().resolve(ModuleRegistrationName.FULFILLMENT)
getContainer().resolve(Modules.FULFILLMENT)

fulfillmentSet1 = await fulfillmentModule.createFulfillmentSets({
name: "Test fulfillment set",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
OrderChangeStatus,
RuleOperator,
Expand Down Expand Up @@ -130,7 +129,7 @@ medusaIntegrationTestRunner({
)
).data.product

const orderModule = container.resolve(ModuleRegistrationName.ORDER)
const orderModule = container.resolve(Modules.ORDER)

order = await orderModule.createOrders({
region_id: region.id,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
import {
ClaimType,
ModuleRegistrationName,
RuleOperator,
} from "@medusajs/utils"
import { ClaimType, Modules, RuleOperator } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import {
adminHeaders,
Expand All @@ -26,7 +22,7 @@ medusaIntegrationTestRunner({
beforeEach(async () => {
const container = getContainer()

await setupTaxStructure(container.resolve(ModuleRegistrationName.TAX))
await setupTaxStructure(container.resolve(Modules.TAX))
await createAdminUser(dbConnection, adminHeaders, container)
order = await createOrderSeeder({ api, container })

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { IEventBusModuleService } from "@medusajs/types"
import { CommonEvents, Modules } from "@medusajs/utils"
import fs from "fs/promises"
import { TestEventUtils, medusaIntegrationTestRunner } from "medusa-test-utils"
import path from "path"
import {
adminHeaders,
createAdminUser,
} from "../../../../helpers/create-admin-user"
import { getProductFixture } from "../../../../helpers/fixtures"
import fs from "fs/promises"
import path from "path"
import { ModuleRegistrationName } from "@medusajs/utils"

jest.setTimeout(50000)

Expand Down Expand Up @@ -56,7 +56,7 @@ medusaIntegrationTestRunner({

let eventBus: IEventBusModuleService
beforeAll(async () => {
eventBus = getContainer().resolve(ModuleRegistrationName.EVENT_BUS)
eventBus = getContainer().resolve(Modules.EVENT_BUS)
})

beforeEach(async () => {
Expand Down Expand Up @@ -201,7 +201,7 @@ medusaIntegrationTestRunner({
describe("POST /admin/products/export", () => {
it("should export a csv file containing the expected products", async () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created",
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus
)

Expand Down Expand Up @@ -243,7 +243,7 @@ medusaIntegrationTestRunner({

it("should export a csv file with categories", async () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created",
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus
)

Expand All @@ -269,7 +269,7 @@ medusaIntegrationTestRunner({

it("should export a csv file with region prices", async () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created",
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus
)

Expand Down Expand Up @@ -328,7 +328,7 @@ medusaIntegrationTestRunner({

it("should export a csv file filtered by specific products", async () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created",
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
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 path from "path"
import {
adminHeaders,
createAdminUser,
} 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"

jest.setTimeout(50000)
Expand Down Expand Up @@ -40,7 +40,7 @@ medusaIntegrationTestRunner({

let eventBus: IEventBusModuleService
beforeAll(async () => {
eventBus = getContainer().resolve(ModuleRegistrationName.EVENT_BUS)
eventBus = getContainer().resolve(Modules.EVENT_BUS)
})

beforeEach(async () => {
Expand Down Expand Up @@ -127,7 +127,7 @@ medusaIntegrationTestRunner({
].forEach((testcase) => {
it(`should import a previously exported products CSV file ${testcase.name}`, async () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created",
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus
)

Expand Down Expand Up @@ -383,7 +383,7 @@ medusaIntegrationTestRunner({

it("should import product with categories", async () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created",
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus
)

Expand Down Expand Up @@ -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 () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created",
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus
)

Expand Down Expand Up @@ -502,7 +502,7 @@ medusaIntegrationTestRunner({

it("should fail on non-existent product fields being present in the CSV", async () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created",
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus
)

Expand Down Expand Up @@ -552,7 +552,7 @@ medusaIntegrationTestRunner({

it("supports importing the v1 template", async () => {
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
"notification.notification.created",
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
eventBus
)

Expand Down Expand Up @@ -781,6 +781,7 @@ medusaIntegrationTestRunner({
created_at: expect.any(String),
updated_at: expect.any(String),
}),

expect.objectContaining({
id: expect.any(String),
title: "Test product",
Expand Down
12 changes: 4 additions & 8 deletions integration-tests/http/__tests__/product/store/product.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import { IStoreModuleService } from "@medusajs/types"
import {
ApiKeyType,
ModuleRegistrationName,
ProductStatus,
} from "@medusajs/utils"
import { ApiKeyType, Modules, ProductStatus } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import {
adminHeaders,
Expand Down Expand Up @@ -91,7 +87,7 @@ medusaIntegrationTestRunner({
await createAdminUser(dbConnection, adminHeaders, appContainer)

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.
const defaultId = (await api.get("/admin/stores", adminHeaders)).data
Expand Down Expand Up @@ -540,7 +536,7 @@ medusaIntegrationTestRunner({
adminHeaders
)

const service = appContainer.resolve(ModuleRegistrationName.STORE)
const service = appContainer.resolve(Modules.STORE)
const [store] = await service.listStores()

if (store) {
Expand Down Expand Up @@ -1158,7 +1154,7 @@ medusaIntegrationTestRunner({
adminHeaders
)

const service = appContainer.resolve(ModuleRegistrationName.STORE)
const service = appContainer.resolve(Modules.STORE)
const [store] = await service.listStores()

if (store) {
Expand Down
3 changes: 1 addition & 2 deletions integration-tests/http/__tests__/returns/returns.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
} from "@medusajs/utils"
Expand Down Expand Up @@ -60,7 +59,7 @@ medusaIntegrationTestRunner({
)
).data.return_reason

const orderModule = container.resolve(ModuleRegistrationName.ORDER)
const orderModule = container.resolve(Modules.ORDER)

order = await orderModule.createOrders({
region_id: "test_region_id",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import {
adminHeaders,
createAdminUser,
Expand Down Expand Up @@ -298,9 +298,7 @@ medusaIntegrationTestRunner({
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?
const fulfillmentModule = getContainer().resolve(
ModuleRegistrationName.FULFILLMENT
)
const fulfillmentModule = getContainer().resolve(Modules.FULFILLMENT)
const sets = await fulfillmentModule.listFulfillmentSets()
expect(sets).toHaveLength(0)
})
Expand Down
Loading
Loading