@things-factory/worksheet-base 4.3.523 → 4.3.524

package/server/graphql/resolvers/worksheet/picking/activate-picking.ts

@@ -76,7 +76,7 @@ export async function activatePicking(
         break
     }
 
-    if (
+     if (
       releaseGood?.orderPackages?.length &&
       releaseGood.lmdOption &&
       releaseGood.lastMileDelivery &&

package/server/utils/lmd-util.ts

@@ -20,13 +20,18 @@ import {
   refreshAccessTokenNinjavan,
   getAccessTokenCityLink
 } from '@things-factory/integration-lmd'
-import { createReleaseGoodLog, OrderPackage, ReleaseGood } from '@things-factory/sales-base'
+import { createReleaseGoodLog, OrderPackage, ReleaseGood, OrderConsignment } from '@things-factory/sales-base'
 import { MarketplaceOrder, MarketplaceStore } from '@things-factory/marketplace-base'
 import { Lambda } from './lambda/lambda-const'
 
 import { EcommerceController } from '../index'
+import { config } from '@things-factory/env'
 
 const debug = require('debug')('things-factory:worksheet-base:lmd-util')
+const ninjavanConfig = config.get('lmdIntegrationNinjavan', {})
+const citylinkConfig = config.get('lmdIntegrationCitylink', {})
+const emsConfig = config.get('lmdIntegrationEms', {})
+const lmdConfig = config.get('lmdIntegrationConfig', {})
 import i18next from 'i18next'
 
 // import { SellercraftController } from '../controllers'
@@ -40,6 +45,8 @@ const LMD_BOARDS = {
 export async function createLmdParcel(releaseGoods, tx, domain, user, marketplaceOrder) {
   try {
     let parcelsRequest = []
+    let parcelsRequestV2 = []
+
     for (let index = 0; index < releaseGoods.length; index++) {
       let releaseGood = releaseGoods[index]
       try {
@@ -54,27 +61,18 @@ export async function createLmdParcel(releaseGoods, tx, domain, user, marketplac
 
       try {
         let lmd: LastMileDelivery = releaseGood.lastMileDelivery
-        let bizplace: Bizplace
+        let version = lmd?.version ? lmd.version : 'v1'
         let lmdBizplace: LastMileDeliveryBizplace = await tx.getRepository(LastMileDeliveryBizplace).findOne({
           where: { lastMileDelivery: lmd.id, bizplace: releaseGood.bizplace },
           relations: ['lastMileDelivery', 'bizplace']
         })
 
+        let bizplace: Bizplace = await assignBizplaceAddress(lmdBizplace, releaseGood, tx)
+        let [latitude, longitude] = bizplace?.latlng?.split(',')
+
         let validLmd: Boolean = await validateLmd(tx, releaseGood, lmd.id)
         if (!validLmd) throw new Error(`Last mile delivery account is not valid. Please contact support team.`)
 
-        if (lmdBizplace?.customAddress == true) {
-          bizplace = await tx.getRepository(Bizplace).findOne({
-            where: { id: lmdBizplace.bizplace.id },
-            relations: ['domain']
-          })
-        } else {
-          bizplace = await tx.getRepository(Bizplace).findOne({
-            where: { domain: releaseGood.domain },
-            relations: ['domain']
-          })
-        }
-
         const senderGeoArea: GeoArea = await tx
           .getRepository(GeoArea)
           .findOne({ where: { postalCode: bizplace.postalCode } })
@@ -99,37 +97,13 @@ export async function createLmdParcel(releaseGoods, tx, domain, user, marketplac
           return releaseGood
         }
 
-        const currentDate = new Date()
-        const currentTimestamp = Math.floor(Date.now() / 1000)
-
         switch (lmd?.platform) {
           case 'CITYLINK':
-            const expiredDateCitylink = new Date(lmd?.expiresIn)
-            // Calculate the renewal date as 2 days before the expiry date
-            const renewalDateCitylink = new Date(expiredDateCitylink.getTime() - 2 * 24 * 60 * 60 * 1000)
-
-            if (currentDate >= renewalDateCitylink) {
-              const lastMileDeliveryCitylink = await getAccessTokenCityLink(lmd?.id, { state: { tx } })
-              lmd.accessToken = lastMileDeliveryCitylink.accessToken
-            }
             releaseGood = fnSplitAddress(releaseGood)
-            break
-
           case 'NINJA_VAN':
           case 'EMS':
-            const renewalTimestamp = lmd?.expiresIn - 12 * 60 * 60 // Renew 12 hr before expiry
-
-            if (currentTimestamp >= renewalTimestamp) {
-              let lastMileDelivery
-              if (lmd?.platform === 'NINJA_VAN') {
-                lastMileDelivery = await refreshAccessTokenNinjavan(lmd?.id, { state: { tx } })
-              } else if (lmd?.platform === 'EMS') {
-                lastMileDelivery = await getAccessTokenEfmx(lmd?.id, lmd?.clientId, lmd?.secretKey, { state: { tx } })
-              }
-              lmd.accessToken = lastMileDelivery.accessToken
-            }
+            lmd = await refreshLmdAccessToken(lmd, tx)
             break
-
           case 'DHL_EXPRESS':
             releaseGood = fnSplitAddress(releaseGood)
             break
@@ -138,8 +112,6 @@ export async function createLmdParcel(releaseGoods, tx, domain, user, marketplac
             break
         }
 
-        let [latitude, longitude] = bizplace?.latlng?.split(',')
-
         let data = {
           courier: lmd.platform,
           clientId: lmd?.clientId,
@@ -154,6 +126,7 @@ export async function createLmdParcel(releaseGoods, tx, domain, user, marketplac
           remark: releaseGood?.remark,
           prefix: lmd?.prefix,
           scope: lmd?.scope,
+          mps: lmd.mps,
 
           //pass releaseGoodId for rg logs
           releaseGoodId: releaseGood?.id,
@@ -163,6 +136,7 @@ export async function createLmdParcel(releaseGoods, tx, domain, user, marketplac
           custRef: releaseGood?.refNo2,
           cod: releaseGood?.codOption,
           paidAmount: releaseGood?.paidAmount?.toString(),
+          source: releaseGood?.source,
 
           recipient: releaseGood.attentionTo,
           phone: releaseGood?.phone1 ? releaseGood.phone1 : releaseGood?.phone2 ? releaseGood.phone2 : '',
@@ -197,46 +171,34 @@ export async function createLmdParcel(releaseGoods, tx, domain, user, marketplac
           handoverMethod: 1
         }
 
-        let unprocessedOrderPackages: OrderPackage[] = releaseGood.orderPackages.filter(op => !op.parcelId)
-
-        let packagesData = unprocessedOrderPackages.map(op => {
-          return {
-            ...data,
-            refNo: op.name,
-            items: op.orderPackageItems.map(opi => {
-              let lengthUnit = opi?.orderProduct?.productDetail?.lengthUnit?.toString()?.toLowerCase() || ''
-
-              let items = {
-                quantity: opi?.releaseQty?.toString() || ' ',
-                item: opi?.orderProduct?.product.name.slice(0, 49).trim() || ' ',
-                sku: opi?.orderProduct?.product.sku || ' ',
-                price:
-                  opi?.orderProduct?.paidAmount?.toString() ||
-                  (opi?.releaseQty * opi?.orderProduct?.productDetail?.costPrice || 0)?.toString() ||
-                  ' ',
-                weight: opi?.orderProduct?.productDetail?.grossWeight?.toString() || ' ',
-                width: opi?.orderProduct?.productDetail?.width || ' ',
-                length: opi?.orderProduct?.productDetail?.depth || ' ',
-                height: opi?.orderProduct?.productDetail?.height || ' '
-              }
-
-              if (lmd.platform == 'SAPX' || lmd.platform == 'VIETTEL_POST') {
-                if (lengthUnit == 'mm' || lengthUnit == 'm') {
-                  ;(items.width = (items.width / 10)?.toString()),
-                    (items.length = (items.length / 10)?.toString()),
-                    (items.height = (items.height / 10)?.toString())
-                } else {
-                  ;(items.width = items.width?.toString()),
-                    (items.length = items.length?.toString()),
-                    (items.height = items.height?.toString())
-                }
+        if (version == 'v2') {
+          let unprocessedConsignments: OrderConsignment = releaseGood?.orderConsignments
+            .map(oc => ({
+              ...oc,
+              orderPackages: oc.orderPackages.filter(op => !op.parcelId)
+            }))
+            .filter(oc => oc.orderPackages.length > 0)
+          let consignmentData = await processOrderConsignments(unprocessedConsignments, data, lmd.platform)
+          parcelsRequestV2.push(...consignmentData)
+        } else {
+          // for version1 lmd endpoint
+          let unprocessedOrderPackages: OrderPackage[] = releaseGood.orderPackages.filter(op => !op.parcelId)
+
+          let packagesData = await Promise.all(
+            unprocessedOrderPackages.map(async op => {
+              const items = await Promise.all(
+                op.orderPackageItems.map(opi => processOrderPackageItems(opi, lmd.platform))
+              )
+              return {
+                ...data,
+                refNo: op.name,
+                items: items
               }
-              return items
             })
-          }
-        })
+          )
 
-        parcelsRequest.push(...packagesData)
+          parcelsRequest.push(...packagesData)
+        }
       } catch (e) {
         createReleaseGoodLog('create-lmd-parcel', e.message, releaseGood.id, {
           state: { domain: null }
@@ -245,14 +207,23 @@ export async function createLmdParcel(releaseGoods, tx, domain, user, marketplac
       }
     }
 
+    if (parcelsRequestV2 && parcelsRequestV2.length > 0) {
+      await lmdIntegrationV2(parcelsRequestV2, releaseGoods, tx, domain, user, marketplaceOrder)
+    }
+
     if (parcelsRequest && parcelsRequest.length > 0) {
       let orderPackages: OrderPackage[]
+      let res
 
       try {
-        let res = await LastMileAPI.createParcel(
-          { ...releaseGoods[0].lastMileDelivery, platform: 'lmdMiddleware' },
+        res = await LastMileAPI.createParcel(
+          {
+            ...releaseGoods[0].lastMileDelivery,
+            platform: lmdConfig.version.v1
+          },
           parcelsRequest
         )
+
         for (let parcel of res) {
           let courier = parcel.transporter
           let transporter = courier.replace(/_/g, ' ')
@@ -304,19 +275,100 @@ export async function createLmdParcel(releaseGoods, tx, domain, user, marketplac
   }
 }
 
+async function lmdIntegrationV2(parcelsRequestV2, releaseGoods, tx, domain, user, marketplaceOrder) {
+  let orderPackages: OrderPackage[]
+  let responses
+  let packages
+
+  try {
+    responses = await LastMileAPI.createParcelV2(
+      {
+        ...releaseGoods[0].lastMileDelivery,
+        platform: lmdConfig.version.v2
+      },
+      parcelsRequestV2
+    )
+
+
+    // diff way return data
+    for (let response of responses) {
+      let courier = response.transporter
+      let transporter = courier.replace(/_/g, ' ')
+      packages = response.packages
+
+      //update consignmentNumber @orderConsignmentNo in orderConsignment
+      await tx
+        .getRepository(OrderConsignment)
+        .update({ name: response.refNo }, { consignmentNumber: response.shipmentID })
+
+      for (let op of packages) {
+        await tx
+          .getRepository(OrderPackage)
+          .update({ name: op.refNo }, { parcelId: op.parcelId, transporter: transporter })
+
+        parcelsRequestV2.map(rg => {
+          createReleaseGoodLog(
+            'lmd-create-parcel',
+            JSON.stringify({ parcelId: op.parcelId, parcelMessage: response.message }),
+            rg.releaseGoodId,
+            {
+              state: { domain: null }
+            }
+          )
+        })
+      }
+    }
+
+    const qb: SelectQueryBuilder<OrderPackage> = tx
+      .getRepository(OrderPackage)
+      .createQueryBuilder('op')
+      .innerJoinAndSelect('op.releaseGood', 'rg')
+      .innerJoinAndSelect('rg.domain', 'd')
+      .innerJoinAndSelect('rg.bizplace', 'b')
+      .innerJoinAndSelect('b.company', 'c')
+      .innerJoinAndSelect('c.domain', 'companyDomain')
+      .innerJoinAndSelect('b.domain', 'd2')
+      .leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
+      .where('op.name IN (:...orderPackageIds)', {
+        orderPackageIds: packages.map(op => {
+          return op.refNo
+        })
+      })
+
+    orderPackages = await qb.getMany()
+
+    await processAwbAndTrackingNo(orderPackages, tx, domain, user, marketplaceOrder)
+  } catch (error) {
+    parcelsRequestV2.map(rg => {
+      createReleaseGoodLog('error-lmd-create-parcel', error.message, rg.releaseGoodId, {
+        state: { domain: null }
+      })
+    })
+  }
+}
+
 export async function processAwbAndTrackingNo(orderPackages, tx, domain, user, marketplaceOrder) {
   const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
   let releaseOrders: ReleaseGood = []
 
   for (let orderPackage of orderPackages) {
-    // await getConnection().transaction(async tx => {
     try {
+      let awbRes
       let releaseGood = orderPackage.releaseGood
-      let awbRes = await LastMileAPI.getAwb(
-        { ...orderPackage.releaseGood.lastMileDelivery, platform: 'lmdMiddleware' },
-        { parcelId: orderPackage.parcelId, staging: orderPackage.releaseGood.lastMileDelivery?.staging }
+      let lmdVersion = releaseGood.lastMileDelivery.version
+
+      const platform = lmdConfig.version[lmdVersion === 'v2' ? 'v2' : 'v1']
+      awbRes = await LastMileAPI[lmdVersion === 'v2' ? 'getAwbV2' : 'getAwb'](
+        {
+          ...orderPackage.releaseGood.lastMileDelivery,
+          platform
+        },
+        {
+          parcelId: orderPackage.parcelId,
+          staging: orderPackage.releaseGood.lastMileDelivery?.staging
+        }
       )
-      // console.log(`[processAwbAndTrackingNo]Origin AWB URL : ${awbRes?.content}`)
+
       let awbCustomize: Boolean = orderPackage.releaseGood.lastMileDelivery?.awbCustomize
 
       if (awbRes) {
@@ -458,39 +510,32 @@ export async function processAwbAndTrackingNo(orderPackages, tx, domain, user, m
       })
     }
   }
-  // })
 }
 
-// trigger RTS
-// try {
-//   let uniqueReleaseOrders: ReleaseGood = [...new Map(releaseOrders.map(item => [item['id'], item])).values()]
-
-//   for (let releaseOrder of uniqueReleaseOrders) {
-//     const orderSource: string = releaseOrder.source
-
-//     if (orderSource == ApplicationType.SELLERCRAFT) {
-//       const sellercraft: Sellercraft = await getRepository(Sellercraft).findOne({
-//         domain: releaseOrder.bizplace.domain,
-//         status: SellercraftStatus.ACTIVE
-//       })
-//       if (sellercraft) {
-//         await getConnection().transaction(async tx => {
-//           const sellercraftCtrl: SellercraftController = new SellercraftController(tx, null, null)
-//           const rtsTriggerLevel: Setting = await tx.getRepository(Setting).findOne({
-//             where: { domain: releaseOrder.domain, category: 'id-rule', name: 'rts-trigger-level' }
-//           })
-
-//           if (rtsTriggerLevel && parseInt(rtsTriggerLevel?.value || 0) == 1) {
-//             await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseOrder)
-//           }
-//         })
-//       }
-//     }
-//   }
-// } catch (e) {
-//   logger.error(`[get-lmd-awb-sof-trigger]: ${e}`)
-// }
-//
+function dateTime() {
+  const currentDate = new Date()
+  const timezoneGMT = 8 * 60 // 8 hours ahead in minutes
+  currentDate.setMinutes(currentDate.getMinutes() + timezoneGMT)
+
+  const yy = currentDate.getFullYear()
+  const mm = String(currentDate.getMonth() + 1).padStart(2, '0')
+  const dd = String(currentDate.getDate()).padStart(2, '0')
+  const hrs = String(currentDate.getHours()).padStart(2, '0')
+  const mins = String(currentDate.getMinutes()).padStart(2, '0')
+  const secs = String(currentDate.getSeconds()).padStart(2, '0')
+  const dateTime = `${yy}-${mm}-${dd}T${hrs}:${mins}:${secs}GMT+08:00`
+
+  return dateTime
+}
+
+function formatDate(isoDateString) {
+  const date = new Date(isoDateString)
+  const day = date.getDate()
+  const monthNames = ['JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC']
+  const month = monthNames[date.getMonth()]
+  const year = date.getFullYear()
+  return `${day} ${month} ${year}`
+}
 
 async function processCallback(packageInfo) {
   try {
@@ -520,22 +565,6 @@ async function processCallback(packageInfo) {
   }
 }
 
-function dateTime() {
-  const currentDate = new Date()
-  const timezoneGMT = 8 * 60 // 8 hours ahead in minutes
-  currentDate.setMinutes(currentDate.getMinutes() + timezoneGMT)
-
-  const yy = currentDate.getFullYear()
-  const mm = String(currentDate.getMonth() + 1).padStart(2, '0')
-  const dd = String(currentDate.getDate()).padStart(2, '0')
-  const hrs = String(currentDate.getHours()).padStart(2, '0')
-  const mins = String(currentDate.getMinutes()).padStart(2, '0')
-  const secs = String(currentDate.getSeconds()).padStart(2, '0')
-  const dateTime = `${yy}-${mm}-${dd}T${hrs}:${mins}:${secs}GMT+08:00`
-
-  return dateTime
-}
-
 async function constructAwb(orderPackage, awbRes) {
   const releaseOrder = orderPackage.releaseGood
   let {
@@ -676,13 +705,117 @@ async function uploadInvoiceToS3(result, orderPackage) {
   return invoice
 }
 
-function formatDate(isoDateString) {
-  const date = new Date(isoDateString)
-  const day = date.getDate()
-  const monthNames = ['JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC']
-  const month = monthNames[date.getMonth()]
-  const year = date.getFullYear()
-  return `${day} ${month} ${year}`
+export async function assignBizplaceAddress(lmdBizplace, releaseGood, tx) {
+  let bizplace: Bizplace
+
+  if (lmdBizplace?.customAddress == true) {
+    bizplace = await tx.getRepository(Bizplace).findOne({
+      where: { id: lmdBizplace.bizplace.id },
+      relations: ['domain']
+    })
+  } else {
+    bizplace = await tx.getRepository(Bizplace).findOne({
+      where: { domain: releaseGood.domain },
+      relations: ['domain']
+    })
+  }
+
+  return bizplace
+}
+
+export async function refreshLmdAccessToken(lmd, tx) {
+  const platform = lmd.platform
+  const currentDate = new Date()
+  const currentTimestamp = Math.floor(Date.now() / 1000)
+
+  switch (platform) {
+    case 'CITYLINK':
+      const expiredDateCitylink = new Date(lmd?.expiresIn)
+      // Calculate the renewal date as 2 days before the expiry date
+      const renewalDateCitylink = new Date(expiredDateCitylink.getTime() - 2 * 24 * 60 * 60 * 1000)
+
+      if (currentDate >= renewalDateCitylink) {
+        const lastMileDeliveryCitylink = await getAccessTokenCityLink(lmd?.id, { state: { tx } })
+        lmd.accessToken = lastMileDeliveryCitylink.accessToken
+      }
+      break
+
+    case 'NINJA_VAN':
+    case 'EMS':
+      const renewalTimestamp = lmd?.expiresIn - 12 * 60 * 60 // Renew 12 hr before expiry
+
+      if (currentTimestamp >= renewalTimestamp) {
+        let lastMileDelivery
+        if (platform === 'NINJA_VAN') {
+          lastMileDelivery = await refreshAccessTokenNinjavan(lmd?.id, { state: { tx } })
+        } else if (platform === 'EMS') {
+          lastMileDelivery = await getAccessTokenEfmx(lmd?.id, lmd?.clientId, lmd?.secretKey, { state: { tx } })
+        }
+        lmd.accessToken = lastMileDelivery.accessToken
+      }
+      break
+
+    default:
+      break
+  }
+
+  return lmd
+}
+
+export async function processOrderConsignments(orderConsignments, data, platform) {
+  return Promise.all(
+    orderConsignments.map(async oc => {
+      const packages = await Promise.all(oc.orderPackages.map(op => processOrderPackage(op, platform)))
+      return {
+        ...data,
+        refNo: oc.name,
+        packages
+      }
+    })
+  )
+}
+
+export async function processOrderPackage(orderPackage, platform) {
+  const items = await Promise.all(orderPackage.orderPackageItems.map(opi => processOrderPackageItems(opi, platform)))
+  return {
+    refNo: orderPackage.name,
+    items
+  }
+}
+
+export async function processOrderPackageItems(opi, platform) {
+  try {
+    let lengthUnit = opi?.orderProduct?.productDetail?.lengthUnit?.toString()?.toLowerCase() || ''
+
+    let items = {
+      quantity: opi?.releaseQty?.toString() || ' ',
+      item: opi?.orderProduct?.product.name.slice(0, 49).trim() || ' ',
+      sku: opi?.orderProduct?.product.sku || ' ',
+      price:
+        opi?.orderProduct?.paidAmount?.toString() ||
+        (opi?.releaseQty * opi?.orderProduct?.productDetail?.costPrice || 0)?.toString() ||
+        ' ',
+      weight: opi?.orderProduct?.productDetail?.grossWeight?.toString() || ' ',
+      width: opi?.orderProduct?.productDetail?.width || ' ',
+      length: opi?.orderProduct?.productDetail?.depth || ' ',
+      height: opi?.orderProduct?.productDetail?.height || ' '
+    }
+
+    if (platform == 'SAPX' || platform == 'VIETTEL_POST') {
+      if (lengthUnit == 'mm' || lengthUnit == 'm') {
+        ;(items.width = (items.width / 10)?.toString()),
+          (items.length = (items.length / 10)?.toString()),
+          (items.height = (items.height / 10)?.toString())
+      } else {
+        ;(items.width = items.width?.toString()),
+          (items.length = items.length?.toString()),
+          (items.height = items.height?.toString())
+      }
+    }
+    return items
+  } catch (e) {
+    logger.error(`[process-order-package-items]: ${e}`)
+  }
 }
 
 export async function validateLmd(tx, releaseGood, lmdId) {