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

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

@@ -1,20 +1,22 @@
 /** Customer list to inform when there are changes */
-/** 1. Sweetmag */
-/** 2. Beidzia */
+/** 1. Bridzia */
+/** 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:v1:add-marketplace-order')
+const debug = require('debug')('things-factory:operato-hub:restful-api:unstable:add-marketplace-order')
+const apiVersion = 'v1'
 
 router.post(
-  '/v1/warehouse/:storeId/add-marketplace-order',
+  `/${apiVersion}/warehouse/:storeId/add-marketplace-order`,
   businessMiddleware,
   storeMiddleware,
   async (context, next) => {
@@ -120,6 +122,16 @@ router.post(
           } as any)
         ).data
       }
+
+      createPayloadLog(
+        marketplaceStore.id,
+        `/${apiVersion}/warehouse/:storeId/add-marketplace-order`,
+        bodyReq,
+        context.body.result,
+        context,
+        PayloadType.INGESTION,
+        'hub-api'
+      )
     })
   }
 )

package/server/routers/api/restful-apis/v1/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/v1/add-release-order.ts

@@ -46,7 +46,7 @@ router.post(
 
         let locationSortingRules = []
         const inventoryAssignmentSetting: Setting = await tx.getRepository(Setting).findOne({
-          where: { domain, name: 'rule-for-inventory-assignment' }
+          where: { domain: { id: domain.id }, name: 'rule-for-inventory-assignment' }
         })
 
         if (inventoryAssignmentSetting) {
@@ -56,7 +56,7 @@ router.post(
           }
         } else {
           const pickingProductSetting: Setting = await tx.getRepository(Setting).findOne({
-            where: { domain, name: 'rule-for-picking-product' }
+            where: { domain: { id: domain.id }, name: 'rule-for-picking-product' }
           })
           if (pickingProductSetting) {
             let locationSetting = JSON.parse(pickingProductSetting.value)
@@ -212,11 +212,11 @@ router.post(
                   break
 
                 case 'FEFO':
-                  sortings.push({ name: 'expiration_date', desc: false })
+                  sortings.push({ name: 'expiration_date', desc: false }, { name: 'created_at', desc: false })
                   break
 
                 case 'FMFO':
-                  sortings.push({ name: 'manufacture_date', desc: false })
+                  sortings.push({ name: 'manufacture_date', desc: false }, { name: 'created_at', desc: false })
                   break
               }
 
@@ -379,6 +379,7 @@ router.post(
 
                 case 'FEFO':
                   qb.orderBy('"iv"."expiration_date"', 'ASC')
+                  qb.orderBy('"iv"."created_at"', 'ASC')
                   if (locationSortingRules?.length > 0) {
                     locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
                       qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
@@ -388,6 +389,7 @@ router.post(
 
                 case 'FMFO':
                   qb.orderBy('"iv"."manufacture_date"', 'ASC')
+                  qb.orderBy('"iv"."created_at"', 'ASC')
                   if (locationSortingRules?.length > 0) {
                     locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
                       qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
@@ -727,7 +729,8 @@ router.post(
           bodyReq,
           context.body,
           context,
-          PayloadType.INGESTION
+          PayloadType.INGESTION,
+          'hub-api'
         )
       } catch (error) {
         createPayloadLog(
@@ -736,7 +739,8 @@ router.post(
           bodyReq,
           error,
           context,
-          PayloadType.INGESTION
+          PayloadType.INGESTION,
+          'hub-api'
         )
         throw error
       }

package/server/routers/api/restful-apis/v1/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/v1/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/v1/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/v1/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/v1/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:v1:get-partners')
 
 router.get('/v1/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/v1/get-products.ts

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

package/server/routers/api/restful-apis/v1/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:v1:get-partners')
@@ -8,7 +9,7 @@ const debug = require('debug')('things-factory:operato-hub:restful-api:v1:get-pa
 router.get('/v1/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/v1/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/v2/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,
+          dodomain: { id: domain.id },
+          bizplace: { id: warehouseId },
           name: supplierInfo.name,
           companyName: supplierInfo.companyName,
           email: supplierInfo.email,

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

@@ -1,20 +1,22 @@
 /** Customer list to inform when there are changes */
-/** 1. Sweetmag */
-/** 2. Bridzia */
+/** 1. Bridzia */
+/** 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:v2:add-marketplace-order')
+const debug = require('debug')('things-factory:operato-hub:restful-api:unstable:add-marketplace-order')
+const apiVersion = 'v2'
 
 router.post(
-  '/v2/warehouse/:storeId/add-marketplace-order',
+  `/${apiVersion}/warehouse/:storeId/add-marketplace-order`,
   businessMiddleware,
   storeMiddleware,
   async (context, next) => {
@@ -120,6 +122,16 @@ router.post(
           } as any)
         ).data
       }
+
+      createPayloadLog(
+        marketplaceStore.id,
+        `/${apiVersion}/warehouse/:storeId/add-marketplace-order`,
+        bodyReq,
+        context.body.result,
+        context,
+        PayloadType.INGESTION,
+        'hub-api'
+      )
     })
   }
 )

package/server/routers/api/restful-apis/v2/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/v2/add-release-order.ts

@@ -46,7 +46,7 @@ router.post(
 
         let locationSortingRules = []
         const inventoryAssignmentSetting: Setting = await tx.getRepository(Setting).findOne({
-          where: { domain, name: 'rule-for-inventory-assignment' }
+          where: { domain: { id: domain.id }, name: 'rule-for-inventory-assignment' }
         })
 
         if (inventoryAssignmentSetting) {
@@ -56,7 +56,7 @@ router.post(
           }
         } else {
           const pickingProductSetting: Setting = await tx.getRepository(Setting).findOne({
-            where: { domain, name: 'rule-for-picking-product' }
+            where: { domain: { id: domain.id }, name: 'rule-for-picking-product' }
           })
           if (pickingProductSetting) {
             let locationSetting = JSON.parse(pickingProductSetting.value)
@@ -212,11 +212,11 @@ router.post(
                   break
 
                 case 'FEFO':
-                  sortings.push({ name: 'expiration_date', desc: false })
+                  sortings.push({ name: 'expiration_date', desc: false }, { name: 'created_at', desc: false })
                   break
 
                 case 'FMFO':
-                  sortings.push({ name: 'manufacture_date', desc: false })
+                  sortings.push({ name: 'manufacture_date', desc: false }, { name: 'created_at', desc: false })
                   break
               }
 
@@ -379,6 +379,7 @@ router.post(
 
                 case 'FEFO':
                   qb.orderBy('"iv"."expiration_date"', 'ASC')
+                  qb.orderBy('"iv"."created_at"', 'ASC')
                   if (locationSortingRules?.length > 0) {
                     locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
                       qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
@@ -388,6 +389,7 @@ router.post(
 
                 case 'FMFO':
                   qb.orderBy('"iv"."manufacture_date"', 'ASC')
+                  qb.orderBy('"iv"."created_at"', 'ASC')
                   if (locationSortingRules?.length > 0) {
                     locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
                       qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
@@ -727,7 +729,8 @@ router.post(
           bodyReq,
           context.body,
           context,
-          PayloadType.INGESTION
+          PayloadType.INGESTION,
+          'hub-api'
         )
       } catch (error) {
         createPayloadLog(
@@ -736,7 +739,8 @@ router.post(
           bodyReq,
           error,
           context,
-          PayloadType.INGESTION
+          PayloadType.INGESTION,
+          'hub-api'
         )
         throw error
       }

package/server/routers/api/restful-apis/v2/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/v2/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/v2/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/v2/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'