chore: remove container registration name (#9137)

This commit is contained in:
Carlos R. L. Rodrigues
2024-09-16 06:22:24 -03:00
committed by GitHub
parent ab4a422fc8
commit 950cf9af79
421 changed files with 1528 additions and 2496 deletions
@@ -9,11 +9,7 @@ import {
IStockLocationServiceNext,
ITaxModuleService,
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
} from "@medusajs/utils"
import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import {
adminHeaders,
@@ -42,21 +38,15 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
cartModuleService = appContainer.resolve(ModuleRegistrationName.CART)
regionModuleService = appContainer.resolve(ModuleRegistrationName.REGION)
scModuleService = appContainer.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT)
pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING)
inventoryModule = appContainer.resolve(ModuleRegistrationName.INVENTORY)
stockLocationModule = appContainer.resolve(
ModuleRegistrationName.STOCK_LOCATION
)
fulfillmentModule = appContainer.resolve(
ModuleRegistrationName.FULFILLMENT
)
taxModule = appContainer.resolve(ModuleRegistrationName.TAX)
cartModuleService = appContainer.resolve(Modules.CART)
regionModuleService = appContainer.resolve(Modules.REGION)
scModuleService = appContainer.resolve(Modules.SALES_CHANNEL)
productModule = appContainer.resolve(Modules.PRODUCT)
pricingModule = appContainer.resolve(Modules.PRICING)
inventoryModule = appContainer.resolve(Modules.INVENTORY)
stockLocationModule = appContainer.resolve(Modules.STOCK_LOCATION)
fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT)
taxModule = appContainer.resolve(Modules.TAX)
remoteLink = appContainer.resolve(ContainerRegistrationKeys.REMOTE_LINK)
remoteQuery = appContainer.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
})
@@ -1,5 +1,5 @@
import { IOrderModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import {
adminHeaders,
@@ -18,7 +18,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
orderModule = appContainer.resolve(ModuleRegistrationName.ORDER)
orderModule = appContainer.resolve(Modules.ORDER)
})
beforeEach(async () => {
@@ -8,24 +8,19 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
remoteQueryObjectFromString,
} from "@medusajs/utils"
const providerId = "manual_test-provider"
export async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve(
ModuleRegistrationName.FULFILLMENT
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const fulfillmentService = container.resolve(Modules.FULFILLMENT)
const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
Modules.STOCK_LOCATION
)
const productModule = container.resolve(ModuleRegistrationName.PRODUCT)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const productModule = container.resolve(Modules.PRODUCT)
const inventoryModule = container.resolve(Modules.INVENTORY)
const shippingProfile = await fulfillmentService.createShippingProfiles({
name: "test",
@@ -49,7 +44,7 @@ export async function prepareDataFixtures({ container }) {
})
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -211,9 +206,7 @@ export async function createOrderFixture({
location,
inventoryItem,
}) {
const orderService: IOrderModuleService = container.resolve(
ModuleRegistrationName.ORDER
)
const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
let order = await orderService.createOrders({
region_id: "test_region_id",
@@ -287,7 +280,7 @@ export async function createOrderFixture({
customer_id: "joe",
})
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const inventoryModule = container.resolve(Modules.INVENTORY)
await inventoryModule.createReservationItems([
{
line_item_id: order.items![0].id,
@@ -15,7 +15,6 @@ import {
import {
ClaimType,
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
remoteQueryObjectFromString,
@@ -28,18 +27,14 @@ const env = { MEDUSA_FF_MEDUSA_V2: true }
const providerId = "manual_test-provider"
async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve(
ModuleRegistrationName.FULFILLMENT
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const fulfillmentService = container.resolve(Modules.FULFILLMENT)
const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
Modules.STOCK_LOCATION
)
const productModule = container.resolve(ModuleRegistrationName.PRODUCT)
const pricingModule = container.resolve(ModuleRegistrationName.PRICING)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const productModule = container.resolve(Modules.PRODUCT)
const pricingModule = container.resolve(Modules.PRICING)
const inventoryModule = container.resolve(Modules.INVENTORY)
const shippingProfile = await fulfillmentService.createShippingProfiles({
name: "test",
@@ -63,7 +58,7 @@ async function prepareDataFixtures({ container }) {
})
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -237,9 +232,7 @@ async function prepareDataFixtures({ container }) {
}
async function createOrderFixture({ container, product }) {
const orderService: IOrderModuleService = container.resolve(
ModuleRegistrationName.ORDER
)
const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
let order = await orderService.createOrders({
region_id: "test_region_id",
email: "foo@bar.com",
@@ -17,7 +17,6 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
remoteQueryObjectFromString,
@@ -30,19 +29,15 @@ const env = { MEDUSA_FF_MEDUSA_V2: true }
const providerId = "manual_test-provider"
async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve(
ModuleRegistrationName.FULFILLMENT
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const fulfillmentService = container.resolve(Modules.FULFILLMENT)
const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
Modules.STOCK_LOCATION
)
const productModule = container.resolve(ModuleRegistrationName.PRODUCT)
const pricingModule = container.resolve(ModuleRegistrationName.PRICING)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const customerService = container.resolve(ModuleRegistrationName.CUSTOMER)
const productModule = container.resolve(Modules.PRODUCT)
const pricingModule = container.resolve(Modules.PRICING)
const inventoryModule = container.resolve(Modules.INVENTORY)
const customerService = container.resolve(Modules.CUSTOMER)
const remoteLink = container.resolve(ContainerRegistrationKeys.REMOTE_LINK)
const customer = await customerService.createCustomers({
@@ -72,7 +67,7 @@ async function prepareDataFixtures({ container }) {
})
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -292,7 +287,7 @@ async function createOrderFixture({
customer,
region,
}) {
const orderService = container.resolve(ModuleRegistrationName.ORDER)
const orderService = container.resolve(Modules.ORDER)
let order = await orderService.createOrders({
region_id: region.id,
email: "foo@bar.com",
@@ -13,7 +13,6 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
remoteQueryObjectFromString,
@@ -26,18 +25,14 @@ const env = { MEDUSA_FF_MEDUSA_V2: true }
const providerId = "manual_test-provider"
async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve(
ModuleRegistrationName.FULFILLMENT
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const fulfillmentService = container.resolve(Modules.FULFILLMENT)
const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
Modules.STOCK_LOCATION
)
const productModule = container.resolve(ModuleRegistrationName.PRODUCT)
const pricingModule = container.resolve(ModuleRegistrationName.PRICING)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const productModule = container.resolve(Modules.PRODUCT)
const pricingModule = container.resolve(Modules.PRICING)
const inventoryModule = container.resolve(Modules.INVENTORY)
const shippingProfile = await fulfillmentService.createShippingProfiles({
name: "test",
@@ -61,7 +56,7 @@ async function prepareDataFixtures({ container }) {
})
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -238,9 +233,7 @@ async function prepareDataFixtures({ container }) {
}
async function createOrderFixture({ container, product }) {
const orderService: IOrderModuleService = container.resolve(
ModuleRegistrationName.ORDER
)
const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
let order = await orderService.createOrders({
region_id: "test_region_id",
email: "foo@bar.com",
@@ -4,8 +4,8 @@ import {
createOrderFulfillmentWorkflow,
} from "@medusajs/core-flows"
import {
InventoryItemDTO,
IOrderModuleService,
InventoryItemDTO,
OrderWorkflow,
ProductDTO,
RegionDTO,
@@ -14,7 +14,7 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
remoteQueryObjectFromString,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
@@ -52,7 +52,7 @@ medusaIntegrationTestRunner({
product = fixtures.product
inventoryItem = fixtures.inventoryItem
orderService = container.resolve(ModuleRegistrationName.ORDER)
orderService = container.resolve(Modules.ORDER)
})
it("should cancel an order", async () => {
@@ -17,7 +17,6 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
remoteQueryObjectFromString,
@@ -30,18 +29,14 @@ const env = { MEDUSA_FF_MEDUSA_V2: true }
const providerId = "manual_test-provider"
async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve(
ModuleRegistrationName.FULFILLMENT
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const fulfillmentService = container.resolve(Modules.FULFILLMENT)
const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
Modules.STOCK_LOCATION
)
const productModule = container.resolve(ModuleRegistrationName.PRODUCT)
const pricingModule = container.resolve(ModuleRegistrationName.PRICING)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const productModule = container.resolve(Modules.PRODUCT)
const pricingModule = container.resolve(Modules.PRICING)
const inventoryModule = container.resolve(Modules.INVENTORY)
const remoteLink = container.resolve(ContainerRegistrationKeys.REMOTE_LINK)
const shippingProfile = await fulfillmentService.createShippingProfiles({
@@ -66,7 +61,7 @@ async function prepareDataFixtures({ container }) {
})
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -241,9 +236,7 @@ async function prepareDataFixtures({ container }) {
}
async function createOrderFixture({ container, product }) {
const orderService: IOrderModuleService = container.resolve(
ModuleRegistrationName.ORDER
)
const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
let order = await orderService.createOrders({
region_id: "test_region_id",
email: "foo@bar.com",
@@ -390,7 +383,7 @@ medusaIntegrationTestRunner({
product = fixtures.product
fulfillmentSet = fixtures.fulfillmentSet
orderService = container.resolve(ModuleRegistrationName.ORDER)
orderService = container.resolve(Modules.ORDER)
})
it("should create a return order", async () => {
@@ -17,7 +17,6 @@ import {
import {
BigNumber,
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
remoteQueryObjectFromString,
} from "@medusajs/utils"
@@ -31,17 +30,13 @@ const variantSkuWithInventory = "test-variant"
let inventoryItem
async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve(
ModuleRegistrationName.FULFILLMENT
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const fulfillmentService = container.resolve(Modules.FULFILLMENT)
const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
Modules.STOCK_LOCATION
)
const productModule = container.resolve(ModuleRegistrationName.PRODUCT)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const productModule = container.resolve(Modules.PRODUCT)
const inventoryModule = container.resolve(Modules.INVENTORY)
const shippingProfile = await fulfillmentService.createShippingProfiles({
name: "test",
@@ -65,7 +60,7 @@ async function prepareDataFixtures({ container }) {
})
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -226,9 +221,7 @@ async function prepareDataFixtures({ container }) {
}
async function createOrderFixture({ container, product, location }) {
const orderService: IOrderModuleService = container.resolve(
ModuleRegistrationName.ORDER
)
const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
let order = await orderService.createOrders({
region_id: "test_region_id",
email: "foo@bar.com",
@@ -310,7 +303,7 @@ async function createOrderFixture({ container, product, location }) {
customer_id: "joe",
})
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const inventoryModule = container.resolve(Modules.INVENTORY)
const reservation = await inventoryModule.createReservationItems([
{
@@ -355,13 +348,11 @@ medusaIntegrationTestRunner({
location = fixtures.location
product = fixtures.product
orderService = container.resolve(ModuleRegistrationName.ORDER)
orderService = container.resolve(Modules.ORDER)
})
it("should create a order fulfillment and cancel it", async () => {
const inventoryModule = container.resolve(
ModuleRegistrationName.INVENTORY
)
const inventoryModule = container.resolve(Modules.INVENTORY)
const order = await createOrderFixture({ container, product, location })
const itemWithInventory = order.items!.find(
@@ -534,9 +525,7 @@ medusaIntegrationTestRunner({
expect(orderFulfill.fulfillments).toHaveLength(1)
expect(orderFulfill.items[0].detail.fulfilled_quantity).toEqual(1)
const inventoryModule = container.resolve(
ModuleRegistrationName.INVENTORY
)
const inventoryModule = container.resolve(Modules.INVENTORY)
const reservation = await inventoryModule.listReservationItems({
line_item_id: order.items![0].id,
})
@@ -16,7 +16,6 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
remoteQueryObjectFromString,
@@ -30,17 +29,13 @@ const providerId = "manual_test-provider"
let inventoryItem
async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve(
ModuleRegistrationName.FULFILLMENT
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const fulfillmentService = container.resolve(Modules.FULFILLMENT)
const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
Modules.STOCK_LOCATION
)
const productModule = container.resolve(ModuleRegistrationName.PRODUCT)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const productModule = container.resolve(Modules.PRODUCT)
const inventoryModule = container.resolve(Modules.INVENTORY)
const shippingProfile = await fulfillmentService.createShippingProfiles({
name: "test",
@@ -64,7 +59,7 @@ async function prepareDataFixtures({ container }) {
})
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -227,9 +222,7 @@ async function prepareDataFixtures({ container }) {
}
async function createOrderFixture({ container, product, location }) {
const orderService: IOrderModuleService = container.resolve(
ModuleRegistrationName.ORDER
)
const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
let order = await orderService.createOrders({
region_id: "test_region_id",
email: "foo@bar.com",
@@ -302,7 +295,7 @@ async function createOrderFixture({ container, product, location }) {
customer_id: "joe",
})
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const inventoryModule = container.resolve(Modules.INVENTORY)
const reservation = await inventoryModule.createReservationItems([
{
line_item_id: order.items![0].id,
@@ -346,7 +339,7 @@ medusaIntegrationTestRunner({
location = fixtures.location
product = fixtures.product
orderService = container.resolve(ModuleRegistrationName.ORDER)
orderService = container.resolve(Modules.ORDER)
})
it("should create a order fulfillment", async () => {
@@ -417,9 +410,7 @@ medusaIntegrationTestRunner({
expect(orderFulfill.fulfillments).toHaveLength(1)
expect(orderFulfill.items[0].detail.fulfilled_quantity).toEqual(1)
const inventoryModule = container.resolve(
ModuleRegistrationName.INVENTORY
)
const inventoryModule = container.resolve(Modules.INVENTORY)
const reservation = await inventoryModule.listReservationItems({
line_item_id: order.items![0].id,
})
@@ -13,7 +13,7 @@ import {
OrderChangeDTO,
OrderDTO,
} from "@medusajs/types"
import { ChangeActionType, ModuleRegistrationName } from "@medusajs/utils"
import { ChangeActionType, Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createOrderFixture, prepareDataFixtures } from "./__fixtures__"
@@ -48,7 +48,7 @@ medusaIntegrationTestRunner({
})
orderChange = result
service = container.resolve(ModuleRegistrationName.ORDER)
service = container.resolve(Modules.ORDER)
})
describe("createOrderChangeActionsWorkflow", () => {
@@ -8,7 +8,7 @@ import {
deleteOrderChangeWorkflowId,
} from "@medusajs/core-flows"
import { IOrderModuleService, OrderChangeDTO, OrderDTO } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createOrderFixture, prepareDataFixtures } from "./__fixtures__"
@@ -100,7 +100,7 @@ medusaIntegrationTestRunner({
})
orderChange = result
service = container.resolve(ModuleRegistrationName.ORDER)
service = container.resolve(Modules.ORDER)
})
it("should successfully cancel an order change", async () => {
@@ -179,7 +179,7 @@ medusaIntegrationTestRunner({
})
orderChange = result
service = container.resolve(ModuleRegistrationName.ORDER)
service = container.resolve(Modules.ORDER)
})
it("should successfully delete an order change", async () => {
@@ -256,7 +256,7 @@ medusaIntegrationTestRunner({
})
orderChange = result
service = container.resolve(ModuleRegistrationName.ORDER)
service = container.resolve(Modules.ORDER)
})
it("should successfully decline an order change", async () => {
@@ -5,7 +5,7 @@ import {
import { IFulfillmentModuleService, OrderDTO, ReturnDTO } from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
remoteQueryObjectFromString,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
@@ -54,7 +54,7 @@ medusaIntegrationTestRunner({
fields: ["order_id", "id", "status", "order_change_id"],
})
service = container.resolve(ModuleRegistrationName.FULFILLMENT)
service = container.resolve(Modules.FULFILLMENT)
;[returnOrder] = await remoteQuery(remoteQueryObject)
})
@@ -6,7 +6,7 @@ import {
import { IOrderModuleService, OrderDTO, ReturnDTO } from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
remoteQueryObjectFromString,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
@@ -65,7 +65,7 @@ medusaIntegrationTestRunner({
fields: ["order_id", "id", "status", "order_change_id"],
})
service = container.resolve(ModuleRegistrationName.ORDER)
service = container.resolve(Modules.ORDER)
;[returnOrder] = await remoteQuery(remoteQueryObject)
})