@things-factory/warehouse-base 5.0.2 → 5.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/warehouse-base",
-  "version": "5.0.2",
+  "version": "5.0.12",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,12 +24,12 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/biz-base": "^5.0.1",
-    "@things-factory/id-rule-base": "^5.0.1",
-    "@things-factory/integration-sellercraft": "^5.0.1",
-    "@things-factory/marketplace-base": "^5.0.2",
-    "@things-factory/product-base": "^5.0.2",
-    "@things-factory/setting-base": "^5.0.1"
+    "@things-factory/biz-base": "^5.0.11",
+    "@things-factory/id-rule-base": "^5.0.11",
+    "@things-factory/integration-sellercraft": "^5.0.11",
+    "@things-factory/marketplace-base": "^5.0.11",
+    "@things-factory/product-base": "^5.0.11",
+    "@things-factory/setting-base": "^5.0.11"
   },
-  "gitHead": "009cda6cb65e0930988fb2b1c1a309b9a7973383"
+  "gitHead": "fc92c5a8449721503a893d67aae8e65ce21a7890"
 }

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

@@ -153,7 +153,7 @@ export class InventoryMutation {
           updater: user,
           lastSeq: 0,
           ...newRecord
-        })
+        } as any)
 
         await tx.getRepository(InventoryHistory).save({
           ...newRecord,
@@ -277,7 +277,7 @@ export class InventoryMutation {
             }
 
             delete inventoryHistory.id
-            await tx.getRepository(InventoryHistory).save(inventoryHistory)
+            await tx.getRepository(InventoryHistory).save(inventoryHistory as any)
 
             newHistoryRecord.qty = newRecord.qty || inventory.qty
             newHistoryRecord.uomValue = newRecord.uomValue || inventory.uomValue || 0

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

@@ -1,16 +1,48 @@
-import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { Brackets, EntityManager, Equal, getRepository, Not, Repository, SelectQueryBuilder } from 'typeorm'
-
-import { User } from '@things-factory/auth-base'
-import { Bizplace, getPartnersCompanyBizplaces, getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { Product, ProductBundleSetting, ProductDetail } from '@things-factory/product-base'
-import { Setting } from '@things-factory/setting-base'
-import { buildQuery, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
-
-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 {
+  Arg,
+  Args,
+  Ctx,
+  Directive,
+  FieldResolver,
+  Query,
+  Resolver,
+  Root,
+} from 'type-graphql';
+import {
+  Brackets,
+  EntityManager,
+  Equal,
+  getRepository,
+  Not,
+  Repository,
+  SelectQueryBuilder,
+} from 'typeorm';
+
+import { User } from '@things-factory/auth-base';
+import {
+  Bizplace,
+  getPartnersCompanyBizplaces,
+  getPermittedBizplaceIds,
+} from '@things-factory/biz-base';
+import {
+  Product,
+  ProductBundleSetting,
+  ProductDetail,
+} from '@things-factory/product-base';
+import { Setting } from '@things-factory/setting-base';
+import {
+  buildQuery,
+  Domain,
+  Filter,
+  ListParam,
+  Pagination,
+  Sorting,
+} from '@things-factory/shell';
+
+import { INVENTORY_STATUS, LOCATION_TYPE } from '../../constants';
+import { InventoryChange } from '../inventory-change/inventory-change';
+import { Inventory } from './inventory';
+import { InventoryBundleGroupDetail, InventoryList } from './inventory-types';
 
 @Resolver(Inventory)
 export class InventoryQuery {
@@ -66,7 +98,7 @@ export class InventoryQuery {
 
       const qb: SelectQueryBuilder<Inventory> = getRepository(Inventory).createQueryBuilder('iv')
       buildQuery(qb, params, context, {
-        searchables: ['warehouse', 'product', 'batchId']
+        searchables: ['warehouse', 'product', 'batchId', 'location', 'palletId']
       })
 
       qb.leftJoinAndSelect('iv.bizplace', 'bizplace')
@@ -664,8 +696,8 @@ export class InventoryQuery {
     @Arg('sortings', type => [Sorting], { nullable: true }) sortings?: Sorting[],
     @Arg('locationSortingRules', type => [Sorting], { nullable: true }) locationSortingRules?: Sorting[]
   ): Promise<InventoryList> {
-    const { domain, user }: { domain: Domain; user: User } = context.state
-    const { page, limit }: { page: number; limit: number } = pagination
+    const { domain, user } = context.state
+    const { page, limit } = pagination
 
     try {
       const productFilters = filters.find(x => x.name == 'product_info')

package/server/service/inventory/inventory.ts

@@ -1,3 +1,4 @@
+import { Field, Float, ID, Int, ObjectType } from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
@@ -9,16 +10,16 @@ import {
   RelationId,
   UpdateDateColumn
 } from 'typeorm'
-import { Domain, ScalarDate } from '@things-factory/shell'
-import { Field, Float, ID, Int, ObjectType } from 'type-graphql'
-import { Product, ProductDetail } from '@things-factory/product-base'
 
+import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
+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 { User } from '@things-factory/auth-base'
 import { Warehouse } from '../warehouse/warehouse'
 
 @Entity()
@@ -284,7 +285,7 @@ export class Inventory {
         id: obj.Bizplace_id,
         name: obj.Bizplace_name,
         description: obj.Bizplace_description
-      }
+      } as any
       this.product = new Product(obj)
       this.location = new Location(obj)
       this.warehouse = new Warehouse(obj)

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

@@ -702,7 +702,7 @@ export async function approveInventoryChanges(patches: any, context: any) {
           delete inventoryHistory.id
           delete inventoryHistory.createdAt
           delete inventoryHistory.updatedAt
-          await tx.getRepository(InventoryHistory).save(inventoryHistory)
+          await tx.getRepository(InventoryHistory).save(inventoryHistory as any)
           newHistoryRecord.qty = newRecord.qty != null ? newRecord.qty : inventory.qty || 0
           newHistoryRecord.uomValue = newRecord.uomValue != null ? newRecord.uomValue : inventory.uomValue || 0
           newHistoryRecord.openingQty = 0

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

@@ -2,7 +2,7 @@ import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graph
 import { Brackets, getRepository, SelectQueryBuilder } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Bizplace, getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { buildQuery, Domain, ListParam } from '@things-factory/shell'
 
 import { InventoryChange } from './inventory-change'
@@ -24,7 +24,7 @@ export class InventoryChangeQuery {
   async inventoryChanges(@Args() params: ListParam, @Ctx() context: any): Promise<InventoryChangeList> {
     const { domain, user }: { domain: Domain; user: User } = context.state
 
-    let bizplaces: Bizplace[]
+    let bizplaces: any[]
     if (!params.filters.find(filter => filter.name === 'bizplace')) {
       bizplaces = await getPermittedBizplaceIds(domain, user)
     } else {

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

@@ -1,8 +1,8 @@
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { Between, Brackets, EntityManager, getRepository, In, Raw, SelectQueryBuilder, IsNull } from 'typeorm'
+import { Between, Brackets, EntityManager, getRepository, In, IsNull, Raw, SelectQueryBuilder } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Bizplace, getMyBizplace, getPermittedBizplaceIds, getPermittedBizplace } from '@things-factory/biz-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'
 
@@ -152,7 +152,7 @@ export class InventoryHistoryQuery {
       ...convertedParams.where,
       ...where,
       bizplace: customerBizplace
-    }
+    } as any
 
     const [items, total] = await tx.getRepository(InventoryHistory).findAndCount({
       ...convertedParams,
@@ -183,10 +183,10 @@ export class InventoryHistoryQuery {
       let tzoffset = params.filters.find(data => data.name === 'tzoffset').value + ' seconds'
 
       if (userFilter) {
-        const user: User = await tx.getRepository(User).findOne({
+        const user: User & { bizplaces: Bizplace[] } = (await tx.getRepository(User).findOne({
           where: { id: userFilter.value },
           relations: ['bizplaces']
-        })
+        })) as any
 
         const bizplace: Bizplace = user.bizplaces[0]
 
@@ -428,10 +428,10 @@ export class InventoryHistoryQuery {
       let bizplaceFilter = { name: '', operator: '', value: '' }
 
       if (userFilter) {
-        const user: User = await tx.getRepository(User).findOne({
+        const user: User & { bizplaces: Bizplace[] } = (await tx.getRepository(User).findOne({
           where: { id: userFilter.value },
           relations: ['bizplaces']
-        })
+        })) as any
 
         const bizplace: Bizplace = user.bizplaces[0]
 
@@ -591,10 +591,10 @@ export class InventoryHistoryQuery {
       let bizplaceFilter = { name: '', operator: '', value: '' }
 
       if (userFilter) {
-        const user: User = await tx.getRepository(User).findOne({
+        const user: User & { bizplaces: Bizplace[] } = (await tx.getRepository(User).findOne({
           where: { id: userFilter.value },
           relations: ['bizplaces']
-        })
+        })) as any
 
         const bizplace: Bizplace = user.bizplaces[0]
 
@@ -755,10 +755,10 @@ export class InventoryHistoryQuery {
       let bizplaceFilter = { name: '', operator: '', value: '' }
 
       if (userFilter) {
-        const user: User = await tx.getRepository(User).findOne({
+        const user: User & { bizplaces: Bizplace[] } = (await tx.getRepository(User).findOne({
           where: { id: userFilter.value },
           relations: ['bizplaces']
-        })
+        })) as any
 
         const bizplace: Bizplace = user.bizplaces[0]
 
@@ -903,10 +903,10 @@ export class InventoryHistoryQuery {
       let byPallet = params.filters.find(data => data.name === 'byPallet')
 
       if (userFilter) {
-        const user: User = await tx.getRepository(User).findOne({
+        const user: User & { bizplaces: Bizplace[] } = (await tx.getRepository(User).findOne({
           where: { id: userFilter.value },
           relations: ['bizplaces']
-        })
+        })) as any
 
         const bizplace: Bizplace = user.bizplaces[0]
 
@@ -992,10 +992,10 @@ export class InventoryHistoryQuery {
 
     // prepare query filters
     if (userFilter) {
-      const user: User = await tx.getRepository(User).findOne({
+      const user: User & { bizplaces: Bizplace[] } = (await tx.getRepository(User).findOne({
         where: { id: userFilter.value },
         relations: ['bizplaces']
-      })
+      })) as any
 
       const bizplace: Bizplace = user.bizplaces[0]
 
@@ -1005,15 +1005,15 @@ export class InventoryHistoryQuery {
     } else {
       bizplaceFilter = !filters.find((filter: any) => filter.name === 'bizplace')
         ? {
-          name: 'bizplace',
-          operator: 'in',
-          value: await getPermittedBizplaceIds(domain, user),
-          relation: true
-        }
+            name: 'bizplace',
+            operator: 'in',
+            value: await getPermittedBizplaceIds(domain, user),
+            relation: true
+          }
         : {
-          ...filters.find(data => data.name === 'bizplace'),
-          value: [filters.find(data => data.name === 'bizplace').value]
-        }
+            ...filters.find(data => data.name === 'bizplace'),
+            value: [filters.find(data => data.name === 'bizplace').value]
+          }
     }
 
     let queryFilter = ``
@@ -1080,8 +1080,9 @@ export class InventoryHistoryQuery {
       sortings.forEach((sorting, idx) => {
         let itmIndex = arrObjectMap.findIndex(x => x.name === sorting.name)
 
-        queryOrder = `${idx === 0 ? 'order by' : queryOrder + ','} ${itmIndex >= 0 ? arrObjectMap[itmIndex].value : sorting.name
-          } ${sorting.desc ? 'DESC' : 'ASC'}`
+        queryOrder = `${idx === 0 ? 'order by' : queryOrder + ','} ${
+          itmIndex >= 0 ? arrObjectMap[itmIndex].value : sorting.name
+        } ${sorting.desc ? 'DESC' : 'ASC'}`
       })
     }
 
@@ -1116,7 +1117,7 @@ export class InventoryHistoryQuery {
     `,
       [domain.id, createdAt.value, timezoneOffset]
     )
-    
+
     //comment start
     //detailed review needed 19 May 2022 by @ChrisLim-git
     await tx.query(
@@ -1375,10 +1376,10 @@ export class InventoryHistoryQuery {
       let toDate = params.filters.find(data => data.name === 'toDate')
 
       if (userFilter) {
-        const user: User = await tx.getRepository(User).findOne({
+        const user: User & { bizplaces: Bizplace[] } = (await tx.getRepository(User).findOne({
           where: { id: userFilter.value },
           relations: ['bizplaces']
-        })
+        })) as any
 
         const bizplace: Bizplace = user.bizplaces[0]
 

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

@@ -43,157 +43,157 @@ export class InventoryHistory {
 
   @Column({ default: 0 })
   @Field()
-  seq: number
+  seq?: number
 
   @ManyToOne(type => Domain)
   @Field()
-  domain: Domain
+  domain?: Domain
 
   @RelationId((inventoryHistory: InventoryHistory) => inventoryHistory.domain)
-  domainId: string
+  domainId?: string
 
   @ManyToOne(type => Bizplace)
   @Field()
-  bizplace: Bizplace
+  bizplace?: Bizplace
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  refOrderId: string
+  refOrderId?: string
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  orderNo: string
+  orderNo?: string
 
   @Column()
   @Field()
-  name: string
+  name?: string
 
   @Column()
   @Field()
-  palletId: string
+  palletId?: string
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  cartonId: string
+  cartonId?: string
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  batchId: string
+  batchId?: string
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  batchIdRef: string
+  batchIdRef?: string
 
   @ManyToOne(type => Pallet, { nullable: true })
   @Field({ nullable: true })
-  reusablePallet: Pallet
+  reusablePallet?: Pallet
 
   @ManyToOne(type => Product, { nullable: true })
   @Field(type => Product, { nullable: true })
-  product: Product
+  product?: Product
 
   /**
    * To be updated to remove nullable. once all process that links to inventory has been updated to use product detail instead of product
    */
   @ManyToOne(type => ProductDetail, { nullable: true })
   @Field(type => ProductDetail, { nullable: true })
-  productDetail: ProductDetail
+  productDetail?: ProductDetail
 
   @ManyToOne(type => Warehouse, { nullable: true })
   @Field({ nullable: true })
-  warehouse: Warehouse
+  warehouse?: Warehouse
 
   @ManyToOne(type => Location, { nullable: true })
   @Field({ nullable: true })
-  location: Location
+  location?: Location
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  zone: string
+  zone?: string
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  orderRefNo: string
+  orderRefNo?: string
 
   @Column()
   @Field()
-  packingType: string
+  packingType?: string
 
   @Column('float', { nullable: true, default: 1 })
   @Field({ nullable: true })
-  packingSize: number
+  packingSize?: number
 
   @Column('float')
   @Field({ nullable: true })
-  qty: number
+  qty?: number
 
   @Column('float', { default: 0, nullable: true })
   @Field({ nullable: true })
-  openingQty: number
+  openingQty?: number
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  uom: string
+  uom?: string
 
   @Column('float', { nullable: true })
   @Field({ nullable: true })
-  uomValue: number
+  uomValue?: number
 
   @Column('float', { default: 0, nullable: true })
   @Field({ nullable: true })
-  openingUomValue: number
+  openingUomValue?: number
 
   @Column('float', { nullable: true })
   @Field({ nullable: true })
-  unitCost: number
+  unitCost?: number
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  description: string
+  description?: string
 
   @Column()
   @Field()
-  status: string
+  status?: string
 
   @Column()
   @Field()
-  transactionType: string
+  transactionType?: string
 
   @ManyToOne(type => Inventory, { nullable: true })
   @Field(type => Inventory, { nullable: true })
-  inventory: Inventory
+  inventory?: Inventory
 
   @Column('date', { nullable: true })
   @Field(type => ScalarDate, { nullable: true })
-  expirationDate: Date
+  expirationDate?: Date
 
   @Column('int', { nullable: true })
   @Field({ nullable: true })
-  manufactureYear: number
+  manufactureYear?: number
 
   @Column('date', { nullable: true })
   @Field(type => ScalarDate, { nullable: true })
-  manufactureDate: Date
+  manufactureDate?: Date
 
   @ManyToOne(type => User, { nullable: true })
   @Field({ nullable: true })
-  creator: User
+  creator?: User
 
   @RelationId((inventoryHistory: InventoryHistory) => inventoryHistory.creator)
-  creatorId: string
+  creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
   @Field({ nullable: true })
-  updater: User
+  updater?: User
 
   @RelationId((inventoryHistory: InventoryHistory) => inventoryHistory.updater)
-  updaterId: string
+  updaterId?: string
 
   @CreateDateColumn()
   @Field({ nullable: true })
-  createdAt: Date
+  createdAt?: Date
 
   @UpdateDateColumn()
   @Field({ nullable: true })
-  updatedAt: Date
+  updatedAt?: Date
 }

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

@@ -3,7 +3,7 @@ import { In } from 'typeorm'
 
 import { Product } from '@things-factory/product-base'
 
-import { INVENTORY_STATUS, INVENTORY_ITEM_SOURCE } from '../../constants'
+import { INVENTORY_ITEM_SOURCE, INVENTORY_STATUS } from '../../constants'
 import { InventoryNoGenerator } from '../../utils'
 import { InventoryItem } from './inventory-item'
 import { InventoryItemPatch, NewInventoryItem } from './inventory-item-type'
@@ -204,8 +204,8 @@ export class InventoryItemMutation {
       inventoryItem.serialNumber = newSerialNumber
       inventoryItem.status = INVENTORY_STATUS.PICKED
       inventoryItem.outboundOrderId = selectedSerialNumber.outboundOrderId
-      inventoryItem.product = selectedSerialNumber.product
-      inventoryItem.inventory = selectedSerialNumber.inventory
+      inventoryItem.product = selectedSerialNumber.product as any
+      inventoryItem.inventory = selectedSerialNumber.inventory as any
       inventoryItem.domain = domain
 
       return await repository.save(inventoryItem)

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

@@ -41,8 +41,7 @@ export class MovementQuery {
   async inboundMovementsCounter(@Args() params: ListParam, @Ctx() context: any): Promise<MovementCount[]> {
     const { domain, user }: { domain: Domain; user: User } = context.state
 
-    let bizplaces = await getPermittedBizplaceIds(domain, user)
-    bizplaces = bizplaces
+    let bizplaces = (await getPermittedBizplaceIds(domain, user))
       .map(bizplace => {
         return "'" + bizplace.trim() + "'"
       })
@@ -102,8 +101,7 @@ export class MovementQuery {
   async outboundMovementsCounter(@Args() params: ListParam, @Ctx() context: any): Promise<MovementCount[]> {
     const { domain, user }: { domain: Domain; user: User } = context.state
 
-    let bizplaces = await getPermittedBizplaceIds(domain, user)
-    bizplaces = bizplaces
+    let bizplaces = (await getPermittedBizplaceIds(domain, user))
       .map(bizplace => {
         return "'" + bizplace.trim() + "'"
       })
@@ -169,8 +167,7 @@ export class MovementQuery {
   ): Promise<MovementCount[]> {
     const { domain, user }: { domain: Domain; user: User } = context.state
 
-    let bizplaces = await getPermittedBizplaceIds(domain, user)
-    bizplaces = bizplaces
+    let bizplaces = (await getPermittedBizplaceIds(domain, user))
       .map(bizplace => {
         return "'" + bizplace.trim() + "'"
       })