@things-factory/operato-hub 4.3.2 → 4.4.0-alpha.0

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

@@ -5,8 +5,6 @@
 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'
@@ -18,109 +16,99 @@ router.post(
   businessMiddleware,
   storeMiddleware,
   async (context, next) => {
-    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) {
+    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 {
                   id
-                  orderNo
-                  currency
-                  itemCount
-                  totalAmount
-                  paymentMethod
-                  remark
-                  giftOption
-                  orderCreatedAt
-                  orderUpdatedAt
-                  marketplaceStore {
-                    storeId
+                  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
+                    }
                   }
-                  marketplaceOrderItems {
+                  marketplaceProductVariation {
                     id
+                    sku
+                    variationId
+                    variationSku
+                    channelSku
                     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
-                      }
-                    }
-                    marketplaceProductVariation {
-                      id
-                      sku
-                      variationId
-                      variationSku
-                      channelSku
-                      name
-                      costPrice
-                      sellPrice
-                      marketplaceStatus
-                    }
+                    costPrice
+                    sellPrice
+                    marketplaceStatus
                   }
                 }
               }
-            `,
-            variables: { marketplaceOrder: bodyReq },
-            context: {
-              ...context,
-              state: {
-                ...context.state,
-                marketplaceStore,
-                domain,
-                type: 'api'
-              }
             }
-          } as any)
-        ).data
-      }
-    })
+          `,
+          variables: { marketplaceOrder: bodyReq },
+          context: {
+            ...context,
+            state: {
+              ...context.state,
+              marketplaceStore,
+              domain,
+              type: 'api'
+            }
+          }
+        } as any)
+      ).data
+    }
   }
 )
 

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

@@ -4,7 +4,7 @@ import { EntityManager, getConnection, SelectQueryBuilder } from 'typeorm'
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
 import { Product, ProductBundle, ProductDetail } from '@things-factory/product-base'
-import { ORDER_TYPES, OrderInventory, OrderProduct } from '@things-factory/sales-base'
+import { ORDER_TYPES, OrderInventory } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
 import { Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
 import { WorksheetDetail } from '@things-factory/worksheet-base'
@@ -254,37 +254,17 @@ router.post(
 
             if (!response.errors) {
               const items = response.data.inventoriesByPallet.items || []
-              if (!items?.length) {
-                context.body = {
-                  result: await createDraftOrder(
-                    client,
-                    customerBizplace,
-                    bodyReq,
-                    bundleInfo,
-                    domain,
-                    context,
-                    orderInventories,
-                    tx
+              if (!items?.length)
+                context.throw(
+                  404,
+                  t(
+                    `error.no inventories found for ${orderInventory.product?.sku} with batch ID ${orderInventory?.batchId}`
                   )
-                }
-                return
-              }
+                )
 
-              items.forEach(async item => {
+              items.forEach(item => {
                 if (orderInventory.releaseQty > item.remainQty || orderInventory.releaseQty <= 0) {
-                  context.body = {
-                    result: await createDraftOrder(
-                      client,
-                      customerBizplace,
-                      bodyReq,
-                      bundleInfo,
-                      domain,
-                      context,
-                      orderInventories,
-                      tx
-                    )
-                  }
-                  return
+                  context.throw(404, t(`error.invalid release qty for ${orderInventory.product?.sku}`))
                 }
 
                 // 3. add more information to orderInventory
@@ -297,21 +277,7 @@ router.post(
               })
 
               return orderInventory
-            } else {
-              context.body = {
-                result: await createDraftOrder(
-                  client,
-                  customerBizplace,
-                  bodyReq,
-                  bundleInfo,
-                  domain,
-                  context,
-                  orderInventories,
-                  tx
-                )
-              }
-              return
-            }
+            } else context.throw(404, t('error.failed to fetch inventory'))
           })
         )
       } else {
@@ -396,21 +362,8 @@ router.post(
             }
 
             let inventories: Inventory[] = await qb.getMany()
-            if (!inventories?.length) {
-              context.body = {
-                result: await createDraftOrder(
-                  client,
-                  customerBizplace,
-                  bodyReq,
-                  bundleInfo,
-                  domain,
-                  context,
-                  orderInventories,
-                  tx
-                )
-              }
-              return
-            }
+            if (!inventories?.length) context.throw(404, t(`error.no inventories found for ${product.sku}`))
+
             inventories = inventories
               .map(inventory => {
                 return {
@@ -421,24 +374,12 @@ router.post(
               })
               .filter(inventory => inventory.remainQty > 0)
 
-            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
-            }
+            const targetInventories: WorksheetDetail[] = _composeTargetInventories(
+              context,
+              product,
+              orderInventory,
+              inventories
+            )
             targetInventories.map(item => {
               finalOrderInventories.push(item.targetInventory)
             })
@@ -487,37 +428,17 @@ router.post(
 
             if (!response.errors) {
               const items = response.data.inventoryProductGroup.items || []
-              if (!items?.length) {
-                context.body = {
-                  result: await createDraftOrder(
-                    client,
-                    customerBizplace,
-                    bodyReq,
-                    bundleInfo,
-                    domain,
-                    context,
-                    orderInventories,
-                    tx
+              if (!items?.length)
+                context.throw(
+                  404,
+                  t(
+                    `error.no inventories found for ${orderInventory.product?.sku} with batch ID ${orderInventory?.batchId}`
                   )
-                }
-                return
-              }
+                )
 
-              items.forEach(async item => {
+              items.forEach(item => {
                 if (orderInventory.releaseQty > item.remainQty || orderInventory.releaseQty <= 0) {
-                  context.body = {
-                    result: await createDraftOrder(
-                      client,
-                      customerBizplace,
-                      bodyReq,
-                      bundleInfo,
-                      domain,
-                      context,
-                      orderInventories,
-                      tx
-                    )
-                  }
-                  return
+                  context.throw(404, t(`error.invalid release qty for ${orderInventory.product?.sku}`))
                 }
 
                 // 3. add more information to orderInventory
@@ -531,21 +452,7 @@ router.post(
 
               delete orderInventory.uomValue
               finalOrderInventories.push(orderInventory)
-            } else {
-              context.body = {
-                result: await createDraftOrder(
-                  client,
-                  customerBizplace,
-                  bodyReq,
-                  bundleInfo,
-                  domain,
-                  context,
-                  orderInventories,
-                  tx
-                )
-              }
-              return
-            }
+            } else context.throw(404, t('error.failed to fetch inventory'))
           }
         }
       }
@@ -753,7 +660,7 @@ export function _composeTargetInventories(context, product, record, inventories)
   })
 
   if (totalInventoryQty < record.releaseQty) {
-    context.throw(404, t(`error.invalid release qty for ${product?.sku}`)) //
+    context.throw(404, t(`error.invalid release qty for ${product?.sku}`))
   }
 
   let targetInventories = []
@@ -819,93 +726,3 @@ 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/unstable/index.ts

@@ -2,7 +2,6 @@ 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 './add-sales-invoice'
 import './bizplace'