6598691372
- Prisma: Zone (postal-code list or radius), Rate (zone- or distance-band
keyed), GeocodeCache (permanent address->lat/lng cache per
IMPLEMENTATION_PLAN.md §9), Location.shopifyLocationId (maps to
Shopify's own Location resource for inventory checks), Booking.zoneId
(needed for per-zone delivery-density counts, not just per-location).
- app/lib/geo.ts: pure haversine distance + postal-code matching, unit
tested against known city-to-city distances.
- app/services/zones.server.ts: geocoding (Google Maps Geocoding API,
cached — never re-geocodes the same address twice), zone eligibility,
nearest-location auto-assignment ranked by distance, delivery-density
threshold checks (a sparse zone doesn't unlock until minOrders bookings
have already routed through it), and inventory-based location exclusion
via Shopify's InventoryLevel API (locations without a mapped
shopifyLocationId are left in rather than false-negative excluded).
- app/services/rates.server.ts: pure rate resolution by zone or distance
band, cheapest-match-wins when bands overlap.
- apps.scheduling.availability.tsx: LOCAL_DELIVERY requests with a
postalCode/address now auto-assign to the nearest eligible,
density-qualified zone/location instead of the shop's default location;
response includes the matched rate. Also fixed a real gap left over from
Phase 4: this route never actually read Booking counts into
getAvailability's `consumed` map, so capacity always showed as fully
available regardless of existing bookings — now it does.
- extensions/datetime-widget: LOCAL_DELIVERY now asks for a postal code
before showing dates; PICKUP shows a Google Maps pin for the location
(both gated on an optional Maps API key — a block setting in the theme
editor, since it needs to be public/client-side, not an app secret);
confirmation display and cart attributes (dd_zone_id, dd_rate_label)
carry the resolved zone/rate through to checkout.
- extensions/delivery-customization: now appends the resolved rate to the
relabeled delivery option ("Local delivery — Aug 25 ($5.99)") when one's
configured — real Cart Transform-based fee *charging* stays deferred to
v2 per IMPLEMENTATION_PLAN.md §5.4, this is display-only.
- Admin: /app/zones and /app/rates (Polaris CRUD, mirroring Phase 1's
patterns), plus shopifyLocationId and auto-geocode-on-save added to the
location edit form.
Fixed one real bug caught only by `npm run build` (not tsc/vitest, which
both passed clean): app.rates._index.tsx's component called
formatPriceLabel from rates.server.ts, and Remix correctly refuses to
bundle anything imported from a .server.ts path for the client. Moved the
pure (no I/O, no Prisma) formatter to app/lib/currency.ts.
Verified: lint, typecheck, 86 unit tests (+21 new: geo, zones, rates,
delivery-customization's rate-label case with a real WASM fixture run),
16 integration tests against live Postgres (+8 new: geocode caching,
postal/radius zone matching, nearest-first ranking, density thresholds),
both builds, and a live script exercising the full
zone-match -> density-check -> rate-resolve -> availability pipeline
together against the Postgres container.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
83 lines
2.7 KiB
TypeScript
83 lines
2.7 KiB
TypeScript
import { describe, expect, it } from "vitest";
|
|
import { isZoneEligible, type ZoneLike } from "../../app/services/zones.server";
|
|
|
|
const TORONTO = { lat: 43.6532, lng: -79.3832 };
|
|
const KITCHENER = { lat: 43.4516, lng: -80.4925 }; // ~100km from Toronto
|
|
|
|
function postalZone(overrides: Partial<ZoneLike> = {}): ZoneLike {
|
|
return {
|
|
id: "zone_1",
|
|
locationId: "loc_1",
|
|
type: "postal",
|
|
postalCodes: ["M5V 3A8", "M4B 1B3"],
|
|
radiusKm: null,
|
|
minOrders: null,
|
|
active: true,
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
function radiusZone(overrides: Partial<ZoneLike> = {}): ZoneLike {
|
|
return {
|
|
id: "zone_2",
|
|
locationId: "loc_1",
|
|
type: "radius",
|
|
postalCodes: [],
|
|
radiusKm: 25,
|
|
minOrders: null,
|
|
active: true,
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
describe("isZoneEligible", () => {
|
|
it("an inactive zone is never eligible, even with a matching postal code", () => {
|
|
const zone = postalZone({ active: false });
|
|
expect(isZoneEligible(zone, null, { postalCode: "M5V 3A8" })).toBe(false);
|
|
});
|
|
|
|
describe("postal zones", () => {
|
|
it("matches a listed postal code", () => {
|
|
expect(isZoneEligible(postalZone(), null, { postalCode: "m5v3a8" })).toBe(true);
|
|
});
|
|
|
|
it("rejects an unlisted postal code", () => {
|
|
expect(isZoneEligible(postalZone(), null, { postalCode: "K1A 0A6" })).toBe(false);
|
|
});
|
|
|
|
it("is ineligible when no postal code is provided", () => {
|
|
expect(isZoneEligible(postalZone(), null, {})).toBe(false);
|
|
});
|
|
|
|
it("ignores location coordinates entirely (postal zones don't need them)", () => {
|
|
expect(isZoneEligible(postalZone(), TORONTO, { postalCode: "M5V 3A8" })).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe("radius zones", () => {
|
|
it("is eligible within the radius", () => {
|
|
expect(isZoneEligible(radiusZone({ radiusKm: 200 }), TORONTO, { coordinates: KITCHENER })).toBe(true);
|
|
});
|
|
|
|
it("is ineligible outside the radius", () => {
|
|
expect(isZoneEligible(radiusZone({ radiusKm: 10 }), TORONTO, { coordinates: KITCHENER })).toBe(false);
|
|
});
|
|
|
|
it("is ineligible when the location has no coordinates set", () => {
|
|
expect(isZoneEligible(radiusZone(), null, { coordinates: KITCHENER })).toBe(false);
|
|
});
|
|
|
|
it("is ineligible when the customer has no coordinates (couldn't geocode)", () => {
|
|
expect(isZoneEligible(radiusZone(), TORONTO, {})).toBe(false);
|
|
});
|
|
|
|
it("is ineligible when radiusKm isn't configured", () => {
|
|
expect(isZoneEligible(radiusZone({ radiusKm: null }), TORONTO, { coordinates: KITCHENER })).toBe(false);
|
|
});
|
|
});
|
|
|
|
it("an unrecognized zone type is never eligible", () => {
|
|
expect(isZoneEligible(postalZone({ type: "driving-time" }), null, { postalCode: "M5V 3A8" })).toBe(false);
|
|
});
|
|
});
|