@things-factory/integration-sellercraft 4.3.24 → 4.3.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-sellercraft",
-  "version": "4.3.24",
+  "version": "4.3.25",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -31,7 +31,7 @@
     "@things-factory/context-ui": "^4.3.23",
     "@things-factory/grist-ui": "^4.3.23",
     "@things-factory/i18n-base": "^4.3.23",
-    "@things-factory/integration-marketplace": "^4.3.24",
+    "@things-factory/integration-marketplace": "^4.3.25",
     "@things-factory/integration-ui": "^4.3.24",
     "@things-factory/more-ui": "^4.3.23",
     "@things-factory/resource-ui": "^4.3.24",
@@ -51,5 +51,5 @@
     "nock": "^13.0.2",
     "should": "^13.2.3"
   },
-  "gitHead": "43ba20d3476c8604e94f6a6b0bd7e84b6ec1bfd8"
+  "gitHead": "bdcecd8454d7a76df3c5676a39440d57bc21d5cb"
 }

package/server/routers/sellercraft-router.ts

@@ -132,7 +132,7 @@ sellercraftRouter.post('/sellercraft/store/update-product-stock', async (context
         }
         if (req.locationId) {
           let location = JSON.parse(req.locationId)
-          req.qty -= location[0].available
+          req.qty -= await StoreAPI.getStoreProductVariationStock(mappedStore, { variantId: req.variationId })
           req.locationId = location[0].location_id
         }
         result = await StoreAPI.updateStoreProductVariationStock(mappedStore, req)
@@ -142,15 +142,8 @@ sellercraftRouter.post('/sellercraft/store/update-product-stock', async (context
           itemId: requestBody[i].native_product_id,
           distributors: requestBody[i].distributors || [], // for Magento
           variationSku: requestBody[i].variant.sku,
-          locationId: requestBody[i]?.variant?.extra_metadata?.locationId, // for Shopify
-          inventoryItemId: requestBody[i]?.variant?.extra_metadata?.inventoryItemId, // for Shopify
           context: { state: { domain: null } }
         }
-        if (req.locationId) {
-          let location = JSON.parse(req.locationId)
-          req.qty -= location[0].available
-          req.locationId = location[0].location_id
-        }
         result = await StoreAPI.updateStoreProductStock(mappedStore, req)
       }
 

package/server/service/marketplace-channel/marketplace-channel-product-mutation.ts

@@ -1,4 +1,4 @@
-import { Ctx, Mutation, Resolver } from 'type-graphql'
+import { Arg, Ctx, Mutation, Resolver } from 'type-graphql'
 import { getRepository } from 'typeorm'
 
 import { config } from '@things-factory/env'
@@ -10,215 +10,224 @@ import { MarketplaceChannel } from './marketplace-channel'
 @Resolver()
 export class MarketplaceChannelProductMutation {
   @Mutation(returns => Boolean)
-  async syncAllMarketplaceChannelProducts(@Ctx() context: any): Promise<boolean> {
+  async syncAllMarketplaceChannelProducts(
+    @Ctx() context: any,
+    @Arg('fromUpdatedDate', { nullable: true }) fromUpdatedDate?: string,
+    @Arg('toUpdatedDate', { nullable: true }) toUpdatedDate?: string
+  ): Promise<boolean> {
     const sellercraftChannelIntegrationConfig = config.get('sellercraftChannelIntegrationConfig', {})
     const { tokenCraftApiKey: apiKey, getShopsTokenCraftUrl } = sellercraftChannelIntegrationConfig
 
     const channels: MarketplaceChannel[] = await getRepository(MarketplaceChannel).find({ where: { isActive: true } })
 
     for (var i = 0; i < channels.length; i++) {
-      var channelsFullPath = getShopsTokenCraftUrl + '?channel_id=' + channels[i].channelId
-      const channelResponse: any = await fetch(channelsFullPath, {
-        method: 'get',
-        headers: {
-          'Content-Type': 'application/json',
-          'x-api-key': apiKey
-        }
-      })
-
-      if (!channelResponse.ok) {
-        throw new Error(channelResponse)
-      }
-      var shopsResponse = await channelResponse.json()
-      var shops = shopsResponse.shops
-
-      for (var j = 0; j < shops.length; j++) {
-        var store = {
-          accessKey: shops[j]?.credential?.consumer_key || '',
-          accessSecret: shops[j]?.credential?.consumer_secret || '',
-          storeURL: shops[j]?.credential?.store_url || '',
-          platform: channels[i].name,
-          accessToken: shops[j]?.credential?.access_token, // Magento+, Tiktok
-          channelShopId: shops[j]?.channel_shop_id,
-          storeId: shops[j]?.credential?.store_url || ''
-        }
-
-        let countryCode = shops[j].country_code
-        let channelCode = shops[j].org_prefix
-        let organisationId = shops[j].account_id
-        let channelShopId = shops[j].channel_shop_id
-
-        var sellercraftStore = { ...store, platform: 'sellercraftChannelIntegration' }
-
-        const productResult = []
-        let totalPages: number = 1
-        let limit: number = 50
-        let parentLinks = []
-
-        for (let page = 0; page < totalPages; page++) {
-          const { results, total, parentLinkList } = await StoreAPI.getStoreProducts(store, {
-            pagination: { page, limit }
-          })
-          totalPages = Math.ceil(total / limit)
-          productResult.push(...results)
-          if (store.platform == 'magento') parentLinks.push(...parentLinkList)
-        }
-
-        const categoryResult = []
-        let totalPagesCategory: number = 1
-        let limitCategory: number = 100
-
-        if (store.platform != 'shopify') {
-          for (let page = 0; page < totalPagesCategory; page++) {
-            const { results, total } = await StoreAPI.getStoreProductCategories(store, {
-              pagination: { page, limitCategory }
-            })
-            totalPagesCategory = Math.ceil(total / limitCategory)
-            categoryResult.push(...results)
+      try {
+        var channelsFullPath = getShopsTokenCraftUrl + '?channel_id=' + channels[i].channelId
+        const channelResponse: any = await fetch(channelsFullPath, {
+          method: 'get',
+          headers: {
+            'Content-Type': 'application/json',
+            'x-api-key': apiKey
           }
-        } else {
-          categoryResult.push({ id: 1, name: 'default', isActive: true })
-        }
+        })
 
-        let mappedProducts = productResult.map(item => {
-          let { categoryId, itemId: productId, name, brand, isVerified, images, attributes, variations } = item
-
-          variations = variations.map(variation => {
-            let {
-              variationSku,
-              variationId,
-              name,
-              isEnabled: isEnabled,
-              isSellable: isSellable,
-              attributes,
-              stockLocked,
-              qty: stockReported,
-              costPrice: fullPrice,
-              sellPrice: priceDiscounted,
-              length,
-              width,
-              height,
-              weight,
-              extraMetadata
-            } = variation
-
-            return {
-              variationSku,
-              variationId,
-              name,
-              isEnabled,
-              isSellable,
-              attributes: store.platform != 'shopify' ? attributes : null,
-              stockLocked,
-              stockReported,
-              fullPrice: parseFloat(fullPrice) || 0,
-              priceDiscounted: parseFloat(priceDiscounted) || 0,
-              inventoryProducts: [
-                {
-                  qty: 1,
-                  name: `${name} - ${variationSku}`,
-                  sku: variationSku,
-                  productVersions: [
-                    {
-                      label: 'Default',
-                      packageLengthMM: length,
-                      packageWidthMM: width,
-                      packageHeightMM: height,
-                      packageWeightGram: weight,
-                      qty: stockReported
-                    }
-                  ]
-                }
-              ],
-              extraMetadata
+        if (!channelResponse.ok) {
+          throw new Error(channelResponse)
+        }
+        var shopsResponse = await channelResponse.json()
+        var shops = shopsResponse.shops
+
+        for (var j = 0; j < shops.length; j++) {
+          try {
+            var store = {
+              accessKey: shops[j]?.credential?.consumer_key || '',
+              accessSecret: shops[j]?.credential?.consumer_secret || '',
+              storeURL: shops[j]?.credential?.store_url || '',
+              platform: channels[i].name,
+              accessToken: shops[j]?.credential?.access_token, // Magento+, Tiktok
+              channelShopId: shops[j]?.channel_shop_id,
+              storeId: shops[j]?.credential?.store_url || ''
             }
-          })
 
-          images = images?.map(image => {
-            return {
-              url: image
+            let countryCode = shops[j].country_code
+            let channelCode = shops[j].org_prefix
+            let organisationId = shops[j].account_id
+            let channelShopId = shops[j].channel_shop_id
+
+            var sellercraftStore = { ...store, platform: 'sellercraftChannelIntegration' }
+
+            const productResult = []
+            let totalPages: number = 1
+            let limit: number = 50
+            let parentLinks = []
+
+            for (let page = 0; page < totalPages; page++) {
+              const { results, total, parentLinkList } = await StoreAPI.getStoreProducts(store, {
+                pagination: { page, limit }
+              })
+              totalPages = Math.ceil(total / limit)
+              productResult.push(...results)
+              if (store.platform == 'magento') parentLinks.push(...parentLinkList)
             }
-          })
-
-          return {
-            organisationId,
-            channelShopId: channelShopId,
-            channelCode: channels[i].channelCode,
-            channelCountry: shops[j].country_code,
-            categoryId: store.platform == 'shopify' ? 1 : categoryId,
-            productId: parentLinks.find(e => e.children.includes(productId))?.id || productId,
-            name,
-            brand,
-            isVerified,
-            images,
-            attributes,
-            variations
-          }
-        })
 
-        let mappedCategories = categoryResult.map(category => {
-          let { id: categoryId, name: categoryName, parent, isActive } = category
-
-          return {
-            categoryId,
-            categoryName,
-            parent,
-            isActive: isActive || true,
-            channelCode,
-            countryCode,
-            childrenCategories: []
-          }
-        })
+            const categoryResult = []
+            let totalPagesCategory: number = 1
+            let limitCategory: number = 100
 
-        if (store.platform == 'magento') {
-          let newList = []
-          for (let np of mappedProducts) {
-            if (np.productId == np.variations[0].variationId) {
-              let vars = mappedProducts
-                .filter(e => e.productId == np.productId)
-                .map(e => {
-                  return e.variations[0]
+            if (store.platform != 'shopify') {
+              for (let page = 0; page < totalPagesCategory; page++) {
+                const { results, total } = await StoreAPI.getStoreProductCategories(store, {
+                  pagination: { page, limitCategory }
                 })
-              np.variations = vars
-              if (np.variations.length > 1) {
-                np.variations = np.variations.filter(v => v.variationId != np.productId)
+                totalPagesCategory = Math.ceil(total / limitCategory)
+                categoryResult.push(...results)
               }
-              newList.push(np)
+            } else {
+              categoryResult.push({ id: 1, name: 'default', isActive: true })
             }
-          }
-          mappedProducts = newList
-        }
 
-        try {
-          let filterList = []
-          mappedCategories = mappedCategories.map(category => {
-            if (mappedCategories.filter(e => e.parent == category.categoryId).length > 0) {
-              category.childrenCategories = mappedCategories.filter(e => e.parent == category.categoryId)
-              filterList.push(...mappedCategories.filter(e => e.parent == category.categoryId))
-            }
-            return category
-          })
+            let mappedProducts = productResult.map(item => {
+              let { categoryId, itemId: productId, name, brand, isVerified, images, attributes, variations } = item
+
+              variations = variations.map(variation => {
+                let {
+                  variationSku,
+                  variationId,
+                  name,
+                  isEnabled: isEnabled,
+                  isSellable: isSellable,
+                  attributes,
+                  stockLocked,
+                  qty: stockReported,
+                  costPrice: fullPrice,
+                  sellPrice: priceDiscounted,
+                  length,
+                  width,
+                  height,
+                  weight,
+                  extraMetadata
+                } = variation
+
+                return {
+                  variationSku,
+                  variationId,
+                  name,
+                  isEnabled,
+                  isSellable,
+                  attributes: store.platform != 'shopify' ? attributes : null,
+                  stockLocked,
+                  stockReported,
+                  fullPrice: parseFloat(fullPrice) || 0,
+                  priceDiscounted: parseFloat(priceDiscounted) || 0,
+                  inventoryProducts: [
+                    {
+                      qty: 1,
+                      name: `${name} - ${variationSku}`,
+                      sku: variationSku,
+                      productVersions: [
+                        {
+                          label: 'Default',
+                          packageLengthMM: length,
+                          packageWidthMM: width,
+                          packageHeightMM: height,
+                          packageWeightGram: weight,
+                          qty: stockReported
+                        }
+                      ]
+                    }
+                  ],
+                  extraMetadata
+                }
+              })
+
+              images = images?.map(image => {
+                return {
+                  url: image
+                }
+              })
+
+              return {
+                organisationId,
+                channelShopId: channelShopId,
+                channelCode: channels[i].channelCode,
+                channelCountry: shops[j].country_code,
+                categoryId: store.platform == 'shopify' ? 1 : categoryId,
+                productId: parentLinks.find(e => e.children.includes(productId))?.id || productId,
+                name,
+                brand,
+                isVerified,
+                images,
+                attributes,
+                variations
+              }
+            })
+
+            let mappedCategories = categoryResult.map(category => {
+              let { id: categoryId, name: categoryName, parent, isActive } = category
+
+              return {
+                categoryId,
+                categoryName,
+                parent,
+                isActive: isActive || true,
+                channelCode,
+                countryCode,
+                childrenCategories: []
+              }
+            })
 
-          mappedCategories = mappedCategories.map(mc => {
-            if (filterList.indexOf(mc) == -1) {
-              return mc
+            if (store.platform == 'magento') {
+              let newList = []
+              for (let np of mappedProducts) {
+                if (np.productId == np.variations[0].variationId) {
+                  let vars = mappedProducts
+                    .filter(e => e.productId == np.productId)
+                    .map(e => {
+                      return e.variations[0]
+                    })
+                  np.variations = vars
+                  if (np.variations.length > 1) {
+                    np.variations = np.variations.filter(v => v.variationId != np.productId)
+                  }
+                  newList.push(np)
+                }
+              }
+              mappedProducts = newList
             }
-          }).filter(e => e)
 
-          await SellercraftChannelIntegrationAPI.ingestChannelCategories(sellercraftStore, {
-            categories: mappedCategories
-          })
-        } catch (e) {}
+            try {
+              let filterList = []
+              mappedCategories = mappedCategories.map(category => {
+                if (mappedCategories.filter(e => e.parent == category.categoryId).length > 0) {
+                  category.childrenCategories = mappedCategories.filter(e => e.parent == category.categoryId)
+                  filterList.push(...mappedCategories.filter(e => e.parent == category.categoryId))
+                }
+                return category
+              })
+
+              mappedCategories = mappedCategories
+                .map(mc => {
+                  if (filterList.indexOf(mc) == -1) {
+                    return mc
+                  }
+                })
+                .filter(e => e)
 
-        try {
-          for (let k = 0, l = mappedProducts.length; k < l; k++) {
-            await SellercraftChannelIntegrationAPI.ingestChannelProduct(sellercraftStore, {
-              products: [mappedProducts[k]]
-            })
-          }
-        } catch (e) {}
-      }
+              await SellercraftChannelIntegrationAPI.ingestChannelCategories(sellercraftStore, {
+                categories: mappedCategories
+              })
+            } catch (e) {}
 
+            try {
+              for (let k = 0, l = mappedProducts.length; k < l; k++) {
+                await SellercraftChannelIntegrationAPI.ingestChannelProduct(sellercraftStore, {
+                  products: [mappedProducts[k]]
+                })
+              }
+            } catch (e) {}
+          } catch (e) {}
+        }
+      } catch (e) {}
     }
     return true
   }