diff --git a/.changeset/flat-swans-pay.md b/.changeset/flat-swans-pay.md new file mode 100644 index 0000000000..c0fda279c4 --- /dev/null +++ b/.changeset/flat-swans-pay.md @@ -0,0 +1,5 @@ +--- +"@medusajs/medusa": patch +--- + +fix(medusa): Only add SC relation when enabled diff --git a/packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js b/packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js index 996cd1684d..0145ffa4a4 100644 --- a/packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js +++ b/packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js @@ -30,20 +30,24 @@ describe("GET /admin/orders", () => { expect(OrderServiceMock.retrieveWithTotals).toHaveBeenCalledWith( IdMap.getId("test-order"), { - select: defaultAdminOrdersFields.filter((field) => { - return ![ - "shipping_total", - "discount_total", - "tax_total", - "refunded_total", - "total", - "subtotal", - "refundable_amount", - "gift_card_total", - "gift_card_tax_total", - ].includes(field) - }), - relations: [...defaultAdminOrdersRelations], + // TODO [MEDUSA_FF_SALES_CHANNELS]: Remove when sales channel flag is removed entirely + select: [...defaultAdminOrdersFields, "sales_channel_id"].filter( + (field) => { + return ![ + "shipping_total", + "discount_total", + "tax_total", + "refunded_total", + "total", + "subtotal", + "refundable_amount", + "gift_card_total", + "gift_card_tax_total", + ].includes(field) + } + ), + // TODO [MEDUSA_FF_SALES_CHANNELS]: Remove when sales channel flag is removed entirely + relations: [...defaultAdminOrdersRelations, "sales_channel"], } ) }) diff --git a/packages/medusa/src/api/routes/admin/orders/index.ts b/packages/medusa/src/api/routes/admin/orders/index.ts index bd85cb273a..7ba42e6629 100644 --- a/packages/medusa/src/api/routes/admin/orders/index.ts +++ b/packages/medusa/src/api/routes/admin/orders/index.ts @@ -1,11 +1,8 @@ import { Router } from "express" import "reflect-metadata" import { Order } from "../../../.." -import { - DeleteResponse, - FindParams, - PaginatedResponse, -} from "../../../../types/common" +import SalesChannelFeatureFlag from "../../../../loaders/feature-flags/sales-channels" +import { FindParams, PaginatedResponse } from "../../../../types/common" import { FlagRouter } from "../../../../utils/flag-router" import middlewares, { transformBody, @@ -22,6 +19,12 @@ export default (app, featureFlagRouter: FlagRouter) => { app.use("/orders", route) const relations = [...defaultAdminOrdersRelations] + const defaultFields = [...defaultAdminOrdersFields] + + if (featureFlagRouter.isFeatureEnabled(SalesChannelFeatureFlag.key)) { + relations.push("sales_channel") + defaultFields.push("sales_channel_id") + } /** * List orders @@ -43,7 +46,7 @@ export default (app, featureFlagRouter: FlagRouter) => { "/:id", transformQuery(FindParams, { defaultRelations: relations, - defaultFields: defaultAdminOrdersFields.filter((field) => { + defaultFields: defaultFields.filter((field) => { return ![ "shipping_total", "discount_total", @@ -333,7 +336,6 @@ export const defaultAdminOrdersRelations = [ "swaps.additional_items", "swaps.fulfillments", "swaps.fulfillments.tracking_links", - "sales_channel", ] export const defaultAdminOrdersFields = [ @@ -345,7 +347,6 @@ export const defaultAdminOrdersFields = [ "cart_id", "draft_order_id", "customer_id", - "sales_channel_id", "email", "region_id", "currency_code", @@ -379,7 +380,6 @@ export const filterableAdminOrdersFields = [ "customer_id", "email", "region_id", - "sales_channel_id", "currency_code", "tax_rate", "canceled_at",