@bash-app/bash-common 30.245.0 → 30.247.0

package/src/__tests__/bashSectionTitleForBashType.test.ts

@@ -0,0 +1,142 @@
+/**
+ * Section heading copy for the homepage rows and `/category/:bashType` pages.
+ *
+ * Two input shapes need to coexist:
+ *   1. `BashEventType` enum values (e.g. "ComedyShow", "Rave") — these have
+ *      a singular label in `BashEventTypeToString` and get pluralized via
+ *      explicit rules in `pluralizeBashEventSingularLabel`.
+ *   2. Free-text section keys persisted by scrapers as `bashEvent.eventType`
+ *      strings that don't exist in the enum — for example
+ *      `scrapeInsomniacToBash.mjs` defaults to `"Raves"` and
+ *      `wiseguysComedyScraper.mjs` writes `"Comedy"`. These are already
+ *      meaningful as headings and must be returned verbatim — never with
+ *      a `" bashes"` suffix tacked on.
+ */
+import { BashEventType } from "@prisma/client";
+
+import {
+  bashSectionTitleForBashType,
+  canonicalBashEventRowKey,
+} from "../definitions.js";
+
+describe("bashSectionTitleForBashType", () => {
+  describe("free-text scraper section keys (non-enum)", () => {
+    it("returns 'Raves' verbatim, not 'Raves bashes'", () => {
+      expect(bashSectionTitleForBashType("Raves")).toBe("Raves");
+    });
+
+    it("returns 'Comedy' verbatim, not 'Comedy bashes'", () => {
+      expect(bashSectionTitleForBashType("Comedy")).toBe("Comedy");
+    });
+
+    it("returns mass-noun headings as-is", () => {
+      expect(bashSectionTitleForBashType("EDM")).toBe("EDM");
+      expect(bashSectionTitleForBashType("Hip Hop")).toBe("Hip Hop");
+      expect(bashSectionTitleForBashType("Karaoke")).toBe("Karaoke");
+    });
+  });
+
+  describe("synthetic homepage rows", () => {
+    it("'Featured' → 'Featured'", () => {
+      expect(bashSectionTitleForBashType("Featured")).toBe("Featured");
+    });
+
+    it("'Trending' → 'Trending'", () => {
+      expect(bashSectionTitleForBashType("Trending")).toBe("Trending");
+    });
+  });
+
+  describe("BashEventType enum values get pluralized", () => {
+    it("'Rave' enum → 'Raves'", () => {
+      expect(bashSectionTitleForBashType(BashEventType.Rave)).toBe("Raves");
+    });
+
+    it("'ComedyShow' enum → 'Comedy Shows'", () => {
+      expect(bashSectionTitleForBashType(BashEventType.ComedyShow)).toBe(
+        "Comedy Shows"
+      );
+    });
+
+    it("'Birthday' enum → 'Birthday Parties' (manual override)", () => {
+      expect(bashSectionTitleForBashType(BashEventType.Birthday)).toBe(
+        "Birthday Parties"
+      );
+    });
+
+    it("'WeddingReception' enum → 'Wedding Receptions' (suffix rule)", () => {
+      expect(bashSectionTitleForBashType(BashEventType.WeddingReception)).toBe(
+        "Wedding Receptions"
+      );
+    });
+
+    it("'HouseParty' enum → 'House Parties' (Party suffix rule)", () => {
+      expect(bashSectionTitleForBashType(BashEventType.HouseParty)).toBe(
+        "House Parties"
+      );
+    });
+  });
+
+  describe("homepage tier-section row keys (`LazyTierSection`, bashType=`title`)", () => {
+    it("titles ending with ' Events' are returned verbatim (no duplicate ' bashes')", () => {
+      expect(bashSectionTitleForBashType("Pro Events")).toBe("Pro Events");
+      expect(bashSectionTitleForBashType("Elite Events")).toBe("Elite Events");
+      expect(bashSectionTitleForBashType("Legend Events")).toBe("Legend Events");
+    });
+  });
+
+  describe("Insomniac-style scraper fallback keys matching enum literals", () => {
+    it("'Festival' → 'Festivals'", () => {
+      expect(bashSectionTitleForBashType("Festival")).toBe("Festivals");
+    });
+    it("'Concert' → 'Concerts'", () => {
+      expect(bashSectionTitleForBashType("Concert")).toBe("Concerts");
+    });
+    it("'Party' enum → 'Parties'", () => {
+      expect(bashSectionTitleForBashType("Party")).toBe("Parties");
+    });
+  });
+
+  describe("keys that diverge from Prisma enum literals (case or display labels)", () => {
+    it("lower-case prisma value 'party' → 'Parties'", () => {
+      expect(bashSectionTitleForBashType("party")).toBe("Parties");
+    });
+
+    it("lower-case 'fundraiser' → 'Fundraisers'", () => {
+      expect(bashSectionTitleForBashType("fundraiser")).toBe("Fundraisers");
+    });
+
+    it("singular display label row key 'House Party' → 'House Parties'", () => {
+      expect(bashSectionTitleForBashType("House Party")).toBe("House Parties");
+    });
+
+    it("trimmed stray whitespace still pluralizes", () => {
+      expect(bashSectionTitleForBashType("  Fundraiser  ")).toBe("Fundraisers");
+    });
+  });
+
+  describe("already-plural enum headings", () => {
+    it("normalizes casing when the row key matches a pluralized enum title", () => {
+      expect(bashSectionTitleForBashType("House Parties")).toBe(
+        "House Parties"
+      );
+      expect(bashSectionTitleForBashType("house parties")).toBe("House Parties");
+      expect(bashSectionTitleForBashType("Comedy Shows")).toBe("Comedy Shows");
+    });
+  });
+});
+
+describe("canonicalBashEventRowKey", () => {
+  it("maps singular labels and enum literals to the Prisma enum string", () => {
+    expect(canonicalBashEventRowKey("House Party")).toBe(
+      BashEventType.HouseParty
+    );
+    expect(canonicalBashEventRowKey(BashEventType.HouseParty)).toBe(
+      BashEventType.HouseParty
+    );
+    expect(canonicalBashEventRowKey("houseparty")).toBe(BashEventType.HouseParty);
+  });
+
+  it("returns trimmed free-text when no enum matches", () => {
+    expect(canonicalBashEventRowKey("Graduation")).toBe("Graduation");
+  });
+});

package/src/definitions.ts

@@ -1,5 +1,4 @@
 import {
-    AgePolicy,
     BashEventType,
     BracketType,
     CompetitionType,
@@ -18,6 +17,7 @@ import {
     User,
 } from "@prisma/client";
 import type {
+    AgePolicy as AgePolicyEnum,
     BashPassTier,
     BashEventDressTags,
     BashEventVibeTags,
@@ -28,6 +28,7 @@ import type {
 } from "@prisma/client";
 import {
   CheckoutExt,
+  PublicTeaserUser,
   PublicUser,
   ServiceBookingExt,
   type UserExt,
@@ -79,6 +80,15 @@ export const GovIdRetentionPolicy = {
 
 export type GovIdRetentionPolicy = GovIdRetentionPolicyEnum;
 
+/** Mirrors Prisma `AgePolicy` — `@prisma/client` browser bundle omits runtime enum exports. */
+export const AgePolicy = {
+  AllAges: "AllAges",
+  EighteenPlus: "EighteenPlus",
+  TwentyOnePlus: "TwentyOnePlus",
+} as const satisfies Record<AgePolicyEnum, AgePolicyEnum>;
+
+export type AgePolicy = AgePolicyEnum;
+
 export const PASSWORD_MIN_LENGTH = 8 as const;
 export const PASSWORD_REQUIREMENTS_REGEX = new RegExp(
   String.raw`^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&^#])[A-Za-z\d@$!%*?&^#]{${PASSWORD_MIN_LENGTH},}$`
@@ -708,7 +718,7 @@ export interface LoginSession {
 }
 
 export interface AttendeeOfBashEvent {
-  user: PublicUser;
+  user: PublicUser | PublicTeaserUser;
   tickets: Ticket[];
 }
 
@@ -1114,7 +1124,6 @@ export const YearsOfExperienceToString: { [key in YearsOfExperienceEnum]: string
 
 // Export Prisma enums for use in frontend
 export {
-    AgePolicy,
     BracketType,
     CompetitionType,
     EntertainmentServiceType,
@@ -1439,8 +1448,8 @@ export const INCOME_RANGE_VALUES: ReadonlyArray<IncomeRange> = [
 
 /** Homepage / discovery section labels for synthetic rows (not `BashEventType` enum values). */
 const SYNTHETIC_BASH_SECTION_TITLE: Record<string, string> = {
-  Featured: "Featured bashes",
-  Trending: "Trending bashes",
+  Featured: "Featured",
+  Trending: "Trending",
 };
 
 /**
@@ -1481,24 +1490,25 @@ const WHOLE_WORD_BASH_LABEL_PLURAL: ReadonlyMap<string, string> = new Map([
 ]);
 
 function pluralizeBashEventSingularLabel(label: string): string {
-  const manual = BASH_EVENT_SINGULAR_LABEL_TO_PLURAL_SECTION.get(label);
+  const t = label.trim();
+  const manual = BASH_EVENT_SINGULAR_LABEL_TO_PLURAL_SECTION.get(t);
   if (manual) return manual;
 
-  const wholeWord = WHOLE_WORD_BASH_LABEL_PLURAL.get(label);
+  const wholeWord = WHOLE_WORD_BASH_LABEL_PLURAL.get(t);
   if (wholeWord) return wholeWord;
 
-  if (label === "Party") return "Parties";
-  if (label.endsWith(" Party")) {
-    return `${label.slice(0, -" Party".length)} Parties`;
+  if (t === "Party") return "Parties";
+  if (t.endsWith(" Party")) {
+    return `${t.slice(0, -" Party".length)} Parties`;
   }
-  if (label.endsWith("-Party")) {
-    return `${label.slice(0, -"-Party".length)}-Parties`;
+  if (t.endsWith("-Party")) {
+    return `${t.slice(0, -"-Party".length)}-Parties`;
   }
-  if (label.endsWith(" Party)")) {
-    return `${label.replace(/ Party\)$/, " Parties)")}`;
+  if (t.endsWith(" Party)")) {
+    return `${t.replace(/ Party\)$/, " Parties)")}`;
   }
-  if (label.endsWith(" Rave")) {
-    return `${label.slice(0, -" Rave".length)} Raves`;
+  if (t.endsWith(" Rave")) {
+    return `${t.slice(0, -" Rave".length)} Raves`;
   }
 
   const replacements: ReadonlyArray<[suffix: string, plural: string]> = [
@@ -1535,37 +1545,97 @@ function pluralizeBashEventSingularLabel(label: string): string {
   ];
 
   for (const [suffix, plural] of replacements) {
-    if (label.endsWith(suffix)) {
-      return `${label.slice(0, -suffix.length)}${plural}`;
+    if (t.endsWith(suffix)) {
+      return `${t.slice(0, -suffix.length)}${plural}`;
     }
   }
 
-  return `${label} bashes`;
+  // No explicit rule matched. The label is almost certainly:
+  //   - already plural (e.g. "Raves" from `scrapeInsomniacToBash.mjs`)
+  //   - a mass noun used as a category heading (e.g. "Comedy" from
+  //     `wiseguysComedyScraper.mjs`, "EDM", "Hip Hop")
+  //   - a future enum value not yet covered above
+  // For all of these, returning the label verbatim is correct. Appending
+  // " bashes" produces "Raves bashes" / "Comedy bashes", which reads wrong.
+  return t;
 }
 
 const BASH_EVENT_TYPE_ENUM_VALUES: ReadonlySet<string> = new Set(
   Object.values(BashEventType) as string[]
 );
 
+function resolveCanonicalBashEventTypeKey(raw: string): string | undefined {
+  const t = raw.trim();
+  if (!t) return undefined;
+  if (BASH_EVENT_TYPE_ENUM_VALUES.has(t)) return t;
+  const lower = t.toLowerCase();
+  for (const v of BASH_EVENT_TYPE_ENUM_VALUES) {
+    if (v.toLowerCase() === lower) return v;
+  }
+  return undefined;
+}
+
+/**
+ * When the row key matches a `BashEventTypeToString` value (e.g. "House Party")
+ * but not the Prisma enum literal (`HouseParty`), still pluralize like the enum.
+ */
+function resolveBashEventEnumKeyFromSingularLabel(raw: string): string | undefined {
+  const t = raw.trim();
+  if (!t) return undefined;
+  const lower = t.toLowerCase();
+  for (const enumKey of BASH_EVENT_TYPE_ENUM_VALUES) {
+    const k = enumKey as BashEventType;
+    const label = BashEventTypeToString[k];
+    if (label === t || label.toLowerCase() === lower) return enumKey;
+  }
+  return undefined;
+}
+
+/**
+ * Stable row key for homepage/category grouping when `eventType` may be stored
+ * as a Prisma enum literal (e.g. `HouseParty`) or as the singular UI label
+ * (`House Party`).
+ */
+export function canonicalBashEventRowKey(raw: string): string {
+  const trimmed = raw.trim();
+  if (!trimmed) return trimmed;
+  const enumKey =
+    resolveCanonicalBashEventTypeKey(trimmed) ??
+    resolveBashEventEnumKeyFromSingularLabel(trimmed);
+  if (enumKey != null) return enumKey;
+  return trimmed;
+}
+
 /**
  * Heading shown on the home page row and the `/category/...` page for a bash
  * `eventType` / section key. Uses plural-friendly copy for Prisma
  * `BashEventType` values; keeps synthetic rows and membership tier rows clear.
  */
 export function bashSectionTitleForBashType(bashType: string): string {
-  const synthetic = SYNTHETIC_BASH_SECTION_TITLE[bashType];
+  const raw = bashType.trim();
+  const lower = raw.toLowerCase();
+
+  const synthetic = SYNTHETIC_BASH_SECTION_TITLE[raw];
   if (synthetic != null) return synthetic;
+  if (/\bEvents$/i.test(raw)) return raw;
 
-  if (/\bEvents$/i.test(bashType)) {
-    return bashType;
+  for (const enumKey of BASH_EVENT_TYPE_ENUM_VALUES) {
+    const singular = BashEventTypeToString[enumKey as BashEventType];
+    const pluralHeading = pluralizeBashEventSingularLabel(singular);
+    if (pluralHeading.toLowerCase() === lower) {
+      return pluralHeading;
+    }
   }
 
-  if (BASH_EVENT_TYPE_ENUM_VALUES.has(bashType)) {
-    const singular = BashEventTypeToString[bashType as BashEventType];
+  const enumKey =
+    resolveCanonicalBashEventTypeKey(raw) ??
+    resolveBashEventEnumKeyFromSingularLabel(raw);
+  if (enumKey != null) {
+    const singular = BashEventTypeToString[enumKey as BashEventType];
     return pluralizeBashEventSingularLabel(singular);
   }
 
-  const spaced = insertSpacesInCamelCase(bashType);
+  const spaced = insertSpacesInCamelCase(raw);
   return pluralizeBashEventSingularLabel(spaced);
 }
 

package/src/extendedSchemas.ts

@@ -199,6 +199,25 @@ export const FRONT_END_USER_DATA_TO_SELECT = {
   },
 } satisfies Prisma.UserSelect;
 
+/**
+ * Minimal `User` fields for public teaser surfaces (event detail avatars, checkout rows,
+ * non-privileged attendee rosters). Omits `email` and other account-level PII.
+ */
+export const PUBLIC_TEASER_USER_DATA_TO_SELECT = {
+  id: true,
+  username: true,
+  givenName: true,
+  familyName: true,
+  image: true,
+  imageUpdatedAt: true,
+  uploadedImage: true,
+  uploadedImageUpdatedAt: true,
+} satisfies Prisma.UserSelect;
+
+export type PublicTeaserUser = Prisma.UserGetPayload<{
+  select: typeof PUBLIC_TEASER_USER_DATA_TO_SELECT;
+}>;
+
 export const PRIVATE_USER_ACCOUNT_TO_SELECT = {
   ...FRONT_END_USER_DATA_TO_SELECT,
   /** Self session only — preferred payment rail (Stripe vs Square). */
@@ -1287,7 +1306,8 @@ export type TicketFlexible = Ticket & {
 };
 
 export interface CheckoutExt extends Checkout {
-  owner: PublicUser;
+  /** Full owner row for hosts/organizers; teaser row (no email) for other authenticated viewers. */
+  owner: PublicUser | PublicTeaserUser;
   tickets: Ticket[];
 }
 
@@ -1302,6 +1322,18 @@ export const CHECKOUT_DATA_TO_INCLUDE = {
   },
 } satisfies Prisma.CheckoutInclude;
 
+/** Checkout list for non-privileged viewers — buyer email omitted on `owner`. */
+export const CHECKOUT_DATA_TO_INCLUDE_TEASER_OWNER = {
+  owner: {
+    select: PUBLIC_TEASER_USER_DATA_TO_SELECT,
+  },
+  tickets: {
+    select: {
+      ownerId: true,
+    },
+  },
+} satisfies Prisma.CheckoutInclude;
+
 export interface ReviewExt extends Review {
   comments?: BashComment[];
 }

package/src/index.ts

@@ -87,6 +87,7 @@ export {
   EventServiceType,
   EventTemplateCategory,
   ExhibitorBookingStatus,
+  FeaturedReason,
   FinancingSubType,
   FlyerCampaignStatus,
   FlyerConversionType,
@@ -305,6 +306,7 @@ export * from "./utils/service/attendeeOptionUtils.js";
 export * from "./utils/service/billingCapUtils.js";
 export * from "./utils/service/eventPromoterUtils.js";
 export * from "./utils/service/regexUtils.js";
+export * from "./utils/service/serviceFeaturedSortUtils.js";
 export * from "./utils/service/serviceBookingExposureUtils.js";
 export * from "./utils/service/serviceUtils.js";
 export * from "./utils/service/venueSettlementUtils.js";

package/src/utils/index.ts

@@ -24,6 +24,7 @@ export * from './service/frontendServiceBookingUtils.js';
 export * from './service/regexUtils.js';
 export * from './service/serviceBookingStatusUtils.js';
 export * from './service/serviceBookingTypes.js';
+export * from './service/serviceFeaturedSortUtils.js';
 export * from './service/serviceRateTypes.js';
 export * from './service/serviceRateUtils.js';
 export * from './service/serviceUtils.js';

package/src/utils/service/serviceFeaturedSortUtils.ts

@@ -0,0 +1,76 @@
+import { FeaturedReason } from "@prisma/client";
+
+/**
+ * Subset of `Service` fields needed to decide featured-tier ordering.
+ * Both the API public list endpoint and the front-end browse filter sort
+ * with this comparator so server and client agree on order.
+ */
+export interface FeaturedServiceSortable {
+  isFeaturedService?: boolean | null;
+  featuredServiceUntil?: Date | string | null;
+  featuredAt?: Date | string | null;
+  featuredReason?: FeaturedReason | null;
+  createdAt?: Date | string | null;
+}
+
+/** Reasons that rank above auto-features in the public sort. */
+const PAID_TIER_REASONS: ReadonlySet<FeaturedReason> = new Set([
+  "Paid",
+  "Admin",
+  "Membership",
+]);
+
+function toMs(value: Date | string | null | undefined): number {
+  if (!value) return 0;
+  const d = value instanceof Date ? value : new Date(value);
+  const t = d.getTime();
+  return Number.isFinite(t) ? t : 0;
+}
+
+function isActiveFeatured(s: FeaturedServiceSortable, now: Date): boolean {
+  if (!s.isFeaturedService) return false;
+  if (!s.featuredServiceUntil) return true;
+  return new Date(s.featuredServiceUntil) >= now;
+}
+
+/**
+ * Tier 0 = paid / admin / membership feature, 1 = AutoNewService, 2 = unfeatured
+ * (or featured but with no reason recorded — these existed before the migration
+ * and are treated as "legacy featured" sitting just below auto-features).
+ */
+function featuredTier(s: FeaturedServiceSortable, now: Date): number {
+  if (!isActiveFeatured(s, now)) return 3;
+  if (s.featuredReason && PAID_TIER_REASONS.has(s.featuredReason)) return 0;
+  if (s.featuredReason === "AutoNewService") return 1;
+  return 2;
+}
+
+/**
+ * Public-services ORDER BY equivalent in JS:
+ *   1. paid/admin/membership features (FIFO by featuredAt asc)
+ *   2. auto-featured new services (FIFO by featuredAt asc)
+ *   3. legacy featured rows with no recorded reason (FIFO by featuredAt asc)
+ *   4. everything else (newest first by createdAt desc)
+ *
+ * Pass a single `now` so all comparisons in one sort use the same instant.
+ */
+export function compareFeaturedServices(
+  now: Date = new Date()
+): (a: FeaturedServiceSortable, b: FeaturedServiceSortable) => number {
+  return (a, b) => {
+    const ta = featuredTier(a, now);
+    const tb = featuredTier(b, now);
+    if (ta !== tb) return ta - tb;
+
+    if (ta < 3) {
+      const fa = toMs(a.featuredAt);
+      const fb = toMs(b.featuredAt);
+      if (fa !== fb) return fa - fb; // ASC — earliest paid wins
+    }
+
+    return toMs(b.createdAt) - toMs(a.createdAt); // DESC for non-featured / tie-break
+  };
+}
+
+/** Minimum number of active featured services required for the homepage / browse "Featured Services" carousel to render. Below this floor the section feels sparse. */
+export const MIN_FEATURED_SERVICES_FOR_SECTION = 3;