@things-factory/warehouse-base 7.0.1-alpha.10 → 7.0.1-alpha.101

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/warehouse-base",
-  "version": "7.0.1-alpha.10",
+  "version": "7.0.1-alpha.101",
   "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": "^7.0.1-alpha.10",
-    "@things-factory/id-rule-base": "^7.0.1-alpha.10",
-    "@things-factory/integration-sellercraft": "^7.0.1-alpha.10",
-    "@things-factory/marketplace-base": "^7.0.1-alpha.10",
-    "@things-factory/product-base": "^7.0.1-alpha.10",
-    "@things-factory/setting-base": "^7.0.1-alpha.10"
+    "@things-factory/biz-base": "^7.0.1-alpha.100",
+    "@things-factory/id-rule-base": "^7.0.1-alpha.100",
+    "@things-factory/integration-sellercraft": "^7.0.1-alpha.101",
+    "@things-factory/marketplace-base": "^7.0.1-alpha.101",
+    "@things-factory/product-base": "^7.0.1-alpha.100",
+    "@things-factory/setting-base": "^7.0.1-alpha.100"
   },
-  "gitHead": "5adeb2a190f3c6eb5c5cbceac181a3d19fefda9b"
+  "gitHead": "531f4b0e658c733f68e3fd0e7f84e13c2afe7816"
 }

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

@@ -825,6 +825,8 @@ export class InventoryQuery {
       let availableStockFilter = params.filters.find(filter => filter.name == 'availableStock')
       let lowStockFilter = params.filters.find(filter => filter.name == 'lowStock')
       let overStockFilter = params.filters.find(filter => filter.name == 'overStock')
+      let warehouseNameFilter = params.filters.find(filter => filter.name == 'warehouseName')
+      let unexpiredOnlyFilter = params.filters.find(filter => filter.name === 'unexpiredOnly')
 
       if (bizplaceFilter) {
         const bizplaceQueryBuilder: SelectQueryBuilder<Bizplace> = getRepository(Bizplace).createQueryBuilder('b')
@@ -893,6 +895,11 @@ export class InventoryQuery {
         availableStockQuery = ` AND SUM("Inventory"."qty") > 0`
       }
 
+      let unexpiredOnlyQuery = ''
+      if (unexpiredOnlyFilter?.value) {
+        unexpiredOnlyQuery = 'AND "Inventory"."expiration_date" >= CURRENT_DATE'
+      }
+
       let thresholdQuery = ''
       if (lowStockFilter?.value) {
         thresholdQuery = `AND COALESCE("ProductDetailBizplaceSetting"."min_qty", "Product"."min_qty",0) > SUM("Inventory"."qty")`
@@ -903,6 +910,11 @@ export class InventoryQuery {
           COALESCE("ProductDetailBizplaceSetting"."max_qty", "Product"."max_qty",0)  < SUM("Inventory"."qty")`
       }
 
+      let warehouseQuery = ''
+      if (warehouseNameFilter?.value) {
+        warehouseQuery = `AND "Warehouse"."name" like '%${warehouseNameFilter.value}%'`
+      }
+
       await tx.query(
         `
         create temp table temp_inv_history AS 
@@ -927,6 +939,8 @@ export class InventoryQuery {
           AND "Inventory"."domain_id" = $1
           ${bizplaceQuery}
           ${productQuery}
+          ${warehouseQuery}
+          ${unexpiredOnlyQuery}
           GROUP BY "Product"."id", "ProductRef"."id", "Bizplace"."id", "ProductDetailBizplaceSetting"."id", "Warehouse"."id"
           HAVING 1 = 1
           ${availableStockQuery}

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

@@ -26,10 +26,7 @@ import { InventoryChangeList, InventoryChangePatch, NewInventoryChange } from '.
 export class InventoryChangeMutation {
   @Directive('@transaction')
   @Mutation(returns => InventoryChange)
-  async createInventoryChange(
-    @Arg('inventoryChange') inventoryChange: NewInventoryChange,
-    @Ctx() context: ResolverContext
-  ): Promise<InventoryChange> {
+  async createInventoryChange(@Arg('inventoryChange') inventoryChange: NewInventoryChange, @Ctx() context: ResolverContext): Promise<InventoryChange> {
     const { domain, user, tx } = context.state
 
     return await tx.getRepository(InventoryChange).save({
@@ -42,11 +39,7 @@ export class InventoryChangeMutation {
 
   @Directive('@transaction')
   @Mutation(returns => InventoryChange)
-  async updateInventoryChange(
-    @Arg('name') name: string,
-    @Arg('patch') patch: InventoryChangePatch,
-    @Ctx() context: ResolverContext
-  ): Promise<InventoryChange> {
+  async updateInventoryChange(@Arg('name') name: string, @Arg('patch') patch: InventoryChangePatch, @Ctx() context: ResolverContext): Promise<InventoryChange> {
     const { domain, user, tx } = context.state
 
     const repository = tx.getRepository(InventoryChange)
@@ -117,10 +110,7 @@ export class InventoryChangeMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean)
-  async deleteInventoryChanges(
-    @Arg('names', type => [String]) names: string[],
-    @Ctx() context: ResolverContext
-  ): Promise<Boolean> {
+  async deleteInventoryChanges(@Arg('names', type => [String]) names: string[], @Ctx() context: ResolverContext): Promise<Boolean> {
     const { domain, tx } = context.state
 
     await tx.getRepository(InventoryChange).delete({
@@ -133,10 +123,7 @@ export class InventoryChangeMutation {
   @Directive('@privilege(category: "inventory", privilege: "mutation")')
   @Directive('@transaction')
   @Mutation(returns => Boolean)
-  async submitInventoryChanges(
-    @Arg('patches', type => [InventoryPatch]) patches: InventoryPatch[],
-    @Ctx() context: ResolverContext
-  ) {
+  async submitInventoryChanges(@Arg('patches', type => [InventoryPatch]) patches: InventoryPatch[], @Ctx() context: ResolverContext) {
     const { domain, user, tx } = context.state
     try {
       const _createRecords = []
@@ -168,9 +155,7 @@ export class InventoryChangeMutation {
         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'
-          )
+          throw new Error('Adjusted qty value should not be lower than released qty, kindly contact our support for assistance')
         }
 
         if (foundExistingPallet) {
@@ -203,10 +188,7 @@ export class InventoryChangeMutation {
           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,
@@ -252,10 +234,7 @@ export class InventoryChangeMutation {
               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.inventoryItem = newInventoryItemChange?.type == INVENTORY_ITEM_CHANGE_TYPE.NEW ? null : newInventoryItemChange.inventoryItem
               newInventoryItemChange.inventoryChange = newInventoryChange
               newInventoryItemChange.domain = domain
               newInventoryItemChange.creator = user
@@ -295,8 +274,7 @@ export class InventoryChangeMutation {
             updateRecord.warehouse = location.warehouse
           }
 
-          if (!!updateRecord?.bizplace?.id)
-            updateRecord.bizplace = await tx.getRepository(Bizplace).findOne(updateRecord.bizplace.id)
+          if (!!updateRecord?.bizplace?.id) updateRecord.bizplace = await tx.getRepository(Bizplace).findOne(updateRecord.bizplace.id)
 
           let product: Product
 
@@ -307,16 +285,14 @@ export class InventoryChangeMutation {
             product = existingRecord.product
           }
 
-          updateRecord.transactionType == 'MISSING'
-            ? (updateRecord.transactionType = 'MISSING')
-            : (updateRecord.transactionType = 'CHANGES')
+          if (!updateRecord.transactionType) {
+            updateRecord.transactionType = 'CHANGES'
+          }
 
           updateRecord.status = 'PENDING'
 
           updateRecord.expirationDate =
-            ((updateRecord?.expirationDate && new Date(updateRecord.expirationDate).getFullYear()) || 0) < 2000
-              ? null
-              : updateRecord.expirationDate
+            ((updateRecord?.expirationDate && new Date(updateRecord.expirationDate).getFullYear()) || 0) < 2000 ? null : updateRecord.expirationDate
 
           const updatedInventoryChange: InventoryChange = await inventoryChangeRepo.save({
             palletId: existingRecord.palletId,
@@ -359,10 +335,7 @@ export class InventoryChangeMutation {
               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.inventoryItem = newInventoryItemChange?.type == INVENTORY_ITEM_CHANGE_TYPE.NEW ? null : inventoryItemChange.inventoryItem
               newInventoryItemChange.inventoryChange = updatedInventoryChange
               newInventoryItemChange.domain = domain
               newInventoryItemChange.creator = user
@@ -444,24 +417,12 @@ export class InventoryChangeMutation {
   @Directive('@privilege(category: "inventory_adjustment_approval", privilege: "mutation")')
   @Directive('@transaction')
   @Mutation(returns => Boolean)
-  async rejectInventoryChanges(
-    @Arg('patches', type => [InventoryChangePatch]) patches: InventoryChangePatch[],
-    @Ctx() context: ResolverContext
-  ): Promise<Boolean> {
+  async rejectInventoryChanges(@Arg('patches', type => [InventoryChangePatch]) patches: InventoryChangePatch[], @Ctx() context: ResolverContext): Promise<Boolean> {
     const { domain, user, tx } = context.state
 
     const _inventoryChanges = await tx.getRepository(InventoryChange).find({
       where: { id: In(patches.map(item => item.id)) },
-      relations: [
-        'inventory',
-        'inventory.bizplace',
-        'inventory.product',
-        'inventory.location',
-        'inventory.warehouse',
-        'bizplace',
-        'product',
-        'location'
-      ]
+      relations: ['inventory', 'inventory.bizplace', 'inventory.product', 'inventory.location', 'inventory.warehouse', 'bizplace', 'product', 'location']
     })
 
     if (_inventoryChanges.length > 0) {
@@ -556,9 +517,7 @@ async function upsertInventoryItems(context, inventoryChange, approvalStatus, tx
         inventoryItem = await tx.getRepository(InventoryItem).save(inventoryItem)
       }
 
-      await tx
-        .getRepository(InventoryItemChange)
-        .update({ id: inventoryItemChange.id }, { status: approvalStatus, inventoryItem })
+      await tx.getRepository(InventoryItemChange).update({ id: inventoryItemChange.id }, { status: approvalStatus, inventoryItem })
     })
   )
 }
@@ -750,10 +709,7 @@ export async function approveInventoryChanges(patches: any, context: ResolverCon
           transactionType: transactionType == '' ? 'ADJUSTMENT' : transactionType,
           productId: newRecord.product ? newRecord.product.id : inventory.product.id,
           warehouseId: newRecord.warehouse ? newRecord.warehouse.id : inventory.warehouse.id,
-          locationId:
-            newRecord.location && newRecord.location.id != inventory.location.id
-              ? newRecord.location.id
-              : inventory.location.id,
+          locationId: newRecord.location && newRecord.location.id != inventory.location.id ? newRecord.location.id : inventory.location.id,
           uom: newRecord.uom != null ? newRecord.uom : inventory.uom
         }
         delete inventoryHistory.id
@@ -786,6 +742,8 @@ export async function approveInventoryChanges(patches: any, context: ResolverCon
         } else {
           statusFilter = (newRecord.qty != null ? newRecord.qty : inventory.qty) > 0 ? 'STORED' : 'TERMINATED'
         }
+
+        delete newRecord.createdAt
         await tx.getRepository(Inventory).save({
           ...inventory,
           ...newRecord,
@@ -874,8 +832,7 @@ export async function approveInventoryChanges(patches: any, context: ResolverCon
           const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
           await ecommerceCtrl.updateProductVariationStock(marketplaceStores, inventory.product.id, companyDomain)
 
-          if (newRecord?.product || newRecord?.bizplace)
-            await ecommerceCtrl.updateProductVariationStock(marketplaceStores, newRecord.product.id, companyDomain)
+          if (newRecord?.product || newRecord?.bizplace) await ecommerceCtrl.updateProductVariationStock(marketplaceStores, newRecord.product.id, companyDomain)
         }
       }
 
@@ -940,10 +897,7 @@ export async function approveInventoryChanges(patches: any, context: ResolverCon
           newRecord.cartonId = cartonId
         }
 
-        let expirationDate =
-          ((newRecord?.expirationDate && new Date(newRecord.expirationDate).getFullYear()) || 0) < 2000
-            ? null
-            : newRecord.expirationDate
+        let expirationDate = ((newRecord?.expirationDate && new Date(newRecord.expirationDate).getFullYear()) || 0) < 2000 ? null : newRecord.expirationDate
 
         let savedInventory = await tx.getRepository(Inventory).save({
           ...newRecord,

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

@@ -1,5 +1,14 @@
 import { Field, ID, ObjectType } from 'type-graphql'
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
@@ -15,7 +24,10 @@ import { Location } from '../location/location'
 @Index('ix_inventory-change_0', (inventoryChange: InventoryChange) => [inventoryChange.domain, inventoryChange.id], {
   unique: true
 })
-@Index('ix_inventory-change_1', (inventoryChange: InventoryChange) => [inventoryChange.domain, inventoryChange.inventory])
+@Index('ix_inventory-change_1', (inventoryChange: InventoryChange) => [
+  inventoryChange.domain,
+  inventoryChange.inventory
+])
 @ObjectType()
 export class InventoryChange {
   @PrimaryGeneratedColumn('uuid')
@@ -35,7 +47,7 @@ export class InventoryChange {
   cartonId: string
 
   @ManyToOne(type => Domain)
-  @Field()
+  @Field(type => Domain)
   domain: Domain
 
   @RelationId((inventoryChange: InventoryChange) => inventoryChange.domain)

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

@@ -1,5 +1,14 @@
 import { Field, ID, ObjectType } from 'type-graphql'
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
@@ -12,9 +21,20 @@ import { Pallet } from '../pallet/pallet'
 import { Warehouse } from '../warehouse/warehouse'
 
 @Entity()
-@Index('ix_inventory-history_0', (inventoryHistory: InventoryHistory) => [inventoryHistory.domain, inventoryHistory.name], { unique: true })
-@Index('ix_inventory-history_1', (inventoryHistory: InventoryHistory) => [inventoryHistory.domain, inventoryHistory.palletId])
-@Index('ix_inventory-history_2', (inventoryHistory: InventoryHistory) => [inventoryHistory.inventory, inventoryHistory.transactionType, inventoryHistory.refOrderId])
+@Index(
+  'ix_inventory-history_0',
+  (inventoryHistory: InventoryHistory) => [inventoryHistory.domain, inventoryHistory.name],
+  { unique: true }
+)
+@Index('ix_inventory-history_1', (inventoryHistory: InventoryHistory) => [
+  inventoryHistory.domain,
+  inventoryHistory.palletId
+])
+@Index('ix_inventory-history_2', (inventoryHistory: InventoryHistory) => [
+  inventoryHistory.inventory,
+  inventoryHistory.transactionType,
+  inventoryHistory.refOrderId
+])
 @ObjectType()
 export class InventoryHistory {
   @PrimaryGeneratedColumn('uuid')
@@ -26,7 +46,7 @@ export class InventoryHistory {
   seq?: number
 
   @ManyToOne(type => Domain)
-  @Field()
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((inventoryHistory: InventoryHistory) => inventoryHistory.domain)

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

@@ -27,7 +27,7 @@ export class InventoryItem {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((inventoryItem: InventoryItem) => inventoryItem.domain)

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

@@ -30,7 +30,7 @@ export class InventoryItemChange {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((inventoryItemChange: InventoryItemChange) => inventoryItemChange.domain)

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

@@ -27,7 +27,7 @@ export class InventoryProduct {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((inventoryProduct: InventoryProduct) => inventoryProduct.domain)

package/server/service/location/location.ts

@@ -27,7 +27,7 @@ export class Location {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field()
+  @Field(type => Domain)
   domain: Domain
 
   @RelationId((location: Location) => location.domain)

package/server/service/movement/movement.ts

@@ -1,5 +1,14 @@
 import { Field, Float, ID, ObjectType } from 'type-graphql'
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
@@ -16,7 +25,7 @@ export class Movement {
   id: string
 
   @ManyToOne(type => Domain)
-  @Field()
+  @Field(type => Domain)
   domain: Domain
 
   @RelationId((movement: Movement) => movement.domain)

package/server/service/pallet/pallet.ts

@@ -27,7 +27,7 @@ export class Pallet {
   id: string
 
   @ManyToOne(type => Domain)
-  @Field()
+  @Field(type => Domain)
   domain: Domain
 
   @RelationId((pallet: Pallet) => pallet.domain)

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

@@ -22,7 +22,7 @@ export class PalletCount {
   id: string
 
   @ManyToOne(type => Domain)
-  @Field()
+  @Field(type => Domain)
   domain: Domain
 
   @RelationId((palletCount: PalletCount) => palletCount.domain)

package/server/service/tote/tote.ts

@@ -23,7 +23,7 @@ export class Tote {
   id: string
 
   @ManyToOne(type => Domain)
-  @Field()
+  @Field(type => Domain)
   domain: Domain
 
   @RelationId((tote: Tote) => tote.domain)

package/server/service/warehouse/warehouse.ts

@@ -27,7 +27,7 @@ export class Warehouse {
   id: string
 
   @ManyToOne(type => Domain)
-  @Field()
+  @Field(type => Domain)
   domain: Domain
 
   @RelationId((warehouse: Warehouse) => warehouse.domain)