@things-factory/integration-marketplace 5.0.7 → 6.0.0-alpha.0

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/entities/marketplace-store.ts

@@ -69,19 +69,19 @@ export class MarketplaceStore {
   webhookKey: string
 
   @Column({ default: false })
-  eTrax: Boolean
+  eTrax: boolean
 
   @Column({ default: false })
-  isAutoUpdateStockQty: Boolean
+  isAutoUpdateStockQty: boolean
 
   @Column({ default: false })
-  isAutoUpdateShipment: Boolean
+  isAutoUpdateShipment: boolean
 
   @Column({ default: false })
-  isOwnTransport: Boolean
+  isOwnTransport: boolean
 
   @Column({ default: false })
-  reserveEnabled: Boolean
+  reserveEnabled: boolean
 
   @OneToMany(type => MarketplaceDistributor, marketplaceDistributor => marketplaceDistributor.marketplaceStore)
   marketplaceDistributors: MarketplaceDistributor[]

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
   }
 }
-

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

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

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

@@ -1,19 +1,19 @@
-import { convertListParams, ListParam } from '@things-factory/shell'
-import { getRepository } from 'typeorm'
+import { convertListParams, getRepository, ListParam } from '@things-factory/shell'
+
 import { MarketplaceSetting as MarketplaceSettingEntity } from '../../../entities'
 
 export const Query = {
-  async marketplaceSetting(_: any, { name }, context: any) {
+  async marketplaceSetting(_: any, { name }, context: ResolverContext) {
     const { domain, tx, user } = context.state
     const repository = tx.getRepository(MarketplaceSettingEntity)
 
     return await repository.findOne({
-      where: { domain, name },
+      where: { domain: { id: domain.id }, name },
       relations: ['marketplaceStore']
     })
   },
 
-  async marketplaceSettings(_: any, params: ListParam, context: any) {
+  async marketplaceSettings(_: any, params: ListParam, context: ResolverContext) {
     const { domain, tx, user } = context.state
     const convertedParams = convertListParams(params)
     const [items, total] = await tx.getRepository(MarketplaceSettingEntity).findAndCount({
@@ -29,7 +29,8 @@ export const Query = {
 export const MarketplaceSetting = {
   async domain(marketplaceSetting) {
     return (
-      await getRepository(MarketplaceSettingEntity).findOne(marketplaceSetting.id, {
+      await getRepository(MarketplaceSettingEntity).findOne({
+        where: { id: marketplaceSetting.id },
         relations: ['domain']
       })
     )?.domain
@@ -37,7 +38,8 @@ export const MarketplaceSetting = {
 
   async creator(marketplaceSetting) {
     return (
-      await getRepository(MarketplaceSettingEntity).findOne(marketplaceSetting.id, {
+      await getRepository(MarketplaceSettingEntity).findOne({
+        where: { id: marketplaceSetting.id },
         relations: ['creator']
       })
     )?.creator
@@ -45,7 +47,8 @@ export const MarketplaceSetting = {
 
   async updater(marketplaceSetting) {
     return (
-      await getRepository(MarketplaceSettingEntity).findOne(marketplaceSetting.id, {
+      await getRepository(MarketplaceSettingEntity).findOne({
+        where: { id: marketplaceSetting.id },
         relations: ['updater']
       })
     )?.updater

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

@@ -1,16 +1,22 @@
 import { MarketplaceSetting, MarketplaceStore } from '../../../entities'
 
 export const updateMarketplaceSetting = {
-  async updateMarketplaceSetting(_: any, { marketplaceSettingPatch }, context: any) {
+  async updateMarketplaceSetting(_: any, { marketplaceSettingPatch }, context: ResolverContext) {
     const { domain, user, tx } = context.state
     const marketplaceSettingRepo = tx.getRepository(MarketplaceSetting)
     const marketplaceStoreRepo = tx.getRepository(MarketplaceStore)
 
     await Promise.all(
       marketplaceSettingPatch.map(async settingPatch => {
-        const marketplaceStore: MarketplaceStore = await marketplaceStoreRepo.findOne(settingPatch?.marketplaceStore.id)
+        const marketplaceStore: MarketplaceStore = await marketplaceStoreRepo.findOneBy({
+          id: settingPatch?.marketplaceStore.id
+        })
         const marketplaceSetting: MarketplaceSetting = await marketplaceSettingRepo.findOne({
-          where: { domain, marketplaceStore, category: settingPatch.category }
+          where: {
+            domain: { id: domain.id },
+            marketplaceStore: { id: marketplaceStore.id },
+            category: settingPatch.category
+          }
         })
 
         await marketplaceSettingRepo.save({

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

@@ -1,46 +1,49 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
+
 import { MarketplaceSetting } from '../../../entities'
 
 export const updateMultipleMarketplaceSetting = {
-  async updateMultipleMarketplaceSetting(_: any, { patches }, context: any) {
+  async updateMultipleMarketplaceSetting(_: any, { patches }, context: ResolverContext) {
     const { domain, user } = context.state
-    
+
     let results = []
     const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
     const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
     const marketplaceSettingRepo = getRepository(MarketplaceSetting)
 
     if (_createRecords.length > 0) {
-        for (let i = 0; i < _createRecords.length; i++) {
-          const newRecord = _createRecords[i]
-          
-          const result = await marketplaceSettingRepo.save({
-            ...newRecord,
-            domain: domain,
-            creator: user,
-            updater: user,
-          })
-          
-          results.push({ ...result, cuFlag: '+' })
-        }
+      for (let i = 0; i < _createRecords.length; i++) {
+        const newRecord = _createRecords[i]
+
+        const result = await marketplaceSettingRepo.save({
+          ...newRecord,
+          domain: domain,
+          creator: user,
+          updater: user
+        })
+
+        results.push({ ...result, cuFlag: '+' })
+      }
     }
 
     if (_updateRecords.length > 0) {
-        for (let i = 0; i < _updateRecords.length; i++) {
-          const newRecord = _updateRecords[i]
-          const marketplaceSetting = await marketplaceSettingRepo.findOne({ domain, id: newRecord.id})
-  
-          const result = await marketplaceSettingRepo.save({
-            ...marketplaceSetting,
-            ...newRecord,
-            updater: user
-          })
-  
-          results.push({ ...result, cuFlag: 'M' })
-        }
+      for (let i = 0; i < _updateRecords.length; i++) {
+        const newRecord = _updateRecords[i]
+        const marketplaceSetting = await marketplaceSettingRepo.findOneBy({
+          domain: { id: domain.id },
+          id: newRecord.id
+        })
+
+        const result = await marketplaceSettingRepo.save({
+          ...marketplaceSetting,
+          ...newRecord,
+          updater: user
+        })
+
+        results.push({ ...result, cuFlag: 'M' })
+      }
     }
-  
+
     return results
   }
 }
-

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

@@ -1,9 +1,10 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
+
 import { MarketplaceStore } from '../../../entities'
 import { STORE_STATUS } from '../../constants'
 
 export const createMarketplaceStore = {
-  async createMarketplaceStore(_: any, { marketplaceStore }, context: any) {
+  async createMarketplaceStore(_: any, { marketplaceStore }, context: ResolverContext) {
     const { user, domain } = context.state
     const randomString: string = Math.random().toString(36).substring(5)
 

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

@@ -1,12 +1,13 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
+
 import { MarketplaceStore } from '../../../entities'
 import { STORE_STATUS } from '../../constants'
 
 export const deleteMarketplaceStore = {
-  async deleteMarketplaceStore(_: any, { name }, context: any) {
+  async deleteMarketplaceStore(_: any, { name }, context: ResolverContext) {
     const { domain, user } = context.state
     const foundMarketplaceStore: MarketplaceStore = await getRepository(MarketplaceStore).findOne({
-      where: { domain, name }
+      where: { domain: { id: domain.id }, name }
     })
 
     await getRepository(MarketplaceStore).save({