@aglyn/plugins-bookings 1.0.0-beta.221 → 1.0.0-beta.222

package/src/lib/server.js

@@ -22,7 +22,7 @@ import { checkEntitlement, registerPluginConfigSchema, registerPluginJob, resolv
 // reach the real verdict.
 import { siteLockdownJobGate } from "@aglyn/tenant-data-admin/server/tenant-write-lockdown";
 import { loadHostEmailWithTokens, renderLoadedHostEmailWithTokens } from "@aglyn/tenant-data-admin/server/host-email-tokens";
-import { BOOKING_MAX_DAYS_AHEAD, bookingTimeZone, computeOpenSlots, formatBookingWhen, isBookingReminderDue, isSlotOpen, REMINDER_WINDOW_END_HOURS, REMINDER_WINDOW_START_HOURS } from "./model/index.js";
+import { BOOKING_MAX_DAYS_AHEAD, bookingChargeUsd, bookingContactAsks, bookingPriceDisplay, bookingContactLines, readBookingContactFields, bookingTimeZone, computeOpenSlotPage, formatBookingWhen, isBookingReminderDue, isSlotOpen, REMINDER_WINDOW_END_HOURS, REMINDER_WINDOW_START_HOURS } from "./model/index.js";
 import { bookingTimeZoneFor } from "./server/booking-time-zone.js";
 import { registerBillingWebhookHandler, registerPluginApiRoute } from "@aglyn/aglyn/server";
 import { pluginTaxProfile } from "@aglyn/aglyn/plugin-manager/plugin-tax-profile";
@@ -85,11 +85,12 @@ registerPluginJob({
         }
     }
 });
-import { firebaseAdmin, getOrgForHost, meterHostEmail, notifyHostManagers, attributeCampaignConversion, resolveCampaignTouch, getPluginConfig, resolveOrgIdForHost, renderHostEmailWithTokens, hostSendingIdentity } from "@aglyn/tenant-data-admin";
+import { firebaseAdmin, getOrgForHost, meterHostEmail, notifyHostManagers, getPluginConfig, resolveOrgIdForHost, renderHostEmailWithTokens, hostSendingIdentity } from "@aglyn/tenant-data-admin";
 import { merchantAccountIsReady } from "@aglyn/tenant-data-admin/server/payment-provider";
 import { checkoutSessionCardAuthenticationParams } from "@aglyn/tenant-data-admin/server/stripe-card-authentication";
 import { emitHostEvent } from "@aglyn/tenant-runtime";
 import recordCapturedContact from "@aglyn/aglyn/plugin-manager/record-captured-contact";
+import { CONVERSION_TOUCH_DETAIL, creditConversion, resolveConversionTouch } from "@aglyn/aglyn/plugin-manager/plugin-conversion-credit";
 import { isEmailConfigured, sendEmail } from "@aglyn/shared-util-email";
 import { FieldValue } from "firebase-admin/firestore";
 import { NO_CLIENT_ADDRESS_BUCKET, readClientIp } from "@aglyn/aglyn/app-utils/request-ip";
@@ -129,7 +130,7 @@ export const slotsHandler = async (req, res)=>{
         });
     }
     try {
-        var _config_maxDaysAhead, _service_priceUsd, _service_timezone;
+        var _config_maxDaysAhead, _req_query_from, _service_timezone;
         const firestore = firebaseAdmin.app().firestore();
         const hostRef = firestore.collection('hosts').doc(hostId);
         // No serviceId → public service directory for the booking widget
@@ -138,13 +139,21 @@ export const slotsHandler = async (req, res)=>{
             const services = await hostRef.collection('services').limit(50).get();
             return res.status(200).json({
                 services: services.docs.filter((doc)=>!doc.get('deletedAt')).map((doc)=>{
-                    var _doc_get, _doc_get1, _doc_get2, _doc_get3;
+                    var _doc_get, _doc_get1, _doc_get2;
                     return {
                         $id: doc.id,
                         name: (_doc_get = doc.get('name')) != null ? _doc_get : '',
                         durationMinutes: Number((_doc_get1 = doc.get('durationMinutes')) != null ? _doc_get1 : 30),
-                        priceUsd: Number((_doc_get2 = doc.get('priceUsd')) != null ? _doc_get2 : 0),
-                        description: (_doc_get3 = doc.get('description')) != null ? _doc_get3 : ''
+                        // What booking it charges, never a price a label stands in for
+                        // (AGL-3475): a labeled service shows its label and charges 0.
+                        priceUsd: bookingChargeUsd(doc.data()),
+                        priceDisplay: bookingPriceDisplay(doc.get('priceDisplay')),
+                        description: (_doc_get2 = doc.get('description')) != null ? _doc_get2 : '',
+                        // What the widget asks for beyond a name and an email (AGL-3493),
+                        // as the booking route will hold it: the widget renders and
+                        // checks the fields from these, the route checks them again.
+                        askPhone: bookingContactAsks(doc.data()).phone,
+                        askAddress: bookingContactAsks(doc.data()).address
                     };
                 })
             });
@@ -156,7 +165,7 @@ export const slotsHandler = async (req, res)=>{
                 error: 'Unknown service'
             });
         }
-        const fromMs = Date.now();
+        const nowMs = Date.now();
         // Booking horizon (AGL-428): configurable via the plugin settings
         // framework; defaults to BOOKING_MAX_DAYS_AHEAD through the schema.
         //
@@ -169,9 +178,17 @@ export const slotsHandler = async (req, res)=>{
             hostId
         });
         const maxDaysAhead = Number((_config_maxDaysAhead = config.maxDaysAhead) != null ? _config_maxDaysAhead : BOOKING_MAX_DAYS_AHEAD);
-        const toMs = fromMs + maxDaysAhead * 24 * 60 * 60000;
+        // Measured from NOW whichever page is asked for: the horizon is how far
+        // ahead a visitor may book, not how far past the page they are on.
+        const toMs = nowMs + maxDaysAhead * 24 * 60 * 60000;
+        // The page asked for (AGL-3492): `from` is the `nextFromMs` the previous
+        // page answered with. Clamped to now, so a stale or hand-written value
+        // can never list a time that has passed, and a value past the horizon
+        // lists nothing rather than reaching beyond it.
+        const askedFromMs = Number((_req_query_from = req.query['from']) != null ? _req_query_from : 0);
+        const fromMs = Number.isFinite(askedFromMs) ? Math.min(Math.max(askedFromMs, nowMs), toMs) : nowMs;
         // Bounded at BOTH ends, to the window the slots are actually computed
-        // over. `computeOpenSlots` below is handed `fromMs`/`toMs` and ignores
+        // over. `computeOpenSlotPage` below is handed `fromMs`/`toMs` and ignores
         // anything outside them, so a booking past the horizon was read, billed
         // and discarded — and worse, it competed for the 500 with the bookings
         // that do matter, so a service booked far ahead could push the near-term
@@ -179,7 +196,10 @@ export const slotsHandler = async (req, res)=>{
         //
         // A second range on `startsAtMs` needs no new index: the field already
         // carries one, and the range it narrows is the one already here.
-        const bookedSnapshot = await hostRef.collection('bookings').where('serviceId', '==', serviceId).where('startsAtMs', '>=', fromMs - 24 * 60 * 60000).where('startsAtMs', '<=', toMs).limit(500).get();
+        const bookedSnapshot = await hostRef.collection('bookings').where('serviceId', '==', serviceId).where('startsAtMs', '>=', fromMs - 24 * 60 * 60000)// One page never walks further than BOOKING_MAX_DAYS_AHEAD past its
+        // start, so a horizon set further out than that is read a page's
+        // worth at a time, not all at once.
+        .where('startsAtMs', '<=', Math.min(toMs, fromMs + BOOKING_MAX_DAYS_AHEAD * 24 * 60 * 60000)).limit(500).get();
         const booked = bookedSnapshot.docs.filter((doc)=>{
             var _doc_get;
             return doc.get('status') !== 'canceled' && // Expired payment holds release the slot (AGL-170).
@@ -191,15 +211,25 @@ export const slotsHandler = async (req, res)=>{
                 endsAtMs: Number((_doc_get1 = doc.get('endsAtMs')) != null ? _doc_get1 : 0)
             };
         });
-        const slots = computeOpenSlots(service, fromMs, toMs, booked, 120);
+        // Bounded in DAYS, not slots (AGL-3492): a page is the widget's day
+        // strip, whole, with every open time each of those days has. The flat
+        // cap of 120 it replaces ran out three and a half weekdays in at
+        // 15-minute steps, so the widget showed a calendar that ended on
+        // Thursday at lunch and a horizon that was never reachable.
+        const { slots, nextFromMs } = computeOpenSlotPage(service, fromMs, toMs, booked);
         return res.status(200).json({
             service: {
                 name: service.name,
                 durationMinutes: service.durationMinutes,
-                priceUsd: (_service_priceUsd = service.priceUsd) != null ? _service_priceUsd : 0,
+                priceUsd: bookingChargeUsd(service),
+                priceDisplay: bookingPriceDisplay(service.priceDisplay),
                 timezone: (_service_timezone = service.timezone) != null ? _service_timezone : 'UTC'
             },
-            slots
+            slots,
+            // Where the next page starts; `null` once this one reached the horizon.
+            nextFromMs,
+            // The configured horizon, so the widget's empty state names it.
+            horizonDays: maxDaysAhead
         });
     } catch (error) {
         console.error(error);
@@ -269,8 +299,8 @@ export const slotsHandler = async (req, res)=>{
         });
     }
     try {
-        var _service_priceUsd, _service_name, _service_name1, _service_name2, _service_name3;
-        var _this, _req_body7;
+        var _service_name, _service_name1, _service_name2, _service_name3;
+        var _req_body7, _req_body8, _this, _req_body9;
         const firestore = firebaseAdmin.app().firestore();
         const hostRef = firestore.collection('hosts').doc(hostId);
         const [hostSnapshot, serviceSnapshot] = await Promise.all([
@@ -288,6 +318,20 @@ export const slotsHandler = async (req, res)=>{
                 error: 'Unknown service'
             });
         }
+        // The phone and the address, held to what THIS service asks for
+        // (AGL-3493) and checked here whatever the widget already checked: this
+        // is a public door, and a request can be written by hand. A field the
+        // service does not ask for is dropped rather than stored.
+        const contact = readBookingContactFields(bookingContactAsks(service), {
+            phone: (_req_body7 = req.body) == null ? void 0 : _req_body7.phone,
+            address: (_req_body8 = req.body) == null ? void 0 : _req_body8.address
+        });
+        if ('error' in contact) return res.status(400).json({
+            error: contact.error
+        });
+        const { phone, address } = contact.fields;
+        // `Phone: …`, `Address: …`, for the managers' notification below.
+        const contactLines = bookingContactLines(contact.fields);
         // Plan gate (dark-launch rule preserved). Plan/quota gates ride the
         // owning org's doc (AGL-238). Hoisted out of its block for AGL-2315:
         // the same org doc now also prices the platform's cut below, and reading
@@ -315,7 +359,9 @@ export const slotsHandler = async (req, res)=>{
         // booking lands as `pendingPayment` with a 15-minute expiry (expired
         // holds release the slot in the collision filters), and the visitor
         // goes to Stripe Checkout; the webhook confirms + emails on payment.
-        const priceUsd = Number((_service_priceUsd = service.priceUsd) != null ? _service_priceUsd : 0);
+        // A service that states its price as a label books with no charge
+        // (AGL-3475), whatever price it stores.
+        const priceUsd = bookingChargeUsd(service);
         const paid = priceUsd > 0;
         if (paid && !process.env.STRIPE_SECRET_KEY) {
             return res.status(501).json({
@@ -476,7 +522,12 @@ export const slotsHandler = async (req, res)=>{
                 serviceId,
                 serviceName: (_service_name = service.name) != null ? _service_name : '',
                 name,
-                email,
+                email
+            }, phone ? {
+                phone
+            } : {}, address ? {
+                address
+            } : {}, {
                 startsAtMs,
                 endsAtMs,
                 timezone,
@@ -491,30 +542,29 @@ export const slotsHandler = async (req, res)=>{
             return bookingRef.id;
         });
         /*
-     * THE CAMPAIGN TOUCH, RESOLVED ONCE FOR THE WHOLE BOOKING.
+     * WHERE THE VISITOR ARRIVED FROM, RESOLVED ONCE FOR THE WHOLE BOOKING.
      *
      * A booking is an identify moment: the visitor was anonymous while they
      * browsed and picked a slot, and this request is the first thing that
-     * names them. Both channels are asked here — the labels their device
-     * carried, and the campaign mail they clicked, joined on the address they
-     * just typed — and the later of the two is credited, exactly as the
-     * revenue join credits the later click.
+     * names them. The plugin that credits outcomes
+     * (`plugin-conversion-credit`) is asked with what their device carried
+     * and the address they just typed, and decides what earns the credit.
      *
      * Resolved once and handed to the booking record, the contact and the
-     * lead below, so the email-channel lookup is one keyed read for the whole
-     * request and the three records cannot name different campaigns.
+     * lead below, so the lookup is paid once for the whole request and the
+     * three records cannot be credited to different arrivals.
      */ const bookedAtMs = Date.now();
-        const campaignTouch = await resolveCampaignTouch({
+        const arrival = await resolveConversionTouch({
             hostId,
-            wire: (_req_body7 = req.body) == null ? void 0 : _req_body7.campaignTouch,
+            wire: (_req_body9 = req.body) == null ? void 0 : _req_body9.campaignTouch,
             email,
             atMs: bookedAtMs
         });
-        void attributeCampaignConversion({
+        void creditConversion({
             hostId,
             kind: 'booking',
             refId: bookingId,
-            touch: campaignTouch,
+            touch: arrival,
             convertedAtMs: bookedAtMs
         });
         /*
@@ -550,11 +600,15 @@ export const slotsHandler = async (req, res)=>{
                 summary: `Booked "${String((_service_name = service.name) != null ? _service_name : 'a service').slice(0, 60)}"`
             },
             surface: 'lead'
-        }, marketingConsent ? {
+        }, phone ? {
+            profileFill: {
+                phone
+            }
+        } : {}, marketingConsent ? {
             marketingConsent: true
-        } : {}, campaignTouch ? {
+        } : {}, arrival ? {
             detail: {
-                campaignTouch
+                [CONVERSION_TOUCH_DETAIL]: arrival
             }
         } : {}));
         if (paid) {
@@ -672,8 +726,8 @@ export const slotsHandler = async (req, res)=>{
                     error: 'Payment setup failed'
                 });
             }
-            // The lead landed above; the confirmation email + workflow event fire
-            // from the payment webhook.
+            // The lead landed above; the confirmation email and the managers'
+            // notification go out from the payment webhook.
             return res.status(200).json({
                 bookingId,
                 startsAtMs,
@@ -683,11 +737,13 @@ export const slotsHandler = async (req, res)=>{
         }
         // Event trigger (AGL-128/148/159).
         // In-app notification to the site's managers (AGL-259): who booked what,
-        // and when, in the booking's own zone and naming it (AGL-3432).
+        // and when, in the booking's own zone and naming it (AGL-3432), and the
+        // phone and address the service asked for (AGL-3493) — the two things
+        // an on-site service needs before it can do anything with the booking.
         void notifyHostManagers(hostId, {
             type: 'content.booking',
             title: 'New booking on {site}',
-            body: `${name} (${email}) booked ${String((_service_name1 = service.name) != null ? _service_name1 : 'a service')} ` + `on {site} for ${when} (${timezone}).`,
+            body: `${name} (${email}) booked ${String((_service_name1 = service.name) != null ? _service_name1 : 'a service')} ` + `on {site} for ${when} (${timezone}).` + (contactLines.length ? ` ${contactLines.join('. ')}.` : ''),
             link: `/${hostId}/bookings`
         });
         const { alerts } = await emitHostEvent(hostId, 'booking', {
@@ -753,7 +809,12 @@ export const slotsHandler = async (req, res)=>{
             booking: _extends({
                 serviceId,
                 serviceName: (_service_name3 = service.name) != null ? _service_name3 : '',
-                email,
+                email
+            }, phone ? {
+                phone
+            } : {}, address ? {
+                address
+            } : {}, {
                 startsAtMs,
                 endsAtMs
             }, crmRef ? {