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

codex changes

Browse Source
This commit is contained in:
Jake Kasper
2025-09-02 07:02:34 -05:00
parent e75be978fa
commit 4853eff749
6 changed files with 171 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/middleware/auth.js
View File

@@ -12,8 +12,10 @@ const authenticateToken = async (req, res, next) => {
});
}
// Log token for debugging (remove in production)
console.log('Token received:', token.substring(0, 20) + '...');
// Log token prefix only in non-production for debugging
if (process.env.NODE_ENV !== 'production') {
console.log('Token received:', token.substring(0, 20) + '...');
}
try {
const decoded = jwt.verify(token, process.env.JWT_SECRET);
@@ -75,4 +77,4 @@ module.exports = {
authenticateToken,
requireAdmin,
requireOwnership
};
};

64
backend/src/routes/applications.js
View File

@@ -76,7 +76,7 @@ router.get('/plans', async (req, res, next) => {
SUM(DISTINCT ls.area) as total_section_area,
COUNT(DISTINCT aps.lawn_section_id) as section_count,
p.id as property_id, p.name as property_name, p.address as property_address,
ue.custom_name as equipment_name, et.name as equipment_type
ue.id as equipment_id, ue.custom_name as equipment_name, et.name as equipment_type
FROM application_plans ap
JOIN application_plan_sections aps ON ap.id = aps.plan_id
JOIN lawn_sections ls ON aps.lawn_section_id = ls.id
@@ -84,7 +84,7 @@ router.get('/plans', async (req, res, next) => {
LEFT JOIN user_equipment ue ON ap.equipment_id = ue.id
LEFT JOIN equipment_types et ON ue.equipment_type_id = et.id
WHERE ${whereClause}
GROUP BY ap.id, p.id, p.name, p.address, ue.custom_name, et.name
GROUP BY ap.id, p.id, p.name, p.address, ue.id, ue.custom_name, et.name
ORDER BY ap.planned_date DESC, ap.created_at DESC`,
queryParams
);
@@ -144,46 +144,37 @@ router.get('/plans', async (req, res, next) => {
}));
// Only get spreader settings for granular applications with equipment
if (plan.equipment_name && productsResult.rows.length > 0) {
if (plan.equipment_id && productsResult.rows.length > 0) {
const firstProduct = productsResult.rows[0];
console.log('Checking spreader settings for plan:', {
planId: plan.id,
equipmentName: plan.equipment_name,
productInfo: {
productId: firstProduct.product_id,
userProductId: firstProduct.user_product_id,
sharedName: firstProduct.shared_name,
productType: firstProduct.product_type
}
});
if (process.env.NODE_ENV !== 'production') {
console.log('Checking spreader settings for plan:', {
planId: plan.id,
equipmentId: plan.equipment_id,
productInfo: {
productId: firstProduct.product_id,
userProductId: firstProduct.user_product_id,
sharedName: firstProduct.shared_name,
productType: firstProduct.product_type
}
});
}
const productType = firstProduct.product_type;
console.log('Detected product type:', productType);
if (process.env.NODE_ENV !== 'production') {
console.log('Detected product type:', productType);
}
if (productType === 'granular') {
// Get equipment ID
const equipmentResult = await pool.query(
'SELECT id FROM user_equipment WHERE custom_name = $1 AND user_id = $2',
[plan.equipment_name, req.user.id]
// Use equipment_id directly to avoid name-based lookup
const equipmentId = plan.equipment_id;
spreaderSetting = await getSpreaderSettingsForEquipment(
equipmentId,
firstProduct.product_id,
firstProduct.user_product_id,
req.user.id
);
console.log('Equipment lookup result:', {
equipmentName: plan.equipment_name,
userId: req.user.id,
foundEquipment: equipmentResult.rows.length > 0,
equipmentId: equipmentResult.rows[0]?.id
});
if (equipmentResult.rows.length > 0) {
const equipmentId = equipmentResult.rows[0].id;
spreaderSetting = await getSpreaderSettingsForEquipment(
equipmentId,
firstProduct.product_id,
firstProduct.user_product_id,
req.user.id
);
if (process.env.NODE_ENV !== 'production') {
console.log('Spreader setting lookup result:', {
equipmentId,
productId: firstProduct.product_id,
@@ -207,6 +198,7 @@ router.get('/plans', async (req, res, next) => {
propertyId: plan.property_id, // Add property ID for frontend to use
propertyName: plan.property_name,
propertyAddress: plan.property_address,
equipmentId: plan.equipment_id,
equipmentName: plan.equipment_name || plan.equipment_type,
productCount: parseInt(planProductInfo.product_count || 0),
totalProductAmount: parseFloat(planProductInfo.total_product_amount || 0),
@@ -1491,4 +1483,4 @@ router.get('/logs', async (req, res, next) => {
}
});
module.exports = router;
module.exports = router;