Some checks failed
CI / Lint, Unit & Integration Tests (push) Has been cancelled
Also fixes the [events] gate that was blocking ALL extension generation
(discovered while starting this phase).
- shopify.app.toml: this org appears enrolled in Shopify's "Next
Generation Events" developer preview, which the CLI now treats as a
REQUIRED top-level [events] section even though nothing in this app
actually uses it (real webhook handling is entirely classic [webhooks],
unaffected). Iteratively discovered the required shape from the CLI's
own field-by-field validation errors, then found the real docs (Events
is optional/developer-preview, api_version pinned to "unstable") to
confirm rather than keep guessing. Added a functionally-inert
[[events.subscription]] placeholder + a stub handler
(webhooks.events.placeholder.tsx) solely to satisfy the gate.
- app/services/availability-request.server.ts +
app/services/hold-request.server.ts: extracted the resolution logic that
used to live directly in apps.scheduling.availability.tsx/hold.tsx into
shared functions. This is what actually makes "same capacity pool feeds
every surface" (CLAUDE.md) true by construction rather than by
convention — the storefront, POS, and checkout routes now call the exact
same code, not three copies that could quietly drift apart.
- extensions/pos-datetime (generated via `shopify app generate extension
--template=pos_smart_grid` — pos_action's flavor requirement contradicted
the CLI's own global --flavor validator, so smart_grid was used instead):
a home-screen tile opening a modal where staff pick method -> date -> time
against the same availability/hold endpoints (pos.scheduling.*.tsx,
session-token authenticated), writing the same dd_* cart properties via
CartApi.addCartProperties — booking.server.ts needed zero changes to
handle POS-originated orders. Several API-shape guesses (toast isError
option, ChoiceList's `value`/`label` props, a nonexistent
action.dismissModal(), shopify.cart.cart.current) were wrong and caught
by typechecking directly against @shopify/ui-extensions' own bundled
.d.ts files (`npm run typecheck:pos`, now also in CI) — none of this was
verified against a live POS session, which isn't possible in this
environment.
- extensions/checkout-datetime (generated via `--template=checkout_ui`):
the Plus-only native picker in checkout itself
(purchase.checkout.block.render) plus a Thank You confirmation block
(purchase.thank-you.block.render). Went looking for an order-status
target too ("all plans show confirmed slot on thank-you/order-status" is
the Phase 7 accept criterion) and confirmed via the installed package's
own type definitions that purchase.order-status.block.render does not
exist in this API version — checkout UI extensions' thank-you/order-status
surfaces are Plus-only regardless. The actual "all plans" mechanism is
extensions/datetime-widget/blocks/order-confirmation.liquid — a new Theme
App Extension block reading order.note_attributes, which works on every
plan since it's plain Liquid, not checkout extensibility.
Both new UI extensions share one real unverified assumption, called out in
code comments: process.env.APP_URL is expected to be substituted at build
time by the Shopify CLI to the app's backend origin, since these run in a
different origin than the app and need an absolute URL, unlike the
storefront widget's relative /apps/scheduling/* path. Needs confirming
against a live dev session.
Verified: lint, typecheck (root + both new extensions'
`npm run typecheck:pos`/`typecheck:checkout`, all now in CI), 102 unit +
18 integration tests (unchanged — this phase didn't touch pure business
logic, only added thin auth wrappers around already-tested services), both
admin/widget builds.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
198 lines
7.0 KiB
TypeScript
198 lines
7.0 KiB
TypeScript
import { DateTime } from "luxon";
|
|
import type { Method } from "@prisma/client";
|
|
import db from "../db.server";
|
|
import { getAvailability, type AvailableSlot } from "./scheduling.server";
|
|
import { findEligibleLocationsForDelivery, meetsDeliveryDensity } from "./zones.server";
|
|
import { resolveRate } from "./rates.server";
|
|
import { formatPriceLabel } from "../lib/currency";
|
|
|
|
// The single availability resolver every surface calls — storefront widget
|
|
// (via apps.scheduling.availability.tsx, app-proxy auth), POS (via
|
|
// pos.scheduling.availability.tsx, session-token auth), and eventually
|
|
// Checkout UI. CLAUDE.md's non-negotiable: "One Scheduling Service + one
|
|
// capacity pool feeds every surface... behavior must never diverge between
|
|
// channels" — this is that single point, not just a shared convention each
|
|
// route re-implements.
|
|
|
|
const MAX_DAYS = 60;
|
|
const DEFAULT_DAYS = 14;
|
|
|
|
export interface AvailabilityRequestParams {
|
|
method: Method;
|
|
locationId?: string;
|
|
postalCode?: string;
|
|
address?: string;
|
|
days?: number;
|
|
}
|
|
|
|
export interface AvailabilityResult {
|
|
locationId: string | null;
|
|
locationName?: string;
|
|
locationLat?: number | null;
|
|
locationLng?: number | null;
|
|
timezone?: string;
|
|
method: Method;
|
|
dates: Record<string, AvailableSlot[]>;
|
|
zoneId: string | null;
|
|
distanceKm: number | null;
|
|
rate: { name: string; priceCents: number; label: string } | null;
|
|
error?: string;
|
|
}
|
|
|
|
function toIsoDate(date: Date): string {
|
|
return date.toISOString().slice(0, 10);
|
|
}
|
|
|
|
/** getAvailability's consumed-capacity map key — must match scheduling.server.ts's slotKey() exactly. */
|
|
function slotKey(date: string, startMin: number): string {
|
|
return `${date}|${startMin}`;
|
|
}
|
|
|
|
export async function resolveAvailabilityRequest(
|
|
shopDomain: string,
|
|
params: AvailabilityRequestParams,
|
|
): Promise<AvailabilityResult> {
|
|
const { method, locationId: locationIdParam, postalCode, address } = params;
|
|
const days = params.days && params.days > 0 ? Math.min(params.days, MAX_DAYS) : DEFAULT_DAYS;
|
|
|
|
let location: Awaited<ReturnType<typeof db.location.findFirst>> = null;
|
|
let zoneId: string | null = null;
|
|
let distanceKm: number | null = null;
|
|
|
|
// Delivery-zone auto-assignment (IMPLEMENTATION_PLAN.md Phase 5): route to
|
|
// the nearest eligible, density-qualified zone for the shopper's address.
|
|
// Falls through to the plain location lookup below for PICKUP/SHIPPING,
|
|
// or when no address was supplied yet, so the picker can still show
|
|
// something before that input exists.
|
|
if (method === "LOCAL_DELIVERY" && (postalCode || address)) {
|
|
const matches = await findEligibleLocationsForDelivery(shopDomain, { postalCode, address });
|
|
const zones = matches.length
|
|
? await db.zone.findMany({ where: { id: { in: matches.map((m) => m.zoneId) } } })
|
|
: [];
|
|
const zoneById = new Map(zones.map((z) => [z.id, z]));
|
|
|
|
for (const match of matches) {
|
|
if (locationIdParam && match.locationId !== locationIdParam) continue;
|
|
const zone = zoneById.get(match.zoneId);
|
|
if (!zone) continue;
|
|
// eslint-disable-next-line no-await-in-loop -- checked in nearest-first order; stop at the first that qualifies
|
|
if (!(await meetsDeliveryDensity(shopDomain, zone))) continue;
|
|
|
|
zoneId = match.zoneId;
|
|
distanceKm = match.distanceKm;
|
|
location = await db.location.findFirst({ where: { id: match.locationId, shopDomain, active: true } });
|
|
break;
|
|
}
|
|
|
|
if (!location) {
|
|
return {
|
|
locationId: null,
|
|
method,
|
|
dates: {},
|
|
zoneId: null,
|
|
distanceKm: null,
|
|
rate: null,
|
|
error: "This address is outside our delivery area right now.",
|
|
};
|
|
}
|
|
} else {
|
|
location = locationIdParam
|
|
? await db.location.findFirst({ where: { id: locationIdParam, shopDomain, active: true } })
|
|
: await db.location.findFirst({ where: { shopDomain, active: true }, orderBy: { createdAt: "asc" } });
|
|
}
|
|
|
|
if (!location) {
|
|
return {
|
|
locationId: null,
|
|
method,
|
|
dates: {},
|
|
zoneId: null,
|
|
distanceKm: null,
|
|
rate: null,
|
|
error: "No active location configured",
|
|
};
|
|
}
|
|
|
|
const now = DateTime.now().setZone(location.timezone);
|
|
const startDate = now.toISODate()!;
|
|
const endDate = now.plus({ days }).toISODate()!;
|
|
const rangeStart = DateTime.fromISO(startDate, { zone: "utc" }).toJSDate();
|
|
const rangeEnd = DateTime.fromISO(endDate, { zone: "utc" }).toJSDate();
|
|
// Bookings are keyed by exact instant; widen the window by a day on each
|
|
// side so a slot near midnight UTC-offset boundaries isn't miscounted.
|
|
const bookingRangeStart = DateTime.fromISO(startDate, { zone: "utc" }).minus({ days: 1 }).toJSDate();
|
|
const bookingRangeEnd = DateTime.fromISO(endDate, { zone: "utc" }).plus({ days: 1 }).toJSDate();
|
|
|
|
const [slotTemplates, overrides, blackouts, bookings, rates] = await Promise.all([
|
|
db.slotTemplate.findMany({ where: { shopDomain, locationId: location.id, method } }),
|
|
db.slotOverride.findMany({
|
|
where: { shopDomain, locationId: location.id, method, date: { gte: rangeStart, lte: rangeEnd } },
|
|
}),
|
|
db.blackoutDate.findMany({
|
|
where: {
|
|
shopDomain,
|
|
date: { gte: rangeStart, lte: rangeEnd },
|
|
AND: [{ OR: [{ locationId: location.id }, { locationId: null }] }, { OR: [{ method }, { method: null }] }],
|
|
},
|
|
}),
|
|
db.booking.findMany({
|
|
where: {
|
|
shopDomain,
|
|
locationId: location.id,
|
|
method,
|
|
status: { in: ["confirmed", "fulfilled"] },
|
|
slotStart: { gte: bookingRangeStart, lte: bookingRangeEnd },
|
|
},
|
|
select: { slotStart: true },
|
|
}),
|
|
db.rate.findMany({ where: { shopDomain, method } }),
|
|
]);
|
|
|
|
const consumed = new Map<string, number>();
|
|
for (const booking of bookings) {
|
|
const local = DateTime.fromJSDate(booking.slotStart, { zone: "utc" }).setZone(location.timezone);
|
|
const key = slotKey(local.toISODate()!, local.hour * 60 + local.minute);
|
|
consumed.set(key, (consumed.get(key) ?? 0) + 1);
|
|
}
|
|
|
|
const availability = getAvailability({
|
|
timezone: location.timezone,
|
|
dateRange: { startDate, endDate },
|
|
slotTemplates: slotTemplates.map((t) => ({
|
|
weekday: t.weekday,
|
|
startMin: t.startMin,
|
|
endMin: t.endMin,
|
|
capacity: t.capacity,
|
|
cutoffMin: t.cutoffMin,
|
|
leadTimeMin: t.leadTimeMin,
|
|
})),
|
|
overrides: overrides.map((o) => ({
|
|
date: toIsoDate(o.date),
|
|
closed: o.closed,
|
|
startMin: o.startMin,
|
|
endMin: o.endMin,
|
|
capacity: o.capacity,
|
|
})),
|
|
blackoutDates: blackouts.map((b) => ({ date: toIsoDate(b.date) })),
|
|
now,
|
|
consumed,
|
|
});
|
|
|
|
const matchedRate = resolveRate(rates, { method, zoneId: zoneId ?? undefined, distanceKm: distanceKm ?? undefined });
|
|
|
|
return {
|
|
locationId: location.id,
|
|
locationName: location.name,
|
|
locationLat: location.lat,
|
|
locationLng: location.lng,
|
|
timezone: location.timezone,
|
|
method,
|
|
dates: availability,
|
|
zoneId,
|
|
distanceKm,
|
|
rate: matchedRate
|
|
? { name: matchedRate.name, priceCents: matchedRate.priceCents, label: formatPriceLabel(matchedRate.priceCents) }
|
|
: null,
|
|
};
|
|
}
|