kasperj/turftracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfgsgs

Browse Source
This commit is contained in:
Jake Kasper
2025-08-25 09:13:21 -04:00
parent dff93f9424
commit 6c70ebe0ae
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/routes/equipment.js
View File

@@ -193,11 +193,9 @@ router.get('/spreaders', async (req, res, next) => {
FROM user_equipment ue FROM user_equipment ue
LEFT JOIN equipment_categories ec ON ue.category_id = ec.id LEFT JOIN equipment_categories ec ON ue.category_id = ec.id
WHERE ue.user_id = $1 WHERE ue.user_id = $1
AND ue.is_active = true AND ue.is_active = true
AND (ec.name ILIKE '%spreader%' -- Temporarily show all equipment so user can identify spreaders
OR ue.spreader_type IS NOT NULL -- TODO: Add proper spreader identification/categorization
OR ue.custom_name ILIKE '%spreader%'
OR ue.manufacturer ILIKE '%spreader%')
ORDER BY ue.custom_name, ue.manufacturer, ue.model`, ORDER BY ue.custom_name, ue.manufacturer, ue.model`,
[req.user.id] [req.user.id]
); );

6
backend/src/utils/validation.js
View File

@@ -109,10 +109,10 @@ const userProductSchema = Joi.object({
Joi.allow(null) Joi.allow(null)
).optional() ).optional()
}).when('equipmentId', { }).when('equipmentId', {
is: Joi.exist(), is: Joi.number().positive(),
then: Joi.object(), // When equipmentId exists, spreaderBrand is optional then: Joi.object(), // When equipmentId is a positive number, spreaderBrand is optional
otherwise: Joi.object({ otherwise: Joi.object({
spreaderBrand: Joi.string().max(100).required() // When no equipmentId, require spreaderBrand spreaderBrand: Joi.string().max(100).required() // When no valid equipmentId, require spreaderBrand
}) })
}) })
).optional() ).optional()