@bash-app/bash-common 30.274.0 → 30.276.0

package/src/utils/__tests__/guestSurface.test.ts

@@ -2,12 +2,33 @@ import {
   capRosterDepthForEventMode,
   filterHiddenVisibilityUserIds,
   orderPreviewAttendeeIds,
+  resolveAttendeeListAccess,
   resolveEffectiveEventMode,
   resolveGuestSurfacePolicy,
   viewerMayFetchFullRoster,
   maxGuestListDepth,
 } from "../guestSurface.js";
 
+describe("resolveAttendeeListAccess", () => {
+  it("prefers attendeeListAccess enum", () => {
+    expect(
+      resolveAttendeeListAccess({
+        attendeeListAccess: "TicketHolders",
+        attendeeListPublic: true,
+      })
+    ).toBe("TicketHolders");
+  });
+
+  it("falls back to legacy attendeeListPublic boolean", () => {
+    expect(resolveAttendeeListAccess({ attendeeListPublic: true })).toBe(
+      "Public"
+    );
+    expect(resolveAttendeeListAccess({ attendeeListPublic: false })).toBe(
+      "Preview"
+    );
+  });
+});
+
 describe("resolveEffectiveEventMode", () => {
   it("maps legacy showAttendees false to Hidden", () => {
     expect(resolveEffectiveEventMode({ showAttendees: false })).toBe("Hidden");

package/src/utils/__tests__/paymentUtils.test.ts

@@ -289,6 +289,25 @@ describe("PaymentUtils - Core Functions", () => {
     test("calculateTotalPriceWithoutTax returns 0 for empty list", () => {
       expect(calculateTotalPriceWithoutTax([], new Map())).toBe(0);
     });
+
+    test("calculateTotalPriceWithoutTax uses unitPriceCents for pay-what-you-can tiers", () => {
+      const tiers = [
+        { id: "t1", price: 2000, pricingType: "USD", isDonationTier: true },
+      ] as any;
+      const ticketList = new Map([
+        [
+          "t1",
+          [
+            {
+              numberOfTickets: 2,
+              ticketDateTime: new Date(),
+              unitPriceCents: 5000,
+            },
+          ],
+        ],
+      ]);
+      expect(calculateTotalPriceWithoutTax(tiers, ticketList)).toBe(10000);
+    });
   });
 
   describe("Ticket total BashPoints", () => {

package/src/utils/__tests__/ticketListUtils.test.ts

@@ -29,6 +29,18 @@ describe("ticketListUtils", () => {
     expect(decoded.get("tier-xyz")![0].numberOfTickets).toBe(3);
   });
 
+  test("round-trips unitPriceCents for pay-what-you-can tiers", () => {
+    const ticketList = new Map<string, NumberOfTicketsForDate[]>([
+      [
+        "tier-pwyc",
+        [{ numberOfTickets: 1, ticketDateTime: isoDate, unitPriceCents: 7500 }],
+      ],
+    ]);
+
+    const decoded = ticketListStrToTicketList(ticketListToString(ticketList));
+    expect(decoded.get("tier-pwyc")![0].unitPriceCents).toBe(7500);
+  });
+
   test("omits tiers with zero tickets", () => {
     const ticketList = new Map<string, NumberOfTicketsForDate[]>([
       ["tier-empty", [{ numberOfTickets: 0, ticketDateTime: isoDate }]],

package/src/utils/groupTicketCartUtils.ts

@@ -0,0 +1,36 @@
+import type { TicketTier } from "@prisma/client";
+
+import type { NumberOfTicketsForDate } from "../definitions.js";
+import { isGroupTicketTier } from "../groupTicketUtils.js";
+
+/**
+ * Validates cart quantities for group package tiers: qty = packages, not seats.
+ */
+export function validateGroupTicketCartForTiers(
+  ticketTiers: TicketTier[],
+  ticketList: Map<string, NumberOfTicketsForDate[]>
+): { ok: true } | { ok: false; message: string } {
+  for (const tier of ticketTiers) {
+    if (!isGroupTicketTier(tier)) {
+      continue;
+    }
+    const rows = ticketList.get(tier.id);
+    if (!rows?.length) {
+      continue;
+    }
+    const packageQty = rows.reduce((s, r) => s + (r.numberOfTickets ?? 0), 0);
+    if (packageQty < 1) {
+      return {
+        ok: false,
+        message: `${tier.title} is a group package — select one package to buy.`,
+      };
+    }
+    if (packageQty > 1) {
+      return {
+        ok: false,
+        message: `${tier.title} is one package per checkout. Buy one table/package at a time.`,
+      };
+    }
+  }
+  return { ok: true };
+}

package/src/utils/guestSurface.ts

@@ -19,6 +19,9 @@ export type AttendeeVisibility =
 
 export type GuestListDepth = "None" | "Partial" | "Full";
 
+/** Who may see the full attendee roster on the bash detail page (Layer 1). */
+export type AttendeeListAccess = "Preview" | "Public" | "TicketHolders";
+
 export type { PublicTeaserUser };
 
 export type NetworkOverlapPayload = {
@@ -60,6 +63,8 @@ export type GuestSurfacePayload = {
   attendeeVisibilityByUserId?: Record<string, AttendeeVisibility>;
   /** Event has public guest list enabled on bash detail */
   attendeeListPublic?: boolean;
+  /** Preview | Public | TicketHolders — supersedes attendeeListPublic when set */
+  attendeeListAccess?: string | null;
 };
 
 export type AttendeeRosterMeta = {
@@ -98,6 +103,18 @@ const DEPTH_RANK: Record<GuestListDepth, number> = {
   Full: 2,
 };
 
+/** Legacy boolean + new enum; prefer attendeeListAccess when present. */
+export function resolveAttendeeListAccess(event: {
+  attendeeListAccess?: string | null;
+  attendeeListPublic?: boolean | null;
+}): AttendeeListAccess {
+  const raw = event.attendeeListAccess;
+  if (raw === "Public" || raw === "TicketHolders" || raw === "Preview") {
+    return raw;
+  }
+  return event.attendeeListPublic ? "Public" : "Preview";
+}
+
 /** Legacy showAttendees=false → Hidden; otherwise honour attendeeDisplayMode string. */
 export function resolveEffectiveEventMode(
   event: EventModeInput

package/src/utils/paymentUtils.ts

@@ -44,6 +44,46 @@ export function calculateDiscountFromPromoCode(
   return 0;
 }
 
+/**
+ * Unit price in cents for checkout (supports pay-what-you-can tiers).
+ */
+export function effectiveTicketUnitPriceCents(
+  tier: TicketTier,
+  row: NumberOfTicketsForDate
+): number {
+  if (tier.isDonationTier === true && row.unitPriceCents != null) {
+    return Math.max(tier.price, row.unitPriceCents);
+  }
+  return tier.price;
+}
+
+export function validatePayWhatYouCanTicketList(
+  ticketTiers: TicketTier[],
+  ticketList: Map<string, NumberOfTicketsForDate[]>
+): { ok: true } | { ok: false; message: string } {
+  for (const tier of ticketTiers) {
+    if (tier.isDonationTier !== true) continue;
+    const rows = ticketList.get(tier.id);
+    if (!rows?.length) continue;
+    for (const row of rows) {
+      if ((row.numberOfTickets ?? 0) <= 0) continue;
+      if (row.unitPriceCents == null) {
+        return {
+          ok: false,
+          message: `Enter an amount for ${tier.title} (minimum $${convertCentsToDollars(tier.price).toFixed(2)}).`,
+        };
+      }
+      if (row.unitPriceCents < tier.price) {
+        return {
+          ok: false,
+          message: `${tier.title} requires at least $${convertCentsToDollars(tier.price).toFixed(2)} per ticket.`,
+        };
+      }
+    }
+  }
+  return { ok: true };
+}
+
 /**
  * Returns the total price in USD cents based on a map where the keys are the ticketTierIds
  * Only counts USD-priced tickets. BashPoints tickets are excluded (they have price=0).
@@ -60,7 +100,8 @@ export function calculateTotalPriceWithoutTax(
     if (tier.pricingType !== "BASHPOINTS") {
       const ticketListNumAndDate = ticketList.get(tier.id);
       ticketListNumAndDate?.forEach((numAndDate: NumberOfTicketsForDate) => {
-        total += tier.price * (numAndDate.numberOfTickets ?? 0);
+        const unitCents = effectiveTicketUnitPriceCents(tier, numAndDate);
+        total += unitCents * (numAndDate.numberOfTickets ?? 0);
       });
     }
   });

package/src/utils/ticketListUtils.ts

@@ -80,7 +80,12 @@ export function ticketListToString(
         }
 
         ticketArgs.push(
-          `${ticketNumAndDates.numberOfTickets}${URL_PARAMS_TICKETS_DATE_DELIM}${dateTimeStr}`
+          `${ticketNumAndDates.numberOfTickets}${URL_PARAMS_TICKETS_DATE_DELIM}${dateTimeStr}${
+            ticketNumAndDates.unitPriceCents != null &&
+            ticketNumAndDates.unitPriceCents > 0
+              ? `${URL_PARAMS_TICKETS_DATE_DELIM}${ticketNumAndDates.unitPriceCents}`
+              : ""
+          }`
         );
       }
     }
@@ -147,10 +152,11 @@ export function ticketListStrToTicketList(
       .filter((ticketNumAndDateStr): boolean => !!ticketNumAndDateStr);
 
     for (const ticketNumAndDateStr of ticketNumAndDates) {
-      // [numberOfTickets];;[date]
-      const [numberOfTickets, ticketDateTimeStr] = ticketNumAndDateStr.split(
-        URL_PARAMS_TICKETS_DATE_DELIM
-      );
+      // [numberOfTickets];;[date];;[unitPriceCents?]
+      const segments = ticketNumAndDateStr.split(URL_PARAMS_TICKETS_DATE_DELIM);
+      const numberOfTickets = segments[0];
+      const ticketDateTimeStr = segments[1];
+      const unitPriceCentsRaw = segments[2];
       const ticketDateTime = DateTime.fromISO(ticketDateTimeStr);
       let ticketDateTimeFormattedStr: string | undefined = undefined;
 
@@ -158,9 +164,17 @@ export function ticketListStrToTicketList(
         ticketDateTimeFormattedStr = ticketDateTime.toISO() ?? undefined;
       }
 
+      const unitPriceCents =
+        unitPriceCentsRaw != null && unitPriceCentsRaw !== ""
+          ? parseInt(unitPriceCentsRaw, 10)
+          : undefined;
+
       ticketNumAndDatesArr.push({
         numberOfTickets: parseInt(numberOfTickets),
         ticketDateTime: ticketDateTimeFormattedStr,
+        ...(unitPriceCents != null && !Number.isNaN(unitPriceCents)
+          ? { unitPriceCents }
+          : {}),
       });
     }
     ticketList.set(ticketTierId, ticketNumAndDatesArr);