@things-factory/operato-hub 4.3.775 → 4.3.776

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

@@ -3,6 +3,7 @@ import { EntityManager, getConnection, getRepository, In } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Bizplace } from '@things-factory/biz-base'
+import { webhookHandler, WebhookEventsEnum } from '@things-factory/integration-base'
 import { Product, ProductBarcode, ProductDetail } from '@things-factory/product-base'
 
 import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
@@ -15,15 +16,18 @@ router.post(
   loggingMiddleware,
   async (context, next) => {
     try {
+      let response = []
+      let bizplace: Bizplace
+      const { user, domain } = context.state
+
       await getConnection().transaction(async (tx: EntityManager) => {
         if (!Array.isArray(context.request.body.data)) throw new ApiError('E01', 'data field is not an array')
 
         const products = context.request.body.data
         const skus = products.map(p => p.sku)
-        const { user, domain } = context.state
 
         // find bizplace
-        const bizplace = await getRepository(Bizplace).findOne({
+        bizplace = await getRepository(Bizplace).findOne({
           where: {
             domain
           }
@@ -48,8 +52,6 @@ router.post(
           throw new ApiError('E05', `existing products found: ${existedProducts.map(ep => ep.sku)}`)
         }
 
-        let response = []
-
         // save product
         await Promise.all(
           products.map(async p => {
@@ -117,7 +119,37 @@ router.post(
                       auxUnit2: pdResult.auxUnit2,
                       auxValue2: pdResult.auxValue2,
                       auxUnit3: pdResult.auxUnit3,
-                      auxValue3: pdResult.auxValue3
+                      auxValue3: pdResult.auxValue3,
+                      auxUnit4: pdResult.auxUnit4,
+                      auxValue4: pdResult.auxValue4,
+                      auxUnit5: pdResult.auxUnit5,
+                      auxValue5: pdResult.auxValue5,
+                      auxUnit6: pdResult.auxUnit6,
+                      auxValue6: pdResult.auxValue6,
+                      auxUnit7: pdResult.auxUnit7,
+                      auxValue7: pdResult.auxValue7,
+                      auxUnit8: pdResult.auxUnit8,
+                      auxValue8: pdResult.auxValue8,
+                      auxUnit9: pdResult.auxUnit9,
+                      auxValue9: pdResult.auxValue9,
+                      auxUnit10: pdResult.auxUnit10,
+                      auxValue10: pdResult.auxValue10,
+                      auxUnit11: pdResult.auxUnit11,
+                      auxValue11: pdResult.auxValue11,
+                      auxUnit12: pdResult.auxUnit12,
+                      auxValue12: pdResult.auxValue12,
+                      auxUnit13: pdResult.auxUnit13,
+                      auxValue13: pdResult.auxValue13,
+                      auxUnit14: pdResult.auxUnit14,
+                      auxValue14: pdResult.auxValue14,
+                      auxUnit15: pdResult.auxUnit15,
+                      auxValue15: pdResult.auxValue15,
+                      auxUnit16: pdResult.auxUnit16,
+                      auxValue16: pdResult.auxValue16,
+                      auxUnit17: pdResult.auxUnit17,
+                      auxValue17: pdResult.auxValue17,
+                      auxUnit18: pdResult.auxUnit18,
+                      auxValue18: pdResult.auxValue18
                     }
                   )
                 }
@@ -170,6 +202,10 @@ router.post(
           data: response
         }
       })
+
+      response.forEach(product => {
+        webhookHandler({ id: product.id, domain }, bizplace, WebhookEventsEnum.ProductCreated)
+      })
     } catch (e) {
       if (e instanceof ApiError) ApiErrorHandler(context, e)
       else throwInternalServerError(context, e)

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

@@ -4,6 +4,7 @@ import { v4 as uuidv4 } from 'uuid'
 
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Bizplace } from '@things-factory/biz-base'
+import { webhookHandler, WebhookEventsEnum } from '@things-factory/integration-base'
 import { pickStrategy, Product, ProductBarcode, ProductDetail } from '@things-factory/product-base'
 
 import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
@@ -72,6 +73,9 @@ router.post(
           ...patch,
           id: uuidv4(),
           isRequiredCheckExpiry: patch?.isRequiredCheckExpiry ? patch.isRequiredCheckExpiry : false,
+          isRequiredCheckManufactureDate: patch?.isRequiredCheckManufactureDate !== undefined 
+            ? patch.isRequiredCheckManufactureDate 
+            : false,
           isRequireSerialNumberScanning: patch?.isRequireSerialNumberScanning
             ? patch.isRequireSerialNumberScanning
             : false,
@@ -96,6 +100,8 @@ router.post(
           return generateNewProductDetail(pd, product)
         })
 
+        syncDefaultProductDetailToProduct(product, patch.productDetails)
+
         results.push(product)
         _createProducts.push(convertToSnakeCase(product))
 
@@ -186,6 +192,9 @@ router.post(
           ...matchingProduct,
           ...patch,
           id: matchingProduct.id,
+          isRequiredCheckManufactureDate: patch?.isRequiredCheckManufactureDate !== undefined 
+            ? patch.isRequiredCheckManufactureDate 
+            : (matchingProduct?.isRequiredCheckManufactureDate ?? false),
           updaterId: user.id,
           updatedAt: now
         }
@@ -195,6 +204,8 @@ router.post(
           product.productDetails = patch?.productDetails.map(pd => {
             return updateProductDetail(pd, matchingProduct)
           })
+
+          syncDefaultProductDetailToProduct(product, product.productDetails)
         }
 
         results.push(product)
@@ -351,6 +362,14 @@ router.post(
         }
       })
 
+      _createProducts.forEach(product => {
+        webhookHandler({ id: product.id, domain }, bizplace, WebhookEventsEnum.ProductCreated)
+      })
+
+      _updateProducts.forEach(product => {
+        webhookHandler({ id: product.id, domain }, bizplace, WebhookEventsEnum.ProductUpdated)
+      })
+
       //pass response
       context.body = {
         data: massageResponseDate(results)
@@ -399,7 +418,7 @@ function checkProductDetails(params, data) {
 
       const matchProductDetail = param.productDetails.find(
         pd =>
-          pd.packingSize === foundIsDefaultProdDetail.packingSize &&
+          (pd.packingSize === foundIsDefaultProdDetail.packingSize || parseFloat(pd.packingSize) === foundIsDefaultProdDetail.packingSize) &&
           pd.packingType === foundIsDefaultProdDetail.packingType &&
           pd.uom === foundIsDefaultProdDetail.uom
       )
@@ -411,6 +430,38 @@ function checkProductDetails(params, data) {
   })
 }
 
+/**
+ * Syncs the default product detail's fields to the product.
+ * @param product - The product to sync fields to.
+ * @param productDetails - The product details array to find the default from.
+ */
+function syncDefaultProductDetailToProduct(product: any, productDetails: any[]) {
+  const defaultPd = productDetails.find(pd => pd.isDefault === true)
+  if (!defaultPd) return
+
+  product.packingType = defaultPd.packingType
+  product.weightUnit = defaultPd.weightUnit
+  product.grossWeight = defaultPd.grossWeight
+  product.lengthUnit = defaultPd.lengthUnit
+  product.costPrice = defaultPd.costPrice
+  product.primaryUnit = defaultPd.uom
+  product.primaryValue = defaultPd.uomValue
+  product.width = defaultPd.width
+  product.depth = defaultPd.depth
+  product.height = defaultPd.height
+  product.volume = defaultPd.volume
+  product.bufferQty = defaultPd.bufferQty
+  product.minQty = defaultPd.minQty
+  product.maxQty = defaultPd.maxQty
+  product.auxUnit1 = defaultPd.auxUnit1
+  product.auxValue1 = defaultPd.auxValue1
+  product.auxUnit2 = defaultPd.auxUnit2
+  product.auxValue2 = defaultPd.auxValue2
+  product.auxUnit3 = defaultPd.auxUnit3
+  product.auxValue3 = defaultPd.auxValue3
+  product.cogsAccountCode = defaultPd.cogsAccountCode
+}
+
 /**
  * Converts the keys of an object to snake_case.
  *

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

@@ -313,6 +313,42 @@ export const params = {
     'pickingStrategy',
     'minInboundShelfLife',
     'minOutboundShelfLife',
+    'auxUnit1',
+    'auxValue1',
+    'auxUnit2',
+    'auxValue2',
+    'auxUnit3',
+    'auxValue3',
+    'auxUnit4',
+    'auxValue4',
+    'auxUnit5',
+    'auxValue5',
+    'auxUnit6',
+    'auxValue6',
+    'auxUnit7',
+    'auxValue7',
+    'auxUnit8',
+    'auxValue8',
+    'auxUnit9',
+    'auxValue9',
+    'auxUnit10',
+    'auxValue10',
+    'auxUnit11',
+    'auxValue11',
+    'auxUnit12',
+    'auxValue12',
+    'auxUnit13',
+    'auxValue13',
+    'auxUnit14',
+    'auxValue14',
+    'auxUnit15',
+    'auxValue15',
+    'auxUnit16',
+    'auxValue16',
+    'auxUnit17',
+    'auxValue17',
+    'auxUnit18',
+    'auxValue18',
     'productDetails',
     'productDetails.isDefault',
     'productDetails.gtin',
@@ -344,6 +380,32 @@ export const params = {
     'productDetails.auxValue4',
     'productDetails.auxUnit5',
     'productDetails.auxValue5',
+    'productDetails.auxUnit6',
+    'productDetails.auxValue6',
+    'productDetails.auxUnit7',
+    'productDetails.auxValue7',
+    'productDetails.auxUnit8',
+    'productDetails.auxValue8',
+    'productDetails.auxUnit9',
+    'productDetails.auxValue9',
+    'productDetails.auxUnit10',
+    'productDetails.auxValue10',
+    'productDetails.auxUnit11',
+    'productDetails.auxValue11',
+    'productDetails.auxUnit12',
+    'productDetails.auxValue12',
+    'productDetails.auxUnit13',
+    'productDetails.auxValue13',
+    'productDetails.auxUnit14',
+    'productDetails.auxValue14',
+    'productDetails.auxUnit15',
+    'productDetails.auxValue15',
+    'productDetails.auxUnit16',
+    'productDetails.auxValue16',
+    'productDetails.auxUnit17',
+    'productDetails.auxValue17',
+    'productDetails.auxUnit18',
+    'productDetails.auxValue18',
     'productDetails.childProductDetail',
     'productDetails.productBarcodes',
     'productDetails.productBarcodes.gtin'
@@ -685,6 +747,42 @@ export const params = {
     'pickingStrategy',
     'minInboundShelfLife',
     'minOutboundShelfLife',
+    'auxUnit1',
+    'auxValue1',
+    'auxUnit2',
+    'auxValue2',
+    'auxUnit3',
+    'auxValue3',
+    'auxUnit4',
+    'auxValue4',
+    'auxUnit5',
+    'auxValue5',
+    'auxUnit6',
+    'auxValue6',
+    'auxUnit7',
+    'auxValue7',
+    'auxUnit8',
+    'auxValue8',
+    'auxUnit9',
+    'auxValue9',
+    'auxUnit10',
+    'auxValue10',
+    'auxUnit11',
+    'auxValue11',
+    'auxUnit12',
+    'auxValue12',
+    'auxUnit13',
+    'auxValue13',
+    'auxUnit14',
+    'auxValue14',
+    'auxUnit15',
+    'auxValue15',
+    'auxUnit16',
+    'auxValue16',
+    'auxUnit17',
+    'auxValue17',
+    'auxUnit18',
+    'auxValue18',
     'productDetails',
     'productDetails.isDefault',
     'productDetails.name',
@@ -716,8 +814,35 @@ export const params = {
     'productDetails.auxValue4',
     'productDetails.auxUnit5',
     'productDetails.auxValue5',
+    'productDetails.auxUnit6',
+    'productDetails.auxValue6',
+    'productDetails.auxUnit7',
+    'productDetails.auxValue7',
+    'productDetails.auxUnit8',
+    'productDetails.auxValue8',
+    'productDetails.auxUnit9',
+    'productDetails.auxValue9',
+    'productDetails.auxUnit10',
+    'productDetails.auxValue10',
+    'productDetails.auxUnit11',
+    'productDetails.auxValue11',
+    'productDetails.auxUnit12',
+    'productDetails.auxValue12',
+    'productDetails.auxUnit13',
+    'productDetails.auxValue13',
+    'productDetails.auxUnit14',
+    'productDetails.auxValue14',
+    'productDetails.auxUnit15',
+    'productDetails.auxValue15',
+    'productDetails.auxUnit16',
+    'productDetails.auxValue16',
+    'productDetails.auxUnit17',
+    'productDetails.auxValue17',
+    'productDetails.auxUnit18',
+    'productDetails.auxValue18',
     'productDetails.childProductDetail',
     'productDetails.childQty',
+    'productDetails.cogsAccountCode',
     'productDetails.productBarcodes.gtin'
   ],
   'add-sales-invoice': [