@things-factory/worksheet-base 4.3.516 → 4.3.520

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

@@ -1,9 +1,10 @@
-import { EntityManager } from 'typeorm'
+import { EntityManager, In } from 'typeorm'
 
 import { Application, ApplicationType, User } from '@things-factory/auth-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { ArrivalNotice, PowrupController } from '@things-factory/sales-base'
+import { WebspertController } from '@things-factory/warehouse-base'
 import { Domain } from '@things-factory/shell'
 import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
 
@@ -13,92 +14,71 @@ import { Worksheet } from '../../../../entities'
 
 export const completePutawayResolver = {
   async completePutaway(_: any, { arrivalNoticeNo }, context: any) {
-    const { tx, user, domain }: { tx: EntityManager; user: User; domain: Domain } = context.state
-    await completePutaway(tx, domain, user, arrivalNoticeNo)
-
-    const arrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
-      where: { domain, name: arrivalNoticeNo },
-      relations: [
-        'purchaseOrder',
-        'bizplace',
-        'bizplace.domain',
-        'bizplace.company',
-        'bizplace.company.domain',
-        'orderProducts',
-        'orderProducts.product',
-        'orderProducts.product.productDetails',
-        'orderProducts.product.productDetails.childProductDetail',
-        'orderProducts.productDetail'
-      ]
-    })
-
-    // search for any active marketplace connection
-    const companyDomain: Domain = arrivalNotice.bizplace.company.domain
-    const customerDomain: Domain = arrivalNotice.bizplace.domain
-    const customerBizplaceId: string = arrivalNotice.bizplace.id
-    const companyBizplace: Bizplace = await getCompanyBizplace(domain, null, customerBizplaceId, tx)
-
-    // const orderSource: string = arrivalNotice.source
-    // switch (orderSource) {
-    //   case ApplicationType.SELLERCRAFT:
-    //     const sellercraft: Sellercraft = await tx
-    //       .getRepository(Sellercraft)
-    //       .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
-
-    //     if (sellercraft) {
-    //       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-    //       await sellercraftCtrl.registerProductInbound(sellercraft, arrivalNotice)
-    //     }
-    //     break
-
-    //   case ApplicationType.MMS:
-    //     const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
-    //       where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
-    //       relations: ['marketplaceDistributors']
-    //     })
-
-    //     if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
-    //       const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-    //       await ecommerceCtrl.updateProductVariationStock(marketplaceStores, arrivalNotice.orderProducts, companyDomain)
-    //     }
-    //     break
-
-    //   default:
-    //     break
-    // }
-
-    const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
-      where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
-      relations: ['marketplaceDistributors']
-    })
-
-    const sellercraft: Sellercraft = await tx
-      .getRepository(Sellercraft)
-      .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
-
-    const application: Application = await tx
-      .getRepository(Application)
-      .findOne({ domain: companyBizplace.domain, status: 'ACTIVE', type: ApplicationType.POWRUP })
-
-    if (sellercraft) {
-      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-
-      // allow async run to skip user wait time
-      sellercraftCtrl.registerProductInbound(sellercraft, arrivalNotice)
-    }
-
-    if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
-      const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-
-      // allow async run to skip user wait time
-      ecommerceCtrl.updateProductVariationStock(marketplaceStores, arrivalNotice.orderProducts, companyDomain)
-    }
-
-    if (application) {
-      const powrupController: PowrupController = new PowrupController()
-
-      // allow async run to skip user wait time
-      powrupController.updateStock(arrivalNotice.orderProducts, customerDomain, user)
+    try {
+      const { tx, user, domain }: { tx: EntityManager; user: User; domain: Domain } = context.state
+      await completePutaway(tx, domain, user, arrivalNoticeNo)
+
+      const arrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
+        where: { domain, name: arrivalNoticeNo },
+        relations: [
+          'purchaseOrder',
+          'bizplace',
+          'bizplace.domain',
+          'bizplace.company',
+          'bizplace.company.domain',
+          'orderProducts',
+          'orderProducts.product',
+          'orderProducts.product.productDetails',
+          'orderProducts.product.productDetails.childProductDetail',
+          'orderProducts.productDetail'
+        ]
+      })
+
+      // search for any active marketplace connection
+      const companyDomain: Domain = arrivalNotice.bizplace.company.domain
+      const customerDomain: Domain = arrivalNotice.bizplace.domain
+      const customerBizplaceId: string = arrivalNotice.bizplace.id
+      const companyBizplace: Bizplace = await getCompanyBizplace(domain, null, customerBizplaceId, tx)
+
+      const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
+        where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
+        relations: ['marketplaceDistributors']
+      })
+
+      const sellercraft: Sellercraft = await tx
+        .getRepository(Sellercraft)
+        .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
+
+      if (sellercraft) {
+        const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+
+        // allow async run to skip user wait time
+        sellercraftCtrl.registerProductInbound(sellercraft, arrivalNotice)
+      }
+
+      if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
+        const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+
+        // allow async run to skip user wait time
+        ecommerceCtrl.updateProductVariationStock(marketplaceStores, arrivalNotice.orderProducts, companyDomain)
+      }
+
+      const application: Application[] = await tx.getRepository(Application).find({
+        domain: companyBizplace.domain,
+        status: 'ACTIVE',
+        type: In([ApplicationType.POWRUP, ApplicationType.WEBSPERT])
+      })
+
+      if (application.find(app => app.type == ApplicationType.POWRUP)) {
+        const powrupController: PowrupController = new PowrupController()
+        powrupController.updateStock(arrivalNotice.orderProducts, customerDomain, user)
+      }
+      if (application.find(app => app.type == ApplicationType.WEBSPERT)) {
+        WebspertController.updateStock(arrivalNotice.orderProducts.map(op => op.productDetail), arrivalNotice.bizplace, domain, user, tx)
+      }
+
+    } catch (error) {
+      throw error
     }
   }
 }

package/server/graphql/resolvers/worksheet/putaway-return/complete-putaway-return.ts

@@ -1,8 +1,9 @@
-import { EntityManager } from 'typeorm'
+import { EntityManager, In } from 'typeorm'
 
 import { Application, ApplicationType, User } from '@things-factory/auth-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { ReturnOrder, PowrupController } from '@things-factory/sales-base'
+import { WebspertController } from '@things-factory/warehouse-base'
 import { Domain } from '@things-factory/shell'
 import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
 
@@ -35,19 +36,22 @@ export const completePutawayReturnResolver = {
 
     const customerBizplaceId: string = returnOrder.bizplace.id
     const companyBizplace: Bizplace = await getCompanyBizplace(domain, null, customerBizplaceId, tx)
-    const application: Application = await tx
+    const application: Application[] = await tx
       .getRepository(Application)
-      .findOne({ domain: companyBizplace.domain, status: 'ACTIVE', type: ApplicationType.POWRUP })
+      .find({ domain: companyBizplace.domain, status: 'ACTIVE', type: In([ApplicationType.POWRUP, ApplicationType.WEBSPERT]) })
 
     if (sellercraft) {
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
       await sellercraftCtrl.registerProductReturn(sellercraft, returnOrder)
     }
 
-    if (application) {
+    if (application.find(app => app.type == ApplicationType.POWRUP)) {
       const powrupController: PowrupController = new PowrupController()
       powrupController.updateStock(returnOrder.orderInventories, customerDomain, user, tx)
     }
+    if (application.find(app => app.type == ApplicationType.WEBSPERT)) {
+      WebspertController.updateStock(returnOrder.orderInventories.map(oi => oi.productDetail), returnOrder.bizplace, domain, user, tx)
+    }
   }
 }