@things-factory/integration-marketplace 5.0.0-alpha.51 → 5.0.0-alpha.55

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

@@ -46,6 +46,14 @@ export function getStoreProducts() {
                 values: attribute.options
               }
             }) || [],
+          sellercraftAttributes: [
+            {
+              native_attribute_id: 'description',
+              attribute_key: 'description',
+              display_name: 'Description',
+              values: [product.description]
+            }
+          ],
           isVerified: product.purchasable,
           variations:
             productVariations.length === 0
@@ -101,6 +109,14 @@ export function getStoreProducts() {
                           values: [attribute.option]
                         }
                       }) || [],
+                    sellercraftAttributes: variant?.attributes?.map(attribute => {
+                      return {
+                        native_attribute_id: attribute.name,
+                        attribute_key: attribute.name,
+                        display_name: attribute.name,
+                        values: [attribute.option]      
+                      }
+                    }) || [],
                     isEnabled: variant.purchasable,
                     length: variant.dimensions.length * 10,
                     width: variant.dimensions.width * 10,

package/server/graphql/resolvers/marketplace-store/lazada/generate-lazada-access-token.ts

@@ -1,4 +1,4 @@
-import uuid from 'uuid/v4'
+import { v4 as uuidv4 } from 'uuid'
 
 import { config } from '@things-factory/env'
 
@@ -42,7 +42,7 @@ export const generateLazadaAccessToken = {
 
       if (!foundMarketplaceSetting) {
         const marketplaceSetting = new MarketplaceSetting()
-        marketplaceSetting.name = uuid()
+        marketplaceSetting.name = uuidv4()
         marketplaceSetting.marketplaceStore = marketplaceStore
         marketplaceSetting.value = '100'
         marketplaceSetting.category = category

package/server/graphql/resolvers/marketplace-store/magento/activate-magento-store.ts

@@ -1,5 +1,5 @@
 import fetch from 'node-fetch'
-import uuid from 'uuid/v4'
+import { v4 as uuidv4 } from 'uuid'
 
 import { MarketplaceSetting, MarketplaceStore } from '../../../../entities'
 import { STORE_STATUS } from '../../../constants'
@@ -65,7 +65,7 @@ export const activateMagentoStore = {
 
       if (!foundMarketplaceSetting) {
         const marketplaceSetting = new MarketplaceSetting()
-        marketplaceSetting.name = uuid()
+        marketplaceSetting.name = uuidv4()
         marketplaceSetting.marketplaceStore = marketplaceStore
         marketplaceSetting.value = '100'
         marketplaceSetting.category = category

package/server/graphql/resolvers/marketplace-store/shopee/generate-shopee-access-token.ts

@@ -1,7 +1,7 @@
 import crypto from 'crypto'
 import Debug from 'debug'
 import fetch from 'node-fetch'
-import uuid from 'uuid/v4'
+import { v4 as uuidv4 } from 'uuid'
 
 import { config } from '@things-factory/env'
 
@@ -77,7 +77,7 @@ export const generateShopeeAccessToken = {
 
       if (!foundMarketplaceSetting) {
         const marketplaceSetting = new MarketplaceSetting()
-        marketplaceSetting.name = uuid()
+        marketplaceSetting.name = uuidv4()
         marketplaceSetting.marketplaceStore = marketplaceStore
         marketplaceSetting.value = '100'
         marketplaceSetting.category = category

package/server/graphql/resolvers/marketplace-store/zalora/generate-zalora-access-token.ts

@@ -1,4 +1,4 @@
-import uuid from 'uuid/v4'
+import { v4 as uuidv4 } from 'uuid'
 
 import { MarketplaceSetting, MarketplaceStore } from '../../../../entities'
 import { STORE_STATUS } from '../../../constants'
@@ -36,7 +36,7 @@ export const generateZaloraAccessToken = {
 
       if (!foundMarketplaceSetting) {
         const marketplaceSetting = new MarketplaceSetting()
-        marketplaceSetting.name = uuid()
+        marketplaceSetting.name = uuidv4()
         marketplaceSetting.marketplaceStore = marketplaceStore
         marketplaceSetting.value = '100'
         marketplaceSetting.category = category

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

@@ -1,5 +1,5 @@
 import { CourierService } from '@things-factory/integration-lmd'
-import uuid from 'uuid/v4'
+import { v4 as uuidv4 } from 'uuid'
 import { MarketplaceStore, MarketplaceTransporter } from '../../../entities'
 
 export const createMarketplaceTransporter = {
@@ -7,7 +7,7 @@ export const createMarketplaceTransporter = {
     const { domain, user, tx } = context.state
 
     return await tx.getRepository(MarketplaceTransporter).save({
-      name: uuid().toString(),
+      name: uuidv4().toString(),
       marketplaceStore: await tx.getRepository(MarketplaceStore).findOne(marketplaceStoreId),
       deliveryTransporter: await tx.getRepository(CourierService).findOne(deliveryTransporter),
       pickupTransporter: await tx.getRepository(CourierService).findOne(deliveryTransporter),

package/server/routers/magento-private-router.ts

@@ -1,7 +1,7 @@
 import Router from 'koa-router'
 import fetch from 'node-fetch'
 import { getRepository } from 'typeorm'
-import uuid from 'uuid/v4'
+import { v4 as uuidv4 } from 'uuid'
 
 import { config } from '@things-factory/env'
 import { getRedirectSubdomainPath } from '@things-factory/shell'
@@ -173,7 +173,7 @@ magentoPrivateRouter.get(
 
       if (!foundMarketplaceSetting) {
         const marketplaceSetting = new MarketplaceSetting()
-        marketplaceSetting.name = uuid()
+        marketplaceSetting.name = uuidv4()
         marketplaceSetting.marketplaceStore = marketplaceStore
         marketplaceSetting.value = '100'
         marketplaceSetting.category = category

package/server/routers/shopify-install-private-router.ts

@@ -1,6 +1,6 @@
 import Router from 'koa-router'
 import { getRepository } from 'typeorm'
-import uuid from 'uuid/v4'
+import { v4 as uuidv4 } from 'uuid'
 
 import { config } from '@things-factory/env'
 import { getRedirectSubdomainPath } from '@things-factory/shell'
@@ -76,7 +76,7 @@ shopifyInstallPrivateRouter.get(
 
       if (!foundMarketplaceSetting) {
         const marketplaceSetting = new MarketplaceSetting()
-        marketplaceSetting.name = uuid()
+        marketplaceSetting.name = uuidv4()
         marketplaceSetting.marketplaceStore = marketplaceStore
         marketplaceSetting.value = '100'
         marketplaceSetting.category = category

package/server/routers/shopify-private-router.ts

@@ -1,6 +1,6 @@
 import Router from 'koa-router'
 import { getRepository } from 'typeorm'
-import uuid from 'uuid/v4'
+import { v4 as uuidv4 } from 'uuid'
 import { config } from '@things-factory/env'
 import { getUrlFromContext } from '@things-factory/shell'
 import { VerificationToken, VerificationTokenType } from '@things-factory/auth-base'
@@ -52,7 +52,7 @@ shopifyPrivateRouter.get(
     }
 
     const marketplaceSetting = new MarketplaceSetting()
-    marketplaceSetting.name = uuid()
+    marketplaceSetting.name = uuidv4()
     marketplaceSetting.marketplaceStore = marketplaceStore
     marketplaceSetting.value = '100'
     marketplaceSetting.category = 'stock_allocation'

package/server/routers/shopify-public-router.ts

@@ -4,7 +4,7 @@ import { getRedirectSubdomainPath } from '@things-factory/shell'
 import Router from 'koa-router'
 import fetch from 'node-fetch'
 import { getRepository } from 'typeorm'
-import uuid from 'uuid/v4'
+import { v4 as uuidv4 } from 'uuid'
 import { StoreAPI } from '../controllers/store-api'
 import { MarketplaceSetting, MarketplaceStore } from '../entities'
 import { STORE_STATUS } from '../graphql/constants'
@@ -84,7 +84,7 @@ shopifyPublicRouter.get('/callback-shopify', async (context, next) => {
     })
 
     const marketplaceSetting = new MarketplaceSetting()
-    marketplaceSetting.name = uuid()
+    marketplaceSetting.name = uuidv4()
     marketplaceSetting.marketplaceStore = store
     marketplaceSetting.value = '100'
     marketplaceSetting.category = 'stock_allocation'

package/server/routers/woocommerce-router.ts

@@ -1,6 +1,6 @@
 import Router from 'koa-router'
 import { getRepository } from 'typeorm'
-import uuid from 'uuid/v4'
+import { v4 as uuidv4 } from 'uuid'
 
 import { MarketplaceSetting, MarketplaceStore } from '../entities'
 import { STORE_STATUS } from '../graphql/constants'
@@ -55,7 +55,7 @@ async function saveWoocommerceAccessInfo(accessInfo: WoocommerAccessInfo): Promi
 
     if (!foundMarketplaceSetting) {
       const marketplaceSetting = new MarketplaceSetting()
-      marketplaceSetting.name = uuid()
+      marketplaceSetting.name = uuidv4()
       marketplaceSetting.marketplaceStore = marketplaceStore
       marketplaceSetting.value = '100'
       marketplaceSetting.category = category