@voyantjs/customer-portal 0.6.8 → 0.7.0

package/dist/service-public.js

@@ -1,4 +1,4 @@
-import { bookingDocuments, bookingFulfillments, bookingItemParticipants, bookingItems, bookingParticipants, bookingSessionStates, bookings, } from "@voyantjs/bookings/schema";
+import { bookingDocuments, bookingFulfillments, bookingItems, bookingItemTravelers, bookingSessionStates, bookingStaffAssignments, bookings, bookingTravelers, } from "@voyantjs/bookings/schema";
 import { crmService, people } from "@voyantjs/crm";
 import { authUser, travelDocumentSchema, userProfilesTable, } from "@voyantjs/db/schema/iam";
 import { invoiceRenditions, invoices, payments } from "@voyantjs/finance/schema";
@@ -109,20 +109,6 @@ function getRecord(value) {
     }
     return value;
 }
-function formatCustomerAddress(address) {
-    if (address.fullText) {
-        return address.fullText;
-    }
-    const parts = [
-        address.line1,
-        address.line2,
-        address.city,
-        address.region,
-        address.postalCode,
-        address.country,
-    ].filter((value) => Boolean(value));
-    return parts.length > 0 ? parts.join(", ") : null;
-}
 function toCustomerAddress(address) {
     return {
         id: address.id,
@@ -358,7 +344,7 @@ async function listLegalDocumentsForBooking(db, bookingId, options = {}) {
             {
                 id: attachment.id,
                 source: "legal",
-                participantId: null,
+                travelerId: null,
                 type: "contract",
                 fileName: attachment.name,
                 fileUrl: downloadUrl,
@@ -477,7 +463,7 @@ async function getFinanceDataForBooking(db, bookingId, options = {}) {
             {
                 id: document.invoiceId,
                 source: "finance",
-                participantId: null,
+                travelerId: null,
                 type: document.invoiceType,
                 fileName: resolveFinanceDocumentFileName(document.invoiceNumber, document.invoiceType, document.format),
                 fileUrl: document.downloadUrl,
@@ -600,9 +586,6 @@ async function listCustomerRecordCandidatesByEmail(db, email) {
         birthday: row.birthday ?? null,
         email: normalizedEmail,
         phone: null,
-        address: null,
-        city: null,
-        country: null,
         billingAddress: null,
         relation: row.relation ?? null,
         status: row.status,
@@ -644,9 +627,6 @@ async function listCustomerRecordCandidatesByPhone(db, phone) {
         birthday: row.birthday ?? null,
         email: null,
         phone: normalizedPhone,
-        address: null,
-        city: null,
-        country: null,
         billingAddress: null,
         relation: row.relation ?? null,
         status: row.status,
@@ -676,32 +656,23 @@ async function getCustomerRecord(db, userId) {
         birthday: person.birthday ?? null,
         email: person.email ?? null,
         phone: person.phone ?? null,
-        address: person.address ?? null,
-        city: person.city ?? null,
-        country: person.country ?? null,
         billingAddress: billingAddress ? toCustomerAddress(billingAddress) : null,
         relation: person.relation ?? null,
         status: person.status,
     };
 }
-async function upsertCustomerBillingAddress(db, personId, input, fallback) {
+async function upsertCustomerBillingAddress(db, personId, input) {
     const existingAddresses = await identityService.listAddressesForEntity(db, "person", personId);
     const existingAddress = selectPreferredAddress(existingAddresses);
-    const fallbackAddress = normalizeNullableString(fallback?.address);
-    const fallbackCity = normalizeNullableString(fallback?.city);
-    const fallbackCountry = normalizeNullableString(fallback?.country);
     const merged = {
         label: input.label ?? existingAddress?.label ?? "billing",
-        fullText: normalizeNullableString(input.fullText) ??
-            (input.line1 === undefined ? fallbackAddress : null) ??
-            existingAddress?.fullText ??
-            null,
+        fullText: normalizeNullableString(input.fullText) ?? existingAddress?.fullText ?? null,
         line1: normalizeNullableString(input.line1) ?? existingAddress?.line1 ?? null,
         line2: normalizeNullableString(input.line2) ?? existingAddress?.line2 ?? null,
-        city: normalizeNullableString(input.city) ?? fallbackCity ?? existingAddress?.city ?? null,
+        city: normalizeNullableString(input.city) ?? existingAddress?.city ?? null,
         region: normalizeNullableString(input.region) ?? existingAddress?.region ?? null,
         postalCode: normalizeNullableString(input.postalCode) ?? existingAddress?.postalCode ?? null,
-        country: normalizeNullableString(input.country) ?? fallbackCountry ?? existingAddress?.country ?? null,
+        country: normalizeNullableString(input.country) ?? existingAddress?.country ?? null,
         isPrimary: input.isPrimary ?? existingAddress?.isPrimary ?? existingAddresses.length === 0,
     };
     if (existingAddress) {
@@ -725,27 +696,27 @@ async function getAccessibleBookingIds(db, params) {
             : Promise.resolve([]),
         linkedPersonId
             ? db
-                .select({ bookingId: bookingParticipants.bookingId })
-                .from(bookingParticipants)
-                .where(eq(bookingParticipants.personId, linkedPersonId))
+                .select({ bookingId: bookingTravelers.bookingId })
+                .from(bookingTravelers)
+                .where(eq(bookingTravelers.personId, linkedPersonId))
             : Promise.resolve([]),
         db
-            .select({ bookingId: bookingParticipants.bookingId })
-            .from(bookingParticipants)
-            .where(sql `lower(${bookingParticipants.email}) = ${email}`),
+            .select({ bookingId: bookingTravelers.bookingId })
+            .from(bookingTravelers)
+            .where(sql `lower(${bookingTravelers.email}) = ${email}`),
     ]);
     return Array.from(new Set([...directBookingRows, ...participantPersonRows, ...participantEmailRows].map((row) => row.bookingId)));
 }
 async function hasBookingAccess(params) {
-    const ownershipConditions = [sql `lower(${bookingParticipants.email}) = ${params.authEmail}`];
+    const ownershipConditions = [sql `lower(${bookingTravelers.email}) = ${params.authEmail}`];
     if (params.linkedPersonId) {
-        ownershipConditions.push(eq(bookingParticipants.personId, params.linkedPersonId));
+        ownershipConditions.push(eq(bookingTravelers.personId, params.linkedPersonId));
     }
     const [participantMatch, bookingMatch] = await Promise.all([
         params.db
-            .select({ bookingId: bookingParticipants.bookingId })
-            .from(bookingParticipants)
-            .where(and(eq(bookingParticipants.bookingId, params.bookingId), or(...ownershipConditions)))
+            .select({ bookingId: bookingTravelers.bookingId })
+            .from(bookingTravelers)
+            .where(and(eq(bookingTravelers.bookingId, params.bookingId), or(...ownershipConditions)))
             .limit(1),
         params.linkedPersonId
             ? params.db
@@ -758,7 +729,22 @@ async function hasBookingAccess(params) {
     return Boolean(participantMatch[0] || bookingMatch[0]);
 }
 async function getBookingBillingContact(db, bookingId, customerRecord) {
-    const [stateRows, primaryParticipantRows] = await Promise.all([
+    const [bookingRows, stateRows, primaryParticipantRows] = await Promise.all([
+        db
+            .select({
+            contactFirstName: bookings.contactFirstName,
+            contactLastName: bookings.contactLastName,
+            contactEmail: bookings.contactEmail,
+            contactPhone: bookings.contactPhone,
+            contactCountry: bookings.contactCountry,
+            contactRegion: bookings.contactRegion,
+            contactCity: bookings.contactCity,
+            contactAddressLine1: bookings.contactAddressLine1,
+            contactPostalCode: bookings.contactPostalCode,
+        })
+            .from(bookings)
+            .where(eq(bookings.id, bookingId))
+            .limit(1),
         db
             .select({ payload: bookingSessionStates.payload })
             .from(bookingSessionStates)
@@ -766,36 +752,53 @@ async function getBookingBillingContact(db, bookingId, customerRecord) {
             .limit(1),
         db
             .select({
-            firstName: bookingParticipants.firstName,
-            lastName: bookingParticipants.lastName,
-            email: bookingParticipants.email,
-            phone: bookingParticipants.phone,
+            firstName: bookingTravelers.firstName,
+            lastName: bookingTravelers.lastName,
+            email: bookingTravelers.email,
+            phone: bookingTravelers.phone,
         })
-            .from(bookingParticipants)
-            .where(and(eq(bookingParticipants.bookingId, bookingId), eq(bookingParticipants.isPrimary, true)))
-            .orderBy(asc(bookingParticipants.createdAt))
+            .from(bookingTravelers)
+            .where(and(eq(bookingTravelers.bookingId, bookingId), eq(bookingTravelers.isPrimary, true)))
+            .orderBy(asc(bookingTravelers.createdAt))
             .limit(1),
     ]);
+    const booking = bookingRows[0] ?? null;
     const stateRow = stateRows[0] ?? null;
     const primaryParticipant = primaryParticipantRows[0] ?? null;
     const sessionBillingContact = resolveBillingContactFromSessionPayload(stateRow?.payload ?? null);
     const billingAddress = customerRecord?.billingAddress ?? null;
     const result = {
-        email: sessionBillingContact?.email ?? primaryParticipant?.email ?? customerRecord?.email ?? null,
-        phone: sessionBillingContact?.phone ?? primaryParticipant?.phone ?? customerRecord?.phone ?? null,
-        firstName: sessionBillingContact?.firstName ??
+        email: booking?.contactEmail ??
+            sessionBillingContact?.email ??
+            primaryParticipant?.email ??
+            customerRecord?.email ??
+            null,
+        phone: booking?.contactPhone ??
+            sessionBillingContact?.phone ??
+            primaryParticipant?.phone ??
+            customerRecord?.phone ??
+            null,
+        firstName: booking?.contactFirstName ??
+            sessionBillingContact?.firstName ??
             primaryParticipant?.firstName ??
             customerRecord?.firstName ??
             null,
-        lastName: sessionBillingContact?.lastName ??
+        lastName: booking?.contactLastName ??
+            sessionBillingContact?.lastName ??
             primaryParticipant?.lastName ??
             customerRecord?.lastName ??
             null,
-        country: sessionBillingContact?.country ?? billingAddress?.country ?? customerRecord?.country ?? null,
-        state: sessionBillingContact?.state ?? billingAddress?.region ?? null,
-        city: sessionBillingContact?.city ?? billingAddress?.city ?? customerRecord?.city ?? null,
-        address1: sessionBillingContact?.address1 ?? billingAddress?.line1 ?? null,
-        postal: sessionBillingContact?.postal ?? billingAddress?.postalCode ?? null,
+        country: booking?.contactCountry ?? sessionBillingContact?.country ?? billingAddress?.country ?? null,
+        state: booking?.contactRegion ?? sessionBillingContact?.state ?? billingAddress?.region ?? null,
+        city: booking?.contactCity ?? sessionBillingContact?.city ?? billingAddress?.city ?? null,
+        address1: booking?.contactAddressLine1 ??
+            sessionBillingContact?.address1 ??
+            billingAddress?.line1 ??
+            null,
+        postal: booking?.contactPostalCode ??
+            sessionBillingContact?.postal ??
+            billingAddress?.postalCode ??
+            null,
     };
     const hasValue = Object.values(result).some((value) => typeof value === "string" && value.length > 0);
     return hasValue ? result : null;
@@ -808,9 +811,9 @@ async function buildBookingDetail(db, bookingId, customerRecord = null, options
     const [participants, items, itemParticipantLinks, documents, fulfillments, legalDocuments, financeData, billingContact,] = await Promise.all([
         db
             .select()
-            .from(bookingParticipants)
-            .where(eq(bookingParticipants.bookingId, booking.id))
-            .orderBy(asc(bookingParticipants.createdAt)),
+            .from(bookingTravelers)
+            .where(eq(bookingTravelers.bookingId, booking.id))
+            .orderBy(asc(bookingTravelers.createdAt)),
         db
             .select()
             .from(bookingItems)
@@ -818,16 +821,16 @@ async function buildBookingDetail(db, bookingId, customerRecord = null, options
             .orderBy(asc(bookingItems.createdAt)),
         db
             .select({
-            id: bookingItemParticipants.id,
-            bookingItemId: bookingItemParticipants.bookingItemId,
-            participantId: bookingItemParticipants.participantId,
-            role: bookingItemParticipants.role,
-            isPrimary: bookingItemParticipants.isPrimary,
+            id: bookingItemTravelers.id,
+            bookingItemId: bookingItemTravelers.bookingItemId,
+            travelerId: bookingItemTravelers.travelerId,
+            role: bookingItemTravelers.role,
+            isPrimary: bookingItemTravelers.isPrimary,
         })
-            .from(bookingItemParticipants)
-            .innerJoin(bookingItems, eq(bookingItems.id, bookingItemParticipants.bookingItemId))
+            .from(bookingItemTravelers)
+            .innerJoin(bookingItems, eq(bookingItems.id, bookingItemTravelers.bookingItemId))
             .where(eq(bookingItems.bookingId, booking.id))
-            .orderBy(asc(bookingItemParticipants.createdAt)),
+            .orderBy(asc(bookingItemTravelers.createdAt)),
         db
             .select()
             .from(bookingDocuments)
@@ -847,7 +850,7 @@ async function buildBookingDetail(db, bookingId, customerRecord = null, options
         const existing = itemLinksByItemId.get(link.bookingItemId) ?? [];
         existing.push({
             id: link.id,
-            participantId: link.participantId,
+            travelerId: link.travelerId,
             role: link.role,
             isPrimary: link.isPrimary,
         });
@@ -857,7 +860,7 @@ async function buildBookingDetail(db, bookingId, customerRecord = null, options
         ...documents.map((document) => ({
             id: document.id,
             source: "booking_document",
-            participantId: document.participantId ?? null,
+            travelerId: document.travelerId ?? null,
             type: document.type,
             fileName: document.fileName,
             fileUrl: document.fileUrl,
@@ -871,6 +874,7 @@ async function buildBookingDetail(db, bookingId, customerRecord = null, options
         documents: financeData.documents,
         payments: financeData.payments,
     };
+    const travelerParticipants = participants.filter((participant) => ["traveler", "occupant", "other"].includes(participant.participantType));
     return customerPortalBookingDetailSchema.parse({
         bookingId: booking.id,
         bookingNumber: booking.bookingNumber,
@@ -883,7 +887,7 @@ async function buildBookingDetail(db, bookingId, customerRecord = null, options
         confirmedAt: normalizeDateTime(booking.confirmedAt),
         cancelledAt: normalizeDateTime(booking.cancelledAt),
         completedAt: normalizeDateTime(booking.completedAt),
-        participants: participants.map((participant) => ({
+        travelers: travelerParticipants.map((participant) => ({
             id: participant.id,
             participantType: participant.participantType,
             firstName: participant.firstName,
@@ -904,7 +908,7 @@ async function buildBookingDetail(db, bookingId, customerRecord = null, options
             unitSellAmountCents: item.unitSellAmountCents ?? null,
             totalSellAmountCents: item.totalSellAmountCents ?? null,
             notes: item.notes ?? null,
-            participantLinks: itemLinksByItemId.get(item.id) ?? [],
+            travelerLinks: itemLinksByItemId.get(item.id) ?? [],
         })),
         billingContact,
         documents: unifiedDocuments,
@@ -912,7 +916,7 @@ async function buildBookingDetail(db, bookingId, customerRecord = null, options
         fulfillments: fulfillments.map((fulfillment) => ({
             id: fulfillment.id,
             bookingItemId: fulfillment.bookingItemId ?? null,
-            participantId: fulfillment.participantId ?? null,
+            travelerId: fulfillment.travelerId ?? null,
             fulfillmentType: fulfillment.fulfillmentType,
             deliveryChannel: fulfillment.deliveryChannel,
             status: fulfillment.status,
@@ -1021,8 +1025,6 @@ export const publicCustomerPortalService = {
         const nextDateOfBirth = input.dateOfBirth !== undefined ? input.dateOfBirth : undefined;
         const nextAddressRecord = input.address !== undefined
             ? {
-                city: input.address.city,
-                country: input.address.country,
                 billingAddress: {
                     line1: input.address.addressLine1,
                     line2: input.address.addressLine2,
@@ -1110,13 +1112,9 @@ export const publicCustomerPortalService = {
                 }
                 : undefined;
             if (nextCustomerRecord || input.firstName !== undefined || input.lastName !== undefined) {
-                const billingAddress = nextCustomerRecord?.billingAddress !== undefined
-                    ? await upsertCustomerBillingAddress(db, customerRecordId, nextCustomerRecord.billingAddress, {
-                        address: nextCustomerRecord.address,
-                        city: nextCustomerRecord.city,
-                        country: nextCustomerRecord.country,
-                    })
-                    : null;
+                if (nextCustomerRecord?.billingAddress !== undefined) {
+                    await upsertCustomerBillingAddress(db, customerRecordId, nextCustomerRecord.billingAddress);
+                }
                 await crmService.updatePerson(db, customerRecordId, {
                     ...(input.firstName !== undefined ? { firstName: input.firstName ?? "" } : {}),
                     ...(input.lastName !== undefined ? { lastName: input.lastName ?? "" } : {}),
@@ -1130,30 +1128,6 @@ export const publicCustomerPortalService = {
                         ? { birthday: nextCustomerRecord.birthday }
                         : {}),
                     ...(nextCustomerRecord?.phone !== undefined ? { phone: nextCustomerRecord.phone } : {}),
-                    ...(nextCustomerRecord?.address !== undefined
-                        ? { address: nextCustomerRecord.address }
-                        : {}),
-                    ...(nextCustomerRecord?.city !== undefined ? { city: nextCustomerRecord.city } : {}),
-                    ...(nextCustomerRecord?.country !== undefined
-                        ? { country: nextCustomerRecord.country }
-                        : {}),
-                    ...(nextCustomerRecord?.billingAddress !== undefined
-                        ? {
-                            address: nextCustomerRecord.address !== undefined
-                                ? nextCustomerRecord.address
-                                : formatCustomerAddress(billingAddress ?? nextCustomerRecord.billingAddress),
-                            city: nextCustomerRecord.city !== undefined
-                                ? nextCustomerRecord.city
-                                : (normalizeNullableString(nextCustomerRecord.billingAddress.city) ??
-                                    billingAddress?.city ??
-                                    null),
-                            country: nextCustomerRecord.country !== undefined
-                                ? nextCustomerRecord.country
-                                : (normalizeNullableString(nextCustomerRecord.billingAddress.country) ??
-                                    billingAddress?.country ??
-                                    null),
-                        }
-                        : {}),
                 });
             }
         }
@@ -1231,36 +1205,12 @@ export const publicCustomerPortalService = {
                     ? { birthday: input.customerRecord.birthday }
                     : {}),
                 ...(input.customerRecord?.phone !== undefined ? { phone: input.customerRecord.phone } : {}),
-                ...(input.customerRecord?.address !== undefined
-                    ? { address: input.customerRecord.address }
-                    : {}),
-                ...(input.customerRecord?.city !== undefined ? { city: input.customerRecord.city } : {}),
-                ...(input.customerRecord?.country !== undefined
-                    ? { country: input.customerRecord.country }
-                    : {}),
-                ...(input.customerRecord?.billingAddress !== undefined
-                    ? {
-                        address: input.customerRecord.address !== undefined
-                            ? input.customerRecord.address
-                            : formatCustomerAddress(input.customerRecord.billingAddress),
-                        city: input.customerRecord.city !== undefined
-                            ? input.customerRecord.city
-                            : (normalizeNullableString(input.customerRecord.billingAddress.city) ?? null),
-                        country: input.customerRecord.country !== undefined
-                            ? input.customerRecord.country
-                            : (normalizeNullableString(input.customerRecord.billingAddress.country) ?? null),
-                    }
-                    : {}),
             });
             if (!updated) {
                 return { error: "customer_record_not_found" };
             }
             if (input.customerRecord?.billingAddress) {
-                await upsertCustomerBillingAddress(db, input.customerRecordId, input.customerRecord.billingAddress, {
-                    address: input.customerRecord.address,
-                    city: input.customerRecord.city,
-                    country: input.customerRecord.country,
-                });
+                await upsertCustomerBillingAddress(db, input.customerRecordId, input.customerRecord.billingAddress);
             }
             const profile = await this.getProfile(db, userId);
             return {
@@ -1299,31 +1249,12 @@ export const publicCustomerPortalService = {
             email: normalizedEmail,
             phone: input.customerRecord?.phone ?? null,
             website: null,
-            address: input.customerRecord?.billingAddress !== undefined
-                ? input.customerRecord.address !== undefined
-                    ? input.customerRecord.address
-                    : formatCustomerAddress(input.customerRecord.billingAddress)
-                : (input.customerRecord?.address ?? null),
-            city: input.customerRecord?.billingAddress !== undefined
-                ? input.customerRecord.city !== undefined
-                    ? input.customerRecord.city
-                    : (normalizeNullableString(input.customerRecord.billingAddress.city) ?? null)
-                : (input.customerRecord?.city ?? null),
-            country: input.customerRecord?.billingAddress !== undefined
-                ? input.customerRecord.country !== undefined
-                    ? input.customerRecord.country
-                    : (normalizeNullableString(input.customerRecord.billingAddress.country) ?? null)
-                : (input.customerRecord?.country ?? null),
         });
         if (!created) {
             return { error: "not_found" };
         }
         if (input.customerRecord?.billingAddress) {
-            await upsertCustomerBillingAddress(db, created.id, input.customerRecord.billingAddress, {
-                address: input.customerRecord.address,
-                city: input.customerRecord.city,
-                country: input.customerRecord.country,
-            });
+            await upsertCustomerBillingAddress(db, created.id, input.customerRecord.billingAddress);
         }
         const profile = await this.getProfile(db, userId);
         return {
@@ -1343,7 +1274,7 @@ export const publicCustomerPortalService = {
             companionMetadataKind)
             .map(toCustomerCompanion);
     },
-    async importBookingParticipantsAsCompanions(db, userId, input) {
+    async importBookingTravelersAsCompanions(db, userId, input) {
         const authProfile = await getAuthProfileRow(db, userId);
         const personId = await resolveLinkedCustomerRecordId(db, userId);
         if (!authProfile || !personId) {
@@ -1358,13 +1289,18 @@ export const publicCustomerPortalService = {
         if (targetBookingIds.length === 0) {
             return { created: [], skippedCount: 0 };
         }
-        const [existingCompanionRows, participantRows] = await Promise.all([
+        const [existingCompanionRows, participantRows, staffAssignmentRows] = await Promise.all([
             identityService.listNamedContactsForEntity(db, "person", personId),
             db
                 .select()
-                .from(bookingParticipants)
-                .where(inArray(bookingParticipants.bookingId, targetBookingIds))
-                .orderBy(asc(bookingParticipants.createdAt)),
+                .from(bookingTravelers)
+                .where(inArray(bookingTravelers.bookingId, targetBookingIds))
+                .orderBy(asc(bookingTravelers.createdAt)),
+            db
+                .select()
+                .from(bookingStaffAssignments)
+                .where(inArray(bookingStaffAssignments.bookingId, targetBookingIds))
+                .orderBy(asc(bookingStaffAssignments.createdAt)),
         ]);
         const existingKeys = new Set(existingCompanionRows
             .filter((row) => (row.metadata?.kind ?? null) ===
@@ -1376,11 +1312,19 @@ export const publicCustomerPortalService = {
         })));
         let skippedCount = 0;
         const created = [];
+        const distinctStaffAssignmentKeys = new Set();
+        for (const assignment of staffAssignmentRows) {
+            distinctStaffAssignmentKeys.add(JSON.stringify([
+                assignment.bookingId,
+                assignment.personId ?? null,
+                assignment.firstName,
+                assignment.lastName,
+                assignment.email ?? null,
+                assignment.phone ?? null,
+            ]));
+        }
+        skippedCount += distinctStaffAssignmentKeys.size;
         for (const participant of participantRows) {
-            if (participant.participantType === "staff") {
-                skippedCount += 1;
-                continue;
-            }
             const name = `${participant.firstName} ${participant.lastName}`.trim();
             if (!name) {
                 skippedCount += 1;
@@ -1407,7 +1351,7 @@ export const publicCustomerPortalService = {
                     metadata: {
                         source: "booking_participant_import",
                         bookingId: participant.bookingId,
-                        participantId: participant.id,
+                        travelerId: participant.id,
                         participantType: participant.participantType,
                         travelerCategory: participant.travelerCategory ?? null,
                     },
@@ -1428,6 +1372,9 @@ export const publicCustomerPortalService = {
         }
         return { created, skippedCount };
     },
+    async importBookingParticipantsAsCompanions(db, userId, input) {
+        return this.importBookingTravelersAsCompanions(db, userId, input);
+    },
     async createCompanion(db, userId, input) {
         const personId = await resolveLinkedCustomerRecordId(db, userId);
         if (!personId) {
@@ -1522,9 +1469,9 @@ export const publicCustomerPortalService = {
                 .orderBy(desc(bookings.createdAt)),
             db
                 .select()
-                .from(bookingParticipants)
-                .where(inArray(bookingParticipants.bookingId, bookingIds))
-                .orderBy(asc(bookingParticipants.createdAt)),
+                .from(bookingTravelers)
+                .where(inArray(bookingTravelers.bookingId, bookingIds))
+                .orderBy(asc(bookingTravelers.createdAt)),
             db
                 .select({
                 bookingId: bookingItems.bookingId,
@@ -1584,7 +1531,7 @@ export const publicCustomerPortalService = {
                 pax: booking.pax ?? null,
                 confirmedAt: normalizeDateTime(booking.confirmedAt),
                 completedAt: normalizeDateTime(booking.completedAt),
-                participantCount: participants.length,
+                travelerCount: participants.length,
                 primaryTravelerName: primaryTraveler
                     ? `${primaryTraveler.firstName} ${primaryTraveler.lastName}`.trim()
                     : null,