@things-factory/integration-sellercraft 5.0.14 → 6.0.0-alpha.3

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@things-factory/integration-sellercraft",
-  "version": "5.0.14",
+  "version": "6.0.0-alpha.3",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
   "license": "MIT",
-  "author": "heartyoh",
+  "author": "heartyoh <heartyoh@hatiolab.com>",
   "description": "A microservice that manage integration with sellercraft ecommerce omnichannel app",
   "publishConfig": {
     "access": "public",
@@ -24,19 +24,19 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/apptool-ui": "^5.0.14",
-    "@things-factory/auth-ui": "^5.0.14",
-    "@things-factory/biz-base": "^5.0.14",
-    "@things-factory/code-ui": "^5.0.14",
-    "@things-factory/context-ui": "^5.0.14",
-    "@things-factory/grist-ui": "^5.0.14",
-    "@things-factory/i18n-base": "^5.0.14",
-    "@things-factory/integration-marketplace": "^5.0.14",
-    "@things-factory/integration-ui": "^5.0.14",
-    "@things-factory/more-ui": "^5.0.14",
-    "@things-factory/resource-ui": "^5.0.14",
-    "@things-factory/setting-ui": "^5.0.14",
-    "@things-factory/system-ui": "^5.0.14",
+    "@things-factory/apptool-ui": "^6.0.0-alpha.3",
+    "@things-factory/auth-ui": "^6.0.0-alpha.3",
+    "@things-factory/biz-base": "^6.0.0-alpha.3",
+    "@things-factory/code-ui": "^6.0.0-alpha.3",
+    "@things-factory/context-ui": "^6.0.0-alpha.3",
+    "@things-factory/grist-ui": "^6.0.0-alpha.3",
+    "@things-factory/i18n-base": "^6.0.0-alpha.3",
+    "@things-factory/integration-marketplace": "^6.0.0-alpha.3",
+    "@things-factory/integration-ui": "^6.0.0-alpha.3",
+    "@things-factory/more-ui": "^6.0.0-alpha.3",
+    "@things-factory/resource-ui": "^6.0.0-alpha.3",
+    "@things-factory/setting-ui": "^6.0.0-alpha.3",
+    "@things-factory/system-ui": "^6.0.0-alpha.3",
     "debug": "^4.1.1",
     "node-fetch": "^2.6.0",
     "querystring": "^0.2.1"
@@ -51,5 +51,5 @@
     "nock": "^13.0.2",
     "should": "^13.2.3"
   },
-  "gitHead": "9ceaa39746fcf42953e429fab2001353cd821ded"
+  "gitHead": "1e273b6485662da938cae8fdca035d994ef4a95d"
 }

package/server/controllers/sellercraft/sellercraft.ts

@@ -46,8 +46,8 @@ export class Sellercraft {
     if (response.ok) {
       return await response.json()
     } else {
-      const result = await response.json()
-      throw new Error(`(${response.status}) ${result.message}`)
+      const result = await response.text()
+      throw new Error(`(${response.status}) ${result}`)
     }
   }
 
@@ -72,8 +72,8 @@ export class Sellercraft {
     if (response.ok) {
       return await response.json()
     } else {
-      const result = await response.json()
-      throw new Error(`(${response.status}) ${result.message}`)
+      const result = await response.text()
+      throw new Error(`(${response.status}) ${result}`)
     }
   }
 
@@ -102,8 +102,8 @@ export class Sellercraft {
     if (response.ok) {
       return await response.json()
     } else {
-      const result = await response.json()
-      throw new Error(`(${response.status}) ${result.message}`)
+      const result = await response.text()
+      throw new Error(`(${response.status}) ${result}`)
     }
   }
 }

package/server/controllers/sellercraft-api/decorators.ts

@@ -32,15 +32,20 @@ export const api = (target: Object, property: string, descriptor: TypedPropertyD
     var denormalized = await denormalize(request || {}, { store })
     debug('request', denormalized)
 
-    var response = await action.apply(this, [
-      { store, method: httpMethod, path, request: denormalized, platformAction }
-    ])
+    try {
+      var response = await action.apply(this, [
+        { store, method: httpMethod, path, request: denormalized, platformAction }
+      ])
 
-    createPayloadLog(store.accountId, path, denormalized, response, request?.context)
+      createPayloadLog(store.accountId, path, denormalized, response, request?.context)
 
-    debug('response', response)
+      debug('response', response)
 
-    return await normalize(response, { store })
+      return await normalize(response, { store })
+    } catch (error) {
+      createPayloadLog(store.accountId, path, denormalized, error, request?.context)
+      throw error
+    }
   }
 
   return descriptor

package/server/controllers/sellercraft-api/index.ts

@@ -1,4 +1,4 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 
 import { Sellercraft } from '../../service'
 import { api } from './decorators'

package/server/controllers/sellercraft-channel-integration/apis/ingest-channel-order.ts

@@ -14,6 +14,7 @@ export function ingestChannelOrder() {
           organisation_id: order.organisationId,
           channel_shop_id: order.channelShopId,
           native_order_id: order.id.toString(),
+          native_order_display_id: order?.sellercraftDisplayOrderNo,
           ordered_at_date: new Date(order.createdAt).toISOString().slice(0, -5) + 'Z',
           ordered_at_time: new Date(order.createdAt).toISOString().slice(0, -5) + 'Z',
           updated_at_date: new Date(order.updatedAt).toISOString().slice(0, -5) + 'Z',
@@ -27,7 +28,7 @@ export function ingestChannelOrder() {
               amount_nett: parseFloat(charge.nettAmount) || 0
             }
           }),
-          address_shipping: {
+          address_shipping: order?.shipAddress1 ? {
             first_name: order.shipFirstName,
             last_name: order.shipLastName,
             line_1: order.shipAddress1,
@@ -40,7 +41,7 @@ export function ingestChannelOrder() {
             country: order.shipCountry,
             phone_1: order.shipPhone1,
             phone_2: order.shipPhone2
-          },
+          } : null,
           address_billing: {
             first_name: order.billFirstName,
             last_name: order.billLastName,
@@ -75,7 +76,8 @@ export function ingestChannelOrder() {
               order_status_value: ORDER_STATUS[`${order.status}`]
             }
           }),
-          seller_logistics: order?.isSOF
+          seller_logistics: order?.isSOF,
+          shipping_type: order?.shipAddress1 ? 'DROP_SHIPPING' : 'SELF_PICKUP'
         }
       })
 

package/server/controllers/sellercraft-channel-integration-api/index.ts

@@ -1,4 +1,4 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 
 import { Sellercraft } from '../../service'
 import { api } from './decorators'

package/server/routers/sellercraft-router.ts

@@ -1,11 +1,12 @@
 import Router from 'koa-router'
 import { v4 as uuidv4 } from 'uuid'
 
-import { config } from '@things-factory/env'
 import { StoreAPI } from '@things-factory/integration-marketplace'
-import { getShop } from '../utils/tokencraft-util'
+import { createPayloadLog, PayloadType } from '@things-factory/integration-base'
+import { sleep } from '@things-factory/utils'
 
 import { SHIPPING_TYPE } from '../constants'
+import { getShop } from '../utils/tokencraft-util'
 
 const debug = require('debug')('things-factory:integration-sellercraft:sellercraft-router')
 
@@ -106,6 +107,12 @@ sellercraftRouter.post('/sellercraft/store/update-order-status', async (context,
     const requestBody = context.request.body
     var result: any = {}
     let mappedStore: any = await getShop(context, requestBody.channel_id, requestBody.shop_id)
+    let packageIds: any =
+      mappedStore.platform == 'tiktok'
+        ? requestBody?.order_items.map(oi => {
+            return oi.package_id
+          })
+        : []
 
     const reqBody = {
       orderId: requestBody.native_order_id,
@@ -118,6 +125,7 @@ sellercraftRouter.post('/sellercraft/store/update-order-status', async (context,
         }) || []
       ),
       isSOF: requestBody?.seller_logistics,
+      packageIds: [...new Set(packageIds)] || [],
       locations:
         mappedStore.platform == 'shopify'
           ? requestBody?.order_items.map(oi => {
@@ -131,7 +139,14 @@ sellercraftRouter.post('/sellercraft/store/update-order-status', async (context,
     let responseBody: any = { operation_id: uuidv4() }
     try {
       try {
-        result = (await StoreAPI.updateOrderStatus(mappedStore, reqBody)) || {}
+        if (mappedStore.platform == 'tiktok') {
+          for (let packageId of reqBody.packageIds) {
+            result = (await StoreAPI.updateOrderStatus(mappedStore, { packageId, status: reqBody.status })) || {}
+          }
+        } else {
+          result = (await StoreAPI.updateOrderStatus(mappedStore, reqBody)) || {}
+        }
+
         debug(result)
       } catch (e) {
         if (e?.requiredDocument) result.requiredDocument = e.requiredDocument
@@ -147,12 +162,15 @@ sellercraftRouter.post('/sellercraft/store/update-order-status', async (context,
           let orderDocument: any = orderPackage.orderDocument
           if (orderDocument?.length == 0) {
             let hasDocument: boolean = false
-            while (!hasDocument) {
+            let retries = 0
+            while (!hasDocument && retries < 10) {
               orderDocument = await StoreAPI.getStoreOrderDocument(mappedStore, { packageId, documentType: 1 })
               if (orderDocument?.length > 0) {
                 hasDocument = true
                 break
               }
+              await sleep(1000)
+              retries++
             }
           }
 
@@ -196,6 +214,18 @@ sellercraftRouter.post('/sellercraft/store/update-order-status', async (context,
 
       responseBody.time = Math.floor(new Date(new Date().toUTCString()).getTime() / 1000)
 
+      try {
+        createPayloadLog(
+          mappedStore.channelShopId,
+          '/sellercraft/store/update-order-status',
+          requestBody,
+          responseBody,
+          null,
+          PayloadType.INGESTION,
+          'hub-api'
+        )
+      } catch (e) {}
+
       context.type = 'application/json'
       context.status = 200
       context.body = responseBody
@@ -208,6 +238,17 @@ sellercraftRouter.post('/sellercraft/store/update-order-status', async (context,
       context.type = 'application/json'
       context.status = 500
       context.body = responseBody
+      try {
+        createPayloadLog(
+          mappedStore?.channelShopId,
+          '/sellercraft/store/update-order-status',
+          requestBody,
+          responseBody,
+          null,
+          PayloadType.INGESTION,
+          'hub-api'
+        )
+      } catch (e) {}
     }
   } catch (e) {}
 })