@voyantjs/bookings 0.19.0 → 0.21.0

package/dist/service.js

@@ -1,7 +1,7 @@
 import { and, asc, desc, eq, exists, ilike, inArray, lte, ne, or, sql } from "drizzle-orm";
 import { availabilitySlotsRef } from "./availability-ref.js";
 import { exchangeRatesRef } from "./markets-ref.js";
-import { bookingItemProductDetailsRef, bookingProductDetailsRef, optionUnitsRef, productDayServicesRef, productDaysRef, productItinerariesRef, productOptionsRef, productsRef, productTicketSettingsRef, } from "./products-ref.js";
+import { bookingItemProductDetailsRef, bookingProductDetailsRef, optionUnitsRef, productDayServicesRef, productDaysRef, productItinerariesRef, productOptionsRef, productsRef, productTicketSettingsRef, suppliersRef, } from "./products-ref.js";
 import { bookingActivityLog, bookingAllocations, bookingDocuments, bookingFulfillments, bookingItems, bookingItemTravelers, bookingNotes, bookingRedemptionEvents, bookingStaffAssignments, bookingSupplierStatuses, bookings, bookingTravelers, } from "./schema.js";
 import { cleanupGroupOnBookingCancelled } from "./service-groups.js";
 import { canTransitionBooking, transitionBooking } from "./state-machine.js";
@@ -17,6 +17,26 @@ function pickTravelDetailFields(data) {
         isLeadTraveler: data.isLeadTraveler,
     };
 }
+/** Stable string identifier for the event. */
+export const AVAILABILITY_SLOT_CHANGED_EVENT = "availability.slot.changed";
+/**
+ * Emit a batch of slot-change events through the runtime's EventBus.
+ * No-op when no event bus is wired (the common test path). Each emit is
+ * fire-and-forget per the EventBus contract — subscriber errors are
+ * logged, not rethrown — but we await to keep ordering deterministic in
+ * tests that drain the bus before assertions.
+ */
+async function emitSlotChanges(runtime, changes) {
+    const eventBus = runtime.eventBus;
+    if (!eventBus || changes.length === 0)
+        return;
+    for (const change of changes) {
+        await eventBus.emit(AVAILABILITY_SLOT_CHANGED_EVENT, change, {
+            category: "domain",
+            source: "service",
+        });
+    }
+}
 const travelerParticipantTypes = ["traveler", "occupant"];
 class BookingServiceError extends Error {
     code;
@@ -262,13 +282,93 @@ async function getConvertProductData(db, data) {
         })),
     };
 }
-function computeHoldExpiresAt(input) {
+const DEFAULT_HOLD_MINUTES = 30;
+function positiveHoldMinutes(value) {
+    return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : null;
+}
+function isUndefinedTableError(error) {
+    return (typeof error === "object" &&
+        error !== null &&
+        "code" in error &&
+        error.code === "42P01");
+}
+async function resolvePolicyHoldMinutes(db, items) {
+    const productIds = new Set();
+    const slotIds = new Set();
+    for (const item of items) {
+        if (item.productId)
+            productIds.add(item.productId);
+        const slotId = item.availabilitySlotId ?? item.slotId;
+        if (slotId)
+            slotIds.add(slotId);
+    }
+    if (slotIds.size > 0) {
+        const slotRows = await db
+            .select({ productId: availabilitySlotsRef.productId })
+            .from(availabilitySlotsRef)
+            .where(inArray(availabilitySlotsRef.id, [...slotIds]));
+        for (const slot of slotRows) {
+            if (slot.productId)
+                productIds.add(slot.productId);
+        }
+    }
+    if (productIds.size === 0) {
+        return DEFAULT_HOLD_MINUTES;
+    }
+    const productRows = await db
+        .select({
+        id: productsRef.id,
+        supplierId: productsRef.supplierId,
+        reservationTimeoutMinutes: productsRef.reservationTimeoutMinutes,
+    })
+        .from(productsRef)
+        .where(inArray(productsRef.id, [...productIds]))
+        .catch((error) => {
+        if (isUndefinedTableError(error))
+            return [];
+        throw error;
+    });
+    const supplierIds = [
+        ...new Set(productRows.map((product) => product.supplierId).filter(Boolean)),
+    ];
+    const supplierRows = supplierIds.length > 0
+        ? await db
+            .select({
+            id: suppliersRef.id,
+            reservationTimeoutMinutes: suppliersRef.reservationTimeoutMinutes,
+        })
+            .from(suppliersRef)
+            .where(inArray(suppliersRef.id, supplierIds))
+            .catch((error) => {
+            if (isUndefinedTableError(error))
+                return [];
+            throw error;
+        })
+        : [];
+    const supplierTimeouts = new Map(supplierRows.map((supplier) => [
+        supplier.id,
+        positiveHoldMinutes(supplier.reservationTimeoutMinutes),
+    ]));
+    const candidates = [];
+    for (const product of productRows) {
+        const productMinutes = positiveHoldMinutes(product.reservationTimeoutMinutes);
+        if (productMinutes !== null) {
+            candidates.push(productMinutes);
+            continue;
+        }
+        const supplierMinutes = product.supplierId ? supplierTimeouts.get(product.supplierId) : null;
+        if (supplierMinutes !== null && supplierMinutes !== undefined) {
+            candidates.push(supplierMinutes);
+        }
+    }
+    return candidates.length > 0 ? Math.min(...candidates) : DEFAULT_HOLD_MINUTES;
+}
+async function computeHoldExpiresAt(db, input, items = []) {
     if (input.holdExpiresAt) {
         return new Date(input.holdExpiresAt);
     }
-    const now = Date.now();
-    const minutes = input.holdMinutes ?? 30;
-    return new Date(now + minutes * 60 * 1000);
+    const minutes = input.holdMinutes ?? (await resolvePolicyHoldMinutes(db, items));
+    return new Date(Date.now() + minutes * 60 * 1000);
 }
 /**
  * Walk a booking's items, convert each line into the booking's
@@ -374,7 +474,18 @@ async function lockAvailabilitySlot(db, slotId) {
         ends_at: toDateValueOrNull(row.ends_at),
     };
 }
-async function adjustSlotCapacity(db, slotId, delta) {
+function buildSlotChange(slot, remainingPax, source) {
+    return {
+        slotId: slot.id,
+        productId: slot.product_id,
+        optionId: slot.option_id,
+        startsAt: slot.starts_at,
+        remainingPax: slot.unlimited ? null : remainingPax,
+        unlimited: slot.unlimited,
+        source,
+    };
+}
+async function adjustSlotCapacity(db, slotId, delta, source = "booking") {
     const locked = await lockAvailabilitySlot(db, slotId);
     if (!locked) {
         return { status: "slot_not_found" };
@@ -383,7 +494,12 @@ async function adjustSlotCapacity(db, slotId, delta) {
         return { status: "slot_unavailable", slot: locked };
     }
     if (locked.unlimited) {
-        return { status: "ok", slot: locked, remainingPax: locked.remaining_pax };
+        return {
+            status: "ok",
+            slot: locked,
+            remainingPax: locked.remaining_pax,
+            slotChange: buildSlotChange(locked, locked.remaining_pax, source),
+        };
     }
     const currentRemaining = locked.remaining_pax ?? 0;
     const nextRemaining = currentRemaining + delta;
@@ -409,21 +525,28 @@ async function adjustSlotCapacity(db, slotId, delta) {
         updatedAt: new Date(),
     })
         .where(eq(availabilitySlotsRef.id, slotId));
-    return { status: "ok", slot: locked, remainingPax: nextRemaining };
+    return {
+        status: "ok",
+        slot: locked,
+        remainingPax: nextRemaining,
+        slotChange: buildSlotChange(locked, nextRemaining, source),
+    };
 }
-async function releaseAllocationCapacity(db, allocation) {
+async function releaseAllocationCapacity(db, allocation, source = "cancel") {
     if (!allocation.availabilitySlotId) {
-        return;
+        return undefined;
     }
     if (allocation.status !== "held" && allocation.status !== "confirmed") {
-        return;
+        return undefined;
     }
-    await adjustSlotCapacity(db, allocation.availabilitySlotId, allocation.quantity);
+    const result = await adjustSlotCapacity(db, allocation.availabilitySlotId, allocation.quantity, source);
+    return result.status === "ok" ? result.slotChange : undefined;
 }
-async function reserveBookingFromTransactionSource(db, source, data, userId) {
+async function reserveBookingFromTransactionSource(db, source, data, userId, runtime = {}) {
+    const slotChanges = [];
     try {
-        return await db.transaction(async (tx) => {
-            const holdExpiresAt = computeHoldExpiresAt(data);
+        const result = await db.transaction(async (tx) => {
+            const holdExpiresAt = await computeHoldExpiresAt(tx, data, source.items);
             const dateRange = deriveBookingDateRange(source.items);
             const pax = deriveBookingPax(source.participants, source.items);
             const [booking] = await tx
@@ -492,7 +615,7 @@ async function reserveBookingFromTransactionSource(db, source, data, userId) {
             const bookingItemMap = new Map();
             for (const item of source.items) {
                 if (item.slotId) {
-                    const capacity = await adjustSlotCapacity(tx, item.slotId, -item.quantity);
+                    const capacity = await adjustSlotCapacity(tx, item.slotId, -item.quantity, "booking");
                     if (capacity.status === "slot_not_found") {
                         throw new BookingServiceError("slot_not_found");
                     }
@@ -509,6 +632,8 @@ async function reserveBookingFromTransactionSource(db, source, data, userId) {
                     if (item.optionId && item.optionId !== slot.option_id) {
                         throw new BookingServiceError("slot_option_mismatch");
                     }
+                    if (capacity.slotChange)
+                        slotChanges.push(capacity.slotChange);
                 }
                 const [bookingItem] = await tx
                     .insert(bookingItems)
@@ -680,6 +805,10 @@ async function reserveBookingFromTransactionSource(db, source, data, userId) {
             }
             return { status: "ok", booking };
         });
+        if (result.status === "ok") {
+            await emitSlotChanges(runtime, slotChanges);
+        }
+        return result;
     }
     catch (error) {
         if (error instanceof BookingServiceError) {
@@ -1033,8 +1162,37 @@ export const bookingsService = {
                 .orderBy(desc(bookings.createdAt)),
             db.select({ count: sql `count(*)::int` }).from(bookings).where(where),
         ]);
+        const bookingIds = rows.map((row) => row.id);
+        const itemTimes = bookingIds.length > 0
+            ? await db
+                .select({
+                bookingId: bookingItems.bookingId,
+                startsAt: bookingItems.startsAt,
+                endsAt: bookingItems.endsAt,
+            })
+                .from(bookingItems)
+                .where(inArray(bookingItems.bookingId, bookingIds))
+            : [];
+        const ranges = new Map();
+        for (const item of itemTimes) {
+            const current = ranges.get(item.bookingId) ?? { startsAt: null, endsAt: null };
+            if (item.startsAt && (!current.startsAt || item.startsAt < current.startsAt)) {
+                current.startsAt = item.startsAt;
+            }
+            if (item.endsAt && (!current.endsAt || item.endsAt > current.endsAt)) {
+                current.endsAt = item.endsAt;
+            }
+            ranges.set(item.bookingId, current);
+        }
         return {
-            data: rows,
+            data: rows.map((row) => {
+                const range = ranges.get(row.id);
+                return {
+                    ...row,
+                    startsAt: range?.startsAt?.toISOString() ?? null,
+                    endsAt: range?.endsAt?.toISOString() ?? null,
+                };
+            }),
             total: countResult[0]?.count ?? 0,
             limit: query.limit,
             offset: query.offset,
@@ -1207,7 +1365,7 @@ export const bookingsService = {
             .where(eq(bookingAllocations.bookingId, bookingId))
             .orderBy(asc(bookingAllocations.createdAt));
     },
-    async reserveBookingFromOffer(db, offerId, data, userId) {
+    async reserveBookingFromOffer(db, offerId, data, userId, runtime = {}) {
         const [offer] = await db.select().from(offersRef).where(eq(offersRef.id, offerId)).limit(1);
         if (!offer) {
             return { status: "not_found" };
@@ -1282,9 +1440,9 @@ export const bookingsService = {
             participants: reservationParticipants,
             items,
             itemParticipants: reservationItemParticipants,
-        }, data, userId);
+        }, data, userId, runtime);
     },
-    async reserveBookingFromOrder(db, orderId, data, userId) {
+    async reserveBookingFromOrder(db, orderId, data, userId, runtime = {}) {
         const [order] = await db.select().from(ordersRef).where(eq(ordersRef.id, orderId)).limit(1);
         if (!order) {
             return { status: "not_found" };
@@ -1359,12 +1517,13 @@ export const bookingsService = {
             participants: reservationParticipants,
             items,
             itemParticipants: reservationItemParticipants,
-        }, data, userId);
+        }, data, userId, runtime);
     },
-    async reserveBooking(db, data, userId) {
+    async reserveBooking(db, data, userId, runtime = {}) {
+        const slotChanges = [];
         try {
-            return await db.transaction(async (tx) => {
-                const holdExpiresAt = computeHoldExpiresAt(data);
+            const result = await db.transaction(async (tx) => {
+                const holdExpiresAt = await computeHoldExpiresAt(tx, data, data.items);
                 const [booking] = await tx
                     .insert(bookings)
                     .values({
@@ -1403,7 +1562,7 @@ export const bookingsService = {
                     throw new BookingServiceError("booking_create_failed");
                 }
                 for (const item of data.items) {
-                    const capacity = await adjustSlotCapacity(tx, item.availabilitySlotId, -item.quantity);
+                    const capacity = await adjustSlotCapacity(tx, item.availabilitySlotId, -item.quantity, "booking");
                     if (capacity.status === "slot_not_found") {
                         throw new BookingServiceError("slot_not_found");
                     }
@@ -1420,6 +1579,8 @@ export const bookingsService = {
                     if (item.optionId && item.optionId !== slot.option_id) {
                         throw new BookingServiceError("slot_option_mismatch");
                     }
+                    if (capacity.slotChange)
+                        slotChanges.push(capacity.slotChange);
                     const [bookingItem] = await tx
                         .insert(bookingItems)
                         .values({
@@ -1481,6 +1642,10 @@ export const bookingsService = {
                 });
                 return { status: "ok", booking };
             });
+            if (result.status === "ok") {
+                await emitSlotChanges(runtime, slotChanges);
+            }
+            return result;
         }
         catch (error) {
             if (error instanceof BookingServiceError) {
@@ -1575,7 +1740,12 @@ export const bookingsService = {
                 if (!canTransitionBooking(booking.status, "confirmed")) {
                     throw new BookingServiceError("invalid_transition");
                 }
-                if (booking.status !== "on_hold") {
+                // Accept both the staff-brokered "on_hold" and the customer
+                // checkout flow's "awaiting_payment". Other statuses (draft,
+                // already-confirmed, expired, cancelled) reject — the state
+                // machine catches the rest, but we explicitly forbid the
+                // states that would skip a step in the lifecycle.
+                if (booking.status !== "on_hold" && booking.status !== "awaiting_payment") {
                     throw new BookingServiceError("invalid_transition");
                 }
                 if (booking.hold_expires_at && booking.hold_expires_at < new Date()) {
@@ -1639,6 +1809,109 @@ export const bookingsService = {
             throw error;
         }
     },
+    async recoverExpiredPaidBooking(db, id, data = {}, userId, runtime = {}) {
+        const slotChanges = [];
+        try {
+            const result = await db.transaction(async (tx) => {
+                const rows = await tx.execute(sql `SELECT id, booking_number, status
+              FROM ${bookings}
+              WHERE ${bookings.id} = ${id}
+              FOR UPDATE`);
+                const booking = rows[0];
+                if (!booking) {
+                    throw new BookingServiceError("not_found");
+                }
+                if (booking.status !== "awaiting_payment" && booking.status !== "expired") {
+                    throw new BookingServiceError("invalid_transition");
+                }
+                const allocations = await tx
+                    .select()
+                    .from(bookingAllocations)
+                    .where(eq(bookingAllocations.bookingId, id));
+                for (const allocation of allocations) {
+                    if (allocation.status === "confirmed") {
+                        continue;
+                    }
+                    if (allocation.status !== "held" && allocation.status !== "expired") {
+                        throw new BookingServiceError("invalid_transition");
+                    }
+                    if (!allocation.availabilitySlotId || allocation.status === "held") {
+                        continue;
+                    }
+                    const capacity = await adjustSlotCapacity(tx, allocation.availabilitySlotId, -allocation.quantity, "booking");
+                    if (capacity.status === "slot_not_found") {
+                        throw new BookingServiceError("slot_not_found");
+                    }
+                    if (capacity.status === "slot_unavailable") {
+                        throw new BookingServiceError("slot_unavailable");
+                    }
+                    if (capacity.status === "insufficient_capacity") {
+                        throw new BookingServiceError("insufficient_capacity");
+                    }
+                    if (capacity.slotChange)
+                        slotChanges.push(capacity.slotChange);
+                }
+                const now = new Date();
+                await tx
+                    .update(bookingAllocations)
+                    .set({
+                    status: "confirmed",
+                    confirmedAt: now,
+                    releasedAt: null,
+                    updatedAt: now,
+                })
+                    .where(and(eq(bookingAllocations.bookingId, id), inArray(bookingAllocations.status, ["held", "expired"])));
+                await tx
+                    .update(bookingItems)
+                    .set({ status: "confirmed", updatedAt: now })
+                    .where(and(eq(bookingItems.bookingId, id), inArray(bookingItems.status, ["on_hold", "expired"])));
+                const [row] = await tx
+                    .update(bookings)
+                    .set({
+                    status: "confirmed",
+                    confirmedAt: now,
+                    paidAt: now,
+                    expiredAt: null,
+                    holdExpiresAt: null,
+                    updatedAt: now,
+                })
+                    .where(eq(bookings.id, id))
+                    .returning();
+                await syncTransactionOnBookingConfirmed(tx, id);
+                await autoIssueFulfillmentsForBooking(tx, id, userId);
+                await tx.insert(bookingActivityLog).values({
+                    bookingId: id,
+                    actorId: userId ?? "system",
+                    activityType: "booking_confirmed",
+                    description: `Late payment recovered and booking ${booking.booking_number} confirmed`,
+                    metadata: { recoveredFromStatus: booking.status },
+                });
+                if (data.note) {
+                    await tx.insert(bookingNotes).values({
+                        bookingId: id,
+                        authorId: userId ?? "system",
+                        content: data.note,
+                    });
+                }
+                return { status: "ok", booking: row ?? null };
+            });
+            if (result.status === "ok" && result.booking) {
+                await runtime.eventBus?.emit("booking.confirmed", {
+                    bookingId: result.booking.id,
+                    bookingNumber: result.booking.bookingNumber,
+                    actorId: userId ?? null,
+                }, { category: "domain", source: "service" });
+                await emitSlotChanges(runtime, slotChanges);
+            }
+            return result;
+        }
+        catch (error) {
+            if (error instanceof BookingServiceError) {
+                return { status: error.code };
+            }
+            throw error;
+        }
+    },
     async extendBookingHold(db, id, data, userId) {
         try {
             return await db.transaction(async (tx) => {
@@ -1650,13 +1923,13 @@ export const bookingsService = {
                 if (!booking) {
                     throw new BookingServiceError("not_found");
                 }
-                if (booking.status !== "on_hold") {
+                if (booking.status !== "on_hold" && booking.status !== "awaiting_payment") {
                     throw new BookingServiceError("invalid_transition");
                 }
                 if (booking.hold_expires_at && booking.hold_expires_at < new Date()) {
                     throw new BookingServiceError("hold_expired");
                 }
-                const holdExpiresAt = computeHoldExpiresAt(data);
+                const holdExpiresAt = await computeHoldExpiresAt(tx, data);
                 await tx
                     .update(bookingAllocations)
                     .set({
@@ -1690,6 +1963,7 @@ export const bookingsService = {
         }
     },
     async expireBooking(db, id, data, userId, runtime = {}) {
+        const slotChanges = [];
         try {
             const result = await db.transaction(async (tx) => {
                 const rows = await tx.execute(sql `SELECT id, status, hold_expires_at
@@ -1712,7 +1986,9 @@ export const bookingsService = {
                     .from(bookingAllocations)
                     .where(eq(bookingAllocations.bookingId, id));
                 for (const allocation of allocations) {
-                    await releaseAllocationCapacity(tx, allocation);
+                    const change = await releaseAllocationCapacity(tx, allocation, "expire");
+                    if (change)
+                        slotChanges.push(change);
                 }
                 await tx
                     .update(bookingAllocations)
@@ -1758,6 +2034,8 @@ export const bookingsService = {
                     cause: runtime.cause ?? "route",
                     actorId: userId ?? null,
                 }, { category: "domain", source: "service" });
+                await emitSlotChanges(runtime, slotChanges);
+                await runtime.expirePaymentSessionsForBooking?.(db, result.booking.id);
             }
             return result;
         }
@@ -1773,7 +2051,7 @@ export const bookingsService = {
         const staleBookings = await db
             .select({ id: bookings.id })
             .from(bookings)
-            .where(and(eq(bookings.status, "on_hold"), sql `${bookings.holdExpiresAt} IS NOT NULL`, lte(bookings.holdExpiresAt, cutoff)))
+            .where(and(inArray(bookings.status, ["on_hold", "awaiting_payment"]), sql `${bookings.holdExpiresAt} IS NOT NULL`, lte(bookings.holdExpiresAt, cutoff)))
             .orderBy(asc(bookings.holdExpiresAt), asc(bookings.createdAt));
         const expiredIds = [];
         for (const booking of staleBookings) {
@@ -1789,6 +2067,7 @@ export const bookingsService = {
         };
     },
     async cancelBooking(db, id, data, userId, runtime = {}) {
+        const slotChanges = [];
         try {
             const result = await db.transaction(async (tx) => {
                 const rows = await tx.execute(sql `SELECT id, status
@@ -1809,7 +2088,9 @@ export const bookingsService = {
                     .from(bookingAllocations)
                     .where(eq(bookingAllocations.bookingId, id));
                 for (const allocation of allocations) {
-                    await releaseAllocationCapacity(tx, allocation);
+                    const change = await releaseAllocationCapacity(tx, allocation, "cancel");
+                    if (change)
+                        slotChanges.push(change);
                 }
                 await tx
                     .update(bookingAllocations)
@@ -1861,6 +2142,7 @@ export const bookingsService = {
                     previousStatus: result.previousStatus,
                     actorId: userId ?? null,
                 }, { category: "domain", source: "service" });
+                await emitSlotChanges(runtime, slotChanges);
             }
             return { status: result.status, booking: result.booking };
         }

package/dist/state-machine.d.ts

@@ -1,8 +1,9 @@
 import type { bookings } from "./schema-core.js";
 export type BookingStatus = (typeof bookings.$inferSelect)["status"];
 export declare const BOOKING_TRANSITIONS: {
-    readonly draft: readonly ["on_hold", "confirmed", "cancelled"];
-    readonly on_hold: readonly ["confirmed", "expired", "cancelled"];
+    readonly draft: readonly ["on_hold", "awaiting_payment", "confirmed", "cancelled"];
+    readonly on_hold: readonly ["awaiting_payment", "confirmed", "expired", "cancelled"];
+    readonly awaiting_payment: readonly ["confirmed", "expired", "cancelled"];
     readonly confirmed: readonly ["in_progress", "cancelled"];
     readonly in_progress: readonly ["completed", "cancelled"];
     readonly completed: readonly [];
@@ -22,6 +23,14 @@ export interface BookingStatusPatch {
     expiredAt?: Date;
     cancelledAt?: Date;
     completedAt?: Date;
+    awaitingPaymentAt?: Date;
+    /**
+     * Stamped when the booking transitions to `confirmed` from
+     * `awaiting_payment` (i.e. the moment payment was received).
+     * Distinct from `confirmedAt` so reporting can split "free
+     * confirmations" from paid ones.
+     */
+    paidAt?: Date;
 }
 export declare function transitionBooking(from: BookingStatus, to: BookingStatus, opts?: {
     now?: Date;

package/dist/state-machine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state-machine.d.ts","sourceRoot":"","sources":["../src/state-machine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAEhD,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,QAAQ,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,CAAA;AAEpE,eAAO,MAAM,mBAAmB;;;;;;;;CAQoC,CAAA;AAEpE,qBAAa,sBAAuB,SAAQ,KAAK;IAI7C,QAAQ,CAAC,IAAI,EAAE,aAAa;IAC5B,QAAQ,CAAC,EAAE,EAAE,aAAa;IAJ5B,QAAQ,CAAC,IAAI,gCAA+B;gBAGjC,IAAI,EAAE,aAAa,EACnB,EAAE,EAAE,aAAa;CAK7B;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO,CAEpF;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,aAAa,CAAA;IACrB,WAAW,CAAC,EAAE,IAAI,CAAA;IAClB,SAAS,CAAC,EAAE,IAAI,CAAA;IAChB,WAAW,CAAC,EAAE,IAAI,CAAA;IAClB,WAAW,CAAC,EAAE,IAAI,CAAA;CACnB;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,aAAa,EACnB,EAAE,EAAE,aAAa,EACjB,IAAI,GAAE;IAAE,GAAG,CAAC,EAAE,IAAI,CAAA;CAAO,GACxB,kBAAkB,CAcpB"}
+{"version":3,"file":"state-machine.d.ts","sourceRoot":"","sources":["../src/state-machine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAEhD,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,QAAQ,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,CAAA;AAEpE,eAAO,MAAM,mBAAmB;;;;;;;;;CASoC,CAAA;AAEpE,qBAAa,sBAAuB,SAAQ,KAAK;IAI7C,QAAQ,CAAC,IAAI,EAAE,aAAa;IAC5B,QAAQ,CAAC,EAAE,EAAE,aAAa;IAJ5B,QAAQ,CAAC,IAAI,gCAA+B;gBAGjC,IAAI,EAAE,aAAa,EACnB,EAAE,EAAE,aAAa;CAK7B;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO,CAEpF;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,aAAa,CAAA;IACrB,WAAW,CAAC,EAAE,IAAI,CAAA;IAClB,SAAS,CAAC,EAAE,IAAI,CAAA;IAChB,WAAW,CAAC,EAAE,IAAI,CAAA;IAClB,WAAW,CAAC,EAAE,IAAI,CAAA;IAClB,iBAAiB,CAAC,EAAE,IAAI,CAAA;IACxB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,IAAI,CAAA;CACd;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,aAAa,EACnB,EAAE,EAAE,aAAa,EACjB,IAAI,GAAE;IAAE,GAAG,CAAC,EAAE,IAAI,CAAA;CAAO,GACxB,kBAAkB,CAkBpB"}

package/dist/state-machine.js

@@ -1,6 +1,7 @@
 export const BOOKING_TRANSITIONS = {
-    draft: ["on_hold", "confirmed", "cancelled"],
-    on_hold: ["confirmed", "expired", "cancelled"],
+    draft: ["on_hold", "awaiting_payment", "confirmed", "cancelled"],
+    on_hold: ["awaiting_payment", "confirmed", "expired", "cancelled"],
+    awaiting_payment: ["confirmed", "expired", "cancelled"],
     confirmed: ["in_progress", "cancelled"],
     in_progress: ["completed", "cancelled"],
     completed: [],
@@ -27,13 +28,18 @@ export function transitionBooking(from, to, opts = {}) {
     }
     const now = opts.now ?? new Date();
     const patch = { status: to };
-    if (to === "confirmed")
+    if (to === "confirmed") {
         patch.confirmedAt = now;
+        if (from === "awaiting_payment")
+            patch.paidAt = now;
+    }
     if (to === "expired")
         patch.expiredAt = now;
     if (to === "cancelled")
         patch.cancelledAt = now;
     if (to === "completed")
         patch.completedAt = now;
+    if (to === "awaiting_payment")
+        patch.awaitingPaymentAt = now;
     return patch;
 }

package/dist/tasks/expire-stale-holds.d.ts

@@ -1,4 +1,5 @@
 import type { PostgresJsDatabase } from "drizzle-orm/postgres-js";
+import { type BookingServiceRuntime } from "../service.js";
 export interface ExpireStaleBookingHoldsInput {
     before?: string | null;
     note?: string | null;
@@ -8,5 +9,5 @@ export interface ExpireStaleBookingHoldsResult {
     count: number;
     cutoff: Date;
 }
-export declare function expireStaleBookingHolds(db: PostgresJsDatabase, input?: ExpireStaleBookingHoldsInput, userId?: string): Promise<ExpireStaleBookingHoldsResult>;
+export declare function expireStaleBookingHolds(db: PostgresJsDatabase, input?: ExpireStaleBookingHoldsInput, userId?: string, runtime?: BookingServiceRuntime): Promise<ExpireStaleBookingHoldsResult>;
 //# sourceMappingURL=expire-stale-holds.d.ts.map

package/dist/tasks/expire-stale-holds.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expire-stale-holds.d.ts","sourceRoot":"","sources":["../../src/tasks/expire-stale-holds.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAIjE,MAAM,WAAW,4BAA4B;IAC3C,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACrB;AAED,MAAM,WAAW,6BAA6B;IAC5C,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,IAAI,CAAA;CACb;AAED,wBAAsB,uBAAuB,CAC3C,EAAE,EAAE,kBAAkB,EACtB,KAAK,GAAE,4BAAiC,EACxC,MAAM,SAAW,GAChB,OAAO,CAAC,6BAA6B,CAAC,CASxC"}
+{"version":3,"file":"expire-stale-holds.d.ts","sourceRoot":"","sources":["../../src/tasks/expire-stale-holds.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAEjE,OAAO,EAAE,KAAK,qBAAqB,EAAmB,MAAM,eAAe,CAAA;AAE3E,MAAM,WAAW,4BAA4B;IAC3C,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACrB;AAED,MAAM,WAAW,6BAA6B;IAC5C,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,IAAI,CAAA;CACb;AAED,wBAAsB,uBAAuB,CAC3C,EAAE,EAAE,kBAAkB,EACtB,KAAK,GAAE,4BAAiC,EACxC,MAAM,SAAW,EACjB,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,6BAA6B,CAAC,CAUxC"}

package/dist/tasks/expire-stale-holds.js

@@ -1,7 +1,7 @@
 import { bookingsService } from "../service.js";
-export async function expireStaleBookingHolds(db, input = {}, userId = "system") {
+export async function expireStaleBookingHolds(db, input = {}, userId = "system", runtime = {}) {
     return bookingsService.expireStaleBookings(db, {
         before: input.before ?? null,
         note: input.note ?? null,
-    }, userId);
+    }, userId, runtime);
 }