@things-factory/operato-hub 4.3.79-alpha.1 → 4.3.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.3.79-alpha.1",
+  "version": "4.3.79",
   "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.79-alpha.0",
-    "@things-factory/apptool-ui": "^4.3.79-alpha.0",
-    "@things-factory/attachment-base": "^4.3.79-alpha.0",
-    "@things-factory/auth-base": "^4.3.79-alpha.0",
-    "@things-factory/auth-ui": "^4.3.79-alpha.0",
-    "@things-factory/biz-base": "^4.3.79-alpha.0",
-    "@things-factory/biz-ui": "^4.3.79-alpha.0",
-    "@things-factory/board-service": "^4.3.79-alpha.0",
-    "@things-factory/board-ui": "^4.3.79-alpha.0",
-    "@things-factory/code-ui": "^4.3.79-alpha.0",
-    "@things-factory/component-ui": "^4.3.79-alpha.0",
-    "@things-factory/context-ui": "^4.3.79-alpha.0",
-    "@things-factory/document-template-ui": "^4.3.79-alpha.0",
-    "@things-factory/export-ui": "^4.3.79-alpha.0",
-    "@things-factory/export-ui-csv": "^4.3.79-alpha.0",
-    "@things-factory/export-ui-excel": "^4.3.79-alpha.0",
-    "@things-factory/grist-ui": "^4.3.79-alpha.0",
-    "@things-factory/help": "^4.3.79-alpha.0",
-    "@things-factory/i18n-base": "^4.3.79-alpha.0",
-    "@things-factory/import-ui": "^4.3.79-alpha.0",
-    "@things-factory/import-ui-excel": "^4.3.79-alpha.0",
-    "@things-factory/integration-accounting": "^4.3.79-alpha.0",
-    "@things-factory/integration-fulfillment": "^4.3.79-alpha.0",
-    "@things-factory/integration-lmd": "^4.3.79-alpha.0",
-    "@things-factory/integration-marketplace": "^4.3.79-alpha.0",
-    "@things-factory/integration-pos": "^4.3.79-alpha.0",
-    "@things-factory/integration-sellercraft": "^4.3.79-alpha.0",
-    "@things-factory/integration-sftp": "^4.3.79-alpha.0",
-    "@things-factory/lite-menu": "^4.3.79-alpha.0",
-    "@things-factory/more-ui": "^4.3.79-alpha.0",
-    "@things-factory/notification": "^4.3.79-alpha.0",
-    "@things-factory/pdf": "^4.3.79-alpha.0",
-    "@things-factory/product-ui": "^4.3.79-alpha.0",
-    "@things-factory/resource-ui": "^4.3.79-alpha.0",
-    "@things-factory/sales-base": "^4.3.79-alpha.1",
-    "@things-factory/scene-data-transform": "^4.3.79-alpha.0",
-    "@things-factory/scene-excel": "^4.3.79-alpha.0",
-    "@things-factory/scene-firebase": "^4.3.79-alpha.0",
-    "@things-factory/scene-form": "^4.3.79-alpha.0",
-    "@things-factory/scene-google-map": "^4.3.79-alpha.0",
-    "@things-factory/scene-graphql": "^4.3.79-alpha.0",
-    "@things-factory/scene-label": "^4.3.79-alpha.0",
-    "@things-factory/scene-marker": "^4.3.79-alpha.0",
-    "@things-factory/scene-mqtt": "^4.3.79-alpha.0",
-    "@things-factory/scene-restful": "^4.3.79-alpha.0",
-    "@things-factory/scene-visualizer": "^4.3.79-alpha.0",
-    "@things-factory/setting-ui": "^4.3.79-alpha.0",
-    "@things-factory/shell": "^4.3.79-alpha.0",
-    "@things-factory/system-ui": "^4.3.79-alpha.0",
-    "@things-factory/warehouse-base": "^4.3.79-alpha.1",
-    "@things-factory/worksheet-base": "^4.3.79-alpha.1",
+    "@things-factory/api": "^4.3.78",
+    "@things-factory/apptool-ui": "^4.3.78",
+    "@things-factory/attachment-base": "^4.3.78",
+    "@things-factory/auth-base": "^4.3.78",
+    "@things-factory/auth-ui": "^4.3.78",
+    "@things-factory/biz-base": "^4.3.78",
+    "@things-factory/biz-ui": "^4.3.78",
+    "@things-factory/board-service": "^4.3.78",
+    "@things-factory/board-ui": "^4.3.78",
+    "@things-factory/code-ui": "^4.3.78",
+    "@things-factory/component-ui": "^4.3.74",
+    "@things-factory/context-ui": "^4.3.78",
+    "@things-factory/document-template-ui": "^4.3.78",
+    "@things-factory/export-ui": "^4.3.78",
+    "@things-factory/export-ui-csv": "^4.3.78",
+    "@things-factory/export-ui-excel": "^4.3.78",
+    "@things-factory/grist-ui": "^4.3.78",
+    "@things-factory/help": "^4.3.78",
+    "@things-factory/i18n-base": "^4.3.78",
+    "@things-factory/import-ui": "^4.3.78",
+    "@things-factory/import-ui-excel": "^4.3.78",
+    "@things-factory/integration-accounting": "^4.3.78",
+    "@things-factory/integration-fulfillment": "^4.3.78",
+    "@things-factory/integration-lmd": "^4.3.78",
+    "@things-factory/integration-marketplace": "^4.3.78",
+    "@things-factory/integration-pos": "^4.3.78",
+    "@things-factory/integration-sellercraft": "^4.3.79",
+    "@things-factory/integration-sftp": "^4.3.78",
+    "@things-factory/lite-menu": "^4.3.78",
+    "@things-factory/more-ui": "^4.3.78",
+    "@things-factory/notification": "^4.3.78",
+    "@things-factory/pdf": "^4.3.74",
+    "@things-factory/product-ui": "^4.3.78",
+    "@things-factory/resource-ui": "^4.3.78",
+    "@things-factory/sales-base": "^4.3.79",
+    "@things-factory/scene-data-transform": "^4.3.76",
+    "@things-factory/scene-excel": "^4.3.76",
+    "@things-factory/scene-firebase": "^4.3.76",
+    "@things-factory/scene-form": "^4.3.76",
+    "@things-factory/scene-google-map": "^4.3.76",
+    "@things-factory/scene-graphql": "^4.3.76",
+    "@things-factory/scene-label": "^4.3.78",
+    "@things-factory/scene-marker": "^4.3.76",
+    "@things-factory/scene-mqtt": "^4.3.76",
+    "@things-factory/scene-restful": "^4.3.76",
+    "@things-factory/scene-visualizer": "^4.3.76",
+    "@things-factory/setting-ui": "^4.3.78",
+    "@things-factory/shell": "^4.3.78",
+    "@things-factory/system-ui": "^4.3.78",
+    "@things-factory/warehouse-base": "^4.3.79",
+    "@things-factory/worksheet-base": "^4.3.79",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
     "yamljs": "^0.3.0"
   },
   "devDependencies": {
-    "@things-factory/builder": "^4.3.79-alpha.0"
+    "@things-factory/builder": "^4.3.74"
   },
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "781aa433ce81cb1cd08d6a3c4abb2934f0a192c1"
+  "gitHead": "e1d319473973c800e4605cc6c47836b9a328c71b"
 }

package/server/middlewares/business-middleware.ts

@@ -1,8 +1,6 @@
-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')
 
@@ -13,7 +11,6 @@ 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') {
@@ -27,7 +24,6 @@ export async function businessMiddleware(context, next) {
     }
 
     context.state.business = company
-    context.state.application = application
   }
 
   await next()

package/server/middlewares/store-middleware.ts

@@ -1,5 +1,4 @@
 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/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, application } = context.state
+      const { client, domain } = context.state
       const { warehouseId: customerBizplaceId } = context.params
       const { t } = context
 
@@ -126,8 +126,7 @@ router.post(
                 phone1: bodyReq?.deliverTo?.phone1 || null,
                 phone2: bodyReq?.deliverTo?.phone2 || null,
                 email: bodyReq?.deliverTo?.email || null,
-                packageId: bodyReq?.packageId || null,
-                source: application?.type || null
+                packageId: bodyReq?.packageId || 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, application } = context.state
+    const { client, domain } = context.state
     const { warehouseId } = context.params
     const { t } = context
     const attachments = undefined
@@ -173,10 +173,7 @@ router.post(
               }
             }
           `,
-          variables: {
-            arrivalNotice: { ...bodyReq, orderProducts, warehouseId, source: application?.type },
-            attachments
-          },
+          variables: { arrivalNotice: { ...bodyReq, orderProducts, warehouseId }, 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, application } = context.state
+      const { client, domain, user } = context.state
       const { warehouseId: customerBizplaceId } = context.params
       const { t } = context
       const bodyReq = context.request.body
@@ -107,8 +107,7 @@ router.post(
           storeName: bodyReq?.storeName,
           storeId: bodyReq?.storeId,
           routeId: bodyReq?.routeId,
-          stopId: bodyReq?.stopId,
-          source: application?.type
+          stopId: bodyReq?.stopId
         }
 
         // check existing order
@@ -496,7 +495,6 @@ 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/bizplace.ts

@@ -0,0 +1,45 @@
+import gql from 'graphql-tag'
+import { restfulApiRouter as router } from '@things-factory/api'
+
+const debug = require('debug')('things-factory:operato-hub:restful-api:v1:bizplace')
+
+router.get('/v1/bizplace/:id', async (context, next) => {
+  const { client } = context.state
+  const { id } = context.params
+
+  debug('params', context.params)
+
+  context.body = {
+    result: (
+      await client.query({
+        query: gql`
+          query bizplace($id: String!) {
+            bizplace(id: $id) {
+              id
+              name
+              description
+              address
+              postalCode
+              latlng
+              status
+              creator {
+                name
+                email
+              }
+              updater {
+                name
+                email
+              }
+              createdAt
+              updatedAt
+            }
+          }
+        `,
+        variables: {
+          id
+        },
+        context
+      } as any)
+    ).data
+  }
+})

package/server/routers/api/restful-apis/v1/get-contact-point-list.ts

@@ -0,0 +1,110 @@
+import gql from 'graphql-tag'
+
+import { restfulApiRouter as router } from '@things-factory/api'
+
+import { businessMiddleware } from '../../../../middlewares/business-middleware'
+import { warehouseMiddleware } from '../../../../middlewares/warehouse-middleware'
+
+router.get(
+  '/v1/warehouse/:warehouseId/get-contact-point-list',
+  businessMiddleware,
+  warehouseMiddleware,
+  async (context, next) => {
+    const { client, warehouse: bizplace, domain } = context.state
+    const { warehouseId } = context.params
+    const { t } = context
+    const { companyName, name, email, paginationEntriesPerPage, paginationOffset } = context.query
+
+    if (!warehouseId) context.throw(404, t('error.warehouse id not found'))
+
+    let filters: any = []
+    let pagination: any = { page: 1, limit: 20 }
+
+    filters = await validateFilters(filters, companyName, name, email)
+    pagination = await validatePagination(context, pagination, paginationEntriesPerPage, paginationOffset)
+
+    context.body = {
+      result: (
+        await client.query({
+          query: gql`
+            query contactPoints($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+              contactPoints(filters: $filters, pagination: $pagination, sortings: $sortings) {
+                items {
+                  name
+                  companyName
+                  email
+                  fax
+                  phone
+                  address
+                  billingAddress
+                  accountNo
+                  address
+                  address2
+                  postalCode
+                  city
+                  type
+                  description
+                  type
+                  state
+                  updatedAt
+                  updater {
+                    name
+                    description
+                  }
+                }
+                total
+              }
+            }
+          `,
+          variables: {
+            filters,
+            pagination,
+            sortings: [{ name: 'name' }]
+          },
+          context: {
+            ...context,
+            state: {
+              ...context.state,
+              bizplace,
+              domain
+            }
+          }
+        } as any)
+      ).data
+    }
+  }
+)
+
+export async function validateFilters(filters, companyName, name, email) {
+  if (companyName && companyName !== '')
+    filters = [...filters, { name: 'companyName', operator: 'i_like', value: companyName }]
+
+  if (name && name !== '') filters = [...filters, { name: 'name', operator: 'i_like', value: name }]
+
+  if (email && email !== '') filters = [...filters, { name: 'email', operator: 'eq', value: email }]
+
+  return filters
+}
+
+export async function validatePagination(context, pagination, entries, offset) {
+  if (!entries) entries = ''
+  if (!offset) offset = ''
+
+  if (entries !== '' && offset !== '' && !isNaN(parseInt(entries)) && !isNaN(parseInt(offset))) {
+    entries = parseInt(entries)
+    offset = parseInt(offset)
+
+    if (offset < 1) context.throw(400, context.t('paginationOffset cannot be less than 1'))
+    else if (entries < 1) context.throw(400, context.t('paginationEntriesPerPage cannot be less than 1'))
+    else if (entries > 100) context.throw(400, context.t('paginationEntriesPerPage cannot be more than 100'))
+    else pagination = { ...pagination, page: offset, limit: entries }
+  } else if (entries !== '' && offset === '' && !isNaN(parseInt(entries))) {
+    entries = parseInt(entries)
+
+    if (entries < 1) context.throw(400, context.t('paginationEntriesPerPage cannot be less than 1'))
+    else if (entries > 100) context.throw(400, context.t('paginationEntriesPerPage cannot be more than 100'))
+    else pagination = { ...pagination, limit: entries }
+  }
+
+  return pagination
+}

package/server/routers/api/restful-apis/v1/get-delivery-order-detail.ts

@@ -0,0 +1,46 @@
+import { restfulApiRouter as router } from '@things-factory/api'
+import gql from 'graphql-tag'
+import { businessMiddleware } from '../../../../middlewares/business-middleware'
+import { warehouseMiddleware } from '../../../../middlewares/warehouse-middleware'
+
+const debug = require('debug')('things-factory:operato-hub:restful-api:v1:get-delivery-order-detail')
+
+router.get('/v1/get-delivery-order-detail/', businessMiddleware, warehouseMiddleware, async (context, next) => {
+  const { client, warehouse: bizplace, domain } = context.state
+  const { warehouseId } = context.params
+  const { t } = context
+  const { doNo } = context.query
+
+  debug('query-params', context.query)
+  debug('params', context.params)
+
+  if (!warehouseId) context.throw(404, t('error.warehouse id not found'))
+  if (!doNo) context.throw(400, t('error.required param x not found', { x: 'doNo' }))
+
+  context.body = {
+    result: (
+      await client.query({
+        query: gql`
+          query deliveryOrderByWorksheet($doNo: String!) {
+            deliveryOrderByWorksheet(name: $doNo) {
+              deliveryOrderInfo {
+                doStatus
+                ownCollection
+                truckNo
+              }
+              contactPointInfo {
+                contactName
+                address
+                phone
+                fax
+                email
+              }
+            }
+          }
+        `,
+        variables: { doNo },
+        context
+      } as any)
+    ).data
+  }
+})

package/server/routers/api/restful-apis/v1/get-delivery-order-list.ts

@@ -0,0 +1,121 @@
+import gql from 'graphql-tag'
+
+import { restfulApiRouter as router } from '@things-factory/api'
+
+import { businessMiddleware } from '../../../../middlewares/business-middleware'
+import { warehouseMiddleware } from '../../../../middlewares/warehouse-middleware'
+
+const debug = require('debug')('things-factory:operato-hub:restful-api:v1:get-delivery-order-list')
+
+router.get(
+  '/v1/warehouse/:warehouseId/get-delivery-order-list',
+  businessMiddleware,
+  warehouseMiddleware,
+  async (context, next) => {
+    const { client } = context.state
+    const { warehouseId } = context.params
+    const { t } = context
+    const { fromDate, toDate, paginationEntriesPerPage, paginationOffset } = context.query
+
+    if (!warehouseId) context.throw(404, t('error.warehouse id not found'))
+
+    debug('params', context.params)
+
+    let filters: any = [{ name: 'bizplace', operator: 'in', value: [warehouseId], relation: true }]
+    let pagination: any = { page: 1, limit: 20 }
+
+    filters = await validateFilters(context, filters, fromDate, toDate)
+    pagination = await validatePagination(context, pagination, paginationEntriesPerPage, paginationOffset)
+
+    context.body = {
+      result: (
+        await client.query({
+          query: gql`
+            query deliveryOrders($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+              deliveryOrders(filters: $filters, pagination: $pagination, sortings: $sortings) {
+                items {
+                  name
+                  bizplace {
+                    name
+                  }
+                  attachments {
+                    name
+                    refBy
+                    path
+                  }
+                  to
+                  deliveryDate
+                  status
+                  releaseGood {
+                    name
+                    description
+                    refNo
+                  }
+                  ownCollection
+                  createdAt
+                  updatedAt
+                  updater {
+                    name
+                  }
+                }
+                total
+              }
+            }
+          `,
+          variables: {
+            filters,
+            pagination,
+            sortings: [{ name: 'createdAt', desc: true }]
+          },
+          context
+        } as any)
+      ).data
+    }
+  }
+)
+
+export async function validateFilters(context, filters, fromDate, toDate) {
+  if (fromDate && fromDate !== '') {
+    fromDate = new Date(`${fromDate.split(' ').join('')} 00:00:00`)
+    if (fromDate instanceof Date && !isNaN(fromDate.getTime())) fromDate = fromDate.toLocaleString()
+    else context.throw(400, context.t('fromDate is invalid'))
+  } else fromDate = ''
+
+  if (toDate && toDate !== '') {
+    toDate = new Date(`${toDate.split(' ').join('')} 23:59:59`)
+    if (toDate instanceof Date && !isNaN(toDate.getTime())) toDate = toDate.toLocaleString()
+    else context.throw(400, context.t('toDate is invalid'))
+  } else toDate = ''
+
+  if (fromDate !== '' && toDate !== '')
+    filters = [...filters, { name: 'createdAt', operator: 'between', value: [fromDate, toDate] }]
+  else if (fromDate !== '' && toDate === '')
+    filters = [...filters, { name: 'createdAt', operator: 'gte', value: fromDate }]
+  else if (fromDate === '' && toDate !== '')
+    filters = [...filters, { name: 'createdAt', operator: 'lte', value: toDate }]
+
+  return filters
+}
+
+export async function validatePagination(context, pagination, entries, offset) {
+  if (!entries) entries = ''
+  if (!offset) offset = ''
+
+  if (entries !== '' && offset !== '' && !isNaN(parseInt(entries)) && !isNaN(parseInt(offset))) {
+    entries = parseInt(entries)
+    offset = parseInt(offset)
+
+    if (offset < 1) context.throw(400, context.t('paginationOffset cannot be less than 1'))
+    else if (entries < 1) context.throw(400, context.t('paginationEntriesPerPage cannot be less than 1'))
+    else if (entries > 100) context.throw(400, context.t('paginationEntriesPerPage cannot be more than 100'))
+    else pagination = { ...pagination, page: offset, limit: entries }
+  } else if (entries !== '' && offset === '' && !isNaN(parseInt(entries))) {
+    entries = parseInt(entries)
+
+    if (entries < 1) context.throw(400, context.t('paginationEntriesPerPage cannot be less than 1'))
+    else if (entries > 100) context.throw(400, context.t('paginationEntriesPerPage cannot be more than 100'))
+    else pagination = { ...pagination, limit: entries }
+  }
+
+  return pagination
+}