validation shit

This commit is contained in:
Jake Kasper
2025-08-25 09:07:51 -04:00
parent 1acff6c440
commit dff93f9424
2 changed files with 11 additions and 2 deletions

View File

@@ -194,7 +194,10 @@ router.get('/spreaders', async (req, res, next) => {
LEFT JOIN equipment_categories ec ON ue.category_id = ec.id
WHERE ue.user_id = $1
AND ue.is_active = true
AND (ec.name ILIKE '%spreader%' OR ue.spreader_type IS NOT NULL)
AND (ec.name ILIKE '%spreader%'
OR ue.spreader_type IS NOT NULL
OR ue.custom_name ILIKE '%spreader%'
OR ue.manufacturer ILIKE '%spreader%')
ORDER BY ue.custom_name, ue.manufacturer, ue.model`,
[req.user.id]
);

View File

@@ -108,7 +108,13 @@ const userProductSchema = Joi.object({
Joi.string().allow(''),
Joi.allow(null)
).optional()
}).or('equipmentId', 'spreaderBrand') // Must have either equipment reference or brand
}).when('equipmentId', {
is: Joi.exist(),
then: Joi.object(), // When equipmentId exists, spreaderBrand is optional
otherwise: Joi.object({
spreaderBrand: Joi.string().max(100).required() // When no equipmentId, require spreaderBrand
})
})
).optional()
});