Add some additional existing data points to products table (partly broken)

inventory-server/src/routes/products.js

@@ -78,6 +78,55 @@ router.get('/', async (req, res) => {
       paramCounter++;
     }
 
+    // Add new text filters for the additional fields
+    if (req.query.description) {
+      conditions.push(`p.description ILIKE $${paramCounter}`);
+      params.push(`%${req.query.description}%`);
+      paramCounter++;
+    }
+
+    if (req.query.harmonized_tariff_code) {
+      conditions.push(`p.harmonized_tariff_code ILIKE $${paramCounter}`);
+      params.push(`%${req.query.harmonized_tariff_code}%`);
+      paramCounter++;
+    }
+
+    if (req.query.notions_reference) {
+      conditions.push(`p.notions_reference ILIKE $${paramCounter}`);
+      params.push(`%${req.query.notions_reference}%`);
+      paramCounter++;
+    }
+
+    if (req.query.line) {
+      conditions.push(`p.line ILIKE $${paramCounter}`);
+      params.push(`%${req.query.line}%`);
+      paramCounter++;
+    }
+
+    if (req.query.subline) {
+      conditions.push(`p.subline ILIKE $${paramCounter}`);
+      params.push(`%${req.query.subline}%`);
+      paramCounter++;
+    }
+
+    if (req.query.artist) {
+      conditions.push(`p.artist ILIKE $${paramCounter}`);
+      params.push(`%${req.query.artist}%`);
+      paramCounter++;
+    }
+
+    if (req.query.country_of_origin) {
+      conditions.push(`p.country_of_origin ILIKE $${paramCounter}`);
+      params.push(`%${req.query.country_of_origin}%`);
+      paramCounter++;
+    }
+
+    if (req.query.location) {
+      conditions.push(`p.location ILIKE $${paramCounter}`);
+      params.push(`%${req.query.location}%`);
+      paramCounter++;
+    }
+
     // Handle numeric filters with operators
     const numericFields = {
       stock: 'p.stock_quantity',
@@ -102,7 +151,16 @@ router.get('/', async (req, res) => {
       daysOfStock: 'pm.days_of_inventory',
       weeksOfStock: 'pm.weeks_of_inventory',
       reorderPoint: 'pm.reorder_point',
-      safetyStock: 'pm.safety_stock'
+      safetyStock: 'pm.safety_stock',
+      // Add new numeric fields
+      preorderCount: 'p.preorder_count',
+      notionsInvCount: 'p.notions_inv_count',
+      rating: 'p.rating',
+      reviews: 'p.reviews',
+      weight: 'p.weight',
+      totalSold: 'p.total_sold',
+      baskets: 'p.baskets',
+      notifies: 'p.notifies'
     };
 
     Object.entries(req.query).forEach(([key, value]) => {
@@ -298,7 +356,8 @@ router.get('/', async (req, res) => {
         pm.last_received_date,
         pm.abc_class,
         pm.stock_status,
-        pm.turnover_rate
+        pm.turnover_rate,
+        p.date_last_sold
       FROM products p
       LEFT JOIN product_metrics pm ON p.pid = pm.pid
       LEFT JOIN product_categories pc ON p.pid = pc.pid
@@ -515,6 +574,29 @@ router.get('/:id', async (req, res) => {
       uom: parseInt(productRows[0].uom),
       managing_stock: Boolean(productRows[0].managing_stock),
       replenishable: Boolean(productRows[0].replenishable),
+      // Format new fields
+      preorder_count: parseInt(productRows[0].preorder_count || 0),
+      notions_inv_count: parseInt(productRows[0].notions_inv_count || 0),
+      harmonized_tariff_code: productRows[0].harmonized_tariff_code || '',
+      notions_reference: productRows[0].notions_reference || '',
+      line: productRows[0].line || '',
+      subline: productRows[0].subline || '',
+      artist: productRows[0].artist || '',
+      rating: parseFloat(productRows[0].rating || 0),
+      reviews: parseInt(productRows[0].reviews || 0),
+      weight: parseFloat(productRows[0].weight || 0),
+      dimensions: {
+        length: parseFloat(productRows[0].length || 0),
+        width: parseFloat(productRows[0].width || 0),
+        height: parseFloat(productRows[0].height || 0),
+      },
+      country_of_origin: productRows[0].country_of_origin || '',
+      location: productRows[0].location || '',
+      total_sold: parseInt(productRows[0].total_sold || 0),
+      baskets: parseInt(productRows[0].baskets || 0),
+      notifies: parseInt(productRows[0].notifies || 0),
+      date_last_sold: productRows[0].date_last_sold || null,
+      // Format existing analytics fields
       daily_sales_avg: parseFloat(productRows[0].daily_sales_avg) || 0,
       weekly_sales_avg: parseFloat(productRows[0].weekly_sales_avg) || 0,
       monthly_sales_avg: parseFloat(productRows[0].monthly_sales_avg) || 0,