chore(medusa): Typeorm upgrade to 0.3.11 (#3041)

packages/medusa/src/api/routes/admin/inventory-items/utils/join-variants.ts

@@ -18,9 +18,14 @@ export const getVariantsByInventoryItemId = async (
     inventoryItems.map((item) => item.id)
   )
 
-  const variants = await productVariantService.list({
-    id: variantInventory.map((varInventory) => varInventory.variant_id),
-  })
+  const variants = await productVariantService.list(
+    {
+      id: variantInventory.map((varInventory) => varInventory.variant_id),
+    },
+    {
+      relations: ["product"],
+    }
+  )
   const variantMap = new Map(variants.map((variant) => [variant.id, variant]))
 
   return variantInventory.reduce((acc, cur) => {

packages/medusa/src/api/routes/admin/orders/create-swap.ts

@@ -142,9 +142,11 @@ export default async (req, res) => {
                     relations: [
                       "cart",
                       "items",
+                      "items.variant",
                       "items.tax_lines",
                       "swaps",
                       "swaps.additional_items",
+                      "swaps.additional_items.variant",
                       "swaps.additional_items.tax_lines",
                     ],
                   })

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

@@ -319,6 +319,7 @@ export const defaultAdminOrdersRelations = [
   "claims.shipping_methods",
   "claims.shipping_address",
   "claims.additional_items",
+  "claims.additional_items.variant",
   "claims.fulfillments",
   "claims.fulfillments.tracking_links",
   "claims.claim_items",
@@ -334,6 +335,7 @@ export const defaultAdminOrdersRelations = [
   "swaps.shipping_methods.tax_lines",
   "swaps.shipping_address",
   "swaps.additional_items",
+  "swaps.additional_items.variant",
   "swaps.fulfillments",
   "swaps.fulfillments.tracking_links",
 ]

packages/medusa/src/api/routes/admin/shipping-options/index.ts

@@ -33,7 +33,7 @@ export default (app, featureFlagRouter: FlagRouter) => {
   return app
 }
 
-export const defaultFields = [
+export const defaultFields: (keyof ShippingOption)[] = [
   "id",
   "name",
   "region_id",

packages/medusa/src/api/routes/admin/shipping-options/update-shipping-option.ts

@@ -14,6 +14,8 @@ import { EntityManager } from "typeorm"
 import TaxInclusivePricingFeatureFlag from "../../../../loaders/feature-flags/tax-inclusive-pricing"
 import { FeatureFlagDecorators } from "../../../../utils/feature-flag-decorators"
 import { validator } from "../../../../utils/validator"
+import { ShippingOptionService } from "../../../../services"
+import { UpdateShippingOptionInput } from "../../../../types/shipping-options"
 
 /**
  * @oas [post] /shipping-options/{id}
@@ -92,9 +94,14 @@ import { validator } from "../../../../utils/validator"
 export default async (req, res) => {
   const { option_id } = req.params
 
-  const validated = await validator(AdminPostShippingOptionsOptionReq, req.body)
+  const validated = (await validator(
+    AdminPostShippingOptionsOptionReq,
+    req.body
+  )) as UpdateShippingOptionInput
 
-  const optionService = req.scope.resolve("shippingOptionService")
+  const optionService: ShippingOptionService = req.scope.resolve(
+    "shippingOptionService"
+  )
 
   const manager: EntityManager = req.scope.resolve("manager")
   await manager.transaction(async (transactionManager) => {

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

@@ -13,6 +13,7 @@ const defaultRelations = [
   "shipping_methods",
   "cart",
   "cart.items",
+  "cart.items.variant",
   "cart.items.adjustments",
 ]
 

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

@@ -32,6 +32,7 @@ export const defaultAdminSwapRelations = [
   "shipping_methods",
   "cart",
   "cart.items",
+  "cart.items.variant",
   "cart.items.adjustments",
 ]
 

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

@@ -57,6 +57,8 @@ export const defaultAdminVariantFields: (keyof ProductVariant)[] = [
   "created_at",
   "updated_at",
   "metadata",
+  "deleted_at",
+  "manage_inventory",
 ]
 
 /**

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

@@ -143,6 +143,7 @@ export const defaultStoreCartRelations = [
   "gift_cards",
   "region",
   "items",
+  "items.variant",
   "items.adjustments",
   "payment",
   "shipping_address",

packages/medusa/src/api/routes/store/carts/update-line-item.ts

@@ -78,7 +78,7 @@ export default async (req, res) => {
     } else {
       const cart = await cartService
         .withTransaction(m)
-        .retrieve(id, { relations: ["items"] })
+        .retrieve(id, { relations: ["items", "items.variant"] })
 
       const existing = cart.items.find((i) => i.id === line_id)
       if (!existing) {

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

@@ -75,7 +75,6 @@ export const defaultStoreOrdersRelations = [
   "fulfillments.tracking_links",
   "items",
   "items.variant",
-  "items.variant.product",
   "shipping_methods",
   "discounts",
   "discounts.rule",

packages/medusa/src/api/routes/store/swaps/create-swap.ts

@@ -140,9 +140,11 @@ export default async (req, res) => {
                     select: ["refunded_total", "total"],
                     relations: [
                       "items",
+                      "items.variant",
                       "items.tax_lines",
                       "swaps",
                       "swaps.additional_items",
+                      "swaps.additional_items.variant",
                       "swaps.additional_items.tax_lines",
                     ],
                   })

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

@@ -21,6 +21,7 @@ export default (app) => {
 export const defaultStoreSwapRelations = [
   "order",
   "additional_items",
+  "additional_items.variant",
   "return_order",
   "return_order.shipping_method",
   "fulfillments",

packages/medusa/src/api/routes/store/variants/__tests__/get-variant.js

@@ -15,7 +15,7 @@ describe("Get variant by id", () => {
     it("calls get variant from variantSerice", () => {
       expect(ProductVariantServiceMock.retrieve).toHaveBeenCalledTimes(1)
       expect(ProductVariantServiceMock.retrieve).toHaveBeenCalledWith("1", {
-        relations: ["prices", "options"],
+        relations: ["prices", "options", "product"],
       })
     })
 

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

@@ -27,7 +27,7 @@ export default (app) => {
   return app
 }
 
-export const defaultStoreVariantRelations = ["prices", "options"]
+export const defaultStoreVariantRelations = ["prices", "options", "product"]
 
 /**
  * @schema StoreVariantsRes