Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 63 additions & 0 deletions integration-tests/http/__tests__/order/admin/order.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,69 @@ medusaIntegrationTestRunner({
expect(response.data.orders).toHaveLength(0)
Comment thread
juanzgc marked this conversation as resolved.
expect(response.data.orders).toEqual([])
})

it("should search orders by shipping address", async () => {
Comment thread
juanzgc marked this conversation as resolved.
let response = await api.get(`/admin/orders?fields=+shipping_address.address_1,+shipping_address.address_2`, adminHeaders)

expect(response.data.orders).toHaveLength(1)
expect(response.data.orders).toEqual([
expect.objectContaining({
id: order.id,
}),
])

response = await api.get(`/admin/orders?fields=+shipping_address.address_1,+shipping_address.address_2&q=${order.shipping_address.address_1}`, adminHeaders)

expect(response.data.orders).toHaveLength(1)
expect(response.data.orders).toEqual([
expect.objectContaining({
id: order.id,
}),
])

response = await api.get(`/admin/orders?q=${order.shipping_address.address_2}`, adminHeaders)

expect(response.data.orders).toHaveLength(1)
expect(response.data.orders).toEqual([
expect.objectContaining({
id: order.id,
}),
])

response = await api.get(`/admin/orders?q=does-not-exist`, adminHeaders)

expect(response.data.orders).toHaveLength(0)
expect(response.data.orders).toEqual([])
})

it("should search orders by billing address", async () => {
let response = await api.get(`/admin/orders?fields=+billing_address.address_1,+billing_address.address_2`, adminHeaders)

expect(response.data.orders).toHaveLength(1)
expect(response.data.orders).toEqual([
expect.objectContaining({
id: order.id,
}),
])

response = await api.get(`/admin/orders?fields=+billing_address.address_1,+billing_address.address_2&q=${order.billing_address.address_1}`, adminHeaders)

expect(response.data.orders).toHaveLength(1)
expect(response.data.orders).toEqual([
expect.objectContaining({
id: order.id,
}),
])

response = await api.get(`/admin/orders?q=${order.billing_address.address_2}`, adminHeaders)

expect(response.data.orders).toHaveLength(1)
expect(response.data.orders).toEqual([
expect.objectContaining({
id: order.id,
}),
])
})
})

describe("POST /orders/:id", () => {
Expand Down
2 changes: 2 additions & 0 deletions packages/modules/order/src/models/order.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@ const _Order = model
mappedBy: undefined,
foreignKey: true,
})
.searchable()
.nullable(),
billing_address: model
.hasOne<any>(() => OrderAddress, {
mappedBy: undefined,
foreignKey: true,
})
.searchable()
.nullable(),
summary: model.hasMany<any>(() => OrderSummary, {
mappedBy: "order",
Expand Down