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

Clean up from simplifying

Browse Source
This commit is contained in:
Matt
2025-02-02 15:41:57 -05:00
parent 7d16500f6f
commit 00c8e1b090
7 changed files with 6 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
inventory-server/scripts/import-from-prod.js
View File

@@ -102,16 +102,6 @@ async function main() {
if (isImportCancelled) throw new Error("Import cancelled"); if (isImportCancelled) throw new Error("Import cancelled");
// Initialize product_metric_status table for any missing products
await localConnection.query(`
INSERT IGNORE INTO product_metric_status (pid)
SELECT pid FROM products p
WHERE NOT EXISTS (
SELECT 1 FROM product_metric_status pms
WHERE pms.pid = p.pid
)
`);
// Clean up any previously running imports that weren't completed // Clean up any previously running imports that weren't completed
await localConnection.query(` await localConnection.query(`
UPDATE import_history UPDATE import_history

15
inventory-server/scripts/import/categories.js
View File

@@ -136,21 +136,6 @@ async function importCategories(prodConnection, localConnection) {
total: totalInserted, total: totalInserted,
elapsed: formatElapsedTime((Date.now() - startTime) / 1000), elapsed: formatElapsedTime((Date.now() - startTime) / 1000),
}); });
// Mark all products in these categories for recalculation
if (categoriesToInsert.length > 0) {
const affectedCatIds = categoriesToInsert.map(c => c.cat_id);
await localConnection.query(`
INSERT INTO product_metric_status (pid, needs_recalculation)
SELECT DISTINCT pc.pid, TRUE
FROM product_categories pc
WHERE pc.cat_id IN (?)
ON DUPLICATE KEY UPDATE
needs_recalculation = TRUE,
updated_at = CURRENT_TIMESTAMP
`, [affectedCatIds]);
}
} }
// After all imports, if we skipped any categories, throw an error // After all imports, if we skipped any categories, throw an error

24
inventory-server/scripts/import/orders.js
View File

@@ -473,18 +473,6 @@ async function importOrders(prodConnection, localConnection, incrementalUpdate =
recordsAdded += inserts; recordsAdded += inserts;
recordsUpdated += updates; recordsUpdated += updates;
importedCount += processedOrderItems.size; importedCount += processedOrderItems.size;
// Mark affected products for recalculation
const affectedPids = [...new Set(validOrders.map(o => o.pid))];
if (affectedPids.length > 0) {
await localConnection.query(`
INSERT INTO product_metric_status (pid, needs_recalculation)
VALUES ${affectedPids.map(() => '(?, TRUE)').join(',')}
ON DUPLICATE KEY UPDATE
needs_recalculation = TRUE,
updated_at = CURRENT_TIMESTAMP
`, affectedPids);
}
} }
// Update progress based on unique orders processed // Update progress based on unique orders processed
@@ -597,18 +585,6 @@ async function importOrders(prodConnection, localConnection, incrementalUpdate =
recordsAdded += inserts; recordsAdded += inserts;
recordsUpdated += updates; recordsUpdated += updates;
importedCount += retryOrderItems.size; importedCount += retryOrderItems.size;
// Mark affected products for recalculation
const affectedPids = [...new Set(validOrders.map(o => o.pid))];
if (affectedPids.length > 0) {
await localConnection.query(`
INSERT INTO product_metric_status (pid, needs_recalculation)
VALUES ${affectedPids.map(() => '(?, TRUE)').join(',')}
ON DUPLICATE KEY UPDATE
needs_recalculation = TRUE,
updated_at = CURRENT_TIMESTAMP
`, affectedPids);
}
} }
} catch (error) { } catch (error) {
console.warn('Warning: Failed to retry skipped orders:', error.message); console.warn('Warning: Failed to retry skipped orders:', error.message);

14
inventory-server/scripts/import/products.js
View File

@@ -203,8 +203,8 @@ async function materializeCalculations(prodConnection, localConnection, incremen
}); });
// Insert all product data into temp table in batches // Insert all product data into temp table in batches
for (let i = 0; i < prodData.length; i += 1000) { for (let i = 0; i < prodData.length; i += 5000) {
const batch = prodData.slice(i, i + 1000); const batch = prodData.slice(i, i + 5000);
const values = batch.map(row => [ const values = batch.map(row => [
row.pid, row.pid,
row.title, row.title,
@@ -315,7 +315,7 @@ async function materializeCalculations(prodConnection, localConnection, incremen
outputProgress({ outputProgress({
status: "running", status: "running",
operation: "Products import", operation: "Products import",
message: `Processed ${Math.min(i + 1000, prodData.length)} of ${prodData.length} product records`, message: `Processed ${Math.min(i + 5000, prodData.length)} of ${prodData.length} product records`,
current: i + batch.length, current: i + batch.length,
total: prodData.length total: prodData.length
}); });
@@ -473,14 +473,6 @@ async function importProducts(prodConnection, localConnection, incrementalUpdate
...insertsAndUpdates.updates.map(p => p.pid), ...insertsAndUpdates.updates.map(p => p.pid),
...insertsAndUpdates.inserts.map(p => p.pid) ...insertsAndUpdates.inserts.map(p => p.pid)
]; ];
await localConnection.query(`
INSERT INTO product_metric_status (pid, needs_recalculation)
VALUES ${affectedPids.map(() => '(?, TRUE)').join(',')}
ON DUPLICATE KEY UPDATE
needs_recalculation = TRUE,
updated_at = CURRENT_TIMESTAMP
`, affectedPids);
} }
// Process category relationships // Process category relationships

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

@@ -474,18 +474,6 @@ async function importPurchaseOrders(prodConnection, localConnection, incremental
recordsAdded += inserts; recordsAdded += inserts;
recordsUpdated += Math.floor(updates); // Ensure we never have fractional updates recordsUpdated += Math.floor(updates); // Ensure we never have fractional updates
processed += batchProcessed; processed += batchProcessed;
// Mark affected products for recalculation
const affectedPids = [...new Set(productBatch.map(p => p.pid))];
if (affectedPids.length > 0) {
await localConnection.query(`
INSERT INTO product_metric_status (pid, needs_recalculation)
VALUES ${affectedPids.map(() => '(?, TRUE)').join(',')}
ON DUPLICATE KEY UPDATE
needs_recalculation = TRUE,
updated_at = CURRENT_TIMESTAMP
`, affectedPids);
}
} }
// Handle updates - now we know these actually have changes // Handle updates - now we know these actually have changes
@@ -511,18 +499,6 @@ async function importPurchaseOrders(prodConnection, localConnection, incremental
recordsUpdated += Math.floor(updates); // Ensure we never have fractional updates recordsUpdated += Math.floor(updates); // Ensure we never have fractional updates
processed += batchProcessed; processed += batchProcessed;
// Mark affected products for recalculation
const affectedPids = [...new Set(productBatch.map(p => p.pid))];
if (affectedPids.length > 0) {
await localConnection.query(`
INSERT INTO product_metric_status (pid, needs_recalculation)
VALUES ${affectedPids.map(() => '(?, TRUE)').join(',')}
ON DUPLICATE KEY UPDATE
needs_recalculation = TRUE,
updated_at = CURRENT_TIMESTAMP
`, affectedPids);
}
} }
// Update progress based on time interval // Update progress based on time interval

26
inventory-server/scripts/reset-db.js
View File

@@ -43,8 +43,7 @@ const CONFIG_TABLES = [
'sales_seasonality', 'sales_seasonality',
'turnover_config', 'turnover_config',
'sync_status', 'sync_status',
'metric_calculation_config', 'metric_calculation_config'
'product_metric_status'
]; ];
// Split SQL into individual statements // Split SQL into individual statements
@@ -501,29 +500,6 @@ async function resetDatabase() {
} }
} }
// Verify triggers exist
const [triggers] = await connection.query('SHOW TRIGGERS');
const expectedTriggers = [
'orders_after_insert_update',
'purchase_orders_after_insert_update',
'products_after_insert_update'
];
const missingTriggers = expectedTriggers.filter(
triggerName => !triggers.some(t => t.Trigger === triggerName)
);
if (missingTriggers.length > 0) {
throw new Error(
`Missing required triggers: ${missingTriggers.join(', ')}`
);
}
outputProgress({
operation: 'Triggers verified',
message: `Successfully verified triggers: ${expectedTriggers.join(', ')}`
});
outputProgress({ outputProgress({
status: 'complete', status: 'complete',
operation: 'Database reset complete', operation: 'Database reset complete',

4
inventory-server/scripts/reset-metrics.js
View File

@@ -34,8 +34,8 @@ const METRICS_TABLES = [
'sales_forecasts', 'sales_forecasts',
'temp_purchase_metrics', 'temp_purchase_metrics',
'temp_sales_metrics', 'temp_sales_metrics',
'vendor_metrics', //before vendor_details for foreign key 'vendor_metrics',
'vendor_time_metrics', //before vendor_details for foreign key 'vendor_time_metrics',
'vendor_details' 'vendor_details'
]; ];