diff --git a/client/package-lock.json b/client/package-lock.json index 82b77715..18078911 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "trek-client", - "version": "2.9.0", + "version": "2.9.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "trek-client", - "version": "2.9.0", + "version": "2.9.7", "dependencies": { "@react-pdf/renderer": "^4.3.2", "axios": "^1.6.7", diff --git a/client/package.json b/client/package.json index 10c40158..0462203b 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "trek-client", - "version": "2.9.0", + "version": "2.9.7", "private": true, "type": "module", "scripts": { diff --git a/client/src/api/client.ts b/client/src/api/client.ts index eb3a236e..237d3e64 100644 --- a/client/src/api/client.ts +++ b/client/src/api/client.ts @@ -248,7 +248,7 @@ export const reservationsApi = { create: (tripId: number | string, data: Record) => apiClient.post(`/trips/${tripId}/reservations`, data).then(r => r.data), update: (tripId: number | string, id: number, data: Record) => apiClient.put(`/trips/${tripId}/reservations/${id}`, data).then(r => r.data), delete: (tripId: number | string, id: number) => apiClient.delete(`/trips/${tripId}/reservations/${id}`).then(r => r.data), - updatePositions: (tripId: number | string, positions: { id: number; day_plan_position: number }[]) => apiClient.put(`/trips/${tripId}/reservations/positions`, { positions }).then(r => r.data), + updatePositions: (tripId: number | string, positions: { id: number; day_plan_position: number }[], dayId?: number) => apiClient.put(`/trips/${tripId}/reservations/positions`, { positions, day_id: dayId }).then(r => r.data), } export const weatherApi = { diff --git a/client/src/components/Memories/MemoriesPanel.tsx b/client/src/components/Memories/MemoriesPanel.tsx index a466e265..baed3cd3 100644 --- a/client/src/components/Memories/MemoriesPanel.tsx +++ b/client/src/components/Memories/MemoriesPanel.tsx @@ -956,6 +956,9 @@ export default function MemoriesPanel({ tripId, startDate, endDate }: MemoriesPa setLightboxUserId(photo.user_id) setLightboxInfo(null) fetchImageAsBlob('/api' + buildProviderAssetUrl(photo, 'original')).then(setLightboxOriginalSrc) + setLightboxInfoLoading(true) + apiClient.get(buildProviderAssetUrl(photo, 'info')) + .then(r => setLightboxInfo(r.data)).catch(() => {}).finally(() => setLightboxInfoLoading(false)) } const exifContent = lightboxInfo ? ( diff --git a/client/src/components/Planner/DayPlanSidebar.tsx b/client/src/components/Planner/DayPlanSidebar.tsx index 58e8a751..5393ec9e 100644 --- a/client/src/components/Planner/DayPlanSidebar.tsx +++ b/client/src/components/Planner/DayPlanSidebar.tsx @@ -341,14 +341,13 @@ const DayPlanSidebar = React.memo(function DayPlanSidebar({ initTransportPositions(dayId) } - // Build base list: ALL places (timed and untimed) + notes sorted by order_index/sort_order - // Places keep their order_index ordering — only transports are inserted based on time. + // All places keep their order_index — untimed can be freely moved, timed auto-sort when time is set const baseItems = [ ...da.map(a => ({ type: 'place' as const, sortKey: a.order_index, data: a })), ...dn.map(n => ({ type: 'note' as const, sortKey: n.sort_order, data: n })), ].sort((a, b) => a.sortKey - b.sortKey) - // Only transports are inserted among base items based on time/position + // Transports are inserted among places based on time const timedTransports = transport.map(r => ({ type: 'transport' as const, data: r, @@ -360,19 +359,20 @@ const DayPlanSidebar = React.memo(function DayPlanSidebar({ return timedTransports.map((item, i) => ({ ...item, sortKey: i })) } - // Insert transports among base items using persisted position or time-to-position mapping. + // Insert transports among places based on per-day position or time const result = [...baseItems] for (let ti = 0; ti < timedTransports.length; ti++) { const timed = timedTransports[ti] const minutes = timed.minutes - // Use persisted position if available - if (timed.data.day_plan_position != null) { - result.push({ type: timed.type, sortKey: timed.data.day_plan_position, data: timed.data }) + // Use per-day position if explicitly set by user reorder + const perDayPos = timed.data.day_positions?.[dayId] ?? timed.data.day_positions?.[String(dayId)] + if (perDayPos != null) { + result.push({ type: timed.type, sortKey: perDayPos, data: timed.data }) continue } - // Find insertion position: after the last base item with time <= this transport's time + // Find insertion position: after the last place with time <= this transport's time let insertAfterKey = -Infinity for (const item of result) { if (item.type === 'place') { @@ -500,10 +500,15 @@ const DayPlanSidebar = React.memo(function DayPlanSidebar({ if (transportUpdates.length) { for (const tu of transportUpdates) { const res = reservations.find(r => r.id === tu.id) - if (res) res.day_plan_position = tu.day_plan_position + if (res) { + res.day_plan_position = tu.day_plan_position + // Update per-day position for multi-day reservations + if (!res.day_positions) res.day_positions = {} + res.day_positions[dayId] = tu.day_plan_position + } } setTransportPosVersion(v => v + 1) - await reservationsApi.updatePositions(tripId, transportUpdates) + await reservationsApi.updatePositions(tripId, transportUpdates, dayId) } if (prevAssignmentIds.length) { const capturedDayId = dayId diff --git a/client/src/components/Planner/ReservationModal.tsx b/client/src/components/Planner/ReservationModal.tsx index bc8c34fd..d974d6a8 100644 --- a/client/src/components/Planner/ReservationModal.tsx +++ b/client/src/components/Planner/ReservationModal.tsx @@ -2,6 +2,7 @@ import { useState, useEffect, useRef, useMemo } from 'react' import { useParams } from 'react-router-dom' import apiClient from '../../api/client' import { useTripStore } from '../../store/tripStore' +import { useAddonStore } from '../../store/addonStore' import Modal from '../shared/Modal' import CustomSelect from '../shared/CustomSelect' import { Plane, Hotel, Utensils, Train, Car, Ship, Ticket, FileText, Users, Paperclip, X, ExternalLink, Link2 } from 'lucide-react' @@ -71,6 +72,7 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p const { t, locale } = useTranslation() const fileInputRef = useRef(null) + const isBudgetEnabled = useAddonStore(s => s.isEnabled('budget')) const budgetItems = useTripStore(s => s.budgetItems) const budgetCategories = useMemo(() => { const cats = new Set() @@ -139,7 +141,7 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p hotel_start_day: (() => { const acc = accommodations.find(a => a.id == reservation.accommodation_id); return acc?.start_day_id || '' })(), hotel_end_day: (() => { const acc = accommodations.find(a => a.id == reservation.accommodation_id); return acc?.end_day_id || '' })(), price: meta.price || '', - budget_category: meta.budget_category || '', + budget_category: (meta.budget_category && budgetItems.some(i => i.category === meta.budget_category)) ? meta.budget_category : '', }) } else { setForm({ @@ -196,8 +198,10 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p if (form.end_date) { combinedEndTime = form.reservation_end_time ? `${form.end_date}T${form.reservation_end_time}` : form.end_date } - if (form.price) metadata.price = form.price - if (form.budget_category) metadata.budget_category = form.budget_category + if (isBudgetEnabled) { + if (form.price) metadata.price = form.price + if (form.budget_category) metadata.budget_category = form.budget_category + } const saveData: Record = { title: form.title, type: form.type, status: form.status, reservation_time: form.reservation_time, reservation_end_time: combinedEndTime, @@ -208,9 +212,11 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p metadata: Object.keys(metadata).length > 0 ? metadata : null, } // Auto-create/update budget entry if price is set, or signal removal if cleared - saveData.create_budget_entry = form.price && parseFloat(form.price) > 0 - ? { total_price: parseFloat(form.price), category: form.budget_category || t(`reservations.type.${form.type}`) || 'Other' } - : { total_price: 0 } + if (isBudgetEnabled) { + saveData.create_budget_entry = form.price && parseFloat(form.price) > 0 + ? { total_price: parseFloat(form.price), category: form.budget_category || t(`reservations.type.${form.type}`) || 'Other' } + : { total_price: 0 } + } // If hotel with place + days, pass hotel data for auto-creation or update if (form.type === 'hotel' && form.hotel_place_id && form.hotel_start_day && form.hotel_end_day) { saveData.create_accommodation = { @@ -643,33 +649,37 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p - {/* Price + Budget Category */} -
-
- - { const v = e.target.value; if (v === '' || /^\d*\.?\d{0,2}$/.test(v)) set('price', v) }} - placeholder="0.00" - style={inputStyle} /> -
-
- - set('budget_category', v)} - options={[ - { value: '', label: t('reservations.budgetCategoryAuto') }, - ...budgetCategories.map(c => ({ value: c, label: c })), - ]} - placeholder={t('reservations.budgetCategoryAuto')} - size="sm" - /> -
-
- {form.price && parseFloat(form.price) > 0 && ( -
- {t('reservations.budgetHint')} -
+ {/* Price + Budget Category — only shown when budget addon is enabled */} + {isBudgetEnabled && ( + <> +
+
+ + { const v = e.target.value; if (v === '' || /^\d*\.?\d{0,2}$/.test(v)) set('price', v) }} + placeholder="0.00" + style={inputStyle} /> +
+
+ + set('budget_category', v)} + options={[ + { value: '', label: t('reservations.budgetCategoryAuto') }, + ...budgetCategories.map(c => ({ value: c, label: c })), + ]} + placeholder={t('reservations.budgetCategoryAuto')} + size="sm" + /> +
+
+ {form.price && parseFloat(form.price) > 0 && ( +
+ {t('reservations.budgetHint')} +
+ )} + )} {/* Actions */} diff --git a/client/src/pages/AtlasPage.tsx b/client/src/pages/AtlasPage.tsx index ddff4ce4..2365c8cf 100644 --- a/client/src/pages/AtlasPage.tsx +++ b/client/src/pages/AtlasPage.tsx @@ -480,15 +480,13 @@ export default function AtlasPage(): React.ReactElement { } } - // Match feature by ISO code OR region name + // Match feature by ISO code OR region name (native or English) const isVisitedFeature = (f: any) => { if (visitedRegionCodes.has(f.properties?.iso_3166_2)) return true const name = (f.properties?.name || '').toLowerCase() if (visitedRegionNames.has(name)) return true - // Fuzzy: check if any visited name is contained in feature name or vice versa - for (const vn of visitedRegionNames) { - if (name.includes(vn) || vn.includes(name)) return true - } + const nameEn = (f.properties?.name_en || '').toLowerCase() + if (nameEn && visitedRegionNames.has(nameEn)) return true return false } @@ -535,15 +533,16 @@ export default function AtlasPage(): React.ReactElement { }, onEachFeature: (feature, layer) => { const regionName = feature?.properties?.name || '' + const regionNameEn = feature?.properties?.name_en || '' const countryName = feature?.properties?.admin || '' const regionCode = feature?.properties?.iso_3166_2 || '' const countryA2 = (feature?.properties?.iso_a2 || '').toUpperCase() const visited = isVisitedFeature(feature) - const count = regionPlaceCounts[regionCode] || regionPlaceCounts[regionName.toLowerCase()] || 0 + const count = regionPlaceCounts[regionCode] || regionPlaceCounts[regionName.toLowerCase()] || regionPlaceCounts[regionNameEn.toLowerCase()] || 0 layer.on('click', () => { if (!countryA2) return if (visited) { - const regionEntry = visitedRegions[countryA2]?.find(r => r.code === regionCode) + const regionEntry = visitedRegions[countryA2]?.find(r => r.code === regionCode || r.name.toLowerCase() === regionNameEn.toLowerCase()) if (regionEntry?.manuallyMarked) { setConfirmActionRef.current({ type: 'unmark-region', diff --git a/client/src/pages/TripPlannerPage.tsx b/client/src/pages/TripPlannerPage.tsx index 2a9225b0..d2c0c2a3 100644 --- a/client/src/pages/TripPlannerPage.tsx +++ b/client/src/pages/TripPlannerPage.tsx @@ -137,6 +137,14 @@ export default function TripPlannerPage(): React.ReactElement | null { return saved || 'plan' }) + useEffect(() => { + const validTabIds = TRIP_TABS.map(t => t.id) + if (!validTabIds.includes(activeTab)) { + setActiveTab('plan') + sessionStorage.setItem(`trip-tab-${tripId}`, 'plan') + } + }, [enabledAddons]) + const handleTabChange = (tabId: string): void => { setActiveTab(tabId) sessionStorage.setItem(`trip-tab-${tripId}`, tabId) diff --git a/server/package-lock.json b/server/package-lock.json index f07912e1..062d1241 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "trek-server", - "version": "2.9.0", + "version": "2.9.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "trek-server", - "version": "2.9.0", + "version": "2.9.7", "dependencies": { "@modelcontextprotocol/sdk": "^1.28.0", "archiver": "^6.0.1", diff --git a/server/package.json b/server/package.json index 1e20029a..7fee6fce 100644 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "trek-server", - "version": "2.9.0", + "version": "2.9.7", "main": "src/index.ts", "scripts": { "start": "node --import tsx src/index.ts", diff --git a/server/src/app.ts b/server/src/app.ts index bc36d97c..33bf1ffd 100644 --- a/server/src/app.ts +++ b/server/src/app.ts @@ -84,7 +84,7 @@ export function createApp(): express.Application { "https://unpkg.com", "https://open-meteo.com", "https://api.open-meteo.com", "https://geocoding-api.open-meteo.com", "https://api.exchangerate-api.com", "https://raw.githubusercontent.com/nvkelso/natural-earth-vector/master/geojson/ne_50m_admin_0_countries.geojson", - "https://router.project-osrm.org/route/v1" + "https://router.project-osrm.org/route/v1/" ], fontSrc: ["'self'", "https://fonts.gstatic.com", "data:"], objectSrc: ["'none'"], diff --git a/server/src/db/migrations.ts b/server/src/db/migrations.ts index a061d1c9..aa3a3e99 100644 --- a/server/src/db/migrations.ts +++ b/server/src/db/migrations.ts @@ -843,6 +843,27 @@ function runMigrations(db: Database.Database): void { const ins = db.prepare('INSERT OR IGNORE INTO packing_bag_members (bag_id, user_id) VALUES (?, ?)'); for (const b of bagsWithUser) ins.run(b.id, b.user_id); }, + // Migration: Per-day positions for multi-day reservations + () => { + db.exec(` + CREATE TABLE IF NOT EXISTS reservation_day_positions ( + reservation_id INTEGER NOT NULL REFERENCES reservations(id) ON DELETE CASCADE, + day_id INTEGER NOT NULL REFERENCES days(id) ON DELETE CASCADE, + position REAL NOT NULL, + PRIMARY KEY (reservation_id, day_id) + ); + `); + // Migrate existing global positions to per-day entries + const reservations = db.prepare('SELECT id, trip_id, reservation_time, reservation_end_time, day_plan_position FROM reservations WHERE day_plan_position IS NOT NULL').all() as any[]; + const ins = db.prepare('INSERT OR IGNORE INTO reservation_day_positions (reservation_id, day_id, position) VALUES (?, ?, ?)'); + for (const r of reservations) { + const startDate = r.reservation_time?.split('T')[0]; + const endDate = r.reservation_end_time?.split('T')[0] || startDate; + if (!startDate) continue; + const matchingDays = db.prepare('SELECT id FROM days WHERE trip_id = ? AND date >= ? AND date <= ?').all(r.trip_id, startDate, endDate) as { id: number }[]; + for (const d of matchingDays) ins.run(r.id, d.id, r.day_plan_position); + } + }, ]; if (currentVersion < migrations.length) { diff --git a/server/src/routes/reservations.ts b/server/src/routes/reservations.ts index 05b75038..b3e233d4 100644 --- a/server/src/routes/reservations.ts +++ b/server/src/routes/reservations.ts @@ -91,10 +91,11 @@ router.put('/positions', authenticate, (req: Request, res: Response) => { if (!Array.isArray(positions)) return res.status(400).json({ error: 'positions must be an array' }); - updatePositions(tripId, positions); + const { day_id } = req.body; + updatePositions(tripId, positions, day_id); res.json({ success: true }); - broadcast(tripId, 'reservation:positions', { positions }, req.headers['x-socket-id'] as string); + broadcast(tripId, 'reservation:positions', { positions, day_id }, req.headers['x-socket-id'] as string); }); router.put('/:id', authenticate, (req: Request, res: Response) => { diff --git a/server/src/services/assignmentService.ts b/server/src/services/assignmentService.ts index 72ac7640..b7579ea9 100644 --- a/server/src/services/assignmentService.ts +++ b/server/src/services/assignmentService.ts @@ -168,6 +168,34 @@ export function getParticipants(assignmentId: string | number) { export function updateTime(id: string | number, placeTime: string | null, endTime: string | null) { db.prepare('UPDATE day_assignments SET assignment_time = ?, assignment_end_time = ? WHERE id = ?') .run(placeTime ?? null, endTime ?? null, id); + + // Auto-sort: reorder timed assignments chronologically within the day + if (placeTime) { + const assignment = db.prepare('SELECT day_id FROM day_assignments WHERE id = ?').get(id) as { day_id: number } | undefined; + if (assignment) { + const dayAssignments = db.prepare(` + SELECT da.id, COALESCE(da.assignment_time, p.place_time) as effective_time + FROM day_assignments da + JOIN places p ON da.place_id = p.id + WHERE da.day_id = ? + ORDER BY da.order_index ASC + `).all(assignment.day_id) as { id: number; effective_time: string | null }[]; + + // Separate timed and untimed, sort timed by time + const timed = dayAssignments.filter(a => a.effective_time).sort((a, b) => { + const ta = a.effective_time!.includes(':') ? a.effective_time! : '99:99'; + const tb = b.effective_time!.includes(':') ? b.effective_time! : '99:99'; + return ta.localeCompare(tb); + }); + const untimed = dayAssignments.filter(a => !a.effective_time); + + // Interleave: timed in chronological order, untimed keep relative position + const reordered = [...timed, ...untimed]; + const update = db.prepare('UPDATE day_assignments SET order_index = ? WHERE id = ?'); + reordered.forEach((a, i) => update.run(i, a.id)); + } + } + return getAssignmentWithPlace(Number(id)); } diff --git a/server/src/services/atlasService.ts b/server/src/services/atlasService.ts index f79d082a..bb48347e 100644 --- a/server/src/services/atlasService.ts +++ b/server/src/services/atlasService.ts @@ -421,7 +421,7 @@ async function reverseGeocodeRegion(lat: number, lng: number): Promise>(); + for (const dp of dayPositions) { + if (!posMap.has(dp.reservation_id)) posMap.set(dp.reservation_id, {}); + posMap.get(dp.reservation_id)![dp.day_id] = dp.position; + } + + for (const r of reservations) { + r.day_positions = posMap.get(r.id) || null; + } + + return reservations; } export function getReservationWithJoins(id: string | number) { @@ -117,14 +137,35 @@ export function createReservation(tripId: string | number, data: CreateReservati return { reservation, accommodationCreated }; } -export function updatePositions(tripId: string | number, positions: { id: number; day_plan_position: number }[]) { - const stmt = db.prepare('UPDATE reservations SET day_plan_position = ? WHERE id = ? AND trip_id = ?'); - const updateMany = db.transaction((items: { id: number; day_plan_position: number }[]) => { - for (const item of items) { - stmt.run(item.day_plan_position, item.id, tripId); - } - }); - updateMany(positions); +export function updatePositions(tripId: string | number, positions: { id: number; day_plan_position: number }[], dayId?: number | string) { + if (dayId) { + // Per-day positions for multi-day reservations + const stmt = db.prepare('INSERT OR REPLACE INTO reservation_day_positions (reservation_id, day_id, position) VALUES (?, ?, ?)'); + const updateMany = db.transaction((items: { id: number; day_plan_position: number }[]) => { + for (const item of items) { + stmt.run(item.id, dayId, item.day_plan_position); + } + }); + updateMany(positions); + } else { + // Legacy: update global position + const stmt = db.prepare('UPDATE reservations SET day_plan_position = ? WHERE id = ? AND trip_id = ?'); + const updateMany = db.transaction((items: { id: number; day_plan_position: number }[]) => { + for (const item of items) { + stmt.run(item.day_plan_position, item.id, tripId); + } + }); + updateMany(positions); + } +} + +export function getDayPositions(tripId: string | number, dayId: number | string) { + return db.prepare(` + SELECT rdp.reservation_id, rdp.position + FROM reservation_day_positions rdp + JOIN reservations r ON rdp.reservation_id = r.id + WHERE r.trip_id = ? AND rdp.day_id = ? + `).all(tripId, dayId) as { reservation_id: number; position: number }[]; } export function getReservation(id: string | number, tripId: string | number) { diff --git a/server/tests/integration/atlas.test.ts b/server/tests/integration/atlas.test.ts index 563ff55e..ed709358 100644 --- a/server/tests/integration/atlas.test.ts +++ b/server/tests/integration/atlas.test.ts @@ -202,3 +202,184 @@ describe('Bucket list', () => { expect(res.status).toBe(404); }); }); + +describe('Mark/unmark region', () => { + it('ATLAS-009 — POST /region/:code/mark marks a region as visited', async () => { + const { user } = createUser(testDb); + + const res = await request(app) + .post('/api/addons/atlas/region/DE-NW/mark') + .set('Cookie', authCookie(user.id)) + .send({ name: 'Nordrhein-Westfalen', country_code: 'DE' }); + + expect(res.status).toBe(200); + expect(res.body.success).toBe(true); + }); + + it('ATLAS-009 — POST /region/:code/mark without name returns 400', async () => { + const { user } = createUser(testDb); + + const res = await request(app) + .post('/api/addons/atlas/region/DE-NW/mark') + .set('Cookie', authCookie(user.id)) + .send({ country_code: 'DE' }); + + expect(res.status).toBe(400); + }); + + it('ATLAS-009 — POST /region/:code/mark without country_code returns 400', async () => { + const { user } = createUser(testDb); + + const res = await request(app) + .post('/api/addons/atlas/region/DE-NW/mark') + .set('Cookie', authCookie(user.id)) + .send({ name: 'Nordrhein-Westfalen' }); + + expect(res.status).toBe(400); + }); + + it('ATLAS-009 — marking a region also auto-marks the parent country', async () => { + const { user } = createUser(testDb); + + await request(app) + .post('/api/addons/atlas/region/DE-NW/mark') + .set('Cookie', authCookie(user.id)) + .send({ name: 'Nordrhein-Westfalen', country_code: 'DE' }); + + const stats = await request(app) + .get('/api/addons/atlas/stats') + .set('Cookie', authCookie(user.id)); + + const codes = (stats.body.countries as any[]).map((c: any) => c.code); + expect(codes).toContain('DE'); + }); + + it('ATLAS-009 — marking the same region twice is idempotent', async () => { + const { user } = createUser(testDb); + + await request(app) + .post('/api/addons/atlas/region/DE-NW/mark') + .set('Cookie', authCookie(user.id)) + .send({ name: 'Nordrhein-Westfalen', country_code: 'DE' }); + + const res = await request(app) + .post('/api/addons/atlas/region/DE-NW/mark') + .set('Cookie', authCookie(user.id)) + .send({ name: 'Nordrhein-Westfalen', country_code: 'DE' }); + + expect(res.status).toBe(200); + }); + + it('ATLAS-010 — GET /regions returns marked regions grouped by country', async () => { + const { user } = createUser(testDb); + + await request(app) + .post('/api/addons/atlas/region/DE-NW/mark') + .set('Cookie', authCookie(user.id)) + .send({ name: 'Nordrhein-Westfalen', country_code: 'DE' }); + + await request(app) + .post('/api/addons/atlas/region/DE-BY/mark') + .set('Cookie', authCookie(user.id)) + .send({ name: 'Bayern', country_code: 'DE' }); + + const res = await request(app) + .get('/api/addons/atlas/regions') + .set('Cookie', authCookie(user.id)); + + expect(res.status).toBe(200); + expect(res.body).toHaveProperty('regions'); + const deRegions = res.body.regions['DE'] as any[]; + expect(deRegions).toBeDefined(); + const codes = deRegions.map((r: any) => r.code); + expect(codes).toContain('DE-NW'); + expect(codes).toContain('DE-BY'); + }); + + it('ATLAS-011 — DELETE /region/:code/mark unmarks a region', async () => { + const { user } = createUser(testDb); + + await request(app) + .post('/api/addons/atlas/region/DE-NW/mark') + .set('Cookie', authCookie(user.id)) + .send({ name: 'Nordrhein-Westfalen', country_code: 'DE' }); + + const del = await request(app) + .delete('/api/addons/atlas/region/DE-NW/mark') + .set('Cookie', authCookie(user.id)); + + expect(del.status).toBe(200); + expect(del.body.success).toBe(true); + + const res = await request(app) + .get('/api/addons/atlas/regions') + .set('Cookie', authCookie(user.id)); + + const deRegions = res.body.regions['DE'] as any[] | undefined; + const codes = (deRegions || []).map((r: any) => r.code); + expect(codes).not.toContain('DE-NW'); + }); + + it('ATLAS-011 — unmark last region in country also unmarks the parent country', async () => { + const { user } = createUser(testDb); + + await request(app) + .post('/api/addons/atlas/region/DE-NW/mark') + .set('Cookie', authCookie(user.id)) + .send({ name: 'Nordrhein-Westfalen', country_code: 'DE' }); + + await request(app) + .delete('/api/addons/atlas/region/DE-NW/mark') + .set('Cookie', authCookie(user.id)); + + const stats = await request(app) + .get('/api/addons/atlas/stats') + .set('Cookie', authCookie(user.id)); + + const codes = (stats.body.countries as any[]).map((c: any) => c.code); + expect(codes).not.toContain('DE'); + }); + + it('ATLAS-011 — unmark one region keeps country when another region remains', async () => { + const { user } = createUser(testDb); + + await request(app) + .post('/api/addons/atlas/region/DE-NW/mark') + .set('Cookie', authCookie(user.id)) + .send({ name: 'Nordrhein-Westfalen', country_code: 'DE' }); + + await request(app) + .post('/api/addons/atlas/region/DE-BY/mark') + .set('Cookie', authCookie(user.id)) + .send({ name: 'Bayern', country_code: 'DE' }); + + await request(app) + .delete('/api/addons/atlas/region/DE-NW/mark') + .set('Cookie', authCookie(user.id)); + + const stats = await request(app) + .get('/api/addons/atlas/stats') + .set('Cookie', authCookie(user.id)); + + const codes = (stats.body.countries as any[]).map((c: any) => c.code); + expect(codes).toContain('DE'); + }); + + it('ATLAS-011 — regions are isolated between users', async () => { + const { user: user1 } = createUser(testDb); + const { user: user2 } = createUser(testDb); + + await request(app) + .post('/api/addons/atlas/region/DE-NW/mark') + .set('Cookie', authCookie(user1.id)) + .send({ name: 'Nordrhein-Westfalen', country_code: 'DE' }); + + const res = await request(app) + .get('/api/addons/atlas/regions') + .set('Cookie', authCookie(user2.id)); + + expect(res.status).toBe(200); + const deRegions = res.body.regions['DE'] as any[] | undefined; + expect(deRegions).toBeUndefined(); + }); +});