asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Chore/rm main entity concept (#7709)

Browse Source 
**What**
Update the `MedusaService` class, factory and types to remove the concept of main modules. The idea being that all method will be explicitly named and suffixes to represent the object you are trying to manipulate.
This pr also includes various fixes in different modules

Co-authored-by: Stevche Radevski <4820812+sradevski@users.noreply.github.com>
Co-authored-by: Oli Juhl <59018053+olivermrbl@users.noreply.github.com>
This commit is contained in:
Adrien de Peretti
2024-06-19 13:02:16 +00:00
committed by GitHub
co-authored by Stevche Radevski Oli Juhl
parent 2895ccfba8
commit 48963f55ef
533 changed files with 6469 additions and 9769 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/modules/order/integration-tests/__tests__/create-order.ts
+22 -22
View File
@@ -1,12 +1,12 @@
import { Modules } from "@medusajs/modules-sdk"
import { CreateOrderDTO, IOrderModuleService } from "@medusajs/types"
import { SuiteOptions, moduleIntegrationTestRunner } from "medusa-test-utils"
import { moduleIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(100000)
moduleIntegrationTestRunner({
moduleIntegrationTestRunner<IOrderModuleService>({
moduleName: Modules.ORDER,
testSuite: ({ service }: SuiteOptions<IOrderModuleService>) => {
testSuite: ({ service }) => {
describe("Order Module Service", () => {
const input = {
email: "foo@bar.com",
@@ -193,7 +193,7 @@ moduleIntegrationTestRunner({
})
it("should create an order, shipping method and items. Including taxes and adjustments associated with them", async function () {
const createdOrder = await service.create(input)
const createdOrder = await service.createOrders(input)
const serializedOrder = JSON.parse(JSON.stringify(createdOrder))
@@ -201,12 +201,12 @@ moduleIntegrationTestRunner({
})
it("should create an order, shipping method and items. Including taxes and adjustments associated with them and add new transactions", async function () {
const inpCopy = JSON.parse(JSON.stringify(input))
inpCopy.transactions.push({
const inpCopy = JSON.parse(JSON.stringify(input)) as CreateOrderDTO
inpCopy.transactions!.push({
amount: 10,
currency_code: "USD",
})
const created = await service.create(inpCopy)
const created = await service.createOrders(inpCopy)
const refund = await service.addTransactions([
{
@@ -218,7 +218,7 @@ moduleIntegrationTestRunner({
const serializedOrder = JSON.parse(
JSON.stringify(
await service.retrieve(created.id, {
await service.retrieveOrder(created.id, {
select: ["id", "summary"],
})
)
@@ -231,11 +231,11 @@ moduleIntegrationTestRunner({
})
)
await service.softDeleteTransactions(refund[0].id)
await service.softDeleteTransactions([refund[0].id])
const serializedOrder2 = JSON.parse(
JSON.stringify(
await service.retrieve(created.id, {
await service.retrieveOrder(created.id, {
select: ["id", "summary"],
})
)
@@ -258,7 +258,7 @@ moduleIntegrationTestRunner({
const serializedOrder3 = JSON.parse(
JSON.stringify(
await service.retrieve(created.id, {
await service.retrieveOrder(created.id, {
select: ["id", "summary"],
})
)
@@ -271,11 +271,11 @@ moduleIntegrationTestRunner({
})
)
await service.restoreTransactions(refund[0].id)
await service.restoreTransactions([refund[0].id])
const serializedOrder4 = JSON.parse(
JSON.stringify(
await service.retrieve(created.id, {
await service.retrieveOrder(created.id, {
select: ["id", "summary"],
})
)
@@ -290,8 +290,8 @@ moduleIntegrationTestRunner({
})
it("should transform requested fields and relations to match the db schema and return the order", async function () {
const createdOrder = await service.create(input)
const getOrder = await service.retrieve(createdOrder.id, {
const createdOrder = await service.createOrders(input)
const getOrder = await service.retrieveOrder(createdOrder.id, {
select: [
"id",
"display_id",
@@ -330,8 +330,8 @@ moduleIntegrationTestRunner({
})
it("should return order transactions", async function () {
const createdOrder = await service.create(input)
const getOrder = await service.retrieve(createdOrder.id, {
const createdOrder = await service.createOrders(input)
const getOrder = await service.retrieveOrder(createdOrder.id, {
select: [
"id",
"transactions.amount",
@@ -357,8 +357,8 @@ moduleIntegrationTestRunner({
})
it("should transform where clause to match the db schema and return the order", async function () {
await service.create(input)
const orders = await service.list(
await service.createOrders(input)
const orders = await service.listOrders(
{
items: {
quantity: 2,
@@ -372,7 +372,7 @@ moduleIntegrationTestRunner({
)
expect(orders.length).toEqual(1)
const orders2 = await service.list(
const orders2 = await service.listOrders(
{
items: {
quantity: 5,
@@ -386,7 +386,7 @@ moduleIntegrationTestRunner({
)
expect(orders2.length).toEqual(0)
const orders3 = await service.list(
const orders3 = await service.listOrders(
{
items: {
detail: {
@@ -402,7 +402,7 @@ moduleIntegrationTestRunner({
)
expect(orders3.length).toEqual(1)
const orders4 = await service.list(
const orders4 = await service.listOrders(
{
items: {
detail: {
packages/modules/order/integration-tests/__tests__/order-claim.ts
+5 -5
View File
@@ -1,7 +1,7 @@
import { Modules } from "@medusajs/modules-sdk"
import { CreateOrderDTO, IOrderModuleService } from "@medusajs/types"
import { ClaimType } from "@medusajs/utils"
import { SuiteOptions, moduleIntegrationTestRunner } from "medusa-test-utils"
import {Modules} from "@medusajs/modules-sdk"
import {CreateOrderDTO, IOrderModuleService} from "@medusajs/types"
import {ClaimType} from "@medusajs/utils"
import {moduleIntegrationTestRunner, SuiteOptions} from "medusa-test-utils"
jest.setTimeout(100000)
@@ -104,7 +104,7 @@ moduleIntegrationTestRunner({
} as CreateOrderDTO
it("should claim an item and add two new items to the order", async function () {
const createdOrder = await service.create(input)
const createdOrder = await service.createOrders(input)
// Fullfilment
await service.registerFulfillment({
packages/modules/order/integration-tests/__tests__/order-edit.ts
+10 -10
View File
@@ -6,15 +6,15 @@ import {
IOrderModuleService,
} from "@medusajs/types"
import { BigNumber } from "@medusajs/utils"
import { SuiteOptions, moduleIntegrationTestRunner } from "medusa-test-utils"
import { moduleIntegrationTestRunner } from "medusa-test-utils"
import { ChangeActionType } from "../../src/utils"
jest.setTimeout(100000)
moduleIntegrationTestRunner({
moduleIntegrationTestRunner<IOrderModuleService>({
debug: false,
moduleName: Modules.ORDER,
testSuite: ({ service }: SuiteOptions<IOrderModuleService>) => {
testSuite: ({ service }) => {
describe("Order Module Service - Order Edits", () => {
const input = {
email: "foo@bar.com",
@@ -128,7 +128,7 @@ moduleIntegrationTestRunner({
} as CreateOrderDTO
it("should change an order by adding actions to it", async function () {
const createdOrder = await service.create(input)
const createdOrder = await service.createOrders(input)
await service.addOrderAction([
{
@@ -210,7 +210,7 @@ moduleIntegrationTestRunner({
await service.applyPendingOrderActions(createdOrder.id)
const finalOrder = await service.retrieve(createdOrder.id, {
const finalOrder = await service.retrieveOrder(createdOrder.id, {
select: [
"id",
"version",
@@ -337,7 +337,7 @@ moduleIntegrationTestRunner({
})
it("should create an order change, add actions to it, confirm the changes, revert all the changes and restore the changes again.", async function () {
const createdOrder = await service.create(input)
const createdOrder = await service.createOrders(input)
const orderChange = await service.createOrderChange({
order_id: createdOrder.id,
@@ -418,7 +418,7 @@ moduleIntegrationTestRunner({
service.confirmOrderChange(orderChange.id)
).rejects.toThrow(`Order Change cannot be modified: ${orderChange.id}`)
const modified = await service.retrieve(createdOrder.id, {
const modified = await service.retrieveOrder(createdOrder.id, {
select: [
"id",
"version",
@@ -483,7 +483,7 @@ moduleIntegrationTestRunner({
// Revert Last Changes
await service.revertLastVersion(createdOrder.id)
const revertedOrder = await service.retrieve(createdOrder.id, {
const revertedOrder = await service.retrieveOrder(createdOrder.id, {
select: [
"id",
"version",
@@ -549,7 +549,7 @@ moduleIntegrationTestRunner({
})
it("should create order changes, cancel and reject them.", async function () {
const createdOrder = await service.create(input)
const createdOrder = await service.createOrders(input)
const orderChange = await service.createOrderChange({
order_id: createdOrder.id,
@@ -598,7 +598,7 @@ moduleIntegrationTestRunner({
service.declineOrderChange(orderChange2.id)
).rejects.toThrow("Order Change cannot be modified")
const [change1, change2] = await service.listOrderChanges(
const [change1, change2] = await (service as any).listOrderChanges(
{
id: [orderChange.id, orderChange2.id],
},
packages/modules/order/integration-tests/__tests__/order-exchange.ts
+4 -4
View File
@@ -1,6 +1,6 @@
import { Modules } from "@medusajs/modules-sdk"
import { CreateOrderDTO, IOrderModuleService } from "@medusajs/types"
import { SuiteOptions, moduleIntegrationTestRunner } from "medusa-test-utils"
import {Modules} from "@medusajs/modules-sdk"
import {CreateOrderDTO, IOrderModuleService} from "@medusajs/types"
import {moduleIntegrationTestRunner, SuiteOptions} from "medusa-test-utils"
jest.setTimeout(100000)
@@ -103,7 +103,7 @@ moduleIntegrationTestRunner({
} as CreateOrderDTO
it("should exchange an item and add two new items to the order", async function () {
const createdOrder = await service.create(input)
const createdOrder = await service.createOrders(input)
// Fullfilment
await service.registerFulfillment({
packages/modules/order/integration-tests/__tests__/order-items-shipping.spec.ts
+93 -93
View File
@@ -4,18 +4,18 @@ import {
IOrderModuleService,
} from "@medusajs/types"
import { OrderStatus } from "@medusajs/utils"
import { SuiteOptions, moduleIntegrationTestRunner } from "medusa-test-utils"
import { moduleIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(100000)
moduleIntegrationTestRunner({
moduleIntegrationTestRunner<IOrderModuleService>({
moduleName: Modules.ORDER,
testSuite: ({ service }: SuiteOptions<IOrderModuleService>) => {
testSuite: ({ service }) => {
describe("Order - Items and Shipping methods", () => {
describe("create", () => {
it("should throw an error when required params are not passed", async () => {
const error = await service
.create([
.createOrders([
{
email: "test@email.com",
} as any,
@@ -28,7 +28,7 @@ moduleIntegrationTestRunner({
})
it("should create an order successfully", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
items: [
@@ -41,7 +41,7 @@ moduleIntegrationTestRunner({
},
])
const [order] = await service.list({ id: [createdOrder.id] })
const [order] = await service.listOrders({ id: [createdOrder.id] })
expect(order).toEqual(
expect.objectContaining({
@@ -52,7 +52,7 @@ moduleIntegrationTestRunner({
})
it("should create an order with billing + shipping address successfully", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
billing_address: {
@@ -66,7 +66,7 @@ moduleIntegrationTestRunner({
},
])
const [order] = await service.list(
const [order] = await service.listOrders(
{ id: [createdOrder.id] },
{ relations: ["billing_address", "shipping_address"] }
)
@@ -95,7 +95,7 @@ moduleIntegrationTestRunner({
},
])
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
billing_address_id: createdAddress.id,
@@ -122,7 +122,7 @@ moduleIntegrationTestRunner({
})
it("should create an order with items", async () => {
const createdOrder = await service.create({
const createdOrder = await service.createOrders({
currency_code: "eur",
items: [
{
@@ -133,7 +133,7 @@ moduleIntegrationTestRunner({
],
})
const order = await service.retrieve(createdOrder.id, {
const order = await service.retrieveOrder(createdOrder.id, {
relations: ["items.item"],
})
@@ -153,7 +153,7 @@ moduleIntegrationTestRunner({
})
it("should create multiple orders with items", async () => {
const createdOrders = await service.create([
const createdOrders = await service.createOrders([
{
currency_code: "eur",
items: [
@@ -176,7 +176,7 @@ moduleIntegrationTestRunner({
},
])
const orders = await service.list(
const orders = await service.listOrders(
{ id: createdOrders.map((c) => c.id) },
{
relations: ["items.item"],
@@ -222,7 +222,7 @@ moduleIntegrationTestRunner({
describe("update", () => {
it("should throw an error if order does not exist", async () => {
const error = await service
.update([
.updateOrders([
{
id: "none-existing",
},
@@ -235,20 +235,20 @@ moduleIntegrationTestRunner({
})
it("should update an order successfully", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
])
const [updatedOrder] = await service.update([
const [updatedOrder] = await service.updateOrders([
{
id: createdOrder.id,
email: "test@email.com",
},
])
const [order] = await service.list({ id: [createdOrder.id] })
const [order] = await service.listOrders({ id: [createdOrder.id] })
expect(order).toEqual(
expect.objectContaining({
@@ -260,11 +260,11 @@ moduleIntegrationTestRunner({
})
it("should update an order with selector successfully", async () => {
const createdOrder = await service.create({
const createdOrder = await service.createOrders({
currency_code: "eur",
})
const [updatedOrder] = await service.update(
const [updatedOrder] = await service.updateOrders(
{ id: createdOrder.id },
{
email: "test@email.com",
@@ -272,7 +272,7 @@ moduleIntegrationTestRunner({
}
)
const [order] = await service.list({ id: [createdOrder.id] })
const [order] = await service.listOrders({ id: [createdOrder.id] })
expect(order).toEqual(
expect.objectContaining({
@@ -285,17 +285,17 @@ moduleIntegrationTestRunner({
})
it("should update an order with id successfully", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
])
const updatedOrder = await service.update(createdOrder.id, {
const updatedOrder = await service.updateOrders(createdOrder.id, {
email: "test@email.com",
})
const [order] = await service.list({ id: [createdOrder.id] })
const [order] = await service.listOrders({ id: [createdOrder.id] })
expect(order).toEqual(
expect.objectContaining({
@@ -309,15 +309,15 @@ moduleIntegrationTestRunner({
describe("delete", () => {
it("should delete an order successfully", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
])
await service.delete([createdOrder.id])
await service.deleteOrders([createdOrder.id])
const orders = await service.list({ id: [createdOrder.id] })
const orders = await service.listOrders({ id: [createdOrder.id] })
expect(orders.length).toEqual(0)
})
@@ -385,7 +385,7 @@ moduleIntegrationTestRunner({
describe("createLineItems", () => {
it("should add a line item to order succesfully", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -399,7 +399,7 @@ moduleIntegrationTestRunner({
},
])
const order = await service.retrieve(createdOrder.id, {
const order = await service.retrieveOrder(createdOrder.id, {
relations: ["items.item"],
})
@@ -415,7 +415,7 @@ moduleIntegrationTestRunner({
})
it("should add multiple line items to order succesfully", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -438,7 +438,7 @@ moduleIntegrationTestRunner({
},
])
const order = await service.retrieve(createdOrder.id, {
const order = await service.retrieveOrder(createdOrder.id, {
relations: ["items.item"],
})
@@ -462,7 +462,7 @@ moduleIntegrationTestRunner({
})
it("should add multiple line items to multiple orders succesfully", async () => {
let [eurOrder, usdOrder] = await service.create([
let [eurOrder, usdOrder] = await service.createOrders([
{
currency_code: "eur",
status: OrderStatus.DRAFT,
@@ -488,7 +488,7 @@ moduleIntegrationTestRunner({
},
])
const orders = await service.list(
const orders = await service.listOrders(
{ id: [eurOrder.id, usdOrder.id] },
{ relations: ["items.item"] }
)
@@ -523,7 +523,7 @@ moduleIntegrationTestRunner({
})
it("should throw an error when required params are not passed adding to a single order", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -544,7 +544,7 @@ moduleIntegrationTestRunner({
})
it("should throw a generic error when required params are not passed using bulk add method", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -568,7 +568,7 @@ moduleIntegrationTestRunner({
describe("updateLineItems", () => {
it("should update a line item in order succesfully with selector approach", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -596,7 +596,7 @@ moduleIntegrationTestRunner({
})
it("should update a line item in order succesfully with id approach", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -621,7 +621,7 @@ moduleIntegrationTestRunner({
})
it("should update line items in orders succesfully with multi-selector approach", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -672,7 +672,7 @@ moduleIntegrationTestRunner({
},
])
const order = await service.retrieve(createdOrder.id, {
const order = await service.retrieveOrder(createdOrder.id, {
relations: ["items.item"],
})
@@ -696,7 +696,7 @@ moduleIntegrationTestRunner({
describe("deleteLineItems", () => {
it("should delete a line item succesfully", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -715,7 +715,7 @@ moduleIntegrationTestRunner({
await service.deleteLineItems([item.id])
const order = await service.retrieve(createdOrder.id, {
const order = await service.retrieveOrder(createdOrder.id, {
relations: ["items"],
})
@@ -723,7 +723,7 @@ moduleIntegrationTestRunner({
})
it("should delete multiple line items succesfully", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -744,7 +744,7 @@ moduleIntegrationTestRunner({
await service.deleteLineItems([item.id, item2.id])
const order = await service.retrieve(createdOrder.id, {
const order = await service.retrieveOrder(createdOrder.id, {
relations: ["items"],
})
@@ -754,7 +754,7 @@ moduleIntegrationTestRunner({
describe("createShippingMethods", () => {
it("should add a shipping method to order succesfully", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -770,7 +770,7 @@ moduleIntegrationTestRunner({
]
)
const order = await service.retrieve(createdOrder.id, {
const order = await service.retrieveOrder(createdOrder.id, {
relations: ["shipping_methods"],
})
@@ -778,13 +778,13 @@ moduleIntegrationTestRunner({
})
it("should add multiple shipping methods to multiple orders succesfully", async () => {
let [eurOrder] = await service.create([
let [eurOrder] = await service.createOrders([
{
currency_code: "eur",
},
])
let [usdOrder] = await service.create([
let [usdOrder] = await service.createOrders([
{
currency_code: "usd",
},
@@ -803,7 +803,7 @@ moduleIntegrationTestRunner({
},
])
const orders = await service.list(
const orders = await service.listOrders(
{ id: [eurOrder.id, usdOrder.id] },
{ relations: ["shipping_methods"] }
)
@@ -821,7 +821,7 @@ moduleIntegrationTestRunner({
describe("setLineItemAdjustments", () => {
it("should set line item adjustments for an order", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -876,7 +876,7 @@ moduleIntegrationTestRunner({
})
it("should replace line item adjustments for an order", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -919,7 +919,7 @@ moduleIntegrationTestRunner({
},
])
const order = await service.retrieve(createdOrder.id, {
const order = await service.retrieveOrder(createdOrder.id, {
relations: ["items.item.adjustments"],
})
@@ -944,7 +944,7 @@ moduleIntegrationTestRunner({
})
it("should delete all line item adjustments for an order", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -981,7 +981,7 @@ moduleIntegrationTestRunner({
await service.setLineItemAdjustments(createdOrder.id, [])
const order = await service.retrieve(createdOrder.id, {
const order = await service.retrieveOrder(createdOrder.id, {
relations: ["items.item.adjustments"],
})
@@ -999,7 +999,7 @@ moduleIntegrationTestRunner({
})
it("should update line item adjustments for an order", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -1043,7 +1043,7 @@ moduleIntegrationTestRunner({
},
])
const order = await service.retrieve(createdOrder.id, {
const order = await service.retrieveOrder(createdOrder.id, {
relations: ["items.item.adjustments"],
})
@@ -1071,7 +1071,7 @@ moduleIntegrationTestRunner({
describe("createLineItemAdjustments", () => {
it("should add line item adjustments for items in an order", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -1108,7 +1108,7 @@ moduleIntegrationTestRunner({
})
it("should add multiple line item adjustments for multiple line items", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -1162,7 +1162,7 @@ moduleIntegrationTestRunner({
})
it("should add line item adjustments for line items on multiple orders", async () => {
let [orderOne, orderTwo] = await service.create([
let [orderOne, orderTwo] = await service.createOrders([
{
currency_code: "eur",
},
@@ -1203,7 +1203,7 @@ moduleIntegrationTestRunner({
const [checkOrderOne, checkOrderTwo] = JSON.parse(
JSON.stringify(
await service.list({}, { relations: ["items.item.adjustments"] })
await service.listOrders({}, { relations: ["items.item.adjustments"] })
)
)
@@ -1241,7 +1241,7 @@ moduleIntegrationTestRunner({
describe("deleteLineItemAdjustments", () => {
it("should delete a line item succesfully", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -1277,7 +1277,7 @@ moduleIntegrationTestRunner({
})
it("should delete a line item succesfully with selector", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -1315,7 +1315,7 @@ moduleIntegrationTestRunner({
describe("setShippingMethodAdjustments", () => {
it("should set shipping method adjustments for an order", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -1374,7 +1374,7 @@ moduleIntegrationTestRunner({
})
it("should replace shipping method adjustments for an order", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -1419,7 +1419,7 @@ moduleIntegrationTestRunner({
},
])
const order = await service.retrieve(createdOrder.id, {
const order = await service.retrieveOrder(createdOrder.id, {
relations: ["shipping_methods.adjustments"],
})
@@ -1446,7 +1446,7 @@ moduleIntegrationTestRunner({
})
it("should delete all shipping method adjustments for an order", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -1485,7 +1485,7 @@ moduleIntegrationTestRunner({
await service.setShippingMethodAdjustments(createdOrder.id, [])
const order = await service.retrieve(createdOrder.id, {
const order = await service.retrieveOrder(createdOrder.id, {
relations: ["shipping_methods.adjustments"],
})
@@ -1503,7 +1503,7 @@ moduleIntegrationTestRunner({
})
it("should update shipping method adjustments for an order", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -1548,7 +1548,7 @@ moduleIntegrationTestRunner({
},
])
const order = await service.retrieve(createdOrder.id, {
const order = await service.retrieveOrder(createdOrder.id, {
relations: ["shipping_methods.adjustments"],
})
@@ -1576,7 +1576,7 @@ moduleIntegrationTestRunner({
describe("createShippingMethodAdjustments", () => {
it("should add shipping method adjustments in an order", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -1615,7 +1615,7 @@ moduleIntegrationTestRunner({
})
it("should add multiple shipping method adjustments for multiple shipping methods", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -1673,12 +1673,12 @@ moduleIntegrationTestRunner({
})
it("should add shipping method adjustments for shipping methods on multiple orders", async () => {
const [orderOne] = await service.create([
const [orderOne] = await service.createOrders([
{
currency_code: "eur",
},
])
const [orderTwo] = await service.create([
const [orderTwo] = await service.createOrders([
{
currency_code: "usd",
},
@@ -1718,12 +1718,12 @@ moduleIntegrationTestRunner({
},
])
const orderOneMethods = await service.listOrderShippingMethods(
const orderOneMethods = await (service as any).listOrderShippingMethods(
{ order_id: orderOne.id },
{ relations: ["shipping_method.adjustments"] }
)
const orderTwoMethods = await service.listOrderShippingMethods(
const orderTwoMethods = await (service as any).listOrderShippingMethods(
{ order_id: orderTwo.id },
{ relations: ["shipping_method.adjustments"] }
)
@@ -1761,13 +1761,13 @@ moduleIntegrationTestRunner({
})
it("should throw if shipping method is not associated with order", async () => {
const [orderOne] = await service.create([
const [orderOne] = await service.createOrders([
{
currency_code: "eur",
},
])
const [orderTwo] = await service.create([
const [orderTwo] = await service.createOrders([
{
currency_code: "eur",
},
@@ -1801,7 +1801,7 @@ moduleIntegrationTestRunner({
describe("deleteShippingMethodAdjustments", () => {
it("should delete a shipping method adjustment succesfully", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -1840,7 +1840,7 @@ moduleIntegrationTestRunner({
})
it("should delete a shipping method succesfully with selector", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -1883,7 +1883,7 @@ moduleIntegrationTestRunner({
describe("setLineItemTaxLines", () => {
it("should set line item tax lines for an order", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -1935,7 +1935,7 @@ moduleIntegrationTestRunner({
})
it("should replace line item tax lines for an order", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -1975,7 +1975,7 @@ moduleIntegrationTestRunner({
},
])
const order = await service.retrieve(createdOrder.id, {
const order = await service.retrieveOrder(createdOrder.id, {
relations: ["items.item.tax_lines"],
})
@@ -2000,7 +2000,7 @@ moduleIntegrationTestRunner({
})
it("should delete all line item tax lines for an order", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -2034,7 +2034,7 @@ moduleIntegrationTestRunner({
await service.setLineItemTaxLines(createdOrder.id, [])
const order = await service.retrieve(createdOrder.id, {
const order = await service.retrieveOrder(createdOrder.id, {
relations: ["items.item.tax_lines"],
})
@@ -2052,7 +2052,7 @@ moduleIntegrationTestRunner({
})
it("should update line item tax lines for an order", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -2093,7 +2093,7 @@ moduleIntegrationTestRunner({
},
])
const order = await service.retrieve(createdOrder.id, {
const order = await service.retrieveOrder(createdOrder.id, {
relations: ["items.item.tax_lines"],
})
@@ -2119,7 +2119,7 @@ moduleIntegrationTestRunner({
})
it("should delete, update, and create line item tax lines for an order", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -2179,7 +2179,7 @@ moduleIntegrationTestRunner({
// delete: should delete the initial tax line for itemOne
])
const order = await service.retrieve(createdOrder.id, {
const order = await service.retrieveOrder(createdOrder.id, {
relations: ["items.item.tax_lines"],
})
@@ -2212,7 +2212,7 @@ moduleIntegrationTestRunner({
describe("createLineItemAdjustments", () => {
it("should add line item tax lines for items in an order", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -2249,7 +2249,7 @@ moduleIntegrationTestRunner({
})
it("should add multiple line item tax lines for multiple line items", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -2303,12 +2303,12 @@ moduleIntegrationTestRunner({
})
it("should add line item tax lines for line items on multiple orders", async () => {
const [orderOne] = await service.create([
const [orderOne] = await service.createOrders([
{
currency_code: "eur",
},
])
const [orderTwo] = await service.create([
const [orderTwo] = await service.createOrders([
{
currency_code: "usd",
},
@@ -2346,7 +2346,7 @@ moduleIntegrationTestRunner({
const [checkOrderOne, checkOrderTwo] = JSON.parse(
JSON.stringify(
await service.list({}, { relations: ["items.item.tax_lines"] })
await service.listOrders({}, { relations: ["items.item.tax_lines"] })
)
)
@@ -2384,7 +2384,7 @@ moduleIntegrationTestRunner({
describe("deleteLineItemAdjustments", () => {
it("should delete line item tax line succesfully", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
@@ -2421,7 +2421,7 @@ moduleIntegrationTestRunner({
})
it("should delete line item tax lines succesfully with selector", async () => {
const [createdOrder] = await service.create([
const [createdOrder] = await service.createOrders([
{
currency_code: "eur",
},
packages/modules/order/integration-tests/__tests__/order-return.ts
+8 -8
View File
@@ -1,12 +1,12 @@
import { Modules } from "@medusajs/modules-sdk"
import { CreateOrderDTO, IOrderModuleService } from "@medusajs/types"
import { SuiteOptions, moduleIntegrationTestRunner } from "medusa-test-utils"
import { moduleIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(1000000)
moduleIntegrationTestRunner({
moduleIntegrationTestRunner<IOrderModuleService>({
moduleName: Modules.ORDER,
testSuite: ({ service }: SuiteOptions<IOrderModuleService>) => {
testSuite: ({ service }) => {
describe("Order Module Service - Return flows", () => {
const input = {
email: "foo@bar.com",
@@ -103,7 +103,7 @@ moduleIntegrationTestRunner({
} as CreateOrderDTO
it("should create an order, fulfill, ship and return the items and cancel some item return", async function () {
const createdOrder = await service.create(input)
const createdOrder = await service.createOrders(input)
// Fullfilment
await service.registerFulfillment({
@@ -116,7 +116,7 @@ moduleIntegrationTestRunner({
}),
})
let getOrder = await service.retrieve(createdOrder.id, {
let getOrder = await service.retrieveOrder(createdOrder.id, {
select: [
"id",
"version",
@@ -176,7 +176,7 @@ moduleIntegrationTestRunner({
}),
})
getOrder = await service.retrieve(createdOrder.id, {
getOrder = await service.retrieveOrder(createdOrder.id, {
select: [
"id",
"version",
@@ -269,7 +269,7 @@ moduleIntegrationTestRunner({
],
})
getOrder = await service.retrieve(createdOrder.id, {
getOrder = await service.retrieveOrder(createdOrder.id, {
select: [
"id",
"version",
@@ -421,7 +421,7 @@ moduleIntegrationTestRunner({
})
)
getOrder = await service.retrieve(createdOrder.id, {
getOrder = await service.retrieveOrder(createdOrder.id, {
select: [
"id",
"version",
packages/modules/order/integration-tests/__tests__/returns.ts
+3 -3
View File
@@ -1,12 +1,12 @@
import { Modules } from "@medusajs/modules-sdk"
import { IOrderModuleService } from "@medusajs/types"
import { SuiteOptions, moduleIntegrationTestRunner } from "medusa-test-utils"
import { moduleIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(100000)
moduleIntegrationTestRunner({
moduleIntegrationTestRunner<IOrderModuleService>({
moduleName: Modules.ORDER,
testSuite: ({ service }: SuiteOptions<IOrderModuleService>) => {
testSuite: ({ service }) => {
describe("Order Module Service - Returns", () => {
it("should create return reasons", async function () {
const reason = await service.createReturnReasons({