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

fixyfix

Browse Source
This commit is contained in:
Jake Kasper
2025-08-25 09:05:10 -04:00
parent fc832bc66a
commit 1acff6c440
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/routes/productSpreaderSettings.js
View File

@@ -17,7 +17,14 @@ const spreaderSettingSchema = Joi.object({
settingValue: Joi.string().max(20).required(),
rateDescription: Joi.string().max(200).allow(null, '').optional(),
notes: Joi.string().allow(null, '').optional()
}).xor('productId', 'userProductId').and('equipmentId', 'settingValue'); // Must have either productId or userProductId, but not both
}).xor('productId', 'userProductId')
.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
})
}); // Must have either productId or userProductId, but not both
const idParamSchema = Joi.object({
id: Joi.number().integer().positive().required()

23
frontend/src/pages/Products/Products.js
View File

@@ -73,18 +73,25 @@ const Products = () => {
// Save spreader settings if any
if (productData.spreaderSettings && productData.spreaderSettings.length > 0) {
const settingPromises = productData.spreaderSettings.map(setting =>
productSpreaderSettingsAPI.create({
const settingPromises = productData.spreaderSettings.map(setting => {
const payload = {
userProductId: createdProduct.id,
equipmentId: setting.equipmentId ? parseInt(setting.equipmentId) : null,
// Legacy fields for backward compatibility
spreaderBrand: setting.spreaderBrand || null,
spreaderModel: setting.spreaderModel || null,
settingValue: setting.settingValue,
rateDescription: setting.rateDescription || null,
notes: setting.notes && setting.notes.trim() ? setting.notes.trim() : null
})
);
};
// Use equipment-based approach if equipmentId is available
if (setting.equipmentId) {
payload.equipmentId = parseInt(setting.equipmentId);
} else {
// Fall back to legacy approach
payload.spreaderBrand = setting.spreaderBrand;
payload.spreaderModel = setting.spreaderModel || null;
}
return productSpreaderSettingsAPI.create(payload);
});
await Promise.all(settingPromises);
}