@things-factory/marketplace-base 4.3.54 → 4.3.60

package/server/graphql/resolvers/marketplace-product/sync-all-marketplace-store-products.ts

@@ -6,10 +6,10 @@ import { MarketplaceProduct, MarketplaceProductAttribute, MarketplaceProductVari
 
 const debug = require('debug')('things-factory:marketplace-base:sync-all-marketplace-store-product')
 
-async function syncAllMarketplaceStoreProducts({ domain, user, tag, marketplaceStores }) {
+async function syncAllMarketplaceStoreProducts({ user, tag, marketplaceStores }) {
   try {
     for (var i = 0; i < marketplaceStores?.length; i++) {
-      const marketplaceStore = marketplaceStores[i]
+      const marketplaceStore: MarketplaceStore = marketplaceStores[i]
 
       let totalPages: number = 1
       let processedData: number = 0
@@ -17,7 +17,11 @@ async function syncAllMarketplaceStoreProducts({ domain, user, tag, marketplaceS
       var limit: number = 50
 
       for (let page = 0; page < totalPages; page++) {
-        const { results: marketplaceProducts, total, page_info } = await StoreAPI.getStoreProducts(marketplaceStore, {
+        const {
+          results: marketplaceProducts,
+          total,
+          page_info
+        } = await StoreAPI.getStoreProducts(marketplaceStore, {
           pagination: { page, limit },
           pageInfo
         })
@@ -30,7 +34,7 @@ async function syncAllMarketplaceStoreProducts({ domain, user, tag, marketplaceS
         // search for existing product
         const existingMarketplaceProducts: MarketplaceProduct[] = await getRepository(MarketplaceProduct).find({
           where: {
-            domain,
+            domain: marketplaceStore.domain,
             marketplaceStore,
             itemId: In(marketplaceProducts.map(product => product.itemId.toString()))
           },
@@ -121,7 +125,7 @@ async function syncAllMarketplaceStoreProducts({ domain, user, tag, marketplaceS
               debug('processed data', processedData)
 
               publishProgress({
-                domain,
+                domain: marketplaceStore.domain,
                 tag,
                 progress: Math.floor((processedData / total) * 100),
                 message: `${processedData} / ${total}`
@@ -138,7 +142,7 @@ async function syncAllMarketplaceStoreProducts({ domain, user, tag, marketplaceS
               // prep marketplace product data for saving
               let marketplaceProduct: MarketplaceProduct = new MarketplaceProduct(product)
               marketplaceProduct.marketplaceStore = marketplaceStore
-              marketplaceProduct.domain = domain
+              marketplaceProduct.domain = marketplaceStore.domain
               marketplaceProduct.creator = user
               marketplaceProduct.updater = user
               await tx.getRepository(MarketplaceProduct).save(marketplaceProduct)
@@ -148,7 +152,7 @@ async function syncAllMarketplaceStoreProducts({ domain, user, tag, marketplaceS
                   ...variation,
                   status: 'ACTIVE',
                   marketplaceProduct,
-                  domain: domain,
+                  domain: marketplaceStore.domain,
                   creator: user,
                   updater: user
                 }
@@ -161,7 +165,7 @@ async function syncAllMarketplaceStoreProducts({ domain, user, tag, marketplaceS
                   ...attribute,
                   status: 'ACTIVE',
                   marketplaceProduct,
-                  domain: domain,
+                  domain: marketplaceStore.domain,
                   creator: user,
                   updater: user
                 }
@@ -172,7 +176,7 @@ async function syncAllMarketplaceStoreProducts({ domain, user, tag, marketplaceS
               debug('processed data', processedData)
 
               publishProgress({
-                domain,
+                domain: marketplaceStore.domain,
                 tag,
                 progress: Math.floor((processedData / total) * 100),
                 message: `${processedData} / ${total}`
@@ -185,7 +189,7 @@ async function syncAllMarketplaceStoreProducts({ domain, user, tag, marketplaceS
     return true
   } catch (ex) {
     publishProgress({
-      domain,
+      domain: marketplaceStores[i].domain,
       tag,
       progress: -1,
       message: 'failed'
@@ -197,14 +201,19 @@ async function syncAllMarketplaceStoreProducts({ domain, user, tag, marketplaceS
 
 export const syncAllMarketplaceStoreProductsResolver = {
   async syncAllMarketplaceStoreProducts(_: any, params: ListParam, context: any) {
-    const { domain, user }: { domain: Domain; user: User } = context.state
-
-    const marketplaceStores: MarketplaceStore[] = await StoreAPI.getMarketplaceStores(domain)
+    let marketplaceStores: MarketplaceStore[]
     const tag = `progress-sync-all-product`
+    if (context) {
+      var { domain, user } = context.state
+      marketplaceStores = await StoreAPI.getMarketplaceStores(domain)
+    } else {
+      marketplaceStores = await getRepository(MarketplaceStore).find({
+        where: { status: 'ACTIVE' }
+      })
+    }
 
     // don't make following line synchronous (await)
     syncAllMarketplaceStoreProducts({
-      domain,
       user,
       tag,
       marketplaceStores

package/server/graphql/types/marketplace-order/index.ts

@@ -46,6 +46,8 @@ export const MarketplaceOrderResolver = gql`
     deleteMarketplaceOrders(names: [String]!): Boolean
     splitOrdersByBatch(patches: [LogisticsInfo]): Boolean @transaction
     updateMarketplaceOrder(orderNo: String!, patch: MarketplaceOrderPatch!): MarketplaceOrder @transaction
+    syncShopeeAwb: Boolean @transaction
+    syncMarketplaceOrdersByPlatform(fromCreatedDate: String, toCreatedDate: String): Boolean
   }
 
   extend type Query {

package/server/graphql/types/marketplace-order/order-document.ts

@@ -8,5 +8,6 @@ export const OrderDocument = gql`
     airwayBill: String
     documentType: String
     itemCount: Int
+    isShopeeV2: Boolean
   }
 `