@things-factory/operato-hub 4.3.744 → 4.3.745

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

@@ -7,6 +7,71 @@ import { Bizplace } from '@things-factory/biz-base'
 import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
 import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
 
+const VALID_DAYS = ['MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', 'SATURDAY', 'SUNDAY']
+const VALID_TYPES = ['CUSTOMER', 'SUPPLIER', 'WAREHOUSE']
+
+function validateBusinessRestDay(businessRestDay: any, index?: number): void {
+  if (businessRestDay === null || businessRestDay === undefined || businessRestDay === '') {
+    return // Allow null/empty values
+  }
+
+  if (typeof businessRestDay !== 'string') {
+    const prefix = index !== undefined ? `Contact point at index ${index}: ` : ''
+    throw new ApiError('E01', `${prefix}businessRestDay must be a string. Valid options: ${VALID_DAYS.join(', ')}`)
+  }
+
+  const days = businessRestDay.split(',').map(day => day.trim().toUpperCase())
+  const invalidDays = days.filter(day => !VALID_DAYS.includes(day))
+
+  if (invalidDays.length > 0) {
+    const prefix = index !== undefined ? `Contact point at index ${index}: ` : ''
+    throw new ApiError(
+      'E01',
+      `${prefix}Invalid businessRestDay value(s): ${invalidDays.join(', ')}. Valid options: ${VALID_DAYS.join(', ')}`
+    )
+  }
+}
+
+function validateType(type: any, index?: number): void {
+  if (!type) {
+    return // Type is required but validation will be handled by reqParams
+  }
+
+  if (typeof type !== 'string') {
+    const prefix = index !== undefined ? `Contact point at index ${index}: ` : ''
+    throw new ApiError('E01', `${prefix}type must be a string. Valid options: ${VALID_TYPES.join(', ')}`)
+  }
+
+  const upperType = type.toUpperCase()
+  if (!VALID_TYPES.includes(upperType)) {
+    const prefix = index !== undefined ? `Contact point at index ${index}: ` : ''
+    throw new ApiError('E01', `${prefix}Invalid type value: ${type}. Valid options: ${VALID_TYPES.join(', ')}`)
+  }
+}
+
+function validateReleaseShelfLife(releaseShelfLife: any, index?: number): void {
+  if (releaseShelfLife === null || releaseShelfLife === undefined || releaseShelfLife === '') {
+    return // Allow null/empty values
+  }
+
+  const prefix = index !== undefined ? `Contact point at index ${index}: ` : ''
+
+  // Check if it's a number
+  if (typeof releaseShelfLife !== 'number') {
+    throw new ApiError('E01', `${prefix}releaseShelfLife must be a number (integer >= 0)`)
+  }
+
+  // Check if it's an integer
+  if (!Number.isInteger(releaseShelfLife)) {
+    throw new ApiError('E01', `${prefix}releaseShelfLife must be an integer (no decimals allowed)`)
+  }
+
+  // Check if it's non-negative
+  if (releaseShelfLife < 0) {
+    throw new ApiError('E01', `${prefix}releaseShelfLife must be 0 or above (no negative values allowed)`)
+  }
+}
+
 router.post(
   '/v1/company/add-contact-points',
   businessMiddleware,
@@ -28,7 +93,24 @@ router.post(
         const emails = []
         const ids = []
         let values = []
-        for (const datapoint of context.request.body.data) {
+        for (let i = 0; i < context.request.body.data.length; i++) {
+          const datapoint = context.request.body.data[i]
+
+          // Validate businessRestDay
+          if (datapoint.hasOwnProperty('businessRestDay')) {
+            validateBusinessRestDay(datapoint.businessRestDay, i)
+          }
+
+          // Validate type
+          if (datapoint.hasOwnProperty('type')) {
+            validateType(datapoint.type, i)
+          }
+
+          // Validate releaseShelfLife
+          if (datapoint.hasOwnProperty('releaseShelfLife')) {
+            validateReleaseShelfLife(datapoint.releaseShelfLife, i)
+          }
+
           phones.push(datapoint.phone)
           emails.push(datapoint.email)
           if (datapoint.id) {
@@ -50,7 +132,13 @@ router.post(
             country: datapoint.country,
             releaseShelfLife: datapoint.releaseShelfLife,
             postCode: datapoint.postCode,
-            type: datapoint.type,
+            type: datapoint.type ? datapoint.type.toUpperCase() : datapoint.type,
+            businessRestDay: datapoint.businessRestDay
+              ? datapoint.businessRestDay
+                  .split(',')
+                  .map(day => day.trim().toUpperCase())
+                  .join(',')
+              : datapoint.businessRestDay,
             domain: context.state.domain,
             bizplace: bizplace,
             creator: context.state.user,
@@ -122,6 +210,7 @@ router.post(
             releaseShelfLife: contactPoint.releaseShelfLife,
             postCode: contactPoint.postCode,
             type: contactPoint.type,
+            businessRestDay: contactPoint.businessRestDay,
             createdAt: contactPoint.createdAt
           }
           data.push(datapoint)

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

@@ -1,4 +1,5 @@
 import './add-contact-points'
+import './update-contact-points'
 import './add-products'
 import './get-bizplace-list'
 import './get-contact-point-list'

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

@@ -0,0 +1,267 @@
+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'
+
+const VALID_DAYS = ['MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', 'SATURDAY', 'SUNDAY']
+const VALID_TYPES = ['CUSTOMER', 'SUPPLIER', 'WAREHOUSE']
+
+function validateBusinessRestDay(businessRestDay: any, index?: number): void {
+  if (businessRestDay === null || businessRestDay === undefined || businessRestDay === '') {
+    return // Allow null/empty values
+  }
+
+  if (typeof businessRestDay !== 'string') {
+    const prefix = index !== undefined ? `Contact point at index ${index}: ` : ''
+    throw new ApiError('E01', `${prefix}businessRestDay must be a string. Valid options: ${VALID_DAYS.join(', ')}`)
+  }
+
+  const days = businessRestDay.split(',').map(day => day.trim().toUpperCase())
+  const invalidDays = days.filter(day => !VALID_DAYS.includes(day))
+
+  if (invalidDays.length > 0) {
+    const prefix = index !== undefined ? `Contact point at index ${index}: ` : ''
+    throw new ApiError(
+      'E01',
+      `${prefix}Invalid businessRestDay value(s): ${invalidDays.join(', ')}. Valid options: ${VALID_DAYS.join(', ')}`
+    )
+  }
+}
+
+function validateType(type: any, index?: number): void {
+  if (!type) {
+    return // Type is optional for updates
+  }
+
+  if (typeof type !== 'string') {
+    const prefix = index !== undefined ? `Contact point at index ${index}: ` : ''
+    throw new ApiError('E01', `${prefix}type must be a string. Valid options: ${VALID_TYPES.join(', ')}`)
+  }
+
+  const upperType = type.toUpperCase()
+  if (!VALID_TYPES.includes(upperType)) {
+    const prefix = index !== undefined ? `Contact point at index ${index}: ` : ''
+    throw new ApiError('E01', `${prefix}Invalid type value: ${type}. Valid options: ${VALID_TYPES.join(', ')}`)
+  }
+}
+
+function validateReleaseShelfLife(releaseShelfLife: any, index?: number): void {
+  if (releaseShelfLife === null || releaseShelfLife === undefined || releaseShelfLife === '') {
+    return // Allow null/empty values
+  }
+
+  const prefix = index !== undefined ? `Contact point at index ${index}: ` : ''
+
+  // Check if it's a number
+  if (typeof releaseShelfLife !== 'number') {
+    throw new ApiError('E01', `${prefix}releaseShelfLife must be a number (integer >= 0)`)
+  }
+
+  // Check if it's an integer
+  if (!Number.isInteger(releaseShelfLife)) {
+    throw new ApiError('E01', `${prefix}releaseShelfLife must be an integer (no decimals allowed)`)
+  }
+
+  // Check if it's non-negative
+  if (releaseShelfLife < 0) {
+    throw new ApiError('E01', `${prefix}releaseShelfLife must be 0 or above (no negative values allowed)`)
+  }
+}
+
+router.post(
+  '/v1/company/update-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) => {
+        // Validate that all contact points have IDs
+        const ids = []
+        for (const datapoint of context.request.body.data) {
+          if (!datapoint.id) {
+            throw new ApiError('E01', 'All contact points must have an id field for update')
+          }
+          ids.push(datapoint.id)
+        }
+
+        // Verify that all contact points exist
+        const existingContactPoints: ContactPoint[] = await tx
+          .getRepository(ContactPoint)
+          .createQueryBuilder('cp')
+          .where('cp.id IN (:...ids)', { ids })
+          .andWhere('cp.bizplace_id = :bizplaceId', { bizplaceId: context.request.body.bizplaceId })
+          .getMany()
+
+        if (existingContactPoints.length !== ids.length) {
+          const foundIds = existingContactPoints.map(cp => cp.id)
+          const missingIds = ids.filter(id => !foundIds.includes(id))
+          throw new ApiError('E04', `Contact point(s) not found: ${missingIds.join(', ')}`)
+        }
+
+        // Get bizplace
+        const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+          where: { id: context.request.body.bizplaceId }
+        })
+
+        if (!bizplace) {
+          throw new ApiError('E04', 'Bizplace not found')
+        }
+
+        // Check for duplicate email or phone within the batch
+        const phones = []
+        const emails = []
+        const phoneToIdMap = new Map()
+        const emailToIdMap = new Map()
+
+        for (let i = 0; i < context.request.body.data.length; i++) {
+          const datapoint = context.request.body.data[i]
+
+          // Validate businessRestDay
+          if (datapoint.hasOwnProperty('businessRestDay')) {
+            validateBusinessRestDay(datapoint.businessRestDay, i)
+          }
+
+          // Validate type
+          if (datapoint.hasOwnProperty('type')) {
+            validateType(datapoint.type, i)
+          }
+
+          // Validate releaseShelfLife
+          if (datapoint.hasOwnProperty('releaseShelfLife')) {
+            validateReleaseShelfLife(datapoint.releaseShelfLife, i)
+          }
+
+          if (datapoint.phone) {
+            phones.push(datapoint.phone)
+            if (phoneToIdMap.has(datapoint.phone)) {
+              throw new ApiError('E05', `Duplicate phone number in update batch: ${datapoint.phone}`)
+            }
+            phoneToIdMap.set(datapoint.phone, datapoint.id)
+          }
+          if (datapoint.email) {
+            emails.push(datapoint.email)
+            if (emailToIdMap.has(datapoint.email)) {
+              throw new ApiError('E05', `Duplicate email in update batch: ${datapoint.email}`)
+            }
+            emailToIdMap.set(datapoint.email, datapoint.id)
+          }
+        }
+
+        // Check for duplicate email or phone in existing records (excluding the records being updated)
+        if (phones.length > 0 || emails.length > 0) {
+          const checkDuplicateEmailPhone: ContactPoint[] = await tx
+            .getRepository(ContactPoint)
+            .createQueryBuilder('cp')
+            .where('cp.bizplace_id = :bizplaceId', { bizplaceId: context.request.body.bizplaceId })
+            .andWhere('cp.id NOT IN (:...ids)', { ids })
+            .andWhere(
+              new Brackets(qb => {
+                if (emails.length > 0) {
+                  qb.where('cp.email IN (:...emails)', { emails })
+                }
+                if (phones.length > 0) {
+                  if (emails.length > 0) {
+                    qb.orWhere('cp.phone IN (:...phones)', { phones })
+                  } else {
+                    qb.where('cp.phone IN (:...phones)', { phones })
+                  }
+                }
+              })
+            )
+            .getMany()
+
+          if (checkDuplicateEmailPhone.length > 0) {
+            const duplicates = checkDuplicateEmailPhone.map(cp => ({
+              id: cp.id,
+              email: cp.email,
+              phone: cp.phone
+            }))
+            throw new ApiError('E05', `Duplicate email or phone number found: ${JSON.stringify(duplicates)}`)
+          }
+        }
+
+        // Update contact points
+        const updatedContactPoints: ContactPoint[] = []
+        for (const datapoint of context.request.body.data) {
+          const existingContactPoint = existingContactPoints.find(cp => cp.id === datapoint.id)
+
+          // Only update fields that are explicitly provided
+          const updateData: any = {
+            updater: context.state.user
+          }
+
+          if (datapoint.hasOwnProperty('name')) updateData.name = datapoint.name
+          if (datapoint.hasOwnProperty('description')) updateData.description = datapoint.description
+          if (datapoint.hasOwnProperty('companyName')) updateData.companyName = datapoint.companyName
+          if (datapoint.hasOwnProperty('email')) updateData.email = datapoint.email
+          if (datapoint.hasOwnProperty('fax')) updateData.fax = datapoint.fax
+          if (datapoint.hasOwnProperty('phone')) updateData.phone = datapoint.phone
+          if (datapoint.hasOwnProperty('billingAddress')) updateData.billingAddress = datapoint.billingAddress
+          if (datapoint.hasOwnProperty('accountNo')) updateData.accountNo = datapoint.accountNo
+          if (datapoint.hasOwnProperty('address')) updateData.address = datapoint.address
+          if (datapoint.hasOwnProperty('address2')) updateData.address2 = datapoint.address2
+          if (datapoint.hasOwnProperty('city')) updateData.city = datapoint.city
+          if (datapoint.hasOwnProperty('state')) updateData.state = datapoint.state
+          if (datapoint.hasOwnProperty('country')) updateData.country = datapoint.country
+          if (datapoint.hasOwnProperty('releaseShelfLife')) updateData.releaseShelfLife = datapoint.releaseShelfLife
+          if (datapoint.hasOwnProperty('postCode')) updateData.postCode = datapoint.postCode
+          if (datapoint.hasOwnProperty('type'))
+            updateData.type = datapoint.type ? datapoint.type.toUpperCase() : datapoint.type
+          if (datapoint.hasOwnProperty('businessRestDay'))
+            updateData.businessRestDay = datapoint.businessRestDay
+              ? datapoint.businessRestDay
+                  .split(',')
+                  .map(day => day.trim().toUpperCase())
+                  .join(',')
+              : datapoint.businessRestDay
+
+          const updated = await tx.getRepository(ContactPoint).save({
+            ...existingContactPoint,
+            ...updateData
+          })
+
+          updatedContactPoints.push(updated)
+        }
+
+        // Format response
+        const data = updatedContactPoints.map(contactPoint => ({
+          id: contactPoint.id,
+          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,
+          country: contactPoint.country,
+          releaseShelfLife: contactPoint.releaseShelfLife,
+          postCode: contactPoint.postCode,
+          type: contactPoint.type,
+          businessRestDay: contactPoint.businessRestDay,
+          createdAt: contactPoint.createdAt,
+          updatedAt: contactPoint.updatedAt
+        }))
+
+        context.body = {
+          data
+        }
+      })
+    } catch (e) {
+      if (e instanceof ApiError) ApiErrorHandler(context, e)
+      else throwInternalServerError(context, e)
+    }
+  }
+)

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

@@ -99,7 +99,29 @@ export const params = {
     'country',
     'releaseShelfLife',
     'postCode',
-    'type'
+    'type',
+    'businessRestDay'
+  ],
+  'update-contact-points': [
+    'bizplaceId',
+    'id',
+    'name',
+    'companyName',
+    'description',
+    'email',
+    'fax',
+    'phone',
+    'billingAddress',
+    'accountNo',
+    'address',
+    'address2',
+    'city',
+    'state',
+    'country',
+    'releaseShelfLife',
+    'postCode',
+    'type',
+    'businessRestDay'
   ],
   'add-marketplace-order': [
     'storeId',
@@ -452,33 +474,78 @@ export const params = {
     'bizplaceId',
     'releaseGood',
     'releaseGood.roId',
-    'releaseGood.collectionOrderNo',
+    'releaseGood.refOrderId',
     'releaseGood.refNo',
     'releaseGood.refNo2',
     'releaseGood.refNo3',
-    'releaseGood.refOrderId',
-    'releaseGood.marketplaceOrderStatus',
-    'releaseGood.billingAddress',
-    'releaseGood.deliveryAddress1',
-    'releaseGood.attentionTo',
-    'releaseGood.city',
-    'releaseGood.ward',
-    'releaseGood.district',
-    'releaseGood.country',
-    'releaseGood.postalCode',
-    'releaseGood.phone1',
-    'releaseGood.transporter',
-    'releaseGood.trackingNo',
-    'releaseGood.airwayBill',
-    'releaseGood.invoice',
+    'releaseGood.description',
+    'releaseGood.truckNo',
+    'releaseGood.collectionOrderNo',
+    'releaseGood.releaseDate',
+    'releaseGood.ownTransport',
+    'releaseGood.exportOption',
+    'releaseGood.packingOption',
+    'releaseGood.courierOption',
+    'releaseGood.remark',
     'shippingOrder',
-    'shippingOrder.shipName',
     'shippingOrder.containerNo',
-    'shippingOrder.loadType',
-    'shippingOrder.from',
-    'shippingOrder.to',
     'shippingOrder.containerArrivalDate',
-    'shippingOrder.containerLeavingDate'
+    'shippingOrder.containerLeavingDate',
+    'shippingOrder.containerClosureDate',
+    'shippingOrder.containerSize',
+    'shippingOrder.remark',
+    'shippingOrder.exportRemark',
+    'orderProducts',
+    'orderProducts.id',
+    'orderProducts.product',
+    'orderProducts.product.sku',
+    'orderProducts.product.refCode',
+    'orderProducts.sku',
+    'orderProducts.refCode',
+    'orderProducts.batchId',
+    'orderProducts.packingType',
+    'orderProducts.packingSize',
+    'orderProducts.releaseQty',
+    'orderProducts.qty',
+    'orderProducts.refItemId',
+    'orderProducts.unitPrice',
+    'orderProducts.remark',
+    'orderProducts._action'
+  ],
+  'update-arrival-notice': [
+    'arrivalNoticeId',
+    'ganNo',
+    'refNo',
+    'refNo2',
+    'refNo3',
+    'etaDate',
+    'ownTransport',
+    'importCargo',
+    'container',
+    'containerNo',
+    'containerSize',
+    'truckNo',
+    'deliveryOrderNo',
+    'remark',
+    'description',
+    'supplierId',
+    'orderProducts',
+    'orderProducts.id',
+    'orderProducts.product',
+    'orderProducts.product.sku',
+    'orderProducts.product.refCode',
+    'orderProducts.sku',
+    'orderProducts.refCode',
+    'orderProducts.batchId',
+    'orderProducts.packingType',
+    'orderProducts.packingSize',
+    'orderProducts.qty',
+    'orderProducts.packQty',
+    'orderProducts.refItemId',
+    'orderProducts.unitPrice',
+    'orderProducts.manufactureDate',
+    'orderProducts.remark',
+    'orderProducts._action'
   ],
   'update-marketplace-shipping-order': ['storeId', 'orderNo', 'transporter', 'airwayBill', 'trackingNo'],
   'get-grn-document': ['fileType', 'bizplaceId', 'grnNo', 'timezoneOffSet'],
@@ -932,6 +999,13 @@ export const reqParams = {
       type: 'field'
     }
   ],
+  'update-contact-points': [
+    {
+      name: 'id',
+      required: true,
+      type: 'field'
+    }
+  ],
   'add-marketplace-order': [
     {
       name: 'storeId',
@@ -1216,12 +1290,19 @@ export const reqParams = {
       name: 'shippingOrder',
       required: false,
       type: 'object',
-      data: [
-        { name: 'shipName', required: true, type: 'field' },
-        { name: 'containerNo', required: true, type: 'field' },
-        { name: 'containerArrivalDate', required: true, type: 'field' },
-        { name: 'containerLeavingDate', required: true, type: 'field' }
-      ]
+      data: []
+    }
+  ],
+  'update-arrival-notice': [
+    {
+      name: 'arrivalNoticeId',
+      required: false,
+      type: 'field'
+    },
+    {
+      name: 'ganNo',
+      required: false,
+      type: 'field'
     }
   ],
   'update-order-package-details': [

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

@@ -28,4 +28,5 @@ import './add-inventory-adjustment'
 import './update-gan-to-arrived'
 import './update-order-package-details'
 import './update-release-order-details'
+import './update-arrival-notice'
 import './upload-attachments'