This commit is contained in:
Jake Kasper
2025-08-22 15:52:52 -04:00
parent 8049a72505
commit 7790b72eb3

View File

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