@voyantjs/notifications 0.6.8 → 0.7.0

package/dist/service-booking-documents.d.ts

@@ -123,6 +123,134 @@ export declare const bookingDocumentNotificationsService: {
             updatedAt: Date;
         };
     }>;
+    /**
+     * Confirm-and-dispatch — single orchestrated call for the operator flow
+     * that wants "list the booking's documents, then send them to the client"
+     * to be one action instead of two round-trips.
+     *
+     * With `sendNotification: false`, the caller gets the bundle back without
+     * attempting a send — useful for rendering a preview/checkbox list before
+     * the operator confirms. With `sendNotification: true`, the same send
+     * guards as `sendBookingDocumentsNotification` apply (no_documents,
+     * no_recipient, no_attachments, send_failed); the result keeps the bundle
+     * regardless so the UI always has something to show.
+     */
+    confirmAndDispatchBooking(db: PostgresJsDatabase, dispatcher: NotificationService, bookingId: string, input: {
+        sendNotification?: boolean;
+    } & SendBookingDocumentsNotificationInput, runtime?: SendBookingDocumentsRuntimeOptions): Promise<{
+        status: "not_found";
+        bookingId?: undefined;
+        documents?: undefined;
+        skipReason?: undefined;
+        recipient?: undefined;
+        delivery?: undefined;
+    } | {
+        status: "preview";
+        bookingId: string;
+        documents: {
+            key: string;
+            source: "finance" | "legal";
+            documentType: "invoice" | "proforma" | "contract";
+            bookingId: string;
+            name: string;
+            createdAt: string;
+            contractId?: string | null | undefined;
+            invoiceId?: string | null | undefined;
+            attachmentId?: string | null | undefined;
+            renditionId?: string | null | undefined;
+            contractStatus?: string | null | undefined;
+            invoiceStatus?: string | null | undefined;
+            format?: string | null | undefined;
+            mimeType?: string | null | undefined;
+            storageKey?: string | null | undefined;
+            downloadUrl?: string | null | undefined;
+            language?: string | null | undefined;
+            metadata?: Record<string, unknown> | null | undefined;
+        }[];
+        skipReason?: undefined;
+        recipient?: undefined;
+        delivery?: undefined;
+    } | {
+        status: "skipped";
+        bookingId: string;
+        documents: {
+            key: string;
+            source: "finance" | "legal";
+            documentType: "invoice" | "proforma" | "contract";
+            bookingId: string;
+            name: string;
+            createdAt: string;
+            contractId?: string | null | undefined;
+            invoiceId?: string | null | undefined;
+            attachmentId?: string | null | undefined;
+            renditionId?: string | null | undefined;
+            contractStatus?: string | null | undefined;
+            invoiceStatus?: string | null | undefined;
+            format?: string | null | undefined;
+            mimeType?: string | null | undefined;
+            storageKey?: string | null | undefined;
+            downloadUrl?: string | null | undefined;
+            language?: string | null | undefined;
+            metadata?: Record<string, unknown> | null | undefined;
+        }[];
+        skipReason: "no_documents" | "no_recipient" | "no_attachments" | "send_failed";
+        recipient?: undefined;
+        delivery?: undefined;
+    } | {
+        status: "dispatched";
+        bookingId: string;
+        documents: {
+            key: string;
+            source: "finance" | "legal";
+            documentType: "invoice" | "proforma" | "contract";
+            bookingId: string;
+            name: string;
+            createdAt: string;
+            contractId?: string | null | undefined;
+            invoiceId?: string | null | undefined;
+            attachmentId?: string | null | undefined;
+            renditionId?: string | null | undefined;
+            contractStatus?: string | null | undefined;
+            invoiceStatus?: string | null | undefined;
+            format?: string | null | undefined;
+            mimeType?: string | null | undefined;
+            storageKey?: string | null | undefined;
+            downloadUrl?: string | null | undefined;
+            language?: string | null | undefined;
+            metadata?: Record<string, unknown> | null | undefined;
+        }[];
+        recipient: string;
+        delivery: {
+            id: string;
+            templateId: string | null;
+            templateSlug: string | null;
+            targetType: "organization" | "other" | "booking" | "invoice" | "booking_payment_schedule" | "booking_guarantee" | "person" | "payment_session";
+            targetId: string | null;
+            personId: string | null;
+            organizationId: string | null;
+            bookingId: string | null;
+            invoiceId: string | null;
+            paymentSessionId: string | null;
+            channel: "email" | "sms";
+            provider: string;
+            providerMessageId: string | null;
+            status: "pending" | "cancelled" | "failed" | "sent";
+            toAddress: string;
+            fromAddress: string | null;
+            subject: string | null;
+            htmlBody: string | null;
+            textBody: string | null;
+            payloadData: Record<string, unknown> | null;
+            metadata: Record<string, unknown> | null;
+            errorMessage: string | null;
+            scheduledFor: Date | null;
+            sentAt: Date | null;
+            failedAt: Date | null;
+            createdAt: Date;
+            updatedAt: Date;
+        };
+        skipReason?: undefined;
+    }>;
 };
 export { createDefaultAttachmentFromDocument as createDefaultBookingDocumentAttachment };
 //# sourceMappingURL=service-booking-documents.d.ts.map

package/dist/service-booking-documents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-booking-documents.d.ts","sourceRoot":"","sources":["../src/service-booking-documents.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAI9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAGjE,OAAO,KAAK,EACV,yBAAyB,EACzB,mBAAmB,EACnB,qCAAqC,EACtC,MAAM,qBAAqB,CAAA;AAE5B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAExD,MAAM,MAAM,iCAAiC,GAAG,CAC9C,QAAQ,EAAE,yBAAyB,KAChC,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAAA;AAE3C,MAAM,WAAW,kCAAkC;IACjD,kBAAkB,CAAC,EAAE,iCAAiC,CAAA;IACtD,QAAQ,CAAC,EAAE,QAAQ,CAAA;CACpB;AAED,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,YAAY,EAAE,MAAM,EAAE,CAAA;CACvB;AA2BD,iBAAS,mCAAmC,CAC1C,QAAQ,EAAE,yBAAyB,GAClC,sBAAsB,GAAG,IAAI,CAU/B;AAwLD,eAAO,MAAM,mCAAmC;kCACV,kBAAkB,aAAa,MAAM;;;;;;;;;;;;;;;;;;;;;;;yCAkBnE,kBAAkB,cACV,mBAAmB,aACpB,MAAM,SACV,qCAAqC,YACnC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4G9C,CAAA;AAED,OAAO,EAAE,mCAAmC,IAAI,sCAAsC,EAAE,CAAA"}
+{"version":3,"file":"service-booking-documents.d.ts","sourceRoot":"","sources":["../src/service-booking-documents.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAI9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAGjE,OAAO,KAAK,EACV,yBAAyB,EACzB,mBAAmB,EACnB,qCAAqC,EACtC,MAAM,qBAAqB,CAAA;AAM5B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAExD,MAAM,MAAM,iCAAiC,GAAG,CAC9C,QAAQ,EAAE,yBAAyB,KAChC,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAAA;AAE3C,MAAM,WAAW,kCAAkC;IACjD,kBAAkB,CAAC,EAAE,iCAAiC,CAAA;IACtD,QAAQ,CAAC,EAAE,QAAQ,CAAA;CACpB;AAED,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,YAAY,EAAE,MAAM,EAAE,CAAA;CACvB;AA2BD,iBAAS,mCAAmC,CAC1C,QAAQ,EAAE,yBAAyB,GAClC,sBAAsB,GAAG,IAAI,CAU/B;AAwLD,eAAO,MAAM,mCAAmC;kCACV,kBAAkB,aAAa,MAAM;;;;;;;;;;;;;;;;;;;;;;;yCAkBnE,kBAAkB,cACV,mBAAmB,aACpB,MAAM,SACV,qCAAqC,YACnC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAoH7C;;;;;;;;;;;OAWG;kCAEG,kBAAkB,cACV,mBAAmB,aACpB,MAAM,SACV;QAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,qCAAqC,YACpE,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4C9C,CAAA;AAED,OAAO,EAAE,mCAAmC,IAAI,sCAAsC,EAAE,CAAA"}

package/dist/service-booking-documents.js

@@ -3,7 +3,7 @@ import { invoiceRenditions, invoices } from "@voyantjs/finance/schema";
 import { contractAttachments, contracts } from "@voyantjs/legal/contracts";
 import { and, desc, eq, ne, or } from "drizzle-orm";
 import { sendNotification } from "./service-deliveries.js";
-import { listBookingNotificationParticipants, resolveReminderRecipient } from "./service-shared.js";
+import { listBookingNotificationItems, listBookingNotificationParticipants, resolveReminderRecipient, } from "./service-shared.js";
 function getMetadataRecord(value) {
     if (!value || typeof value !== "object" || Array.isArray(value)) {
         return null;
@@ -191,8 +191,11 @@ export const bookingDocumentNotificationsService = {
         if (documents.length === 0) {
             return { status: "no_documents" };
         }
-        const participants = await listBookingNotificationParticipants(db, bookingId);
-        const recipient = resolveReminderRecipient(participants);
+        const [participants, items] = await Promise.all([
+            listBookingNotificationParticipants(db, bookingId),
+            listBookingNotificationItems(db, bookingId),
+        ]);
+        const recipient = resolveReminderRecipient(booking, participants);
         const to = input.to ?? recipient?.email ?? null;
         if (!to) {
             return { status: "no_recipient" };
@@ -225,14 +228,18 @@ export const bookingDocumentNotificationsService = {
                     startDate: booking.startDate,
                     endDate: booking.endDate,
                 },
-                participant: recipient
+                traveler: recipient
                     ? {
                         firstName: recipient.firstName,
                         lastName: recipient.lastName,
                         email: recipient.email,
+                        participantType: recipient.participantType,
+                        isPrimary: recipient.isPrimary,
                     }
                     : null,
+                travelers: participants,
                 documents,
+                items,
                 ...(input.data ?? {}),
             },
             targetType: "booking",
@@ -267,5 +274,50 @@ export const bookingDocumentNotificationsService = {
             delivery,
         };
     },
+    /**
+     * Confirm-and-dispatch — single orchestrated call for the operator flow
+     * that wants "list the booking's documents, then send them to the client"
+     * to be one action instead of two round-trips.
+     *
+     * With `sendNotification: false`, the caller gets the bundle back without
+     * attempting a send — useful for rendering a preview/checkbox list before
+     * the operator confirms. With `sendNotification: true`, the same send
+     * guards as `sendBookingDocumentsNotification` apply (no_documents,
+     * no_recipient, no_attachments, send_failed); the result keeps the bundle
+     * regardless so the UI always has something to show.
+     */
+    async confirmAndDispatchBooking(db, dispatcher, bookingId, input, runtime = {}) {
+        const bundle = await this.listBookingDocumentBundle(db, bookingId);
+        if (!bundle)
+            return { status: "not_found" };
+        const documents = bundle.documents;
+        const sendNotification = input.sendNotification ?? true;
+        if (!sendNotification) {
+            return {
+                status: "preview",
+                bookingId,
+                documents,
+            };
+        }
+        const result = await this.sendBookingDocumentsNotification(db, dispatcher, bookingId, input, runtime);
+        if (result.status === "not_found") {
+            return { status: "not_found" };
+        }
+        if (result.status !== "sent") {
+            return {
+                status: "skipped",
+                bookingId,
+                documents,
+                skipReason: result.status,
+            };
+        }
+        return {
+            status: "dispatched",
+            bookingId: result.bookingId,
+            documents: result.documents,
+            recipient: result.recipient,
+            delivery: result.delivery,
+        };
+    },
 };
 export { createDefaultAttachmentFromDocument as createDefaultBookingDocumentAttachment };

package/dist/service-deliveries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-deliveries.d.ts","sourceRoot":"","sources":["../src/service-deliveries.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAGjE,OAAO,KAAK,EACV,6BAA6B,EAC7B,mBAAmB,EACnB,4BAA4B,EAC5B,qBAAqB,EACrB,mCAAmC,EACpC,MAAM,qBAAqB,CAAA;AAyC5B,wBAAsB,cAAc,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgChG;AAED,wBAAsB,eAAe,CAAC,EAAE,EAAE,kBAAkB,EAAE,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAOvE;AAED,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,kBAAkB,EACtB,UAAU,EAAE,mBAAmB,EAC/B,KAAK,EAAE,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA8H7B;AAED,wBAAsB,8BAA8B,CAClD,EAAE,EAAE,kBAAkB,EACtB,UAAU,EAAE,mBAAmB,EAC/B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,mCAAmC;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA8F3C;AAED,wBAAsB,uBAAuB,CAC3C,EAAE,EAAE,kBAAkB,EACtB,UAAU,EAAE,mBAAmB,EAC/B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA4FpC"}
+{"version":3,"file":"service-deliveries.d.ts","sourceRoot":"","sources":["../src/service-deliveries.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAGjE,OAAO,KAAK,EACV,6BAA6B,EAC7B,mBAAmB,EACnB,4BAA4B,EAC5B,qBAAqB,EACrB,mCAAmC,EACpC,MAAM,qBAAqB,CAAA;AA0C5B,wBAAsB,cAAc,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgChG;AAED,wBAAsB,eAAe,CAAC,EAAE,EAAE,kBAAkB,EAAE,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAOvE;AAED,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,kBAAkB,EACtB,UAAU,EAAE,mBAAmB,EAC/B,KAAK,EAAE,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA8H7B;AAED,wBAAsB,8BAA8B,CAClD,EAAE,EAAE,kBAAkB,EACtB,UAAU,EAAE,mBAAmB,EAC/B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,mCAAmC;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAuG3C;AAED,wBAAsB,uBAAuB,CAC3C,EAAE,EAAE,kBAAkB,EACtB,UAAU,EAAE,mBAAmB,EAC/B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAqGpC"}

package/dist/service-deliveries.js

@@ -2,7 +2,7 @@ import { bookings } from "@voyantjs/bookings/schema";
 import { invoices, paymentSessions } from "@voyantjs/finance";
 import { desc, eq, sql } from "drizzle-orm";
 import { notificationDeliveries } from "./schema.js";
-import { buildWhereClause, listBookingNotificationParticipants, NotificationError, paginate, renderNotificationTemplate, resolveReminderRecipient, summarizeNotificationAttachments, toTimestamp, } from "./service-shared.js";
+import { buildWhereClause, listBookingNotificationItems, listBookingNotificationParticipants, NotificationError, paginate, renderNotificationTemplate, resolveReminderRecipient, summarizeNotificationAttachments, toTimestamp, } from "./service-shared.js";
 import { getTemplateById, getTemplateBySlug } from "./service-templates.js";
 function normalizeAttachments(attachments) {
     if (!attachments || attachments.length === 0) {
@@ -194,8 +194,13 @@ export async function sendPaymentSessionNotification(db, dispatcher, sessionId,
         ? ((await db.select().from(invoices).where(eq(invoices.id, session.invoiceId)).limit(1))[0] ??
             null)
         : null;
-    const participants = booking ? await listBookingNotificationParticipants(db, booking.id) : [];
-    const recipient = resolveReminderRecipient(participants);
+    const [participants, items] = booking
+        ? await Promise.all([
+            listBookingNotificationParticipants(db, booking.id),
+            listBookingNotificationItems(db, booking.id),
+        ])
+        : [[], []];
+    const recipient = resolveReminderRecipient(booking ?? null, participants);
     const to = input.to ?? session.payerEmail ?? recipient?.email ?? null;
     if (!to) {
         throw new NotificationError("No recipient available for payment session notification");
@@ -247,13 +252,17 @@ export async function sendPaymentSessionNotification(db, dispatcher, sessionId,
                     dueDate: invoice.dueDate,
                 }
                 : null,
-            participant: recipient
+            traveler: recipient
                 ? {
                     firstName: recipient.firstName,
                     lastName: recipient.lastName,
                     email: recipient.email,
+                    participantType: recipient.participantType,
+                    isPrimary: recipient.isPrimary,
                 }
                 : null,
+            travelers: participants,
+            items,
             ...(input.data ?? {}),
         },
         targetType: "payment_session",
@@ -277,8 +286,13 @@ export async function sendInvoiceNotification(db, dispatcher, invoiceId, input)
         .from(bookings)
         .where(eq(bookings.id, invoice.bookingId))
         .limit(1);
-    const participants = booking ? await listBookingNotificationParticipants(db, booking.id) : [];
-    const recipient = resolveReminderRecipient(participants);
+    const [participants, items] = booking
+        ? await Promise.all([
+            listBookingNotificationParticipants(db, booking.id),
+            listBookingNotificationItems(db, booking.id),
+        ])
+        : [[], []];
+    const recipient = resolveReminderRecipient(booking ?? null, participants);
     const [latestSession] = await db
         .select()
         .from(paymentSessions)
@@ -335,13 +349,17 @@ export async function sendInvoiceNotification(db, dispatcher, invoiceId, input)
                     currency: latestSession.currency,
                 }
                 : null,
-            participant: recipient
+            traveler: recipient
                 ? {
                     firstName: recipient.firstName,
                     lastName: recipient.lastName,
                     email: recipient.email,
+                    participantType: recipient.participantType,
+                    isPrimary: recipient.isPrimary,
                 }
                 : null,
+            travelers: participants,
+            items,
             ...(input.data ?? {}),
         },
         targetType: "invoice",

package/dist/service-reminders.d.ts

@@ -17,7 +17,7 @@ export declare function deliverReminderRun(db: PostgresJsDatabase, dispatcher: N
     organizationId: string | null;
     paymentSessionId: string | null;
     notificationDeliveryId: string | null;
-    status: "failed" | "sent" | "processing" | "queued" | "skipped";
+    status: "failed" | "sent" | "processing" | "skipped" | "queued";
     recipient: string | null;
     scheduledFor: Date;
     processedAt: Date;

package/dist/service-reminders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-reminders.d.ts","sourceRoot":"","sources":["../src/service-reminders.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAIjE,OAAO,KAAK,EAGV,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAU5B,KAAK,wBAAwB,GAAG,CAAC,KAAK,EAAE;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAgxBnF,wBAAsB,iBAAiB,CACrC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,oBAAoB,YAAK,EAChC,eAAe,EAAE,wBAAwB,gCAoF1C;AAED,wBAAsB,kBAAkB,CACtC,EAAE,EAAE,kBAAkB,EACtB,UAAU,EAAE,mBAAmB,EAC/B,KAAK,EAAE;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;;;;;UAkDjC;AAED,wBAAsB,eAAe,CACnC,EAAE,EAAE,kBAAkB,EACtB,UAAU,EAAE,mBAAmB,EAC/B,KAAK,GAAE,oBAAyB,gCA4EjC"}
+{"version":3,"file":"service-reminders.d.ts","sourceRoot":"","sources":["../src/service-reminders.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAIjE,OAAO,KAAK,EAGV,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAW5B,KAAK,wBAAwB,GAAG,CAAC,KAAK,EAAE;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAoyBnF,wBAAsB,iBAAiB,CACrC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,oBAAoB,YAAK,EAChC,eAAe,EAAE,wBAAwB,gCAoF1C;AAED,wBAAsB,kBAAkB,CACtC,EAAE,EAAE,kBAAkB,EACtB,UAAU,EAAE,mBAAmB,EAC/B,KAAK,EAAE;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;;;;;UAkDjC;AAED,wBAAsB,eAAe,CACnC,EAAE,EAAE,kBAAkB,EACtB,UAAU,EAAE,mBAAmB,EAC/B,KAAK,GAAE,oBAAyB,gCA4EjC"}

package/dist/service-reminders.js

@@ -1,9 +1,9 @@
-import { bookingParticipants, bookings } from "@voyantjs/bookings/schema";
+import { bookings, bookingTravelers } from "@voyantjs/bookings/schema";
 import { bookingPaymentSchedules, invoices } from "@voyantjs/finance";
 import { and, desc, eq, gt, or } from "drizzle-orm";
 import { notificationReminderRules, notificationReminderRuns } from "./schema.js";
 import { sendInvoiceNotification, sendNotification } from "./service-deliveries.js";
-import { addUtcDays, buildReminderDedupeKey, resolveReminderRecipient, startOfUtcDay, toDateString, toTimestamp, } from "./service-shared.js";
+import { addUtcDays, buildReminderDedupeKey, listBookingNotificationItems, resolveReminderRecipient, startOfUtcDay, toDateString, toTimestamp, } from "./service-shared.js";
 function buildReminderSweepSummary() {
     return {
         processed: 0,
@@ -156,21 +156,23 @@ async function queueBookingPaymentScheduleReminder(db, enqueueDelivery, rule, sc
     if (!booking) {
         return markReminderRunSkipped(db, reminderRun.id, now, "Booking not found for payment schedule");
     }
-    const participants = await db
-        .select({
-        id: bookingParticipants.id,
-        firstName: bookingParticipants.firstName,
-        lastName: bookingParticipants.lastName,
-        email: bookingParticipants.email,
-        participantType: bookingParticipants.participantType,
-        isPrimary: bookingParticipants.isPrimary,
-    })
-        .from(bookingParticipants)
-        .where(eq(bookingParticipants.bookingId, booking.id))
-        .orderBy(desc(bookingParticipants.isPrimary), bookingParticipants.createdAt);
-    const recipient = resolveReminderRecipient(participants);
+    const [participants] = await Promise.all([
+        db
+            .select({
+            id: bookingTravelers.id,
+            firstName: bookingTravelers.firstName,
+            lastName: bookingTravelers.lastName,
+            email: bookingTravelers.email,
+            participantType: bookingTravelers.participantType,
+            isPrimary: bookingTravelers.isPrimary,
+        })
+            .from(bookingTravelers)
+            .where(eq(bookingTravelers.bookingId, booking.id))
+            .orderBy(desc(bookingTravelers.isPrimary), bookingTravelers.createdAt),
+    ]);
+    const recipient = resolveReminderRecipient(booking, participants);
     if (!recipient?.email) {
-        return markReminderRunSkipped(db, reminderRun.id, now, "No participant email available for booking payment reminder");
+        return markReminderRunSkipped(db, reminderRun.id, now, "No traveler email available for booking payment reminder");
     }
     return enqueueReminderRun(db, enqueueDelivery, { ...reminderRun, recipient: recipient.email }, now);
 }
@@ -225,21 +227,23 @@ async function queueInvoiceReminder(db, enqueueDelivery, rule, invoice, now) {
     if (!booking) {
         return markReminderRunSkipped(db, reminderRun.id, now, "Booking not found for invoice reminder");
     }
-    const participants = await db
-        .select({
-        id: bookingParticipants.id,
-        firstName: bookingParticipants.firstName,
-        lastName: bookingParticipants.lastName,
-        email: bookingParticipants.email,
-        participantType: bookingParticipants.participantType,
-        isPrimary: bookingParticipants.isPrimary,
-    })
-        .from(bookingParticipants)
-        .where(eq(bookingParticipants.bookingId, booking.id))
-        .orderBy(desc(bookingParticipants.isPrimary), bookingParticipants.createdAt);
-    const recipient = resolveReminderRecipient(participants);
+    const [participants] = await Promise.all([
+        db
+            .select({
+            id: bookingTravelers.id,
+            firstName: bookingTravelers.firstName,
+            lastName: bookingTravelers.lastName,
+            email: bookingTravelers.email,
+            participantType: bookingTravelers.participantType,
+            isPrimary: bookingTravelers.isPrimary,
+        })
+            .from(bookingTravelers)
+            .where(eq(bookingTravelers.bookingId, booking.id))
+            .orderBy(desc(bookingTravelers.isPrimary), bookingTravelers.createdAt),
+    ]);
+    const recipient = resolveReminderRecipient(booking, participants);
     if (!recipient?.email) {
-        return markReminderRunSkipped(db, reminderRun.id, now, "No participant email available for invoice reminder");
+        return markReminderRunSkipped(db, reminderRun.id, now, "No traveler email available for invoice reminder");
     }
     return enqueueReminderRun(db, enqueueDelivery, { ...reminderRun, recipient: recipient.email }, now);
 }
@@ -285,19 +289,22 @@ async function sendBookingPaymentScheduleReminder(db, dispatcher, rule, schedule
             .returning();
         return run ?? null;
     }
-    const participants = await db
-        .select({
-        id: bookingParticipants.id,
-        firstName: bookingParticipants.firstName,
-        lastName: bookingParticipants.lastName,
-        email: bookingParticipants.email,
-        participantType: bookingParticipants.participantType,
-        isPrimary: bookingParticipants.isPrimary,
-    })
-        .from(bookingParticipants)
-        .where(eq(bookingParticipants.bookingId, booking.id))
-        .orderBy(desc(bookingParticipants.isPrimary), bookingParticipants.createdAt);
-    const recipient = resolveReminderRecipient(participants);
+    const [participants, items] = await Promise.all([
+        db
+            .select({
+            id: bookingTravelers.id,
+            firstName: bookingTravelers.firstName,
+            lastName: bookingTravelers.lastName,
+            email: bookingTravelers.email,
+            participantType: bookingTravelers.participantType,
+            isPrimary: bookingTravelers.isPrimary,
+        })
+            .from(bookingTravelers)
+            .where(eq(bookingTravelers.bookingId, booking.id))
+            .orderBy(desc(bookingTravelers.isPrimary), bookingTravelers.createdAt),
+        listBookingNotificationItems(db, booking.id),
+    ]);
+    const recipient = resolveReminderRecipient(booking, participants);
     const [processingRun] = await db
         .insert(notificationReminderRuns)
         .values({
@@ -327,7 +334,7 @@ async function sendBookingPaymentScheduleReminder(db, dispatcher, rule, schedule
         return null;
     }
     if (!recipient?.email) {
-        return markReminderRunSkipped(db, processingRun.id, now, "No participant email available for booking payment reminder");
+        return markReminderRunSkipped(db, processingRun.id, now, "No traveler email available for booking payment reminder");
     }
     try {
         const delivery = await sendNotification(db, dispatcher, {
@@ -344,11 +351,14 @@ async function sendBookingPaymentScheduleReminder(db, dispatcher, rule, schedule
                 currency: schedule.currency,
                 scheduleType: schedule.scheduleType,
                 reminderOffsetDays: rule.relativeDaysFromDueDate,
-                participant: {
+                traveler: {
                     firstName: recipient.firstName,
                     lastName: recipient.lastName,
                     email: recipient.email,
+                    participantType: recipient.participantType,
+                    isPrimary: recipient.isPrimary,
                 },
+                travelers: participants,
                 booking: {
                     id: booking.id,
                     bookingNumber: booking.bookingNumber,
@@ -365,6 +375,7 @@ async function sendBookingPaymentScheduleReminder(db, dispatcher, rule, schedule
                     scheduleType: schedule.scheduleType,
                     status: schedule.status,
                 },
+                items,
             },
             targetType: "booking_payment_schedule",
             targetId: schedule.id,
@@ -428,19 +439,21 @@ async function sendInvoiceReminder(db, dispatcher, rule, invoice, now) {
             .returning();
         return run ?? null;
     }
-    const participants = await db
-        .select({
-        id: bookingParticipants.id,
-        firstName: bookingParticipants.firstName,
-        lastName: bookingParticipants.lastName,
-        email: bookingParticipants.email,
-        participantType: bookingParticipants.participantType,
-        isPrimary: bookingParticipants.isPrimary,
-    })
-        .from(bookingParticipants)
-        .where(eq(bookingParticipants.bookingId, booking.id))
-        .orderBy(desc(bookingParticipants.isPrimary), bookingParticipants.createdAt);
-    const recipient = resolveReminderRecipient(participants);
+    const [participants] = await Promise.all([
+        db
+            .select({
+            id: bookingTravelers.id,
+            firstName: bookingTravelers.firstName,
+            lastName: bookingTravelers.lastName,
+            email: bookingTravelers.email,
+            participantType: bookingTravelers.participantType,
+            isPrimary: bookingTravelers.isPrimary,
+        })
+            .from(bookingTravelers)
+            .where(eq(bookingTravelers.bookingId, booking.id))
+            .orderBy(desc(bookingTravelers.isPrimary), bookingTravelers.createdAt),
+    ]);
+    const recipient = resolveReminderRecipient(booking, participants);
     const [processingRun] = await db
         .insert(notificationReminderRuns)
         .values({
@@ -472,7 +485,7 @@ async function sendInvoiceReminder(db, dispatcher, rule, invoice, now) {
         return null;
     }
     if (!recipient?.email) {
-        return markReminderRunSkipped(db, processingRun.id, now, "No participant email available for invoice reminder");
+        return markReminderRunSkipped(db, processingRun.id, now, "No traveler email available for invoice reminder");
     }
     try {
         const delivery = await sendInvoiceNotification(db, dispatcher, invoice.id, {
@@ -515,23 +528,26 @@ async function sendQueuedBookingPaymentScheduleReminder(db, dispatcher, run, rul
     if (!booking) {
         return markReminderRunSkipped(db, run.id, now, "Booking not found for payment schedule");
     }
-    const participants = await db
-        .select({
-        id: bookingParticipants.id,
-        firstName: bookingParticipants.firstName,
-        lastName: bookingParticipants.lastName,
-        email: bookingParticipants.email,
-        participantType: bookingParticipants.participantType,
-        isPrimary: bookingParticipants.isPrimary,
-    })
-        .from(bookingParticipants)
-        .where(eq(bookingParticipants.bookingId, booking.id))
-        .orderBy(desc(bookingParticipants.isPrimary), bookingParticipants.createdAt);
-    const fallbackRecipient = resolveReminderRecipient(participants);
-    const participant = participants.find((entry) => entry.email === run.recipient) ?? fallbackRecipient ?? null;
-    const recipientEmail = run.recipient ?? participant?.email ?? null;
+    const [participants, items] = await Promise.all([
+        db
+            .select({
+            id: bookingTravelers.id,
+            firstName: bookingTravelers.firstName,
+            lastName: bookingTravelers.lastName,
+            email: bookingTravelers.email,
+            participantType: bookingTravelers.participantType,
+            isPrimary: bookingTravelers.isPrimary,
+        })
+            .from(bookingTravelers)
+            .where(eq(bookingTravelers.bookingId, booking.id))
+            .orderBy(desc(bookingTravelers.isPrimary), bookingTravelers.createdAt),
+        listBookingNotificationItems(db, booking.id),
+    ]);
+    const fallbackRecipient = resolveReminderRecipient(booking, participants);
+    const traveler = participants.find((entry) => entry.email === run.recipient) ?? fallbackRecipient ?? null;
+    const recipientEmail = run.recipient ?? traveler?.email ?? null;
     if (!recipientEmail) {
-        return markReminderRunSkipped(db, run.id, now, "No participant email available for booking payment reminder");
+        return markReminderRunSkipped(db, run.id, now, "No traveler email available for booking payment reminder");
     }
     try {
         const delivery = await sendNotification(db, dispatcher, {
@@ -548,13 +564,16 @@ async function sendQueuedBookingPaymentScheduleReminder(db, dispatcher, run, rul
                 currency: schedule.currency,
                 scheduleType: schedule.scheduleType,
                 reminderOffsetDays: rule.relativeDaysFromDueDate,
-                participant: participant
+                traveler: traveler
                     ? {
-                        firstName: participant.firstName,
-                        lastName: participant.lastName,
+                        firstName: traveler.firstName,
+                        lastName: traveler.lastName,
                         email: recipientEmail,
+                        participantType: traveler.participantType,
+                        isPrimary: traveler.isPrimary,
                     }
                     : null,
+                travelers: participants,
                 booking: {
                     id: booking.id,
                     bookingNumber: booking.bookingNumber,
@@ -571,6 +590,7 @@ async function sendQueuedBookingPaymentScheduleReminder(db, dispatcher, run, rul
                     scheduleType: schedule.scheduleType,
                     status: schedule.status,
                 },
+                items,
             },
             targetType: "booking_payment_schedule",
             targetId: schedule.id,