@things-factory/worksheet-base 4.3.828 → 4.3.829

package/server/graphql/resolvers/worksheet/picking/complete-picking.ts

@@ -1,4 +1,4 @@
-import { EntityManager, getManager, In } from 'typeorm'
+import { EntityManager, getManager, getRepository, In } from 'typeorm'
 import { ApplicationType, User } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint, getMyBizplace } from '@things-factory/biz-base'
 import { logger } from '@things-factory/env'
@@ -169,21 +169,22 @@ export async function completePicking(
 
             if (sellercraft) {
               const initSCOrderShipment = async (sellercraft, rtsTriggerLevel) => {
-                await getManager().transaction(async txMgr => {
-                  const sellercraftCtrl: SellercraftController = new SellercraftController(txMgr, domain, user)
-
-                  if (!releaseGood?.orderPackages?.length && !releaseGood?.marketPackCallSuccess) {
-                    ///// Q: why need to refetch Order Products?
-                    const orderProducts: OrderProduct[] = await txMgr.getRepository(OrderProduct).find({
-                      where: { releaseGood },
-                      relations: ['product', 'product.productDetails', 'productDetail']
-                    })
-                    await sellercraftCtrl.packOrder(sellercraft, { ...releaseGood, orderProducts })
-                  }
+                // Issue #4104: don't wrap marketplace HTTP calls in a transaction.
+                // Bind the controller to getManager() (auto-commit) and use the
+                // global repository for the orderProducts read.
+                const sellercraftCtrl: SellercraftController = new SellercraftController(getManager(), domain, user)
+
+                if (!releaseGood?.orderPackages?.length && !releaseGood?.marketPackCallSuccess) {
+                  ///// Q: why need to refetch Order Products?
+                  const orderProducts: OrderProduct[] = await getRepository(OrderProduct).find({
+                    where: { releaseGood },
+                    relations: ['product', 'product.productDetails', 'productDetail']
+                  })
+                  await sellercraftCtrl.packOrder(sellercraft, { ...releaseGood, orderProducts })
+                }
 
-                  // Trigger if RTS Trigger Level Setting == 1
-                  if (rtsTriggerLevel == 1) await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
-                })
+                // Trigger if RTS Trigger Level Setting == 1
+                if (rtsTriggerLevel == 1) await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
               }
 
               // asynchronouly call to initiate sellercraft order shipment/ RTS
@@ -196,22 +197,22 @@ export async function completePicking(
 
             if (powrup) {
               const initPowrupShipment = async (powrup, rtsTriggerLevel) => {
-                await getManager().transaction(async txMgr => {
-                  const powrupController: PowrupController = new PowrupController()
-
-                  if (!releaseGood?.orderPackages?.length && !releaseGood?.marketPackCallSuccess && !releaseGood.lastMileDelivery?.isTms) {
-                    ///// Q: why need to refetch Order Products?
-                    const orderProducts: OrderProduct[] = await txMgr.getRepository(OrderProduct).find({
-                      where: { releaseGood },
-                      relations: ['product', 'productDetail']
-                    })
-                    await powrupController.packOrder(powrup, { ...releaseGood, orderProducts }, domain, user, txMgr)
-                  }
+                // Issue #4104: same fix — no surrounding transaction, no trxMgr
+                // passed to controller methods.
+                const powrupController: PowrupController = new PowrupController()
 
-                  // Trigger if RTS Trigger Level Setting == 1
-                  if (rtsTriggerLevel == 1)
-                    await powrupController.initiateShipment(powrup, releaseGood, domain, user, txMgr)
-                })
+                if (!releaseGood?.orderPackages?.length && !releaseGood?.marketPackCallSuccess && !releaseGood.lastMileDelivery?.isTms) {
+                  ///// Q: why need to refetch Order Products?
+                  const orderProducts: OrderProduct[] = await getRepository(OrderProduct).find({
+                    where: { releaseGood },
+                    relations: ['product', 'productDetail']
+                  })
+                  await powrupController.packOrder(powrup, { ...releaseGood, orderProducts }, domain, user)
+                }
+
+                // Trigger if RTS Trigger Level Setting == 1
+                if (rtsTriggerLevel == 1)
+                  await powrupController.initiateShipment(powrup, releaseGood, domain, user)
               }
               // asynchronouly call to initiate powrup order shipment/ RTS
               initPowrupShipment(powrup, rtsTriggerLevel)
@@ -445,7 +446,10 @@ export async function completePicking(
                 status: SellercraftStatus.ACTIVE
               })
               if (sellercraft) {
-                const sellercraftCtrl: SellercraftController = new SellercraftController(tx, null, null)
+                // Issue #4104: bind to getManager() (auto-commit), not the
+                // outer @transaction `tx`, so marketplace HTTP calls don't
+                // hold row locks on order_packages.
+                const sellercraftCtrl: SellercraftController = new SellercraftController(getManager(), null, null)
                 const rtsTriggerLevel: Setting = await tx.getRepository(Setting).findOne({
                   where: { domain: releaseGood.domain, category: 'id-rule', name: 'rts-trigger-level' }
                 })
@@ -464,7 +468,8 @@ export async function completePicking(
                 })
 
                 if (rtsTriggerLevel && parseInt(rtsTriggerLevel?.value || 0) == 1) {
-                  powrupController.initiateShipment(powrup, releaseGood, domain, user, tx)
+                  // Issue #4104: don't pass `tx` — same reason as above.
+                  powrupController.initiateShipment(powrup, releaseGood, domain, user)
                 }
               }
             }