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

package/server/controllers/shopify/apis/get-store-orders.ts

@@ -5,26 +5,31 @@ export function getStoreOrders() {
     method: 'get',
     path: '/orders.json',
     denormalize(req) {
-      var { pagination, fromCreatedDate, toCreatedDate, fromUpdatedDate, toUpdatedDate, lastOrderId } = req || {}
+      var { pagination, fromCreatedDate, toCreatedDate, fromUpdatedDate, toUpdatedDate, lastOrderId, nextCursor } = req || {}
       var { page = 0, limit = 100 } = pagination || {}
 
       var payload: any = {
-        limit,
-        status: 'any'
+        limit
       }
 
-      if (fromCreatedDate && toCreatedDate) {
+      if (nextCursor) {
+        payload.page_info = nextCursor
+      }
+
+      if (fromCreatedDate && toCreatedDate && !nextCursor) {
         var created_at_min = new Date(fromCreatedDate).toISOString()
         var created_at_max = new Date(toCreatedDate).toISOString()
         payload.created_at_min = created_at_min
         payload.created_at_max = created_at_max
+        payload.status = 'any'
       }
 
-      if (fromUpdatedDate && toUpdatedDate) {
+      if (fromUpdatedDate && toUpdatedDate && !nextCursor) {
         var updated_at_min = new Date(fromUpdatedDate).toISOString()
         var updated_at_max = new Date(toUpdatedDate).toISOString()
         payload.updated_at_min = updated_at_min
         payload.updated_at_max = updated_at_max
+        payload.status = 'any'
       }
 
       if (lastOrderId) payload.since_id = Number(lastOrderId)
@@ -38,9 +43,11 @@ export function getStoreOrders() {
 
       const linkParams = res.link
       var more: boolean = false
+      let nextCursor: any = null
 
       if (linkParams) {
-        more = checkNextPage(linkParams)
+        more = checkNextPage(linkParams).nextPage
+        nextCursor = checkNextPage(linkParams).nextCursor
       }
 
       const orderSourceNames: any = ['pos']
@@ -135,7 +142,9 @@ export function getStoreOrders() {
                   variationSku: lineItem.sku,
                   channelSku: lineItem.sku,
                   variationName: lineItem.name,
-                  originalPrice: lineItem.price
+                  originalPrice: lineItem.price,
+                  total: lineItem.price,
+                  subtotal: lineItem.price
                 }
 
                 lineItems.push(lineItem)
@@ -149,7 +158,9 @@ export function getStoreOrders() {
                   variationSku: lineItem.sku,
                   channelSku: lineItem.sku,
                   variationName: lineItem.name,
-                  originalPrice: lineItem.price
+                  originalPrice: lineItem.price,
+                  total: lineItem.price,
+                  subtotal: lineItem.price
                 }
 
                 if (lineItem.qty >= 0) lineItems.push(lineItem)
@@ -210,32 +221,33 @@ export function getStoreOrders() {
             let billingAddress = order?.billing_address || shippingAddress
 
             result.shipping = {
-              address_1: shippingAddress.address1,
-              address_2: shippingAddress.address2,
-              address_3: shippingAddress.province,
-              postcode: shippingAddress.zip,
-              country: shippingAddress.country_code,
-              city: shippingAddress.city,
-              first_name: shippingAddress.first_name,
-              last_name: shippingAddress.last_name,
-              phone: shippingAddress.phone,
-              email: order.email
+              address_1: shippingAddress?.address1,
+              address_2: shippingAddress?.address2,
+              address_3: shippingAddress?.province,
+              postcode: shippingAddress?.zip,
+              country: shippingAddress?.country_code,
+              city: shippingAddress?.city,
+              first_name: shippingAddress?.first_name,
+              last_name: shippingAddress?.last_name,
+              phone: shippingAddress?.phone,
+              email: order?.email
             }
             result.billing = {
-              address_1: billingAddress.address1,
-              address_2: billingAddress.address2,
-              address_3: billingAddress.province,
-              postcode: billingAddress.zip,
-              country: billingAddress.country_code,
-              city: billingAddress.city,
-              first_name: billingAddress.first_name,
-              last_name: billingAddress.last_name,
-              phone: billingAddress.phone,
-              email: order.email
+              address_1: billingAddress?.address1,
+              address_2: billingAddress?.address2,
+              address_3: billingAddress?.province,
+              postcode: billingAddress?.zip,
+              country: billingAddress?.country_code,
+              city: billingAddress?.city,
+              first_name: billingAddress?.first_name,
+              last_name: billingAddress?.last_name,
+              phone: billingAddress?.phone,
+              email: order?.email
             }
             result.isSOF = true
             result.firstName = order?.customer?.first_name || ''
             result.lastName = order?.customer?.last_name || ''
+            result.sellercraftDisplayOrderNo = order.name
           }
 
           itemCount = result.orderItems.length
@@ -244,20 +256,24 @@ export function getStoreOrders() {
           return result
         })
 
-      return { results, more }
+      return { results, more, nextCursor }
     }
   }
 }
 
 function checkNextPage(link) {
   let nextPage: boolean = false
+  let nextCursor = null
 
   // If there's a previous link, remove the first part of the string entirely
   if (link.indexOf(`rel="next"`) > -1) {
+    let nextLink = link.split(' ')
+    nextLink = nextLink[nextLink.indexOf(`rel="next"`)-1]
+    nextCursor = new URLSearchParams(nextLink.substring(nextLink.indexOf('<') + 1, nextLink.lastIndexOf('>'))).get('page_info')
     nextPage = true
   }
 
-  return nextPage
+  return { nextPage, nextCursor }
 }
 
 function getSellercraftStatus(fulfillmentStatus, paymentStatus) {

package/server/controllers/shopify/apis/get-store-products.ts

@@ -77,19 +77,14 @@ export function getStoreProducts() {
           marketplaceStatus: product.status,
           hasVariation: true,
           categoryId: product?.collection_id ? product.collection_id : null,
-          attributes: product?.options?.map(option => {
-            return {
-              native_attribute_id: option.id,
-              attribute_key: option.name,
-              values: option.values
-            }
-          }) || [],
+          attributes: [],
           sellercraftAttributes: [
             {
               native_attribute_id: 'description',
               attribute_key: 'description',
               display_name: 'Description',
-              values: [product.body_html]
+              values: [product.body_html],
+              data_type: 'RICH_TEXT'
             }
           ],
           images: product?.images?.map(image => {

package/server/controllers/shopify/shopify.ts

@@ -79,11 +79,11 @@ export class Shopify {
     var result = await response.json()
     result.link = link
 
-    try {
-      createPayloadLog(shop, path, qs || '', result, {
-        state: { domain: null }
-      })
-    } catch (e) {}
+    // try {
+    //   createPayloadLog(shop, path, qs || '', result, {
+    //     state: { domain: null }
+    //   })
+    // } catch (e) {}
     debug('response result', result)
 
     return result
@@ -108,11 +108,11 @@ export class Shopify {
     })
 
     const result = await response.json()
-    try {
-      createPayloadLog(shop, path, jsondata, result, {
-        state: { domain: null }
-      })
-    } catch (e) {}
+    // try {
+    //   createPayloadLog(shop, path, jsondata, result, {
+    //     state: { domain: null }
+    //   })
+    // } catch (e) {}
     debug('response result', result)
 
     return result
@@ -137,11 +137,11 @@ export class Shopify {
     })
 
     const result = await response.json()
-    try {
-      createPayloadLog(shop, path, jsondata, result, {
-        state: { domain: null }
-      })
-    } catch (e) {}
+    // try {
+    //   createPayloadLog(shop, path, jsondata, result, {
+    //     state: { domain: null }
+    //   })
+    // } catch (e) {}
     debug('response result', result)
 
     return result

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

@@ -1,4 +1,4 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 
 import { MarketplaceStore } from '../../entities'
 import { api } from './decorators'
@@ -28,7 +28,7 @@ export class StoreAPI {
   static async getMarketplaceStores(domain, options?) {
     const repository = getRepository(MarketplaceStore)
     return await repository.find({
-      where: { domain, status: 'ACTIVE', ...options },
+      where: { domain: { id: domain.id }, status: 'ACTIVE', ...options },
       relations: ['domain']
     })
   }
@@ -194,4 +194,16 @@ export class StoreAPI {
 
   @api
   static getStoreProductVariationStock(store, req): any {}
+
+  @api
+  static getStoreOrderByBatch(store, req): any {}
+
+  @api
+  static getTrackingNumber(store, req): any {}
+
+  @api
+  static createShippingDocument(store, req): any {}
+
+  @api
+  static getShippingDocumentResult(store, req): any {}
 }

package/server/controllers/tiktok/apis/get-store-order.ts

@@ -4,7 +4,7 @@ import { StoreAPI } from '../../store-api'
 
 // Delivery Option: STANDARD, EXPRESS, ECONOMY, SEND_BY_SELLER
 
-const documentStatuses = [112, 121, 122, 130]
+const documentStatuses = [112]
 
 export function getStoreOrder() {
   return {
@@ -60,19 +60,17 @@ export function getStoreOrder() {
 
         let orderItems = itemList.map(item => {
           var { sku_id, quantity: qty, sku_original_price, sku_sale_price } = item
-          var matchedOrderLine = orderLineList.find(ol => ol.sku_id == sku_id)
-          var name = matchedOrderLine.order_line_id
 
           return {
-            name,
+            name: sku_id,
             variationId: sku_id,
             qty,
             paidPrice: sku_sale_price,
             orderNo,
             docRefNo,
-            total: sku_sale_price,
+            total: sku_original_price,
             totalTax: 0,
-            subtotal: sku_original_price,
+            subtotal: sku_sale_price,
             subtotalTax: 0,
             slaExpiresAt
           }
@@ -139,31 +137,35 @@ export function getStoreOrder() {
           shipping,
           firstName,
           lastName: null,
-          isSOF
+          isSOF,
+          orderLineList
         }
 
         let orderPackage: any = {}
-        if (packageList && packageList[0]?.package_id) {
-          let orderPackageDetail: any = await StoreAPI.getStoreOrderPackage(store, {
-            packageId: packageList[0].package_id
-          })
-
-          orderPackage = {
-            ...orderPackageDetail,
-            orderId: name
-          }
+        try {
+          if (packageList && packageList[0]?.package_id) {
+            let orderPackageDetail: any = await StoreAPI.getStoreOrderPackage(store, {
+              packageId: packageList[0].package_id
+            })
 
-          if (documentStatuses.indexOf(status) >= 0) {
-            let orderDocument: any = await StoreAPI.getStoreOrderDocument(store, {
+            orderPackage = {
+              ...orderPackageDetail,
               packageId: packageList[0].package_id,
-              documentType: 1
-            })
+              orderId: name
+            }
 
-            orderPackage.orderDocument = orderDocument || []
-          }
+            if (documentStatuses.indexOf(status) >= 0) {
+              let orderDocument: any = await StoreAPI.getStoreOrderDocument(store, {
+                packageId: packageList[0].package_id,
+                documentType: 1
+              })
 
-          result.orderPackage = orderPackage
-        }
+              orderPackage.orderDocument = orderDocument || []
+            }
+
+            result.orderPackage = orderPackage
+          }
+        } catch (e) {}
 
         results.push(result)
       }

package/server/controllers/tiktok/apis/get-store-orders.ts

@@ -8,7 +8,7 @@ export function getStoreOrders() {
     path: '/api/orders/search',
     denormalize(req) {
       var { pagination, fromCreatedDate, toCreatedDate, fromUpdatedDate, toUpdatedDate, nextCursor } = req || {}
-      var { page, limit } = pagination || { page: 0, limit: 100 }
+      var { page, limit } = pagination || { page: 0, limit: 20 }
 
       let payload: any = { page_size: limit }
 

package/server/controllers/tiktok/apis/update-order-status.ts

@@ -1,14 +1,14 @@
 export function updateOrderStatus() {
   return {
-    path: '/api/order/rts',
+    path: '/api/fulfillment/rts',
     method: 'post',
     async denormalize(req, { store }) {
-      let { orderId, status } = req
+      let { packageId, status } = req
 
       if (status == 'READY_TO_SHIP') {
         return {
           payload: {
-            order_id: orderId
+            package_id: packageId
           }
         }
       } else {
@@ -16,7 +16,7 @@ export function updateOrderStatus() {
       }
     },
     normalize(res) {
-      let result = { ...res, requiredDocument: true }
+      let result = { ...res, requiredDocument: false }
 
       return result
     }

package/server/controllers/tiktok/platform-action.ts

@@ -49,24 +49,24 @@ export const action = async ({ store, method = 'get', path, request }) => {
   }
 
   if (response.code != 0) {
-    createPayloadLog(
-      store.channelShopId,
-      path,
-      request,
-      response,
-      request?.context ? request.context : { state: { domain: null } }
-    )
+    // createPayloadLog(
+    //   store.channelShopId,
+    //   path,
+    //   request,
+    //   response,
+    //   request?.context ? request.context : { state: { domain: null } }
+    // )
 
     throw response
   }
 
-  createPayloadLog(
-    store.channelShopId,
-    path,
-    request,
-    response,
-    request?.context ? request.context : { state: { domain: null } }
-  )
+  // createPayloadLog(
+  //   store.channelShopId,
+  //   path,
+  //   request,
+  //   response,
+  //   request?.context ? request.context : { state: { domain: null } }
+  // )
 
   return response
 }

package/server/engine/connector/lazada-connector.ts

@@ -1,9 +1,10 @@
+import { config } from '@things-factory/env'
 import { ConnectionManager, Connector } from '@things-factory/integration-base'
-import { getRepository } from 'typeorm'
-import { MarketplaceStore } from '../../entities'
+import { getRepository } from '@things-factory/shell'
+
 import { Lazada } from '../../controllers/lazada'
+import { MarketplaceStore } from '../../entities'
 
-import { config } from '@things-factory/env'
 const lazadaConfig = config.get('marketplaceIntegrationLazada', {})
 const { appKey, appSecret } = lazadaConfig
 
@@ -19,7 +20,7 @@ export class LazadaConnector implements Connector {
 
     const repository = getRepository(MarketplaceStore)
     const marketplaceStore: any = await repository.findOne({
-      where: { domain, storeId }
+      where: { domain: { id: domain.id }, storeId }
     })
 
     const client = new Lazada(marketplaceStore.countryCode, appKey, appSecret)

package/server/engine/task/marketplace-api.ts

@@ -1,8 +1,9 @@
 import { ConnectionManager, TaskRegistry } from '@things-factory/integration-base'
+import { getRepository } from '@things-factory/shell'
 import { access } from '@things-factory/utils'
-import { getRepository } from 'typeorm'
-import { MarketplaceStore } from '../../entities'
+
 import { StoreAPI } from '../../controllers/store-api'
+import { MarketplaceStore } from '../../entities'
 
 async function MarketplaceAPI(step, { logger, data, domain }) {
   var {
@@ -21,7 +22,7 @@ async function MarketplaceAPI(step, { logger, data, domain }) {
 
   const repository = getRepository(MarketplaceStore)
   const marketplaceStore: any = await repository.findOne({
-    where: { domain, name: store }
+    where: { domain: { id: domain.id }, name: store }
   })
 
   if (!marketplaceStore) {

package/server/graphql/resolvers/marketplace-distributor/create-marketplace-distributor.ts

@@ -1,12 +1,12 @@
 import { MarketplaceDistributor, MarketplaceStore } from '../../../entities'
 
 export const createMarketplaceDistributor = {
-  async createMarketplaceDistributor(_: any, { marketplaceStoreId, marketplaceDistributor }, context: any) {
+  async createMarketplaceDistributor(_: any, { marketplaceStoreId, marketplaceDistributor }, context: ResolverContext) {
     const { domain, user, tx } = context.state
 
     return await tx.getRepository(MarketplaceDistributor).save({
       ...marketplaceDistributor,
-      marketplaceStore: await tx.getRepository(MarketplaceStore).findOne(marketplaceStoreId),
+      marketplaceStore: await tx.getRepository(MarketplaceStore).findOneBy({ id: marketplaceStoreId }),
       domain,
       creator: user,
       updater: user

package/server/graphql/resolvers/marketplace-distributor/delete-marketplace-distributor.ts

@@ -1,11 +1,12 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
+
 import { MarketplaceDistributor } from '../../../entities'
 
 export const deleteMarketplaceDistributor = {
-  async deleteMarketplaceSetting(_: any, { id }, context: any) {
+  async deleteMarketplaceSetting(_: any, { id }, context: ResolverContext) {
     const { domain } = context.state
 
-    await getRepository(MarketplaceDistributor).delete({ domain, id })
+    await getRepository(MarketplaceDistributor).delete({ domain: { id: domain.id }, id })
 
     return true
   }

package/server/graphql/resolvers/marketplace-distributor/delete-marketplace-distributors.ts

@@ -1,12 +1,15 @@
-import { getRepository, In } from 'typeorm'
+import { In } from 'typeorm'
+
+import { getRepository } from '@things-factory/shell'
+
 import { MarketplaceDistributor } from '../../../entities'
 
 export const deleteMarketplaceDistributors = {
-  async deleteMarketplaceDistributors(_: any, { ids }, context: any) {
+  async deleteMarketplaceDistributors(_: any, { ids }, context: ResolverContext) {
     const { domain, user } = context.state
 
     await getRepository(MarketplaceDistributor).delete({
-      domain,
+      domain: { id: domain.id },
       name: In(ids)
     })
 

package/server/graphql/resolvers/marketplace-distributor/marketplace-distributor-query.ts

@@ -1,22 +1,23 @@
-import { convertListParams, ListParam } from '@things-factory/shell'
-import { getRepository } from 'typeorm'
+import { convertListParams, getRepository, ListParam } from '@things-factory/shell'
+
 import { MarketplaceDistributor as MarketplaceDistributorEntity } from '../../../entities'
 
 export const Query = {
-  async marketplaceDistributor(_: any, { name }, context: any) {
+  async marketplaceDistributor(_: any, { name }, context: ResolverContext) {
     const { domain, tx } = context.state
     const repository = tx.getRepository(MarketplaceDistributorEntity)
 
     return await repository.findOne({
-      where: { domain, name },
+      where: { domain: { id: domain.id }, name },
       relations: ['marketplaceStore']
     })
   },
 
-  async marketplaceDistributors(_: any, params: ListParam, context: any) {
+  async marketplaceDistributors(_: any, params: ListParam, context: ResolverContext) {
     const { domain, tx } = context.state
     let convertedParams = convertListParams(params)
-    convertedParams.where.domain = domain
+    convertedParams.where.domain = { id: domain.id } as any
+
     const [items, total] = await tx.getRepository(MarketplaceDistributorEntity).findAndCount({
       ...convertedParams,
       relations: ['marketplaceStore']
@@ -29,7 +30,8 @@ export const Query = {
 export const MarketplaceDistributor = {
   async domain(marketplaceDistributor) {
     return (
-      await getRepository(MarketplaceDistributorEntity).findOne(marketplaceDistributor.id, {
+      await getRepository(MarketplaceDistributorEntity).findOne({
+        where: { id: marketplaceDistributor.id },
         relations: ['domain']
       })
     )?.domain
@@ -37,7 +39,8 @@ export const MarketplaceDistributor = {
 
   async creator(marketplaceDistributor) {
     return (
-      await getRepository(MarketplaceDistributorEntity).findOne(marketplaceDistributor.id, {
+      await getRepository(MarketplaceDistributorEntity).findOne({
+        where: { id: marketplaceDistributor.id },
         relations: ['creator']
       })
     )?.creator
@@ -45,7 +48,8 @@ export const MarketplaceDistributor = {
 
   async updater(marketplaceDistributor) {
     return (
-      await getRepository(MarketplaceDistributorEntity).findOne(marketplaceDistributor.id, {
+      await getRepository(MarketplaceDistributorEntity).findOne({
+        where: { id: marketplaceDistributor.id },
         relations: ['updater']
       })
     )?.updater

package/server/graphql/resolvers/marketplace-distributor/update-marketplace-distributor.ts

@@ -1,16 +1,16 @@
 import { MarketplaceDistributor, MarketplaceStore } from '../../../entities'
 
 export const updateMarketplaceDistributor = {
-  async updateMarketplaceDistributor(_: any, { marketplaceDistributorPatch }, context: any) {
+  async updateMarketplaceDistributor(_: any, { marketplaceDistributorPatch }, context: ResolverContext) {
     const { domain, user, tx } = context.state
     const marketplaceDistributorRepo = tx.getRepository(MarketplaceDistributor)
     const marketplaceStoreRepo = tx.getRepository(MarketplaceStore)
 
-    const marketplaceStore: MarketplaceStore = await marketplaceStoreRepo.findOne(
-      marketplaceDistributorPatch?.marketplaceStore.id
-    )
+    const marketplaceStore: MarketplaceStore = await marketplaceStoreRepo.findOneBy({
+      id: marketplaceDistributorPatch?.marketplaceStore.id
+    })
     const marketplaceDistributor: MarketplaceDistributor = await marketplaceDistributorRepo.findOne({
-      where: { domain, marketplaceStore }
+      where: { domain: { id: domain.id }, marketplaceStore: { id: marketplaceStore.id } }
     })
 
     return await marketplaceDistributorRepo.save({

package/server/graphql/resolvers/marketplace-distributor/update-multiple-marketplace-distributor.ts

@@ -1,8 +1,9 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
+
 import { MarketplaceDistributor } from '../../../entities'
 
 export const updateMultipleMarketplaceDistributor = {
-  async updateMultipleMarketplaceDistributor(_: any, { patches }, context: any) {
+  async updateMultipleMarketplaceDistributor(_: any, { patches }, context: ResolverContext) {
     const { domain, user } = context.state
 
     let results = []
@@ -28,7 +29,10 @@ export const updateMultipleMarketplaceDistributor = {
     if (_updateRecords.length > 0) {
       for (let i = 0; i < _updateRecords.length; i++) {
         const newRecord = _updateRecords[i]
-        const MarketplaceDistributor = await MarketplaceDistributorRepo.findOne({ domain, id: newRecord.id })
+        const MarketplaceDistributor = await MarketplaceDistributorRepo.findOneBy({
+          domain: { id: domain.id },
+          id: newRecord.id
+        })
 
         const result = await MarketplaceDistributorRepo.save({
           ...MarketplaceDistributor,

package/server/graphql/resolvers/marketplace-setting/create-marketplace-setting.ts

@@ -1,8 +1,9 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
+
 import { MarketplaceSetting } from '../../../entities'
 
 export const createMarketplaceSetting = {
-  async createMarketplaceSetting(_: any, { marketplaceSetting }, context: any) {
+  async createMarketplaceSetting(_: any, { marketplaceSetting }, context: ResolverContext) {
     const { domain, user } = context.state
 
     return await getRepository(MarketplaceSetting).save({
@@ -13,4 +14,3 @@ export const createMarketplaceSetting = {
     })
   }
 }
-

package/server/graphql/resolvers/marketplace-setting/delete-marketplace-setting.ts

@@ -1,13 +1,13 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
+
 import { MarketplaceSetting } from '../../../entities'
 
 export const deleteMarketplaceSetting = {
-  async deleteMarketplaceSetting(_: any, { name }, context: any) {
+  async deleteMarketplaceSetting(_: any, { name }, context: ResolverContext) {
     const { domain, user } = context.state
 
     await getRepository(MarketplaceSetting).delete({ domain, name })
-    
+
     return true
   }
 }
-