Please fill in your form
+Hi ${attendee.name},
+${payer} registered you for ${eventTitle}. Please fill in your attendee form.
+ ${ctaButton('Fill in my form', link)} + ${fallbackLink(link)} + `, { preheader: `Your attendee form for ${eventTitle}` }); + try { + await sendMail({ to: attendee.email, subject: `Your attendee form for ${eventTitle}`, html, text: `Hi ${attendee.name},\n\n${payer} registered you for ${eventTitle}. Please fill in your attendee form:\n${link}\n\n${org.name}` }); + sent.push('email'); + } catch (e) { + console.warn('[attendee form link] email failed:', e?.message || e); + } + } + if (attendee.phone) { + const { waTextAny } = require('./notify'); + const { isValidZAPhone } = require('./whatsapp'); + if (isValidZAPhone(attendee.phone)) { + await waTextAny({ name: attendee.name, phoneNumber: attendee.phone }, `Hi ${attendee.name}, ${payer} registered you for *${eventTitle}*. Please fill in your attendee form: ${link}`); + sent.push('WhatsApp'); + } + } + return sent; +} + module.exports = { + sendAttendeeFormLinkMessage, sendRegistrationEmails, sendRegistrationUpdatedEmails, sendPaymentEmails, diff --git a/backend/src/utils/ticketUtils.js b/backend/src/utils/ticketUtils.js index 0d22cd5..512e25e 100644 --- a/backend/src/utils/ticketUtils.js +++ b/backend/src/utils/ticketUtils.js @@ -1,11 +1,14 @@ const prisma = require('../config/db'); const { v4: uuidv4 } = require('uuid'); +const { planLineTickets } = require('./attendees'); /** * Generate tickets for a registration when payment status is "paid". * * Rules: - * - Exactly ONE ticket per registrationOption (keyed by eventOptionId). + * - Each named attendee (group tickets) gets their own quantity-1 ticket; the rest of a + * line's places share ONE quantity ticket per registrationOption (see + * utils/attendees.js planLineTickets). * - If duplicate registrationOptions exist for the same eventOptionId (old data), * consolidate them: merge quantities, keep the one with scan history, delete the rest. * - If duplicate ticket records exist for the same registrationOption (old data), @@ -90,55 +93,40 @@ const generateTicketsForRegistration = async (registrationId) => { }); })); - // ── Step 2: For each unique option, ensure exactly one ticket with correct qty ── + // ── Step 2: For each unique option, sync its tickets: one per named attendee, plus + // one shared quantity ticket for any unnamed places ── // Re-read fresh list (some options may have been deleted above) const freshOptions = await prisma.registrationOption.findMany({ where: { registrationId }, include: { - tickets: { include: { usages: true }, orderBy: { createdAt: 'asc' } } + tickets: { include: { usages: true }, orderBy: { createdAt: 'asc' } }, + attendees: { orderBy: { order: 'asc' } }, } }); // Each option owns disjoint tickets, so resolve them concurrently instead of one at a time. const perOptionResults = await Promise.all(freshOptions.map(async (option) => { - const targetQty = option.quantity || 1; - const existingTickets = option.tickets || []; - - if (existingTickets.length === 0) { - // Create one ticket - return prisma.ticket.create({ - data: { - id: uuidv4(), - qrCode: uuidv4(), - registrationOptionId: option.id, - userId: registration.userId, - eventId: registration.eventId, - quantity: targetQty, - updatedAt: new Date() - } - }); - } - - // Pick primary: prefer scanned, otherwise oldest - const withUsages = existingTickets.filter(t => (t.usages || []).length > 0); - const primary = withUsages.length > 0 ? withUsages[0] : existingTickets[0]; - - const updates = []; - // Update quantity on primary if needed - if (primary.quantity !== targetQty) { - updates.push(prisma.ticket.update({ where: { id: primary.id }, data: { quantity: targetQty, updatedAt: new Date() } })); - } - - // Delete unscanned duplicates - const dups = existingTickets.filter(t => t.id !== primary.id && (t.usages || []).length === 0); - if (dups.length > 0) { - updates.push(prisma.ticket.deleteMany({ where: { id: { in: dups.map(t => t.id) } } })); - } - if (updates.length > 0) await Promise.all(updates); - return null; + const plan = planLineTickets({ quantity: option.quantity || 1 }, option.attendees || [], option.tickets || []); + await Promise.all([ + plan.remove.length ? prisma.ticket.deleteMany({ where: { id: { in: plan.remove } } }) : null, + ...plan.update.map(u => prisma.ticket.update({ where: { id: u.id }, data: { ...u.data, updatedAt: new Date() } })), + ]); + return Promise.all(plan.create.map(c => prisma.ticket.create({ + data: { + id: uuidv4(), + qrCode: uuidv4(), + registrationOptionId: option.id, + userId: registration.userId, + eventId: registration.eventId, + quantity: c.quantity, + attendeeId: c.attendeeId, + holderUserId: c.holderUserId, + updatedAt: new Date() + } + }))); })); - return perOptionResults.filter(Boolean); + return perOptionResults.flat(); } catch (error) { console.error('Error generating tickets:', error); throw error; diff --git a/backend/tests/attendees.test.js b/backend/tests/attendees.test.js new file mode 100644 index 0000000..181afe3 --- /dev/null +++ b/backend/tests/attendees.test.js @@ -0,0 +1,104 @@ +const { validateAttendees, planLineTickets, lineKey } = require('../src/utils/attendees'); + +const EVENT = { + allowNamedAttendees: true, + eventOptions: [ + { id: 'kid', name: 'Camper', isMainTicket: true }, + { id: 'shirt', name: 'T-shirt', isMainTicket: false }, + ], +}; +const places = (n) => ({ [lineKey('kid', null)]: n }); + +describe('validateAttendees', () => { + test('cleans up names and contact details', () => { + const out = validateAttendees(EVENT, places(2), [ + { eventOptionId: 'kid', name: ' Sam ', email: ' ', phone: '0821234567' }, + { eventOptionId: 'kid', name: 'Alex', email: 'alex@example.com' }, + ]); + expect(out).toEqual([ + { eventOptionId: 'kid', variantId: null, name: 'Sam', email: null, phone: '0821234567' }, + { eventOptionId: 'kid', variantId: null, name: 'Alex', email: 'alex@example.com', phone: null }, + ]); + }); + + test('nothing to check when no attendees are given', () => { + expect(validateAttendees({ ...EVENT, allowNamedAttendees: false }, places(1), [])).toEqual([]); + }); + + test('refuses names on events that do not take them', () => { + expect(() => validateAttendees({ ...EVENT, allowNamedAttendees: false }, places(1), [{ eventOptionId: 'kid', name: 'Sam' }])).toThrow(/doesn't take attendee names/); + }); + + test('only main tickets can be named', () => { + expect(() => validateAttendees(EVENT, { [lineKey('shirt', null)]: 1 }, [{ eventOptionId: 'shirt', name: 'Sam' }])).toThrow(/main tickets/); + }); + + test('needs a name and a valid email', () => { + expect(() => validateAttendees(EVENT, places(1), [{ eventOptionId: 'kid', name: ' ' }])).toThrow(/enter a name/); + expect(() => validateAttendees(EVENT, places(1), [{ eventOptionId: 'kid', name: 'Sam', email: 'nope' }])).toThrow(/valid email/); + }); + + test('no more names than places, counting names already given', () => { + expect(() => validateAttendees(EVENT, places(1), [{ eventOptionId: 'kid', name: 'A' }, { eventOptionId: 'kid', name: 'B' }])).toThrow(/More names/); + expect(() => validateAttendees(EVENT, places(3), [{ eventOptionId: 'kid', name: 'C' }], places(2))).not.toThrow(); + expect(() => validateAttendees(EVENT, places(2), [{ eventOptionId: 'kid', name: 'C' }], places(2))).toThrow(/More names/); + }); +}); + +describe('planLineTickets', () => { + const scan = (q = 1) => [{ quantityRedeemed: q }]; + + test('no attendees: one shared ticket for the whole quantity', () => { + expect(planLineTickets({ quantity: 3 }, [], [])).toEqual({ create: [{ attendeeId: null, holderUserId: null, quantity: 3 }], update: [], remove: [] }); + }); + + test('every attendee gets their own ticket; unnamed places share one', () => { + const plan = planLineTickets({ quantity: 3 }, [{ id: 'a1', userId: 'u9' }, { id: 'a2', userId: null }], []); + expect(plan.create).toEqual([ + { attendeeId: 'a1', holderUserId: 'u9', quantity: 1 }, + { attendeeId: 'a2', holderUserId: null, quantity: 1 }, + { attendeeId: null, holderUserId: null, quantity: 1 }, + ]); + }); + + test('naming every place replaces the shared ticket', () => { + const plan = planLineTickets({ quantity: 2 }, [{ id: 'a1' }, { id: 'a2' }], [{ id: 't0', attendeeId: null, quantity: 2, usages: [] }]); + expect(plan.remove).toEqual(['t0']); + expect(plan.create).toHaveLength(2); + }); + + test('a scanned shared ticket is kept and never shrunk below what was used', () => { + const plan = planLineTickets({ quantity: 2 }, [{ id: 'a1' }, { id: 'a2' }], [{ id: 't0', attendeeId: null, quantity: 2, usages: scan(1) }]); + expect(plan.remove).toEqual([]); + expect(plan.update).toEqual([{ id: 't0', data: { quantity: 1 } }]); + }); + + test('removing an attendee removes their unscanned ticket', () => { + const plan = planLineTickets({ quantity: 1 }, [{ id: 'a1' }], [ + { id: 't1', attendeeId: 'a1', quantity: 1, usages: [] }, + { id: 't2', attendeeId: 'gone', quantity: 1, usages: [] }, + ]); + expect(plan).toEqual({ create: [], update: [], remove: ['t2'] }); + }); + + test("keeps a scanned ticket whose attendee was removed, and counts it as a used place", () => { + const plan = planLineTickets({ quantity: 2 }, [{ id: 'a1' }], [ + { id: 't1', attendeeId: 'a1', quantity: 1, usages: [] }, + { id: 't2', attendeeId: 'gone', quantity: 1, usages: scan() }, + ]); + expect(plan).toEqual({ create: [], update: [], remove: [] }); + }); + + test('follows the attendee to a newly linked account', () => { + const plan = planLineTickets({ quantity: 1 }, [{ id: 'a1', userId: 'u2' }], [{ id: 't1', attendeeId: 'a1', quantity: 1, holderUserId: null, usages: [] }]); + expect(plan.update).toEqual([{ id: 't1', data: { holderUserId: 'u2', quantity: 1 } }]); + }); + + test('existing single shared ticket is resized, duplicates dropped', () => { + const plan = planLineTickets({ quantity: 4 }, [], [ + { id: 't1', attendeeId: null, quantity: 2, usages: [] }, + { id: 't2', attendeeId: null, quantity: 2, usages: [] }, + ]); + expect(plan).toEqual({ create: [], update: [{ id: 't1', data: { quantity: 4 } }], remove: ['t2'] }); + }); +}); diff --git a/frontend/package-lock.json b/frontend/package-lock.json index d32f4b9..3d6eb36 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "hope-events-frontend", - "version": "1.13.0", + "version": "1.14.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "hope-events-frontend", - "version": "1.13.0", + "version": "1.14.0", "dependencies": { "@hookform/resolvers": "^5.2.1", "@radix-ui/react-accordion": "^1.2.11", diff --git a/frontend/package.json b/frontend/package.json index 3780e35..3a09d70 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "hope-events-frontend", - "version": "1.13.0", + "version": "1.14.0", "private": true, "scripts": { "dev": "next dev --turbopack", diff --git a/frontend/src/app/dashboard/staff/event-tickets/page.tsx b/frontend/src/app/dashboard/staff/event-tickets/page.tsx index 9d4ab47..eb2d2a2 100644 --- a/frontend/src/app/dashboard/staff/event-tickets/page.tsx +++ b/frontend/src/app/dashboard/staff/event-tickets/page.tsx @@ -145,7 +145,7 @@ function EventTicketsContent() { const optVariant = t.registrationOption?.variant?.name; const type = optVariant ? `${optBase} — ${optVariant}` : optBase; const qty = t.quantity || 1; - const holder = t.user?.name || t.userId || ""; + const holder = t.attendee?.name ? `${t.attendee.name}${t.user?.name ? ` (booked by ${t.user.name})` : ""}` : (t.user?.name || t.userId || ""); const qrSrc = `https://api.qrserver.com/v1/create-qr-code/?size=140x140&data=${encodeURIComponent( t.qrCode || t.id )}`; diff --git a/frontend/src/app/dashboard/staff/ticket-scanning/page.tsx b/frontend/src/app/dashboard/staff/ticket-scanning/page.tsx index 6d3aa47..8fd390c 100644 --- a/frontend/src/app/dashboard/staff/ticket-scanning/page.tsx +++ b/frontend/src/app/dashboard/staff/ticket-scanning/page.tsx @@ -375,7 +375,10 @@ export default function TicketScanningPage() {