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

packages/inventory/src/services/inventory-item.ts

@@ -1,11 +1,11 @@
-import { DeepPartial, EntityManager } from "typeorm"
+import { DeepPartial, EntityManager, FindManyOptions } from "typeorm"
 import { isDefined, MedusaError } from "medusa-core-utils"
 import {
-  FindConfig,
   buildQuery,
-  IEventBusService,
-  FilterableInventoryItemProps,
   CreateInventoryItemInput,
+  FilterableInventoryItemProps,
+  FindConfig,
+  IEventBusService,
   InventoryItemDTO,
   TransactionBaseService,
 } from "@medusajs/medusa"
@@ -87,7 +87,7 @@ export default class InventoryItemService extends TransactionBaseService {
     const manager = this.getManager()
     const itemRepository = manager.getRepository(InventoryItem)
 
-    const query = buildQuery({ id: inventoryItemId }, config)
+    const query = buildQuery({ id: inventoryItemId }, config) as FindManyOptions
     const [inventoryItem] = await itemRepository.find(query)
 
     if (!inventoryItem) {

packages/inventory/src/services/inventory-level.ts

@@ -1,10 +1,10 @@
-import { DeepPartial, EntityManager } from "typeorm"
+import { DeepPartial, EntityManager, FindManyOptions } from "typeorm"
 import { isDefined, MedusaError } from "medusa-core-utils"
 import {
-  FindConfig,
   buildQuery,
-  FilterableInventoryLevelProps,
   CreateInventoryLevelInput,
+  FilterableInventoryLevelProps,
+  FindConfig,
   IEventBusService,
   TransactionBaseService,
 } from "@medusajs/medusa"
@@ -52,7 +52,7 @@ export default class InventoryLevelService extends TransactionBaseService {
     const manager = this.getManager()
     const levelRepository = manager.getRepository(InventoryLevel)
 
-    const query = buildQuery(selector, config)
+    const query = buildQuery(selector, config) as FindManyOptions
     return await levelRepository.find(query)
   }
 
@@ -69,7 +69,7 @@ export default class InventoryLevelService extends TransactionBaseService {
     const manager = this.getManager()
     const levelRepository = manager.getRepository(InventoryLevel)
 
-    const query = buildQuery(selector, config)
+    const query = buildQuery(selector, config) as FindManyOptions
     return await levelRepository.findAndCount(query)
   }
 
@@ -94,7 +94,7 @@ export default class InventoryLevelService extends TransactionBaseService {
     const manager = this.getManager()
     const levelRepository = manager.getRepository(InventoryLevel)
 
-    const query = buildQuery({ id: inventoryLevelId }, config)
+    const query = buildQuery({ id: inventoryLevelId }, config) as FindManyOptions
     const [inventoryLevel] = await levelRepository.find(query)
 
     if (!inventoryLevel) {

packages/inventory/src/services/reservation-item.ts

@@ -1,4 +1,4 @@
-import { EntityManager } from "typeorm"
+import { EntityManager, FindManyOptions } from "typeorm"
 import { isDefined, MedusaError } from "medusa-core-utils"
 import {
   FindConfig,
@@ -62,7 +62,7 @@ export default class ReservationItemService extends TransactionBaseService {
     const manager = this.getManager()
     const itemRepository = manager.getRepository(ReservationItem)
 
-    const query = buildQuery(selector, config)
+    const query = buildQuery(selector, config) as FindManyOptions
     return await itemRepository.find(query)
   }
 
@@ -79,7 +79,7 @@ export default class ReservationItemService extends TransactionBaseService {
     const manager = this.getManager()
     const itemRepository = manager.getRepository(ReservationItem)
 
-    const query = buildQuery(selector, config)
+    const query = buildQuery(selector, config) as FindManyOptions
     return await itemRepository.findAndCount(query)
   }
 
@@ -104,7 +104,7 @@ export default class ReservationItemService extends TransactionBaseService {
     const manager = this.getManager()
     const reservationItemRepository = manager.getRepository(ReservationItem)
 
-    const query = buildQuery({ id: reservationItemId }, config)
+    const query = buildQuery({ id: reservationItemId }, config) as FindManyOptions
     const [reservationItem] = await reservationItemRepository.find(query)
 
     if (!reservationItem) {

packages/inventory/src/utils/query.ts

@@ -1,6 +1,8 @@
-import { EntityManager, ILike } from "typeorm"
+import { EntityManager, FindOptionsWhere, ILike } from "typeorm"
 import {
+  buildLegacyFieldsListFrom,
   buildQuery,
+  ExtendedFindConfig,
   FilterableInventoryItemProps,
   FindConfig,
 } from "@medusajs/medusa"
@@ -12,14 +14,19 @@ export function getListQuery(
   config: FindConfig<InventoryItem> = { relations: [], skip: 0, take: 10 }
 ) {
   const inventoryItemRepository = manager.getRepository(InventoryItem)
-  const query = buildQuery(selector, config)
+
+  const { q, ...selectorRest } = selector
+  const query = buildQuery(selectorRest, config) as ExtendedFindConfig<InventoryItem> & {
+    where: FindOptionsWhere<InventoryItem & {
+      location_id?: string
+    }>
+  }
+
 
   const queryBuilder = inventoryItemRepository.createQueryBuilder("inv_item")
 
-  if (query.where.q) {
-    query.where.sku = ILike(`%${query.where.q as string}%`)
-
-    delete query.where.q
+  if (q) {
+    query.where.sku = ILike(`%${q}%`)
   }
 
   if ("location_id" in query.where) {
@@ -50,7 +57,8 @@ export function getListQuery(
   }
 
   if (query.select) {
-    queryBuilder.select(query.select.map((s) => "inv_item." + s))
+    const legacySelect = buildLegacyFieldsListFrom(query.select)
+    queryBuilder.select(legacySelect.map((s) => "inv_item." + s))
   }
 
   if (query.order) {