refactor(events): gate member benefits on hasMemberAccess

Extracts hasMemberAccess(member) in tickets.js and uses it across event
registration, ticket purchase, and series purchase flows so guest, suspended,
and cancelled records no longer count as members while pending_payment still
does.
This commit is contained in:
Jennie Robinson Faber 2026-04-18 17:06:17 +01:00
parent c5e901ed24
commit 15329e3e84
7 changed files with 188 additions and 30 deletions

View file

@ -4,6 +4,7 @@ import { connectDB } from "../../../utils/mongoose.js";
import { sendEventRegistrationEmail } from "../../../utils/resend.js";
import { validateBody } from "../../../utils/validateBody.js";
import { eventRegistrationSchema } from "../../../utils/schemas.js";
import { hasMemberAccess } from "../../../utils/tickets.js";
import mongoose from "mongoose";
export default defineEventHandler(async (event) => {
@ -63,10 +64,13 @@ export default defineEventHandler(async (event) => {
});
}
// Check member status and handle different registration scenarios
// Check member status and handle different registration scenarios.
// Member access is decoupled from payment status: active and pending_payment
// both confer access; guest, suspended, and cancelled do not.
const member = await Member.findOne({ email: body.email.toLowerCase() });
const memberHasAccess = hasMemberAccess(member);
if (eventData.membersOnly && !member) {
if (eventData.membersOnly && !memberHasAccess) {
throw createError({
statusCode: 403,
statusMessage:
@ -78,7 +82,7 @@ export default defineEventHandler(async (event) => {
if (
eventData.pricing?.paymentRequired &&
!eventData.pricing?.isFree &&
!member
!memberHasAccess
) {
throw createError({
statusCode: 402, // Payment Required
@ -91,7 +95,7 @@ export default defineEventHandler(async (event) => {
let isMember = false;
let membershipLevel = "non-member";
if (member) {
if (memberHasAccess) {
isMember = true;
membershipLevel = `${member.circle}-${member.contributionTier}`;
}

View file

@ -5,6 +5,7 @@ import {
validateTicketPurchase,
calculateTicketPrice,
completeTicketPurchase,
hasMemberAccess,
} from "../../../../utils/tickets.js";
import { sendEventRegistrationEmail } from "../../../../utils/resend.js";
import mongoose from "mongoose";
@ -43,16 +44,17 @@ export default defineEventHandler(async (event) => {
});
}
// Check if user is a member. Guests don't count as members for pricing/validation.
// Check if user is a member. Only members with access (active or
// pending_payment) count for pricing/validation; guest, suspended,
// and cancelled members are treated as non-members.
let member = await Member.findOne({ email: body.email.toLowerCase() });
let accountCreated = false;
const isRealMember = (m) => !!m && m.status !== "guest";
// Validate ticket purchase
const validation = validateTicketPurchase(eventData, {
email: body.email,
name: body.name,
member: isRealMember(member) ? member : null,
member: hasMemberAccess(member) ? member : null,
});
if (!validation.valid) {
@ -109,15 +111,15 @@ export default defineEventHandler(async (event) => {
}
// Create registration
const realMember = isRealMember(member);
const memberHasAccess = hasMemberAccess(member);
const registration = {
memberId: member ? member._id : null,
name: body.name,
email: body.email.toLowerCase(),
membershipLevel: realMember
membershipLevel: memberHasAccess
? `${member.circle}-${member.contributionTier}`
: "non-member",
isMember: realMember,
isMember: memberHasAccess,
ticketType: ticketInfo.ticketType,
ticketPrice: ticketInfo.price,
paymentStatus: requiresPayment ? "completed" : "not_required",

View file

@ -8,6 +8,7 @@ import {
releaseSeriesTicket,
completeSeriesTicketPurchase,
registerForAllSeriesEvents,
hasMemberAccess,
} from "../../../../utils/tickets.js";
import { sendSeriesPassConfirmation } from "../../../../utils/resend.js";
@ -33,7 +34,9 @@ export default defineEventHandler(async (event) => {
});
}
// Check membership — prefer JWT auth for accurate member pricing
// Check membership — prefer JWT auth for accurate member pricing.
// Only members with access (active or pending_payment) get member-tier
// pricing; guest, suspended, and cancelled are treated as non-members.
let member = null;
try {
member = await requireAuth(event);
@ -46,12 +49,13 @@ export default defineEventHandler(async (event) => {
// Resolve canonical email: use authenticated member's email if available
const canonicalEmail = member ? member.email : email.toLowerCase();
const accessMember = hasMemberAccess(member) ? member : null;
// Validate purchase
const validation = validateSeriesTicketPurchase(series, {
email: canonicalEmail,
name,
member,
member: accessMember,
});
if (!validation.valid) {
@ -84,8 +88,8 @@ export default defineEventHandler(async (event) => {
memberId: member?._id,
name,
email: canonicalEmail,
membershipLevel: member?.circle || "non-member",
isMember: !!member,
membershipLevel: accessMember?.circle || "non-member",
isMember: !!accessMember,
ticketType: ticketInfo.ticketType,
ticketPrice: ticketInfo.price,
paymentStatus: ticketInfo.isFree ? "not_required" : "completed",