@things-factory/warehouse-base 4.3.108 → 4.3.111

package/server/service/inventory/inventory-query.ts

@@ -66,12 +66,7 @@ export class InventoryQuery {
 
       qb.leftJoinAndSelect('inventory.bizplace', 'bizplace')
         .leftJoinAndSelect('inventory.product', 'product')
-        .leftJoinAndSelect('inventory.productDetail', 'productDetail')
-        .leftJoinAndSelect(
-          'product.productDetails',
-          'productDetails',
-          'productDetails.id = inventory.product_detail_id'
-        )
+        //.leftJoinAndSelect('product.productDetails', 'productDetail', 'productDetail.product_id = product.id')
         .leftJoinAndSelect('inventory.warehouse', 'warehouse')
         .leftJoinAndSelect('inventory.location', 'location')
         .leftJoinAndSelect('inventory.creator', 'creator')
@@ -151,12 +146,36 @@ export class InventoryQuery {
         qb.offset((page - 1) * limit).limit(limit)
       }
 
-      let items = (await qb.getRawMany()).map(item => {
-        return {
-          ...new Inventory(item),
-          serialNumbers: item.serial_numbers
-        }
-      })
+      let items: any = await qb.getRawMany()
+
+      items = await Promise.all(
+        items.map(async item => {
+          let productDetails = await tx.getRepository(ProductDetail).find({ where: { product: item.product_id } })
+          let productDetail
+          //if more than one productDetail
+          if (productDetails.length > 1) {
+            productDetail = productDetails.filter(
+              (itm: ProductDetail) =>
+                itm.packingType == item.inventory_packing_type && itm.packingSize == item.inventory_packing_size
+            )
+
+            //if more than one with same packingType and packingSize
+            if (productDetail.length > 1) {
+              productDetail = productDetail.find((itm: ProductDetail) => itm.isDefault == true)
+            } else {
+              productDetail = productDetail[0]
+            }
+          } else {
+            productDetail = productDetails[0]
+          }
+          item = {
+            ...new Inventory(item),
+            serialNumbers: item.serial_numbers,
+            productDetail
+          }
+          return item
+        })
+      )
       let total = await qb.getCount()
 
       return {
@@ -397,7 +416,6 @@ export class InventoryQuery {
           AND "Inventory"."domain_id" = $1
           ${bizplaceQuery}
           ${productQuery}
-          ${inventoryQuery}
           GROUP BY "Product"."id", "Bizplace"."id", "ProductDetailBizplaceSetting"."id", "Inventory"."packing_type", "Location"."type", "ProductRef"."id"
           HAVING 1 = 1
           ${availableStockQuery}
@@ -580,27 +598,23 @@ export class InventoryQuery {
     @Arg('bizplaceName') bizplaceName: string,
     @Ctx() context: any
   ): Promise<Boolean> {
-    try {
-      const invRepo: Repository<Inventory> = getRepository(Inventory)
-      const bizRepo: Repository<Bizplace> = getRepository(Bizplace)
+    const invRepo: Repository<Inventory> = getRepository(Inventory)
+    const bizRepo: Repository<Bizplace> = getRepository(Bizplace)
 
-      const inventory: Inventory = await invRepo.findOne({
-        where: { domain: context.state.domain, palletId, status: INVENTORY_STATUS.STORED },
-        relations: ['bizplace']
-      })
+    const inventory: Inventory = await invRepo.findOne({
+      where: { domain: context.state.domain, palletId, status: INVENTORY_STATUS.STORED },
+      relations: ['bizplace']
+    })
 
-      if (!inventory) throw new Error('This inventory status is not stored.')
+    if (!inventory) throw new Error('This inventory status is not stored.')
 
-      const ownerBizplace: Bizplace = await bizRepo.findOne({
-        where: { name: bizplaceName }
-      })
+    const ownerBizplace: Bizplace = await bizRepo.findOne({
+      where: { name: bizplaceName }
+    })
 
-      const foundBizplace: Bizplace = inventory.bizplace
+    const foundBizplace: Bizplace = inventory.bizplace
 
-      return Boolean(ownerBizplace.id === foundBizplace.id)
-    } catch (e) {
-      return false
-    }
+    return Boolean(ownerBizplace.id === foundBizplace.id)
   }
 
   @Directive('@privilege(category: "inventory", privilege: "query")')
@@ -660,7 +674,7 @@ export class InventoryQuery {
 
     const productBundleSettings: ProductBundleSetting[] = await getRepository(ProductBundleSetting).find({
       where: { productBundle: productBundleId },
-      relations: ['product', 'productDetail', 'productBundle']
+      relations: ['product', 'productBundle']
     })
 
     if (!productBundleSettings.length) {
@@ -671,7 +685,6 @@ export class InventoryQuery {
     buildQuery(qb, params, context)
 
     qb.select('iv.product_id', 'productId')
-      .addSelect('iv.product_detail_id', 'productDetailId')
       .addSelect('iv.batch_id', 'batchId')
       .addSelect('iv.batch_id_ref', 'batchIdRef')
       .addSelect('iv.packing_type', 'packingType')
@@ -700,7 +713,6 @@ export class InventoryQuery {
       productIds: productBundleSettings.map(productBundle => productBundle.product.id)
     })
       .groupBy('iv.product_id')
-      .addGroupBy('iv.product_detail_id')
       .addGroupBy('iv.batch_id')
       .addGroupBy('iv.batch_id_ref')
       .addGroupBy('iv.packing_type')
@@ -729,7 +741,6 @@ export class InventoryQuery {
       return {
         id: pbs.id,
         productId: pbs.product.id,
-        productDetailId: pbs.productDetail.id,
         bundleId: pbs.productBundle.id,
         bundleQty: pbs.bundleQty,
         releaseQty: bundleReleaseQty * pbs.bundleQty,

package/server/service/inventory/inventory-types.ts

@@ -47,9 +47,6 @@ export class InventoryPatch {
   @Field(type => ObjectRef, { nullable: true })
   product?: ObjectRef
 
-  @Field(type => ObjectRef, { nullable: true })
-  productDetail?: ObjectRef
-
   @Field({ nullable: true })
   sku?: string
 

package/server/service/inventory/inventory.ts

@@ -210,9 +210,6 @@ export class Inventory {
   @Field({ nullable: true })
   productId: string
 
-  @Field({ nullable: true })
-  productDetailId: string
-
   @Field({ nullable: true })
   productName: string
 
@@ -305,6 +302,7 @@ export class Inventory {
         description: obj.bizplace_description
       }
       this.product = new Product(obj)
+      this.productDetail = new ProductDetail(obj)
       this.location = new Location(obj)
       this.warehouse = new Warehouse(obj)
       this.name = obj.inventory_name

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

@@ -6,7 +6,8 @@ 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 { Product, ProductDetail } from '@things-factory/product-base'
+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'
 
@@ -202,9 +203,7 @@ export class InventoryChangeMutation {
           newRecord.bizplace = await tx.getRepository(Bizplace).findOne(newRecord.bizplace.id)
 
           var product: Product = await tx.getRepository(Product).findOne(newRecord.product.id)
-          var productDetail: ProductDetail = await tx.getRepository(ProductDetail).findOne(newRecord.productDetailId)
           newRecord.product = product
-          newRecord.productDetail = productDetail
 
           newRecord.status = 'PENDING'
           newRecord.transactionType = 'NEW'
@@ -531,7 +530,6 @@ async function upsertInventoryItems(context, inventoryChange, approvalStatus, tx
           inventoryItem.serialNumber = inventoryItemChange.serialNumber
           inventoryItem.status = INVENTORY_STATUS.STORED
           inventoryItem.product = inventoryChange.inventory.product
-          inventoryItem.productDetail = inventoryChange.inventory.productDetail
           inventoryItem.domain = inventoryItemChange.domain
           inventoryItem.inventory = inventoryChange.inventory
           inventoryItem.source = INVENTORY_ITEM_SOURCE.ADJUSTMENT
@@ -551,8 +549,7 @@ async function upsertInventoryItems(context, inventoryChange, approvalStatus, tx
           inventoryItem = {
             ...existingInventoryItem,
             serialNumber: inventoryItemChange.serialNumber,
-            product: inventoryItemChange.inventory.product,
-            productDetail: inventoryItemChange.inventory.productDetail
+            product: inventoryItemChange.inventory.product
           }
         } else if (changeType == INVENTORY_ITEM_CHANGE_TYPE.REMOVED) {
           inventoryItem = {
@@ -589,7 +586,6 @@ export async function approveInventoryChanges(patches: any, context: any) {
       'bizplace.company',
       'bizplace.company.domain',
       'product',
-      'productDetail',
       'product.productDetails',
       'product.productDetails.childProductDetail',
       'location'
@@ -625,7 +621,6 @@ export async function approveInventoryChanges(patches: any, context: any) {
             'bizplace.company',
             'bizplace.company.domain',
             'product',
-            'productDetail',
             'product.productDetails',
             'product.productDetails.childProductDetail',
             'warehouse',
@@ -635,6 +630,8 @@ export async function approveInventoryChanges(patches: any, context: any) {
           ]
         })
 
+        const customerDomain: Domain = inventory.bizplace.domain
+
         // Check for locked inventory, and stop from udpating inventory
         if (inventory.qty < inventory.lockedQty) {
           arrLockedInventory.push(_inventoryChanges[i])

package/server/service/inventory-history/inventory-history-query.ts

@@ -1,43 +1,10 @@
-import {
-  Arg,
-  Args,
-  Ctx,
-  Directive,
-  FieldResolver,
-  Query,
-  Resolver,
-  Root
-} from 'type-graphql'
-import {
-  Between,
-  Brackets,
-  EntityManager,
-  getRepository,
-  In,
-  IsNull,
-  Raw,
-  SelectQueryBuilder
-} from 'typeorm'
+import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
+import { Between, Brackets, EntityManager, getRepository, In, IsNull, Raw, SelectQueryBuilder } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import {
-  Bizplace,
-  getMyBizplace,
-  getPermittedBizplaceIds
-} from '@things-factory/biz-base'
-import {
-  Product,
-  ProductDetail
-} from '@things-factory/product-base'
-import {
-  buildQuery,
-  convertListParams,
-  Domain,
-  Filter,
-  ListParam,
-  Pagination,
-  Sorting
-} from '@things-factory/shell'
+import { Bizplace, getMyBizplace, getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
+import { buildQuery, convertListParams, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
 
 import { RawInventoryHistoryList } from '../'
 import { InventoryList } from '../inventory/inventory-types'
@@ -263,8 +230,6 @@ export class InventoryHistoryQuery {
           Lower(prd.name) LIKE ANY(ARRAY[${productValue}])
           OR Lower(prd.sku) LIKE ANY(ARRAY[${productValue}])
           OR Lower(prd.description) LIKE ANY(ARRAY[${productValue}])
-          OR Lower(prd.brand) LIKE ANY(ARRAY[${productValue}])
-          OR Lower(prd.brand_sku) LIKE ANY(ARRAY[${productValue}])
         )`
       }
 
@@ -1460,7 +1425,7 @@ export class InventoryHistoryQuery {
           rih.bizplace_id as bizplace_id,
           cast(rih.created_at + (interval '8 hour') as DATE) as "tempDate"
           from reduced_inventory_histories rih
-          left join product_details pd on pd.id = rih.product_detail_id
+          left join product_details pd on pd.product_id = rih.product_id and pd.packing_type = rih.packing_type
           where rih.status not like 'TERMINATED' and rih.bizplace_id = $1
           group by CAST(rih.created_at + (interval '8 hour') as DATE), rih.bizplace_id
         )
@@ -1500,8 +1465,8 @@ export class InventoryHistoryQuery {
       await tx.query(
         `
         create temp table temp_result ON COMMIT drop as(
-          select lag(sub."closingQty", 1, 0::double precision) over (partition by sub.bizplace_id order by sub.date) as "openingQty", 
-          lag(sub."closingVolume", 1, 0::numeric) over (partition by sub.bizplace_id order by sub.date) as "openingVolume", sub.* from(
+          select lag(sub."closingQty", 1, 0) over (partition by sub.bizplace_id order by sub.date) as "openingQty", 
+          lag(sub."closingVolume", 1, 0) over (partition by sub.bizplace_id order by sub.date) as "openingVolume", sub.* from(
           select (select sum(tmp2.total) from temp_reduced_inventory_histories_with_date_range tmp2 where tmp2.row <= tmp.row) as "closingQty",
           (select sum(tmp2."totalVolume") from temp_reduced_inventory_histories_with_date_range tmp2 where tmp2.row <= tmp.row) as "closingVolume", tmp.* from
           temp_reduced_inventory_histories_with_date_range tmp) sub

package/server/service/inventory-item/inventory-item.ts

@@ -11,7 +11,7 @@ import {
 } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Product, ProductDetail} from '@things-factory/product-base'
+import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 
 import { Inventory } from '../inventory/inventory'
@@ -32,8 +32,7 @@ export class InventoryItem {
 
   @RelationId((inventoryItem: InventoryItem) => inventoryItem.domain)
   domainId?: string
-  
-  
+
   @Column()
   @Field()
   name: string
@@ -58,19 +57,13 @@ export class InventoryItem {
   @Field({ nullable: true })
   outboundOrderId: string
 
-
   @ManyToOne(type => Product)
   @Field(type => Product, { nullable: true })
   product?: Product
 
-  
   @RelationId((inventoryItem: InventoryItem) => inventoryItem.product)
   productId?: string
 
-  @ManyToOne(type => ProductDetail, { nullable: true })
-  @Field({ nullable: true })
-  productDetail: ProductDetail
-
   @ManyToOne(type => Inventory)
   @Field(type => Inventory)
   inventory?: Inventory

package/server/service/inventory-product/inventory-product.ts

@@ -11,7 +11,7 @@ import {
 } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Product, ProductDetail } from '@things-factory/product-base'
+import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 
 @Entity()
@@ -60,10 +60,6 @@ export class InventoryProduct {
   @RelationId((inventoryProduct: InventoryProduct) => inventoryProduct.product)
   productId?: string
 
-  @ManyToOne(type => ProductDetail, { nullable: true })
-  @Field({ nullable: true })
-  productDetail: ProductDetail
-
   @CreateDateColumn()
   @Field({ nullable: true })
   createdAt?: Date

package/server/service/location/location-mutation.ts

@@ -77,12 +77,10 @@ export class LocationMutation {
   @Mutation(returns => Boolean)
   async deleteAllLocations(@Arg('warehouseId') warehouseId: string, @Ctx() context: any) {
     const { tx }: { tx: EntityManager } = context.state
-    let warehouse = await tx.getRepository(Warehouse).findOne(warehouseId)
 
     await tx.getRepository(Location).delete({
-      warehouse
+      warehouse: await tx.getRepository(Warehouse).findOne(warehouseId)
     })
-    return true
   }
 }
 

package/server/service/pallet/pallet-mutation.ts

@@ -1,5 +1,5 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, In, getRepository } from 'typeorm'
+import { EntityManager, In } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
@@ -8,7 +8,6 @@ import { Domain } from '@things-factory/shell'
 import { PalletHistory } from '../pallet-history/pallet-history'
 import { Pallet } from './pallet'
 import { NewPallet, PalletPatch } from './pallet-types'
-import i18next from 'i18next'
 
 @Resolver(Pallet)
 export class PalletMutation {
@@ -26,8 +25,12 @@ export class PalletMutation {
   }
 
   @Directive('@transaction')
-  @Mutation(returns => Boolean)
-  async updatePallet(@Arg('name') name: string, @Arg('patch') patch: PalletPatch, @Ctx() context: any) {
+  @Mutation(returns => Pallet)
+  async updatePallet(
+    @Arg('name') name: string,
+    @Arg('patch') patch: PalletPatch,
+    @Ctx() context: any
+  ): Promise<Pallet> {
     const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
 
     const repository = tx.getRepository(Pallet)
@@ -43,66 +46,80 @@ export class PalletMutation {
   }
 
   @Directive('@transaction')
-  @Mutation(returns => Boolean)
-  async updateMultiplePallet(@Arg('patches', type => [PalletPatch]) patches: PalletPatch[], @Ctx() context: any) {
+  @Mutation(returns => [Pallet])
+  async updateMultiplePallet(
+    @Arg('patches', type => [PalletPatch]) patches: PalletPatch[],
+    @Ctx() context: any
+  ): Promise<Pallet[]> {
     const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
 
-    for (let patch of patches) {
-      let foundPallet: Pallet
+    let results = []
+    const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
+    const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
 
-      if (patch.name) {
-        foundPallet = await getRepository(Pallet).findOne({
-          where: {
-            domain,
-            name: patch.name
-          },
-          relations: ['owner', 'holder']
-        })
-      } else if (patch.id) {
-        foundPallet = await getRepository(Pallet).findOne({
-          where: {
-            domain,
-            id: patch.id
-          },
-          relations: ['owner', 'holder']
-        })
-      }
+    if (_createRecords.length > 0) {
+      for (let i = 0; i < _createRecords.length; i++) {
+        const newRecord = _createRecords[i]
 
-      if (!foundPallet) {
-        delete patch?.id
+        if (newRecord.owner && newRecord.owner.id) {
+          newRecord.owner = await tx.getRepository(Bizplace).findOne(newRecord.owner.id)
+        }
+
+        if (newRecord.holder && newRecord.holder.id) {
+          newRecord.holder = await tx.getRepository(Bizplace).findOne(newRecord.holder.id)
+        }
 
-        let newPallet = await tx.getRepository(Pallet).save({ ...patch, domain, creator: user, updater: user })
+        const result: Pallet = await tx.getRepository(Pallet).save({
+          domain: domain,
+          creator: user,
+          updater: user,
+          ...newRecord
+        })
 
         await tx.getRepository(PalletHistory).save({
-          ...patch,
-          pallet: newPallet,
+          ...newRecord,
+          pallet: result,
           domain: domain,
           creator: user,
           updater: user,
           transactionType: 'NEW'
         })
-      } else {
-        if (patch.cuFlag === '+') {
-          throw new Error(i18next.t('error.pallet (x) already exists', { x: patch.name }))
+
+        results.push({ ...result, cuFlag: '+' })
+      }
+    }
+
+    if (_updateRecords.length > 0) {
+      for (let i = 0; i < _updateRecords.length; i++) {
+        const newRecord = _updateRecords[i]
+        const pallet = await tx.getRepository(Pallet).findOne({
+          where: { id: newRecord.id },
+          relations: ['owner', 'holder']
+        })
+        const seq = pallet.seq + 1
+
+        if (newRecord.owner && newRecord.owner.id) {
+          newRecord.owner = await tx.getRepository(Bizplace).findOne(newRecord.owner.id)
+        }
+
+        if (newRecord.holder && newRecord.holder.id) {
+          newRecord.holder = await tx.getRepository(Bizplace).findOne(newRecord.holder.id)
         }
-        delete patch.cuFlag
-
-        let updatedPallet: any = await tx.getRepository(Pallet).update(
-          { id: foundPallet.id },
-          {
-            ...patch,
-            updater: user,
-            seq: foundPallet.seq++,
-            refOrderNo: null
-          }
-        )
+
+        const result = await tx.getRepository(Pallet).save({
+          ...pallet,
+          ...newRecord,
+          seq,
+          updater: user,
+          refOrderNo: null
+        })
 
         let newHistory = {
-          ...foundPallet,
-          ...patch,
-          pallet: updatedPallet,
-          seq: updatedPallet.seq,
-          domain,
+          ...pallet,
+          ...newRecord,
+          pallet: result,
+          seq,
+          domain: domain,
           creator: user,
           updater: user,
           transactionType: 'UPDATE'
@@ -113,10 +130,12 @@ export class PalletMutation {
         await tx.getRepository(PalletHistory).save({
           ...newHistory
         })
+
+        results.push({ ...result, cuFlag: 'M' })
       }
     }
 
-    return true
+    return results
   }
 
   @Directive('@transaction')

package/server/service/tote/tote-mutation.ts

@@ -97,7 +97,7 @@ export class ToteMutation {
 
         let foundTote = await tx
           .getRepository(Tote)
-          .findOne({ where: { domain, name: tote.name, bizplace: newRecord.bizplace } })
+          .findOne({ where: { domain, name: newRecord.name, bizplace: newRecord.bizplace } })
 
         if (foundTote) {
           throw new Error('Duplicated tote found')

package/server/service/tote/tote-query.ts

@@ -1,5 +1,5 @@
-import { Arg, Ctx, FieldResolver, Query, Resolver, Root, Directive } from 'type-graphql'
-import { getRepository, IsNull, EntityManager } from 'typeorm'
+import { Arg, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
+import { getRepository, IsNull } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
@@ -10,7 +10,6 @@ import { ToteList } from './tote-types'
 
 @Resolver(Tote)
 export class ToteQuery {
-  @Directive('@transaction')
   @Query(returns => ToteList)
   async totes(
     @Ctx() context: any,
@@ -18,12 +17,11 @@ export class ToteQuery {
     @Arg('pagination', type => Pagination, { nullable: true }) pagination?: Pagination,
     @Arg('sortings', type => [Sorting], { nullable: true }) sortings?: Sorting[]
   ): Promise<ToteList> {
-    const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+    const { domain }: { domain: Domain } = context.state
 
-    const deletedFilter: any = filters.find((filter: any) => filter.name === 'deleted_at')
-    delete filters[filters.indexOf(deletedFilter)]
+    const deletedFilter: any = filters.find((filter: any) => filter.name === 'deleted' && filter.value === true)
 
-    const queryBuilder = tx.getRepository(Tote).createQueryBuilder()
+    const queryBuilder = getRepository(Tote).createQueryBuilder()
     buildQuery(queryBuilder, { filters, pagination, sortings }, context)
 
     queryBuilder
@@ -31,9 +29,9 @@ export class ToteQuery {
       .leftJoinAndSelect('Tote.bizplace', 'Bizplace')
       .leftJoinAndSelect('Tote.creator', 'Creator')
       .leftJoinAndSelect('Tote.updater', 'Updater')
-      .andWhere('Domain.id = :domainId', { domainId: domain.id })
+      .where('Domain.id = :domainId', { domainId: domain.id })
 
-    if (deletedFilter.value) {
+    if (deletedFilter) {
       queryBuilder.andWhere('Tote.deletedAt IS NOT NULL')
     } else {
       queryBuilder.andWhere('Tote.deletedAt IS NULL')

package/server/service/warehouse/warehouse-mutation.ts

@@ -7,8 +7,6 @@ import { Domain } from '@things-factory/shell'
 import { Warehouse } from './warehouse'
 import { NewWarehouse, WarehousePatch } from './warehouse-types'
 
-import i18next from 'i18next'
-
 @Resolver(Warehouse)
 export class WarehouseMutation {
   @Directive('@privilege(category: "warehouse", privilege: "mutation")')
@@ -31,48 +29,11 @@ export class WarehouseMutation {
 
   @Directive('@privilege(category: "warehouse", privilege: "mutation")')
   @Directive('@transaction')
-  @Mutation(returns => Boolean)
+  @Mutation(returns => [Warehouse])
   async updateMultipleWarehouse(
     @Arg('patches', type => [WarehousePatch]) patches: WarehousePatch[],
     @Ctx() context: any
-  ) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-
-    for (let patch of patches) {
-      let foundWarehouse: Warehouse
-
-      if (patch?.name) {
-        foundWarehouse = await tx.getRepository(Warehouse).findOne({
-          domain,
-          name: patch.name
-        })
-      } else if (patch?.id) {
-        foundWarehouse = await tx.getRepository(Warehouse).findOne({
-          domain,
-          id: patch.id
-        })
-      }
-
-      if (!foundWarehouse) {
-        delete patch?.id
-        await tx.getRepository(Warehouse).save({ ...patch, domain, creator: user, updater: user })
-      } else {
-        if (patch.cuFlag === '+') {
-          throw new Error(i18next.t('error.warehouse (x) already exists', { x: patch.name }))
-        }
-        delete patch.cuFlag
-        await tx.getRepository(Warehouse).update(
-          { id: foundWarehouse.id },
-          {
-            ...patch,
-            updater: user
-          }
-        )
-      }
-    }
-
-    return true
-
+  ): Promise<Warehouse[]> {
     let results = []
     const _createRecords = patches.filter((patch: any) => patch.cuFlag === '+')
     const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')