@things-factory/operato-hub 4.2.12 → 4.3.0

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

@@ -0,0 +1,196 @@
+import gql from 'graphql-tag'
+import { EntityManager, getConnection } from 'typeorm'
+
+import { restfulApiRouter as router } from '@things-factory/api'
+import { Bizplace } from '@things-factory/biz-base'
+import { OrderInventory } from '@things-factory/sales-base'
+
+import { businessMiddleware } from '../../../../middlewares/business-middleware'
+import { warehouseMiddleware } from '../../../../middlewares/warehouse-middleware'
+
+const debug = require('debug')('things-factory:operato-hub:restful-api:unstable:add-draft-release-order')
+
+router.post(
+  '/v2/warehouse/:warehouseId/add-draft-release-order',
+  businessMiddleware,
+  warehouseMiddleware,
+  async (context, next) => {
+    return await getConnection().transaction(async (tx: EntityManager) => {
+      const { client, domain } = context.state
+      const { warehouseId: customerBizplaceId } = context.params
+      const { t } = context
+
+      if (!customerBizplaceId) context.throw(404, t('error.warehouse id not found'))
+
+      let bodyReq = context.request.body
+      if (typeof bodyReq === undefined || !Object.keys(bodyReq)?.length) {
+        context.throw(400, t('error.invalid body request format'))
+      }
+      debug('post:/add-draft-release-order request.body', bodyReq)
+      await checkMandatoryKey(context, bodyReq)
+
+      // get customer company's bizplace
+      const customerBizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+        where: { id: customerBizplaceId }
+      })
+
+      const orderInventories: OrderInventory[] = bodyReq.orderInventories
+
+      context.body = {
+        result: (
+          await client.mutate({
+            mutation: gql`
+              mutation upsertDraftReleaseGood(
+                $draftReleaseGood: DraftReleaseGoodPatch!
+                $orderProducts: [OrderProductPatch!]!
+                $files: [Upload!]
+              ) {
+                upsertDraftReleaseGood(
+                  draftReleaseGood: $draftReleaseGood
+                  orderProducts: $orderProducts
+                  files: $files
+                ) {
+                  id
+                  name
+                  refNo
+                  refNo2
+                  refNo3
+                  status
+                  truckNo
+                  ownTransport
+                  marketplaceOrderStatus
+                  billingAddress
+                  deliveryAddress1
+                  deliveryAddress2
+                  deliveryAddress3
+                  deliveryAddress4
+                  deliveryAddress5
+                  attentionTo
+                  attentionCompany
+                  city
+                  state
+                  postalCode
+                  country
+                  phone1
+                  phone2
+                  email
+                  type
+                  exportOption
+                  releaseDate
+                  collectionOrderNo
+                  bizplace {
+                    name
+                  }
+                  orderProducts {
+                    product {
+                      sku
+                      name
+                      description
+                    }
+                    packingType
+                    packingSize
+                    releaseQty
+                  }
+                }
+              }
+            `,
+            variables: {
+              draftReleaseGood: {
+                bizplace: {
+                  id: customerBizplace.id
+                },
+                courierOption: bodyReq.courierOption,
+                collectionOrderNo: bodyReq.collectionOrderNo,
+                exportOption: bodyReq.exportOption,
+                ownTransport: bodyReq.ownTransport,
+                packingOption: bodyReq.packingOption,
+                refNo: bodyReq.refNo,
+                refNo2: bodyReq?.refNo2,
+                refNo3: bodyReq?.refNo3,
+                releaseDate: bodyReq.releaseDate,
+                type: bodyReq.type,
+                marketplaceOrderStatus: bodyReq?.marketplaceOrderStatus,
+                remark: bodyReq?.remark || null,
+                billingAddress: bodyReq?.billTo?.billingAddress || null,
+                deliveryAddress1: bodyReq?.deliverTo?.deliveryAddress1 || null,
+                deliveryAddress2: bodyReq?.deliverTo?.deliveryAddress2 || null,
+                deliveryAddress3: bodyReq?.deliverTo?.deliveryAddress3 || null,
+                deliveryAddress4: bodyReq?.deliverTo?.deliveryAddress4 || null,
+                deliveryAddress5: bodyReq?.deliverTo?.deliveryAddress5 || null,
+                attentionTo: bodyReq?.deliverTo?.attentionTo || null,
+                attentionCompany: bodyReq?.deliverTo?.attentionCompany || null,
+                city: bodyReq?.deliverTo?.city || null,
+                state: bodyReq?.deliverTo?.state || null,
+                postalCode: bodyReq?.deliverTo?.postalCode || null,
+                country: bodyReq?.deliverTo?.country || null,
+                phone1: bodyReq?.deliverTo?.phone1 || null,
+                phone2: bodyReq?.deliverTo?.phone2 || null,
+                email: bodyReq?.deliverTo?.email || null
+              },
+              orderProducts: orderInventories,
+              files: []
+            },
+            context: {
+              ...context,
+              hasUpload: true,
+              state: {
+                ...context.state,
+                customerBizplace,
+                domain,
+                type: 'api'
+              }
+            }
+          } as any)
+        ).data
+      }
+    })
+  }
+)
+
+export async function checkMandatoryKey(context, params) {
+  let noparams = ['releaseDate', 'exportOption'].filter(param => !(param in params))
+
+  if ('ownTransport' in params) {
+    if (params.ownTransport == true) {
+      if (!params.hasOwnProperty('collectionOrderNo')) {
+        noparams.push('collectionOrderNo')
+      }
+    }
+  } else {
+    noparams.push('ownTransport')
+  }
+
+  if ('exportOption' in params) {
+    if (params.exportOption === true) {
+      if (
+        params.exportOption.filter(
+          record =>
+            !record.containerNo || !record.containerArrivalDate || !record.containerLeavingDate || !record.shipName
+        ).length
+      ) {
+        noparams.push('exportOption')
+      }
+    }
+  }
+
+  if ('orderInventories' in params) {
+    params.orderInventories.forEach((param, key) => {
+      let noSubParams = []
+
+      if (!param?.releaseQty) noSubParams.push('releaseQty')
+
+      if (!param?.product) noSubParams.push('product')
+
+      if (noSubParams?.length)
+        context.throw(400, context.t('error.required param x not found', { x: `${noSubParams.join(', ')}` }))
+    })
+  } else {
+    noparams.push('orderInventories')
+  }
+
+  if (noparams?.length) {
+    context.throw(400, context.t('error.required param x not found', { x: `${noparams.join(', ')}` }))
+  }
+
+  return params
+}

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

@@ -5,6 +5,8 @@
 import gql from 'graphql-tag'
 
 import { restfulApiRouter as router } from '@things-factory/api'
+import { EntityManager, getConnection } from 'typeorm'
+import { MarketplaceOrder } from '@things-factory/marketplace-base'
 
 import { businessMiddleware } from '../../../../middlewares/business-middleware'
 import { storeMiddleware } from '../../../../middlewares/store-middleware'
@@ -16,99 +18,109 @@ router.post(
   businessMiddleware,
   storeMiddleware,
   async (context, next) => {
-    const { client, marketplaceStore, domain } = context.state
-    const { t } = context
-    const bodyReq = context.request.body
-
-    if (typeof bodyReq === undefined || !Object.keys(bodyReq)?.length) {
-      context.throw(400, t('error.invalid body request format'))
-    }
-
-    await checkMandatoryKey(context, bodyReq)
-    debug('post:/add-marketplace-order body request', bodyReq)
-
-    context.body = {
-      result: (
-        await client.mutate({
-          mutation: gql`
-            mutation generateMarketplaceOrder($marketplaceOrder: NewMarketplaceOrder!) {
-              generateMarketplaceOrder(marketplaceOrder: $marketplaceOrder) {
-                id
-                orderNo
-                currency
-                itemCount
-                totalAmount
-                paymentMethod
-                remark
-                giftOption
-                orderCreatedAt
-                orderUpdatedAt
-                marketplaceStore {
-                  storeId
-                }
-                marketplaceOrderItems {
+    return await getConnection().transaction(async (tx: EntityManager) => {
+      const { client, marketplaceStore, domain } = context.state
+      const { t } = context
+      const bodyReq = context.request.body
+
+      if (typeof bodyReq === undefined || !Object.keys(bodyReq)?.length) {
+        context.throw(400, t('error.invalid body request format'))
+      }
+
+      await checkMandatoryKey(context, bodyReq)
+      debug('post:/add-marketplace-order body request', bodyReq)
+
+      let existingMarketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+        where: { name: bodyReq.name, domain, marketplaceStore }
+      })
+
+      if (existingMarketplaceOrder) {
+        context.throw(400, `error.duplicate entry for order ${bodyReq.name}`)
+      }
+
+      context.body = {
+        result: (
+          await client.mutate({
+            mutation: gql`
+              mutation generateMarketplaceOrder($marketplaceOrder: NewMarketplaceOrder!) {
+                generateMarketplaceOrder(marketplaceOrder: $marketplaceOrder) {
                   id
-                  name
-                  qty
-                  cancelBy
-                  returnStatus
-                  paidPrice
-                  packageId
-                  invoiceNo
-                  status
-                  marketplaceOrderShippingItems {
-                    marketplaceOrderShipping {
-                      attentionTo
-                      address1
-                      address2
-                      address3
-                      address4
-                      address5
-                      state
-                      city
-                      postCode
-                      country
-                      phone1
-                      phone2
-                      email
-                      orderType
-                      freightType
-                      parcelType
-                      goodsType
-                      deliveryMethod
-                      totalWeight
-                      totalVolume
-                      transporter
-                    }
+                  orderNo
+                  currency
+                  itemCount
+                  totalAmount
+                  paymentMethod
+                  remark
+                  giftOption
+                  orderCreatedAt
+                  orderUpdatedAt
+                  marketplaceStore {
+                    storeId
                   }
-                  marketplaceProductVariation {
+                  marketplaceOrderItems {
                     id
-                    sku
-                    variationId
-                    variationSku
-                    channelSku
                     name
-                    costPrice
-                    sellPrice
-                    marketplaceStatus
+                    qty
+                    cancelBy
+                    returnStatus
+                    paidPrice
+                    packageId
+                    invoiceNo
+                    status
+                    marketplaceOrderShippingItems {
+                      marketplaceOrderShipping {
+                        attentionTo
+                        address1
+                        address2
+                        address3
+                        address4
+                        address5
+                        state
+                        city
+                        postCode
+                        country
+                        phone1
+                        phone2
+                        email
+                        orderType
+                        freightType
+                        parcelType
+                        goodsType
+                        deliveryMethod
+                        totalWeight
+                        totalVolume
+                        transporter
+                      }
+                    }
+                    marketplaceProductVariation {
+                      id
+                      sku
+                      variationId
+                      variationSku
+                      channelSku
+                      name
+                      costPrice
+                      sellPrice
+                      marketplaceStatus
+                    }
                   }
                 }
               }
+            `,
+            variables: { marketplaceOrder: bodyReq },
+            context: {
+              ...context,
+              state: {
+                ...context.state,
+                marketplaceStore,
+                domain,
+                type: 'api'
+              }
             }
-          `,
-          variables: { marketplaceOrder: bodyReq },
-          context: {
-            ...context,
-            state: {
-              ...context.state,
-              marketplaceStore,
-              domain,
-              type: 'api'
-            }
-          }
-        } as any)
-      ).data
-    }
+          } as any)
+        ).data
+      }
+    })
   }
 )
 

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

@@ -257,17 +257,37 @@ router.post(
 
             if (!response.errors) {
               const items = response.data.inventoriesByPallet.items || []
-              if (!items?.length)
-                context.throw(
-                  404,
-                  t(
-                    `error.no inventories found for ${orderInventory.product?.sku} with batch ID ${orderInventory?.batchId}`
+              if (!items?.length) {
+                context.body = {
+                  result: await createDraftOrder(
+                    client,
+                    customerBizplace,
+                    bodyReq,
+                    bundleInfo,
+                    domain,
+                    context,
+                    orderInventories,
+                    tx
                   )
-                )
+                }
+                return
+              }
 
-              items.forEach(item => {
+              items.forEach(async item => {
                 if (orderInventory.releaseQty > item.remainQty || orderInventory.releaseQty <= 0) {
-                  context.throw(404, t(`error.invalid release qty for ${orderInventory.product?.sku}`))
+                  context.body = {
+                    result: await createDraftOrder(
+                      client,
+                      customerBizplace,
+                      bodyReq,
+                      bundleInfo,
+                      domain,
+                      context,
+                      orderInventories,
+                      tx
+                    )
+                  }
+                  return
                 }
 
                 // 3. add more information to orderInventory
@@ -280,7 +300,21 @@ router.post(
               })
 
               return orderInventory
-            } else context.throw(404, t('error.failed to fetch inventory'))
+            } else {
+              context.body = {
+                result: await createDraftOrder(
+                  client,
+                  customerBizplace,
+                  bodyReq,
+                  bundleInfo,
+                  domain,
+                  context,
+                  orderInventories,
+                  tx
+                )
+              }
+              return
+            }
           })
         )
       } else {
@@ -365,8 +399,21 @@ router.post(
             }
 
             let inventories: Inventory[] = await qb.getMany()
-            if (!inventories?.length) context.throw(404, t(`error.no inventories found for ${product.sku}`))
-
+            if (!inventories?.length) {
+              context.body = {
+                result: await createDraftOrder(
+                  client,
+                  customerBizplace,
+                  bodyReq,
+                  bundleInfo,
+                  domain,
+                  context,
+                  orderInventories,
+                  tx
+                )
+              }
+              return
+            }
             inventories = inventories
               .map(inventory => {
                 return {
@@ -377,12 +424,27 @@ router.post(
               })
               .filter(inventory => inventory.remainQty > 0)
 
-            const targetInventories: WorksheetDetail[] = _composeTargetInventories(
-              context,
-              product,
-              orderInventory,
-              inventories
-            )
+            let targetInventories: WorksheetDetail[]
+            try {
+              targetInventories = _composeTargetInventories(context, product, orderInventory, inventories)
+            } catch (e) {
+              context.body = {
+                result: await createDraftOrder(
+                  client,
+                  customerBizplace,
+                  bodyReq,
+                  bundleInfo,
+                  domain,
+                  context,
+                  orderInventories,
+                  tx
+                )
+              }
+              return
+            }
+            targetInventories.map(item => {
+              finalOrderInventories.push(item.targetInventory)
+            })
             targetInventories.map(item => {
               finalOrderInventories.push(item.targetInventory)
             })
@@ -431,17 +493,37 @@ router.post(
 
             if (!response.errors) {
               const items = response.data.inventoryProductGroup.items || []
-              if (!items?.length)
-                context.throw(
-                  404,
-                  t(
-                    `error.no inventories found for ${orderInventory.product?.sku} with batch ID ${orderInventory?.batchId}`
+              if (!items?.length) {
+                context.body = {
+                  result: await createDraftOrder(
+                    client,
+                    customerBizplace,
+                    bodyReq,
+                    bundleInfo,
+                    domain,
+                    context,
+                    orderInventories,
+                    tx
                   )
-                )
+                }
+                return
+              }
 
-              items.forEach(item => {
+              items.forEach(async item => {
                 if (orderInventory.releaseQty > item.remainQty || orderInventory.releaseQty <= 0) {
-                  context.throw(404, t(`error.invalid release qty for ${orderInventory.product?.sku}`))
+                  context.body = {
+                    result: await createDraftOrder(
+                      client,
+                      customerBizplace,
+                      bodyReq,
+                      bundleInfo,
+                      domain,
+                      context,
+                      orderInventories,
+                      tx
+                    )
+                  }
+                  return
                 }
 
                 // 3. add more information to orderInventory
@@ -455,7 +537,21 @@ router.post(
 
               delete orderInventory.uomValue
               finalOrderInventories.push(orderInventory)
-            } else context.throw(404, t('error.failed to fetch inventory'))
+            } else {
+              context.body = {
+                result: await createDraftOrder(
+                  client,
+                  customerBizplace,
+                  bodyReq,
+                  bundleInfo,
+                  domain,
+                  context,
+                  orderInventories,
+                  tx
+                )
+              }
+              return
+            }
           }
         }
       }
@@ -729,3 +825,93 @@ function combineItems(inventoryList) {
 
   return mappedList
 }
+
+async function createDraftOrder(client, customerBizplace, bodyReq, bundleInfo, domain, context, orderInventories, tx) {
+  return (
+    await client.mutate({
+      mutation: gql`
+        mutation upsertDraftReleaseGood(
+          $draftReleaseGood: DraftReleaseGoodPatch!
+          $orderProducts: [OrderProductPatch!]!
+        ) {
+          upsertDraftReleaseGood(draftReleaseGood: $draftReleaseGood, orderProducts: $orderProducts) {
+            id
+            name
+            refNo
+            refNo2
+            status
+            truckNo
+            ownTransport
+            marketplaceOrderStatus
+            billingAddress
+            deliveryAddress1
+            deliveryAddress2
+            deliveryAddress3
+            deliveryAddress4
+            deliveryAddress5
+            attentionTo
+            attentionCompany
+            city
+            state
+            postalCode
+            country
+            phone1
+            phone2
+            email
+            type
+            exportOption
+            releaseDate
+            collectionOrderNo
+            bizplace {
+              name
+            }
+          }
+        }
+      `,
+      variables: {
+        draftReleaseGood: {
+          bizplace: {
+            id: customerBizplace.id
+          },
+          courierOption: bodyReq.courierOption,
+          collectionOrderNo: bodyReq.collectionOrderNo,
+          exportOption: bodyReq.exportOption,
+          ownTransport: bodyReq.ownTransport,
+          packingOption: bodyReq.packingOption,
+          refNo: bodyReq.refNo,
+          refNo2: bodyReq?.refNo2,
+          releaseDate: bodyReq.releaseDate,
+          type: bodyReq.type,
+          marketplaceOrderStatus: bodyReq?.marketplaceOrderStatus,
+          remark: bodyReq?.remark || null,
+          billingAddress: bodyReq?.billTo?.billingAddress || null,
+          deliveryAddress1: bodyReq?.deliverTo?.deliveryAddress1 || null,
+          deliveryAddress2: bodyReq?.deliverTo?.deliveryAddress2 || null,
+          deliveryAddress3: bodyReq?.deliverTo?.deliveryAddress3 || null,
+          deliveryAddress4: bodyReq?.deliverTo?.deliveryAddress4 || null,
+          deliveryAddress5: bodyReq?.deliverTo?.deliveryAddress5 || null,
+          attentionTo: bodyReq?.deliverTo?.attentionTo || null,
+          attentionCompany: bodyReq?.deliverTo?.attentionCompany || null,
+          city: bodyReq?.deliverTo?.city || null,
+          state: bodyReq?.deliverTo?.state || null,
+          postalCode: bodyReq?.deliverTo?.postalCode || null,
+          country: bodyReq?.deliverTo?.country || null,
+          phone1: bodyReq?.deliverTo?.phone1 || null,
+          phone2: bodyReq?.deliverTo?.phone2 || null,
+          email: bodyReq?.deliverTo?.email || null
+        },
+        orderProducts: orderInventories
+      },
+      context: {
+        ...context,
+        hasUpload: true,
+        state: {
+          ...context.state,
+          customerBizplace,
+          domain,
+          type: 'api'
+        }
+      }
+    } as any)
+  ).data
+}

package/server/routers/api/restful-apis/v2/index.ts

@@ -2,6 +2,7 @@ import './add-contact-point'
 import './add-inbound-order'
 import './add-marketplace-order'
 import './add-products'
+import './add-draft-release-order'
 import './add-release-order'
 import './bizplace'
 import './reject-inbound-order'