@things-factory/warehouse-base 4.3.76 → 4.3.79-alpha.1

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

@@ -11,9 +11,20 @@ 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 { logger } from '@things-factory/env'
 
 @Resolver(Inventory)
 export class InventoryQuery {
+  /**
+   * Combined single query resolver to perform extraction of data with or without pagination
+   * @param context 
+   * @param filters 
+   * @param pagination 
+   * @param sortings 
+   * @param locationSortingRules 
+   * @param exportItem 
+   * @returns 
+   */
   @Directive('@privilege(category: "inventory", privilege: "query")')
   @Directive('@transaction')
   @Query(returns => InventoryList)
@@ -22,16 +33,23 @@ export class InventoryQuery {
     @Arg('filters', type => [Filter], { nullable: true }) filters?: Filter[],
     @Arg('pagination', type => Pagination, { nullable: true }) pagination?: Pagination,
     @Arg('sortings', type => [Sorting], { nullable: true }) sortings?: Sorting[],
-    @Arg('locationSortingRules', type => [Sorting], { nullable: true }) locationSortingRules?: Sorting[]
+    @Arg('locationSortingRules', type => [Sorting], { nullable: true }) locationSortingRules?: Sorting[],
+    @Arg('exportItem', type => Boolean, { nullable: true }) exportItem?: Boolean
   ): Promise<InventoryList> {
     const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const { page, limit }: { page: number; limit: number } = pagination || {}
 
     try {
-      const productFilters = filters.find(x => x.name == 'product_info')
-      filters = filters.filter(x => x.name != 'product_info')
+      //Define special filters
+      const productFilters = filters.find((filter: any) => filter.name == 'productInfo')
+      const remainOnlyParam = filters.find((filter: any) => filter.name == 'remainOnly')
+      const bizplace = filters.find((filter: any) => filter.name === 'bizplace')
+
+      filters = filters.filter(x => (['productInfo', 'remainOnly']).indexOf(x.name) < 0)
+
       const params = { filters, pagination }
 
-      if (!params.filters.find((filter: any) => filter.name === 'bizplace')) {
+      if (!bizplace) {
         params.filters.push({
           name: 'bizplace',
           operator: 'in',
@@ -40,54 +58,44 @@ export class InventoryQuery {
         })
       }
 
-      const remainOnlyParam: { name: string; operator: string; value: boolean } = params?.filters?.find(
-        (f: { name: string; operator: string; value: any }) => f.name === 'remainOnly'
-      )
-
-      let remainOnly: boolean = false
-      if (typeof remainOnlyParam?.value !== 'undefined') {
-        remainOnly = remainOnlyParam.value
-        params.filters = params.filters.filter(
-          (f: { name: string; operator: string; value: any }) => f.name !== 'remainOnly'
-        )
-      }
+      const remainOnly: boolean = remainOnlyParam?.value || false
 
-      const unlockOnlyParam: { name: string; operator: string; value: boolean } = params?.filters?.find(
-        (f: { name: string; operator: string; value: any }) => f.name === 'unlockOnly'
-      )
-
-      let unlockOnly: boolean = false
-      if (typeof unlockOnlyParam?.value !== 'undefined') {
-        unlockOnly = unlockOnlyParam.value
-        params.filters = params.filters.filter(
-          (f: { name: string; operator: string; value: any }) => f.name !== 'unlockOnly'
-        )
-      }
-
-      const qb: SelectQueryBuilder<Inventory> = getRepository(Inventory).createQueryBuilder('iv')
+      // Define Query data
+      const qb: SelectQueryBuilder<Inventory> = tx.getRepository(Inventory).createQueryBuilder('inventory')
       buildQuery(qb, params, context)
 
-      qb.leftJoinAndSelect('iv.bizplace', 'bizplace')
-        .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
-          })
+      qb.leftJoinAndSelect('inventory.bizplace', 'bizplace')
+        .leftJoinAndSelect('inventory.product', 'product')
+        .leftJoinAndSelect('product.productDetails', 'productDetail', 'productDetail.id = inventory.product_detail_id')
+        .leftJoinAndSelect('inventory.warehouse', 'warehouse')
+        .leftJoinAndSelect('inventory.location', 'location')
+        .leftJoinAndSelect('inventory.creator', 'creator')
+        .leftJoinAndSelect('inventory.updater', 'updater')
+
+        // To get aggregated serial number in csv and total number of stored serial number
+        .leftJoinAndSelect(
+          subQuery => {
+            return subQuery
+              .select('inventoryItems.inventory_id', 'inventory_item_inventory_id')
+              .addSelect(`SUM(case when "inventoryItems"."status" = 'STORED' then 1 else 0 end)`, 'inventory_item_count')
+              .addSelect(`string_agg(inventoryItems.serial_number, ', ')`, 'serial_numbers')
+              .from('inventory_items', 'inventoryItems')
+              .where(`inventoryItems.domain_id = :domainId`, { domainId: domain.id })
+              .andWhere(`inventoryItems.status = :ivicStatus`, { ivicStatus: INVENTORY_STATUS.STORED })
+              .groupBy('inventoryItems.inventory_id')
+          },
+          'inventoryItems',
+          '"inventoryItems"."inventory_item_inventory_id" = "inventory"."id"'
         )
 
+      // To get inventory with remaining qty
       if (remainOnly) {
-        qb.andWhere('iv.qty > 0')
-          .andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END >= 0')
-          .andWhere('iv.qty - CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END > 0')
-      }
-
-      if (unlockOnly) {
-        qb.andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END = 0')
+        qb.andWhere('inventory.qty > 0')
+          .andWhere('CASE WHEN inventory.lockedQty IS NULL THEN 0 ELSE inventory.lockedQty END >= 0')
+          .andWhere('inventory.qty - CASE WHEN inventory.lockedQty IS NULL THEN 0 ELSE inventory.lockedQty END > 0')
       }
 
+      // Filter based on multiple product parameters and allow to search in csv format
       if (productFilters) {
         let productFilterValue = `%${productFilters.value.toLowerCase()}%`
         qb.andWhere(qb => {
@@ -95,7 +103,7 @@ export class InventoryQuery {
             .subQuery()
             .select()
             .from(Product, `products`)
-            .where(`products.id = iv.product_id`)
+            .where(`products.id = Inventory.product_id`) // @chrislim Does the uppercase I in Inventory affect? I can see the rest are in lowercase i
             .andWhere(
               new Brackets(qb => {
                 qb.where('Lower(products.sku) LIKE :productInfo', { productInfo: productFilterValue })
@@ -109,12 +117,13 @@ export class InventoryQuery {
         })
       }
 
+      // Apply sorting based on child data
       if (sortings?.length !== 0) {
         const arrChildSortData = ['bizplace', 'product', 'location', 'warehouse', 'zone']
         const sort = (sortings || []).reduce(
           (acc, sort) => ({
             ...acc,
-            [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'iv.' + sort.name]: sort.desc
+            [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'inventory.' + sort.name]: sort.desc
               ? 'DESC'
               : 'ASC'
           }),
@@ -124,45 +133,28 @@ export class InventoryQuery {
       }
 
       if (locationSortingRules?.length > 0) {
-        locationSortingRules.forEach((rule: { name: string; desc: boolean }) => {
-          qb.addOrderBy(`location.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
-        })
+        locationSortingRules.forEach((rule) => { qb.addOrderBy(`location.${rule.name}`, rule.desc ? 'DESC' : 'ASC') })
       }
 
-      let [items, total] = await qb.getManyAndCount()
-      items = await Promise.all(
-        items.map(async (item: Inventory) => {
-          let [productDetails, inventoryItems] = await Promise.all([
-            getRepository(ProductDetail).find({
-              where: {
-                product: item.product.id,
-                packingType: item.packingType,
-                packingSize: item.packingSize
-              }
-            }),
-            tx.query(
-              `
-              SELECT string_agg(ii.serial_number, ', ') AS "serialNumbers"
-              FROM inventory_items ii
-              WHERE ii.inventory_id = $1
-              GROUP BY ii.inventory_id 
-            `,
-              [item.id]
-            )
-          ])
+      // Fetch all row for exporting
+      if (exportItem != true && page && limit) {
+        qb.offset((page - 1) * limit).limit(limit)
+      }
 
-          item.product['productDetails'] = productDetails
-          return {
-            ...item,
-            remainQty: item.qty - (item.lockedQty ? item.lockedQty : 0),
-            remainUomValue: item.uomValue - (item.lockedUomValue ? item.lockedUomValue : 0),
-            serialNumbers: inventoryItems[0]?.serialNumbers
-          }
-        })
-      )
+      let items = (await qb.getRawMany()).map(item => {
+        return {
+          ...new Inventory(item),
+          serialNumbers: item.serial_numbers
+        }
+      })
+      let total = await qb.getCount()
 
-      return { items, total }
+      return {
+        items,
+        total
+      }
     } catch (error) {
+      logger.error(`inventory-query[inventories]: ${error}`)
       throw error
     }
   }
@@ -653,7 +645,7 @@ export class InventoryQuery {
 
     const productBundleSettings: ProductBundleSetting[] = await getRepository(ProductBundleSetting).find({
       where: { productBundle: productBundleId },
-      relations: ['product', 'productBundle']
+      relations: ['product', 'productDetail', 'productBundle']
     })
 
     if (!productBundleSettings.length) {
@@ -664,6 +656,7 @@ 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')
@@ -692,6 +685,7 @@ 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')
@@ -720,6 +714,7 @@ 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,
@@ -763,145 +758,6 @@ export class InventoryQuery {
     return { bundleGroup, bundleSetting }
   }
 
-  @Directive('@privilege(category: "inventory", privilege: "query")')
-  @Query(returns => InventoryList)
-  async inventoriesForExport(
-    @Ctx() context: any,
-    @Arg('filters', type => [Filter], { nullable: true }) filters?: Filter[],
-    @Arg('pagination', type => Pagination, { nullable: true }) pagination?: Pagination,
-    @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
-
-    try {
-      const productFilters = filters.find(x => x.name == 'product_info')
-      filters = filters.filter(x => x.name != 'product_info')
-      const params = { filters, pagination }
-
-      if (!params.filters.find((filter: any) => filter.name === 'bizplace')) {
-        throw new Error('Please select a customer for export.')
-      }
-
-      const remainOnlyParam: { name: string; operator: string; value: boolean } = params?.filters?.find(
-        (f: { name: string; operator: string; value: any }) => f.name === 'remainOnly'
-      )
-
-      let remainOnly: boolean = false
-      if (typeof remainOnlyParam?.value !== 'undefined') {
-        remainOnly = remainOnlyParam.value
-        params.filters = params.filters.filter(
-          (f: { name: string; operator: string; value: any }) => f.name !== 'remainOnly'
-        )
-      }
-
-      const unlockOnlyParam: { name: string; operator: string; value: boolean } = params?.filters?.find(
-        (f: { name: string; operator: string; value: any }) => f.name === 'unlockOnly'
-      )
-
-      let unlockOnly: boolean = false
-      if (typeof unlockOnlyParam?.value !== 'undefined') {
-        unlockOnly = unlockOnlyParam.value
-        params.filters = params.filters.filter(
-          (f: { name: string; operator: string; value: any }) => f.name !== 'unlockOnly'
-        )
-      }
-
-      const qb: SelectQueryBuilder<Inventory> = getRepository(Inventory).createQueryBuilder('Inventory')
-      buildQuery(qb, params, context)
-
-      qb.leftJoinAndSelect('Inventory.bizplace', 'Bizplace')
-        .leftJoinAndSelect('Inventory.product', 'Product')
-        .leftJoinAndSelect('Inventory.warehouse', 'Warehouse')
-        .leftJoinAndSelect('Inventory.location', 'Location')
-        .leftJoinAndSelect('Inventory.creator', 'Creator')
-        .leftJoinAndSelect('Inventory.updater', 'Updater')
-        .leftJoinAndSelect(
-          subQuery => {
-            return subQuery
-              .select('ii.inventory_id', 'inventory_id')
-              .addSelect(`string_agg(ii.serial_number, ', ')`, 'serial_numbers')
-              .from('inventory_items', 'ii')
-              .where(`ii.domain_id = :domainId`, { domainId: domain.id })
-              .groupBy('ii.inventory_id')
-          },
-          'ii2',
-          'ii2.inventory_id = Inventory.id'
-        )
-
-      if (remainOnly) {
-        qb.andWhere('Inventory.qty > 0')
-          .andWhere('CASE WHEN Inventory.locked_qty IS NULL THEN 0 ELSE Inventory.locked_qty END >= 0')
-          .andWhere('Inventory.qty - CASE WHEN Inventory.locked_qty IS NULL THEN 0 ELSE Inventory.locked_qty END > 0')
-      }
-
-      if (unlockOnly) {
-        qb.andWhere('CASE WHEN Inventory.locked_qty IS NULL THEN 0 ELSE Inventory.locked_qty END = 0')
-      }
-
-      if (productFilters) {
-        let productFilterValue = `%${productFilters.value.toLowerCase()}%`
-        qb.andWhere(qb => {
-          const subQuery = qb
-            .subQuery()
-            .select()
-            .from(Product, `products`)
-            .where(`products.id = Inventory.product_id`)
-            .andWhere(
-              new Brackets(qb => {
-                qb.where('Lower(products.sku) LIKE :productInfo', { productInfo: productFilterValue })
-                  .orWhere('Lower(products.name) LIKE :productInfo', { productInfo: productFilterValue })
-                  .orWhere('Lower(products.description) LIKE :productInfo', { productInfo: productFilterValue })
-                  .orWhere('Lower(products.brand) LIKE :productInfo', { productInfo: productFilterValue })
-              })
-            )
-            .getQuery()
-          return `EXISTS ${subQuery}`
-        })
-      }
-
-      if (sortings?.length !== 0) {
-        const arrChildSortData = ['bizplace', 'product', 'location', 'warehouse', 'zone']
-        const sort = (sortings || []).reduce(
-          (acc, sort) => ({
-            ...acc,
-            [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'Inventory.' + sort.name]: sort.desc
-              ? 'DESC'
-              : 'ASC'
-          }),
-          {}
-        )
-        qb.orderBy(sort)
-      }
-
-      if (locationSortingRules?.length > 0) {
-        locationSortingRules.forEach((rule: { name: string; desc: boolean }) => {
-          qb.addOrderBy(`location.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
-        })
-      }
-
-      let items = await qb
-        .offset((page - 1) * limit)
-        .limit(limit)
-        .getRawMany()
-
-      let total = await qb.getCount()
-
-      return {
-        items: items.map(item => {
-          return {
-            ...new Inventory(item),
-            serialNumbers: item.serial_numbers
-          }
-        }),
-        total
-      }
-    } catch (error) {
-      throw error
-    }
-  }
-
   @FieldResolver(type => Domain)
   async domain(@Root() inventory: Inventory): Promise<Domain> {
     return await getRepository(Domain).findOne(inventory.domainId)

package/server/service/inventory/inventory.ts

@@ -210,6 +210,9 @@ export class Inventory {
   @Field({ nullable: true })
   productId: string
 
+  @Field({ nullable: true })
+  productDetailId: string
+
   @Field({ nullable: true })
   productName: string
 
@@ -295,46 +298,46 @@ export class Inventory {
 
   constructor(obj?) {
     if (obj) {
-      this.id = obj.Inventory_id
+      this.id = obj.inventory_id
       this.bizplace = {
-        id: obj.Bizplace_id,
-        name: obj.Bizplace_name,
-        description: obj.Bizplace_description
+        id: obj.bizplace_id,
+        name: obj.bizplace_name,
+        description: obj.bizplace_description
       }
       this.product = new Product(obj)
       this.location = new Location(obj)
       this.warehouse = new Warehouse(obj)
-      this.name = obj.Inventory_name
-      this.palletId = obj.Inventory_pallet_id
-      this.batchId = obj.Inventory_batch_id
-      this.refOrderId = obj.Inventory_ref_order_id
-      this.orderProductId = obj.Inventory_order_product_id
-      this.zone = obj.Inventory_zone
-      this.costPrice = obj.Inventory_cost_price
-      this.sellPrice = obj.Inventory_sell_price
-      this.packingType = obj.Inventory_packing_type
-      this.unit = obj.Inventory_unit
-      this.uom = obj.Inventory_uom
-      this.uomValue = obj.Inventory_uom_value
-      this.lockedUomValue = obj.Inventory_locked_uom_value
-      this.qty = obj.Inventory_qty
-      this.lockedQty = obj.Inventory_locked_qty
-      this.lastSeq = obj.Inventory_last_seq
-      this.description = obj.Inventory_description
-      this.status = obj.Inventory_status
-      this.otherRef = obj.Inventory_other_ref
-      this.remark = obj.Inventory_remark
-      this.createdAt = obj.Inventory_created_at
-      this.updatedAt = obj.Inventory_updated_at
-      this.expirationDate = obj.Inventory_expiration_date
-      this.unitCost = obj.Inventory_unit_cost
-      this.manufactureYear = obj.Inventory_manufacture_year
-      this.manufactureDate = obj.Inventory_manufacture_date
-      this.batchIdRef = obj.Inventory_batch_id_ref
-      this.cartonId = obj.Inventory_carton_id
-      this.packingSize = obj.Inventory_packing_size
-      this.creatorId = obj.Inventory_creator_id
-      this.updaterId = obj.Inventory_updater_id
+      this.name = obj.inventory_name
+      this.palletId = obj.inventory_pallet_id
+      this.batchId = obj.inventory_batch_id
+      this.refOrderId = obj.inventory_ref_order_id
+      this.orderProductId = obj.inventory_order_product_id
+      this.zone = obj.inventory_zone
+      this.costPrice = obj.inventory_cost_price
+      this.sellPrice = obj.inventory_sell_price
+      this.packingType = obj.inventory_packing_type
+      this.unit = obj.inventory_unit
+      this.uom = obj.inventory_uom
+      this.uomValue = obj.inventory_uom_value
+      this.lockedUomValue = obj.inventory_locked_uom_value
+      this.qty = obj.inventory_qty
+      this.lockedQty = obj.inventory_locked_qty
+      this.lastSeq = obj.inventory_last_seq
+      this.description = obj.inventory_description
+      this.status = obj.inventory_status
+      this.otherRef = obj.inventory_other_ref
+      this.remark = obj.inventory_remark
+      this.createdAt = obj.inventory_created_at
+      this.updatedAt = obj.inventory_updated_at
+      this.expirationDate = obj.inventory_expiration_date
+      this.unitCost = obj.inventory_unit_cost
+      this.manufactureYear = obj.inventory_manufacture_year
+      this.manufactureDate = obj.inventory_manufacture_date
+      this.batchIdRef = obj.inventory_batch_id_ref
+      this.cartonId = obj.inventory_carton_id
+      this.packingSize = obj.inventory_packing_size
+      this.creatorId = obj.inventory_creator_id
+      this.updaterId = obj.inventory_updater_id
     }
   }
 }