@things-factory/sales-base 4.3.212 → 4.3.214

package/server/service/others/other-query.ts

@@ -212,11 +212,11 @@ export class OtherQuery {
         productDetail: availableItem ? { id: availableItem.productDetailId } : null,
         inventory: availableItem
           ? {
-              ...availableItem,
-              remainQty: availableItem ? availableItem.remainQty : null,
-              remainUomValue: availableItem ? availableItem.remainUomValue : null,
-              remainUomValueWithUom: availableItem ? availableItem.remainUomValueWithUom : ''
-            }
+            ...availableItem,
+            remainQty: availableItem ? availableItem.remainQty : null,
+            remainUomValue: availableItem ? availableItem.remainUomValue : null,
+            remainUomValueWithUom: availableItem ? availableItem.remainUomValueWithUom : ''
+          }
           : null,
         productId: availableItem ? availableItem.productId : null,
         productDetailID: availableItem ? availableItem.productDetailId : null,
@@ -299,8 +299,6 @@ export class OtherQuery {
       const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace: Bizplace } =
         context.state
 
-      const productDetailRepo = tx.getRepository(ProductDetail)
-
       let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
       let foundPermittedBizplace: Bizplace
       let companyBizplace: Bizplace
@@ -336,90 +334,118 @@ export class OtherQuery {
 
       if (partnerStrictProductSelectionSetting) strictProduct = partnerStrictProductSelectionSetting.value
 
-      let newOrderProducts: any[] = []
-
-      for (var i = 0; i < orderProducts.length; i++) {
-        const orderProduct = orderProducts[i]
-        const productSKU: string = orderProduct.productSKU
-        const foundProduct: Product = await tx.getRepository(Product).findOne({
-          where: {
-            sku: productSKU,
-            bizplace: companyBizplace
+      const json_op = JSON.stringify(
+        orderProducts.map(orderProduct => {
+          return {
+            sku: orderProduct.productSKU,
+            packing_type: orderProduct.packingType,
+            pack_qty: orderProduct.packQty,
+            pallet_qty: orderProduct.palletQty,
+            unit_price: orderProduct.unitPrice,
+            batch_id: orderProduct.batchId,
+            uom: orderProduct.uom,
+            uom_value: orderProduct.uomValue
           }
         })
+      )
 
-        let newOrderProduct: any
-
-        if (foundProduct) {
-          let productDetail: ProductDetail
-          const hasConditions: boolean = Boolean(
-            (orderProduct?.packingType && orderProduct?.packingType.trim() != '') ||
-              (orderProduct?.uom && orderProduct?.uom.trim() != '') ||
-              orderProduct?.uomValue
-          )
-          let productDetailCondition: any = { product: foundProduct }
-
-          if (hasConditions && strictProduct == 'true') {
-            if (orderProduct?.packingType && orderProduct.packingType.trim() != '')
-              productDetailCondition.packingType = orderProduct.packingType.trim()
-
-            if (orderProduct?.uom && orderProduct.uom.trim() != '') productDetailCondition.uom = orderProduct.uom.trim()
-
-            if (orderProduct?.uomValue) productDetailCondition.uomValue = orderProduct.uomValue
-          } else {
-            productDetailCondition.isDefault = true
-          }
-
-          productDetail = await productDetailRepo.findOne({
-            where: productDetailCondition
-          })
-
-          //check if is strict product selection for uom value, uom, packing type
-          const uomValue: number =
-            strictProduct == 'true' && productDetail ? productDetail.uomValue : orderProduct.uomValue
-
-          const uom = strictProduct == 'true' && productDetail ? productDetail.uom : orderProduct.uom
-
-          const packingType =
-            strictProduct == 'true' && productDetail ? productDetail.packingType : orderProduct.packingType
-
-          newOrderProduct = {
-            ...orderProduct,
-            packingType,
-            packingSize: productDetail ? productDetail.packingSize : orderProduct.packingSize,
-            uom,
-            uomValue,
-            productName: `${foundProduct.name}(${foundProduct.description}(${foundProduct.sku}))`,
-            productBrand: foundProduct?.brand ? foundProduct.brand : null,
-            product: {
-              id: foundProduct.id,
-              name: foundProduct.name,
-              sku: foundProduct.sku,
-              type: foundProduct.type,
-              brand: foundProduct.brand,
-              primaryUnit: productDetail ? productDetail.uom : null,
-              primaryValue: productDetail ? productDetail.uomValue : null,
-              costPrice: foundProduct.costPrice
-            },
-            productDetail,
-            totalUomValue:
-              orderProduct.packQty > 0
-                ? uomValue
-                  ? `${(orderProduct.packQty * uomValue).toFixed(2)} ${uom}`
-                  : null
-                : null,
-            isError: productDetail ? false : true
-          }
-        } else {
-          newOrderProduct = {
-            ...orderProduct,
-            productName: orderProduct.productSKU,
-            isError: true
+      // create temp table to hold the input data
+      await tx.query(`
+          CREATE TEMP TABLE raw_order_products(
+            sku VARCHAR(150),
+            packing_type VARCHAR(50),
+            pack_qty FLOAT,
+            pallet_qty FLOAT,
+            unit_price FLOAT,
+            batch_id VARCHAR(50),
+            uom VARCHAR(10),
+            uom_value FLOAT
+          );
+      `)
+
+      // insert input data into temp table
+      await tx.query(`
+          INSERT INTO raw_order_products
+          SELECT * FROM JSON_POPULATE_RECORDSET(NULL::raw_order_products, $1) js
+      `, [json_op])
+
+      // find closest matching product details from input data
+      await tx.query(`
+        create temp table matching_product_details as (
+          select row_number() over(partition by rop.sku order by is_default desc) as rn,
+          rop.sku as "rop_sku", rop.packing_type as "rop_packing_type", rop.uom as "rop_uom", rop.uom_value as "rop_uom_value", pd.*
+          from product_details pd
+          inner join products p on p.id = pd.product_id AND p.bizplace_id = $1
+          inner join raw_order_products rop ON LOWER(rop.sku) = LOWER(p.sku)
+          where 
+          pd.packing_type = coalesce(rop.packing_type, pd.packing_type) 
+          and	pd.uom = coalesce(rop.uom, pd.uom)
+          and pd.uom_value = coalesce(rop.uom_value, pd.uom_value)
+      )`, [companyBizplace.id])
+
+      // massage data into defined structure
+      let results = await tx.query(`
+        select *,
+        case when "packQty" > 0 and "uomValue" is not null then "packQty" * "uomValue" else null end as "totalUomValue"
+        from (
+          SELECT 
+          js.sku,
+          js.pack_qty as "packQty",
+          js.pallet_qty as "palletQty",
+          js.unit_price as "unitPrice",
+          js.batch_id as "batchId",
+          p.id AS "productId",
+          p.name as "productName",
+          p.brand as "productBrand",
+          p.type as "productType",
+          coalesce(mpd.uom, pdd.uom) as "productPrimaryUnit",
+          coalesce(mpd.uom_value, pdd.uom_value) as "productPrimaryValue",
+          coalesce(mpd.packing_size, pdd.packing_size) as "packingSize",
+          ${strictProduct.toLowerCase() === 'false' ? `
+            coalesce(js.packing_type, mpd.packing_type, pdd.packing_type) as "packingType",
+            coalesce(js.uom, mpd.uom, js.uom) as "uom",
+            coalesce(js.uom_value, mpd.uom_value, js.uom_value) as "uomValue",
+          ` : `
+            coalesce(mpd.packing_type, pdd.packing_type) as "packingType",
+            coalesce(mpd.uom, js.uom) as "uom",
+            coalesce(mpd.uom_value, js.uom_value) as "uomValue",
+          `}          
+          coalesce(mpd.id, pdd.id) AS "productDetailId",
+          coalesce(mpd.cost_price, pdd.cost_price) AS "productDetailCostPrice",
+          CASE WHEN p.id is null then js.sku else concat(p.name,' (',p.description,' (',js.sku,'))') end as "productName",
+          CASE WHEN p.id is null or coalesce(mpd.id, pdd.id) is null then true else false end as "isError"
+          FROM raw_order_products js
+          LEFT JOIN products p ON LOWER(js.sku) = LOWER(p.sku) AND p.bizplace_id = $1
+          left join matching_product_details mpd on mpd.rn = 1 and mpd.rop_sku = js.sku and mpd.rop_packing_type = js.packing_type and mpd.rop_uom = js.uom
+          left join product_details pdd on p.id = pdd.product_id and pdd.is_default = true
+        ) dt
+      `, [companyBizplace.id])
+
+      // remove all temp table
+      await tx.query(`DROP TABLE matching_product_details`)
+      await tx.query(`DROP TABLE raw_order_products`)
+
+      // build output structure
+      const newOrderProducts: any[] = results.map(result => {
+        return {
+          ...result,
+          product: {
+            id: result.productId,
+            name: result.productName,
+            sku: result.productSku,
+            description: result.productDescription,
+            type: result.productType,
+            brand: result.productBrand,
+            primaryUnit: result.productPrimaryUnit,
+            primaryValue: result.productPrimaryValue,
+            costPrice: result.productDetailCostPrice,
+          },
+          productDetail: {
+            id: result.productDetailId,
+            costPrice: result.productDetailCostPrice,
           }
         }
-
-        newOrderProducts.push(newOrderProduct)
-      }
+      })
 
       return newOrderProducts
     } catch (e) {
@@ -494,7 +520,7 @@ export class OtherQuery {
           let productDetail: ProductDetail
           const hasConditions: boolean = Boolean(
             (orderProduct?.packingType && orderProduct?.packingType.trim() != '') ||
-              (orderProduct?.uom && orderProduct?.uom.trim() != '')
+            (orderProduct?.uom && orderProduct?.uom.trim() != '')
           )
           let productDetailCondition: any = { product: foundProduct }
 
@@ -519,8 +545,8 @@ export class OtherQuery {
                 ? productDetail.uomValue
                 : null
               : orderProduct?.uomValue
-              ? orderProduct.uomValue
-              : productDetail.uomValue
+                ? orderProduct.uomValue
+                : productDetail.uomValue
 
           newOrderProduct = {
             ...orderProduct,