From af43b72c04ab4273771487b455c2998afa3cce6f Mon Sep 17 00:00:00 2001 From: joshua Date: Thu, 29 Oct 2026 12:39:27 +0200 Subject: [PATCH] Series, season passes, deals and campuses on API v2 (1.51.9) - v2: series (+ page, compare, follow), season passes (+ buy, pay, mine), bundle deals (+ quote), coupon codes (+ check, redemptions), campuses (+ admin, enabled, order, audience). - src/services/series.ts, deals.ts, campuses.ts; the five controllers are thin v1 wrappers. - v2 errors carry a service's own code as `reason`. - Frontend: apiV2Data() for screens with their own record types; these screens on v2. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Ls1vMdg2GYqbnKZmPaX1ot --- apps/events/CHANGELOG.md | 25 ++++++++++++++++++ apps/events/WHATS-NEW.md | 5 ++++ apps/events/backend/package-lock.json | 4 +-- apps/events/backend/package.json | 2 +- apps/events/docs/HANDOVER.md | 14 +++++++++-- apps/events/docs/ROADMAP-v2.md | 7 +++--- apps/events/e2e/api-v2.spec.ts | 35 ++++++++++++++++++++++++++ apps/events/frontend/package-lock.json | 4 +-- apps/events/frontend/package.json | 2 +- apps/events/package-lock.json | 4 +-- apps/events/package.json | 2 +- 11 files changed, 90 insertions(+), 14 deletions(-) diff --git a/apps/events/CHANGELOG.md b/apps/events/CHANGELOG.md index 928332f..c6700a7 100644 --- a/apps/events/CHANGELOG.md +++ b/apps/events/CHANGELOG.md @@ -7,6 +7,31 @@ and this project follows [Semantic Versioning](https://semver.org/). ## [Unreleased] +## [1.51.9] - 2026-10-29 + +### Added + +- **API v2 — series, season passes, deals and campuses:** `/series` (list, create, `PATCH`, delete, + `/series/by-slug/{slug}`, `/series/{id}/compare`, `PUT`/`DELETE /series/{id}/follow`); + `/season-passes` (list, create, `PATCH`, delete, `/season-passes/{id}/buy`), + `/season-pass-purchases/{id}/checkout`, `/me/season-passes`; bundle deals + (`/events/{id}/bundles`, `PATCH`/`DELETE /bundles/{id}`, `/bundles/quote`); coupon codes (`/coupons`, + `/coupons/{id}`, `/coupons/redemptions`, `/coupons/check` — always a 200 with `valid`); campuses + (`/campuses`, `/campuses/admin`, `/campuses/by-slug/{slug}`, `PUT /campuses/enabled`, + `PUT /campuses/order`, create, `PATCH`, delete, `/campuses/{id}/audience`). +- **Services:** `src/services/series.ts`, `deals.ts` and `campuses.ts` — the series, season pass, + bundle, coupon and campus controllers are now thin v1 wrappers. +- **v2 errors carry a service's own code as `reason`** (e.g. `CAMPUS_HAS_EVENTS`), like the shared + middleware's codes. +- Frontend: `apiV2Data()` — `apiV2` for screens with their own record types (path, parameters and + body still checked; cast the answer). Series, season passes, bundles, coupons, campuses, the + coupon field and bundle quotes on the register page all use v2. + +### Changed + +- Checking a coupon code on v2 answers `valid: false` with the reason instead of an error; the + coupon field shows that reason as before. + ## [1.51.8] - 2026-10-29 ### Added diff --git a/apps/events/WHATS-NEW.md b/apps/events/WHATS-NEW.md index 3740aae..59e9854 100644 --- a/apps/events/WHATS-NEW.md +++ b/apps/events/WHATS-NEW.md @@ -12,6 +12,11 @@ Write for church admins, not developers: no environment variables, endpoints or developer log is CHANGELOG.md. A tagged version without a section here shows "No details given". --> +## 1.51.9 + +- **More groundwork for 2.0.** Event series, season passes, bundle deals, coupon codes and campuses + now run on the new version of the server's connection to the app. They work just as before. + ## 1.51.8 - **More groundwork for 2.0.** Event pages, ticket types, scanning sections, attachments, planned diff --git a/apps/events/backend/package-lock.json b/apps/events/backend/package-lock.json index b8a3d24..4df9607 100644 --- a/apps/events/backend/package-lock.json +++ b/apps/events/backend/package-lock.json @@ -1,12 +1,12 @@ { "name": "event-management-backend", - "version": "1.51.8", + "version": "1.51.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "event-management-backend", - "version": "1.51.8", + "version": "1.51.9", "hasInstallScript": true, "dependencies": { "@cj-tech-master/excelts": "^10.2.0", diff --git a/apps/events/backend/package.json b/apps/events/backend/package.json index 5f6ba25..eac2318 100644 --- a/apps/events/backend/package.json +++ b/apps/events/backend/package.json @@ -1,6 +1,6 @@ { "name": "event-management-backend", - "version": "1.51.8", + "version": "1.51.9", "description": "Event Management System Backend", "main": "src/index.js", "scripts": { diff --git a/apps/events/docs/HANDOVER.md b/apps/events/docs/HANDOVER.md index c339dfa..8a2653d 100644 --- a/apps/events/docs/HANDOVER.md +++ b/apps/events/docs/HANDOVER.md @@ -1,6 +1,6 @@ # Handover — where things stand and how to carry on -Last updated: 2026-10-29, after **1.51.8** (and Hub 1.5.0). The plan itself is in +Last updated: 2026-10-29, after **1.51.9** (and Hub 1.5.0). The plan itself is in [ROADMAP-v2.md](./ROADMAP-v2.md) (decisions table at the end); the previous round of features is in [FEATURES-ROUND-1.md](./FEATURES-ROUND-1.md). @@ -17,6 +17,7 @@ encrypted settings unreadable or break existing installs. | 1.51.3 | **Express 5** (qs query parser and `req.body = {}` kept); scanner and at-the-door on v2 check-in; shared middleware answers v2-shaped on `/api/v2` (`legacyErrorsToV2`, `reason`); v1 `Deprecation` + `successor-version` headers (`src/v2/deprecation.ts`) | | 1.51.2 | **v2 accounts and check-in**: signup, login (+ code step), `PATCH /me`; check-in look-up and scan with `outcome`s. `src/services/auth.ts` (from userController) and `src/services/checkin.ts` (from ticketController); login/signup/profile pages on v2 | | 1.51.1 | **v2 registrations and payments**: register, get, cancel, checkout; create/cancel moved to `src/services/registrations.ts`, online checkout to `src/services/payments.ts` (v1 uses them too); typed frontend calls (`apiV2`, `npm run api:types`); register page, Pay now and My Events cancel on v2 | +| 1.51.9 | **Series, season passes, bundles, coupons, campuses on v2** — `src/services/series.ts`, `deals.ts`, `campuses.ts`; `reason` on v2 errors from service codes; frontend `apiV2Data()` | | 1.51.8 | **Rest of event set-up on v2**: event in full, calendar, alias, ticket options and variants, attachments, sections, costs, image uploads — `src/services/eventDetails.ts`, `src/services/setup.ts`; frontend `fetchEvent()` and `lib/eventSetup.ts`; v2 `file` and `upload` routes | | 1.51.7 | **Setting events up on v2** (`/events/manage`, create, `PATCH`, deactivate, copy-from, notify-recipients) via `src/services/events.ts`; `fetchManagedEvents()` for every picker; **pg-boss 11** in schema `pgboss_v11` | | 1.51.6 | Command palette lists every report (from `ReportCatalog`) and every dashboard page (e2e drift check); exceljs → ExcelTS 10 (`@cj-tech-master/excelts`, no dependencies; e2e `e2e/excel.spec.ts`); backend `engines.node` >= 22 | @@ -68,7 +69,7 @@ encrypted settings unreadable or break existing installs. Hub 1.1.0 is deployed with update requests rolled out, and `scripts/install.sh` has been tried on a test server (both done 2026-10-28). -1. **1.51.9 – 1.51.15: every endpoint onto v2**, one area per release (roadmap build order, row +1. **1.51.10 – 1.51.15: every endpoint onto v2**, one area per release (roadmap build order, row 11b): services in TS, screens on `apiV2`, v1 routes into `SUCCESSORS`. 1.51.15 gives incoming webhooks and links in sent messages v2 URLs, with the v1 paths still answering (links redirect, webhooks handled by the same code). Then **2.0.0** — AI helpers and v1 removed. @@ -466,6 +467,15 @@ a test server (both done 2026-10-28). `fetchAllUsers` (Payments, Email/WhatsApp attendees, Forms, Manual) — a server-side search picker would replace them; the coupons list; `GET /api/registrations` without `page` (other callers still use the plain array). +## Series, deals and campuses on v2 (1.51.9) + +- **`apiV2Data(method, path, opts)`** (`lib/apiV2.ts`) returns `data` untyped for screens that keep + their own record types: `await (apiV2Data("get", "/coupons", { authToken }) as Promise)`. + TypeScript can't infer the method and path when a result type is given, so cast instead. +- **Codes in service errors** (`fail(409, message, 'CAMPUS_HAS_EVENTS')`) reach v2 clients as + `error.reason`, and v1 controllers still send them as `code`. +- Answers that aren't failures (a coupon that doesn't apply) are `200` with a flag on v2. + ## The rest of event set-up on v2 (1.51.8) - **One event:** `fetchEvent(id, { authToken, nextOptions })` (`lib/api.ts`, v2 `GET /events/{id}/full`) — diff --git a/apps/events/docs/ROADMAP-v2.md b/apps/events/docs/ROADMAP-v2.md index 09e77dc..bc15fe0 100644 --- a/apps/events/docs/ROADMAP-v2.md +++ b/apps/events/docs/ROADMAP-v2.md @@ -41,8 +41,9 @@ shipped; 1.49.1 **bulk actions** and 1.49.2 **saved filters** shipped — §9 is pass** shipped. 1.50.1 **pagination and search on long lists** and 1.50.2 **event picker and webhook guide** shipped. 1.51.0 **TypeScript backend and `/api/v2` foundations**, 1.51.1 **v2 registrations and payments**, 1.51.2 **v2 accounts and check-in** and 1.51.3 **Express 5, scanner on v2, v1 deprecation headers** shipped. 1.51.4 **security and dependency updates**, 1.51.5 **Next.js 16** and 1.51.6 **the complete command palette and -ExcelTS** , 1.51.7 **setting events up on v2, pg-boss 11** and 1.51.8 **the rest of event set-up on v2** shipped. -**Next: 1.51.9 – 1.51.15 (every endpoint onto v2), then 2.0.0.** +ExcelTS** , 1.51.7 **setting events up on v2, pg-boss 11** and 1.51.8 **the rest of event set-up on v2** and 1.51.9 +**series, passes, deals and campuses on v2** shipped. **Next: 1.51.10 – 1.51.15 (every endpoint onto v2), +then 2.0.0.** **Repositories:** @@ -1011,7 +1012,7 @@ income justify the hardware: | 9 | 1.47.0 ✅ – 1.47.3 ✅, 1.48.0 ✅ | Event series & cloning (1.47.0 clone, 1.47.1 series, 1.47.2 year-on-year reports, 1.47.3 season pass), Outbound webhooks (Wallet passes removed from scope) | Smaller, independent wins | | 10 | 1.49.0 ✅ – 1.49.2 ✅, 1.50.0 ✅, 1.50.1 ✅, 1.50.2 ✅ | Admin dashboard/Ctrl+K/bulk actions/saved filters, Accessibility pass, pagination and search on long lists, event picker and webhook guide (Afrikaans removed from scope) | Polish before the big release | | 11 | 1.51.0 ✅, 1.51.1 ✅, 1.51.2 ✅, 1.51.3 ✅ | TypeScript backend + OpenAPI + `/api/v2` alongside v1: 1.51.0 foundations (build, launcher, route declarations, errors, paging, OpenAPI at `/docs/v2`, first read endpoints); 1.51.1 registrations and payments as TS services, typed frontend calls; 1.51.2 check-in and accounts; 1.51.3 Express 5, the scanner on v2, v1 deprecation headers, v2-shaped shared middleware | The breaking-change groundwork | -| 11b | 1.51.4 ✅ – 1.51.8 ✅, 1.51.9 – 1.51.15 | **Every endpoint on v2 before 2.0** (decided 2026-10-29): 1.51.4 dependency audit and Node 24 LTS; 1.51.5 Next.js 16 and ESLint 10 (ESLint 9 is out of support); 1.51.6 the complete command palette and ExcelTS instead of exceljs; 1.51.7 setting events up (the staff list, create, change, deactivate, copy-from, notification recipients) and pg-boss 11; 1.51.8 the rest of event set-up (the event in full, ticket options and variants, attachments, sections, costs, uploads, calendar file, alias); 1.51.9 series, season passes, bundles, coupons and campuses; 1.51.10 registrations and money, staff side (manage registrations, payments, cashup, provider transactions, waitlist, sponsorship, consent, forms, feedback); 1.51.11 tickets and attendance, staff side (tickets, scan locks, attendance, allocations); 1.51.12 kids check-in and volunteer rosters; 1.51.13 people and messaging (users, WhatsApp, broadcasts, scheduled emails, automations, banner, saved filters, dashboard, stats, analytics, reports); 1.51.14 privacy and admin (privacy, admin, settings, setup, Hub, outbound webhooks, backups); 1.51.15 **incoming webhooks and links in sent messages**: Yoco, PayFast and WAWP webhooks and the links in emails and WhatsApp (unsubscribe, consent, ticket transfer, calendar feeds, waitlist offers) get v2 URLs — new messages and provider registrations use them, and the v1 paths keep answering (links by a 308 redirect to v2, provider webhooks handled by the same code, since providers may not follow a redirect on a POST). Each moves its area's logic into TS services, its screens onto `apiV2`, and its v1 routes into `SUCCESSORS` | 2.0 can then remove v1 | +| 11b | 1.51.4 ✅ – 1.51.9 ✅, 1.51.10 – 1.51.15 | **Every endpoint on v2 before 2.0** (decided 2026-10-29): 1.51.4 dependency audit and Node 24 LTS; 1.51.5 Next.js 16 and ESLint 10 (ESLint 9 is out of support); 1.51.6 the complete command palette and ExcelTS instead of exceljs; 1.51.7 setting events up (the staff list, create, change, deactivate, copy-from, notification recipients) and pg-boss 11; 1.51.8 the rest of event set-up (the event in full, ticket options and variants, attachments, sections, costs, uploads, calendar file, alias); 1.51.9 series, season passes, bundles, coupons and campuses; 1.51.10 registrations and money, staff side (manage registrations, payments, cashup, provider transactions, waitlist, sponsorship, consent, forms, feedback); 1.51.11 tickets and attendance, staff side (tickets, scan locks, attendance, allocations); 1.51.12 kids check-in and volunteer rosters; 1.51.13 people and messaging (users, WhatsApp, broadcasts, scheduled emails, automations, banner, saved filters, dashboard, stats, analytics, reports); 1.51.14 privacy and admin (privacy, admin, settings, setup, Hub, outbound webhooks, backups); 1.51.15 **incoming webhooks and links in sent messages**: Yoco, PayFast and WAWP webhooks and the links in emails and WhatsApp (unsubscribe, consent, ticket transfer, calendar feeds, waitlist offers) get v2 URLs — new messages and provider registrations use them, and the v1 paths keep answering (links by a 308 redirect to v2, provider webhooks handled by the same code, since providers may not follow a redirect on a POST). Each moves its area's logic into TS services, its screens onto `apiV2`, and its v1 routes into `SUCCESSORS` | 2.0 can then remove v1 | | 12 | **2.0.0** | **AI helpers** (§15 — headline feature: draft an event, summarise reports and feedback, draft messages, improve text; through the Hub with a rand cap per licence), v1 removed (all of it is on v2 by then; the old webhook URLs and links already sent in messages keep forwarding to v2), migration guide, marketing site/docs for selling | The release. AI needs the Hub (phase 6) for the key, metering and caps | Each phase should add matching help content (`frontend/src/content/help/`), diff --git a/apps/events/e2e/api-v2.spec.ts b/apps/events/e2e/api-v2.spec.ts index f548db3..07b5994 100644 --- a/apps/events/e2e/api-v2.spec.ts +++ b/apps/events/e2e/api-v2.spec.ts @@ -148,6 +148,41 @@ test.describe("API v2", () => { expect(costs.map((c: { label: string }) => c.label)).toContain("E2E Hall"); }); + test("series, coupon codes, bundle quotes and campuses", async ({ request }) => { + const sup = { Authorization: `Bearer ${seed().users.supervisor.token}` }; + const user = { Authorization: `Bearer ${seed().users.user.token}` }; + + const made = await request.post(`${API}/api/v2/series`, { headers: sup, data: { name: "E2E v2 Series", description: "Made through v2" } }); + expect(made.status()).toBe(201); + const series = (await made.json()).data; + const renamed = (await (await request.patch(`${API}/api/v2/series/${series.id}`, { headers: sup, data: { name: "E2E v2 Series (renamed)" } })).json()).data; + expect(renamed.name).toBe("E2E v2 Series (renamed)"); + const page = (await (await request.get(`${API}/api/v2/series/by-slug/${series.slug}`, { headers: user })).json()).data; + expect(page).toMatchObject({ id: series.id, following: false, upcoming: [], past: [] }); + expect((await (await request.put(`${API}/api/v2/series/${series.id}/follow`, { headers: user })).json()).data).toEqual({ following: true }); + + const ev = (await (await request.get(`${API}/api/v2/events/${seed().events.conference}/full`)).json()).data; + const opt = ev.eventOptions[0]; + const code = await request.post(`${API}/api/v2/coupons`, { headers: sup, data: { code: "E2EV2TEN", type: "percent", value: 10, eventIds: [ev.id] } }); + expect(code.status()).toBe(201); + const basket = { eventId: ev.id, options: [{ eventOptionId: opt.id, quantity: 1 }] }; + const ok = (await (await request.post(`${API}/api/v2/coupons/check`, { headers: user, data: { ...basket, code: "E2EV2TEN" } })).json()).data; + expect(ok).toMatchObject({ valid: true, code: "E2EV2TEN" }); + const bad = await request.post(`${API}/api/v2/coupons/check`, { headers: user, data: { ...basket, code: "NO-SUCH-CODE" } }); + expect(bad.status()).toBe(200); + expect((await bad.json()).data.valid).toBe(false); + + const quote = (await (await request.post(`${API}/api/v2/bundles/quote`, { data: basket })).json()).data; + expect(quote).toMatchObject({ bundleDiscount: 0 }); + expect(quote.total).toBe(quote.subtotal); + + const campuses = (await (await request.get(`${API}/api/v2/campuses`)).json()).data; + // On or off depending on which tests ran first: when off, the list is empty. + if (campuses.enabled) expect(campuses.campuses.map((c: { slug: string }) => c.slug)).toEqual(expect.arrayContaining([seed().campuses.north.slug])); + else expect(campuses.campuses).toEqual([]); + expect((await request.get(`${API}/api/v2/campuses/admin`, { headers: sup })).status()).toBe(403); + }); + test("an admin can read the OpenAPI reference at /docs/v2", async ({ page, request }) => { const headers = { Authorization: `Bearer ${seed().users.user.token}` }; expect((await request.get(`${API}/api/v2/openapi.json`, { headers })).status()).toBe(403); diff --git a/apps/events/frontend/package-lock.json b/apps/events/frontend/package-lock.json index f0f890e..0036e43 100644 --- a/apps/events/frontend/package-lock.json +++ b/apps/events/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "hope-events-frontend", - "version": "1.51.8", + "version": "1.51.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "hope-events-frontend", - "version": "1.51.8", + "version": "1.51.9", "dependencies": { "@dnd-kit/core": "^6.3.1", "@hookform/resolvers": "^5.2.1", diff --git a/apps/events/frontend/package.json b/apps/events/frontend/package.json index cdefd07..ba13bd0 100644 --- a/apps/events/frontend/package.json +++ b/apps/events/frontend/package.json @@ -1,6 +1,6 @@ { "name": "hope-events-frontend", - "version": "1.51.8", + "version": "1.51.9", "private": true, "scripts": { "dev": "next dev", diff --git a/apps/events/package-lock.json b/apps/events/package-lock.json index 7e1496f..c42bdc8 100644 --- a/apps/events/package-lock.json +++ b/apps/events/package-lock.json @@ -1,12 +1,12 @@ { "name": "hope-events", - "version": "1.51.8", + "version": "1.51.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "hope-events", - "version": "1.51.8", + "version": "1.51.9", "license": "ISC", "devDependencies": { "@axe-core/playwright": "^4.14.0", diff --git a/apps/events/package.json b/apps/events/package.json index bc6c774..951767e 100644 --- a/apps/events/package.json +++ b/apps/events/package.json @@ -1,6 +1,6 @@ { "name": "hope-events", - "version": "1.51.8", + "version": "1.51.9", "main": "index.js", "scripts": { "dev:backend": "cd backend && npm run dev",