This commit is contained in:
Jake Kasper
2025-08-26 07:29:10 -05:00
parent 0e7f6c32f4
commit 05b4334ac6
2 changed files with 270 additions and 22 deletions

View File

@@ -216,12 +216,14 @@ router.get('/plans/:id', validateParams(idParamSchema), async (req, res, next) =
`SELECT ap.*, ls.name as section_name, ls.area as section_area, ls.polygon_data,
p.id as property_id, p.name as property_name, p.address as property_address,
ue.id as equipment_id, ue.custom_name as equipment_name,
et.name as equipment_type, et.category as equipment_category
et.name as equipment_type, et.category as equipment_category,
nz.id as nozzle_id, nz.custom_name as nozzle_name, nz.flow_rate_gpm, nz.spray_angle
FROM application_plans ap
JOIN lawn_sections ls ON ap.lawn_section_id = ls.id
JOIN properties p ON ls.property_id = p.id
LEFT JOIN user_equipment ue ON ap.equipment_id = ue.id
LEFT JOIN equipment_types et ON ue.equipment_type_id = et.id
LEFT JOIN user_equipment nz ON ap.nozzle_id = nz.id
WHERE ap.id = $1 AND ap.user_id = $2`,
[planId, req.user.id]
);
@@ -271,6 +273,12 @@ router.get('/plans/:id', validateParams(idParamSchema), async (req, res, next) =
type: plan.equipment_type,
category: plan.equipment_category
},
nozzle: plan.nozzle_id ? {
id: plan.nozzle_id,
name: plan.nozzle_name,
flowRateGpm: plan.flow_rate_gpm,
sprayAngle: plan.spray_angle
} : null,
products: productsResult.rows.map(product => ({
id: product.id,
productId: product.product_id,