@things-factory/operato-hub 4.3.670 → 4.3.671

package/config.development.js

@@ -6,6 +6,25 @@ module.exports = {
   subdomainOffset: 2,
   port: 4445,
   inspect: '9260',
+  storage: {
+    type: 's3',
+    accessKeyId: 'AKIAUQEOPWEJHCE4MTH4',
+    secretAccessKey: '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',
+    bucketName: 'opa-one',
+    region: 'ap-southeast-1'
+  },
+  ormconfig: {
+    name: 'default',
+    type: 'postgres',
+    database: 'arif',
+    username: 'postgres',
+    password: 'hatio',
+    host: '192.168.0.144',
+    port: 15432,
+    synchronize: false,
+    logging: true
+  },
+
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
@@ -31,17 +50,6 @@ module.exports = {
   //   logging: true
   // },
   //postgres
-  ormconfig: {
-    name: 'default',
-    type: 'postgres',
-    database: 'arif',
-    username: 'postgres',
-    password: 'hatio',
-    host: '192.168.0.153',
-    port: 15432,
-    synchronize: false,
-    logging: true
-  },
 
   // //ERIC
   // ormconfig: {
@@ -219,5 +227,5 @@ module.exports = {
     email: 'support@hatio.asia'
   },
   reportApiUrl:
-  'http://k8s-default-operator-2fd6178d98-66c66a0f76c09575.elb.ap-southeast-1.amazonaws.com/rest/report/show_html'
+    'http://k8s-default-operator-2fd6178d98-66c66a0f76c09575.elb.ap-southeast-1.amazonaws.com/rest/report/show_html'
 }

package/openapi/v1/inbound.yaml

@@ -45,6 +45,11 @@ definitions:
           containerSize:
             type: 'string'
             example: '5 tonnes'
+          attachments:
+            type: 'array'
+            items:
+              type: 'string'
+              example: '3975ed0f-5307-4880-bb2c-077f5a64285f'
           orderProducts:
             type: 'array'
             items:
@@ -702,12 +707,13 @@ definitions:
 
 paths:
   # add-inbound-order
+
   api/v1/warehouse/add-inbound-order:
     post:
       tags:
         - 'Inbound'
       summary: 'Add inbound order(s).'
-      description: 'Add Inbound Order.'
+      description: 'Add Inbound Order. Attachments id are return by upload-attachments api'
       operationId: 'addInboundOrder'
       produces:
         - 'application/json'
@@ -765,6 +771,11 @@ paths:
                   supplierId:
                     type: 'string'
                     example: "69a462c5-9a58-4a61-915d-7ef4c31c8937'(MANDATORY)"
+                  attachments:
+                    type: 'array'
+                    items:
+                      type: 'string'
+                      example: ['3975ed0f-5307-4880-bb2c-077f5a64285f', '3975ed0f-5307-4880-bb2c-077f5a642417']
                   orderProducts:
                     type: 'array'
                     items:

package/openapi/v1/outbound.yaml

@@ -141,6 +141,11 @@ definitions:
               name:
                 type: 'string'
                 example: 'SeeBuu Warehouse'
+          attachments:
+            type: 'array'
+            items:
+              type: 'string'
+              example: '3975ed0f-5307-4880-bb2c-077f5a64285f'
           orderProducts:
             type: 'array'
             items:
@@ -2929,7 +2934,7 @@ paths:
       tags:
         - 'Outbound'
       summary: 'Add release order(s).'
-      description: 'Add Release order'
+      description: 'Add Release order. Attachments id are return by upload-attachments api'
       operationId: 'addReleaseOrder'
       produces:
         - 'application/json'
@@ -3013,6 +3018,11 @@ paths:
                     type: 'string'
                     example: '2206308RFYKUCV'
                     description: '// compulsory when ownTransport is true'
+                  attachments:
+                    type: 'array'
+                    items:
+                      type: 'string'
+                      example: ['3975ed0f-5307-4880-bb2c-077f5a64285f', '3975ed0f-5307-4880-bb2c-077f5a642417']
                   shippingOrder:
                     type: 'object'
                     description: '// compulsory when exportOption is true'

package/openapi/v1/upload-attachments.yaml

@@ -0,0 +1,83 @@
+openapi: 3.0.0
+
+paths:
+  /api/v1/warehouse/upload-attachments:
+    post:
+      summary: Upload attachments and URLs
+      description: This endpoint accepts a multipart form with a required JSON `data` field and at least one of `attachments` (files) or `urls`.
+      tags:
+        - Attachments
+      requestBody:
+        description: Multipart form data for uploading files and URLs.
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                data:
+                  type: string
+                  description: |
+                    A JSON object string containing required bizplace. { "data": { "bizplaceId": "ed2cd631-ac50-44aa-b798-6567d7acde63" } }
+                  example: '{ "data": { "bizplaceId": "ed2cd631-ac50-44aa-b798-6567d7acde63" } }'
+                attachments:
+                  type: array
+                  description: A list of files to be uploaded.
+                  items:
+                    type: string
+                    format: binary
+                urls:
+                  type: array
+                  description: A JSON array string of external URLs to be associated.
+                  items:
+                    type: string
+                  example: '["https://example.com/document1.pdf", "https://example.com/document2.docx"]'
+            required:
+              - data
+            allOf:
+              - type: object
+                properties:
+                  attachments: {}
+                  urls: {}
+                oneOf:
+                  - required: ['attachments']
+                  - required: ['urls']
+      responses:
+        '200':
+          description: Upload successful.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  responseCode:
+                    type: string
+                    example: '200'
+                  message:
+                    type: string
+                    example: 'Attachments uploaded successfully'
+                  apiResponse:
+                    type: object
+                    properties:
+                      attachments:
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            id:
+                              type: string
+                              format: uuid
+                              example: '4eb6f487-f920-47c9-ae54-bcdb4e62dac6'
+                            size:
+                              type: integer
+                              example: 13264
+                            name:
+                              type: string
+                              example: 'dummy-1641923583.pdf'
+                            mimetype:
+                              type: string
+                              example: 'application/pdf'
+                  requestId:
+                    type: string
+                    format: uuid
+                    example: '0198bafe-84d5-7316-b93c-2bd1664bf62d'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.3.670",
+  "version": "4.3.671",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -55,61 +55,61 @@
     "@operato/scene-tab": "^0.1.8",
     "@operato/scene-table": "^0.1.8",
     "@operato/scene-wheel-sorter": "^0.1.8",
-    "@things-factory/api": "^4.3.591",
-    "@things-factory/apptool-ui": "^4.3.591",
-    "@things-factory/attachment-base": "^4.3.591",
-    "@things-factory/auth-base": "^4.3.591",
-    "@things-factory/auth-ui": "^4.3.591",
-    "@things-factory/biz-base": "^4.3.595",
-    "@things-factory/biz-ui": "^4.3.660",
-    "@things-factory/board-service": "^4.3.591",
-    "@things-factory/board-ui": "^4.3.642",
-    "@things-factory/code-ui": "^4.3.642",
+    "@things-factory/api": "^4.3.671",
+    "@things-factory/apptool-ui": "^4.3.671",
+    "@things-factory/attachment-base": "^4.3.671",
+    "@things-factory/auth-base": "^4.3.671",
+    "@things-factory/auth-ui": "^4.3.671",
+    "@things-factory/biz-base": "^4.3.671",
+    "@things-factory/biz-ui": "^4.3.671",
+    "@things-factory/board-service": "^4.3.671",
+    "@things-factory/board-ui": "^4.3.671",
+    "@things-factory/code-ui": "^4.3.671",
     "@things-factory/component-ui": "^4.3.591",
-    "@things-factory/context-ui": "^4.3.591",
-    "@things-factory/document-template-ui": "^4.3.642",
-    "@things-factory/export-ui": "^4.3.591",
-    "@things-factory/export-ui-csv": "^4.3.591",
-    "@things-factory/export-ui-excel": "^4.3.591",
-    "@things-factory/geography": "^4.3.617",
-    "@things-factory/grist-ui": "^4.3.642",
-    "@things-factory/help": "^4.3.591",
-    "@things-factory/i18n-base": "^4.3.591",
-    "@things-factory/import-ui": "^4.3.660",
-    "@things-factory/import-ui-excel": "^4.3.660",
-    "@things-factory/integration-accounting": "^4.3.660",
-    "@things-factory/integration-fulfillment": "^4.3.667",
-    "@things-factory/integration-lmd": "^4.3.669",
-    "@things-factory/integration-marketplace": "^4.3.669",
-    "@things-factory/integration-pos": "^4.3.660",
-    "@things-factory/integration-powrup": "^4.3.669",
-    "@things-factory/integration-sellercraft": "^4.3.669",
-    "@things-factory/integration-sftp": "^4.3.668",
-    "@things-factory/lite-menu": "^4.3.642",
-    "@things-factory/marketplace-base": "^4.3.669",
-    "@things-factory/more-ui": "^4.3.591",
-    "@things-factory/notification": "^4.3.609",
+    "@things-factory/context-ui": "^4.3.671",
+    "@things-factory/document-template-ui": "^4.3.671",
+    "@things-factory/export-ui": "^4.3.671",
+    "@things-factory/export-ui-csv": "^4.3.671",
+    "@things-factory/export-ui-excel": "^4.3.671",
+    "@things-factory/geography": "^4.3.671",
+    "@things-factory/grist-ui": "^4.3.671",
+    "@things-factory/help": "^4.3.671",
+    "@things-factory/i18n-base": "^4.3.671",
+    "@things-factory/import-ui": "^4.3.671",
+    "@things-factory/import-ui-excel": "^4.3.671",
+    "@things-factory/integration-accounting": "^4.3.671",
+    "@things-factory/integration-fulfillment": "^4.3.671",
+    "@things-factory/integration-lmd": "^4.3.671",
+    "@things-factory/integration-marketplace": "^4.3.671",
+    "@things-factory/integration-pos": "^4.3.671",
+    "@things-factory/integration-powrup": "^4.3.671",
+    "@things-factory/integration-sellercraft": "^4.3.671",
+    "@things-factory/integration-sftp": "^4.3.671",
+    "@things-factory/lite-menu": "^4.3.671",
+    "@things-factory/marketplace-base": "^4.3.671",
+    "@things-factory/more-ui": "^4.3.671",
+    "@things-factory/notification": "^4.3.671",
     "@things-factory/pdf": "^4.3.591",
-    "@things-factory/product-ui": "^4.3.660",
-    "@things-factory/resource-ui": "^4.3.660",
-    "@things-factory/sales-base": "^4.3.670",
+    "@things-factory/product-ui": "^4.3.671",
+    "@things-factory/resource-ui": "^4.3.671",
+    "@things-factory/sales-base": "^4.3.671",
     "@things-factory/scene-data-transform": "^4.3.591",
     "@things-factory/scene-excel": "^4.3.591",
     "@things-factory/scene-firebase": "^4.3.591",
     "@things-factory/scene-form": "^4.3.591",
     "@things-factory/scene-google-map": "^4.3.591",
     "@things-factory/scene-graphql": "^4.3.591",
-    "@things-factory/scene-label": "^4.3.612",
+    "@things-factory/scene-label": "^4.3.671",
     "@things-factory/scene-marker": "^4.3.591",
     "@things-factory/scene-mqtt": "^4.3.591",
     "@things-factory/scene-restful": "^4.3.591",
     "@things-factory/scene-visualizer": "^4.3.591",
-    "@things-factory/setting-ui": "^4.3.642",
-    "@things-factory/shell": "^4.3.591",
-    "@things-factory/system-ui": "^4.3.591",
-    "@things-factory/transport-base": "^4.3.631",
-    "@things-factory/warehouse-base": "^4.3.669",
-    "@things-factory/worksheet-base": "^4.3.670",
+    "@things-factory/setting-ui": "^4.3.671",
+    "@things-factory/shell": "^4.3.671",
+    "@things-factory/system-ui": "^4.3.671",
+    "@things-factory/transport-base": "^4.3.671",
+    "@things-factory/warehouse-base": "^4.3.671",
+    "@things-factory/worksheet-base": "^4.3.671",
     "cron-parser": "^4.7.0",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
@@ -122,5 +122,5 @@
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "47417e3b9d937e10d77063f8ed3ef111991456a0"
+  "gitHead": "ef524cb207378186ec71917d9a8546363d4300b2"
 }

package/server/routers/api/restful-apis/v1/middlewares/validation-middleware.ts

@@ -1,6 +1,8 @@
 import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
 import { params, reqParams, requireFromToDateValidation, requireLimitOffsetValidation } from '../utils/params'
 import { validateFromToDate, validateLimitOffset } from '../utils/validate-util'
+import mime from 'mime-types'
+const axios = require('axios')
 
 const debug = require('debug')('things-factory:operato-hub:validation-middleware')
 
@@ -18,6 +20,15 @@ export async function validationMiddleware(context, next) {
       throw new ApiError('E03', 'data')
     }
 
+    let contentType = getContentType(context.request.req.rawHeaders)
+    if (contentType.includes('multipart/form-data')) {
+      context.request.body.data = JSON.parse(context.request.body.data).data
+      if (context.request.body.urls) {
+        context.request.body.urls = JSON.parse(context.request.body.urls)
+      }
+      await validateAttachments(context)
+    }
+
     validateExpected(endpoint, context)
     validateRequired(endpoint, context)
 
@@ -113,3 +124,87 @@ function validateReq(obj, path = []) {
     }
   }
 }
+
+async function validateAttachments(context) {
+  const ALLOWED_MIME_TYPES = [
+    'application/pdf',
+    'application/vnd.ms-excel',
+    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+    'application/msword',
+    'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    'application/vnd.oasis.opendocument.spreadsheet',
+    'application/zip',
+    'text/html', // for both .htm and .html
+    'image/tiff',
+    'image/jpeg', // for both .jpg and .jpeg
+    'image/png',
+    'video/mp2t', // for .ts
+    'image/gif'
+  ]
+  const attachmentsSizeLimit = 10 * 1024 * 1024
+  let totalAttachmentsSize = 0
+
+  if (context.request.files?.attachments) {
+    let { attachments } = context.request.files
+
+    if (!Array.isArray(attachments)) {
+      attachments = [attachments]
+      context.request.files.attachments = attachments
+    }
+
+    attachments.forEach(attachment => {
+      if (!ALLOWED_MIME_TYPES.includes(attachment.mimetype)) {
+        throw new ApiError('E01', `Invalid file type. Allowed types: ${ALLOWED_MIME_TYPES.join(', ')}`)
+      }
+      totalAttachmentsSize += attachment.size
+      if (attachment.size > attachmentsSizeLimit || totalAttachmentsSize > attachmentsSizeLimit) {
+        throw new ApiError('E01', `Total file size exceeds the maximum limit of 10mb`)
+      }
+    })
+  }
+
+  if (context.request.body.urls) {
+    let { urls } = context.request.body
+    if (!Array.isArray(urls)) {
+      urls = [urls]
+    }
+    context.request.body.urls = urls
+    for (const url of context.request.body.urls) {
+      const response = await fetch(url, { method: 'HEAD' })
+      if (!response.ok) {
+        throw new ApiError('E01', 'invalid URL')
+      }
+      totalAttachmentsSize += parseInt(response.headers.get('Content-Length'), 10)
+      if (totalAttachmentsSize > attachmentsSizeLimit) {
+        throw new ApiError('E01', 'Exceeded total attachments size limit of 10mb')
+      }
+
+      const contentType = response.headers.get('Content-Type')
+      if (contentType && contentType != 'application/octet-stream') {
+        if (!ALLOWED_MIME_TYPES.includes(contentType)) {
+          throw new ApiError('E01', `Invalid URL or Invalid file type. Allowed types: ${ALLOWED_MIME_TYPES.join(', ')}`)
+        }
+      } else {
+        let fileName
+        //content-type unknown from request header, download file to verify
+        const response = await axios.get(url, { responseType: 'arraybuffer' })
+        const contentDisposition = response.statusText == 'OK' ? response.headers['content-disposition'] : null
+        const filenameMatch = /filename="([^"]+)"/.exec(contentDisposition)
+        if (filenameMatch && filenameMatch[1]) {
+          fileName = filenameMatch[1] ? filenameMatch[1] : null
+        }
+        const mimeType = fileName ? mime.lookup(fileName) : null
+        if (!ALLOWED_MIME_TYPES.includes(mimeType)) {
+          throw new ApiError('E01', `Invalid URL or Invalid file type. Allowed types: ${ALLOWED_MIME_TYPES.join(', ')}`)
+        }
+      }
+    }
+  }
+}
+
+function getContentType(rawHeaders: string[]): string | null {
+  for (let i = 0; i < rawHeaders.length; i += 2) {
+    if (rawHeaders[i] == 'Content-Type') return rawHeaders[i + 1]
+  }
+  return null
+}

package/server/routers/api/restful-apis/v1/utils/params.ts

@@ -297,7 +297,8 @@ export const params = {
     'orderProducts.product.refCode',
     'orderProducts.product.uom',
     'orderProducts.product.uomValue',
-    'supplierId'
+    'supplierId',
+    'attachments'
   ],
   'cancel-inbound-order': ['bizplaceId', 'ganNo', 'remark'],
   'add-release-order': [
@@ -380,7 +381,8 @@ export const params = {
     'xilnexSetting.outletName',
     'xilnexSetting.clientId',
     'xilnexSetting.clientPayment',
-    'xilnexSetting.salesType'
+    'xilnexSetting.salesType',
+    'attachments'
   ],
   'cancel-release-order': ['bizplaceId', 'roId', 'orderNo', 'orderNo2', 'orderNo3', 'remark', 'refOrderId'],
   'update-order-package-details': [
@@ -650,7 +652,8 @@ export const params = {
     'collectionOrderNo'
   ],
   'get-return-order-list': ['bizplaceId', 'name', ...fromToDate, ...limitOffset],
-  'get-return-order-details': ['bizplaceId', 'id', 'returnOrderNo']
+  'get-return-order-details': ['bizplaceId', 'id', 'returnOrderNo'],
+  'upload-attachments': ['bizplaceId']
 }
 
 // Required Params
@@ -674,6 +677,7 @@ export const reqParams = {
   'get-warehouse-bizplace-onhand-inventories': ['bizplaceId'],
   'get-inventory-adjustment-details': ['id'],
   'get-inventory-adjustment-list': ['bizplaceId', 'fromDate', 'toDate'],
+  'upload-attachments': ['bizplaceId'],
   'upsert-product': [
     {
       name: 'sku',

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

@@ -19,7 +19,6 @@ import {
 } from '@things-factory/sales-base'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
-
 import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
 import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
 
@@ -95,9 +94,30 @@ router.post(
           truckNo: result.truckNo,
           deliveryOrderNo: result.deliveryOrderNo,
           orderProducts: result.orderProducts,
-          supplier: result?.supplier
+          supplier: result?.supplier,
+          ...(bodyReq.attachments && bodyReq.attachments.length > 0 ? { attachments: bodyReq.attachments } : {})
         }
 
+        const attachments =
+          bodyReq.attachments === undefined || bodyReq.attachments === null
+            ? []
+            : Array.isArray(bodyReq.attachments)
+            ? bodyReq.attachments
+            : [bodyReq.attachments]
+
+        if (attachments.length > 0) {
+          let totalSize = await tx.query(`select sum(coalesce("size"::int,0)) from attachments where id  = any($1)`, [
+            attachments
+          ])
+          if (parseInt(totalSize[0].sum) > 10 * 1024 * 1024) {
+            throw new ApiError('E01', 'Exceeded total attachments size limit of 10mb')
+          }
+          await tx.query(`update attachments set ref_by = $1, category = $2 where id = any($3)`, [
+            result.id,
+            'GAN',
+            attachments
+          ])
+        }
         webhookHandler(result, result.bizplace, WebhookEventsEnum.ArrivalNoticeCreated)
 
         context.body = {

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

@@ -11,7 +11,6 @@ import {
 } from 'typeorm'
 import { v4 as uuidv4 } from 'uuid'
 import { webhookHandler, WebhookEventsEnum } from '@things-factory/integration-base'
-
 import { restfulApiRouter as router } from '@things-factory/api'
 import { User } from '@things-factory/auth-base'
 import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
@@ -338,7 +337,29 @@ router.post(
           bizplace: { name: result.bizplace.name },
           domain: { name: result.domain.name },
           orderProducts: result.orderProducts,
-          orderInventories: result.orderInventories
+          orderInventories: result.orderInventories,
+          ...(bodyReq.attachments && bodyReq.attachments.length > 0 ? { attachments: bodyReq.attachments } : {})
+        }
+
+        const attachments =
+          bodyReq.attachments === undefined || bodyReq.attachments === null
+            ? []
+            : Array.isArray(bodyReq.attachments)
+            ? bodyReq.attachments
+            : [bodyReq.attachments]
+
+        if (attachments.length > 0) {
+          let totalSize = await tx.query(`select sum(coalesce("size"::int,0)) from attachments where id  = any($1)`, [
+            attachments
+          ])
+          if (parseInt(totalSize[0].sum) > 10 * 1024 * 1024) {
+            throw new ApiError('E01', 'Exceeded total attachments size limit of 10mb')
+          }
+          await tx.query(`update attachments set ref_by = $1, category = $2 where id = any($3)`, [
+            result.id,
+            'DELIVERY_ORDER',
+            attachments
+          ])
         }
         //trigger webhook
         webhookHandler(result, result.bizplace, WebhookEventsEnum.ReleaseOrderCreated)

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

@@ -26,4 +26,5 @@ import './get-return-order-list'
 import './get-warehouse-bizplace-onhand-inventories'
 import './update-gan-to-arrived'
 import './update-order-package-details'
-import './update-release-order-details'
+import './update-release-order-details'
+import './upload-attachments'