diff --git a/apps/events/CHANGELOG.md b/apps/events/CHANGELOG.md index 67ce149..dc0f8e4 100644 --- a/apps/events/CHANGELOG.md +++ b/apps/events/CHANGELOG.md @@ -7,6 +7,27 @@ and this project follows [Semantic Versioning](https://semver.org/). ## [Unreleased] +## [1.51.12] - 2026-10-29 + +### Added + +- **API v2 — tickets and attendance:** `/me/tickets` (+ `/email`), `/tickets` (the staff list, one + ticket, sending, issuing, scan stats and recent scans, the ticket for a QR code), transfers + (`/tickets/{id}/transfer`, `/ticket-transfers/{token}` to accept or decline), `/events/{id}/tickets`; + offline scanning (`/scan-locks`: take tickets offline, snapshot, sync, release, reports); the + attendance register (`/events/{id}/attendance`, its PDF/Excel export) and certificates (issue, + send, revoke, download, preview, verify, `/me/certificates`); allocations (`/events/{id}/allocations`, + `/allocation-sets`, `/allocation-groups`, `/me/allocation-groups`). +- Frontend: `apiV2Raw()` for screens whose helpers pass the path as a string; file downloads + read v2's error shape. +- `v1Route` can run a v1 router (with `map: () => ({ url })`); a chain that answers nothing is a + 404 instead of waiting. + +### Changed + +- Tickets, transfers, offline scanning, attendance, certificates, allocations and the kids room + set-up use v2. + ## [1.51.11] - 2026-10-29 ### Added diff --git a/apps/events/WHATS-NEW.md b/apps/events/WHATS-NEW.md index a27cd6f..e5f8166 100644 --- a/apps/events/WHATS-NEW.md +++ b/apps/events/WHATS-NEW.md @@ -12,6 +12,12 @@ 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.12 + +- **More groundwork for 2.0.** Tickets, ticket transfers, offline scanning, the attendance register, + certificates and group allocations now run on the new version of the server's connection to the + app. They work just as before. + ## 1.51.11 - **More groundwork for 2.0.** Payments, cash-ups, the waitlist, sponsorship, consent forms and diff --git a/apps/events/backend/package-lock.json b/apps/events/backend/package-lock.json index 6ae34a6..bd94810 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.11", + "version": "1.51.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "event-management-backend", - "version": "1.51.11", + "version": "1.51.12", "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 99b7822..00cc374 100644 --- a/apps/events/backend/package.json +++ b/apps/events/backend/package.json @@ -1,6 +1,6 @@ { "name": "event-management-backend", - "version": "1.51.11", + "version": "1.51.12", "description": "Event Management System Backend", "main": "src/index.js", "scripts": { diff --git a/apps/events/backend/src/v2/viaV1.ts b/apps/events/backend/src/v2/viaV1.ts index 3e3a611..99129cc 100644 --- a/apps/events/backend/src/v2/viaV1.ts +++ b/apps/events/backend/src/v2/viaV1.ts @@ -15,7 +15,8 @@ import type { Request, RequestHandler } from 'express'; import { defineRoute, fileResponse, type Access, type Ctx } from './route'; /* eslint-disable @typescript-eslint/no-explicit-any -- requests and v1 answers are passed through */ -type Parts = { params?: Record; query?: Record; body?: unknown }; +/** `url` (with its query string) is for v1 routers, which route by it. */ +type Parts = { params?: Record; query?: Record; body?: unknown; url?: string }; type V1Answer = { status: number; json?: unknown; body?: Buffer; headers: Record; redirect?: string }; /** A response that records what a v1 handler sends (JSON, `send`, a piped stream or a redirect). */ @@ -86,7 +87,7 @@ class RecordingResponse extends Writable { */ export async function runV1(handlers: RequestHandler | RequestHandler[], req: Request, parts: Parts = {}): Promise { const fake = Object.create(req) as Request; - for (const key of ['params', 'query', 'body'] as const) { + for (const key of ['params', 'query', 'body', 'url'] as const) { if (parts[key] !== undefined) Object.defineProperty(fake, key, { value: parts[key], writable: true, configurable: true, enumerable: true }); } const res = new RecordingResponse(); @@ -97,7 +98,8 @@ export async function runV1(handlers: RequestHandler | RequestHandler[], req: Re advanced = true; if (err) return reject(err); if (i + 1 < chain.length) step(i + 1).then(resolve, reject); - else resolve(); + // Nothing answered (e.g. a v1 router with no matching route). + else reject(Object.assign(new Error('There is no such API endpoint.'), { statusCode: 404 })); }; Promise.resolve(chain[i](fake, res as any, next)).then(() => { if (!advanced) resolve(); }, reject); }); diff --git a/apps/events/backend/tests/viaV1.test.ts b/apps/events/backend/tests/viaV1.test.ts index 151dc8e..506ab9d 100644 --- a/apps/events/backend/tests/viaV1.test.ts +++ b/apps/events/backend/tests/viaV1.test.ts @@ -72,4 +72,17 @@ describe('v2 routes answered by v1 handlers', () => { expect(res.headers['content-disposition']).toContain('ticket.pdf'); expect((res.body as Buffer).toString()).toBe('%PDF-1.4 end'); }); + + test("a v1 router is given the v1 URL; one with no matching route is a 404", async () => { + const router = express.Router(); + router.get('/today', (req, res) => { res.json({ q: req.query.x }); }); + const app = appWith( + v1Route({ method: 'get', path: '/dash', tag: 'T', summary: 's', access: 'public', v1: router, map: ctx => ({ url: '/today?x=' + String(ctx.req.query.x) }) }), + v1Route({ method: 'get', path: '/nothing', tag: 'T', summary: 's', access: 'public', v1: router, map: () => ({ url: '/missing' }) }), + ); + expect((await request(app).get('/api/v2/dash?x=7')).body).toEqual({ data: { q: '7' } }); + const res = await request(app).get('/api/v2/nothing'); + expect(res.status).toBe(404); + expect(res.body.error.code).toBe('NOT_FOUND'); + }); }); diff --git a/apps/events/docs/HANDOVER.md b/apps/events/docs/HANDOVER.md index 76d3f6f..4752b1f 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.11** (and Hub 1.5.0). The plan itself is in +Last updated: 2026-10-29, after **1.51.12** (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.12 | **Tickets and attendance on v2** — `resources/attendance.ts`; frontend `apiV2Raw()` for string-path helpers | | 1.51.11 | **Money on v2** — `src/v2/viaV1.ts` (`v1Route`: a v2 route answered by the v1 handler); `resources/money.ts`; `/docs/v2` collapsed with a filter | | 1.51.10 | **Managing registrations on v2** — `src/services/registrationAdmin.ts` (the rest of `registrationController.js`); frontend `fetchAllRegistrations()`; money split out to 1.51.11 | | 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()` | @@ -71,7 +72,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.12 – 1.51.16: every endpoint onto v2**, one area per release (roadmap build order, row +1. **1.51.13 – 1.51.16: 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.16 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. diff --git a/apps/events/docs/ROADMAP-v2.md b/apps/events/docs/ROADMAP-v2.md index 52f32e0..c6b5844 100644 --- a/apps/events/docs/ROADMAP-v2.md +++ b/apps/events/docs/ROADMAP-v2.md @@ -42,8 +42,8 @@ pass** shipped. 1.50.1 **pagination and search on long lists** and 1.50.2 **even 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** and 1.51.9 -**series, passes, deals and campuses on v2** 1.51.10 **managing registrations on v2** and 1.51.11 **money on v2** shipped. -**Next: 1.51.12 – 1.51.16 (every endpoint onto v2), then 2.0.0.** +**series, passes, deals and campuses on v2** 1.51.10 **managing registrations on v2**, 1.51.11 **money on v2** and 1.51.12 **tickets and +attendance on v2** shipped. **Next: 1.51.13 – 1.51.16 (every endpoint onto v2), then 2.0.0.** **Repositories:** @@ -1012,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.11 ✅, 1.51.12 – 1.51.16 | **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 managing registrations (the staff lists, status, at the door, bulk actions, items, coupons, attendees, attendee forms); 1.51.11 money, staff side (payments, cashup, provider transactions, waitlist, sponsorship, consent, form builder, feedback); 1.51.12 tickets and attendance, staff side (tickets, scan locks, attendance, allocations); 1.51.13 kids check-in and volunteer rosters; 1.51.14 people and messaging (users, WhatsApp, broadcasts, scheduled emails, automations, banner, saved filters, dashboard, stats, analytics, reports); 1.51.15 privacy and admin (privacy, admin, settings, setup, Hub, outbound webhooks, backups); 1.51.16 **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 puts its area's endpoints on v2 (1.51.1 – 1.51.10 by moving the logic into TS services; from 1.51.11 by `v1Route`, which runs the v1 handler behind a v2 route — moving those handlers into TS services is a 2.x clean-up that doesn't change the API), its screens onto `apiV2`, and its v1 routes into `SUCCESSORS` | 2.0 can then remove v1 | +| 11b | 1.51.4 ✅ – 1.51.12 ✅, 1.51.13 – 1.51.16 | **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 managing registrations (the staff lists, status, at the door, bulk actions, items, coupons, attendees, attendee forms); 1.51.11 money, staff side (payments, cashup, provider transactions, waitlist, sponsorship, consent, form builder, feedback); 1.51.12 tickets and attendance, staff side (tickets, scan locks, attendance, allocations); 1.51.13 kids check-in and volunteer rosters; 1.51.14 people and messaging (users, WhatsApp, broadcasts, scheduled emails, automations, banner, saved filters, dashboard, stats, analytics, reports); 1.51.15 privacy and admin (privacy, admin, settings, setup, Hub, outbound webhooks, backups); 1.51.16 **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 puts its area's endpoints on v2 (1.51.1 – 1.51.10 by moving the logic into TS services; from 1.51.11 by `v1Route`, which runs the v1 handler behind a v2 route — moving those handlers into TS services is a 2.x clean-up that doesn't change the API), 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/frontend/package-lock.json b/apps/events/frontend/package-lock.json index 47736a9..d4e6070 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.11", + "version": "1.51.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "hope-events-frontend", - "version": "1.51.11", + "version": "1.51.12", "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 05baf8d..53898f5 100644 --- a/apps/events/frontend/package.json +++ b/apps/events/frontend/package.json @@ -1,6 +1,6 @@ { "name": "hope-events-frontend", - "version": "1.51.11", + "version": "1.51.12", "private": true, "scripts": { "dev": "next dev", diff --git a/apps/events/package-lock.json b/apps/events/package-lock.json index 2c1fa76..63f1265 100644 --- a/apps/events/package-lock.json +++ b/apps/events/package-lock.json @@ -1,12 +1,12 @@ { "name": "hope-events", - "version": "1.51.11", + "version": "1.51.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "hope-events", - "version": "1.51.11", + "version": "1.51.12", "license": "ISC", "devDependencies": { "@axe-core/playwright": "^4.14.0", diff --git a/apps/events/package.json b/apps/events/package.json index 5413568..4983c15 100644 --- a/apps/events/package.json +++ b/apps/events/package.json @@ -1,6 +1,6 @@ { "name": "hope-events", - "version": "1.51.11", + "version": "1.51.12", "main": "index.js", "scripts": { "dev:backend": "cd backend && npm run dev",