matt/inventory
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Modify import scripts to handle edge cases with empty arrays and null conditions

Browse Source 
- Improve parameter handling in incremental update queries for purchase orders and products
This commit is contained in:
Matt
2025-01-31 01:50:21 -05:00
parent 5e4d1c3bd8
commit d0abe9d9a2
4 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
inventory-server/scripts/import/purchase-orders.js
View File

@@ -31,8 +31,7 @@ async function importPurchaseOrders(prodConnection, localConnection, incremental
// Build incremental conditions
const incrementalWhereClause = incrementalUpdate
? `AND (
p.stamp > ?
OR p.date_updated > ?
p.date_updated > ?
OR p.date_ordered > ?
OR p.date_estin > ?
OR r.date_updated > ?
@@ -43,7 +42,7 @@ async function importPurchaseOrders(prodConnection, localConnection, incremental
)`
: "";
const incrementalParams = incrementalUpdate
? [lastSyncTime, lastSyncTime, lastSyncTime, lastSyncTime, lastSyncTime, lastSyncTime, lastSyncTime, lastSyncTime, lastSyncTime]
? [lastSyncTime, lastSyncTime, lastSyncTime, lastSyncTime, lastSyncTime, lastSyncTime, lastSyncTime, lastSyncTime]
: [];
// First get all relevant PO IDs with basic info
@@ -56,16 +55,32 @@ async function importPurchaseOrders(prodConnection, localConnection, incremental
JOIN po_products pop ON p.po_id = pop.po_id
JOIN suppliers s ON p.supplier_id = s.supplierid
WHERE p.date_ordered >= DATE_SUB(CURRENT_DATE, INTERVAL ${incrementalUpdate ? '1' : '5'} YEAR)
${incrementalWhereClause}
${incrementalUpdate ? `
AND (
p.date_updated > ?
OR p.date_ordered > ?
OR p.date_estin > ?
)
` : ''}
UNION
SELECT DISTINCT r.receiving_id as po_id, rp.pid
FROM receivings_products rp
USE INDEX (received_date)
LEFT JOIN receivings r ON r.receiving_id = rp.receiving_id
WHERE rp.received_date >= DATE_SUB(CURRENT_DATE, INTERVAL ${incrementalUpdate ? '1' : '5'} YEAR)
${incrementalWhereClause}
${incrementalUpdate ? `
AND (
r.date_created > ?
OR r.date_checked > ?
OR rp.stamp > ?
OR rp.received_date > ?
)
` : ''}
) all_items
`, [...incrementalParams, ...incrementalParams]);
`, incrementalUpdate ? [
lastSyncTime, lastSyncTime, lastSyncTime, // PO conditions
lastSyncTime, lastSyncTime, lastSyncTime, lastSyncTime // Receiving conditions
] : []);
const [poList] = await prodConnection.query(`
SELECT DISTINCT
@@ -337,7 +352,7 @@ async function importPurchaseOrders(prodConnection, localConnection, incremental
}
}
// Update sync status with proper incrementing of last_sync_id
// Only update sync status if we get here (no errors thrown)
await localConnection.query(`
INSERT INTO sync_status (table_name, last_sync_timestamp)
VALUES ('purchase_orders', NOW())