From 655c071960ebad6c00d440e8585c08961da49057 Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 29 Jan 2025 16:25:24 -0500 Subject: [PATCH] Limit order and purchase order imports to last 5 years --- inventory-server/scripts/import/orders.js | 2 ++ .../scripts/import/purchase-orders.js | 20 +++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/inventory-server/scripts/import/orders.js b/inventory-server/scripts/import/orders.js index 768153c..65906fd 100644 --- a/inventory-server/scripts/import/orders.js +++ b/inventory-server/scripts/import/orders.js @@ -36,6 +36,7 @@ async function importOrders(prodConnection, localConnection) { FROM order_items oi FORCE INDEX (PRIMARY) JOIN _order o FORCE INDEX (PRIMARY) ON oi.order_id = o.order_id WHERE o.order_status >= 15 + AND o.date_placed_onlydate >= DATE_SUB(CURRENT_DATE, INTERVAL 5 YEAR) AND (o.date_placed_onlydate > ? OR o.stamp > ?) `, [lastSyncTime, lastSyncTime]); @@ -89,6 +90,7 @@ async function importOrders(prodConnection, localConnection) { FROM order_items oi JOIN _order o ON oi.order_id = o.order_id WHERE o.order_status >= 15 + AND o.date_placed_onlydate >= DATE_SUB(CURRENT_DATE, INTERVAL 5 YEAR) AND (o.date_placed_onlydate > ? OR o.stamp > ?) LIMIT ? OFFSET ? diff --git a/inventory-server/scripts/import/purchase-orders.js b/inventory-server/scripts/import/purchase-orders.js index e2dd1ee..dfd357a 100644 --- a/inventory-server/scripts/import/purchase-orders.js +++ b/inventory-server/scripts/import/purchase-orders.js @@ -52,15 +52,17 @@ async function importPurchaseOrders(prodConnection, localConnection) { FORCE INDEX (idx_date_created) JOIN po_products pop ON p.po_id = pop.po_id JOIN suppliers s ON p.supplier_id = s.supplierid - WHERE p.date_ordered > ? + WHERE p.date_ordered >= DATE_SUB(CURRENT_DATE, INTERVAL 5 YEAR) + AND (p.date_ordered > ? OR p.stamp > ? - OR p.date_modified > ? + OR p.date_modified > ?) UNION SELECT DISTINCT r.receiving_id as po_id, rp.pid FROM receivings_products rp LEFT JOIN receivings r ON r.receiving_id = rp.receiving_id - WHERE rp.received_date > ? - OR rp.stamp > ? + WHERE rp.received_date >= DATE_SUB(CURRENT_DATE, INTERVAL 5 YEAR) + AND (rp.received_date > ? + OR rp.stamp > ?) ) all_items `, [lastSyncTime, lastSyncTime, lastSyncTime, lastSyncTime, lastSyncTime]); @@ -79,15 +81,17 @@ async function importPurchaseOrders(prodConnection, localConnection) { COALESCE(p.notes, '') as long_note FROM ( SELECT po_id FROM po - WHERE date_ordered > ? + WHERE date_ordered >= DATE_SUB(CURRENT_DATE, INTERVAL 5 YEAR) + AND (date_ordered > ? OR stamp > ? - OR date_modified > ? + OR date_modified > ?) UNION SELECT DISTINCT r.receiving_id as po_id FROM receivings r JOIN receivings_products rp ON r.receiving_id = rp.receiving_id - WHERE rp.received_date > ? - OR rp.stamp > ? + WHERE rp.received_date >= DATE_SUB(CURRENT_DATE, INTERVAL 5 YEAR) + AND (rp.received_date > ? + OR rp.stamp > ?) ) ids LEFT JOIN po p ON ids.po_id = p.po_id LEFT JOIN suppliers s1 ON p.supplier_id = s1.supplierid