@things-factory/warehouse-base 6.0.73 → 6.0.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/warehouse-base",
-  "version": "6.0.73",
+  "version": "6.0.75",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -23,12 +23,12 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/biz-base": "^6.0.73",
-    "@things-factory/id-rule-base": "^6.0.73",
-    "@things-factory/integration-sellercraft": "^6.0.73",
-    "@things-factory/marketplace-base": "^6.0.73",
-    "@things-factory/product-base": "^6.0.73",
-    "@things-factory/setting-base": "^6.0.73"
+    "@things-factory/biz-base": "^6.0.75",
+    "@things-factory/id-rule-base": "^6.0.75",
+    "@things-factory/integration-sellercraft": "^6.0.75",
+    "@things-factory/marketplace-base": "^6.0.75",
+    "@things-factory/product-base": "^6.0.75",
+    "@things-factory/setting-base": "^6.0.75"
   },
-  "gitHead": "cf00adc3f06bebbe492c63f0f743eb874155f9b5"
+  "gitHead": "f7ca179a7fabfc129a9981a7bd734380a3ac64f0"
 }

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

@@ -1,21 +1,21 @@
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import {
-  Brackets,
-  EntityManager,
-  Equal,
-  getRepository,
-  Not,
-  OrderByCondition,
-  Repository,
-  SelectQueryBuilder
-} from 'typeorm'
+import { Brackets, EntityManager, Equal, Not, OrderByCondition, Repository, SelectQueryBuilder } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace, getPartnersCompanyBizplaces, getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { logger } from '@things-factory/env'
 import { Product, ProductBundleSetting } from '@things-factory/product-base'
 import { Setting } from '@things-factory/setting-base'
-import { buildQuery, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
+import {
+  buildQuery,
+  Domain,
+  Filter,
+  ListParam,
+  Pagination,
+  Sorting,
+  getQueryBuilderFromListParams,
+  getRepository
+} from '@things-factory/shell'
 
 import { INVENTORY_STATUS, LOCATION_TYPE } from '../../constants'
 import { InventoryChange } from '../inventory-change/inventory-change'
@@ -58,20 +58,13 @@ export class InventoryQuery {
 
       const params = { filters, pagination }
 
-      if (!bizplace) {
-        params.filters.push({
-          name: 'bizplace',
-          operator: 'in',
-          value: await getPermittedBizplaceIds(domain, user),
-          relation: true
-        })
-      }
-
       const remainOnly: boolean = remainOnlyParam?.value || false
 
-      // Define Query data
-      const qb: SelectQueryBuilder<Inventory> = tx.getRepository(Inventory).createQueryBuilder('inventory')
-      buildQuery(qb, params, context, {
+      const qb: SelectQueryBuilder<Inventory> = getQueryBuilderFromListParams({
+        repository: tx.getRepository(Inventory),
+        params,
+        domain,
+        alias: 'inventory',
         searchables: ['warehouse', 'product', 'batchId', 'location', 'palletId']
       })
 
@@ -83,24 +76,31 @@ export class InventoryQuery {
         .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"'
+      if (!bizplace) {
+        const bizplaces = await getPermittedBizplaceIds(domain, user)
+
+        qb.andWhere(
+          new Brackets(qb => {
+            qb.orWhere('inventory.bizplace_id IN (:...bizplaces)', { bizplaces })
+          })
         )
+      }
+
+      // To get aggregated serial number in csv and total number of stored serial number
+      qb.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) {