@voyantjs/bookings 0.6.8 → 0.6.9

package/dist/service.js

@@ -1,9 +1,9 @@
 import { and, asc, desc, eq, ilike, inArray, lte, ne, or, sql } from "drizzle-orm";
 import { availabilitySlotsRef } from "./availability-ref.js";
 import { bookingItemProductDetailsRef, bookingProductDetailsRef, optionUnitsRef, productDayServicesRef, productDaysRef, productOptionsRef, productsRef, productTicketSettingsRef, } from "./products-ref.js";
-import { bookingActivityLog, bookingAllocations, bookingDocuments, bookingFulfillments, bookingItemParticipants, bookingItems, bookingNotes, bookingParticipants, bookingRedemptionEvents, bookingSupplierStatuses, bookings, } from "./schema.js";
+import { bookingActivityLog, bookingAllocations, bookingDocuments, bookingFulfillments, bookingItems, bookingItemTravelers, bookingNotes, bookingRedemptionEvents, bookingStaffAssignments, bookingSupplierStatuses, bookings, bookingTravelers, } from "./schema.js";
 import { cleanupGroupOnBookingCancelled } from "./service-groups.js";
-import { bookingTransactionDetailsRef, offerItemParticipantsRef, offerItemsRef, offerParticipantsRef, offersRef, orderItemParticipantsRef, orderItemsRef, orderParticipantsRef, ordersRef, } from "./transactions-ref.js";
+import { bookingTransactionDetailsRef, offerItemParticipantsRef, offerItemsRef, offerParticipantsRef, offerStaffAssignmentsRef, offersRef, orderItemParticipantsRef, orderItemsRef, orderParticipantsRef, orderStaffAssignmentsRef, ordersRef, } from "./transactions-ref.js";
 const travelerParticipantTypes = ["traveler", "occupant"];
 class BookingServiceError extends Error {
     code;
@@ -24,47 +24,31 @@ function toDateValueOrNull(value) {
         return null;
     return value instanceof Date ? value : new Date(value);
 }
-function toPassengerResponse(participant) {
+function toTravelerResponse(participant) {
     return {
         id: participant.id,
         bookingId: participant.bookingId,
+        participantType: participant.participantType,
+        travelerCategory: participant.travelerCategory,
         firstName: participant.firstName,
         lastName: participant.lastName,
         email: participant.email,
         phone: participant.phone,
+        preferredLanguage: participant.preferredLanguage,
+        accessibilityNeeds: participant.accessibilityNeeds,
         specialRequests: participant.specialRequests,
-        isLeadPassenger: participant.isPrimary,
+        isPrimary: participant.isPrimary,
+        notes: participant.notes,
         createdAt: participant.createdAt,
         updatedAt: participant.updatedAt,
     };
 }
-function toCreateParticipantFromPassenger(data) {
-    return {
-        participantType: "traveler",
-        firstName: data.firstName,
-        lastName: data.lastName,
-        email: data.email ?? null,
-        phone: data.phone ?? null,
-        specialRequests: data.specialRequests ?? null,
-        isPrimary: data.isLeadPassenger ?? false,
-    };
-}
-function toUpdateParticipantFromPassenger(data) {
-    return {
-        firstName: data.firstName,
-        lastName: data.lastName,
-        email: data.email ?? null,
-        phone: data.phone ?? null,
-        specialRequests: data.specialRequests ?? null,
-        isPrimary: data.isLeadPassenger ?? undefined,
-    };
-}
-async function ensureParticipantFlags(db, bookingId, participantId, data) {
+async function ensureParticipantFlags(db, bookingId, travelerId, data) {
     if (data.isPrimary) {
         await db
-            .update(bookingParticipants)
+            .update(bookingTravelers)
             .set({ isPrimary: false, updatedAt: new Date() })
-            .where(and(eq(bookingParticipants.bookingId, bookingId), ne(bookingParticipants.id, participantId)));
+            .where(and(eq(bookingTravelers.bookingId, bookingId), ne(bookingTravelers.id, travelerId)));
     }
 }
 async function ensureBookingScopedLinks(db, bookingId, data) {
@@ -78,18 +62,24 @@ async function ensureBookingScopedLinks(db, bookingId, data) {
             return { ok: false, reason: "booking_item_not_found" };
         }
     }
-    if (data.participantId) {
-        const [participant] = await db
-            .select({ id: bookingParticipants.id })
-            .from(bookingParticipants)
-            .where(and(eq(bookingParticipants.id, data.participantId), eq(bookingParticipants.bookingId, bookingId)))
+    if (data.travelerId) {
+        const [traveler] = await db
+            .select({ id: bookingTravelers.id })
+            .from(bookingTravelers)
+            .where(and(eq(bookingTravelers.id, data.travelerId), eq(bookingTravelers.bookingId, bookingId)))
             .limit(1);
-        if (!participant) {
-            return { ok: false, reason: "participant_not_found" };
+        if (!traveler) {
+            return { ok: false, reason: "traveler_not_found" };
         }
     }
     return { ok: true };
 }
+function isStaffParticipantType(participantType) {
+    return participantType === "staff";
+}
+function toStaffAssignmentRole(role) {
+    return role === "service_assignee" ? "service_assignee" : "other";
+}
 function deriveBookingDateRange(items) {
     const dates = items
         .flatMap((item) => [item.serviceDate, item.startsAt?.toISOString().slice(0, 10) ?? null])
@@ -112,6 +102,23 @@ function deriveBookingPax(participants, items) {
 function getTransactionItemParticipantItemId(link) {
     return "offerItemId" in link ? link.offerItemId : link.orderItemId;
 }
+function toStaffReservationParticipant(assignment, suffix) {
+    return {
+        id: `staff:${suffix}:${assignment.id}`,
+        personId: assignment.personId,
+        participantType: "staff",
+        travelerCategory: null,
+        firstName: assignment.firstName,
+        lastName: assignment.lastName,
+        email: assignment.email,
+        phone: assignment.phone,
+        preferredLanguage: assignment.preferredLanguage,
+        isPrimary: assignment.isPrimary,
+        notes: assignment.notes,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+    };
+}
 function mapDeliveryFormatToFulfillment(format) {
     switch (format) {
         case "pdf":
@@ -318,6 +325,16 @@ async function reserveBookingFromTransactionSource(db, source, data, userId) {
                 personId: source.personId,
                 organizationId: source.organizationId,
                 sourceType: data.sourceType,
+                contactFirstName: data.contactFirstName ?? source.contactFirstName,
+                contactLastName: data.contactLastName ?? source.contactLastName,
+                contactEmail: data.contactEmail ?? source.contactEmail,
+                contactPhone: data.contactPhone ?? source.contactPhone,
+                contactPreferredLanguage: data.contactPreferredLanguage ?? source.contactPreferredLanguage,
+                contactCountry: data.contactCountry ?? source.contactCountry,
+                contactRegion: data.contactRegion ?? source.contactRegion,
+                contactCity: data.contactCity ?? source.contactCity,
+                contactAddressLine1: data.contactAddressLine1 ?? source.contactAddressLine1,
+                contactPostalCode: data.contactPostalCode ?? source.contactPostalCode,
                 sellCurrency: source.currency,
                 baseCurrency: source.baseCurrency,
                 sellAmountCents: source.totalAmountCents,
@@ -333,10 +350,15 @@ async function reserveBookingFromTransactionSource(db, source, data, userId) {
                 throw new BookingServiceError("booking_create_failed");
             }
             const participantMap = new Map();
+            const staffParticipantMap = new Map();
             if (data.includeParticipants) {
                 for (const participant of source.participants) {
+                    if (isStaffParticipantType(participant.participantType)) {
+                        staffParticipantMap.set(participant.id, participant);
+                        continue;
+                    }
                     const [createdParticipant] = await tx
-                        .insert(bookingParticipants)
+                        .insert(bookingTravelers)
                         .values({
                         bookingId: booking.id,
                         personId: participant.personId ?? null,
@@ -437,17 +459,78 @@ async function reserveBookingFromTransactionSource(db, source, data, userId) {
                     continue;
                 }
                 const bookingItemId = bookingItemMap.get(sourceItemId);
-                const participantId = participantMap.get(link.participantId);
-                if (!bookingItemId || !participantId) {
+                const travelerId = participantMap.get(link.travelerId);
+                if (!bookingItemId || !travelerId) {
                     continue;
                 }
-                await tx.insert(bookingItemParticipants).values({
+                await tx.insert(bookingItemTravelers).values({
                     bookingItemId,
-                    participantId,
+                    travelerId,
                     role: link.role,
                     isPrimary: link.isPrimary,
                 });
             }
+            if (staffParticipantMap.size > 0) {
+                const linkedStaffAssignments = [];
+                const linkedStaffParticipantIds = new Set();
+                for (const link of source.itemParticipants) {
+                    const staffParticipant = staffParticipantMap.get(link.travelerId);
+                    if (!staffParticipant) {
+                        continue;
+                    }
+                    const sourceItemId = getTransactionItemParticipantItemId(link);
+                    if (!sourceItemId) {
+                        continue;
+                    }
+                    const bookingItemId = bookingItemMap.get(sourceItemId);
+                    if (!bookingItemId) {
+                        continue;
+                    }
+                    linkedStaffParticipantIds.add(staffParticipant.id);
+                    linkedStaffAssignments.push({
+                        bookingId: booking.id,
+                        bookingItemId,
+                        personId: staffParticipant.personId ?? null,
+                        role: toStaffAssignmentRole(link.role),
+                        firstName: staffParticipant.firstName,
+                        lastName: staffParticipant.lastName,
+                        email: staffParticipant.email ?? null,
+                        phone: staffParticipant.phone ?? null,
+                        preferredLanguage: staffParticipant.preferredLanguage ?? null,
+                        isPrimary: link.isPrimary || staffParticipant.isPrimary,
+                        notes: staffParticipant.notes ?? null,
+                        metadata: {
+                            sourceParticipantId: staffParticipant.id,
+                            sourceItemId,
+                            sourceRole: link.role,
+                        },
+                    });
+                }
+                for (const staffParticipant of staffParticipantMap.values()) {
+                    if (linkedStaffParticipantIds.has(staffParticipant.id)) {
+                        continue;
+                    }
+                    linkedStaffAssignments.push({
+                        bookingId: booking.id,
+                        bookingItemId: null,
+                        personId: staffParticipant.personId ?? null,
+                        role: "service_assignee",
+                        firstName: staffParticipant.firstName,
+                        lastName: staffParticipant.lastName,
+                        email: staffParticipant.email ?? null,
+                        phone: staffParticipant.phone ?? null,
+                        preferredLanguage: staffParticipant.preferredLanguage ?? null,
+                        isPrimary: staffParticipant.isPrimary,
+                        notes: staffParticipant.notes ?? null,
+                        metadata: {
+                            sourceParticipantId: staffParticipant.id,
+                        },
+                    });
+                }
+                if (linkedStaffAssignments.length > 0) {
+                    await tx.insert(bookingStaffAssignments).values(linkedStaffAssignments);
+                }
+            }
             await tx
                 .insert(bookingTransactionDetailsRef)
                 .values({
@@ -616,13 +699,13 @@ async function autoIssueFulfillmentsForBooking(db, bookingId, userId) {
     const settingsByProductId = new Map(settings.map((setting) => [setting.productId, setting]));
     const travelerParticipants = await db
         .select()
-        .from(bookingParticipants)
-        .where(and(eq(bookingParticipants.bookingId, bookingId), or(eq(bookingParticipants.participantType, "traveler"), eq(bookingParticipants.participantType, "occupant"))))
-        .orderBy(desc(bookingParticipants.isPrimary), asc(bookingParticipants.createdAt));
+        .from(bookingTravelers)
+        .where(and(eq(bookingTravelers.bookingId, bookingId), or(eq(bookingTravelers.participantType, "traveler"), eq(bookingTravelers.participantType, "occupant"))))
+        .orderBy(desc(bookingTravelers.isPrimary), asc(bookingTravelers.createdAt));
     const participantLinks = await db
         .select()
-        .from(bookingItemParticipants)
-        .where(sql `${bookingItemParticipants.bookingItemId} IN (
+        .from(bookingItemTravelers)
+        .where(sql `${bookingItemTravelers.bookingItemId} IN (
         SELECT ${bookingItems.id}
         FROM ${bookingItems}
         WHERE ${bookingItems.bookingId} = ${bookingId}
@@ -660,7 +743,7 @@ async function autoIssueFulfillmentsForBooking(db, bookingId, userId) {
             fulfillmentsToInsert.push({
                 bookingId,
                 bookingItemId: item.id,
-                participantId: null,
+                travelerId: null,
                 fulfillmentType: delivery.fulfillmentType,
                 deliveryChannel: delivery.deliveryChannel,
                 status: "issued",
@@ -673,7 +756,7 @@ async function autoIssueFulfillmentsForBooking(db, bookingId, userId) {
             fulfillmentsToInsert.push({
                 bookingId,
                 bookingItemId: item.id,
-                participantId: null,
+                travelerId: null,
                 fulfillmentType: delivery.fulfillmentType,
                 deliveryChannel: delivery.deliveryChannel,
                 status: "issued",
@@ -684,20 +767,20 @@ async function autoIssueFulfillmentsForBooking(db, bookingId, userId) {
         }
         const linkedParticipants = participantLinksByItemId
             .get(item.id)
-            ?.map((link) => travelerParticipants.find((participant) => participant.id === link.participantId))
+            ?.map((link) => travelerParticipants.find((participant) => participant.id === link.travelerId))
             .filter((participant) => Boolean(participant)) ?? [];
         const participantsForItem = linkedParticipants.length > 0 ? linkedParticipants : travelerParticipants;
         for (const participant of participantsForItem) {
             fulfillmentsToInsert.push({
                 bookingId,
                 bookingItemId: item.id,
-                participantId: participant.id,
+                travelerId: participant.id,
                 fulfillmentType: delivery.fulfillmentType,
                 deliveryChannel: delivery.deliveryChannel,
                 status: "issued",
                 payload: {
                     ...payloadBase,
-                    participantId: participant.id,
+                    travelerId: participant.id,
                     scope: "participant",
                 },
                 issuedAt: now,
@@ -892,7 +975,7 @@ export const bookingsService = {
         if (!offer) {
             return { status: "not_found" };
         }
-        const [participants, items, itemParticipants] = await Promise.all([
+        const [participants, items, itemParticipants, staffAssignments] = await Promise.all([
             db
                 .select()
                 .from(offerParticipantsRef)
@@ -912,7 +995,31 @@ export const bookingsService = {
             WHERE ${offerItemsRef.offerId} = ${offerId}
           )`)
                 .orderBy(asc(offerItemParticipantsRef.createdAt)),
+            db
+                .select()
+                .from(offerStaffAssignmentsRef)
+                .where(eq(offerStaffAssignmentsRef.offerId, offerId))
+                .orderBy(asc(offerStaffAssignmentsRef.createdAt)),
         ]);
+        const reservationParticipants = [...participants];
+        const reservationItemParticipants = itemParticipants.map((link) => ({
+            travelerId: link.travelerId,
+            role: link.role,
+            isPrimary: link.isPrimary,
+            offerItemId: link.offerItemId,
+        }));
+        for (const assignment of staffAssignments) {
+            const participant = toStaffReservationParticipant(assignment, "offer");
+            reservationParticipants.push(participant);
+            if (assignment.offerItemId) {
+                reservationItemParticipants.push({
+                    travelerId: participant.id,
+                    role: assignment.role,
+                    isPrimary: assignment.isPrimary,
+                    offerItemId: assignment.offerItemId,
+                });
+            }
+        }
         return reserveBookingFromTransactionSource(db, {
             kind: "offer",
             sourceId: offerId,
@@ -920,14 +1027,24 @@ export const bookingsService = {
             orderId: null,
             personId: offer.personId ?? null,
             organizationId: offer.organizationId ?? null,
+            contactFirstName: offer.contactFirstName ?? null,
+            contactLastName: offer.contactLastName ?? null,
+            contactEmail: offer.contactEmail ?? null,
+            contactPhone: offer.contactPhone ?? null,
+            contactPreferredLanguage: offer.contactPreferredLanguage ?? null,
+            contactCountry: offer.contactCountry ?? null,
+            contactRegion: offer.contactRegion ?? null,
+            contactCity: offer.contactCity ?? null,
+            contactAddressLine1: offer.contactAddressLine1 ?? null,
+            contactPostalCode: offer.contactPostalCode ?? null,
             currency: offer.currency,
             baseCurrency: offer.baseCurrency ?? null,
             totalAmountCents: offer.totalAmountCents ?? null,
             costAmountCents: offer.costAmountCents ?? null,
             notes: offer.notes ?? null,
-            participants,
+            participants: reservationParticipants,
             items,
-            itemParticipants,
+            itemParticipants: reservationItemParticipants,
         }, data, userId);
     },
     async reserveBookingFromOrder(db, orderId, data, userId) {
@@ -935,7 +1052,7 @@ export const bookingsService = {
         if (!order) {
             return { status: "not_found" };
         }
-        const [participants, items, itemParticipants] = await Promise.all([
+        const [participants, items, itemParticipants, staffAssignments] = await Promise.all([
             db
                 .select()
                 .from(orderParticipantsRef)
@@ -955,7 +1072,31 @@ export const bookingsService = {
             WHERE ${orderItemsRef.orderId} = ${orderId}
           )`)
                 .orderBy(asc(orderItemParticipantsRef.createdAt)),
+            db
+                .select()
+                .from(orderStaffAssignmentsRef)
+                .where(eq(orderStaffAssignmentsRef.orderId, orderId))
+                .orderBy(asc(orderStaffAssignmentsRef.createdAt)),
         ]);
+        const reservationParticipants = [...participants];
+        const reservationItemParticipants = itemParticipants.map((link) => ({
+            travelerId: link.travelerId,
+            role: link.role,
+            isPrimary: link.isPrimary,
+            orderItemId: link.orderItemId,
+        }));
+        for (const assignment of staffAssignments) {
+            const participant = toStaffReservationParticipant(assignment, "order");
+            reservationParticipants.push(participant);
+            if (assignment.orderItemId) {
+                reservationItemParticipants.push({
+                    travelerId: participant.id,
+                    role: assignment.role,
+                    isPrimary: assignment.isPrimary,
+                    orderItemId: assignment.orderItemId,
+                });
+            }
+        }
         return reserveBookingFromTransactionSource(db, {
             kind: "order",
             sourceId: orderId,
@@ -963,14 +1104,24 @@ export const bookingsService = {
             orderId: order.id,
             personId: order.personId ?? null,
             organizationId: order.organizationId ?? null,
+            contactFirstName: order.contactFirstName ?? null,
+            contactLastName: order.contactLastName ?? null,
+            contactEmail: order.contactEmail ?? null,
+            contactPhone: order.contactPhone ?? null,
+            contactPreferredLanguage: order.contactPreferredLanguage ?? null,
+            contactCountry: order.contactCountry ?? null,
+            contactRegion: order.contactRegion ?? null,
+            contactCity: order.contactCity ?? null,
+            contactAddressLine1: order.contactAddressLine1 ?? null,
+            contactPostalCode: order.contactPostalCode ?? null,
             currency: order.currency,
             baseCurrency: order.baseCurrency ?? null,
             totalAmountCents: order.totalAmountCents ?? null,
             costAmountCents: order.costAmountCents ?? null,
             notes: order.notes ?? null,
-            participants,
+            participants: reservationParticipants,
             items,
-            itemParticipants,
+            itemParticipants: reservationItemParticipants,
         }, data, userId);
     },
     async reserveBooking(db, data, userId) {
@@ -987,6 +1138,16 @@ export const bookingsService = {
                     sourceType: data.sourceType,
                     externalBookingRef: data.externalBookingRef ?? null,
                     communicationLanguage: data.communicationLanguage ?? null,
+                    contactFirstName: data.contactFirstName ?? null,
+                    contactLastName: data.contactLastName ?? null,
+                    contactEmail: data.contactEmail ?? null,
+                    contactPhone: data.contactPhone ?? null,
+                    contactPreferredLanguage: data.contactPreferredLanguage ?? null,
+                    contactCountry: data.contactCountry ?? null,
+                    contactRegion: data.contactRegion ?? null,
+                    contactCity: data.contactCity ?? null,
+                    contactAddressLine1: data.contactAddressLine1 ?? null,
+                    contactPostalCode: data.contactPostalCode ?? null,
                     sellCurrency: data.sellCurrency,
                     baseCurrency: data.baseCurrency ?? null,
                     sellAmountCents: data.sellAmountCents ?? null,
@@ -1097,6 +1258,16 @@ export const bookingsService = {
                 .insert(bookings)
                 .values({
                 ...data,
+                contactFirstName: data.contactFirstName ?? null,
+                contactLastName: data.contactLastName ?? null,
+                contactEmail: data.contactEmail ?? null,
+                contactPhone: data.contactPhone ?? null,
+                contactPreferredLanguage: data.contactPreferredLanguage ?? null,
+                contactCountry: data.contactCountry ?? null,
+                contactRegion: data.contactRegion ?? null,
+                contactCity: data.contactCity ?? null,
+                contactAddressLine1: data.contactAddressLine1 ?? null,
+                contactPostalCode: data.contactPostalCode ?? null,
                 holdExpiresAt: toTimestamp(data.holdExpiresAt),
                 confirmedAt: toTimestamp(data.confirmedAt),
                 expiredAt: toTimestamp(data.expiredAt),
@@ -1122,6 +1293,18 @@ export const bookingsService = {
             .update(bookings)
             .set({
             ...data,
+            contactFirstName: data.contactFirstName === undefined ? undefined : (data.contactFirstName ?? null),
+            contactLastName: data.contactLastName === undefined ? undefined : (data.contactLastName ?? null),
+            contactEmail: data.contactEmail === undefined ? undefined : (data.contactEmail ?? null),
+            contactPhone: data.contactPhone === undefined ? undefined : (data.contactPhone ?? null),
+            contactPreferredLanguage: data.contactPreferredLanguage === undefined
+                ? undefined
+                : (data.contactPreferredLanguage ?? null),
+            contactCountry: data.contactCountry === undefined ? undefined : (data.contactCountry ?? null),
+            contactRegion: data.contactRegion === undefined ? undefined : (data.contactRegion ?? null),
+            contactCity: data.contactCity === undefined ? undefined : (data.contactCity ?? null),
+            contactAddressLine1: data.contactAddressLine1 === undefined ? undefined : (data.contactAddressLine1 ?? null),
+            contactPostalCode: data.contactPostalCode === undefined ? undefined : (data.contactPostalCode ?? null),
             holdExpiresAt: data.holdExpiresAt === undefined ? undefined : toTimestamp(data.holdExpiresAt),
             confirmedAt: data.confirmedAt === undefined ? undefined : toTimestamp(data.confirmedAt),
             expiredAt: data.expiredAt === undefined ? undefined : toTimestamp(data.expiredAt),
@@ -1467,22 +1650,22 @@ export const bookingsService = {
             throw error;
         }
     },
-    listParticipants(db, bookingId) {
+    listTravelerRecords(db, bookingId) {
         return db
             .select()
-            .from(bookingParticipants)
-            .where(eq(bookingParticipants.bookingId, bookingId))
-            .orderBy(desc(bookingParticipants.isPrimary), asc(bookingParticipants.createdAt));
+            .from(bookingTravelers)
+            .where(eq(bookingTravelers.bookingId, bookingId))
+            .orderBy(desc(bookingTravelers.isPrimary), asc(bookingTravelers.createdAt));
     },
-    async getParticipantById(db, bookingId, participantId) {
+    async getTravelerRecordById(db, bookingId, travelerId) {
         const [row] = await db
             .select()
-            .from(bookingParticipants)
-            .where(and(eq(bookingParticipants.id, participantId), eq(bookingParticipants.bookingId, bookingId)))
+            .from(bookingTravelers)
+            .where(and(eq(bookingTravelers.id, travelerId), eq(bookingTravelers.bookingId, bookingId)))
             .limit(1);
         return row ?? null;
     },
-    async createParticipant(db, bookingId, data, userId) {
+    async createTravelerRecord(db, bookingId, data, userId) {
         const [booking] = await db
             .select({ id: bookings.id })
             .from(bookings)
@@ -1492,7 +1675,7 @@ export const bookingsService = {
             return null;
         }
         const [row] = await db
-            .insert(bookingParticipants)
+            .insert(bookingTravelers)
             .values({
             bookingId,
             personId: data.personId ?? null,
@@ -1518,15 +1701,15 @@ export const bookingsService = {
             actorId: userId ?? "system",
             activityType: "passenger_update",
             description: `Participant ${data.firstName} ${data.lastName} added`,
-            metadata: { participantId: row.id, participantType: data.participantType },
+            metadata: { travelerId: row.id, participantType: data.participantType },
         });
         return row;
     },
-    async updateParticipant(db, participantId, data) {
+    async updateTravelerRecord(db, travelerId, data) {
         const [row] = await db
-            .update(bookingParticipants)
+            .update(bookingTravelers)
             .set({ ...data, updatedAt: new Date() })
-            .where(eq(bookingParticipants.id, participantId))
+            .where(eq(bookingTravelers.id, travelerId))
             .returning();
         if (!row) {
             return null;
@@ -1534,31 +1717,54 @@ export const bookingsService = {
         await ensureParticipantFlags(db, row.bookingId, row.id, data);
         return row;
     },
-    async deleteParticipant(db, participantId) {
+    async deleteTravelerRecord(db, travelerId) {
         const [row] = await db
-            .delete(bookingParticipants)
-            .where(eq(bookingParticipants.id, participantId))
-            .returning({ id: bookingParticipants.id });
+            .delete(bookingTravelers)
+            .where(eq(bookingTravelers.id, travelerId))
+            .returning({ id: bookingTravelers.id });
         return row ?? null;
     },
-    listPassengers(db, bookingId) {
+    listTravelers(db, bookingId) {
         return db
             .select()
-            .from(bookingParticipants)
-            .where(and(eq(bookingParticipants.bookingId, bookingId), or(...travelerParticipantTypes.map((type) => eq(bookingParticipants.participantType, type)))))
-            .orderBy(asc(bookingParticipants.createdAt))
-            .then((rows) => rows.map(toPassengerResponse));
+            .from(bookingTravelers)
+            .where(and(eq(bookingTravelers.bookingId, bookingId), or(...travelerParticipantTypes.map((type) => eq(bookingTravelers.participantType, type)))))
+            .orderBy(asc(bookingTravelers.createdAt))
+            .then((rows) => rows.map(toTravelerResponse));
     },
-    async createPassenger(db, bookingId, data, userId) {
-        const row = await this.createParticipant(db, bookingId, toCreateParticipantFromPassenger(data), userId);
-        return row ? toPassengerResponse(row) : null;
+    async createTraveler(db, bookingId, data, userId) {
+        const row = await this.createTravelerRecord(db, bookingId, {
+            participantType: "traveler",
+            travelerCategory: data.travelerCategory ?? null,
+            firstName: data.firstName,
+            lastName: data.lastName,
+            email: data.email ?? null,
+            phone: data.phone ?? null,
+            preferredLanguage: data.preferredLanguage ?? null,
+            accessibilityNeeds: data.accessibilityNeeds ?? null,
+            specialRequests: data.specialRequests ?? null,
+            isPrimary: data.isPrimary ?? false,
+            notes: data.notes ?? null,
+        }, userId);
+        return row ? toTravelerResponse(row) : null;
     },
-    async updatePassenger(db, passengerId, data) {
-        const row = await this.updateParticipant(db, passengerId, toUpdateParticipantFromPassenger(data));
-        return row ? toPassengerResponse(row) : null;
+    async updateTraveler(db, travelerId, data) {
+        const row = await this.updateTravelerRecord(db, travelerId, {
+            firstName: data.firstName,
+            lastName: data.lastName,
+            email: data.email ?? null,
+            phone: data.phone ?? null,
+            preferredLanguage: data.preferredLanguage ?? null,
+            accessibilityNeeds: data.accessibilityNeeds ?? null,
+            specialRequests: data.specialRequests ?? null,
+            travelerCategory: data.travelerCategory ?? null,
+            isPrimary: data.isPrimary ?? undefined,
+            notes: data.notes ?? null,
+        });
+        return row ? toTravelerResponse(row) : null;
     },
-    async deletePassenger(db, passengerId) {
-        return this.deleteParticipant(db, passengerId);
+    async deleteTraveler(db, travelerId) {
+        return this.deleteTravelerRecord(db, travelerId);
     },
     listItems(db, bookingId) {
         return db
@@ -1639,9 +1845,9 @@ export const bookingsService = {
     listItemParticipants(db, itemId) {
         return db
             .select()
-            .from(bookingItemParticipants)
-            .where(eq(bookingItemParticipants.bookingItemId, itemId))
-            .orderBy(desc(bookingItemParticipants.isPrimary), asc(bookingItemParticipants.createdAt));
+            .from(bookingItemTravelers)
+            .where(eq(bookingItemTravelers.bookingItemId, itemId))
+            .orderBy(desc(bookingItemTravelers.isPrimary), asc(bookingItemTravelers.createdAt));
     },
     async addItemParticipant(db, itemId, data) {
         const [item] = await db
@@ -1652,25 +1858,25 @@ export const bookingsService = {
         if (!item) {
             return null;
         }
-        const [participant] = await db
-            .select({ id: bookingParticipants.id })
-            .from(bookingParticipants)
-            .where(eq(bookingParticipants.id, data.participantId))
+        const [traveler] = await db
+            .select({ id: bookingTravelers.id })
+            .from(bookingTravelers)
+            .where(eq(bookingTravelers.id, data.travelerId))
             .limit(1);
-        if (!participant) {
+        if (!traveler) {
             return null;
         }
         if (data.isPrimary) {
             await db
-                .update(bookingItemParticipants)
+                .update(bookingItemTravelers)
                 .set({ isPrimary: false })
-                .where(eq(bookingItemParticipants.bookingItemId, itemId));
+                .where(eq(bookingItemTravelers.bookingItemId, itemId));
         }
         const [row] = await db
-            .insert(bookingItemParticipants)
+            .insert(bookingItemTravelers)
             .values({
             bookingItemId: itemId,
-            participantId: data.participantId,
+            travelerId: data.travelerId,
             role: data.role,
             isPrimary: data.isPrimary ?? false,
         })
@@ -1679,9 +1885,9 @@ export const bookingsService = {
     },
     async removeItemParticipant(db, linkId) {
         const [row] = await db
-            .delete(bookingItemParticipants)
-            .where(eq(bookingItemParticipants.id, linkId))
-            .returning({ id: bookingItemParticipants.id });
+            .delete(bookingItemTravelers)
+            .where(eq(bookingItemTravelers.id, linkId))
+            .returning({ id: bookingItemTravelers.id });
         return row ?? null;
     },
     listSupplierStatuses(db, bookingId) {
@@ -1789,7 +1995,7 @@ export const bookingsService = {
             .values({
             bookingId,
             bookingItemId: data.bookingItemId ?? null,
-            participantId: data.participantId ?? null,
+            travelerId: data.travelerId ?? null,
             fulfillmentType: data.fulfillmentType,
             deliveryChannel: data.deliveryChannel,
             status,
@@ -1807,7 +2013,7 @@ export const bookingsService = {
             metadata: {
                 fulfillmentId: row?.id ?? null,
                 bookingItemId: data.bookingItemId ?? null,
-                participantId: data.participantId ?? null,
+                travelerId: data.travelerId ?? null,
                 status,
             },
         });
@@ -1831,7 +2037,7 @@ export const bookingsService = {
             .update(bookingFulfillments)
             .set({
             bookingItemId: data.bookingItemId === undefined ? undefined : (data.bookingItemId ?? null),
-            participantId: data.participantId === undefined ? undefined : (data.participantId ?? null),
+            travelerId: data.travelerId === undefined ? undefined : (data.travelerId ?? null),
             fulfillmentType: data.fulfillmentType,
             deliveryChannel: data.deliveryChannel,
             status: nextStatus,
@@ -1860,7 +2066,7 @@ export const bookingsService = {
                 metadata: {
                     fulfillmentId,
                     bookingItemId: row.bookingItemId,
-                    participantId: row.participantId,
+                    travelerId: row.travelerId,
                     status: row.status,
                 },
             });
@@ -1897,7 +2103,7 @@ export const bookingsService = {
                 .values({
                 bookingId,
                 bookingItemId: data.bookingItemId ?? null,
-                participantId: data.participantId ?? null,
+                travelerId: data.travelerId ?? null,
                 redeemedAt,
                 redeemedBy: data.redeemedBy ?? userId ?? null,
                 location: data.location ?? null,
@@ -1938,7 +2144,7 @@ export const bookingsService = {
                 metadata: {
                     redemptionEventId: event?.id ?? null,
                     bookingItemId: data.bookingItemId ?? null,
-                    participantId: data.participantId ?? null,
+                    travelerId: data.travelerId ?? null,
                     redeemedAt: redeemedAt.toISOString(),
                     method: data.method,
                 },
@@ -1986,6 +2192,13 @@ export const bookingsService = {
         });
         return row;
     },
+    async deleteNote(db, noteId) {
+        const [row] = await db
+            .delete(bookingNotes)
+            .where(eq(bookingNotes.id, noteId))
+            .returning({ id: bookingNotes.id });
+        return row ?? null;
+    },
     listDocuments(db, bookingId) {
         return db
             .select()
@@ -2006,7 +2219,7 @@ export const bookingsService = {
             .insert(bookingDocuments)
             .values({
             bookingId,
-            participantId: data.participantId ?? data.passengerId ?? null,
+            travelerId: data.travelerId ?? null,
             type: data.type,
             fileName: data.fileName,
             fileUrl: data.fileUrl,