mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-06-21 06:11:45 +00:00
3bf49d4180
- Times are now per-assignment instead of per-place, so the same place on different days can have different times - Migration 26 adds assignment_time/assignment_end_time columns - New endpoint PUT /assignments/:id/time for updating assignment times - Time picker removed from place creation (only shown when editing) - End-before-start validation disables save button - Time collision warning shows overlapping activities on the same day - Fix participant avatars using avatar_url instead of avatar filename - Rename "Add Place" to "Add Place/Activity" (DE + EN) - Improve README update instructions with docker inspect tip
407 lines
15 KiB
JavaScript
407 lines
15 KiB
JavaScript
const express = require('express');
|
|
const { db, canAccessTrip } = require('../db/database');
|
|
const { authenticate } = require('../middleware/auth');
|
|
const { broadcast } = require('../websocket');
|
|
|
|
const router = express.Router({ mergeParams: true });
|
|
|
|
function verifyTripOwnership(tripId, userId) {
|
|
return canAccessTrip(tripId, userId);
|
|
}
|
|
|
|
function getAssignmentsForDay(dayId) {
|
|
const assignments = db.prepare(`
|
|
SELECT da.*, p.id as place_id, p.name as place_name, p.description as place_description,
|
|
p.lat, p.lng, p.address, p.category_id, p.price, p.currency as place_currency,
|
|
COALESCE(da.assignment_time, p.place_time) as place_time,
|
|
COALESCE(da.assignment_end_time, p.end_time) as end_time,
|
|
p.duration_minutes, p.notes as place_notes,
|
|
p.image_url, p.transport_mode, p.google_place_id, p.website, p.phone,
|
|
c.name as category_name, c.color as category_color, c.icon as category_icon
|
|
FROM day_assignments da
|
|
JOIN places p ON da.place_id = p.id
|
|
LEFT JOIN categories c ON p.category_id = c.id
|
|
WHERE da.day_id = ?
|
|
ORDER BY da.order_index ASC, da.created_at ASC
|
|
`).all(dayId);
|
|
|
|
return assignments.map(a => {
|
|
const tags = db.prepare(`
|
|
SELECT t.* FROM tags t
|
|
JOIN place_tags pt ON t.id = pt.tag_id
|
|
WHERE pt.place_id = ?
|
|
`).all(a.place_id);
|
|
|
|
return {
|
|
id: a.id,
|
|
day_id: a.day_id,
|
|
order_index: a.order_index,
|
|
notes: a.notes,
|
|
created_at: a.created_at,
|
|
place: {
|
|
id: a.place_id,
|
|
name: a.place_name,
|
|
description: a.place_description,
|
|
lat: a.lat,
|
|
lng: a.lng,
|
|
address: a.address,
|
|
category_id: a.category_id,
|
|
price: a.price,
|
|
currency: a.place_currency,
|
|
place_time: a.place_time,
|
|
end_time: a.end_time,
|
|
duration_minutes: a.duration_minutes,
|
|
notes: a.place_notes,
|
|
image_url: a.image_url,
|
|
transport_mode: a.transport_mode,
|
|
google_place_id: a.google_place_id,
|
|
website: a.website,
|
|
phone: a.phone,
|
|
category: a.category_id ? {
|
|
id: a.category_id,
|
|
name: a.category_name,
|
|
color: a.category_color,
|
|
icon: a.category_icon,
|
|
} : null,
|
|
tags,
|
|
}
|
|
};
|
|
});
|
|
}
|
|
|
|
// GET /api/trips/:tripId/days
|
|
router.get('/', authenticate, (req, res) => {
|
|
const { tripId } = req.params;
|
|
|
|
const trip = verifyTripOwnership(tripId, req.user.id);
|
|
if (!trip) {
|
|
return res.status(404).json({ error: 'Trip not found' });
|
|
}
|
|
|
|
const days = db.prepare('SELECT * FROM days WHERE trip_id = ? ORDER BY day_number ASC').all(tripId);
|
|
|
|
if (days.length === 0) {
|
|
return res.json({ days: [] });
|
|
}
|
|
|
|
const dayIds = days.map(d => d.id);
|
|
const dayPlaceholders = dayIds.map(() => '?').join(',');
|
|
|
|
// Load ALL assignments for all days in one query
|
|
const allAssignments = db.prepare(`
|
|
SELECT da.*, p.id as place_id, p.name as place_name, p.description as place_description,
|
|
p.lat, p.lng, p.address, p.category_id, p.price, p.currency as place_currency,
|
|
COALESCE(da.assignment_time, p.place_time) as place_time,
|
|
COALESCE(da.assignment_end_time, p.end_time) as end_time,
|
|
p.duration_minutes, p.notes as place_notes,
|
|
p.image_url, p.transport_mode, p.google_place_id, p.website, p.phone,
|
|
c.name as category_name, c.color as category_color, c.icon as category_icon
|
|
FROM day_assignments da
|
|
JOIN places p ON da.place_id = p.id
|
|
LEFT JOIN categories c ON p.category_id = c.id
|
|
WHERE da.day_id IN (${dayPlaceholders})
|
|
ORDER BY da.order_index ASC, da.created_at ASC
|
|
`).all(...dayIds);
|
|
|
|
// Batch-load ALL tags for all places across all assignments
|
|
const placeIds = [...new Set(allAssignments.map(a => a.place_id))];
|
|
const tagsByPlaceId = {};
|
|
if (placeIds.length > 0) {
|
|
const placePlaceholders = placeIds.map(() => '?').join(',');
|
|
const allTags = db.prepare(`
|
|
SELECT t.*, pt.place_id FROM tags t
|
|
JOIN place_tags pt ON t.id = pt.tag_id
|
|
WHERE pt.place_id IN (${placePlaceholders})
|
|
`).all(...placeIds);
|
|
for (const tag of allTags) {
|
|
if (!tagsByPlaceId[tag.place_id]) tagsByPlaceId[tag.place_id] = [];
|
|
tagsByPlaceId[tag.place_id].push({ id: tag.id, name: tag.name, color: tag.color, created_at: tag.created_at });
|
|
}
|
|
}
|
|
|
|
// Group assignments by day_id
|
|
const assignmentsByDayId = {};
|
|
// Load all participants for all assignments
|
|
const allAssignmentIds = allAssignments.map(a => a.id)
|
|
const allParticipants = allAssignmentIds.length > 0
|
|
? db.prepare(`SELECT ap.assignment_id, ap.user_id, u.username, u.avatar FROM assignment_participants ap JOIN users u ON ap.user_id = u.id WHERE ap.assignment_id IN (${allAssignmentIds.map(() => '?').join(',')})`)
|
|
.all(...allAssignmentIds)
|
|
: []
|
|
const participantsByAssignment = {}
|
|
for (const p of allParticipants) {
|
|
if (!participantsByAssignment[p.assignment_id]) participantsByAssignment[p.assignment_id] = []
|
|
participantsByAssignment[p.assignment_id].push({ user_id: p.user_id, username: p.username, avatar: p.avatar })
|
|
}
|
|
|
|
for (const a of allAssignments) {
|
|
if (!assignmentsByDayId[a.day_id]) assignmentsByDayId[a.day_id] = [];
|
|
assignmentsByDayId[a.day_id].push({
|
|
id: a.id,
|
|
day_id: a.day_id,
|
|
order_index: a.order_index,
|
|
notes: a.notes,
|
|
participants: participantsByAssignment[a.id] || [],
|
|
created_at: a.created_at,
|
|
place: {
|
|
id: a.place_id,
|
|
name: a.place_name,
|
|
description: a.place_description,
|
|
lat: a.lat,
|
|
lng: a.lng,
|
|
address: a.address,
|
|
category_id: a.category_id,
|
|
price: a.price,
|
|
currency: a.place_currency,
|
|
place_time: a.place_time,
|
|
end_time: a.end_time,
|
|
duration_minutes: a.duration_minutes,
|
|
notes: a.place_notes,
|
|
image_url: a.image_url,
|
|
transport_mode: a.transport_mode,
|
|
google_place_id: a.google_place_id,
|
|
website: a.website,
|
|
phone: a.phone,
|
|
category: a.category_id ? {
|
|
id: a.category_id,
|
|
name: a.category_name,
|
|
color: a.category_color,
|
|
icon: a.category_icon,
|
|
} : null,
|
|
tags: tagsByPlaceId[a.place_id] || [],
|
|
}
|
|
});
|
|
}
|
|
|
|
// Load ALL day_notes for all days in one query
|
|
const allNotes = db.prepare(
|
|
`SELECT * FROM day_notes WHERE day_id IN (${dayPlaceholders}) ORDER BY sort_order ASC, created_at ASC`
|
|
).all(...dayIds);
|
|
const notesByDayId = {};
|
|
for (const note of allNotes) {
|
|
if (!notesByDayId[note.day_id]) notesByDayId[note.day_id] = [];
|
|
notesByDayId[note.day_id].push(note);
|
|
}
|
|
|
|
const daysWithAssignments = days.map(day => ({
|
|
...day,
|
|
assignments: assignmentsByDayId[day.id] || [],
|
|
notes_items: notesByDayId[day.id] || [],
|
|
}));
|
|
|
|
res.json({ days: daysWithAssignments });
|
|
});
|
|
|
|
// POST /api/trips/:tripId/days
|
|
router.post('/', authenticate, (req, res) => {
|
|
const { tripId } = req.params;
|
|
|
|
const trip = verifyTripOwnership(tripId, req.user.id);
|
|
if (!trip) {
|
|
return res.status(404).json({ error: 'Trip not found' });
|
|
}
|
|
|
|
const { date, notes } = req.body;
|
|
|
|
const maxDay = db.prepare('SELECT MAX(day_number) as max FROM days WHERE trip_id = ?').get(tripId);
|
|
const dayNumber = (maxDay.max || 0) + 1;
|
|
|
|
const result = db.prepare(
|
|
'INSERT INTO days (trip_id, day_number, date, notes) VALUES (?, ?, ?, ?)'
|
|
).run(tripId, dayNumber, date || null, notes || null);
|
|
|
|
const day = db.prepare('SELECT * FROM days WHERE id = ?').get(result.lastInsertRowid);
|
|
|
|
const dayResult = { ...day, assignments: [] };
|
|
res.status(201).json({ day: dayResult });
|
|
broadcast(tripId, 'day:created', { day: dayResult }, req.headers['x-socket-id']);
|
|
});
|
|
|
|
// PUT /api/trips/:tripId/days/:id
|
|
router.put('/:id', authenticate, (req, res) => {
|
|
const { tripId, id } = req.params;
|
|
|
|
const trip = verifyTripOwnership(tripId, req.user.id);
|
|
if (!trip) {
|
|
return res.status(404).json({ error: 'Trip not found' });
|
|
}
|
|
|
|
const day = db.prepare('SELECT * FROM days WHERE id = ? AND trip_id = ?').get(id, tripId);
|
|
if (!day) {
|
|
return res.status(404).json({ error: 'Day not found' });
|
|
}
|
|
|
|
const { notes, title } = req.body;
|
|
db.prepare('UPDATE days SET notes = ?, title = ? WHERE id = ?').run(notes || null, title !== undefined ? title : day.title, id);
|
|
|
|
const updatedDay = db.prepare('SELECT * FROM days WHERE id = ?').get(id);
|
|
const dayWithAssignments = { ...updatedDay, assignments: getAssignmentsForDay(id) };
|
|
res.json({ day: dayWithAssignments });
|
|
broadcast(tripId, 'day:updated', { day: dayWithAssignments }, req.headers['x-socket-id']);
|
|
});
|
|
|
|
// DELETE /api/trips/:tripId/days/:id
|
|
router.delete('/:id', authenticate, (req, res) => {
|
|
const { tripId, id } = req.params;
|
|
|
|
const trip = verifyTripOwnership(tripId, req.user.id);
|
|
if (!trip) {
|
|
return res.status(404).json({ error: 'Trip not found' });
|
|
}
|
|
|
|
const day = db.prepare('SELECT * FROM days WHERE id = ? AND trip_id = ?').get(id, tripId);
|
|
if (!day) {
|
|
return res.status(404).json({ error: 'Day not found' });
|
|
}
|
|
|
|
db.prepare('DELETE FROM days WHERE id = ?').run(id);
|
|
res.json({ success: true });
|
|
broadcast(tripId, 'day:deleted', { dayId: Number(id) }, req.headers['x-socket-id']);
|
|
});
|
|
|
|
// === Accommodation routes ===
|
|
const accommodationsRouter = express.Router({ mergeParams: true });
|
|
|
|
function getAccommodationWithPlace(id) {
|
|
return db.prepare(`
|
|
SELECT a.*, p.name as place_name, p.address as place_address, p.image_url as place_image, p.lat as place_lat, p.lng as place_lng
|
|
FROM day_accommodations a
|
|
JOIN places p ON a.place_id = p.id
|
|
WHERE a.id = ?
|
|
`).get(id);
|
|
}
|
|
|
|
// GET /api/trips/:tripId/accommodations
|
|
accommodationsRouter.get('/', authenticate, (req, res) => {
|
|
const { tripId } = req.params;
|
|
|
|
const trip = verifyTripOwnership(tripId, req.user.id);
|
|
if (!trip) {
|
|
return res.status(404).json({ error: 'Trip not found' });
|
|
}
|
|
|
|
const accommodations = db.prepare(`
|
|
SELECT a.*, p.name as place_name, p.address as place_address, p.image_url as place_image, p.lat as place_lat, p.lng as place_lng
|
|
FROM day_accommodations a
|
|
JOIN places p ON a.place_id = p.id
|
|
WHERE a.trip_id = ?
|
|
ORDER BY a.created_at ASC
|
|
`).all(tripId);
|
|
|
|
res.json({ accommodations });
|
|
});
|
|
|
|
// POST /api/trips/:tripId/accommodations
|
|
accommodationsRouter.post('/', authenticate, (req, res) => {
|
|
const { tripId } = req.params;
|
|
|
|
const trip = verifyTripOwnership(tripId, req.user.id);
|
|
if (!trip) {
|
|
return res.status(404).json({ error: 'Trip not found' });
|
|
}
|
|
|
|
const { place_id, start_day_id, end_day_id, check_in, check_out, confirmation, notes } = req.body;
|
|
|
|
if (!place_id || !start_day_id || !end_day_id) {
|
|
return res.status(400).json({ error: 'place_id, start_day_id, and end_day_id are required' });
|
|
}
|
|
|
|
const place = db.prepare('SELECT id FROM places WHERE id = ? AND trip_id = ?').get(place_id, tripId);
|
|
if (!place) {
|
|
return res.status(404).json({ error: 'Place not found' });
|
|
}
|
|
|
|
const startDay = db.prepare('SELECT id FROM days WHERE id = ? AND trip_id = ?').get(start_day_id, tripId);
|
|
if (!startDay) {
|
|
return res.status(404).json({ error: 'Start day not found' });
|
|
}
|
|
|
|
const endDay = db.prepare('SELECT id FROM days WHERE id = ? AND trip_id = ?').get(end_day_id, tripId);
|
|
if (!endDay) {
|
|
return res.status(404).json({ error: 'End day not found' });
|
|
}
|
|
|
|
const result = db.prepare(
|
|
'INSERT INTO day_accommodations (trip_id, place_id, start_day_id, end_day_id, check_in, check_out, confirmation, notes) VALUES (?, ?, ?, ?, ?, ?, ?, ?)'
|
|
).run(tripId, place_id, start_day_id, end_day_id, check_in || null, check_out || null, confirmation || null, notes || null);
|
|
|
|
const accommodation = getAccommodationWithPlace(result.lastInsertRowid);
|
|
res.status(201).json({ accommodation });
|
|
broadcast(tripId, 'accommodation:created', { accommodation }, req.headers['x-socket-id']);
|
|
});
|
|
|
|
// PUT /api/trips/:tripId/accommodations/:id
|
|
accommodationsRouter.put('/:id', authenticate, (req, res) => {
|
|
const { tripId, id } = req.params;
|
|
|
|
const trip = verifyTripOwnership(tripId, req.user.id);
|
|
if (!trip) {
|
|
return res.status(404).json({ error: 'Trip not found' });
|
|
}
|
|
|
|
const existing = db.prepare('SELECT * FROM day_accommodations WHERE id = ? AND trip_id = ?').get(id, tripId);
|
|
if (!existing) {
|
|
return res.status(404).json({ error: 'Accommodation not found' });
|
|
}
|
|
|
|
const { place_id, start_day_id, end_day_id, check_in, check_out, confirmation, notes } = req.body;
|
|
|
|
const newPlaceId = place_id !== undefined ? place_id : existing.place_id;
|
|
const newStartDayId = start_day_id !== undefined ? start_day_id : existing.start_day_id;
|
|
const newEndDayId = end_day_id !== undefined ? end_day_id : existing.end_day_id;
|
|
const newCheckIn = check_in !== undefined ? check_in : existing.check_in;
|
|
const newCheckOut = check_out !== undefined ? check_out : existing.check_out;
|
|
const newConfirmation = confirmation !== undefined ? confirmation : existing.confirmation;
|
|
const newNotes = notes !== undefined ? notes : existing.notes;
|
|
|
|
if (place_id !== undefined) {
|
|
const place = db.prepare('SELECT id FROM places WHERE id = ? AND trip_id = ?').get(place_id, tripId);
|
|
if (!place) {
|
|
return res.status(404).json({ error: 'Place not found' });
|
|
}
|
|
}
|
|
|
|
if (start_day_id !== undefined) {
|
|
const startDay = db.prepare('SELECT id FROM days WHERE id = ? AND trip_id = ?').get(start_day_id, tripId);
|
|
if (!startDay) {
|
|
return res.status(404).json({ error: 'Start day not found' });
|
|
}
|
|
}
|
|
|
|
if (end_day_id !== undefined) {
|
|
const endDay = db.prepare('SELECT id FROM days WHERE id = ? AND trip_id = ?').get(end_day_id, tripId);
|
|
if (!endDay) {
|
|
return res.status(404).json({ error: 'End day not found' });
|
|
}
|
|
}
|
|
|
|
db.prepare(
|
|
'UPDATE day_accommodations SET place_id = ?, start_day_id = ?, end_day_id = ?, check_in = ?, check_out = ?, confirmation = ?, notes = ? WHERE id = ?'
|
|
).run(newPlaceId, newStartDayId, newEndDayId, newCheckIn, newCheckOut, newConfirmation, newNotes, id);
|
|
|
|
const accommodation = getAccommodationWithPlace(id);
|
|
res.json({ accommodation });
|
|
broadcast(tripId, 'accommodation:updated', { accommodation }, req.headers['x-socket-id']);
|
|
});
|
|
|
|
// DELETE /api/trips/:tripId/accommodations/:id
|
|
accommodationsRouter.delete('/:id', authenticate, (req, res) => {
|
|
const { tripId, id } = req.params;
|
|
|
|
const trip = verifyTripOwnership(tripId, req.user.id);
|
|
if (!trip) {
|
|
return res.status(404).json({ error: 'Trip not found' });
|
|
}
|
|
|
|
const existing = db.prepare('SELECT * FROM day_accommodations WHERE id = ? AND trip_id = ?').get(id, tripId);
|
|
if (!existing) {
|
|
return res.status(404).json({ error: 'Accommodation not found' });
|
|
}
|
|
|
|
db.prepare('DELETE FROM day_accommodations WHERE id = ?').run(id);
|
|
res.json({ success: true });
|
|
broadcast(tripId, 'accommodation:deleted', { accommodationId: Number(id) }, req.headers['x-socket-id']);
|
|
});
|
|
|
|
module.exports = router;
|
|
module.exports.accommodationsRouter = accommodationsRouter;
|