@things-factory/operato-hub 4.3.188 → 4.3.190

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.3.188",
+  "version": "4.3.190",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -55,7 +55,7 @@
     "@operato/scene-tab": "^0.1.8",
     "@operato/scene-table": "^0.1.8",
     "@operato/scene-wheel-sorter": "^0.1.8",
-    "@things-factory/api": "^4.3.179",
+    "@things-factory/api": "^4.3.190",
     "@things-factory/apptool-ui": "^4.3.179",
     "@things-factory/attachment-base": "^4.3.179",
     "@things-factory/auth-base": "^4.3.179",
@@ -77,20 +77,21 @@
     "@things-factory/i18n-base": "^4.3.179",
     "@things-factory/import-ui": "^4.3.179",
     "@things-factory/import-ui-excel": "^4.3.179",
-    "@things-factory/integration-accounting": "^4.3.186",
-    "@things-factory/integration-fulfillment": "^4.3.186",
-    "@things-factory/integration-lmd": "^4.3.186",
-    "@things-factory/integration-marketplace": "^4.3.186",
-    "@things-factory/integration-pos": "^4.3.186",
-    "@things-factory/integration-sellercraft": "^4.3.186",
-    "@things-factory/integration-sftp": "^4.3.186",
+    "@things-factory/integration-accounting": "^4.3.190",
+    "@things-factory/integration-fulfillment": "^4.3.190",
+    "@things-factory/integration-lmd": "^4.3.190",
+    "@things-factory/integration-marketplace": "^4.3.190",
+    "@things-factory/integration-pos": "^4.3.190",
+    "@things-factory/integration-sellercraft": "^4.3.190",
+    "@things-factory/integration-sftp": "^4.3.190",
     "@things-factory/lite-menu": "^4.3.186",
+    "@things-factory/marketplace-base": "^4.3.190",
     "@things-factory/more-ui": "^4.3.179",
     "@things-factory/notification": "^4.3.186",
     "@things-factory/pdf": "^4.3.159",
     "@things-factory/product-ui": "^4.3.187",
     "@things-factory/resource-ui": "^4.3.179",
-    "@things-factory/sales-base": "^4.3.188",
+    "@things-factory/sales-base": "^4.3.190",
     "@things-factory/scene-data-transform": "^4.3.159",
     "@things-factory/scene-excel": "^4.3.159",
     "@things-factory/scene-firebase": "^4.3.159",
@@ -105,8 +106,8 @@
     "@things-factory/setting-ui": "^4.3.186",
     "@things-factory/shell": "^4.3.179",
     "@things-factory/system-ui": "^4.3.179",
-    "@things-factory/warehouse-base": "^4.3.187",
-    "@things-factory/worksheet-base": "^4.3.188",
+    "@things-factory/warehouse-base": "^4.3.190",
+    "@things-factory/worksheet-base": "^4.3.190",
     "cron-parser": "^4.7.0",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
@@ -118,5 +119,5 @@
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "e302836bb0f2a765c54e5cac96e82b7c7ace86fe"
+  "gitHead": "9fc85f3d95eeddd2191d156d99fc77bcc81b5071"
 }

package/server/routers/api/restful-apis/v1/company/index.ts

@@ -1,12 +1,6 @@
 import './add-contact-points'
-import './add-marketplace-order'
 import './add-products'
-import './cancel-marketplace-order'
 import './get-bizplace-list'
 import './get-contact-point-list'
-import './get-marketplace-order-shipping-list'
-import './get-marketplace-store-list'
 import './get-partner-list'
 import './get-product-list'
-import './update-marketplace-order-delivered'
-import './update-marketplace-shipping-order'

package/server/routers/api/restful-apis/v1/index.ts

@@ -1,2 +1,3 @@
 import './company'
 import './warehouse'
+import './marketplace'

package/server/routers/api/restful-apis/v1/{company → marketplace}/add-marketplace-order.ts

@@ -1,10 +1,8 @@
-import { getConnection, EntityManager, IsNull, SelectQueryBuilder } from 'typeorm'
+import { EntityManager, getConnection, IsNull, SelectQueryBuilder } from 'typeorm'
+import { v4 as uuidv4 } from 'uuid'
 
 import { restfulApiRouter as router } from '@things-factory/api'
-import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
-import { v4 as uuidv4 } from 'uuid'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
-import { Product, ProductBundle, ProductBundleSetting } from '@things-factory/product-base'
 import {
   MarketplaceOrder as MarketplaceOrderEntity,
   MarketplaceOrderItem as MarketplaceOrderItemEntity,
@@ -13,10 +11,13 @@ import {
   MarketplaceProductVariation as MarketplaceProductVariationEntity,
   NoGenerator
 } from '@things-factory/marketplace-base'
-import { businessMiddleware, validationMiddleware, loggingMiddleware } from '../middlewares'
+import { Product, ProductBundle, ProductBundleSetting } from '@things-factory/product-base'
+
+import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
+import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
 
 router.post(
-  '/v1/company/add-marketplace-order',
+  '/v1/marketplace/add-marketplace-order',
   businessMiddleware,
   validationMiddleware,
   loggingMiddleware,

package/server/routers/api/restful-apis/v1/marketplace/add-marketplace-products.ts

@@ -0,0 +1,106 @@
+import _ from 'lodash'
+import { EntityManager, getConnection, In } from 'typeorm'
+import { v4 as uuidv4 } from 'uuid'
+
+import { restfulApiRouter as router } from '@things-factory/api'
+import { MarketplaceStore } from '@things-factory/integration-marketplace'
+import { MarketplaceProduct, MarketplaceProductVariation } from '@things-factory/marketplace-base'
+
+import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
+import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
+
+router.post(
+  '/v1/marketplace/add-marketplace-products',
+  businessMiddleware,
+  validationMiddleware,
+  loggingMiddleware,
+  async (context, next) => {
+    try {
+      await getConnection().transaction(async (tx: EntityManager) => {
+        const { user, domain } = context.state
+        const { marketplaceProducts, storeId } = context.request.body.data
+
+        if (!Array.isArray(marketplaceProducts)) throw new ApiError('E01', 'data field is not an array')
+
+        const marketplaceStore: MarketplaceStore = await tx.getRepository(MarketplaceStore).findOne({
+          where: { name: storeId, domain }
+        })
+        if (!marketplaceStore) throw new ApiError('E04', 'storeId')
+
+        const itemIds = marketplaceProducts.map(mp => mp.itemId)
+
+        //check duplicate sku from request
+        let duplicateItemId = itemIds.filter((item, index) => itemIds.indexOf(item) != index)
+
+        if (duplicateItemId?.length > 0) {
+          throw new ApiError('E05', `duplicated item id found: ${[...new Set(duplicateItemId)]}`)
+        }
+
+        //check if sku existed in db
+        let existedMarketplaceProducts: MarketplaceProduct = await tx.getRepository(MarketplaceProduct).find({
+          where: {
+            itemId: In(itemIds),
+            marketplaceStore,
+            domain
+          }
+        })
+
+        if (existedMarketplaceProducts?.length > 0) {
+          throw new ApiError('E05', `existing products found: ${existedMarketplaceProducts.map(emp => emp.itemId)}`)
+        }
+
+        let response = []
+
+        // save product
+        await Promise.all(
+          marketplaceProducts.map(async mp => {
+            let marketplaceProduct = mp
+            const marketplaceProductVariations = mp.marketplaceProductVariations
+
+            marketplaceProduct.isku = marketplaceProduct?.isku ? marketplaceProduct.isku : uuidv4()
+            marketplaceProduct.domain = domain
+            marketplaceProduct.marketplaceStore = marketplaceStore
+            marketplaceProduct.creator = user
+            marketplaceProduct.updater = user
+            delete marketplaceProduct.marketplaceProductVariations
+
+            let mpResult = await tx.getRepository(MarketplaceProduct).save(marketplaceProduct)
+
+            // save product details
+            let mpvs = await Promise.all(
+              marketplaceProductVariations.map(async mpv => {
+                let mpvResult = await tx.getRepository(MarketplaceProductVariation).save({
+                  ...mpv,
+                  name: mpv?.name ? mpv.name : mpResult.name,
+                  channelSku: mpv?.channelSku ? mpv.channelSku : mpv.variationSku,
+                  status: 'ACTIVE',
+                  marketplaceProduct: mpResult,
+                  domain: domain,
+                  creator: user,
+                  updater: user
+                })
+                delete mpvResult.creator
+                delete mpvResult.updater
+                delete mpvResult.product
+                delete mpvResult.domain
+                return mpvResult
+              })
+            )
+            delete mpResult.creator
+            delete mpResult.updater
+            delete mpResult.bizplace
+            delete mpResult.domain
+            response.push({ ...mpResult, marketplaceProductVariations: mpvs })
+          })
+        )
+
+        context.body = {
+          data: response
+        }
+      })
+    } catch (e) {
+      if (e instanceof ApiError) ApiErrorHandler(context, e)
+      else throwInternalServerError(context, e)
+    }
+  }
+)

package/server/routers/api/restful-apis/v1/marketplace/cancel-marketplace-order.ts

@@ -0,0 +1,100 @@
+import { EntityManager, getConnection } from 'typeorm'
+
+import { restfulApiRouter as router } from '@things-factory/api'
+import { User } from '@things-factory/auth-base'
+import { Bizplace, getCustomerBizplaces } from '@things-factory/biz-base'
+import { FulfillmentAPI, FulfillmentCenter } from '@things-factory/integration-fulfillment'
+import { MarketplaceStore } from '@things-factory/integration-marketplace'
+import { MarketplaceOrder, MarketplaceOrderItem } from '@things-factory/marketplace-base'
+import { Domain } from '@things-factory/shell'
+
+import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
+import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
+
+router.post(
+  '/v1/marketplace/cancel-marketplace-order',
+  businessMiddleware,
+  validationMiddleware,
+  loggingMiddleware,
+  async (context, next) => {
+    try {
+      const { orderNo, remark, cancelBy } = context.request.body.data
+      const { domain, user }: { domain: Domain; user: User } = context.state
+
+      await getConnection().transaction(async (tx: EntityManager) => {
+        const marketplaceStore: MarketplaceStore = await tx.getRepository(MarketplaceStore).findOne({
+          where: { name: context.request.body.data.storeId, domain: context.state.domain }
+        })
+        if (!marketplaceStore) throw new ApiError('E04', 'storeId')
+
+        let marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+          where: { domain, orderNo, marketplaceStore },
+          relations: ['fulfillmentCenter', 'marketplaceStore', 'marketplaceOrderItems']
+        })
+        if (!marketplaceOrder) throw new ApiError('E04', 'orderNo')
+
+        let marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems.map(orderItem => {
+          let marketplaceOrderItem: MarketplaceOrderItem = Object.assign({}, orderItem)
+          marketplaceOrderItem.reason = remark
+          marketplaceOrderItem.status = 'cancelled'
+          marketplaceOrderItem.updater = user
+          marketplaceOrderItem.cancelBy = cancelBy
+
+          return marketplaceOrderItem
+        })
+        await tx.getRepository(MarketplaceOrderItem).save(marketplaceOrderItems)
+
+        marketplaceOrder.status = 'cancelled'
+        marketplaceOrder.remark = remark
+        marketplaceOrder.updater = user
+        marketplaceOrder = await tx.getRepository(MarketplaceOrder).save(marketplaceOrder)
+
+        const cancelStatuses: string[] = ['cancelled', 'canceled']
+        if (cancelStatuses.includes(marketplaceOrder.status) && marketplaceOrder?.releaseOrderId) {
+          if (marketplaceOrder.isSplitted) {
+            const fulfillmentCenter: FulfillmentCenter = marketplaceOrder.fulfillmentCenter
+            const centerId: string = fulfillmentCenter.centerId
+            const warehouseDomain: Domain = await tx.getRepository(Domain).findOne({ where: { subdomain: centerId } })
+            const customerBizplaces: Bizplace[] = await getCustomerBizplaces(warehouseDomain)
+            const customerBizplaceId: string = customerBizplaces[0].id
+
+            const { items: releaseOrders }: any = await FulfillmentAPI.getOutboundOrders(fulfillmentCenter, {
+              customerBizplaceId,
+              refNo: marketplaceOrder.orderNo
+            })
+            if (releaseOrders?.length) {
+              for (var a = 0; a < releaseOrders.length; a++) {
+                const releaseOrderId: string = releaseOrders[a].id
+                await FulfillmentAPI.cancelReleaseOrder(fulfillmentCenter, { customerBizplaceId, releaseOrderId })
+              }
+            }
+          } else {
+            const releaseOrderId: string = marketplaceOrder.releaseOrderId
+            const fulfillmentCenter: FulfillmentCenter = marketplaceOrder.fulfillmentCenter
+            const centerId: string = fulfillmentCenter.centerId
+
+            const warehouseDomain: Domain = await tx.getRepository(Domain).findOne({ where: { subdomain: centerId } })
+            const customerBizplaces: Bizplace[] = await getCustomerBizplaces(warehouseDomain)
+            const customerBizplaceId: string = customerBizplaces[0].id
+            await FulfillmentAPI.cancelReleaseOrder(fulfillmentCenter, { customerBizplaceId, releaseOrderId })
+          }
+        }
+        const data = {
+          orderNo: marketplaceOrder.orderNo,
+          status: marketplaceOrder.status,
+          remark: marketplaceOrder.remark,
+          cancelBy: cancelBy || null,
+          createdAt: marketplaceOrder.createdAt,
+          updatedAt: marketplaceOrder.updatedAt
+        }
+
+        context.body = {
+          data
+        }
+      })
+    } catch (e) {
+      if (e instanceof ApiError) ApiErrorHandler(context, e)
+      else throwInternalServerError(context, e)
+    }
+  }
+)

package/server/routers/api/restful-apis/v1/{company → marketplace}/get-marketplace-order-shipping-list.ts

@@ -1,14 +1,14 @@
+import _ from 'lodash'
 import { getRepository } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
-import { MarketplaceOrderShipping, MarketplaceOrder } from '@things-factory/marketplace-base'
+import { MarketplaceOrder, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
 
+import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
 import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
-import _ from 'lodash'
-import { businessMiddleware, validationMiddleware, loggingMiddleware } from '../middlewares'
 
 router.get(
-  '/v1/company/get-marketplace-order-shipping-list',
+  '/v1/marketplace/get-marketplace-order-shipping-list',
   businessMiddleware,
   validationMiddleware,
   loggingMiddleware,

package/server/routers/api/restful-apis/v1/{company → marketplace}/get-marketplace-store-list.ts

@@ -3,11 +3,11 @@ import { getRepository } from 'typeorm'
 import { restfulApiRouter as router } from '@things-factory/api'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
 
+import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
 import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
-import { businessMiddleware, validationMiddleware, loggingMiddleware } from '../middlewares'
 
 router.get(
-  '/v1/company/get-marketplace-store-list',
+  '/v1/marketplace/get-marketplace-store-list',
   businessMiddleware,
   validationMiddleware,
   loggingMiddleware,

package/server/routers/api/restful-apis/v1/marketplace/index.ts

@@ -0,0 +1,8 @@
+import './add-marketplace-order'
+import './add-marketplace-products'
+import './cancel-marketplace-order'
+import './get-marketplace-order-shipping-list'
+import './get-marketplace-store-list'
+import './update-marketplace-order-delivered'
+import './update-marketplace-shipping-order'
+import './update-marketplace-product'

package/server/routers/api/restful-apis/v1/{company → marketplace}/update-marketplace-order-delivered.ts

@@ -1,14 +1,14 @@
-import { getConnection, EntityManager } from 'typeorm'
+import { EntityManager, getConnection } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
-import { MarketplaceOrder } from '@things-factory/marketplace-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
+import { MarketplaceOrder } from '@things-factory/marketplace-base'
 
+import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
 import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
-import { businessMiddleware, validationMiddleware, loggingMiddleware } from '../middlewares'
 
 router.post(
-  '/v1/company/update-marketplace-order-delivered',
+  '/v1/marketplace/update-marketplace-order-delivered',
   businessMiddleware,
   validationMiddleware,
   loggingMiddleware,

package/server/routers/api/restful-apis/v1/marketplace/update-marketplace-product.ts

@@ -0,0 +1,109 @@
+import { EntityManager, getConnection } from 'typeorm'
+
+import { restfulApiRouter as router } from '@things-factory/api'
+import { User } from '@things-factory/auth-base'
+import {
+  MarketplaceProduct as MarketplaceProductEntity,
+  MarketplaceProductVariation as MarketplaceProductVariationEntity
+} from '@things-factory/marketplace-base'
+import { Domain } from '@things-factory/shell'
+
+import { businessMiddleware, loggingMiddleware, storeMiddleware, validationMiddleware } from '../middlewares'
+import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
+
+router.post(
+  '/v1/marketplace/update-marketplace-product',
+  businessMiddleware,
+  validationMiddleware,
+  loggingMiddleware,
+  storeMiddleware,
+  async (context, next) => {
+    await getConnection().transaction(async (tx: EntityManager) => {
+      try {
+        const { domain, user }: { domain: Domain; user: User } = context.state
+        const { marketplaceStore } = context.state
+        const data = context.request.body.data
+        let marketplaceProduct: MarketplaceProductEntity = await tx.getRepository(MarketplaceProductEntity).findOne({
+          where: { marketplaceStore, id: data.id }
+        })
+
+        if (!marketplaceProduct) throw new ApiError('E04', `Marketplace Product ${data.itemId}`)
+
+        let productVariations: any[] = data.marketplaceProductVariations
+
+        delete data.marketplaceProductVariations
+
+        await tx.getRepository(MarketplaceProductEntity).save({ ...marketplaceProduct, ...data, updater: user })
+
+        if (productVariations?.length > 0) {
+          await Promise.all(
+            productVariations.map(async pv => {
+              let marketplaceProductVariation: MarketplaceProductVariationEntity = await tx
+                .getRepository(MarketplaceProductVariationEntity)
+                .findOne({
+                  where: { domain, marketplaceProduct, variationId: pv.variationId }
+                })
+
+              if (!marketplaceProductVariation) {
+                delete pv.sku
+
+                let mpvResult = await tx.getRepository(MarketplaceProductVariationEntity).save({
+                  ...pv,
+                  domain,
+                  marketplaceProduct,
+                  updater: user
+                })
+                delete mpvResult.creator
+                delete mpvResult.updater
+                delete mpvResult.product
+                delete mpvResult.domain
+                return mpvResult
+              } else {
+                let mpvResult = await tx.getRepository(MarketplaceProductVariationEntity).save({
+                  ...marketplaceProductVariation,
+                  ...pv,
+                  updater: user
+                })
+                delete mpvResult.creator
+                delete mpvResult.updater
+                delete mpvResult.product
+                delete mpvResult.domain
+                return mpvResult
+              }
+            })
+          )
+        }
+
+        let newMarketplaceProduct: MarketplaceProductEntity = await tx.getRepository(MarketplaceProductEntity).findOne({
+          where: { marketplaceStore, itemId: data.itemId },
+          relations: ['marketplaceProductVariations']
+        })
+
+        let newMarketplaceProductVariations: MarketplaceProductVariationEntity[] =
+          newMarketplaceProduct.marketplaceProductVariations
+
+        delete newMarketplaceProduct.creator
+        delete newMarketplaceProduct.updater
+        delete newMarketplaceProduct.domain
+        delete newMarketplaceProduct.marketplaceProductVariations
+
+        newMarketplaceProductVariations = newMarketplaceProductVariations.map(mpv => {
+          delete mpv.creator
+          delete mpv.updater
+          delete mpv.domain
+
+          return {
+            ...mpv
+          }
+        })
+
+        context.body = {
+          data: { ...marketplaceProduct, marketplaceProductVariations: newMarketplaceProductVariations }
+        }
+      } catch (e) {
+        if (e instanceof ApiError) ApiErrorHandler(context, e)
+        else throwInternalServerError(context, e)
+      }
+    })
+  }
+)

package/server/routers/api/restful-apis/v1/{company → marketplace}/update-marketplace-shipping-order.ts

@@ -1,12 +1,14 @@
-import { getConnection, EntityManager } from 'typeorm'
+import { EntityManager, getConnection } from 'typeorm'
+
 import { restfulApiRouter as router } from '@things-factory/api'
+import { User } from '@things-factory/auth-base'
 import { MarketplaceOrderShipping as MarketplaceOrderShippingEntity } from '@things-factory/marketplace-base'
+
+import { businessMiddleware, loggingMiddleware, storeMiddleware, validationMiddleware } from '../middlewares'
 import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
-import { businessMiddleware, validationMiddleware, loggingMiddleware, storeMiddleware } from '../middlewares'
-import { User } from '@things-factory/auth-base'
 
 router.post(
-  '/v1/company/update-marketplace-shipping-order',
+  '/v1/marketplace/update-marketplace-shipping-order',
   businessMiddleware,
   validationMiddleware,
   loggingMiddleware,