@things-factory/warehouse-base 5.0.14 → 6.0.0-alpha.0

package/server/service/inventory-change/inventory-change-mutation.ts

@@ -1,12 +1,10 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, In, MoreThan, Not } from 'typeorm'
+import { In, MoreThan, Not } from 'typeorm'
 
-import { Privilege, User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
-import { sendNotification } from '@things-factory/notification'
 import { Product } from '@things-factory/product-base'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
@@ -30,9 +28,9 @@ export class InventoryChangeMutation {
   @Mutation(returns => InventoryChange)
   async createInventoryChange(
     @Arg('inventoryChange') inventoryChange: NewInventoryChange,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<InventoryChange> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const { domain, user, tx } = context.state
 
     return await tx.getRepository(InventoryChange).save({
       ...inventoryChange,
@@ -47,9 +45,9 @@ export class InventoryChangeMutation {
   async updateInventoryChange(
     @Arg('name') name: string,
     @Arg('patch') patch: InventoryChangePatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<InventoryChange> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const { domain, user, tx } = context.state
 
     const repository = tx.getRepository(InventoryChange)
     const inventoryChange = await repository.findOne({
@@ -67,9 +65,9 @@ export class InventoryChangeMutation {
   @Mutation(returns => [InventoryChange])
   async updateMultipleInventoryChange(
     @Arg('patches', type => [InventoryChangePatch]) patches: InventoryChangePatch[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<InventoryChange[]> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const { domain, user, tx } = context.state
     let results = []
     const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
     const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
@@ -93,7 +91,7 @@ export class InventoryChangeMutation {
     if (_updateRecords.length > 0) {
       for (let i = 0; i < _updateRecords.length; i++) {
         const newRecord = _updateRecords[i]
-        const inventoryChange = await inventoryChangeRepo.findOne(newRecord.id)
+        const inventoryChange = await inventoryChangeRepo.findOneBy({ id: newRecord.id })
 
         const result = await inventoryChangeRepo.save({
           ...inventoryChange,
@@ -110,8 +108,8 @@ export class InventoryChangeMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean)
-  async deleteInventoryChange(@Arg('name') name: string, @Ctx() context: any): Promise<Boolean> {
-    const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+  async deleteInventoryChange(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<Boolean> {
+    const { domain, tx } = context.state
 
     await tx.getRepository(InventoryChange).delete({ domain: domain, name })
     return true
@@ -119,8 +117,11 @@ export class InventoryChangeMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean)
-  async deleteInventoryChanges(@Arg('names', type => [String]) names: string[], @Ctx() context: any): Promise<Boolean> {
-    const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+  async deleteInventoryChanges(
+    @Arg('names', type => [String]) names: string[],
+    @Ctx() context: ResolverContext
+  ): Promise<Boolean> {
+    const { domain, tx } = context.state
 
     await tx.getRepository(InventoryChange).delete({
       domain: domain,
@@ -134,273 +135,298 @@ export class InventoryChangeMutation {
   @Mutation(returns => Boolean)
   async submitInventoryChanges(
     @Arg('patches', type => [InventoryPatch]) patches: InventoryPatch[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ) {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const { domain, user, tx } = context.state
+    try {
+      const _createRecords = []
+      const _updateRecords = []
+
+      for (let i = 0; i < patches.length; i++) {
+        let foundExistingPallet = await tx
+          .getRepository(Inventory)
+          .createQueryBuilder('iv')
+          .where('iv.domain_id = :domain_id', { domain_id: domain.id })
+          .andWhere('(iv.pallet_id = :pallet_id or iv.id = :id)', {
+            pallet_id: patches[i]?.palletId,
+            id: patches[i]?.id
+          })
+          .getOne()
 
-    const _createRecords = []
-    const _updateRecords = []
+        //remove any unchanged records
+        for (const [key, value] of Object.entries(patches[i])) {
+          if (foundExistingPallet && key != 'id' && key != 'cuFlag' && value == foundExistingPallet[key]) {
+            delete patches[i][key]
+          }
+        }
 
-    for (let i = 0; i < patches.length; i++) {
-      let foundExistingPallet = await tx.getRepository(Inventory).findOne({
-        where: { domain, palletId: patches[i]?.palletId }
-      })
+        // skip process when no processable data found
+        if (Object.keys(patches[i]).filter(x => x != 'id' && x != 'cuFlag').length == 0) {
+          continue
+        }
 
-      if (!foundExistingPallet) {
-        foundExistingPallet = await tx.getRepository(Inventory).findOne({
-          where: { id: patches[i]?.id }
-        })
-      }
+        const invLockedQty: number = foundExistingPallet?.lockedQty == null ? 0 : foundExistingPallet?.lockedQty
 
-      const invLockedQty: number = foundExistingPallet?.lockedQty == null ? 0 : foundExistingPallet?.lockedQty
+        if (patches[i]?.qty < invLockedQty) {
+          throw new Error(
+            'Adjusted qty value should not be lower than released qty, kindly contact our support for assistance'
+          )
+        }
 
-      if (patches[i]?.qty < invLockedQty) {
-        throw new Error(
-          'Adjusted qty value should not be lower than released qty, kindly contact our support if you have difficulties'
-        )
+        if (foundExistingPallet) {
+          delete patches[i].serialNumbers
+          _updateRecords.push(patches[i])
+        } else {
+          _createRecords.push(patches[i])
+        }
       }
 
-      if (foundExistingPallet) {
-        delete patches[i].serialNumbers
-        _updateRecords.push(patches[i])
-      } else {
-        _createRecords.push(patches[i])
-      }
-    }
+      const inventoryChangeRepo = tx.getRepository(InventoryChange)
+      const inventoryItemChangeRepo = tx.getRepository(InventoryItemChange)
+      if (_createRecords.length > 0) {
+        for (let i = 0; i < _createRecords.length; i++) {
+          const newRecord = _createRecords[i]
 
-    const inventoryChangeRepo = tx.getRepository(InventoryChange)
-    const inventoryItemChangeRepo = tx.getRepository(InventoryItemChange)
-    if (_createRecords.length > 0) {
-      for (let i = 0; i < _createRecords.length; i++) {
-        const newRecord = _createRecords[i]
+          var location = await tx.getRepository(Location).findOne({
+            where: { id: newRecord.location.id },
+            relations: ['warehouse']
+          })
+          newRecord.location = location
+          newRecord.zone = location.zone
+          newRecord.warehouse = location.warehouse
 
-        var location = await tx.getRepository(Location).findOne({
-          where: { id: newRecord.location.id },
-          relations: ['warehouse']
-        })
-        newRecord.location = location
-        newRecord.zone = location.zone
-        newRecord.warehouse = location.warehouse
+          newRecord.bizplace = await tx.getRepository(Bizplace).findOneBy({ id: newRecord.bizplace.id })
 
-        newRecord.bizplace = await tx.getRepository(Bizplace).findOne(newRecord.bizplace.id)
+          var product: Product = await tx.getRepository(Product).findOne(newRecord.product.id)
+          newRecord.product = product
 
-        var product: Product = await tx.getRepository(Product).findOne(newRecord.product.id)
-        newRecord.product = product
+          newRecord.status = 'PENDING'
+          newRecord.transactionType = 'NEW'
 
-        newRecord.status = 'PENDING'
-        newRecord.transactionType = 'NEW'
+          newRecord.expirationDate =
+            ((newRecord?.expirationDate && new Date(newRecord.expirationDate).getFullYear()) || 0) < 2000
+              ? null
+              : newRecord.expirationDate
 
-        newRecord.expirationDate =
-          ((newRecord?.expirationDate && new Date(newRecord.expirationDate).getFullYear()) || 0) < 2000
-            ? null
-            : newRecord.expirationDate
+          const newInventoryChange: InventoryChange = await inventoryChangeRepo.save({
+            ...newRecord,
+            id: undefined,
+            name: InventoryNoGenerator.inventoryName(),
+            domain: domain,
+            creator: user,
+            updater: user
+          })
 
-        const newInventoryChange: InventoryChange = await inventoryChangeRepo.save({
-          ...newRecord,
-          id: undefined,
-          name: InventoryNoGenerator.inventoryName(),
-          domain: domain,
-          creator: user,
-          updater: user
-        })
+          if (newRecord?.serialNumbers) {
+            let serialNumbers: string = newRecord.serialNumbers
+            let newSerialNumbers: any = serialNumbers.split(',')
+            let inventoryItemChanges: InventoryItemChange[] = []
 
-        if (newRecord?.serialNumbers) {
-          let serialNumbers: string = newRecord.serialNumbers
-          let newSerialNumbers: any = serialNumbers.split(',')
-          let inventoryItemChanges: InventoryItemChange[] = []
+            for (let i = 0; i < newSerialNumbers.length; i++) {
+              let newSerialNumber: string = newSerialNumbers[i]
+              let inventoryItemChange: any = {
+                serialNumber: newSerialNumber,
+                type: INVENTORY_ITEM_CHANGE_TYPE.NEW
+              }
 
-          for (let i = 0; i < newSerialNumbers.length; i++) {
-            let newSerialNumber: string = newSerialNumbers[i]
-            let inventoryItemChange: any = {
-              serialNumber: newSerialNumber,
-              type: INVENTORY_ITEM_CHANGE_TYPE.NEW
+              inventoryItemChanges.push(inventoryItemChange)
             }
 
-            inventoryItemChanges.push(inventoryItemChange)
+            newRecord.inventoryItemChangesJson = JSON.stringify(inventoryItemChanges)
           }
 
-          newRecord.inventoryItemChangesJson = JSON.stringify(inventoryItemChanges)
-        }
-
-        // create new inventory items
-        if (newRecord?.inventoryItemChangesJson) {
-          const inventoryItemChanges: InventoryItemChange[] = JSON.parse(newRecord.inventoryItemChangesJson)
-          if (product?.isRequireSerialNumberScanningInbound) {
-            if (inventoryItemChanges?.length != newRecord?.qty) {
-              throw new Error('Serial Numbers not tally with quantity')
+          // create new inventory items
+          if (newRecord?.inventoryItemChangesJson) {
+            const inventoryItemChanges: InventoryItemChange[] = JSON.parse(newRecord.inventoryItemChangesJson)
+            if (product?.isRequireSerialNumberScanningInbound) {
+              if (inventoryItemChanges?.length != newRecord?.qty) {
+                throw new Error('Serial Numbers not tally with quantity')
+              }
             }
-          }
 
-          let newInventoryItemChanges: InventoryItemChange[] = []
-
-          inventoryItemChanges.map(inventoryItemChange => {
-            let newInventoryItemChange: InventoryItemChange = new InventoryItemChange()
-            newInventoryItemChange.name = InventoryNoGenerator.inventoryName()
-            newInventoryItemChange.serialNumber = inventoryItemChange.serialNumber
-            newInventoryItemChange.type = inventoryItemChange.type
-            newInventoryItemChange.status = newInventoryChange.status
-            newInventoryItemChange.inventoryItem =
-              newInventoryItemChange?.type == INVENTORY_ITEM_CHANGE_TYPE.NEW
-                ? null
-                : newInventoryItemChange.inventoryItem
-            newInventoryItemChange.inventoryChange = newInventoryChange
-            newInventoryItemChange.domain = domain
-            newInventoryItemChange.creator = user
-            newInventoryItemChange.updater = user
-
-            newInventoryItemChanges.push(newInventoryItemChange)
-          })
+            let newInventoryItemChanges: InventoryItemChange[] = []
+
+            inventoryItemChanges.map(inventoryItemChange => {
+              let newInventoryItemChange: InventoryItemChange = new InventoryItemChange()
+              newInventoryItemChange.name = InventoryNoGenerator.inventoryName()
+              newInventoryItemChange.serialNumber = inventoryItemChange.serialNumber
+              newInventoryItemChange.type = inventoryItemChange.type
+              newInventoryItemChange.status = newInventoryChange.status
+              newInventoryItemChange.inventoryItem =
+                newInventoryItemChange?.type == INVENTORY_ITEM_CHANGE_TYPE.NEW
+                  ? null
+                  : newInventoryItemChange.inventoryItem
+              newInventoryItemChange.inventoryChange = newInventoryChange
+              newInventoryItemChange.domain = domain
+              newInventoryItemChange.creator = user
+              newInventoryItemChange.updater = user
+
+              newInventoryItemChanges.push(newInventoryItemChange)
+            })
 
-          await inventoryItemChangeRepo.save(newInventoryItemChanges)
+            await inventoryItemChangeRepo.save(newInventoryItemChanges)
+          }
         }
       }
-    }
-
-    if (_updateRecords.length > 0) {
-      for (let i = 0; i < _updateRecords.length; i++) {
-        const updateRecord = _updateRecords[i]
 
-        let existingRecord = await tx.getRepository(Inventory).findOne({
-          where: { domain, palletId: updateRecord?.palletId },
-          relations: ['location', 'warehouse', 'product', 'bizplace']
-        })
+      if (_updateRecords.length > 0) {
+        for (let i = 0; i < _updateRecords.length; i++) {
+          const updateRecord = _updateRecords[i]
 
-        if (!existingRecord) {
-          existingRecord = await tx.getRepository(Inventory).findOne({
-            where: { domain, id: updateRecord?.id },
+          let existingRecord = await tx.getRepository(Inventory).findOne({
+            where: { domain, palletId: updateRecord?.palletId },
             relations: ['location', 'warehouse', 'product', 'bizplace']
           })
-        }
 
-        if (!!updateRecord?.location?.id) {
-          var location = await tx.getRepository(Location).findOne({
-            where: { id: updateRecord.location.id },
-            relations: ['warehouse']
-          })
-          updateRecord.location = location
-          updateRecord.zone = location.zone
-          updateRecord.warehouse = location.warehouse
-        }
+          if (!existingRecord) {
+            existingRecord = await tx.getRepository(Inventory).findOne({
+              where: { domain, id: updateRecord?.id },
+              relations: ['location', 'warehouse', 'product', 'bizplace']
+            })
+          }
 
-        if (!!updateRecord?.bizplace?.id)
-          updateRecord.bizplace = await tx.getRepository(Bizplace).findOne(updateRecord.bizplace.id)
+          if (!!updateRecord?.location?.id) {
+            var location = await tx.getRepository(Location).findOne({
+              where: { id: updateRecord.location.id },
+              relations: ['warehouse']
+            })
+            updateRecord.location = location
+            updateRecord.zone = location.zone
+            updateRecord.warehouse = location.warehouse
+          }
 
-        let product: Product
+          if (!!updateRecord?.bizplace?.id)
+            updateRecord.bizplace = await tx.getRepository(Bizplace).findOne(updateRecord.bizplace.id)
 
-        if (!!updateRecord?.product?.id) {
-          product = await tx.getRepository(Product).findOne(updateRecord.product.id)
-          updateRecord.product = product
-        } else {
-          product = existingRecord.product
-        }
+          let product: Product
 
-        updateRecord.transactionType == 'MISSING'
-          ? (updateRecord.transactionType = 'MISSING')
-          : (updateRecord.transactionType = 'CHANGES')
+          if (!!updateRecord?.product?.id) {
+            product = await tx.getRepository(Product).findOne(updateRecord.product.id)
+            updateRecord.product = product
+          } else {
+            product = existingRecord.product
+          }
 
-        updateRecord.status = 'PENDING'
+          updateRecord.transactionType == 'MISSING'
+            ? (updateRecord.transactionType = 'MISSING')
+            : (updateRecord.transactionType = 'CHANGES')
 
-        updateRecord.expirationDate =
-          ((updateRecord?.expirationDate && new Date(updateRecord.expirationDate).getFullYear()) || 0) < 2000
-            ? null
-            : updateRecord.expirationDate
-
-        const updatedInventoryChange: InventoryChange = await inventoryChangeRepo.save({
-          palletId: existingRecord.palletId,
-          ...updateRecord,
-          id: undefined,
-          name: InventoryNoGenerator.inventoryName(),
-          inventory: existingRecord,
-          domain: domain,
-          creator: user,
-          updater: user
-        })
+          updateRecord.status = 'PENDING'
+
+          updateRecord.expirationDate =
+            ((updateRecord?.expirationDate && new Date(updateRecord.expirationDate).getFullYear()) || 0) < 2000
+              ? null
+              : updateRecord.expirationDate
 
-        // create new inventory items
-        if (updateRecord?.inventoryItemChangesJson) {
-          const originalInventoryItems: InventoryItem[] = await tx.getRepository(InventoryItem).find({
-            where: { domain, inventory: existingRecord }
+          const updatedInventoryChange: InventoryChange = await inventoryChangeRepo.save({
+            palletId: existingRecord.palletId,
+            ...updateRecord,
+            id: undefined,
+            name: InventoryNoGenerator.inventoryName(),
+            inventory: existingRecord,
+            domain: domain,
+            creator: user,
+            updater: user
           })
-          const inventoryItemChanges: InventoryItemChange[] = JSON.parse(updateRecord.inventoryItemChangesJson)
-          if (product?.isRequireSerialNumberScanningInbound) {
-            const combinedInventoryItems: any[] = [...originalInventoryItems, ...inventoryItemChanges]
-            let qty: number = updateRecord?.qty ? updateRecord.qty : existingRecord.qty
-            if (combinedInventoryItems?.length != qty) {
-              throw new Error('Serial Numbers not tally with quantity')
+
+          // create new inventory items
+          if (updateRecord?.inventoryItemChangesJson) {
+            const originalInventoryItems: InventoryItem[] = await tx.getRepository(InventoryItem).find({
+              where: { domain: { id: domain.id }, inventory: { id: existingRecord.id }, status: Not('DELETED') }
+            })
+            const inventoryItemChanges: InventoryItemChange[] = JSON.parse(updateRecord.inventoryItemChangesJson)
+            if (product?.isRequireSerialNumberScanningInbound) {
+              // const combinedInventoryItems: any[] = [...originalInventoryItems, ...inventoryItemChanges]
+              let qty: number = updateRecord?.qty ? updateRecord.qty : existingRecord.qty
+
+              if (originalInventoryItems.length == 0) {
+                if (inventoryItemChanges.length !== qty) {
+                  throw new Error('Serial Numbers not tally with quantity')
+                }
+              } else {
+                if (originalInventoryItems?.length - inventoryItemChanges.length !== qty) {
+                  throw new Error('Serial Numbers not tally with quantity')
+                }
+              }
             }
-          }
 
-          let newInventoryItemChanges: InventoryItemChange[] = []
-
-          inventoryItemChanges.map(inventoryItemChange => {
-            let newInventoryItemChange: InventoryItemChange = new InventoryItemChange()
-            newInventoryItemChange.name = InventoryNoGenerator.inventoryName()
-            newInventoryItemChange.serialNumber = inventoryItemChange.serialNumber
-            newInventoryItemChange.type = inventoryItemChange.type
-            newInventoryItemChange.status = updatedInventoryChange.status
-            newInventoryItemChange.inventory = updatedInventoryChange.inventory
-            newInventoryItemChange.inventoryItem =
-              newInventoryItemChange?.type == INVENTORY_ITEM_CHANGE_TYPE.NEW
-                ? null
-                : newInventoryItemChange.inventoryItem
-            newInventoryItemChange.inventoryChange = updatedInventoryChange
-            newInventoryItemChange.domain = domain
-            newInventoryItemChange.creator = user
-            newInventoryItemChange.updater = user
-
-            newInventoryItemChanges.push(newInventoryItemChange)
-          })
+            let newInventoryItemChanges: InventoryItemChange[] = []
+
+            inventoryItemChanges.map(inventoryItemChange => {
+              let newInventoryItemChange: InventoryItemChange = new InventoryItemChange()
+              newInventoryItemChange.name = InventoryNoGenerator.inventoryName()
+              newInventoryItemChange.serialNumber = inventoryItemChange.serialNumber
+              newInventoryItemChange.type = inventoryItemChange.type
+              newInventoryItemChange.status = updatedInventoryChange.status
+              newInventoryItemChange.inventory = updatedInventoryChange.inventory
+              newInventoryItemChange.inventoryItem =
+                newInventoryItemChange?.type == INVENTORY_ITEM_CHANGE_TYPE.NEW
+                  ? null
+                  : inventoryItemChange.inventoryItem
+              newInventoryItemChange.inventoryChange = updatedInventoryChange
+              newInventoryItemChange.domain = domain
+              newInventoryItemChange.creator = user
+              newInventoryItemChange.updater = user
+
+              newInventoryItemChanges.push(newInventoryItemChange)
+            })
 
-          await inventoryItemChangeRepo.save(newInventoryItemChanges)
+            await inventoryItemChangeRepo.save(newInventoryItemChanges)
+          }
         }
       }
-    }
 
-    const notificationApprover: any = await tx
-      .getRepository(Privilege)
-      .createQueryBuilder('p')
-      .select('u.*')
-      .addSelect('r.*')
-      .innerJoin('p.roles', 'r')
-      .innerJoin('r.users', 'u')
-      .where('p.name = :name', { name: 'mutation' })
-      .andWhere('p.category = :category', { category: 'inventory' })
-      .andWhere('r.domain_id = :domainId', { domainId: domain.id })
-      .groupBy('u.id')
-      .addGroupBy('r.id')
-      .getRawMany()
-
-    if (_updateRecords.some(res => res.transactionType == 'MISSING')) {
-      if (notificationApprover?.length && context.header?.referer) {
-        const receivers: any[] = notificationApprover.map(user => user.id)
-        const msg = {
-          title: `Missing stock identified. Review this transaction in Inventory Adjustment Approval.`,
-          body: ``,
-          url: context.header.referer,
-          data: { url: context.header.referer }
-        }
-        await sendNotification({
-          receivers,
-          message: { ...msg }
-        })
-      }
-    } else {
-      if (notificationApprover?.length && context.header?.referer) {
-        const receivers: any[] = notificationApprover.map(user => user.id)
-        const msg = {
-          title: `There is an inventory adjustment pending for approval, kindly review within 1 hour to avoid any operation conflict.`,
-          body: ``,
-          url: context.header.referer,
-          data: { url: context.header.referer }
-        }
-        await sendNotification({
-          receivers,
-          message: { ...msg }
-        })
-      }
+      /**
+       * @notes Temporary off sendNotification due to suspect of causing wms down
+       */
+      // const notificationApprover: any = await tx
+      //   .getRepository(Privilege)
+      //   .createQueryBuilder('p')
+      //   .select('u.*')
+      //   .addSelect('r.*')
+      //   .innerJoin('p.roles', 'r')
+      //   .innerJoin('r.users', 'u')
+      //   .where('p.name = :name', { name: 'mutation' })
+      //   .andWhere('p.category = :category', { category: 'inventory' })
+      //   .andWhere('r.domain_id = :domainId', { domainId: domain.id })
+      //   .groupBy('u.id')
+      //   .addGroupBy('r.id')
+      //   .getRawMany()
+
+      // if (_updateRecords.some(res => res.transactionType == 'MISSING')) {
+      //   if (notificationApprover?.length && context.header?.referer) {
+      //     const receivers: any[] = notificationApprover.map(user => user.id)
+      //     const msg = {
+      //       title: `Missing stock identified. Review this transaction in Inventory Adjustment Approval.`,
+      //       body: ``,
+      //       url: context.header.referer,
+      //       data: { url: context.header.referer }
+      //     }
+      //     await sendNotification({
+      //       receivers,
+      //       message: { ...msg }
+      //     })
+      //   }
+      // } else {
+      //   if (notificationApprover?.length && context.header?.referer) {
+      //     const receivers: any[] = notificationApprover.map(user => user.id)
+      //     const msg = {
+      //       title: `There is an inventory adjustment pending for approval, kindly review within 1 hour to avoid any operation conflict.`,
+      //       body: ``,
+      //       url: context.header.referer,
+      //       data: { url: context.header.referer }
+      //     }
+      //     await sendNotification({
+      //       receivers,
+      //       message: { ...msg }
+      //     })
+      //   }
+      // }
+
+      return true
+    } catch (error) {
+      throw error
     }
-
-    return true
   }
 
   @Directive('@privilege(category: "inventory_adjustment_approval", privilege: "mutation")')
@@ -408,7 +434,7 @@ export class InventoryChangeMutation {
   @Mutation(returns => InventoryChangeList)
   async approveInventoryChanges(
     @Arg('patches', type => [InventoryChangePatch]) patches: InventoryChangePatch[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<InventoryChangeList> {
     const inventoryChangeList = await approveInventoryChanges(patches, context)
 
@@ -420,9 +446,9 @@ export class InventoryChangeMutation {
   @Mutation(returns => Boolean)
   async rejectInventoryChanges(
     @Arg('patches', type => [InventoryChangePatch]) patches: InventoryChangePatch[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Boolean> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const { domain, user, tx } = context.state
 
     const _inventoryChanges = await tx.getRepository(InventoryChange).find({
       where: { id: In(patches.map(item => item.id)) },
@@ -472,10 +498,10 @@ function clean(obj) {
 }
 
 async function upsertInventoryItems(context, inventoryChange, approvalStatus, tx) {
-  const { domain, user }: { domain: Domain; user: User } = context.state
+  const { domain, user } = context.state
 
   let inventoryItemChanges: InventoryItemChange[] = await tx.getRepository(InventoryItemChange).find({
-    where: { domain, inventoryChange: inventoryChange, status: 'PENDING' },
+    where: { domain: { id: domain.id }, inventoryChange: inventoryChange, status: 'PENDING' },
     relations: ['domain', 'inventoryItem', 'inventory', 'inventory.product', 'inventoryChange']
   })
   await Promise.all(
@@ -537,8 +563,8 @@ async function upsertInventoryItems(context, inventoryChange, approvalStatus, tx
   )
 }
 
-export async function approveInventoryChanges(patches: any, context: any) {
-  const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+export async function approveInventoryChanges(patches: any, context: ResolverContext) {
+  const { domain, user, tx } = context.state
 
   // Get Selected Inventory Change Data
   const _inventoryChanges = await tx.getRepository(InventoryChange).find({
@@ -634,7 +660,7 @@ export async function approveInventoryChanges(patches: any, context: any) {
 
           // Check and set current location status
           let currentLocationInventoryCount = await tx.getRepository(Inventory).count({
-            where: { location: inventory.location, status: 'STORED', id: Not(inventory.id) }
+            where: { location: { id: inventory.location.id }, status: 'STORED', id: Not(inventory.id) }
           })
 
           if (currentLocationInventoryCount == 0) {
@@ -781,7 +807,7 @@ export async function approveInventoryChanges(patches: any, context: any) {
         } else {
           let latestLocationInventoryCount = await tx.getRepository(Inventory).count({
             where: {
-              location: newRecord.location ? newRecord.location.id : inventory.location.id,
+              location: { id: newRecord.location ? newRecord.location.id : inventory.location.id },
               status: 'STORED',
               id: Not(inventory.id)
             }
@@ -801,18 +827,41 @@ export async function approveInventoryChanges(patches: any, context: any) {
 
         const companyDomain: Domain = inventory.bizplace?.company.domain
 
-        const sellercraft: Sellercraft = await tx
-          .getRepository(Sellercraft)
-          .findOne({ where: { domain: customerDomain, status: SellercraftStatus.ACTIVE }, relations: ['domain'] })
+        const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+        if (newRecord?.bizplace?.id && inventory.bizplace.id != newRecord?.bizplace?.id) {
+          const prevBizSC: Sellercraft = await tx.getRepository(Sellercraft).findOne({
+            where: {
+              domain: { id: inventory.bizplace?.domain.id },
+              status: SellercraftStatus.ACTIVE
+            },
+            relations: ['domain']
+          })
+          if (prevBizSC) {
+            await sellercraftCtrl.updateSellercraftStock(prevBizSC, { ...inventory, bizplace: inventory.bizplace })
+          }
+        }
 
-        if (sellercraft) {
-          const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-          await sellercraftCtrl.updateSellercraftStock(sellercraft, inventory)
-          if (newRecord?.product || newRecord?.bizplace) {
-            if (!newRecord?.product) newRecord.product = inventory.product
+        const currentBizSC: Sellercraft = await tx.getRepository(Sellercraft).findOne({
+          where: {
+            domain: newRecord?.bizplace?.domain || inventory?.bizplace?.domain,
+            status: SellercraftStatus.ACTIVE
+          },
+          relations: ['domain']
+        })
 
-            await sellercraftCtrl.updateSellercraftStock(sellercraft, newRecord)
-          }
+        if (currentBizSC) {
+          if (newRecord?.product?.id && newRecord?.product?.id != inventory?.product?.id)
+            await sellercraftCtrl.updateSellercraftStock(currentBizSC, {
+              ...inventory,
+              bizplace: newRecord?.bizplace || inventory?.bizplace,
+              product: inventory.product
+            })
+
+          await sellercraftCtrl.updateSellercraftStock(currentBizSC, {
+            ...inventory,
+            bizplace: newRecord?.bizplace || inventory?.bizplace,
+            product: newRecord?.product || inventory?.product
+          })
         }
 
         // check for any existing active marketplace connection, update marketplace selling qty
@@ -832,7 +881,7 @@ export async function approveInventoryChanges(patches: any, context: any) {
 
       // Adding Inventory
       else {
-        const total = await tx.getRepository(Inventory).count({
+        const total = await tx.getRepository(Inventory).countBy({
           createdAt: MoreThan(new Date(year, month, date))
         })
 
@@ -869,7 +918,7 @@ export async function approveInventoryChanges(patches: any, context: any) {
         newRecord.palletId = palletId
 
         const warehouseCartonSetting: Setting = await tx.getRepository(Setting).findOne({
-          where: { domain, category: 'id-rule', name: 'enable-carton-label' }
+          where: { domain: { id: domain.id }, category: 'id-rule', name: 'enable-carton-label' }
         })
 
         const partnerCartonSetting: PartnerSetting = await tx.getRepository(PartnerSetting).findOne({