@things-factory/operato-hub 4.3.89 → 4.3.94-alpha.1

package/openapi/v1.yaml

@@ -12,21 +12,27 @@ info:
     name: MIT
     url: http://mit-license.org/
 tags:
-  - name: 'product'
+  - name: 'Authentication'
+  - name: 'Bizplace'
+  - name: 'Partner'
+  - name: 'Contact Point'
+  - name: 'Product'
     description: 'API for read, create and update products'
-  - name: 'inbound'
+  - name: 'Marketplace'
+  - name: 'Inbound'
     description: 'API to create and get inbound order list and detail'
-  - name: 'outbound'
+  - name: 'Outbound'
     description: 'API to create and get outbound order list and detail'
-  - name: 'inventory'
+  - name: 'Inventory'
     description: 'API to get inventory information from WMS'
 schemes:
   - 'https'
   - 'http'
 servers:
-  - url: '/api/v1'
+  - url: '/oauth'
 
-components:
+components:     # test 
+# Authentorize Button
   securitySchemes:
     basicAuth:
       type: http
@@ -48,6 +54,31 @@ components:
             LMD: last-mile delivery system
             FREIGHT: freight system
             FLEET: fleet system
+# Schemas at the bottom
+  schemas:
+    # Response Code
+    API Response Code:     
+      type: object
+      properties:
+        E00:
+          type: No Errors
+          HTTP Response Status Code: 200 OK
+        E01:
+          type: 'Invalid parameter value: {{parameter}}'
+          HTTP Response Status Code: 400 Bad Request 
+        E02:
+          type: 'Unexpected parameter: {{parameter}}'
+          HTTP Response Status Code: 400 Bad Request
+        E03:
+          type: 'Missing parameter: {{parameter}}'
+          HTTP Response Status Code: 400 Bad Request
+        E04:
+          type: 'Resource not found: {{parameter}}'
+          HTTP Response Status Code: 404 Not Found
+        E05:
+          type: 'Duplicate entry: {{parameter}}'
+          HTTP Response Status Code: 409 Conflict
+
 
 security:
   - basicAuth: []
@@ -67,7 +98,7 @@ responses:
 securityDefinitions:
   wms_auth:
     type: 'oauth2'
-    authorizationUrl: 'http://petstore.swagger.io/oauth/dialog'
+    authorizationUrl: 'http://petstore.swagger.io/oauth/dialog' # <-- i don't know why it's still here
     flow: 'implicit'
     scopes:
       write:product: 'modify product in specific company id'
@@ -86,3 +117,4 @@ securityDefinitions:
 externalDocs:
   description: 'Find out about our release notes'
   url: 'https://developer.myoperato.com/release_notes'
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.3.89",
+  "version": "4.3.94-alpha.1",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -56,66 +56,66 @@
     "@operato/scene-tab": "^0.1.8",
     "@operato/scene-table": "^0.1.8",
     "@operato/scene-wheel-sorter": "^0.1.8",
-    "@things-factory/api": "^4.3.86",
-    "@things-factory/apptool-ui": "^4.3.86",
-    "@things-factory/attachment-base": "^4.3.86",
-    "@things-factory/auth-base": "^4.3.86",
-    "@things-factory/auth-ui": "^4.3.86",
-    "@things-factory/biz-base": "^4.3.86",
-    "@things-factory/biz-ui": "^4.3.86",
-    "@things-factory/board-service": "^4.3.86",
-    "@things-factory/board-ui": "^4.3.86",
-    "@things-factory/code-ui": "^4.3.86",
-    "@things-factory/component-ui": "^4.3.86",
-    "@things-factory/context-ui": "^4.3.86",
-    "@things-factory/document-template-ui": "^4.3.86",
-    "@things-factory/export-ui": "^4.3.86",
-    "@things-factory/export-ui-csv": "^4.3.86",
-    "@things-factory/export-ui-excel": "^4.3.86",
-    "@things-factory/grist-ui": "^4.3.86",
-    "@things-factory/help": "^4.3.86",
-    "@things-factory/i18n-base": "^4.3.86",
-    "@things-factory/import-ui": "^4.3.86",
-    "@things-factory/import-ui-excel": "^4.3.86",
-    "@things-factory/integration-accounting": "^4.3.86",
-    "@things-factory/integration-fulfillment": "^4.3.86",
-    "@things-factory/integration-lmd": "^4.3.86",
-    "@things-factory/integration-marketplace": "^4.3.89",
-    "@things-factory/integration-pos": "^4.3.86",
-    "@things-factory/integration-sellercraft": "^4.3.89",
-    "@things-factory/integration-sftp": "^4.3.86",
-    "@things-factory/lite-menu": "^4.3.86",
-    "@things-factory/more-ui": "^4.3.86",
-    "@things-factory/notification": "^4.3.86",
-    "@things-factory/pdf": "^4.3.86",
-    "@things-factory/product-ui": "^4.3.86",
-    "@things-factory/resource-ui": "^4.3.86",
-    "@things-factory/sales-base": "^4.3.89",
-    "@things-factory/scene-data-transform": "^4.3.86",
-    "@things-factory/scene-excel": "^4.3.86",
-    "@things-factory/scene-firebase": "^4.3.86",
-    "@things-factory/scene-form": "^4.3.86",
-    "@things-factory/scene-google-map": "^4.3.86",
-    "@things-factory/scene-graphql": "^4.3.86",
-    "@things-factory/scene-label": "^4.3.86",
-    "@things-factory/scene-marker": "^4.3.86",
-    "@things-factory/scene-mqtt": "^4.3.86",
-    "@things-factory/scene-restful": "^4.3.86",
-    "@things-factory/scene-visualizer": "^4.3.86",
-    "@things-factory/setting-ui": "^4.3.86",
-    "@things-factory/shell": "^4.3.86",
-    "@things-factory/system-ui": "^4.3.86",
-    "@things-factory/warehouse-base": "^4.3.89",
-    "@things-factory/worksheet-base": "^4.3.89",
+    "@things-factory/api": "^4.3.94-alpha.1",
+    "@things-factory/apptool-ui": "^4.3.94-alpha.1",
+    "@things-factory/attachment-base": "^4.3.94-alpha.1",
+    "@things-factory/auth-base": "^4.3.94-alpha.1",
+    "@things-factory/auth-ui": "^4.3.94-alpha.1",
+    "@things-factory/biz-base": "^4.3.94-alpha.1",
+    "@things-factory/biz-ui": "^4.3.94-alpha.1",
+    "@things-factory/board-service": "^4.3.94-alpha.1",
+    "@things-factory/board-ui": "^4.3.94-alpha.1",
+    "@things-factory/code-ui": "^4.3.94-alpha.1",
+    "@things-factory/component-ui": "^4.3.94-alpha.1",
+    "@things-factory/context-ui": "^4.3.94-alpha.1",
+    "@things-factory/document-template-ui": "^4.3.94-alpha.1",
+    "@things-factory/export-ui": "^4.3.94-alpha.1",
+    "@things-factory/export-ui-csv": "^4.3.94-alpha.1",
+    "@things-factory/export-ui-excel": "^4.3.94-alpha.1",
+    "@things-factory/grist-ui": "^4.3.94-alpha.1",
+    "@things-factory/help": "^4.3.94-alpha.1",
+    "@things-factory/i18n-base": "^4.3.94-alpha.1",
+    "@things-factory/import-ui": "^4.3.94-alpha.1",
+    "@things-factory/import-ui-excel": "^4.3.94-alpha.1",
+    "@things-factory/integration-accounting": "^4.3.94-alpha.1",
+    "@things-factory/integration-fulfillment": "^4.3.94-alpha.1",
+    "@things-factory/integration-lmd": "^4.3.94-alpha.1",
+    "@things-factory/integration-marketplace": "^4.3.94-alpha.1",
+    "@things-factory/integration-pos": "^4.3.94-alpha.1",
+    "@things-factory/integration-sellercraft": "^4.3.94-alpha.1",
+    "@things-factory/integration-sftp": "^4.3.94-alpha.1",
+    "@things-factory/lite-menu": "^4.3.94-alpha.1",
+    "@things-factory/more-ui": "^4.3.94-alpha.1",
+    "@things-factory/notification": "^4.3.94-alpha.1",
+    "@things-factory/pdf": "^4.3.94-alpha.1",
+    "@things-factory/product-ui": "^4.3.94-alpha.1",
+    "@things-factory/resource-ui": "^4.3.94-alpha.1",
+    "@things-factory/sales-base": "^4.3.94-alpha.1",
+    "@things-factory/scene-data-transform": "^4.3.94-alpha.1",
+    "@things-factory/scene-excel": "^4.3.94-alpha.1",
+    "@things-factory/scene-firebase": "^4.3.94-alpha.1",
+    "@things-factory/scene-form": "^4.3.94-alpha.1",
+    "@things-factory/scene-google-map": "^4.3.94-alpha.1",
+    "@things-factory/scene-graphql": "^4.3.94-alpha.1",
+    "@things-factory/scene-label": "^4.3.94-alpha.1",
+    "@things-factory/scene-marker": "^4.3.94-alpha.1",
+    "@things-factory/scene-mqtt": "^4.3.94-alpha.1",
+    "@things-factory/scene-restful": "^4.3.94-alpha.1",
+    "@things-factory/scene-visualizer": "^4.3.94-alpha.1",
+    "@things-factory/setting-ui": "^4.3.94-alpha.1",
+    "@things-factory/shell": "^4.3.94-alpha.1",
+    "@things-factory/system-ui": "^4.3.94-alpha.1",
+    "@things-factory/warehouse-base": "^4.3.94-alpha.1",
+    "@things-factory/worksheet-base": "^4.3.94-alpha.1",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
     "yamljs": "^0.3.0"
   },
   "devDependencies": {
-    "@things-factory/builder": "^4.3.86"
+    "@things-factory/builder": "^4.3.94-alpha.1"
   },
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "7bcc26bb32589c622ab05813a6b5012729aa3b9e"
+  "gitHead": "5c698043389882069b7b0ace294c29618f714463"
 }

package/server/graphql/resolvers/synchronization/sync-products-to-sellercraft.ts

@@ -1,11 +1,10 @@
-import { EntityManager, getRepository } from 'typeorm'
+import { EntityManager } from 'typeorm'
 
 import { Bizplace } from '@things-factory/biz-base'
 import { logger } from '@things-factory/env'
 import { FulfillmentAPI, FulfillmentCenter } from '@things-factory/integration-fulfillment'
 import { Sellercraft, SellercraftAPI } from '@things-factory/integration-sellercraft'
-import { Product, ProductDetail } from '@things-factory/product-base'
-import { WarehouseBizplaceOnhandInventory } from '@things-factory/worksheet-base'
+import { ProductDetail } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 
 export const syncProductsToSellercraftResolver = {
@@ -24,16 +23,19 @@ export const syncProductsToSellercraftResolver = {
       let hasMorePage: boolean = true
       const limit: number = 50
 
-      const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({ where: { id: sellercraftId }, relations: ['domain'] })
+      const sellercraft: Sellercraft = await tx
+        .getRepository(Sellercraft)
+        .findOne({ where: { id: sellercraftId }, relations: ['domain'] })
       const customerDomain: Domain = sellercraft.domain
       const fulfilmentCenter: FulfillmentCenter = await FulfillmentAPI.getFulfillmentCenter(fulfillmentCenterId)
       const customerBizplace: Bizplace = await tx.getRepository(Bizplace).findOne({ where: { domain: customerDomain } })
 
-      await tx.query(`
+      await tx.query(
+        `
         create temp table temp_warehouse_product_inventory ON COMMIT DROP as (
           select p.id, p.sku as product_sku, p.name as product_name, p.description as product_description, 
           pd.gtin, pd.uom, pd.packing_size, coalesce(pd.nett_weight, 0) as nett_weight, pd.width, pd."depth", pd.height,
-          coalesce(src.qty, 0) as available_qty, coalesce(src.qty - src."remainQty", 0) as reserved_qty, coalesce(src."remainQty",0) as remain_qty
+          coalesce(src.qty, 0) as available_qty, coalesce(src.qty - src."remain_qty", 0) as reserved_qty, coalesce(src."remain_qty",0) as remain_qty
           from bizplaces b
           inner join companies c on c.id = b.company_id 
           inner join domains d on d.id = c.domain_id
@@ -41,17 +43,19 @@ export const syncProductsToSellercraftResolver = {
           inner join product_details pd on pd.product_id = p.id
           left join (
             select wboi.* from warehouse_bizplace_onhand_inventories wboi 
-            inner join domains d on d.id = wboi."domainId"
+            inner join domains d on d.id = wboi."domain_id"
             inner join fulfillment_centers fc on d.subdomain = fc.center_id 
             where fc.id= $1 
-              and wboi."bizplaceId" = $2 and "groupType" = 'SINGLE'
-          ) src on src."productId" = pd."product_id" 
-            and src."packingType" = pd."packing_type" 
-            and src."packingSize" = pd."packing_size" 
+              and wboi."bizplaceId" = $2 and "group_type" = 'SINGLE'
+          ) src on src."product_id" = pd."product_id" 
+            and src."packing_type" = pd."packing_type" 
+            and src."packing_size" = pd."packing_size" 
             and src."uom" = pd."uom" 
           where b.id = $2
         )
-      `, [fulfilmentCenter.id, customerBizplace.id])
+      `,
+        [fulfilmentCenter.id, customerBizplace.id]
+      )
 
       let total = await tx.query(`
         select count(*) from temp_warehouse_product_inventory            
@@ -66,9 +70,12 @@ export const syncProductsToSellercraftResolver = {
           //   paginationOffset: page
           // })
 
-          const items = await tx.query(`
+          const items = await tx.query(
+            `
             select * from temp_warehouse_product_inventory limit $1 offset $2
-          `, [limit, page * limit])
+          `,
+            [limit, page * limit]
+          )
 
           let sellercraftInv: any[] = []
 
@@ -101,9 +108,11 @@ export const syncProductsToSellercraftResolver = {
           await SellercraftAPI.updateProduct(sellercraft, { context, accountId: sellercraft.accountId, sellercraftInv })
 
           page++
-          hasMorePage = (total[0]?.count || 0) > (page * limit)
+          hasMorePage = (total[0]?.count || 0) > page * limit
         } catch (e) {
-          logger.error(`[syncProductsToSellercraftResolver] sellercraftID:${sellercraftId} fulfillmentCenterId:${fulfillmentCenterId} page:${page} - ${e}`)
+          logger.error(
+            `[syncProductsToSellercraftResolver] sellercraftID:${sellercraftId} fulfillmentCenterId:${fulfillmentCenterId} page:${page} - ${e}`
+          )
         }
       }
     } catch (e) {

package/server/middlewares/business-middleware.ts

@@ -1,6 +1,8 @@
+import { getRepository } from 'typeorm'
+
+import { Application } from '@things-factory/auth-base'
 import { Bizplace, Company } from '@things-factory/biz-base'
 import { Domain, getDomainFromURL } from '@things-factory/shell'
-import { getRepository } from 'typeorm'
 
 const debug = require('debug')('things-factory:operato-hub:business-middleware')
 
@@ -11,6 +13,7 @@ export async function businessMiddleware(context, next) {
 
   if (user) {
     const domain: Domain = await getDomainFromURL(context)
+    const application: Application = await getRepository(Application).findOne({ where: { id: user.reference } })
 
     let company: Company
     if (domain.extType === 'company') {
@@ -24,6 +27,7 @@ export async function businessMiddleware(context, next) {
     }
 
     context.state.business = company
+    context.state.application = application
   }
 
   await next()

package/server/middlewares/store-middleware.ts

@@ -1,4 +1,5 @@
 import { getRepository } from 'typeorm'
+
 import { MarketplaceStore as MarketplaceStoreEntity } from '@things-factory/integration-marketplace'
 
 const debug = require('debug')('things-factory:operato-hub:store-middleware')

package/server/routers/api/index.ts

@@ -1,3 +1,2 @@
 import './restful-apis/v1'
-import './restful-apis/v2'
 import './restful-apis/unstable'

package/server/routers/api/restful-apis/unstable/add-draft-release-order.ts

@@ -16,7 +16,7 @@ router.post(
   warehouseMiddleware,
   async (context, next) => {
     return await getConnection().transaction(async (tx: EntityManager) => {
-      const { client, domain } = context.state
+      const { client, domain, application } = context.state
       const { warehouseId: customerBizplaceId } = context.params
       const { t } = context
 
@@ -126,7 +126,8 @@ router.post(
                 phone1: bodyReq?.deliverTo?.phone1 || null,
                 phone2: bodyReq?.deliverTo?.phone2 || null,
                 email: bodyReq?.deliverTo?.email || null,
-                packageId: bodyReq?.packageId || null
+                packageId: bodyReq?.packageId || null,
+                source: application?.type || null
               },
               orderProducts: orderInventories,
               files: []

package/server/routers/api/restful-apis/unstable/add-inbound-order.ts

@@ -15,7 +15,7 @@ router.post(
   businessMiddleware,
   warehouseMiddleware,
   async (context, next) => {
-    const { client, domain } = context.state
+    const { client, domain, application } = context.state
     const { warehouseId } = context.params
     const { t } = context
     const attachments = undefined
@@ -173,7 +173,10 @@ router.post(
               }
             }
           `,
-          variables: { arrivalNotice: { ...bodyReq, orderProducts, warehouseId }, attachments },
+          variables: {
+            arrivalNotice: { ...bodyReq, orderProducts, warehouseId, source: application?.type },
+            attachments
+          },
           context: {
             ...context,
             hasUpload: true,

package/server/routers/api/restful-apis/unstable/add-release-order.ts

@@ -43,7 +43,7 @@ router.post(
   warehouseMiddleware,
   async (context, next) => {
     return await getConnection().transaction(async (tx: EntityManager) => {
-      const { client, domain, user } = context.state
+      const { client, domain, user, application } = context.state
       const { warehouseId: customerBizplaceId } = context.params
       const { t } = context
       const bodyReq = context.request.body
@@ -107,7 +107,8 @@ router.post(
           storeName: bodyReq?.storeName,
           storeId: bodyReq?.storeId,
           routeId: bodyReq?.routeId,
-          stopId: bodyReq?.stopId
+          stopId: bodyReq?.stopId,
+          source: application?.type
         }
 
         // check existing order
@@ -123,15 +124,15 @@ router.post(
             let itemList = await tx.query(
               `
             select wboi.* from warehouse_bizplace_onhand_inventories wboi 
-            where wboi."domainId"= $1 and 
-            wboi."bizplaceId" = $2 and 
-            wboi."groupType" = 'SINGLE' and 
-            wboi."productId" = $3 and
-            wboi."packingType" = $4 and
-            wboi."packingSize" = $5 and
+            where wboi."domain_id"= $1 and 
+            wboi."bizplace_id" = $2 and 
+            wboi."group_type" = 'SINGLE' and 
+            wboi."product_id" = $3 and
+            wboi."packing_type" = $4 and
+            wboi."packing_size" = $5 and
             wboi."uom" = $6 and
-            wboi."remainQty" >= $7 and
-            wboi."remainUomValue" >= $8
+            wboi."remain_qty" >= $7 and
+            wboi."remain_uom_value" >= $8
           `,
               [
                 domain.id,
@@ -495,6 +496,7 @@ async function createReleaseGood(
       stopId: releaseGood?.stopId,
       packageId: releaseGood?.packageId || null,
       noOfItems: orderProducts.length,
+      source: releaseGood?.source,
       creator: user,
       updater: user,
       acceptedBy: user,

package/server/routers/api/restful-apis/v1/company/add-contact-points.ts

@@ -0,0 +1,111 @@
+import { getConnection, EntityManager, In, Brackets } from 'typeorm'
+
+import { restfulApiRouter as router } from '@things-factory/api'
+import { ContactPoint } from '@things-factory/biz-base'
+import { Bizplace } from '@things-factory/biz-base'
+
+import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
+import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
+
+router.post(
+  '/v1/company/add-contact-points',
+  businessMiddleware,
+  validationMiddleware,
+  loggingMiddleware,
+  async (context, next) => {
+    try {
+      if (!Array.isArray(context.request.body.data)) throw new ApiError('E01', 'data field is not an array')
+      if (!context.request.body.hasOwnProperty('bizplaceId')) throw new ApiError('E03', 'bizplaceId')
+      if (!context.request.body.bizplaceId) throw new ApiError('E01', 'bizplaceId')
+      await getConnection().transaction(async (tx: EntityManager) => {
+        // create and format values to be inserted
+        const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+          where: { id: context.request.body.bizplaceId }
+        })
+
+        // check if phone or email already belongs in bizplace
+        const phones = []
+        const emails = []
+        let values = []
+        for (const datapoint of context.request.body.data) {
+          phones.push(datapoint.phone)
+          emails.push(datapoint.email)
+          const value = {
+            name: datapoint.name,
+            description: datapoint.description,
+            companyName: datapoint.companyName,
+            email: datapoint.email,
+            fax: datapoint.fax,
+            phone: datapoint.phone,
+            billingAddress: datapoint.billingAddress,
+            accountNo: datapoint.accountNo,
+            address: datapoint.address,
+            address2: datapoint.address2,
+            city: datapoint.city,
+            state: datapoint.state,
+            postCode: datapoint.postCode,
+            type: datapoint.type,
+            domain: context.state.domain,
+            bizplace: bizplace,
+            creator: context.state.user,
+            updater: context.state.user
+          }
+          values.push(value)
+        }
+
+        const checkDuplicateEmailPhone: ContactPoint = await tx
+          .getRepository(ContactPoint)
+          .createQueryBuilder('cp')
+          .where('cp.bizplace_id = :bizplaceId', { bizplaceId: context.request.body.bizplaceId })
+          .andWhere(
+            new Brackets(qb => {
+              qb.where('cp.email in(:email)', { email: emails.toString() })
+              qb.orWhere('cp.phone in(:phone)', { phone: phones.toString() })
+            })
+          )
+          .getOne()
+        if (checkDuplicateEmailPhone) throw new ApiError('E05', 'email or phone number')
+
+        // insert values to DB
+        const result = await tx
+          .getRepository(ContactPoint)
+          .createQueryBuilder()
+          .insert()
+          .into(ContactPoint)
+          .values(values)
+          .returning('*')
+          .execute()
+
+        // create and format response
+        let data = []
+        for (const contactPoint of result.generatedMaps) {
+          const datapoint = {
+            name: contactPoint.name,
+            description: contactPoint.description,
+            companyName: contactPoint.companyName,
+            email: contactPoint.email,
+            fax: contactPoint.fax,
+            phone: contactPoint.phone,
+            billingAddress: contactPoint.billingAddress,
+            accountNo: contactPoint.accountNo,
+            address: contactPoint.address,
+            address2: contactPoint.address2,
+            city: contactPoint.city,
+            state: contactPoint.state,
+            postCode: contactPoint.postCode,
+            type: contactPoint.type,
+            createdAt: contactPoint.createdAt
+          }
+          data.push(datapoint)
+        }
+
+        context.body = {
+          data
+        }
+      })
+    } catch (e) {
+      if (e instanceof ApiError) ApiErrorHandler(context, e)
+      else throwInternalServerError(context, e)
+    }
+  }
+)