@things-factory/operato-hub 5.0.13 → 6.0.0-alpha.1

package/server/migrations/1608009991065-SeedUser.ts

@@ -1,7 +1,9 @@
+import { MigrationInterface, QueryRunner, Repository } from 'typeorm'
+
 import { User, UserStatus } from '@things-factory/auth-base'
 import { Company } from '@things-factory/biz-base'
-import { Domain } from '@things-factory/shell'
-import { getRepository, MigrationInterface, QueryRunner, Repository } from 'typeorm'
+import { Domain, getRepository } from '@things-factory/shell'
+
 import { businessRegister } from '../controllers/company-initializer'
 
 const ADMIN_USER = {
@@ -54,7 +56,7 @@ export class SeedUser1608009991065 implements MigrationInterface {
     const domainRepository = getRepository(Domain)
 
     const user = await userRepository.findOne({ where: { name: ADMIN_USER.name } })
-    await userRepository.delete(user)
+    await userRepository.delete({ id: user.id })
 
     const systemDomain = await domainRepository.findOne({ where: { systemFlag: true } })
     await domainRepository.delete(systemDomain)

package/server/routers/api/restful-apis/unstable/add-draft-release-order.ts

@@ -125,7 +125,8 @@ router.post(
                 country: bodyReq?.deliverTo?.country || null,
                 phone1: bodyReq?.deliverTo?.phone1 || null,
                 phone2: bodyReq?.deliverTo?.phone2 || null,
-                email: bodyReq?.deliverTo?.email || null
+                email: bodyReq?.deliverTo?.email || null,
+                packageId: bodyReq?.packageId || null
               },
               orderProducts: orderInventories,
               files: []

package/server/routers/api/restful-apis/unstable/add-inbound-order.ts

@@ -1,9 +1,10 @@
 import gql from 'graphql-tag'
-import { getRepository, In } from 'typeorm'
+import { In } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Bizplace, ContactPoint, getCompanyBizplace } from '@things-factory/biz-base'
 import { Product, ProductDetail } from '@things-factory/product-base'
+import { getRepository } from '@things-factory/shell'
 
 import { businessMiddleware } from '../../../../middlewares/business-middleware'
 import { warehouseMiddleware } from '../../../../middlewares/warehouse-middleware'
@@ -90,7 +91,7 @@ router.post(
       const supplierInfo = bodyReq.supplier
       const foundSupplier: ContactPoint = await getRepository(ContactPoint).findOne({
         where: {
-          domain,
+          domain: { id: domain.id },
           bizplace: warehouseId,
           name: supplierInfo.name,
           companyName: supplierInfo.companyName,

package/server/routers/api/restful-apis/unstable/add-marketplace-order.ts

@@ -3,18 +3,20 @@
 /** 2. Sweetmag */
 
 import gql from 'graphql-tag'
+import { EntityManager, getConnection } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
-import { EntityManager, getConnection } from 'typeorm'
+import { createPayloadLog, PayloadType } from '@things-factory/integration-base'
 import { MarketplaceOrder } from '@things-factory/marketplace-base'
 
 import { businessMiddleware } from '../../../../middlewares/business-middleware'
 import { storeMiddleware } from '../../../../middlewares/store-middleware'
 
 const debug = require('debug')('things-factory:operato-hub:restful-api:unstable:add-marketplace-order')
+const apiVersion = 'unstable'
 
 router.post(
-  '/unstable/warehouse/:storeId/add-marketplace-order',
+  `/${apiVersion}/warehouse/:storeId/add-marketplace-order`,
   businessMiddleware,
   storeMiddleware,
   async (context, next) => {
@@ -120,6 +122,15 @@ router.post(
           } as any)
         ).data
       }
+
+      createPayloadLog(
+        marketplaceStore.id,
+        `/${apiVersion}/warehouse/:storeId/add-marketplace-order`,
+        bodyReq,
+        context.body.result,
+        context,
+        PayloadType.INGESTION
+      )
     })
   }
 )

package/server/routers/api/restful-apis/unstable/add-products.ts

@@ -29,6 +29,8 @@ router.post(
     await checkMandatoryKey(context, bodyReq)
     debug('post:/add-product request.body', bodyReq)
 
+    let products = checkProductDetails(bodyReq)
+
     context.body = {
       result: (
         await client.mutate({
@@ -39,7 +41,7 @@ router.post(
               }
             }
           `,
-          variables: { products: bodyReq },
+          variables: { products },
           context: {
             ...context,
             state: {
@@ -66,23 +68,45 @@ export async function checkMandatoryKey(context, params) {
 
     if (param?.productDetails) {
       let noSubParams = []
-      param.productDetails.forEach((subParam, key) => {
-        if (!subParam.gtin) noSubParams.push('gtin')
-
-        if (!subParam.packingType) noSubParams.push('packingType')
-
-        if (!subParam.packingSize) noSubParams.push('packingSize')
-
-        if (!subParam.uom) noSubParams.push('uom')
-
-        if (!subParam.uomValue) noSubParams.push('uomValue')
-
-        if (noSubParams?.length)
-          context.throw(400, context.t('error.required param x not found', { x: `${noSubParams.join(', ')}` }))
-      })
+      if (param.productDetails.length == 0) {
+        context.throw(
+          400,
+          context.t('error.required param {x} not found in productDetails', {
+            x: 'gtin, packingType, packingSize, uom, uomValue'
+          })
+        )
+      } else {
+        param.productDetails.forEach((subParam, key) => {
+          if (!subParam.gtin) noSubParams.push('gtin')
+
+          if (!subParam.packingType) noSubParams.push('packingType')
+
+          if (!subParam.packingSize) noSubParams.push('packingSize')
+
+          if (!subParam.uom) noSubParams.push('uom')
+
+          if (!subParam.uomValue) noSubParams.push('uomValue')
+
+          if (noSubParams?.length)
+            context.throw(
+              400,
+              context.t('error.required param {x} not found in productDetails', { x: `${noSubParams.join(', ')}` })
+            )
+        })
+      }
     }
 
     if (noparams?.length)
-      context.throw(400, context.t('error.required param x not found', { x: `${noparams.join(', ')}` }))
+      context.throw(400, context.t('error.required param {x} not found', { x: `${noparams.join(', ')}` }))
   })
 }
+
+function checkProductDetails(params) {
+  params.forEach(param => {
+    if (!param?.productDetails.some(pd => pd.isDefault)) {
+      param.productDetails[0].isDefault = true
+    }
+  })
+
+  return params
+}

package/server/routers/api/restful-apis/unstable/add-release-order.ts

@@ -1,8 +1,7 @@
-import { EntityManager, getConnection, getRepository, In, Not, Repository, SelectQueryBuilder } from 'typeorm'
+import { EntityManager, getConnection, In, Not, Repository, SelectQueryBuilder } from 'typeorm'
 import { v4 as uuidv4 } from 'uuid'
 
 import { restfulApiRouter as router } from '@things-factory/api'
-import { User } from '@things-factory/auth-base'
 import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
 import { logger } from '@things-factory/env'
 import { generateId } from '@things-factory/id-rule-base'
@@ -27,7 +26,7 @@ import {
   SellercraftController
 } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 import { Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
 
 import { ValidationError } from '../../../../errors/index'
@@ -103,6 +102,7 @@ router.post(
           trackingNo: bodyReq?.trackingNo,
           airwayBill: bodyReq?.airwayBill,
           invoice: bodyReq?.invoice,
+          packageId: bodyReq?.packageId,
           storeName: bodyReq?.storeName,
           storeId: bodyReq?.storeId,
           routeId: bodyReq?.routeId,
@@ -110,7 +110,7 @@ router.post(
         }
 
         // check existing order
-        await checkExistingOrder(releaseGood, customerBizplace, context, tx)
+        await checkExistingOrder(releaseGood, customerBizplace, bodyReq?.checkDuplicationValidation, context, tx)
 
         //massage data
         massagedData = await massageOrderItems(releaseGood, bodyReq.orderInventories, context)
@@ -168,29 +168,14 @@ router.post(
           })
         }
         // assignment
-        console.time('assign')
+        // console.time('assign')
         let assignedOrderProducts = await assignToInventory(massagedData.orderProducts, customerBizplace, context, tx)
-        console.timeEnd('assign')
+        // console.timeEnd('assign')
 
         // create order
-        console.time('save')
+        // console.time('save')
         let result = await createReleaseGood(releaseGood, assignedOrderProducts, customerBizplace, context, tx)
-        console.timeEnd('save')
-
-        const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({ domain: customerBizplace.domain })
-        if (sellercraft) {
-          try {
-            const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-            let packageInfo = await sellercraftCtrl.packOrder(sellercraft, {
-              ...result,
-              orderProducts: result.orderProducts
-            })
-
-            await getRepository(ReleaseGood).update({ id: result.id }, { packageId: packageInfo.packageId })
-          } catch (error) {
-            logger.error(`add-release-order[packageId][OrderNo: ${result.name}]: ${JSON.stringify(error)}`)
-          }
-        }
+        // console.timeEnd('save')
 
         let addReleaseGood = {
           id: result.id,
@@ -223,6 +208,7 @@ router.post(
           airwayBill: result.airwayBill,
           invoice: result.invoice,
           type: result.type,
+          packageId: result.packageId,
           storeName: result.storeName,
           storeId: result.storeId,
           routeId: result.routeId,
@@ -236,7 +222,6 @@ router.post(
         }
         // return body
         context.body = { result: { addReleaseGood } }
-
         createPayloadLog(
           customerBizplaceId,
           `/${apiVersion}/warehouse/:warehouseId/add-release-order`,
@@ -257,11 +242,49 @@ router.post(
 
         if (error.errorCode) {
           if (error.errorCode == 'INSUFFICIENT_STOCK' && requiredDraft) {
-            await createDraftOrder(releaseGood, massagedData.orderProducts, context)
+            const result = await createDraftOrder(releaseGood, massagedData.orderProducts, context)
+            let createdDraftOrder = {
+              id: result.id,
+              name: result.name,
+              refNo: result.refNo,
+              refNo2: result.refNo2,
+              refNo3: result.refNo3,
+              status: result.status,
+              truckNo: result.truckNo,
+              ownTransport: result.ownTransport,
+              marketplaceOrderStatus: result.marketplaceOrderStatus,
+              billingAddress: result.billingAddress,
+              deliveryAddress1: result.deliveryAddress1,
+              deliveryAddress2: result.deliveryAddress2,
+              deliveryAddress3: result.deliveryAddress3,
+              deliveryAddress4: result.deliveryAddress4,
+              deliveryAddress5: result.deliveryAddress5,
+              attentionTo: result.attentionTo,
+              attentionCompany: result.attentionCompany,
+              city: result.city,
+              state: result.state,
+              postalCode: result.postalCode,
+              country: result.country,
+              phone1: result.phone1,
+              phone2: result.phone2,
+              email: result.email,
+              type: result.type,
+              packageId: result.packageId,
+              exportOption: result.exportOption,
+              releaseDate: result.releaseDate,
+              collectionOrderNo: result.collectionOrderNo,
+              bizplace: { name: result.bizplace.name },
+              domain: { name: result.domain.name }
+            }
+            context.body = { result: { createdDraftOrder } }
+          } else {
+            logger.error(`add-release-order: ${JSON.stringify(error)}`)
+            context.throw(400, context.t(error))
           }
+        } else {
+          logger.error(`add-release-order: ${JSON.stringify(error)}`)
+          context.throw(400, context.t(error))
         }
-        logger.error(`add-release-order: ${JSON.stringify(error)}`)
-        context.throw(400, context.t(error))
       }
     })
   }
@@ -315,16 +338,16 @@ async function checkMandatoryKey(context, params) {
   return params
 }
 
-async function checkExistingOrder(releaseGood, bizplace, context, tx) {
-  const { domain, user }: { domain: Domain; user: User } = context.state
+async function checkExistingOrder(releaseGood, bizplace, checkDuplicationValidation = true, context, tx) {
+  const { domain, user } = context.state
   const refNo: string = releaseGood.refNo
   const refNo2: string = releaseGood.refNo2
   const refNo3: string = releaseGood.refNo3
 
-  if (releaseGood.type == 'b2c') {
+  if (checkDuplicationValidation) {
     const foundDraftReleaseGood: DraftReleaseGood = await tx.getRepository(DraftReleaseGood).findOne({
       where: {
-        domain,
+        domain: { id: domain.id },
         refNo: refNo || null,
         refNo2: refNo2 || null,
         refNo3: refNo3 || null,
@@ -340,7 +363,7 @@ async function checkExistingOrder(releaseGood, bizplace, context, tx) {
       })
     }
 
-    const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({ domain: bizplace.domain })
+    const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOneBy({ domain: bizplace.domain })
 
     if (sellercraft) {
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, bizplace.domain, user)
@@ -366,7 +389,7 @@ async function checkExistingOrder(releaseGood, bizplace, context, tx) {
           const refNo2: string = releaseGood.refNo2
           const foundSplittedReleaseGood = await tx.getRepository(ReleaseGood).findOne({
             where: {
-              domain,
+              domain: { id: domain.id },
               refNo2,
               status: Not(In([ORDER_STATUS.CANCELLED, ORDER_STATUS.PENDING_CANCEL]))
             },
@@ -405,7 +428,7 @@ async function createReleaseGood(
   tx?: EntityManager
 ): Promise<ReleaseGood> {
   try {
-    const { domain, user }: { domain: Domain; user: User } = context.state
+    const { domain, user } = context.state
     const settingRepo: Repository<Setting> = tx?.getRepository(Setting) || getRepository(Setting)
 
     if (orderProducts.length <= 0) {
@@ -421,13 +444,12 @@ async function createReleaseGood(
     // find RO number rule setting
     const roNoSetting: Setting = await settingRepo.findOne({
       where: {
-        domain,
+        domain: { id: domain.id },
         name: ORDER_NUMBER_SETTING_KEY.RO_NUMBER_RULE
       }
     })
 
     newReleaseGood = {
-      ...newReleaseGood,
       name: roNoSetting
         ? await generateId({ domain, type: ORDER_NUMBER_RULE_TYPE.RO_NUMBER, seed: {} })
         : OrderNoGenerator.releaseGood(),
@@ -470,6 +492,7 @@ async function createReleaseGood(
       storeId: releaseGood?.storeId,
       routeId: releaseGood?.routeId,
       stopId: releaseGood?.stopId,
+      packageId: releaseGood?.packageId || null,
       noOfItems: orderProducts.length,
       creator: user,
       updater: user,
@@ -501,7 +524,7 @@ async function createReleaseGood(
             bizplace: bizplace,
             releaseGood: resultReleaseGood,
             type: ORDER_TYPES.RELEASE_OF_GOODS,
-            status: ORDER_PRODUCT_STATUS.ASSIGNED
+            status: ORDER_INVENTORY_STATUS.PENDING_WORKSHEET
           })
           await tx.getRepository(OrderInventory).save(orderInventory)
 
@@ -820,6 +843,10 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
     let orderProduct = orderProducts[opIdx]
 
     let assignedOrderInventories = []
+    const pickingProductSetting: Setting = await tx.getRepository(Setting).findOne({
+      where: { domain: { id: domain.id }, name: 'rule-for-picking-product' }
+    })
+
     for (let oiIdx = 0; oiIdx < orderProducts[opIdx].orderInventories.length; oiIdx++) {
       const orderInventory = orderProduct.orderInventories[oiIdx]
       let sortings: any = []
@@ -827,34 +854,58 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
       switch (orderInventory.product.pickingStrategy) {
         case 'LIFO':
           sortings.push({ name: 'iv.created_at', desc: true })
+          if (pickingProductSetting?.value) {
+            for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
+              sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false })
+            }
+          } else {
+            sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false })
+          }
 
           break
         case 'FEFO':
-          sortings.push({ name: 'iv.expiration_date', desc: false })
-          sortings.push({ name: 'iv.created_at', desc: false })
+          sortings.push({ name: 'iv.expiration_date', desc: false }, { name: 'iv.created_at', desc: false })
+          if (pickingProductSetting?.value) {
+            for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
+              sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false })
+            }
+          } else {
+            sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false })
+          }
 
           break
         case 'FMFO':
-          sortings.push({ name: 'iv.manufacture_date', desc: false })
-          sortings.push({ name: 'iv.created_at', desc: false })
+          sortings.push({ name: 'iv.manufacture_date', desc: false }, { name: 'iv.created_at', desc: false })
+          if (pickingProductSetting?.value) {
+            for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
+              sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false })
+            }
+          } else {
+            sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false })
+          }
 
           break
         case 'LOCATION':
-          const pickingProductSetting: Setting = await tx.getRepository(Setting).findOne({
-            where: { domain, name: 'rule-for-picking-product' }
-          })
           if (pickingProductSetting?.value) {
             for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
               sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false })
             }
           } else {
-            sortings.push({ name: 'loc.name', desc: true })
+            sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false })
           }
 
           break
         //Every other case includes 'FIFO' will be applicable for this case
         default:
           sortings.push({ name: 'iv.created_at', desc: false })
+          if (pickingProductSetting?.value) {
+            for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
+              sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false })
+            }
+          } else {
+            sortings.push({ name: 'loc.name', desc: false })
+            sortings.push({ name: 'iv.pallet_id', desc: false })
+          }
           break
       }
 
@@ -912,7 +963,8 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
               sum(qty - locked_qty - release_qty) over (order by sort_seq asc rows between unbounded preceding and current row) as lock_amount
               from (
                 SELECT 0 as sort_seq, null as id, null as pallet_id, null as batch_id, null as batch_id_ref, 
-                null as unit, '${orderInventory.uom}' as uom, '${orderInventory.packingType}' as packing_type, '${orderInventory.packingSize
+                null as unit, '${orderInventory.uom}' as uom, '${orderInventory.packingType}' as packing_type, '${
+          orderInventory.packingSize
         }' as packing_size,
                 null as manufacture_year, null as carton_id, 0 as uom_value, 0 as locked_uom_value, 0 as qty, 0 as locked_qty, null as created_at,
                 '${orderInventory.releaseQty}' as release_qty, '${orderInventory.releaseUomValue}' as release_uom_value
@@ -953,8 +1005,6 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
         ]
       )
 
-      // let data = await qb.getMany()
-
       let totalAssigned = updatedInventories[0].reduce((acc, inv) => {
         return acc + inv.reserve_qty
       }, 0)

package/server/routers/api/restful-apis/unstable/cancel-release-order.ts

@@ -1,9 +1,9 @@
 import gql from 'graphql-tag'
-import { getRepository } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Bizplace } from '@things-factory/biz-base'
-import { ReleaseGood, DraftReleaseGood } from '@things-factory/sales-base'
+import { DraftReleaseGood, ReleaseGood } from '@things-factory/sales-base'
+import { getRepository } from '@things-factory/shell'
 
 import { businessMiddleware } from '../../../../middlewares/business-middleware'
 import { warehouseMiddleware } from '../../../../middlewares/warehouse-middleware'

package/server/routers/api/restful-apis/unstable/get-delivery-orders.ts

@@ -74,6 +74,33 @@ router.get(
                       refBy
                       path
                     }
+                    orderInventories {
+                      batchId
+                      batchIdRef
+                      packingType
+                      packingSize
+                      uom
+                      releaseQty
+                      releaseUomValue
+                      product {
+                        sku
+                        name
+                        description
+                        brand
+                        brandSku
+                        gtin
+                        type
+                      }
+                      orderToteItems {
+                        qty
+                        orderTote {
+                          name
+                          orderToteSeals {
+                            name
+                          }
+                        }
+                      }
+                    }
                     releaseGood {
                       name
                       description
@@ -84,7 +111,6 @@ router.get(
                       ownTransport
                       crossDocking
                       status
-                      releaseDateTime
                       releaseDate
                       remark
                       courierOption
@@ -118,16 +144,6 @@ router.get(
                       handoverType
                       dropoffAddress
                       noOfItems
-                      orderProducts {
-                        id
-                        type
-                        batchId
-                        packingType
-                        packingSize
-                        releaseQty
-                        releaseUomValue
-                        status
-                      }
                     }
                     createdAt
                     updatedAt

package/server/routers/api/restful-apis/unstable/get-goods-received-notes.ts

@@ -67,8 +67,15 @@ router.get(
                         batchId
                         packingType
                         packingSize
-                        releaseQty
-                        releaseUomValue
+                        packQty
+                        actualPackQty
+                        palletQty
+                        actualPalletQty
+                        uom
+                        uomValue
+                        totalUomValue
+                        issue
+                        remark
                         status
                         product {
                           id

package/server/routers/api/restful-apis/unstable/get-onhand-inventories.ts

@@ -1,8 +1,8 @@
 import gql from 'graphql-tag'
-import { getRepository } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Product } from '@things-factory/product-base'
+import { getRepository } from '@things-factory/shell'
 
 import { businessMiddleware } from '../../../../middlewares/business-middleware'
 import { warehouseMiddleware } from '../../../../middlewares/warehouse-middleware'

package/server/routers/api/restful-apis/unstable/get-partners.ts

@@ -1,12 +1,14 @@
+import { In } from 'typeorm'
+
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Bizplace, Partner } from '@things-factory/biz-base'
-import { getRepository, In } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 
 const debug = require('debug')('things-factory:operato-hub:restful-api:unstable:get-partners')
 
 router.get('/unstable/partners/:bizplaceId', async (context, next) => {
   const { bizplaceId } = context.params
-  const bizplace: Bizplace = await getRepository(Bizplace).findOne(bizplaceId)
+  const bizplace: Bizplace = await getRepository(Bizplace).findOneBy({ id: bizplaceId })
   const partners: Partner[] = await getRepository(Partner).find({
     where: { partnerBizplace: bizplace },
     relations: ['domainBizplace']

package/server/routers/api/restful-apis/unstable/get-products.ts

@@ -40,6 +40,7 @@ router.get(
                   brandSku
                   isRequiredCheckExpiry
                   expirationPeriod
+                  pickingStrategy
                   auxUnit1
                   auxValue1
                   auxUnit2

package/server/routers/api/restful-apis/unstable/get-warehouses.ts

@@ -1,6 +1,7 @@
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Bizplace } from '@things-factory/biz-base'
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
+
 import { getBizplaceAccessibleWarehouses } from '../../../../utils'
 
 const debug = require('debug')('things-factory:operato-hub:restful-api:unstable:get-partners')
@@ -8,7 +9,7 @@ const debug = require('debug')('things-factory:operato-hub:restful-api:unstable:
 router.get('/unstable/get-warehouses/:bizplaceId', async (context, next) => {
   try {
     const { bizplaceId } = context.params
-    const bizplace: Bizplace = await getRepository(Bizplace).findOne(bizplaceId)
+    const bizplace: Bizplace = await getRepository(Bizplace).findOneBy({ id: bizplaceId })
     context.body = {
       result: await getBizplaceAccessibleWarehouses(bizplace)
     }

package/server/routers/api/restful-apis/unstable/update-release-order-details.ts

@@ -1,8 +1,8 @@
 import gql from 'graphql-tag'
-import { getRepository } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Bizplace } from '@things-factory/biz-base'
+import { getRepository } from '@things-factory/shell'
 
 import { businessMiddleware } from '../../../../middlewares/business-middleware'
 import { warehouseMiddleware } from '../../../../middlewares/warehouse-middleware'

package/server/routers/api/restful-apis/v1/add-inbound-order.ts

@@ -1,9 +1,10 @@
 import gql from 'graphql-tag'
-import { getRepository, In } from 'typeorm'
+import { In } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Bizplace, ContactPoint, getCompanyBizplace } from '@things-factory/biz-base'
 import { Product, ProductDetail } from '@things-factory/product-base'
+import { getRepository } from '@things-factory/shell'
 
 import { businessMiddleware } from '../../../../middlewares/business-middleware'
 import { warehouseMiddleware } from '../../../../middlewares/warehouse-middleware'
@@ -90,8 +91,8 @@ router.post(
       const supplierInfo = bodyReq.supplier
       const foundSupplier: ContactPoint = await getRepository(ContactPoint).findOne({
         where: {
-          domain,
-          bizplace: warehouseId,
+          domain: { id: domain.id },
+          bizplace: { id: warehouseId },
           name: supplierInfo.name,
           companyName: supplierInfo.companyName,
           email: supplierInfo.email,