fix(medusa): Fix hanging inventory item migration script (#3624)

.changeset/serious-geckos-change.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+fix(medusa): Fix hanging inventory item migration script 

packages/medusa/src/scripts/migrate-inventory-items.ts

@@ -1,15 +1,16 @@
-import { AwilixContainer } from "awilix"
-import dotenv from "dotenv"
-import express from "express"
-
 import { IInventoryService, IStockLocationService } from "@medusajs/types"
-import loaders from "../loaders"
-import { ProductVariant } from "../models"
 import {
   ProductVariantInventoryService,
   ProductVariantService,
 } from "../services"
 
+import { AwilixContainer } from "awilix"
+import { EntityManager } from "typeorm"
+import { ProductVariant } from "../models"
+import dotenv from "dotenv"
+import express from "express"
+import loaders from "../loaders"
+
 dotenv.config()
 
 const BATCH_SIZE = 100
@@ -17,10 +18,24 @@ const BATCH_SIZE = 100
 const migrateProductVariant = async (
   variant: ProductVariant,
   locationId: string,
-  { container }: { container: AwilixContainer }
+  {
+    container,
+    transactionManager,
+  }: { container: AwilixContainer; transactionManager: EntityManager }
 ) => {
   const productVariantInventoryService: ProductVariantInventoryService =
     container.resolve("productVariantInventoryService")
+
+  const productVariantInventoryServiceTx =
+    productVariantInventoryService.withTransaction(transactionManager)
+
+  const existingVariantInventoryItems =
+    await productVariantInventoryServiceTx.listByVariant(variant.id)
+
+  if (existingVariantInventoryItems.length) {
+    return
+  }
+
   const inventoryService: IInventoryService =
     container.resolve("inventoryService")
 
@@ -28,31 +43,38 @@ const migrateProductVariant = async (
     return
   }
 
-  const inventoryItem = await inventoryService.createInventoryItem({
-    sku: variant.sku,
-    material: variant.material,
-    width: variant.width,
-    length: variant.length,
-    height: variant.height,
-    weight: variant.weight,
-    origin_country: variant.origin_country,
-    hs_code: variant.hs_code,
-    mid_code: variant.mid_code,
-    requires_shipping: true,
-  })
+  const context = { transactionManager }
+  const inventoryItem = await inventoryService.createInventoryItem(
+    {
+      sku: variant.sku,
+      material: variant.material,
+      width: variant.width,
+      length: variant.length,
+      height: variant.height,
+      weight: variant.weight,
+      origin_country: variant.origin_country,
+      hs_code: variant.hs_code,
+      mid_code: variant.mid_code,
+      requires_shipping: true,
+    },
+    context
+  )
 
-  await productVariantInventoryService.attachInventoryItem(
+  await productVariantInventoryServiceTx.attachInventoryItem(
     variant.id,
     inventoryItem.id,
     1
   )
 
-  await inventoryService.createInventoryLevel({
-    location_id: locationId,
-    inventory_item_id: inventoryItem.id,
-    stocked_quantity: variant.inventory_quantity,
-    incoming_quantity: 0,
-  })
+  await inventoryService.createInventoryLevel(
+    {
+      location_id: locationId,
+      inventory_item_id: inventoryItem.id,
+      stocked_quantity: variant.inventory_quantity,
+      incoming_quantity: 0,
+    },
+    context
+  )
 }
 
 const migrateStockLocation = async (container: AwilixContainer) => {
@@ -75,11 +97,17 @@ const processBatch = async (
   locationId: string,
   container: AwilixContainer
 ) => {
-  await Promise.all(
-    variants.map(async (variant) => {
-      await migrateProductVariant(variant, locationId, { container })
-    })
-  )
+  const manager = container.resolve("manager")
+  return await manager.transaction(async (transactionManager) => {
+    await Promise.all(
+      variants.map(async (variant) => {
+        await migrateProductVariant(variant, locationId, {
+          container,
+          transactionManager,
+        })
+      })
+    )
+  })
 }
 
 const migrate = async function ({ directory }) {

packages/medusa/src/services/product-variant-inventory.ts

@@ -247,9 +247,13 @@ class ProductVariantInventoryService extends TransactionBaseService {
       })
 
     // Verify that item exists
-    await this.inventoryService_.retrieveInventoryItem(inventoryItemId, {
-      select: ["id"],
-    })
+    await this.inventoryService_.retrieveInventoryItem(
+      inventoryItemId,
+      {
+        select: ["id"],
+      },
+      { transactionManager: this.activeManager_ }
+    )
 
     const variantInventoryRepo = this.activeManager_.getRepository(
       ProductVariantInventoryItem

packages/medusa/src/services/staged-job.ts

@@ -1,10 +1,11 @@
-import { EventBusTypes } from "@medusajs/types"
 import { DeepPartial, EntityManager, In } from "typeorm"
+
+import { EventBusTypes } from "@medusajs/types"
+import { FindConfig } from "../types/common"
 import { QueryDeepPartialEntity } from "typeorm/query-builder/QueryPartialEntity"
-import { TransactionBaseService } from "../interfaces"
 import { StagedJob } from "../models"
 import { StagedJobRepository } from "../repositories/staged-job"
-import { FindConfig } from "../types/common"
+import { TransactionBaseService } from "../interfaces"
 import { isString } from "../utils"
 
 type StagedJobServiceProps = {
@@ -42,8 +43,7 @@ class StagedJobService extends TransactionBaseService {
   }
 
   async create(data: EventBusTypes.EmitData[] | EventBusTypes.EmitData) {
-    return await this.atomicPhase_(async (manager) => {
-      const stagedJobRepo = manager.withRepository(this.stagedJobRepository_)
+      const stagedJobRepo = this.activeManager_.withRepository(this.stagedJobRepository_)
 
       const data_ = Array.isArray(data) ? data : [data]
 
@@ -56,7 +56,6 @@ class StagedJobService extends TransactionBaseService {
       ) as QueryDeepPartialEntity<StagedJob>[]
 
       return await stagedJobRepo.insertBulk(stagedJobs)
-    })
   }
 }
 

packages/types/src/inventory/inventory.ts

@@ -1,5 +1,3 @@
-import { FindConfig } from "../common"
-
 import {
   CreateInventoryItemInput,
   CreateInventoryLevelInput,
@@ -14,101 +12,139 @@ import {
   UpdateReservationItemInput,
 } from "./common"
 
+import { FindConfig } from "../common"
+import { SharedContext } from ".."
+
 export interface IInventoryService {
   listInventoryItems(
     selector: FilterableInventoryItemProps,
-    config?: FindConfig<InventoryItemDTO>
+    config?: FindConfig<InventoryItemDTO>,
+    context?: SharedContext
   ): Promise<[InventoryItemDTO[], number]>
 
   listReservationItems(
     selector: FilterableReservationItemProps,
-    config?: FindConfig<ReservationItemDTO>
+    config?: FindConfig<ReservationItemDTO>,
+    context?: SharedContext
   ): Promise<[ReservationItemDTO[], number]>
 
   listInventoryLevels(
     selector: FilterableInventoryLevelProps,
-    config?: FindConfig<InventoryLevelDTO>
+    config?: FindConfig<InventoryLevelDTO>,
+    context?: SharedContext
   ): Promise<[InventoryLevelDTO[], number]>
 
   retrieveInventoryItem(
     inventoryItemId: string,
-    config?: FindConfig<InventoryItemDTO>
+    config?: FindConfig<InventoryItemDTO>,
+    context?: SharedContext
   ): Promise<InventoryItemDTO>
 
   retrieveInventoryLevel(
     inventoryItemId: string,
-    locationId: string
+    locationId: string,
+    context?: SharedContext
   ): Promise<InventoryLevelDTO>
 
-  retrieveReservationItem(reservationId: string): Promise<ReservationItemDTO>
+  retrieveReservationItem(
+    reservationId: string,
+    context?: SharedContext
+  ): Promise<ReservationItemDTO>
 
   createReservationItem(
-    input: CreateReservationItemInput
+    input: CreateReservationItemInput,
+    context?: SharedContext
   ): Promise<ReservationItemDTO>
 
   createInventoryItem(
-    input: CreateInventoryItemInput
+    input: CreateInventoryItemInput,
+    context?: SharedContext
   ): Promise<InventoryItemDTO>
 
   createInventoryLevel(
-    data: CreateInventoryLevelInput
+    data: CreateInventoryLevelInput,
+    context?: SharedContext
   ): Promise<InventoryLevelDTO>
 
   updateInventoryLevel(
     inventoryItemId: string,
     locationId: string,
-    update: UpdateInventoryLevelInput
+    update: UpdateInventoryLevelInput,
+    context?: SharedContext
   ): Promise<InventoryLevelDTO>
 
   updateInventoryItem(
     inventoryItemId: string,
-    input: CreateInventoryItemInput
+    input: CreateInventoryItemInput,
+    context?: SharedContext
   ): Promise<InventoryItemDTO>
 
   updateReservationItem(
     reservationItemId: string,
-    input: UpdateReservationItemInput
+    input: UpdateReservationItemInput,
+    context?: SharedContext
   ): Promise<ReservationItemDTO>
 
-  deleteReservationItemsByLineItem(lineItemId: string): Promise<void>
+  deleteReservationItemsByLineItem(
+    lineItemId: string,
+    context?: SharedContext
+  ): Promise<void>
 
-  deleteReservationItem(reservationItemId: string | string[]): Promise<void>
+  deleteReservationItem(
+    reservationItemId: string | string[],
+    context?: SharedContext
+  ): Promise<void>
 
-  deleteInventoryItem(inventoryItemId: string): Promise<void>
+  deleteInventoryItem(
+    inventoryItemId: string,
+    context?: SharedContext
+  ): Promise<void>
 
-  deleteInventoryItemLevelByLocationId(locationId: string): Promise<void>
+  deleteInventoryItemLevelByLocationId(
+    locationId: string,
+    context?: SharedContext
+  ): Promise<void>
 
-  deleteReservationItemByLocationId(locationId: string): Promise<void>
+  deleteReservationItemByLocationId(
+    locationId: string,
+    context?: SharedContext
+  ): Promise<void>
 
   deleteInventoryLevel(
     inventoryLevelId: string,
-    locationId: string
+    locationId: string,
+    context?: SharedContext
   ): Promise<void>
 
   adjustInventory(
     inventoryItemId: string,
     locationId: string,
-    adjustment: number
+    adjustment: number,
+    context?: SharedContext
   ): Promise<InventoryLevelDTO>
 
   confirmInventory(
     inventoryItemId: string,
     locationIds: string[],
-    quantity: number
+    quantity: number,
+    context?: SharedContext
   ): Promise<boolean>
 
   retrieveAvailableQuantity(
     inventoryItemId: string,
-    locationIds: string[]
+    locationIds: string[],
+    context?: SharedContext
   ): Promise<number>
 
   retrieveStockedQuantity(
     inventoryItemId: string,
-    locationIds: string[]
+    locationIds: string[],
+    context?: SharedContext
   ): Promise<number>
 
   retrieveReservedQuantity(
     inventoryItemId: string,
-    locationIds: string[]
+    locationIds: string[],
+    context?: SharedContext
   ): Promise<number>
 }

packages/types/src/stock-location/stock-location.ts

@@ -1,4 +1,3 @@
-import { FindConfig } from "../common/common"
 import {
   CreateStockLocationInput,
   FilterableStockLocationProps,
@@ -6,25 +5,38 @@ import {
   UpdateStockLocationInput,
 } from "./common"
 
+import { FindConfig } from "../common/common"
+import { SharedContext } from "../shared-context"
+
 export interface IStockLocationService {
   list(
     selector: FilterableStockLocationProps,
-    config?: FindConfig<StockLocationDTO>
+    config?: FindConfig<StockLocationDTO>,
+    context?: SharedContext
   ): Promise<StockLocationDTO[]>
 
   listAndCount(
     selector: FilterableStockLocationProps,
-    config?: FindConfig<StockLocationDTO>
+    config?: FindConfig<StockLocationDTO>,
+    context?: SharedContext
   ): Promise<[StockLocationDTO[], number]>
 
   retrieve(
     id: string,
-    config?: FindConfig<StockLocationDTO>
+    config?: FindConfig<StockLocationDTO>,
+    context?: SharedContext
   ): Promise<StockLocationDTO>
 
-  create(input: CreateStockLocationInput): Promise<StockLocationDTO>
+  create(
+    input: CreateStockLocationInput,
+    context?: SharedContext
+  ): Promise<StockLocationDTO>
 
-  update(id: string, input: UpdateStockLocationInput): Promise<StockLocationDTO>
+  update(
+    id: string,
+    input: UpdateStockLocationInput,
+    context?: SharedContext
+  ): Promise<StockLocationDTO>
 
-  delete(id: string): Promise<void>
+  delete(id: string, context?: SharedContext): Promise<void>
 }