@bash-app/bash-common 30.386.0 → 30.393.0

package/prisma/schema.prisma

@@ -9,38 +9,6 @@ datasource db {
   directUrl = env("POSTGRES_URL_NON_POOLING")
 }
 
-model Club {
-  id      String       @id @default(cuid())
-  name    String
-  street  String
-  userId  String
-  price   Int?
-  events  BashEvent[]
-  admin   ClubAdmin[]
-  members ClubMember[]
-  budgets Budget[]     @relation("ClubBudgets")
-}
-
-model ClubAdmin {
-  id     String        @id @default(cuid())
-  userId String
-  clubId String
-  role   ClubAdminRole
-  club   Club          @relation(fields: [clubId], references: [id], onDelete: Cascade)
-  admin  User          @relation(fields: [userId], references: [id], onDelete: Cascade)
-}
-
-model ClubMember {
-  id            String           @id @default(cuid())
-  userId        String
-  clubId        String
-  status        ClubMemberStatus
-  statusHistory Json
-  price         Int?
-  club          Club             @relation(fields: [clubId], references: [id], onDelete: Cascade)
-  member        User             @relation(fields: [userId], references: [id], onDelete: Cascade)
-}
-
 model BashComment {
   id              String        @id @default(cuid())
   creatorId       String
@@ -937,6 +905,9 @@ model BashEvent {
   /// Curated cause IDs from `CAUSE_TAGS` (bash-common) for discovery/search later.
   causeTags                   String[]               @default([])
   eventType                   String                 @default("Other")
+  /// How far the draw goes — orthogonal to eventType. Hosts may set Local/State only.
+  discoveryScope              DiscoveryScope         @default(Unspecified)
+  discoveryScopeLabel         String?
   timezone                    String?
   startDateTime               DateTime?
   endDateTime                 DateTime?
@@ -994,7 +965,6 @@ model BashEvent {
   status                      BashStatus             @default(Draft)
   tags                        String[]
   coverPhoto                  String?
-  clubId                      String?
   dateTimePublished           DateTime?
   includedItems               String[]
   videoLink                   String?
@@ -1276,7 +1246,6 @@ model BashEvent {
   associatedBashesReferencingMe   AssociatedBash[]
   comments                        BashComment[]
   amountOfGuests                  AmountOfGuests?                @relation(fields: [amountOfGuestsId], references: [id], onDelete: Cascade)
-  club                            Club?                          @relation(fields: [clubId], references: [id])
   creator                         User                           @relation("CreatedEvent", fields: [creatorId], references: [id], onDelete: Cascade)
   targetAudience                  TargetAudience?                @relation(fields: [targetAudienceId], references: [id], onDelete: Cascade)
   transferredFrom                 User?                          @relation("TransferredFrom", fields: [transferredFromId], references: [id])
@@ -1390,6 +1359,7 @@ model BashEvent {
 
   // Organization Relations
   budgets Budget[]    @relation("EventBudgets")
+  budgetApprovalRequests BudgetApprovalRequest[]
   rsvps   EventRSVP[] @relation("EventRSVPs")
 
   // Groups & page views (Phases 0–4)
@@ -1435,6 +1405,7 @@ model BashEvent {
   locationShareSessions LocationShareSession[]
   /// Private Memories vault captures for this bash
   memoryCaptures        BashMemoryCapture[]
+  suggestedNights       SuggestedNight[]
 
   @@index([templateId])
   @@index([parentEventId])
@@ -1442,6 +1413,7 @@ model BashEvent {
   @@index([hostedByServiceId])
   @@index([eventSeriesId])
   @@index([status, aiApprovalVerdict])
+  @@index([discoveryScope, startDateTime])
 }
 
 /// Lineup / attribution roster for an event (optional act list for checkout tagging).
@@ -4634,8 +4606,6 @@ model User {
   blogPosts                      BlogPost[]                   @relation("BlogAuthor")
   checkouts                      Checkout[]
   waiverAcceptances              WaiverAcceptance[]
-  clubAdmins                     ClubAdmin[]
-  clubMembers                    ClubMember[]
   competitions                   Competition[]
   competitionSponsorships        CompetitionSponsor[]
   competitionPrizeOffersSubmitted CompetitionPrizeOffer[] @relation("CompetitionPrizeOffersSubmitted")
@@ -4855,6 +4825,8 @@ model User {
   approvedBudgets                Budget[]             @relation("BudgetApprover")
   submittedBudgets               Budget[]             @relation("BudgetSubmitter")
   ownedBudgets                   Budget[]             @relation("UserBudgets")
+  budgetApprovalsRequested       BudgetApprovalRequest[] @relation("BudgetApprovalRequester")
+  budgetApprovalsAsApprover      BudgetApprovalRequest[] @relation("BudgetApprovalApprover")
   departmentsHeaded              Department[]         @relation("DepartmentHead")
   /// Enterprise platform (Phase 0-4): internal team members assigned as a named
   /// account manager, and org members who submit/approve procurement requests
@@ -4895,6 +4867,8 @@ model User {
   // Activity Intent / Experience Discovery
   userDiscoveryPreferences UserDiscoveryPreferences?
   activityIntents          ActivityIntent[]
+  tastePreferences         UserTastePreference[]
+  suggestedNights          SuggestedNight[]
   experienceInvitations    ExperienceInvitation[]
   experienceOpportunitiesCreated ExperienceOpportunity[] @relation("ExperienceOpportunityCreatedBy")
 
@@ -4944,6 +4918,12 @@ model UserPreferences {
   organizerUpdatesNotify      Boolean  @default(true)
   eventSuggestions            Boolean  @default(true)
   eventReminderNotify         Boolean  @default(true)
+  /// Opt-in: engine may propose nights (Build my nights strip).
+  suggestedNightsEnabled      Boolean  @default(false)
+  /// Favorite-nudge email/push. Migrated to match eventReminderNotify.
+  suggestedNightReminderNotify Boolean @default(true)
+  /// Hosts in the guest's CRM may filter blasts by taste chips.
+  hostsMayTargetTaste         Boolean  @default(true)
   newMessageNotify            Boolean  @default(true)
   invitationNotify            Boolean  @default(true)
   commentNotify               Boolean  @default(true)
@@ -5053,6 +5033,38 @@ model UserPreferences {
   user                       User     @relation(fields: [userId], references: [id], onDelete: Cascade)
 }
 
+model UserTastePreference {
+  id        String          @id @default(cuid())
+  userId    String
+  user      User            @relation(fields: [userId], references: [id], onDelete: Cascade)
+  kind      UserTasteKind
+  value     String
+  weight    Int             @default(1)
+  source    UserTasteSource @default(Explicit)
+  updatedAt DateTime        @updatedAt
+
+  @@unique([userId, kind, value])
+  @@index([userId, kind])
+}
+
+model SuggestedNight {
+  id          String               @id @default(cuid())
+  userId      String
+  user        User                 @relation(fields: [userId], references: [id], onDelete: Cascade)
+  bashEventId String
+  bashEvent   BashEvent            @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+  status      SuggestedNightStatus @default(Proposed)
+  reason      String[]             @default([])
+  proposedAt  DateTime             @default(now())
+  acceptedAt  DateTime?
+  dismissedAt DateTime?
+  remindedAt  DateTime?
+
+  @@unique([userId, bashEventId])
+  @@index([userId, status])
+  @@index([bashEventId, status])
+}
+
 model UserFollowing {
   id           String    @id @default(cuid())
   userId       String
@@ -5736,6 +5748,10 @@ model EventService {
   rateUnit            String?
   minimumChargeCents  Int?
   minimumQuantity     Int?
+  /// Delivery logistics for F&B listings: Pickup | Delivery | FullService.
+  fulfillmentModes    String[]              @default([])
+  /// Minimum advance-notice days required for F&B bookings (e.g. 7 = one week).
+  leadTimeDays        Int?
   crowdSize           AmountOfGuests?       @relation(fields: [crowdSizeId], references: [id], onDelete: Cascade)
   serviceRange        ServiceRange?         @relation(fields: [serviceRangeId], references: [id])
   service             Service?
@@ -7259,7 +7275,6 @@ model Budget {
   // Flexible ownership - at least ONE should be set
   organizationId String?
   bashEventId    String?
-  clubId         String?
   departmentId   String?
   userId         String? // For personal event budgets
   /// Optional: budgets tied to a service profile (vendor/exhibitor/sponsor owner costs).
@@ -7297,7 +7312,6 @@ model Budget {
   // Relations
   organization Organization? @relation("OrganizationBudgets", fields: [organizationId], references: [id], onDelete: Cascade)
   bashEvent    BashEvent?    @relation("EventBudgets", fields: [bashEventId], references: [id], onDelete: Cascade)
-  club         Club?         @relation("ClubBudgets", fields: [clubId], references: [id], onDelete: Cascade)
   department   Department?   @relation("DepartmentBudgets", fields: [departmentId], references: [id], onDelete: Cascade)
   user         User?         @relation("UserBudgets", fields: [userId], references: [id], onDelete: Cascade)
   service      Service?      @relation("ServiceBudgets", fields: [serviceId], references: [id], onDelete: Cascade)
@@ -7308,7 +7322,6 @@ model Budget {
 
   @@index([organizationId])
   @@index([bashEventId])
-  @@index([clubId])
   @@index([departmentId])
   @@index([userId])
   @@index([serviceId])
@@ -7316,6 +7329,66 @@ model Budget {
   @@index([fiscalYear])
 }
 
+enum BudgetApprovalKind {
+  CapAsk
+  PlanSignOff
+}
+
+enum BudgetApprovalStatus {
+  Pending
+  Approved
+  ChangesRequested
+  Declined
+  Cancelled
+  Superseded
+}
+
+/// Event-level budget sign-off or pre-plan cap ask. Not per-line Budget.status.
+model BudgetApprovalRequest {
+  id                 String                @id @default(cuid())
+  bashEventId        String
+  kind               BudgetApprovalKind
+  status             BudgetApprovalStatus  @default(Pending)
+  requesterUserId    String
+  hostNote           String?
+  approverEmail      String
+  approverName       String?
+  approverUserId     String?
+  token              String                @unique @default(cuid())
+  expiresAt          DateTime
+  snapshotJson       Json
+  snapshotTotalCents Int
+  authorizedCents    Int?
+  decisionNote       String?
+  decidedAt          DateTime?
+  staleAt            DateTime?
+  createdAt          DateTime              @default(now())
+  updatedAt          DateTime              @updatedAt
+
+  bashEvent    BashEvent                 @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+  requester    User                      @relation("BudgetApprovalRequester", fields: [requesterUserId], references: [id], onDelete: Cascade)
+  approverUser User?                     @relation("BudgetApprovalApprover", fields: [approverUserId], references: [id], onDelete: SetNull)
+  lineNotes    BudgetApprovalLineNote[]
+
+  @@index([bashEventId, status])
+  @@index([approverEmail])
+}
+
+model BudgetApprovalLineNote {
+  id                     String   @id @default(cuid())
+  requestId              String
+  budgetId               String?
+  nameSnapshot           String
+  categorySnapshot       String?
+  allocatedCentsSnapshot Int
+  note                   String
+  createdAt              DateTime @default(now())
+
+  request BudgetApprovalRequest @relation(fields: [requestId], references: [id], onDelete: Cascade)
+
+  @@index([requestId])
+}
+
 enum BudgetContributionKind {
   Cash
   InKind
@@ -8506,20 +8579,6 @@ model BashEventMessageRead {
   @@index([userId])
 }
 
-enum ClubAdminRole {
-  Owner
-  Admin
-  Staff
-}
-
-enum ClubMemberStatus {
-  Active
-  Inactive
-  Canceled
-  Paused
-  Removed
-}
-
 enum TaskStatus {
   Open
   Accepted
@@ -8620,6 +8679,10 @@ enum NotificationType {
   SideQuestWindowOpened // Attendee: a timed Side Quest just went live
   /// Attendee/ticket holder: host changed significant bash details (time, place, title, …)
   EventDetailsUpdated
+  /// Approver already on Bash: host sent a budget sign-off or cap ask
+  BudgetApprovalRequested
+  /// Host: approver approved, requested changes, or declined a budget request
+  BudgetApprovalDecided
 }
 
 /// Opt-in reminder for a scheduled tier release (v1.5).
@@ -8670,6 +8733,34 @@ enum BashEventSource {
   Partner // Generic: use sourcePartnerId for partner key (e.g. 'mixlog', custom integrations)
 }
 
+/// How far an event's draw goes. Orthogonal to BashEventType.
+enum DiscoveryScope {
+  Local
+  State
+  National
+  International
+  Unspecified
+}
+
+enum UserTasteKind {
+  EventType
+  CauseTag
+  MusicGenre
+  DiscoveryScope
+}
+
+enum UserTasteSource {
+  Explicit
+  Inferred
+}
+
+enum SuggestedNightStatus {
+  Proposed
+  Accepted
+  Dismissed
+  Expired
+}
+
 /// Channel used to create a BashEvent. See BashEvent.creationChannel doc comment.
 enum CreationChannel {
   Web
@@ -9490,6 +9581,8 @@ enum FoodAndBeverageSubType {
   DessertBar
   BeverageCart
   ConcessionStand
+  CelebrationCake
+  GrazingTable
   FoodAndBeverageOther
 }
 
@@ -9530,6 +9623,7 @@ enum RentalEquipmentSubType {
   BounceHouse
   WaterSlide
   CarnivalGames
+  RestroomTrailer
   RentalEquipmentOther
 }
 
@@ -9617,6 +9711,7 @@ enum WellnessSubType {
 }
 
 enum HostingSupportSubType {
+  Officiant
   HostingSupportOther
 }
 
@@ -9868,6 +9963,24 @@ enum DessertBarFormat {
   MultiStationDessert
 }
 
+enum CelebrationCakeFormat {
+  WeddingCake
+  BirthdayCake
+  AnniversaryCake
+  CorporateCake
+  CustomOrder
+}
+
+enum GrazingTableFormat {
+  CharcuterieBoard
+  CheeseBoard
+  DessertBoard
+  BreakfastBoard
+  GrazingTableSetup
+  CorporateSpread
+  CustomOrder
+}
+
 enum BeverageCartFormat {
   FullBarCart
   PremiumBarCart
@@ -10151,6 +10264,25 @@ enum TablesFormat {
   CustomTables
 }
 
+enum RestroomTrailerFormat {
+  LuxuryTrailer
+  StandardPortable
+  ADAAccessible
+  MultiStall
+  HandwashStation
+}
+
+enum OfficiantFormat {
+  WeddingCeremony
+  Elopement
+  VowRenewal
+  CommitmentCeremony
+  Interfaith
+  Nondenominational
+  Civil
+  CustomCeremony
+}
+
 enum TentsFormat {
   ClearSpanTents
   FrameTents

package/src/__tests__/bashSectionTitleForBashType.test.ts

@@ -52,6 +52,16 @@ describe("bashSectionTitleForBashType", () => {
     it("'Ideas' → 'Ideas'", () => {
       expect(bashSectionTitleForBashType("Ideas")).toBe("Ideas");
     });
+
+    it("scope rows use destination copy", () => {
+      expect(bashSectionTitleForBashType("National")).toBe(
+        "Across the country"
+      );
+      expect(bashSectionTitleForBashType("International")).toBe(
+        "Worth the flight"
+      );
+      expect(bashSectionTitleForBashType("CrewGoing")).toBe("The crew's going");
+    });
   });
 
   describe("BashEventType enum values get pluralized", () => {

package/src/__tests__/budgetApproval.test.ts

@@ -0,0 +1,153 @@
+import {
+  buildBudgetApprovalSnapshot,
+  budgetApprovalSnapshotsMatch,
+  eventBudgetApprovalWizardPath,
+  formatBudgetCents,
+  isBudgetApprovalExpired,
+  isValidApproverEmail,
+  normalizeApproverEmail,
+  parseBudgetApprovalSnapshot,
+  resolveApproverDisplayName,
+  validateBudgetApprovalDecide,
+} from "../budgetApproval.js";
+
+describe("budgetApproval helpers", () => {
+  it("normalizes and validates approver emails", () => {
+    expect(normalizeApproverEmail("  Pat@Acme.com ")).toBe("pat@acme.com");
+    expect(isValidApproverEmail("pat@acme.com")).toBe(true);
+    expect(isValidApproverEmail("not-an-email")).toBe(false);
+  });
+
+  it("hashes snapshots in a stable, order-independent way", () => {
+    const a = buildBudgetApprovalSnapshot([
+      { id: "b", name: "DJ", category: null, totalAllocatedCents: 20000 },
+      { id: "a", name: "Venue", category: "Rentals", totalAllocatedCents: 10000 },
+    ]);
+    const b = buildBudgetApprovalSnapshot([
+      { id: "a", name: "Venue", category: "Rentals", totalAllocatedCents: 10000 },
+      { id: "b", name: "DJ", category: null, totalAllocatedCents: 20000 },
+    ]);
+    expect(a.totalCents).toBe(30000);
+    expect(a.hash).toBe(b.hash);
+    expect(
+      budgetApprovalSnapshotsMatch(a.lines, parseBudgetApprovalSnapshot(b.lines))
+    ).toBe(true);
+  });
+
+  it("detects drift when an amount changes", () => {
+    const original = buildBudgetApprovalSnapshot([
+      { id: "a", name: "Venue", category: null, totalAllocatedCents: 10000 },
+    ]);
+    const changed = buildBudgetApprovalSnapshot([
+      { id: "a", name: "Venue", category: null, totalAllocatedCents: 12000 },
+    ]);
+    expect(budgetApprovalSnapshotsMatch(original.lines, changed.lines)).toBe(
+      false
+    );
+  });
+
+  it("requires cents on cap-ask approve and a note on request-changes", () => {
+    expect(
+      validateBudgetApprovalDecide({
+        action: "approve",
+        kind: "CapAsk",
+        authorizedCents: 0,
+      })
+    ).toEqual({
+      ok: false,
+      error: "Enter an authorized amount greater than zero.",
+    });
+    expect(
+      validateBudgetApprovalDecide({
+        action: "approve",
+        kind: "CapAsk",
+        authorizedCents: 50000,
+      }).ok
+    ).toBe(true);
+    expect(
+      validateBudgetApprovalDecide({
+        action: "changes",
+        kind: "PlanSignOff",
+      })
+    ).toEqual({
+      ok: false,
+      error: "Add an overall note or a note on at least one line.",
+    });
+    expect(
+      validateBudgetApprovalDecide({
+        action: "changes",
+        kind: "PlanSignOff",
+        lineNotes: [
+          {
+            nameSnapshot: "Venue",
+            allocatedCentsSnapshot: 10000,
+            note: "Too high",
+          },
+        ],
+      }).ok
+    ).toBe(true);
+    expect(
+      validateBudgetApprovalDecide({
+        action: "changes",
+        kind: "CapAsk",
+        lineNotes: [
+          {
+            nameSnapshot: "Venue",
+            allocatedCentsSnapshot: 10000,
+            note: "n/a",
+          },
+        ],
+      })
+    ).toEqual({
+      ok: false,
+      error: "A cap ask has no budget lines to annotate.",
+    });
+  });
+
+  it("resolves display name decided > hint > email", () => {
+    expect(
+      resolveApproverDisplayName({
+        decidedName: "Pat Chen",
+        hostHintName: "Boss",
+        email: "pat@acme.com",
+      })
+    ).toBe("Pat Chen");
+    expect(
+      resolveApproverDisplayName({
+        decidedName: "  ",
+        hostHintName: "Boss",
+        email: "pat@acme.com",
+      })
+    ).toBe("Boss");
+    expect(
+      resolveApproverDisplayName({
+        decidedName: null,
+        hostHintName: null,
+        email: "pat@acme.com",
+      })
+    ).toBe("pat@acme.com");
+  });
+
+  it("computes expiry from expiresAt", () => {
+    expect(
+      isBudgetApprovalExpired("2020-01-01T00:00:00.000Z", new Date("2026-01-01"))
+    ).toBe(true);
+    expect(
+      isBudgetApprovalExpired("2030-01-01T00:00:00.000Z", new Date("2026-01-01"))
+    ).toBe(false);
+  });
+
+  it("formats money and the wizard deep link", () => {
+    expect(formatBudgetCents(420000)).toBe("$4,200");
+    expect(eventBudgetApprovalWizardPath("evt-1")).toContain(
+      "/bash-event-wizard/evt-1/"
+    );
+    expect(eventBudgetApprovalWizardPath("evt-1")).toContain("budgetTab=lines");
+  });
+
+  it("parses invalid snapshot json as empty", () => {
+    expect(parseBudgetApprovalSnapshot(null)).toEqual([]);
+    expect(parseBudgetApprovalSnapshot("nope")).toEqual([]);
+    expect(parseBudgetApprovalSnapshot([{ id: 1 }])).toEqual([]);
+  });
+});

package/src/__tests__/crewSocialCopy.test.ts

@@ -0,0 +1,25 @@
+import { crewSocialProofCopy } from "../crewSocialCopy.js";
+
+describe("crewSocialProofCopy", () => {
+  it("names visible crew", () => {
+    expect(
+      crewSocialProofCopy([
+        { displayName: "Nico", attendanceVisible: true },
+        { displayName: "Petra", attendanceVisible: true },
+      ]).line
+    ).toBe("Nico and Petra are going");
+  });
+
+  it("does not use a count when names are hidden", () => {
+    const copy = crewSocialProofCopy([
+      { displayName: "Sam", attendanceVisible: false },
+      { displayName: "Alex", attendanceVisible: false },
+    ]);
+    expect(copy.line).toBe("Your crew's on this one");
+    expect(copy.named).toBe(false);
+  });
+
+  it("omits the line when nobody is going", () => {
+    expect(crewSocialProofCopy([]).line).toBeNull();
+  });
+});

package/src/__tests__/discoveryScope.test.ts

@@ -0,0 +1,65 @@
+import {
+  DiscoveryScope,
+  inferDiscoveryScopeFromText,
+  isHostSettableDiscoveryScope,
+  resolveDiscoveryScopeForWrite,
+} from "../discoveryScope.js";
+
+describe("discoveryScope", () => {
+  it("lets hosts set Local and State only", () => {
+    expect(isHostSettableDiscoveryScope(DiscoveryScope.Local)).toBe(true);
+    expect(isHostSettableDiscoveryScope(DiscoveryScope.State)).toBe(true);
+    expect(isHostSettableDiscoveryScope(DiscoveryScope.National)).toBe(false);
+    expect(isHostSettableDiscoveryScope(DiscoveryScope.International)).toBe(
+      false
+    );
+  });
+
+  it("infers State from state fair copy", () => {
+    expect(inferDiscoveryScopeFromText("Utah State Fair")).toBe(
+      DiscoveryScope.State
+    );
+  });
+
+  it("infers National from destination brands", () => {
+    expect(inferDiscoveryScopeFromText("EDC Las Vegas")).toBe(
+      DiscoveryScope.National
+    );
+  });
+
+  it("infers International from world-tour language", () => {
+    expect(inferDiscoveryScopeFromText("Tomorrowland world tour")).toBe(
+      DiscoveryScope.International
+    );
+  });
+
+  it("clamps host National without a hard signal", () => {
+    expect(
+      resolveDiscoveryScopeForWrite({
+        requested: DiscoveryScope.National,
+        role: "host",
+        title: "House party in Sugar House",
+      })
+    ).toBe(DiscoveryScope.Unspecified);
+  });
+
+  it("allows host National when inference already matches", () => {
+    expect(
+      resolveDiscoveryScopeForWrite({
+        requested: DiscoveryScope.National,
+        role: "host",
+        title: "Coachella Weekend 1",
+      })
+    ).toBe(DiscoveryScope.National);
+  });
+
+  it("lets scrapers set National", () => {
+    expect(
+      resolveDiscoveryScopeForWrite({
+        requested: DiscoveryScope.National,
+        role: "scraper",
+        title: "Random fest",
+      })
+    ).toBe(DiscoveryScope.National);
+  });
+});