OUT-3244: add missing portalid condition while product map update

src/app/api/quickbooks/product/product.service.ts

@@ -266,7 +266,7 @@ export class ProductService extends BaseService {
     const query = this.db
       .update(QBProductSync)
       .set(parsedInsertPayload)
-      .where(conditions)
+      .where(and(conditions, eq(QBProductSync.portalId, this.user.workspaceId)))
 
     const [product] = returningFields?.length
       ? await query.returning(
@@ -397,6 +397,8 @@ export class ProductService extends BaseService {
     let itemCount = 0
 
     for (const product of mappedProducts) {
+      if (product.isExcluded) continue
+
       const qbItemId = z.string().parse(product.qbItemId)
       const productId = z.string().parse(product.productId)
 
@@ -707,7 +709,7 @@ export class ProductService extends BaseService {
       console.info(
         `ProductService#updateProductSyncToken. Item not found for Id ${qbItemId} in QuickBooks. Unmapping the product...`,
       )
-      await this.unmapProducts(qbItemId)
+      // if (updateMappingTable) await this.unmapProducts(qbItemId)
       return
     } else if (!item.Active) {
       console.info(

src/components/dashboard/settings/sections/product/ProductMappingTable.tsx

@@ -4,6 +4,7 @@ import useClickOutside from '@/hook/useClickOutside'
 import { useDropdownPosition } from '@/hook/useDropdown'
 import {
   ProductDataType,
+  QBItemDataType,
   useMapItem,
   useProductTableSetting,
 } from '@/hook/useSettings'
@@ -14,12 +15,19 @@ const MapItemComponent = ({
   mappingItems,
   productId,
   priceId,
+  qbItems,
 }: {
   mappingItems: ProductMappingItemType[] | undefined
   productId: string
   priceId: string
+  qbItems: QBItemDataType[] | undefined
 }) => {
-  const { currentlyMapped } = useMapItem(mappingItems, productId, priceId)
+  const { currentlyMapped } = useMapItem(
+    mappingItems,
+    productId,
+    priceId,
+    qbItems,
+  )
   return (
     <>
       {currentlyMapped ? (
@@ -148,6 +156,7 @@ export default function ProductMappingTable({
                             mappingItems={mappingItems}
                             productId={product.id}
                             priceId={product.priceId}
+                            qbItems={quickbooksItems}
                           />
                         )}
                       </div>

src/hook/useSettings.ts

@@ -96,7 +96,7 @@
     if (!productSetting || !intialSettingState) return
     const showButton = !equal(intialSettingState, productSetting)
     setSettingShowConfirm(showButton)
   }, [productSetting])
 
   useEffect(() => {
     if (setting && setting?.setting) {
@@ -203,7 +203,11 @@
       [index]: '',
     }))
     const fileteredChangedItem = changedItemReference.filter(
-      (item) => item.id !== products[index].id,
+      (item) =>
+        !(
+          item.id === products[index].id &&
+          item.priceId === products[index].priceId
+        ),
     )
     const newVal = [
       ...fileteredChangedItem,
@@ -448,6 +452,7 @@
   mappingItems: ProductMappingItemType[] | undefined,
   productId: string,
   priceId: string,
+  qbItems: QBItemDataType[] | undefined,
 ) => {
   const [currentlyMapped, setCurrentlyMapped] = useState<
     ProductMappingItemType | undefined
@@ -460,8 +465,24 @@
         item.qbItemId
       )
     })
-    setCurrentlyMapped(currentMapItem)
-    return currentMapItem
+    const currentQbItem = qbItems?.find((item) => {
+      return item.id === currentMapItem?.qbItemId
+    })
+
+    let itemToReturn: { name: string; unitPrice: string } | undefined
+    const itemName = currentQbItem?.name || currentMapItem?.name
+    const itemUnitPrice =
+      currentQbItem?.numericPrice.toFixed(2) || currentMapItem?.unitPrice
+
+    if (itemName && itemUnitPrice) {
+      itemToReturn = {
+        name: itemName,
+        unitPrice: itemUnitPrice,
+      }
+    }
+
+    setCurrentlyMapped(itemToReturn)
+    return itemToReturn
   }
 
   useEffect(() => {