mowing history
This commit is contained in:
@@ -84,11 +84,16 @@ router.post('/sessions', validateRequest(mowingSessionSchema), async (req, res,
|
||||
router.get('/sessions', async (req, res, next) => {
|
||||
try {
|
||||
const result = await pool.query(
|
||||
`SELECT ms.*, p.name as property_name, ue.custom_name as equipment_name
|
||||
`SELECT ms.*, p.name as property_name, ue.custom_name as equipment_name,
|
||||
STRING_AGG(ls.name, ', ') as section_names,
|
||||
SUM(ls.area) as total_area
|
||||
FROM mowing_sessions ms
|
||||
JOIN properties p ON ms.property_id=p.id
|
||||
LEFT JOIN user_equipment ue ON ms.equipment_id=ue.id
|
||||
JOIN mowing_session_sections lss ON lss.session_id = ms.id
|
||||
JOIN lawn_sections ls ON lss.lawn_section_id = ls.id
|
||||
WHERE ms.user_id=$1
|
||||
GROUP BY ms.id, p.name, ue.custom_name
|
||||
ORDER BY ms.created_at DESC
|
||||
LIMIT 200`,
|
||||
[req.user.id]
|
||||
@@ -214,11 +219,16 @@ router.put('/plans/:id/status', async (req, res, next) => {
|
||||
router.get('/logs', async (req, res, next) => {
|
||||
try {
|
||||
const rs = await pool.query(
|
||||
`SELECT ms.*, p.name as property_name, ue.custom_name as equipment_name
|
||||
`SELECT ms.*, p.name as property_name, ue.custom_name as equipment_name,
|
||||
STRING_AGG(ls.name, ', ') as section_names,
|
||||
SUM(ls.area) as total_area
|
||||
FROM mowing_sessions ms
|
||||
JOIN properties p ON ms.property_id=p.id
|
||||
LEFT JOIN user_equipment ue ON ms.equipment_id=ue.id
|
||||
JOIN mowing_session_sections lss ON lss.session_id = ms.id
|
||||
JOIN lawn_sections ls ON lss.lawn_section_id = ls.id
|
||||
WHERE ms.user_id=$1
|
||||
GROUP BY ms.id, p.name, ue.custom_name
|
||||
ORDER BY ms.created_at DESC
|
||||
LIMIT 200`, [req.user.id]);
|
||||
res.json({ success: true, data: { logs: rs.rows } });
|
||||
|
||||
Reference in New Issue
Block a user