@voyantjs/bookings 0.6.8 → 0.7.0

package/dist/service-public.js

@@ -1,7 +1,7 @@
 import { and, asc, desc, eq, inArray, or } from "drizzle-orm";
 import { optionPriceRulesRef, optionUnitPriceRulesRef, optionUnitTiersRef, priceCatalogsRef, } from "./pricing-ref.js";
 import { optionUnitsRef, productOptionsRef, productsRef } from "./products-ref.js";
-import { bookingAllocations, bookingDocuments, bookingFulfillments, bookingItemParticipants, bookingItems, bookingParticipants, bookingSessionStates, bookings, } from "./schema.js";
+import { bookingAllocations, bookingDocuments, bookingFulfillments, bookingItems, bookingItemTravelers, bookingSessionStates, bookings, bookingTravelers, } from "./schema.js";
 import { bookingsService } from "./service.js";
 const travelerParticipantTypes = new Set(["traveler", "occupant"]);
 const WIZARD_STATE_KEY = "wizard";
@@ -20,6 +20,50 @@ function normalizeDateTime(value) {
     }
     return value instanceof Date ? value.toISOString() : value;
 }
+function getRecord(value) {
+    return value && typeof value === "object" && !Array.isArray(value)
+        ? value
+        : null;
+}
+function getNestedRecord(record, keys) {
+    for (const key of keys) {
+        const value = getRecord(record?.[key]);
+        if (value) {
+            return value;
+        }
+    }
+    return null;
+}
+function getRecordString(record, keys) {
+    for (const key of keys) {
+        const value = record?.[key];
+        if (typeof value === "string" && value.length > 0) {
+            return value;
+        }
+    }
+    return null;
+}
+function extractBookingContactFromStatePayload(payload) {
+    const root = getRecord(payload);
+    const stepData = getNestedRecord(root, ["stepData", "steps"]);
+    const billingRecord = getNestedRecord(root, ["billing", "billingContact", "contact"]) ??
+        getNestedRecord(stepData, ["billing", "billingContact", "contact"]);
+    const billing = getNestedRecord(billingRecord, ["billing", "contact"]) ?? billingRecord;
+    if (!billing) {
+        return null;
+    }
+    return {
+        contactFirstName: getRecordString(billing, ["firstName"]),
+        contactLastName: getRecordString(billing, ["lastName"]),
+        contactEmail: getRecordString(billing, ["email"]),
+        contactPhone: getRecordString(billing, ["phone"]),
+        contactCountry: getRecordString(billing, ["country"]),
+        contactRegion: getRecordString(billing, ["state", "region"]),
+        contactCity: getRecordString(billing, ["city"]),
+        contactAddressLine1: getRecordString(billing, ["addressLine1", "address1", "line1"]),
+        contactPostalCode: getRecordString(billing, ["postalCode", "postal", "zip"]),
+    };
+}
 function countTravelerParticipants(participants) {
     return participants.filter((participant) => travelerParticipantTypes.has(participant.participantType)).length;
 }
@@ -141,9 +185,9 @@ async function buildOverviewSnapshot(db, query) {
     const [participants, items, itemParticipantLinks, documents, fulfillments] = 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)
@@ -151,16 +195,16 @@ async function buildOverviewSnapshot(db, query) {
             .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)
@@ -184,7 +228,7 @@ async function buildOverviewSnapshot(db, query) {
         const existing = itemLinksByItemId.get(link.bookingItemId) ?? [];
         existing.push({
             id: link.id,
-            participantId: link.participantId,
+            travelerId: link.travelerId,
             role: link.role,
             isPrimary: link.isPrimary,
         });
@@ -202,7 +246,7 @@ async function buildOverviewSnapshot(db, query) {
         confirmedAt: normalizeDateTime(booking.confirmedAt),
         cancelledAt: normalizeDateTime(booking.cancelledAt),
         completedAt: normalizeDateTime(booking.completedAt),
-        participants: participants.map((participant) => ({
+        travelers: participants.map((participant) => ({
             id: participant.id,
             participantType: participant.participantType,
             firstName: participant.firstName,
@@ -230,11 +274,11 @@ async function buildOverviewSnapshot(db, query) {
             optionId: item.optionId ?? null,
             optionUnitId: item.optionUnitId ?? null,
             pricingCategoryId: item.pricingCategoryId ?? null,
-            participantLinks: itemLinksByItemId.get(item.id) ?? [],
+            travelerLinks: itemLinksByItemId.get(item.id) ?? [],
         })),
         documents: documents.map((document) => ({
             id: document.id,
-            participantId: document.participantId ?? null,
+            travelerId: document.travelerId ?? null,
             type: document.type,
             fileName: document.fileName,
             fileUrl: document.fileUrl,
@@ -242,7 +286,7 @@ async function buildOverviewSnapshot(db, query) {
         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,
@@ -269,7 +313,19 @@ function buildUnitWarnings(unit, quantity, sessionPax) {
     }
     return warnings;
 }
-async function resolveSessionPricingSnapshot(db, productId, input) {
+/**
+ * Resolves the catalog-scoped pricing snapshot for a product (options → option
+ * price rules → per-unit price rules → tiers). The snapshot is the same data
+ * the storefront booking session uses to compute a total — exposing it as a
+ * standalone admin preview lets operator dialogs, tour-sheet exports, and
+ * reconciliation flows see the same numbers the customer would see, without
+ * creating a throwaway session.
+ *
+ * Returns `null` when the product isn't publicly visible or there's no active
+ * catalog / matching option (caller can decide whether to 404 or surface a
+ * "pricing unavailable for this selection" message).
+ */
+export async function resolveSessionPricingSnapshot(db, productId, input) {
     const [product] = await db
         .select({
         id: productsRef.id,
@@ -388,9 +444,9 @@ async function buildSessionSnapshot(db, bookingId) {
         bookingsService.getBookingById(db, bookingId),
         db
             .select()
-            .from(bookingParticipants)
-            .where(eq(bookingParticipants.bookingId, bookingId))
-            .orderBy(asc(bookingParticipants.createdAt)),
+            .from(bookingTravelers)
+            .where(eq(bookingTravelers.bookingId, bookingId))
+            .orderBy(asc(bookingTravelers.createdAt)),
         db
             .select()
             .from(bookingItems)
@@ -403,16 +459,16 @@ async function buildSessionSnapshot(db, bookingId) {
             .orderBy(asc(bookingAllocations.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, bookingId))
-            .orderBy(asc(bookingItemParticipants.createdAt)),
+            .orderBy(asc(bookingItemTravelers.createdAt)),
         getWizardSessionState(db, bookingId),
     ]);
     if (!booking) {
@@ -423,15 +479,15 @@ async function buildSessionSnapshot(db, bookingId) {
         const existing = itemLinksByItemId.get(link.bookingItemId) ?? [];
         existing.push({
             id: link.id,
-            participantId: link.participantId,
+            travelerId: link.travelerId,
             role: link.role,
             isPrimary: link.isPrimary,
         });
         itemLinksByItemId.set(link.bookingItemId, existing);
     }
-    const hasParticipants = participants.length > 0;
     const hasTraveler = countTravelerParticipants(participants) > 0;
-    const hasPrimaryParticipant = participants.some((participant) => participant.isPrimary);
+    const hasTravelers = participants.length > 0;
+    const hasPrimaryTraveler = participants.some((participant) => participant.isPrimary);
     const hasItems = items.length > 0;
     const hasAllocations = allocations.length > 0;
     return {
@@ -450,7 +506,7 @@ async function buildSessionSnapshot(db, bookingId) {
         expiredAt: normalizeDateTime(booking.expiredAt),
         cancelledAt: normalizeDateTime(booking.cancelledAt),
         completedAt: normalizeDateTime(booking.completedAt),
-        participants: participants.map((participant) => ({
+        travelers: participants.map((participant) => ({
             id: participant.id,
             participantType: participant.participantType,
             travelerCategory: participant.travelerCategory ?? null,
@@ -485,7 +541,7 @@ async function buildSessionSnapshot(db, bookingId) {
             optionId: item.optionId ?? null,
             optionUnitId: item.optionUnitId ?? null,
             pricingCategoryId: item.pricingCategoryId ?? null,
-            participantLinks: itemLinksByItemId.get(item.id) ?? [],
+            travelerLinks: itemLinksByItemId.get(item.id) ?? [],
         })),
         allocations: allocations.map((allocation) => ({
             id: allocation.id,
@@ -503,15 +559,14 @@ async function buildSessionSnapshot(db, bookingId) {
             releasedAt: normalizeDateTime(allocation.releasedAt),
         })),
         checklist: {
-            hasParticipants,
-            hasTraveler,
-            hasPrimaryParticipant,
+            hasTravelers,
+            hasPrimaryTraveler,
             hasItems,
             hasAllocations,
             readyForConfirmation: booking.status === "on_hold" &&
-                hasParticipants &&
+                hasTravelers &&
                 hasTraveler &&
-                hasPrimaryParticipant &&
+                hasPrimaryTraveler &&
                 hasItems &&
                 hasAllocations,
         },
@@ -520,7 +575,8 @@ async function buildSessionSnapshot(db, bookingId) {
 }
 export const publicBookingsService = {
     async createSession(db, input, userId) {
-        const travelerCount = countTravelerParticipants(input.participants);
+        const travelers = input.travelers ?? [];
+        const travelerCount = countTravelerParticipants(travelers);
         const bookingNumber = await generateBookingNumber(db);
         const result = await bookingsService.reserveBooking(db, {
             bookingNumber,
@@ -558,8 +614,8 @@ export const publicBookingsService = {
         if (!("booking" in result) || !result.booking) {
             return result;
         }
-        for (const participant of input.participants) {
-            await bookingsService.createParticipant(db, result.booking.id, {
+        for (const participant of travelers) {
+            await bookingsService.createTravelerRecord(db, result.booking.id, {
                 participantType: participant.participantType,
                 travelerCategory: participant.travelerCategory ?? null,
                 firstName: participant.firstName,
@@ -593,6 +649,13 @@ export const publicBookingsService = {
             return { status: "not_found" };
         }
         const state = await upsertWizardSessionState(db, bookingId, input);
+        if (!state) {
+            return { status: "not_found" };
+        }
+        const bookingContact = extractBookingContactFromStatePayload(state.payload);
+        if (bookingContact) {
+            await bookingsService.updateBooking(db, bookingId, bookingContact);
+        }
         return { status: "ok", state };
     },
     async updateSession(db, bookingId, input, userId) {
@@ -609,20 +672,22 @@ export const publicBookingsService = {
                 pax: input.pax,
             });
         }
-        for (const participantId of input.removedParticipantIds) {
-            const participant = await bookingsService.getParticipantById(db, bookingId, participantId);
+        const travelers = input.travelers;
+        const removedTravelerIds = input.removedTravelerIds ?? [];
+        for (const travelerId of removedTravelerIds) {
+            const participant = await bookingsService.getTravelerRecordById(db, bookingId, travelerId);
             if (participant) {
-                await bookingsService.deleteParticipant(db, participant.id);
+                await bookingsService.deleteTravelerRecord(db, participant.id);
             }
         }
-        if (input.participants) {
-            for (const participant of input.participants) {
+        if (travelers) {
+            for (const participant of travelers) {
                 if (participant.id) {
-                    const existing = await bookingsService.getParticipantById(db, bookingId, participant.id);
+                    const existing = await bookingsService.getTravelerRecordById(db, bookingId, participant.id);
                     if (!existing) {
                         return { status: "participant_not_found" };
                     }
-                    await bookingsService.updateParticipant(db, participant.id, {
+                    await bookingsService.updateTravelerRecord(db, participant.id, {
                         participantType: participant.participantType,
                         travelerCategory: participant.travelerCategory ?? null,
                         firstName: participant.firstName,
@@ -637,7 +702,7 @@ export const publicBookingsService = {
                     });
                     continue;
                 }
-                await bookingsService.createParticipant(db, bookingId, {
+                await bookingsService.createTravelerRecord(db, bookingId, {
                     participantType: participant.participantType,
                     travelerCategory: participant.travelerCategory ?? null,
                     firstName: participant.firstName,
@@ -662,11 +727,11 @@ export const publicBookingsService = {
                 return holdResult;
             }
         }
-        if (input.pax === undefined && (input.participants || input.removedParticipantIds.length > 0)) {
+        if (input.pax === undefined && (travelers || removedTravelerIds.length > 0)) {
             const participants = await db
-                .select({ participantType: bookingParticipants.participantType })
-                .from(bookingParticipants)
-                .where(eq(bookingParticipants.bookingId, bookingId));
+                .select({ participantType: bookingTravelers.participantType })
+                .from(bookingTravelers)
+                .where(eq(bookingTravelers.bookingId, bookingId));
             const travelerCount = countTravelerParticipants(participants);
             await bookingsService.updateBooking(db, bookingId, {
                 pax: travelerCount > 0 ? travelerCount : null,