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

package/server/graphql/resolvers/store-order/get-store-order-items.ts

@@ -1,7 +1,7 @@
 import { StoreAPI } from '../../../controllers/store-api'
 
 export const getStoreOrderItems = {
-  async getStoreOrderItems(_: any, { storeId, orderId }, context: any) {
+  async getStoreOrderItems(_: any, { storeId, orderId }, context: ResolverContext) {
     var store = await StoreAPI.getMarketplaceStore(storeId)
     return await StoreAPI.getStoreOrderItems(store, { orderId })
   }

package/server/graphql/resolvers/store-order/get-store-order.ts

@@ -1,7 +1,7 @@
 import { StoreAPI } from '../../../controllers/store-api'
 
 export const getStoreOrder = {
-  async getStoreOrder(_: any, { storeId, orderId }, context: any) {
+  async getStoreOrder(_: any, { storeId, orderId }, context: ResolverContext) {
     var store = await StoreAPI.getMarketplaceStore(storeId)
     return await StoreAPI.getStoreOrder(store, { orderId })
   }

package/server/graphql/resolvers/store-order/get-store-orders.ts

@@ -1,7 +1,7 @@
 import { StoreAPI } from '../../../controllers/store-api'
 
 export const getStoreOrders = {
-  async getStoreOrders(_: any, { storeId }, context: any) {
+  async getStoreOrders(_: any, { storeId }, context: ResolverContext) {
     var store = await StoreAPI.getMarketplaceStore(storeId)
     return await StoreAPI.getStoreOrders(store, {
       pagination: {

package/server/graphql/resolvers/store-order/reject-store-order-cancellation.ts

@@ -1,7 +1,7 @@
 import { StoreAPI } from '../../../controllers/store-api'
 
 export const rejectStoreOrderCancellation = {
-  async rejectStoreOrderCancellation(_: any, { storeId, orderId }, context: any) {
+  async rejectStoreOrderCancellation(_: any, { storeId, orderId }, context: ResolverContext) {
     // only in Shopee, to reject buyer order cancellation
     var store = await StoreAPI.getMarketplaceStore(storeId)
     return await StoreAPI.rejectStoreOrderCancellation(store, orderId)

package/server/graphql/resolvers/store-order/set-store-order-status-packed-by-marketplace.ts

@@ -1,7 +1,7 @@
 import { StoreAPI } from '../../../controllers/store-api'
 
 export const setStoreOrderStatusPackedByMarketplace = {
-  async setStoreOrderStatusPackedByMarketplace(_: any, { storeId, deliveryInformation }, context: any) {
+  async setStoreOrderStatusPackedByMarketplace(_: any, { storeId, deliveryInformation }, context: ResolverContext) {
     // set status to packed by marketplace (Lazada)
     var store = await StoreAPI.getMarketplaceStore(storeId)
     return await StoreAPI.setStoreOrderStatusPackedByMarketplace(store, deliveryInformation)

package/server/graphql/resolvers/store-order/set-store-order-status-ready-to-ship.ts

@@ -2,7 +2,7 @@ import { config } from '@things-factory/env'
 import { StoreAPI } from '../../../controllers/store-api'
 
 export const setStoreOrderStatusReadyToShip = {
-  async setStoreOrderStatusReadyToShip(_: any, { storeId, deliveryInformation }, context: any) {
+  async setStoreOrderStatusReadyToShip(_: any, { storeId, deliveryInformation }, context: ResolverContext) {
     // set status to ready to ship (Lazada)
     var store = await StoreAPI.getMarketplaceStore(storeId)
     return await StoreAPI.setStoreOrderStatusReadyToShip(store, deliveryInformation)

package/server/graphql/resolvers/store-product/create-store-product-variations.ts

@@ -1,7 +1,7 @@
 import { StoreAPI } from '../../../controllers/store-api'
 
 export const createStoreProductVariations = {
-  async createStoreProductVariations(_: any, { storeId, itemId, variations }, context: any) {
+  async createStoreProductVariations(_: any, { storeId, itemId, variations }, context: ResolverContext) {
     // only in Shopee
     var store = await StoreAPI.getMarketplaceStore(storeId)
     return await StoreAPI.createStoreProductVariations(store, { itemId, variations })

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

@@ -1,7 +1,7 @@
 import { StoreAPI } from '../../../controllers/store-api'
 
 export const createStoreProduct = {
-  async createStoreProduct(_: any, { storeId, productInformation }, context: any) {
+  async createStoreProduct(_: any, { storeId, productInformation }, context: ResolverContext) {
     var store = await StoreAPI.getMarketplaceStore(storeId)
     return await StoreAPI.createStoreProduct(store, productInformation)
   }

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

@@ -1,7 +1,7 @@
 import { StoreAPI } from '../../../controllers/store-api'
 
 export const deleteStoreProduct = {
-  async deleteStoreProduct(_: any, { storeId, itemList }, context: any) {
+  async deleteStoreProduct(_: any, { storeId, itemList }, context: ResolverContext) {
     var store = await StoreAPI.getMarketplaceStore(storeId)
     return await StoreAPI.deleteStoreProduct(store, itemList)
   }

package/server/graphql/resolvers/store-product/get-store-product-brands.ts

@@ -1,7 +1,7 @@
 import { StoreAPI } from '../../../controllers/store-api'
 
 export const getStoreProductBrands = {
-  async getStoreProductBrands(_: any, { storeId }, context: any) {
+  async getStoreProductBrands(_: any, { storeId }, context: ResolverContext) {
     // only in Lazada
     var store = await StoreAPI.getMarketplaceStore(storeId)
     return await StoreAPI.getStoreProductBrands(store, {

package/server/graphql/resolvers/store-product/get-store-product-categories.ts

@@ -1,7 +1,7 @@
 import { StoreAPI } from '../../../controllers/store-api'
 
 export const getStoreProductCategories = {
-  async getStoreProductCategories(_: any, { storeId }, context: any) {
+  async getStoreProductCategories(_: any, { storeId }, context: ResolverContext) {
     var store = await StoreAPI.getMarketplaceStore(storeId)
     return await StoreAPI.getStoreProductCategories(store)
   }

package/server/graphql/resolvers/store-product/get-store-product-category-attributes.ts

@@ -1,7 +1,7 @@
 import { StoreAPI } from '../../../controllers/store-api'
 
 export const getStoreProductCategoryAttributes = {
-  async getStoreProductCategoryAttributes(_: any, { storeId, categoryId, isCrossBorder }, context: any) {
+  async getStoreProductCategoryAttributes(_: any, { storeId, categoryId, isCrossBorder }, context: ResolverContext) {
     var store = await StoreAPI.getMarketplaceStore(storeId)
     return await StoreAPI.getStoreProductCategoryAttributes(store, {
       categoryId,

package/server/graphql/resolvers/store-product/get-store-product.ts

@@ -1,7 +1,7 @@
 import { StoreAPI } from '../../../controllers/store-api'
 
 export const getStoreProduct = {
-  async getStoreProduct(_: any, { storeId, itemId }, context: any) {
+  async getStoreProduct(_: any, { storeId, itemId }, context: ResolverContext) {
     var store = await StoreAPI.getMarketplaceStore(storeId)
     return await StoreAPI.getStoreProduct(store, itemId)
   }

package/server/graphql/resolvers/store-product/get-store-products.ts

@@ -1,7 +1,7 @@
 import { StoreAPI } from '../../../controllers/store-api'
 
 export const getStoreProducts = {
-  async getStoreProducts(_: any, { storeId }, context: any) {
+  async getStoreProducts(_: any, { storeId }, context: ResolverContext) {
     var store = await StoreAPI.getMarketplaceStore(storeId)
     return await StoreAPI.getStoreProducts(store, {
       pagination: {

package/server/graphql/resolvers/store-product/update-store-product.ts

@@ -1,7 +1,7 @@
 import { StoreAPI } from '../../../controllers/store-api'
 
 export const updateStoreProduct = {
-  async updateStoreProduct(_: any, { storeId, productInformation }, context: any) {
+  async updateStoreProduct(_: any, { storeId, productInformation }, context: ResolverContext) {
     var store = await StoreAPI.getMarketplaceStore(storeId)
     return await StoreAPI.updateStoreProduct(store, productInformation)
   }

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

@@ -1,10 +1,9 @@
 import Router from 'koa-router'
 import fetch from 'node-fetch'
-import { getRepository } from 'typeorm'
 import { v4 as uuidv4 } from 'uuid'
 
 import { config } from '@things-factory/env'
-import { getRedirectSubdomainPath } from '@things-factory/shell'
+import { getRedirectSubdomainPath, getRepository } from '@things-factory/shell'
 
 import { Magento } from '../controllers/magento'
 import { MarketplaceSetting, MarketplaceStore } from '../entities'
@@ -129,7 +128,7 @@ magentoPrivateRouter.get(
     // need to get or save marketplace-store here
     var marketplaceStore = await getRepository(MarketplaceStore).findOne({
       where: {
-        domain,
+        domain: { id: domain.id },
         storeId: oauthVerifier,
         platform: 'magento'
       }
@@ -168,7 +167,7 @@ magentoPrivateRouter.get(
 
     marketplaceSettingCategories.forEach(async category => {
       const foundMarketplaceSetting: MarketplaceSetting = await getRepository(MarketplaceSetting).findOne({
-        where: { marketplaceStore, domain, category }
+        where: { marketplaceStore: { id: marketplaceStore.id }, domain: { id: domain.id }, category }
       })
 
       if (!foundMarketplaceSetting) {

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

@@ -1,9 +1,8 @@
 import Router from 'koa-router'
-import { getRepository } from 'typeorm'
 import { v4 as uuidv4 } from 'uuid'
 
 import { config } from '@things-factory/env'
-import { getRedirectSubdomainPath } from '@things-factory/shell'
+import { getRedirectSubdomainPath, getRepository } from '@things-factory/shell'
 
 import { MarketplaceSetting, MarketplaceStore } from '../entities'
 import { STORE_STATUS } from '../graphql/constants'
@@ -32,7 +31,7 @@ shopifyInstallPrivateRouter.get(
     // need to get or save marketplace-store here
     var marketplaceStore = await getRepository(MarketplaceStore).findOne({
       where: {
-        domain,
+        domain: { id: domain.id },
         storeId: shop,
         platform: 'shopify'
       }
@@ -40,7 +39,7 @@ shopifyInstallPrivateRouter.get(
 
     if (!marketplaceStore) {
       marketplaceStore = await getRepository(MarketplaceStore).save({
-        domain,
+        domain: { id: domain.id },
         platform: 'shopify',
         name: 'shopify-' + shop,
         storeId: shop,
@@ -71,7 +70,7 @@ shopifyInstallPrivateRouter.get(
 
     marketplaceSettingCategories.forEach(async category => {
       const foundMarketplaceSetting: MarketplaceSetting = await getRepository(MarketplaceSetting).findOne({
-        where: { marketplaceStore, domain, category }
+        where: { marketplaceStore: { id: marketplaceStore.id }, domain: { id: domain.id }, category }
       })
 
       if (!foundMarketplaceSetting) {

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

@@ -1,9 +1,8 @@
 import Router from 'koa-router'
 import fetch from 'node-fetch'
-import { getRepository } from 'typeorm'
 
 import { config } from '@things-factory/env'
-import { getUrlFromContext } from '@things-factory/shell'
+import { getRepository, getUrlFromContext } from '@things-factory/shell'
 
 import { Shopify } from '../controllers/shopify'
 import { MarketplaceStore } from '../entities'

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

@@ -1,12 +1,12 @@
 import Router from 'koa-router'
-import { getRepository } from 'typeorm'
 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'
-import { Shopify } from '../controllers/shopify'
+import { config } from '@things-factory/env'
+import { getRepository, getUrlFromContext } from '@things-factory/shell'
 
-import { MarketplaceStore, MarketplaceSetting } from '../entities'
+import { Shopify } from '../controllers/shopify'
+import { MarketplaceSetting, MarketplaceStore } from '../entities'
 import { STORE_STATUS } from '../graphql/constants'
 
 const shopifyConfig = config.get('marketplaceIntegrationShopify', {})
@@ -32,7 +32,7 @@ shopifyPrivateRouter.get(
     // need to get or save marketplace-store here
     var marketplaceStore = await getRepository(MarketplaceStore).findOne({
       where: {
-        domain,
+        domain: { id: domain.id },
         storeId: shop,
         platform: 'shopify'
       }

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

@@ -1,10 +1,11 @@
-import { User, VerificationToken, VerificationTokenType } from '@things-factory/auth-base'
-import { config } from '@things-factory/env'
-import { getRedirectSubdomainPath } from '@things-factory/shell'
 import Router from 'koa-router'
 import fetch from 'node-fetch'
-import { getRepository } from 'typeorm'
 import { v4 as uuidv4 } from 'uuid'
+
+import { User, VerificationToken, VerificationTokenType } from '@things-factory/auth-base'
+import { config } from '@things-factory/env'
+import { getRedirectSubdomainPath, getRepository } from '@things-factory/shell'
+
 import { StoreAPI } from '../controllers/store-api'
 import { MarketplaceSetting, MarketplaceStore } from '../entities'
 import { STORE_STATUS } from '../graphql/constants'
@@ -75,7 +76,7 @@ shopifyPublicRouter.get('/callback-shopify', async (context, next) => {
       status: STORE_STATUS.ACTIVE
     }
 
-    var user = await getRepository(User).findOne(userId)
+    var user = await getRepository(User).findOneBy({ id: userId })
 
     store = await getRepository(MarketplaceStore).save({
       ...store,

package/server/routers/woocommerce-router.ts

@@ -1,7 +1,8 @@
 import Router from 'koa-router'
-import { getRepository } from 'typeorm'
 import { v4 as uuidv4 } from 'uuid'
 
+import { getRepository } from '@things-factory/shell'
+
 import { MarketplaceSetting, MarketplaceStore } from '../entities'
 import { STORE_STATUS } from '../graphql/constants'
 
@@ -39,7 +40,7 @@ async function saveWoocommerceAccessInfo(accessInfo: WoocommerAccessInfo): Promi
     consumer_secret: accessSecret
   } = accessInfo
 
-  let marketplaceStore: MarketplaceStore = await getRepository(MarketplaceStore).findOne(marketplaceStoreId)
+  let marketplaceStore: MarketplaceStore = await getRepository(MarketplaceStore).findOneBy({ id: marketplaceStoreId })
   marketplaceStore.accessKey = accessKey
   marketplaceStore.accessSecret = accessSecret
   marketplaceStore.accessInfo = JSON.stringify(accessInfo, null, 2)
@@ -50,7 +51,7 @@ async function saveWoocommerceAccessInfo(accessInfo: WoocommerAccessInfo): Promi
 
   marketplaceSettingCategories.forEach(async category => {
     const foundMarketplaceSetting: MarketplaceSetting = await getRepository(MarketplaceSetting).findOne({
-      where: { marketplaceStore, domain: marketplaceStore.domain, category }
+      where: { marketplaceStore: { id: marketplaceStore.id }, domain: { id: marketplaceStore.domain.id }, category }
     })
 
     if (!foundMarketplaceSetting) {