fix(medusa, utils): fix the way selects are consumed alongside the relations

.changeset/great-panthers-call.md

@@ -0,0 +1,12 @@
+---
+"@medusajs/medusa": patch
+"@medusajs/admin-ui": patch
+"@medusajs/admin": patch
+"medusa-plugin-brightpearl": patch
+"medusa-plugin-segment": patch
+"medusa-plugin-sendgrid": patch
+"medusa-plugin-slack-notification": patch
+"@medusajs/utils": patch
+---
+
+fix(medusa, utils): fix the way selects are consumed alongside the relations

integration-tests/api/__tests__/batch-jobs/order/export.js

@@ -109,8 +109,6 @@ describe("Batchjob with type order-export", () => {
 
     expect(batchJob.status).toBe("completed")
 
-    expect(batchJob.status).toBe("completed")
-
     exportFilePath = path.resolve(__dirname, batchJob.result.file_key)
     const isFileExists = (await fs.stat(exportFilePath)).isFile()
 

integration-tests/api/__tests__/batch-jobs/product/export.js

@@ -60,6 +60,7 @@ describe("Batch job of product-export type", () => {
     const db = useDb()
     await db.teardown()
 
+    // @ts-ignore
     try {
       const isFileExists = (await fs.stat(exportFilePath))?.isFile()
 
@@ -74,8 +75,8 @@ describe("Batch job of product-export type", () => {
 
         await fs.unlink(exportFilePath)
       }
-    } catch (e) {
-      console.log(e)
+    } catch (err) {
+      // noop
     }
   })
 

integration-tests/api/__tests__/database/index.js

@@ -40,7 +40,7 @@ describe("Database options", () => {
 
         // Idle time is 1000 ms so this should timeout
         await new Promise((resolve) =>
-          setTimeout(() => resolve(console.log("")), 2000)
+          setTimeout(() => resolve(undefined), 2000)
         )
 
         // This query should fail with a QueryRunnerAlreadyReleasedError

integration-tests/api/__tests__/store/customer.js

@@ -293,16 +293,19 @@ describe("/store/customers", () => {
         })
 
       expect(response.status).toEqual(200)
-      expect(response.data.orders).toEqual([
-        expect.objectContaining({
-          display_id: 3,
-          status: "canceled",
-        }),
-        expect.objectContaining({
-          display_id: 1,
-          status: "completed",
-        }),
-      ])
+      expect(response.data.orders.length).toEqual(2)
+      expect(response.data.orders).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            display_id: 3,
+            status: "canceled",
+          }),
+          expect.objectContaining({
+            display_id: 1,
+            status: "completed",
+          }),
+        ])
+      )
       expect(response.data.orders.length).toEqual(2)
     })
   })

integration-tests/api/__tests__/store/products.js

@@ -10,6 +10,10 @@ const {
 
 const productSeeder = require("../../helpers/store-product-seeder")
 const adminSeeder = require("../../helpers/admin-seeder")
+const {
+  allowedStoreProductsFields,
+  defaultStoreProductsRelations,
+} = require("@medusajs/medusa/dist")
 
 jest.setTimeout(30000)
 
@@ -988,23 +992,28 @@ describe("/store/products", () => {
     it("response contains only fields defined with `fields` param", async () => {
       const api = useApi()
 
+      const fields = allowedStoreProductsFields
+
       const response = await api.get(
-        "/store/products/test-product?fields=handle"
+        `/store/products/test-product?fields=${fields.join(",")}`
       )
 
       expect(response.status).toEqual(200)
 
-      expect(Object.keys(response.data.product)).toEqual([
-        // fields
-        "handle",
-        // relations
-        "variants",
-        "options",
-        "images",
-        "tags",
-        "collection",
-        "type",
-      ])
+      const expectedProperties = [...fields, ...defaultStoreProductsRelations]
+      const actualProperties = [
+        ...Object.keys(response.data.product),
+        ...Object.keys(response.data.product.variants[0]).map(
+          (key) => `variants.${key}`
+        ),
+        "variants.prices.amount",
+        "options.values",
+      ]
+
+      expect(Object.keys(response.data.product).length).toEqual(31)
+      expect(actualProperties).toEqual(
+        expect.arrayContaining(expectedProperties)
+      )
     })
   })
 })

integration-tests/plugins/__tests__/inventory/order/order.js

@@ -5,7 +5,6 @@ const { initDb, useDb } = require("../../../../helpers/use-db")
 const { setPort, useApi } = require("../../../../helpers/use-api")
 
 const adminSeeder = require("../../../helpers/admin-seeder")
-const cartSeeder = require("../../../helpers/cart-seeder")
 const {
   simpleProductFactory,
   simpleCustomerFactory,

packages/admin-ui/ui/src/domain/orders/details/utils/use-admin-expand-paramter.ts

@@ -7,6 +7,7 @@ const orderRelations = [
   "discounts",
   "discounts.rule",
   "shipping_methods",
+  "shipping_methods.shipping_option",
   "payments",
   "items",
   "fulfillments",

packages/medusa-plugin-brightpearl/src/services/brightpearl.js

@@ -1,8 +1,5 @@
-import { MedusaError, humanizeAmount } from "medusa-core-utils"
-import {
-  ReservationType,
-  updateInventoryAndReservations,
-} from "@medusajs/medusa"
+import { humanizeAmount, MedusaError } from "medusa-core-utils"
+import { updateInventoryAndReservations } from "@medusajs/medusa"
 
 import { BaseService } from "medusa-interfaces"
 import Brightpearl from "../utils/brightpearl"
@@ -111,7 +108,7 @@ class BrightpearlService extends BaseService {
         httpMethod: "POST",
         uriTemplate: `${this.options.backend_url}/brightpearl/goods-out`,
         bodyTemplate:
-          "{\"account\": \"${account-code}\", \"lifecycle_event\": \"${lifecycle-event}\", \"resource_type\": \"${resource-type}\", \"id\": \"${resource-id}\" }",
+          '{"account": "${account-code}", "lifecycle_event": "${lifecycle-event}", "resource_type": "${resource-type}", "id": "${resource-id}" }',
         contentType: "application/json",
         idSetAccepted: false,
       },
@@ -1008,6 +1005,7 @@ class BrightpearlService extends BaseService {
         "shipping_address",
         "billing_address",
         "shipping_methods",
+        "shipping_methods.shipping_option",
         "payments",
         "sales_channel",
       ],

packages/medusa-plugin-brightpearl/src/subscribers/order.js

@@ -102,6 +102,7 @@ class OrderSubscriber {
         "additional_items.tax_lines",
         "shipping_address",
         "shipping_methods",
+        "shipping_methods.shipping_option",
         "shipping_methods.tax_lines",
       ],
     })
@@ -148,6 +149,7 @@ class OrderSubscriber {
         "additional_items.variant.product",
         "additional_items.tax_lines",
         "shipping_address",
+        "shipping_methods.shipping_option",
         "shipping_methods",
       ],
     })

packages/medusa-plugin-segment/src/subscribers/order.js

@@ -46,6 +46,7 @@ class OrderSubscriber {
             "discounts",
             "discounts.rule",
             "shipping_methods",
+            "shipping_methods.shipping_option",
             "payments",
             "fulfillments",
             "returns",
@@ -56,6 +57,7 @@ class OrderSubscriber {
             "swaps.return_order",
             "swaps.payment",
             "swaps.shipping_methods",
+            "swaps.shipping_methods.shipping_option",
             "swaps.shipping_address",
             "swaps.additional_items",
             "swaps.fulfillments",
@@ -149,6 +151,7 @@ class OrderSubscriber {
             "discounts",
             "discounts.rule",
             "shipping_methods",
+            "shipping_methods.shipping_option",
             "payments",
             "fulfillments",
             "returns",
@@ -159,6 +162,7 @@ class OrderSubscriber {
             "swaps.return_order",
             "swaps.payment",
             "swaps.shipping_methods",
+            "swaps.shipping_methods.shipping_option",
             "swaps.shipping_address",
             "swaps.additional_items",
             "swaps.fulfillments",
@@ -257,6 +261,7 @@ class OrderSubscriber {
           "discounts",
           "discounts.rule",
           "shipping_methods",
+          "shipping_methods.shipping_option",
           "payments",
           "fulfillments",
           "items",
@@ -267,6 +272,7 @@ class OrderSubscriber {
           "swaps.return_order",
           "swaps.payment",
           "swaps.shipping_methods",
+          "swaps.shipping_methods.shipping_option",
           "swaps.shipping_address",
           "swaps.additional_items",
           "swaps.fulfillments",

packages/medusa-plugin-sendgrid/src/services/sendgrid.js

@@ -850,7 +850,9 @@ class SendGridService extends NotificationService {
   }
 
   async swapCreatedData({ id }) {
-    const store = await this.storeService_.retrieve({ where: { id: Not(IsNull()) } })
+    const store = await this.storeService_.retrieve({
+      where: { id: Not(IsNull()) },
+    })
     const swap = await this.swapService_.retrieve(id, {
       relations: [
         "additional_items",
@@ -913,7 +915,7 @@ class SendGridService extends NotificationService {
         "shipping_total",
         "subtotal",
       ],
-      relations: ["items", "items.variant", "items.variant.product"]
+      relations: ["items", "items.variant", "items.variant.product"],
     })
     const currencyCode = order.currency_code.toUpperCase()
 
@@ -993,6 +995,7 @@ class SendGridService extends NotificationService {
       relations: [
         "shipping_address",
         "shipping_methods",
+        "shipping_methods.shipping_option",
         "shipping_methods.tax_lines",
         "additional_items",
         "additional_items.variant",
@@ -1028,11 +1031,7 @@ class SendGridService extends NotificationService {
         "shipping_total",
         "subtotal",
       ],
-      relations: [
-        "items",
-        "items.variant",
-        "items.variant.product",
-      ]
+      relations: ["items", "items.variant", "items.variant.product"],
     })
 
     const returnRequest = swap.return_order
@@ -1152,7 +1151,7 @@ class SendGridService extends NotificationService {
         "order.items",
         "order.items.variant",
         "order.items.variant.product",
-        "order.shipping_address"
+        "order.shipping_address",
       ],
     })
 

packages/medusa-plugin-slack-notification/src/services/slack.js

@@ -42,6 +42,7 @@ class SlackService extends BaseService {
         "discounts",
         "discounts.rule",
         "shipping_methods",
+        "shipping_methods.shipping_option",
         "payments",
         "fulfillments",
         "returns",
@@ -51,6 +52,7 @@ class SlackService extends BaseService {
         "swaps.return_order",
         "swaps.payment",
         "swaps.shipping_methods",
+        "swaps.shipping_methods.shipping_option",
         "swaps.shipping_address",
         "swaps.additional_items",
         "swaps.fulfillments",

packages/medusa/src/api/routes/admin/swaps/__tests__/get-swap.js

@@ -15,6 +15,7 @@ const defaultRelations = [
   "return_order",
   "shipping_address",
   "shipping_methods",
+  "shipping_methods.shipping_option",
 ]
 
 const defaultFields = [

packages/medusa/src/api/routes/admin/swaps/index.ts

@@ -34,6 +34,7 @@ export const defaultAdminSwapRelations = [
   "return_order",
   "shipping_address",
   "shipping_methods",
+  "shipping_methods.shipping_option",
 ]
 
 export const defaultAdminSwapFields = [

packages/medusa/src/api/routes/store/orders/index.ts

@@ -83,6 +83,7 @@ export const defaultStoreOrdersRelations = [
   "items",
   "items.variant",
   "shipping_methods",
+  "shipping_methods.shipping_option",
   "discounts",
   "discounts.rule",
   "customer",

packages/medusa/src/api/routes/store/products/index.ts

@@ -104,9 +104,7 @@ export const allowedStoreProductsFields = [
 
 export const allowedStoreProductsRelations = [
   ...defaultStoreProductsRelations,
-  "variants.title",
   "variants.inventory_items",
-  "variants.prices.amount",
   "sales_channels",
 ]
 

packages/medusa/src/api/routes/store/swaps/index.ts

@@ -24,10 +24,12 @@ export const defaultStoreSwapRelations = [
   "additional_items.variant",
   "return_order",
   "return_order.shipping_method",
+  "return_order.shipping_method.shipping_option",
   "fulfillments",
   "payment",
   "shipping_address",
   "shipping_methods",
+  "shipping_methods.shipping_option",
   "cart",
 ]
 export const defaultStoreSwapFields: FindConfig<Swap>["select"] = [

packages/medusa/src/models/shipping-method.ts

@@ -76,7 +76,7 @@ export class ShippingMethod {
   @JoinColumn({ name: "return_id" })
   return_order: Return
 
-  @ManyToOne(() => ShippingOption, { eager: true })
+  @ManyToOne(() => ShippingOption)
   @JoinColumn({ name: "shipping_option_id" })
   shipping_option: ShippingOption