From 7790b72eb38664bebc91ea7c1126fac8c2df5769 Mon Sep 17 00:00:00 2001
From: Jake Kasper <jake.kasper@hpe.com>
Date: Fri, 22 Aug 2025 15:52:52 -0400
Subject: [PATCH] nozzles

---
 backend/src/routes/nozzles.js | 38 +++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/backend/src/routes/nozzles.js b/backend/src/routes/nozzles.js
index 193f0e2..1ffd436 100644
--- a/backend/src/routes/nozzles.js
+++ b/backend/src/routes/nozzles.js
@@ -167,13 +167,17 @@ router.get('/flow-rate/:nozzleTypeId/:pressurePsi', validateParams(idParamSchema
 router.get('/', async (req, res, next) => {
   try {
     const result = await pool.query(
-      `SELECT un.*, nt.name as type_name, nt.manufacturer as type_manufacturer, 
-              nt.model as type_model, nt.orifice_size, nt.spray_angle, nt.flow_rate_gpm,
-              nt.droplet_size, nt.spray_pattern, nt.pressure_range_psi
-       FROM user_nozzles un
-       LEFT JOIN nozzle_types nt ON un.nozzle_type_id = nt.id
-       WHERE un.user_id = $1
-       ORDER BY nt.manufacturer, nt.name, un.custom_name`,
+      `SELECT ue.id, ue.custom_name, ue.manufacturer, ue.model,
+              ue.orifice_size, ue.spray_angle, ue.flow_rate_gpm,
+              ue.droplet_size, ue.spray_pattern, ue.pressure_range_psi,
+              ue.thread_size, ue.material, ue.color_code, ue.quantity_owned,
+              et.name as type_name, ec.name as category_name,
+              ue.created_at, ue.updated_at
+       FROM user_equipment ue
+       JOIN equipment_types et ON ue.equipment_type_id = et.id
+       JOIN equipment_categories ec ON et.category_id = ec.id
+       WHERE ue.user_id = $1 AND ec.name = 'Nozzle'
+       ORDER BY ue.manufacturer, ue.custom_name`,
       [req.user.id]
     );
 
@@ -182,21 +186,21 @@ router.get('/', async (req, res, next) => {
       data: {
         nozzles: result.rows.map(item => ({
           id: item.id,
-          nozzleTypeId: item.nozzle_type_id,
+          customName: item.custom_name,
           typeName: item.type_name,
-          typeManufacturer: item.type_manufacturer,
-          typeModel: item.type_model,
+          manufacturer: item.manufacturer,
+          model: item.model,
           orificeSize: item.orifice_size,
-          sprayAngle: item.spray_angle,
-          flowRateGpm: parseFloat(item.flow_rate_gpm),
+          sprayAngle: parseInt(item.spray_angle) || null,
+          flowRateGpm: parseFloat(item.flow_rate_gpm) || null,
           dropletSize: item.droplet_size,
           sprayPattern: item.spray_pattern,
           pressureRangePsi: item.pressure_range_psi,
-          customName: item.custom_name,
-          quantity: item.quantity,
-          condition: item.condition,
-          purchaseDate: item.purchase_date,
-          notes: item.notes,
+          threadSize: item.thread_size,
+          material: item.material,
+          colorCode: item.color_code,
+          quantityOwned: parseInt(item.quantity_owned) || 1,
+          categoryName: item.category_name,
           createdAt: item.created_at,
           updatedAt: item.updated_at
         }))