@things-factory/warehouse-base 4.1.41 → 4.2.2

package/server/constants/inventory.ts

@@ -10,7 +10,9 @@ export const INVENTORY_STATUS = {
   DELETED: 'DELETED',
   CHECKED: 'CHECKED',
   PICKED: 'PICKED',
-  PICKING: 'PICKING'
+  PICKING: 'PICKING',
+  SORTING: 'SORTING',
+  SORTED: 'SORTED'
 }
 
 export const INVENTORY_TYPES = {
@@ -56,3 +58,9 @@ export const INVENTORY_ITEM_SOURCE = {
   OUTBOUND: 'OUTBOUND',
   ADJUSTMENT: 'ADJUSTMENT'
 }
+
+export const INVENTORY_ITEM_CHANGE_TYPE = {
+  NEW: 'NEW',
+  MODIFIED: 'MODIFIED',
+  REMOVED: 'REMOVED'
+}

package/server/service/index.ts

@@ -2,6 +2,10 @@ import { entities as InventoryEntities, resolvers as InventoryResolvers } from '
 import { entities as InventoryChangeEntities, resolvers as InventoryChangeResolvers } from './inventory-change'
 import { entities as InventoryHistoryEntities, resolvers as InventoryHistoryResvolers } from './inventory-history'
 import { entities as InventoryItemEntities, resolvers as InventoryItemResolvers } from './inventory-item'
+import {
+  entities as InventoryItemChangeEntities,
+  resolvers as InventoryItemChangeResolvers
+} from './inventory-item-change'
 import { entities as LocationEntities, resolvers as LocationResolvers } from './location'
 import { entities as MovementEntities, resolvers as MovementResolvers } from './movement'
 import { entities as PalletEntities, resolvers as PalletResolvers } from './pallet'
@@ -11,7 +15,9 @@ import { entities as ReducedInventoryHistoryEntities } from './reduced-inventory
 import { entities as WarehouseEntities, resolvers as WarehouseResolvers } from './warehouse'
 
 /* EXPORT ENTITY TYPES */
+export * from './inventory-item-change/inventory-item-change'
 export * from './inventory-item/inventory-item'
+export * from './inventory-item-change/inventory-item-change'
 export * from './inventory/inventory'
 export * from './inventory-change/inventory-change'
 export * from './inventory-history/inventory-history'
@@ -27,6 +33,7 @@ export * from './reduced-inventory-history/reduced-inventory-history'
 export * from './inventory/inventory-types'
 export * from './inventory/inventory-types'
 export * from './inventory-item/inventory-item'
+export * from './inventory-item-change/inventory-item-change'
 export * from './inventory-change/inventory-change-types'
 export * from './inventory-history/inventory-history-types'
 export * from './location/location-types'
@@ -41,6 +48,7 @@ export const entities = [
   ...InventoryChangeEntities,
   ...InventoryHistoryEntities,
   ...InventoryItemEntities,
+  ...InventoryItemChangeEntities,
   ...LocationEntities,
   ...MovementEntities,
   ...PalletEntities,
@@ -56,6 +64,7 @@ export const schema = {
     ...InventoryChangeResolvers,
     ...InventoryHistoryResvolers,
     ...InventoryItemResolvers,
+    ...InventoryItemChangeResolvers,
     ...LocationResolvers,
     ...MovementResolvers,
     ...PalletResolvers,

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

@@ -11,6 +11,7 @@ import { INVENTORY_STATUS, LOCATION_TYPE } from '../../constants'
 import { InventoryChange } from '../inventory-change/inventory-change'
 import { Inventory } from './inventory'
 import { InventoryBundleGroupDetail, InventoryList } from './inventory-types'
+import { InventoryItem } from '../inventory-item/inventory-item'
 
 @Resolver(Inventory)
 export class InventoryQuery {
@@ -70,6 +71,12 @@ export class InventoryQuery {
         .leftJoinAndSelect('iv.product', 'product')
         .leftJoinAndSelect('iv.warehouse', 'warehouse')
         .leftJoinAndSelect('iv.location', 'location')
+        .leftJoin('iv.inventoryItems', 'ivi')
+        .loadRelationCountAndMap('iv.inventoryItemCount', 'iv.inventoryItems', 'ivic', qb =>
+          qb.andWhere('ivic.status = :ivicStatus', {
+            ivicStatus: INVENTORY_STATUS.STORED
+          })
+        )
 
       if (remainOnly) {
         qb.andWhere('iv.qty > 0')
@@ -136,10 +143,22 @@ export class InventoryQuery {
             }
           })
 
+          let inventoryItems: InventoryItem[] = await getRepository(InventoryItem).find({
+            where: { domain, inventory: item }
+          })
+
+          let serialNumbers: string =
+            inventoryItems
+              .map(inventoryItem => {
+                return inventoryItem.serialNumber
+              })
+              .join(',') || ''
+
           return {
             ...item,
             remainQty: item.qty - selectedQty,
-            remainUomValue: item.uomValue - selectedUomValue
+            remainUomValue: item.uomValue - selectedUomValue,
+            serialNumbers: serialNumbers
           }
         })
       )
@@ -745,6 +764,27 @@ export class InventoryQuery {
         .offset((page - 1) * limit)
         .limit(limit)
         .getRawMany()
+
+      await Promise.all(
+        items.map(async item => {
+          let inventoryItems: InventoryItem[] = await getRepository(InventoryItem).find({
+            where: { domain, inventory: item }
+          })
+
+          let serialNumbers: string =
+            inventoryItems
+              .map(inventoryItem => {
+                return inventoryItem.serialNumber
+              })
+              .join(',') || ''
+
+          return {
+            ...item,
+            serialNumbers: serialNumbers
+          }
+        })
+      )
+
       let total = await qb.getCount()
       return { items: items.map(item => new Inventory(item)), total }
     } catch (error) {
@@ -843,9 +883,7 @@ export async function inventoriesByStrategy(
       qb.orderBy('"INV"."created_at"', 'ASC')
       if (locationSortingRules?.length > 0) {
         locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
-          idx === 0
-            ? qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
-            : qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+          qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
         })
       }
       break
@@ -854,9 +892,7 @@ export async function inventoriesByStrategy(
       qb.orderBy('"INV"."created_at"', 'DESC')
       if (locationSortingRules?.length > 0) {
         locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
-          idx === 0
-            ? qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
-            : qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+          qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
         })
       }
       break
@@ -865,9 +901,16 @@ export async function inventoriesByStrategy(
       qb.orderBy('"INV"."expiration_date"', 'ASC')
       if (locationSortingRules?.length > 0) {
         locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
-          idx === 0
-            ? qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
-            : qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+          qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+        })
+      }
+      break
+
+    case 'FMFO':
+      qb.orderBy('"INV"."manufacture_date"', 'ASC')
+      if (locationSortingRules?.length > 0) {
+        locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
+          qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
         })
       }
       break
@@ -880,10 +923,6 @@ export async function inventoriesByStrategy(
             : qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
         })
       } else qb.orderBy('"LOC"."name"', 'DESC')
-      break
-    default:
-      qb.orderBy('"INV"."created_at"', 'ASC')
-
       break
   }
 

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

@@ -122,6 +122,12 @@ export class InventoryPatch {
   @Field(type => Float, { nullable: true })
   unitCost?: number
 
+  @Field({ nullable: true })
+  inventoryItemChangesJson?: string
+
+  @Field({ nullable: true })
+  serialNumbers?: string
+
   @Field({ nullable: true })
   updatedAt?: string
 
@@ -202,6 +208,9 @@ export class NewInventory {
 
   @Field(type => ScalarDate, { nullable: true })
   manufactureDate: Date
+
+  @Field({ nullable: true })
+  serialNumbers?: string
 }
 
 @ObjectType()

package/server/service/inventory/inventory.ts

@@ -17,6 +17,7 @@ import { Product, ProductDetail } from '@things-factory/product-base'
 import { Domain, ScalarDate } from '@things-factory/shell'
 
 import { InventoryChange } from '../inventory-change/inventory-change'
+import { InventoryItem } from '../inventory-item/inventory-item'
 import { Location } from '../location/location'
 import { Pallet } from '../pallet/pallet'
 import { Warehouse } from '../warehouse/warehouse'
@@ -195,6 +196,13 @@ export class Inventory {
   @Field(type => [InventoryChange], { nullable: true })
   inventoryChanges: InventoryChange[]
 
+  @OneToMany(type => InventoryItem, inventoryItems => inventoryItems.inventory)
+  @Field(type => [InventoryItem], { nullable: true })
+  inventoryItems: InventoryItem[]
+
+  @Field({ nullable: true })
+  serialNumbers?: string
+
   @Column('date', { nullable: true })
   @Field(type => ScalarDate, { nullable: true })
   expirationDate: Date
@@ -255,6 +263,15 @@ export class Inventory {
   @Field({ nullable: true })
   changeCount?: number
 
+  @Field({ nullable: true })
+  binLocation?: string
+
+  @Field({ nullable: true })
+  orderNo?: string
+
+  @Field({ nullable: true })
+  inventoryItemCount: number
+
   constructor(obj?) {
     if (obj) {
       this.id = obj.Inventory_id

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

@@ -10,10 +10,13 @@ import { Product } from '@things-factory/product-base'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
-import { INVENTORY_STATUS, LOCATION_STATUS } from '../../constants'
+import { INVENTORY_ITEM_CHANGE_TYPE, INVENTORY_ITEM_SOURCE, INVENTORY_STATUS, LOCATION_STATUS } from '../../constants'
 import { EcommerceController, SellercraftController } from '../../controllers'
 import { InventoryNoGenerator } from '../../utils'
 import { InventoryHistory } from '../inventory-history/inventory-history'
+import { InventoryItemChange } from '../inventory-item-change/inventory-item-change'
+import { InventoryItem } from '../inventory-item/inventory-item'
+import { checkExistingSerialNumber } from '../inventory-item/inventory-item-query'
 import { Inventory } from '../inventory/inventory'
 import { InventoryPatch } from '../inventory/inventory-types'
 import { Location } from '../location/location'
@@ -150,6 +153,7 @@ export class InventoryChangeMutation {
       }
 
       if (foundExistingPallet) {
+        delete patches[i].serialNumbers
         _updateRecords.push(patches[i])
       } else {
         _createRecords.push(patches[i])
@@ -157,6 +161,7 @@ export class InventoryChangeMutation {
     }
 
     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]
@@ -182,7 +187,7 @@ export class InventoryChangeMutation {
             ? null
             : newRecord.expirationDate
 
-        await inventoryChangeRepo.save({
+        const newInventoryChange: InventoryChange = await inventoryChangeRepo.save({
           ...newRecord,
           id: undefined,
           name: InventoryNoGenerator.inventoryName(),
@@ -190,6 +195,56 @@ export class InventoryChangeMutation {
           creator: user,
           updater: user
         })
+
+        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
+            }
+
+            inventoryItemChanges.push(inventoryItemChange)
+          }
+
+          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')
+            }
+          }
+
+          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)
+        }
       }
     }
 
@@ -222,8 +277,14 @@ export class InventoryChangeMutation {
         if (!!updateRecord?.bizplace?.id)
           updateRecord.bizplace = await tx.getRepository(Bizplace).findOne(updateRecord.bizplace.id)
 
-        if (!!updateRecord?.product?.id)
-          updateRecord.product = await tx.getRepository(Product).findOne(updateRecord.product.id)
+        let product: Product
+
+        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 = 'CHANGES'
@@ -233,7 +294,7 @@ export class InventoryChangeMutation {
             ? null
             : updateRecord.expirationDate
 
-        await inventoryChangeRepo.save({
+        const updatedInventoryChange: InventoryChange = await inventoryChangeRepo.save({
           palletId: existingRecord.palletId,
           ...updateRecord,
           id: undefined,
@@ -243,6 +304,44 @@ export class InventoryChangeMutation {
           creator: user,
           updater: user
         })
+
+        // create new inventory items
+        if (updateRecord?.inventoryItemChangesJson) {
+          const originalInventoryItems: InventoryItem[] = await tx.getRepository(InventoryItem).find({
+            where: { domain, inventory: existingRecord }
+          })
+          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')
+            }
+          }
+
+          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)
+          })
+
+          await inventoryItemChangeRepo.save(newInventoryItemChanges)
+        }
       }
     }
 
@@ -509,6 +608,8 @@ export class InventoryChangeMutation {
             }
           }
 
+          await upsertInventoryItems(context, _inventoryChanges[i], 'APPROVED', tx)
+
           const sellercraft: Sellercraft = await tx
             .getRepository(Sellercraft)
             .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
@@ -626,6 +727,8 @@ export class InventoryChangeMutation {
           _inventoryChanges[i].inventory = savedInventory
           _inventoryChanges[i].palletId = savedInventory.palletId
 
+          await upsertInventoryItems(context, _inventoryChanges[i], 'APPROVED', tx)
+
           const sellercraft: Sellercraft = await tx
             .getRepository(Sellercraft)
             .findOne({ domain: newRecord.bizplace.domain, status: SellercraftStatus.ACTIVE })
@@ -666,7 +769,7 @@ export class InventoryChangeMutation {
     @Arg('patches', type => [InventoryChangePatch]) patches: InventoryChangePatch[],
     @Ctx() context: any
   ): Promise<Boolean> {
-    const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
 
     const _inventoryChanges = await tx.getRepository(InventoryChange).find({
       where: { id: In(patches.map(item => item.id)) },
@@ -695,6 +798,8 @@ export class InventoryChangeMutation {
         })
 
         if (latestEntry.length > 0) _inventoryChanges[i].lastInventoryHistory = latestEntry[0]
+
+        await upsertInventoryItems(context, _inventoryChanges[i], 'REJECTED', tx)
       }
 
       await tx.getRepository(InventoryChange).save(_inventoryChanges.filter(change => change.status == 'REJECTED'))
@@ -712,3 +817,69 @@ function clean(obj) {
     }
   }
 }
+
+async function upsertInventoryItems(context, inventoryChange, approvalStatus, tx) {
+  const { domain, user }: { domain: Domain; user: User } = context.state
+
+  let inventoryItemChanges: InventoryItemChange[] = await tx.getRepository(InventoryItemChange).find({
+    where: { domain, inventoryChange: inventoryChange, status: 'PENDING' },
+    relations: ['domain', 'inventoryItem', 'inventory', 'inventory.product', 'inventoryChange']
+  })
+  await Promise.all(
+    inventoryItemChanges.map(async inventoryItemChange => {
+      let inventoryItem: InventoryItem = new InventoryItem()
+      if (approvalStatus == 'APPROVED') {
+        const changeType: string = inventoryItemChange.type
+        const existingInventoryItem: InventoryItem = inventoryItemChange.inventoryItem
+        if (changeType == INVENTORY_ITEM_CHANGE_TYPE.NEW) {
+          const foundSerialNumber: Boolean = await checkExistingSerialNumber(
+            inventoryItemChange.serialNumber,
+            inventoryChange.inventory.product,
+            context,
+            inventoryChange.inventory,
+            tx
+          )
+
+          if (foundSerialNumber) throw new Error(`Serial number ${inventoryItemChange.serialNumber} is duplicated`)
+
+          inventoryItem.name = InventoryNoGenerator.inventoryName()
+          inventoryItem.serialNumber = inventoryItemChange.serialNumber
+          inventoryItem.status = INVENTORY_STATUS.STORED
+          inventoryItem.product = inventoryChange.inventory.product
+          inventoryItem.domain = inventoryItemChange.domain
+          inventoryItem.inventory = inventoryChange.inventory
+          inventoryItem.source = INVENTORY_ITEM_SOURCE.ADJUSTMENT
+          inventoryItem.creator = user
+          inventoryItem.updater = user
+        } else if (changeType == INVENTORY_ITEM_CHANGE_TYPE.MODIFIED) {
+          const foundSerialNumber: Boolean = await checkExistingSerialNumber(
+            inventoryItemChange.serialNumber,
+            inventoryItemChange.inventory.product,
+            context,
+            inventoryItemChange.inventory,
+            tx
+          )
+
+          if (foundSerialNumber) throw new Error(`Serial number ${inventoryItemChange.serialNumber} is duplicated`)
+
+          inventoryItem = {
+            ...existingInventoryItem,
+            serialNumber: inventoryItemChange.serialNumber,
+            product: inventoryItemChange.inventory.product
+          }
+        } else if (changeType == INVENTORY_ITEM_CHANGE_TYPE.REMOVED) {
+          inventoryItem = {
+            ...existingInventoryItem,
+            status: INVENTORY_STATUS.DELETED
+          }
+        }
+
+        inventoryItem = await tx.getRepository(InventoryItem).save(inventoryItem)
+      }
+
+      await tx
+        .getRepository(InventoryItemChange)
+        .update({ id: inventoryItemChange.id }, { status: approvalStatus, inventoryItem })
+    })
+  )
+}

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

@@ -44,6 +44,7 @@ export class InventoryChangeQuery {
       .leftJoinAndSelect('ic.product', 'product')
       .leftJoinAndSelect('ic.location', 'location')
       .leftJoinAndSelect('ic.lastInventoryHistory', 'livh')
+      .leftJoinAndSelect('ic.inventoryItemChange', 'itc')
       .leftJoinAndSelect('livh.product', 'livhProduct')
       .leftJoinAndSelect('livh.warehouse', 'livhWarehouse')
       .leftJoinAndSelect('livh.location', 'livhLocation')

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

@@ -16,6 +16,7 @@ import { Product, ProductDetail } from '@things-factory/product-base'
 import { Domain, ScalarDate } from '@things-factory/shell'
 
 import { InventoryHistory } from '../inventory-history/inventory-history'
+import { InventoryItemChange } from '../inventory-item-change/inventory-item-change'
 import { Inventory } from '../inventory/inventory'
 import { Location } from '../location/location'
 
@@ -72,6 +73,10 @@ export class InventoryChange {
   @Field(type => Product, { nullable: true })
   product: Product
 
+  @ManyToOne(type => InventoryItemChange, { nullable: true })
+  @Field(type => InventoryItemChange, { nullable: true })
+  inventoryItemChange: InventoryItemChange
+
   /**
    * To be updated to remove nullable. once all process that links to inventory has been updated to use product detail instead of product
    */

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

@@ -1,7 +1,8 @@
-import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { Brackets, getRepository, SelectQueryBuilder } from 'typeorm'
+import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
+import { Brackets, EntityManager, getRepository, In, Not, SelectQueryBuilder } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
+import { Product } from '@things-factory/product-base'
 import { convertListParams, Domain, ListParam } from '@things-factory/shell'
 
 import { INVENTORY_STATUS } from '../../constants'
@@ -25,11 +26,81 @@ export class InventoryItemQuery {
     const { domain } = context.state
 
     const convertedParams = convertListParams(params, domain.id)
-    const [items, total] = await getRepository(InventoryItem).findAndCount(convertedParams)
+    const [items, total] = await getRepository(InventoryItem).findAndCount({
+      ...convertedParams,
+      relations: ['inventory', 'product']
+    })
 
     return { items, total }
   }
 
+  @Directive('@transaction')
+  @Query(returns => InventoryItemList, { description: 'To fetch multiple InventoryItems with InventoryItemChanges' })
+  async inventoryItemsWithChanges(@Args() params: ListParam, @Ctx() context: any): Promise<InventoryItemList> {
+    const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+
+    const page = params?.pagination?.page
+    const limit = params?.pagination?.limit
+
+    let inventoryFilter = params.filters.find(filter => filter.name == 'inventoryId')
+
+    let items: any = []
+    let total: any = 0
+    if (inventoryFilter) {
+      await tx.query(
+        `
+        create temp table temp_inventory_items on commit drop as (
+          select * from (
+            select ii.id, ii.name, ii.serial_number, '' as "type", 'ORIGINAL' as "transaction_type", i2.id as inventory_id, i2.name as inventory_name, i2.pallet_id as pallet_id, i2.carton_id as carton_id, p2.id as product_id, p2.name as product_name, p2.sku as product_sku from inventory_items ii 
+            inner join inventories i2 on i2.id = ii.inventory_id 
+            inner join products p2 on p2.id = i2.product_id
+            where ii.domain_id = $1 and ii.inventory_id = $2 and ii.status = $3
+          ) src
+        )
+      `,
+        [domain.id, inventoryFilter.value, INVENTORY_STATUS.STORED]
+      )
+
+      const offsetQuery: string = params?.pagination ? `OFFSET ${(page - 1) * limit} LIMIT ${limit}` : ''
+
+      items = await tx.query(`
+        select * from temp_inventory_items ${offsetQuery}
+      `)
+
+      total = await tx.query(`
+        select count(*) from temp_inventory_items
+      `)
+
+      items = items.map(item => {
+        return {
+          id: item.id,
+          name: item.name,
+          serialNumber: item.serial_number,
+          type: item.type,
+          transactionType: item.transaction_type,
+          inventory: {
+            id: item.inventory_id,
+            name: item.inventory_name,
+            palletId: item.pallet_id,
+            cartonId: item.carton_id
+          },
+          product: {
+            id: item.product_id,
+            name: item.product_name,
+            sku: item.product_sku
+          }
+        }
+      })
+
+      total = total[0].count
+    }
+
+    return {
+      items,
+      total
+    }
+  }
+
   @Query(returns => InventoryItemList, { description: 'To fetch multiple InventoryItems by inventory' })
   async inventoryItemsByInventory(@Args() params: ListParam, @Ctx() context: any): Promise<InventoryItemList> {
     const { domain } = context.state
@@ -47,6 +118,7 @@ export class InventoryItemQuery {
     qb.leftJoinAndSelect('ivi.product', 'product').leftJoinAndSelect('ivi.inventory', 'inventory')
     qb.where('ivi.product_id=:productId', { productId: productIdFilter.value })
     qb.andWhere('inventory.status!=:inventoryStatus', { inventoryStatus: INVENTORY_STATUS.PARTIALLY_UNLOADED })
+    qb.andWhere('inventory.domain_id=:domainId', { domainId: domain.id })
 
     if (orderTypeFilter.value == 'inbound') {
       qb.andWhere('ivi.inbound_order_id=:orderId', { orderId: orderIdFilter.value })
@@ -116,3 +188,26 @@ export class InventoryItemQuery {
     return await getRepository(User).findOne(inventoryItem.creatorId)
   }
 }
+
+export async function checkExistingSerialNumber(
+  serialNumber: string,
+  product: Product,
+  context: any,
+  inventory?: Inventory,
+  tx?: EntityManager
+) {
+  const { domain }: { domain: Domain } = context.state
+
+  let countCondition: any = {
+    domain,
+    product,
+    serialNumber,
+    status: Not(In([INVENTORY_STATUS.DELETED, INVENTORY_STATUS.TERMINATED]))
+  }
+
+  if (inventory) countCondition = { ...countCondition, inventory }
+
+  const duplicatedSerialNumberCnt: number = await tx.getRepository(InventoryItem).count(countCondition)
+
+  if (duplicatedSerialNumberCnt) return true
+}