Some checks failed
CI / Lint, Unit & Integration Tests (push) Has been cancelled
Audited the implementation against DS_Delivery_Date_Time_App_Study.docx and closed the actionable gaps (see IMPLEMENTATION_REVIEW_2026-09-04.md). Core (code + unit tests, 156 green): - Wire excludeLocationsWithoutStock into resolveAvailabilityRequest; widget now sends variantIds so inventory-based location exclusion actually runs. - Live slot re-validation at checkout: new checkout-snapshot.server.ts writes a shop-metafield capacity snapshot; validation-slot's evaluateCheckout rejects a complete selection that has since filled / blacked out / closed / hit the daily cap / left the schedule. Refreshed on order webhooks and slot/blackout/location/enforcement edits. - Scopable checkout enforcement: Shop.enforcementMode (all|tagged|off) + enforcementTag, new app.settings.tsx admin page, honoured via the snapshot. - Per-day order cap: Location.dailyOrderCap threaded through getAvailability (dailyCap + consumedPerDate); admin field on the location screen. - Product-rule slot blocking: ProductRule.blockedStartMins, unioned in resolveProductRuleConstraints, enforced in the engine and resolveHoldRequest; admin field on the product rules screen. - Product-page placement: product-availability.liquid block + widget data-mode="preview" (read-only earliest-date line). - Second locale: datetime-widget fr.json / fr.schema.json. - Migration 20260904120000_review_gaps (apply with prisma migrate deploy). New Functions (source + unit tests; need `shopify app deploy` to ship): - extensions/payment-customization: cart.payment-methods.transform.run — hides cash-on-delivery / pay-in-store gateways on SHIPPING orders. - extensions/checkout-datetime/src: restored from a gitignored dist-only state — Plus native picker + Thank you / Order status confirmation blocks, all calling the existing checkout.scheduling.* routes (one capacity pool). tsconfig ships checkJs:false pending reconciliation with live checkout types. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
99 lines
4.5 KiB
TypeScript
99 lines
4.5 KiB
TypeScript
import { DateTime } from "luxon";
|
|
import type { Method } from "@prisma/client";
|
|
import db from "../db.server";
|
|
import { minutesUntil, slotDateTime, weekdayOf } from "../lib/time";
|
|
import { remainingCapacity } from "./capacity.server";
|
|
import { tryCreateHold, releaseHold, countActiveHolds } from "./holds.server";
|
|
import { resolveProductRuleConstraints, productRefsFromCartLines, type ProductRef } from "./product-rules.server";
|
|
|
|
// Shared by every surface that reserves capacity — storefront widget (via
|
|
// apps.scheduling.hold.tsx) and POS (via pos.scheduling.hold.tsx). Same
|
|
// pool, same code, different auth wrapper. See holds.server.ts for why
|
|
// creating a hold has to be a single atomic Redis operation.
|
|
|
|
export interface HoldRequestParams {
|
|
intent: "create" | "release";
|
|
locationId: string;
|
|
method: Method;
|
|
date: string;
|
|
startMin: number;
|
|
cartToken: string;
|
|
/** Same ProductRule-scoping inputs as AvailabilityRequestParams — see availability-request.server.ts. */
|
|
cartLines?: Array<{ vendor?: string; productType?: string }>;
|
|
productRefs?: ProductRef[];
|
|
}
|
|
|
|
export interface HoldRequestResult {
|
|
status: number;
|
|
body: { ok?: true; success?: boolean; expiresAt?: number; remaining?: number; error?: string };
|
|
}
|
|
|
|
export async function resolveHoldRequest(shopDomain: string, params: HoldRequestParams): Promise<HoldRequestResult> {
|
|
const { intent, locationId, method, date, startMin, cartToken } = params;
|
|
|
|
const location = await db.location.findFirst({ where: { id: locationId, shopDomain, active: true } });
|
|
if (!location) {
|
|
return { status: 404, body: { error: "Location not found" } };
|
|
}
|
|
|
|
const slotStart = slotDateTime(date, startMin, location.timezone);
|
|
const slot = { shopDomain, locationId: location.id, method, slotStartIso: slotStart.toUTC().toISO()! };
|
|
|
|
if (intent === "release") {
|
|
await releaseHold(slot, cartToken);
|
|
return { status: 200, body: { ok: true } };
|
|
}
|
|
|
|
const template = await db.slotTemplate.findFirst({
|
|
where: { shopDomain, locationId: location.id, method, weekday: weekdayOf(date, location.timezone), startMin },
|
|
});
|
|
if (!template) {
|
|
return { status: 404, body: { error: "Slot not found" } };
|
|
}
|
|
|
|
// ProductRule enforcement (PRODUCT_STRATEGY.md §2) — the real, server-side
|
|
// gate for method/location/lead-time restrictions. Availability filters
|
|
// what's *shown*; this is what actually stops a hold (and therefore a
|
|
// booking) from being created against a rule, whether or not the shopper
|
|
// went through the widget to get here.
|
|
const productRules = await db.productRule.findMany({ where: { shopDomain, active: true } });
|
|
const cartProductRefs = [...(params.productRefs ?? []), ...productRefsFromCartLines(params.cartLines ?? [])];
|
|
const ruleConstraints = resolveProductRuleConstraints(productRules, cartProductRefs);
|
|
|
|
if (ruleConstraints.allowedMethods != null && !ruleConstraints.allowedMethods.includes(method)) {
|
|
return { status: 400, body: { success: false, error: "One or more items in your cart aren't available with this fulfillment method." } };
|
|
}
|
|
if (ruleConstraints.allowedLocationIds != null && !ruleConstraints.allowedLocationIds.includes(location.id)) {
|
|
return { status: 400, body: { success: false, error: "One or more items in your cart aren't available at this location." } };
|
|
}
|
|
if (ruleConstraints.minLeadTimeMin > 0) {
|
|
const now = DateTime.now().setZone(location.timezone);
|
|
if (minutesUntil(now, slotStart) < ruleConstraints.minLeadTimeMin) {
|
|
return { status: 400, body: { success: false, error: "One or more items in your cart need more preparation time than this slot allows." } };
|
|
}
|
|
}
|
|
if (ruleConstraints.blockedStartMins.includes(startMin)) {
|
|
return { status: 400, body: { success: false, error: "One or more items in your cart can't be scheduled for this time slot." } };
|
|
}
|
|
|
|
const confirmedCount = await db.booking.count({
|
|
where: { shopDomain, locationId: location.id, method, slotStart: slotStart.toJSDate(), status: "confirmed" },
|
|
});
|
|
|
|
const capacityBudget = remainingCapacity({ capacity: template.capacity, consumed: confirmedCount });
|
|
if (capacityBudget <= 0) {
|
|
return { status: 409, body: { success: false, error: "Slot is full" } };
|
|
}
|
|
|
|
const result = await tryCreateHold(slot, cartToken, capacityBudget);
|
|
if (!result.success) {
|
|
return { status: 409, body: { success: false, error: "Slot was just taken" } };
|
|
}
|
|
|
|
const activeHolds = await countActiveHolds(slot);
|
|
return {
|
|
status: 200,
|
|
body: { success: true, expiresAt: result.expiresAt, remaining: Math.max(0, capacityBudget - activeHolds) },
|
|
};
|
|
}
|