Merge pull request #409 from mauriceboe/refactor/mcp-use-service-layer

refactor(mcp): replace direct DB access with service layer calls

server/src/services/adminService.ts

@@ -463,6 +463,11 @@ export function deleteTemplateItem(itemId: string) {
 
 // ── Addons ─────────────────────────────────────────────────────────────────
 
+export function isAddonEnabled(addonId: string): boolean {
+  const addon = db.prepare('SELECT enabled FROM addons WHERE id = ?').get(addonId) as { enabled: number } | undefined;
+  return !!addon?.enabled;
+}
+
 export function listAddons() {
   const addons = db.prepare('SELECT * FROM addons ORDER BY sort_order, id').all() as Addon[];
   return addons.map(a => ({ ...a, enabled: !!a.enabled, config: JSON.parse(a.config || '{}') }));

server/src/services/assignmentService.ts

@@ -35,8 +35,11 @@ export function getAssignmentWithPlace(assignmentId: number | bigint) {
   return {
     id: a.id,
     day_id: a.day_id,
+    place_id: a.place_id,
     order_index: a.order_index,
     notes: a.notes,
+    assignment_time: a.assignment_time ?? null,
+    assignment_end_time: a.assignment_end_time ?? null,
     participants,
     created_at: a.created_at,
     place: {

server/src/services/atlasService.ts

@@ -327,6 +327,12 @@ export function getCountryPlaces(userId: number, code: string) {
 
 // ── Mark / unmark country ───────────────────────────────────────────────────
 
+export function listVisitedCountries(userId: number): { country_code: string; created_at: string }[] {
+  return db.prepare(
+    'SELECT country_code, created_at FROM visited_countries WHERE user_id = ? ORDER BY created_at DESC'
+  ).all(userId) as { country_code: string; created_at: string }[];
+}
+
 export function markCountryVisited(userId: number, code: string): void {
   db.prepare('INSERT OR IGNORE INTO visited_countries (user_id, country_code) VALUES (?, ?)').run(userId, code);
 }

server/src/services/authService.ts

@@ -988,3 +988,38 @@ export function createResourceToken(userId: number, purpose?: string): { error?:
   if (!token) return { error: 'Service unavailable', status: 503 };
   return { token };
 }
+
+// ---------------------------------------------------------------------------
+// MCP auth helpers
+// ---------------------------------------------------------------------------
+
+export function isDemoUser(userId: number): boolean {
+  if (process.env.DEMO_MODE !== 'true') return false;
+  const user = db.prepare('SELECT email FROM users WHERE id = ?').get(userId) as { email: string } | undefined;
+  return user?.email === 'demo@nomad.app';
+}
+
+export function verifyMcpToken(rawToken: string): User | null {
+  const hash = createHash('sha256').update(rawToken).digest('hex');
+  const row = db.prepare(`
+    SELECT u.id, u.username, u.email, u.role
+    FROM mcp_tokens mt
+    JOIN users u ON mt.user_id = u.id
+    WHERE mt.token_hash = ?
+  `).get(hash) as User | undefined;
+  if (row) {
+    db.prepare('UPDATE mcp_tokens SET last_used_at = CURRENT_TIMESTAMP WHERE token_hash = ?').run(hash);
+    return row;
+  }
+  return null;
+}
+
+export function verifyJwtToken(token: string): User | null {
+  try {
+    const decoded = jwt.verify(token, JWT_SECRET, { algorithms: ['HS256'] }) as { id: number };
+    const user = db.prepare('SELECT id, username, email, role FROM users WHERE id = ?').get(decoded.id) as User | undefined;
+    return user || null;
+  } catch {
+    return null;
+  }
+}

server/src/services/dayService.ts

@@ -145,10 +145,10 @@ export function getDay(id: string | number, tripId: string | number) {
   return db.prepare('SELECT * FROM days WHERE id = ? AND trip_id = ?').get(id, tripId) as Day | undefined;
 }
 
-export function updateDay(id: string | number, current: Day, fields: { notes?: string; title?: string }) {
+export function updateDay(id: string | number, current: Day, fields: { notes?: string; title?: string | null }) {
   db.prepare('UPDATE days SET notes = ?, title = ? WHERE id = ?').run(
     fields.notes || null,
-    fields.title !== undefined ? fields.title : current.title,
+    'title' in fields ? (fields.title ?? null) : current.title,
     id
   );
   const updatedDay = db.prepare('SELECT * FROM days WHERE id = ?').get(id) as Day;

server/src/services/queryHelpers.ts

@@ -56,8 +56,11 @@ function formatAssignmentWithPlace(a: AssignmentRow, tags: Partial<Tag>[], parti
   return {
     id: a.id,
     day_id: a.day_id,
+    place_id: a.place_id,
     order_index: a.order_index,
     notes: a.notes,
+    assignment_time: a.assignment_time ?? null,
+    assignment_end_time: a.assignment_end_time ?? null,
     participants: participants || [],
     created_at: a.created_at,
     place: {

server/src/services/tripService.ts

@@ -2,6 +2,11 @@ import path from 'path';
 import fs from 'fs';
 import { db, canAccessTrip, isOwner } from '../db/database';
 import { Trip, User } from '../types';
+import { listDays, listAccommodations } from './dayService';
+import { listBudgetItems } from './budgetService';
+import { listItems as listPackingItems } from './packingService';
+import { listReservations } from './reservationService';
+import { listNotes as listCollabNotes } from './collabService';
 
 export const MS_PER_DAY = 86400000;
 export const MAX_TRIP_DAYS = 365;
@@ -27,7 +32,7 @@ export { isOwner };
 
 // ── Day generation ────────────────────────────────────────────────────────
 
-export function generateDays(tripId: number | bigint | string, startDate: string | null, endDate: string | null) {
+export function generateDays(tripId: number | bigint | string, startDate: string | null, endDate: string | null, maxDays?: number) {
   const existing = db.prepare('SELECT id, day_number, date FROM days WHERE trip_id = ?').all(tripId) as { id: number; day_number: number; date: string | null }[];
 
   if (!startDate || !endDate) {
@@ -56,7 +61,7 @@ export function generateDays(tripId: number | bigint | string, startDate: string
   const [ey, em, ed] = endDate.split('-').map(Number);
   const startMs = Date.UTC(sy, sm - 1, sd);
   const endMs = Date.UTC(ey, em - 1, ed);
-  const numDays = Math.min(Math.floor((endMs - startMs) / MS_PER_DAY) + 1, MAX_TRIP_DAYS);
+  const numDays = Math.min(Math.floor((endMs - startMs) / MS_PER_DAY) + 1, maxDays ?? MAX_TRIP_DAYS);
 
   const targetDates: string[] = [];
   for (let i = 0; i < numDays; i++) {
@@ -110,7 +115,15 @@ export function generateDays(tripId: number | bigint | string, startDate: string
 
 // ── Trip CRUD ─────────────────────────────────────────────────────────────
 
-export function listTrips(userId: number, archived: number) {
+export function listTrips(userId: number, archived: number | null) {
+  if (archived === null) {
+    return db.prepare(`
+      ${TRIP_SELECT}
+      LEFT JOIN trip_members m ON m.trip_id = t.id AND m.user_id = :userId
+      WHERE (t.user_id = :userId OR m.user_id IS NOT NULL)
+      ORDER BY t.created_at DESC
+    `).all({ userId });
+  }
   return db.prepare(`
     ${TRIP_SELECT}
     LEFT JOIN trip_members m ON m.trip_id = t.id AND m.user_id = :userId
@@ -128,7 +141,7 @@ interface CreateTripData {
   reminder_days?: number;
 }
 
-export function createTrip(userId: number, data: CreateTripData) {
+export function createTrip(userId: number, data: CreateTripData, maxDays?: number) {
   const rd = data.reminder_days !== undefined
     ? (Number(data.reminder_days) >= 0 && Number(data.reminder_days) <= 30 ? Number(data.reminder_days) : 3)
     : 3;
@@ -139,7 +152,7 @@ export function createTrip(userId: number, data: CreateTripData) {
   `).run(userId, data.title, data.description || null, data.start_date || null, data.end_date || null, data.currency || 'EUR', rd);
 
   const tripId = result.lastInsertRowid;
-  generateDays(tripId, data.start_date || null, data.end_date || null);
+  generateDays(tripId, data.start_date || null, data.end_date || null, maxDays);
 
   const trip = db.prepare(`${TRIP_SELECT} WHERE t.id = :tripId`).get({ userId, tripId });
   return { trip, tripId: Number(tripId), reminderDays: rd };
@@ -409,6 +422,49 @@ export function exportICS(tripId: string | number): { ics: string; filename: str
   return { ics, filename: `${safeFilename}.ics` };
 }
 
+// ── Trip summary (used by MCP get_trip_summary tool) ──────────────────────
+
+export function getTripSummary(tripId: number) {
+  const trip = db.prepare('SELECT * FROM trips WHERE id = ?').get(tripId) as Record<string, unknown> | undefined;
+  if (!trip) return null;
+
+  const ownerRow = getTripOwner(tripId);
+  if (!ownerRow) return null;
+  const { owner, members } = listMembers(tripId, ownerRow.user_id);
+
+  const { days: rawDays } = listDays(tripId);
+  const days = rawDays.map(({ notes_items, ...day }) => ({ ...day, notes: notes_items }));
+
+  const accommodations = listAccommodations(tripId);
+
+  const budgetItems = listBudgetItems(tripId);
+  const budget = {
+    item_count: budgetItems.length,
+    total: budgetItems.reduce((sum, i) => sum + (i.total_price || 0), 0),
+    currency: trip.currency,
+  };
+
+  const packingItems = listPackingItems(tripId);
+  const packing = {
+    total: packingItems.length,
+    checked: (packingItems as { checked: number }[]).filter(i => i.checked).length,
+  };
+
+  const reservations = listReservations(tripId);
+  const collab_notes = listCollabNotes(tripId);
+
+  return {
+    trip,
+    members: { owner, collaborators: members },
+    days,
+    accommodations,
+    budget,
+    packing,
+    reservations,
+    collab_notes,
+  };
+}
+
 // ── Custom error types ────────────────────────────────────────────────────
 
 export class NotFoundError extends Error {