@bash-app/bash-common 30.117.0 → 30.118.1

package/prisma/schema.prisma

@@ -16,6 +16,7 @@ model Club {
   events  BashEvent[]
   admin   ClubAdmin[]
   members ClubMember[]
+  budgets Budget[]     @relation("ClubBudgets")
 }
 
 model ClubAdmin {
@@ -56,7 +57,8 @@ model BashComment {
 model BashFeedPost {
   id               String    @id @default(cuid())
   userId           String
-  bashId           String
+  bashId           String?
+  serviceId        String?
   content          String?   @db.Text
   mediaIds         String[] // Array of Media IDs
   mentionedUserIds String[] // Array of User IDs mentioned in post
@@ -71,7 +73,8 @@ model BashFeedPost {
 
   // Relationships
   user     User              @relation(fields: [userId], references: [id], onDelete: Cascade)
-  bash     BashEvent         @relation(fields: [bashId], references: [id], onDelete: Cascade)
+  bash     BashEvent?        @relation(fields: [bashId], references: [id], onDelete: Cascade)
+  service  Service?          @relation(fields: [serviceId], references: [id], onDelete: Cascade)
   likes    BashFeedLike[]
   comments BashFeedComment[]
   ratings  BashFeedRating[]
@@ -80,6 +83,7 @@ model BashFeedPost {
   reposts  BashFeedRepost[]
 
   @@index([bashId])
+  @@index([serviceId])
   @@index([userId])
   @@index([createdAt])
   @@index([isAnonymous])
@@ -338,6 +342,7 @@ model EventTask {
   neededCount                Int? // Number of volunteers needed
   estimatedDuration          Int? // Estimated duration in minutes
   createdAt                  DateTime?        @default(now())
+  organizationId             String? // Organization association
   assignedTo                 User?            @relation("TasksAssignedToMe", fields: [assignedToId], references: [id], onDelete: Cascade)
   bashEvent                  BashEvent        @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
   creator                    User             @relation(fields: [creatorId], references: [id], onDelete: Cascade)
@@ -547,89 +552,99 @@ model Invitation {
 }
 
 model BashEvent {
-  id                              String                         @id @default(cuid())
-  source                          BashEventSource                @default(Bash)
-  title                           String
-  slug                            String?                        @unique
-  creatorId                       String
-  createdAt                       DateTime?                      @default(now())
-  isApproved                      Boolean?                       @default(false)
-  description                     String?
-  eventType                       String                         @default("Other")
-  timezone                        String?
-  startDateTime                   DateTime?
-  endDateTime                     DateTime?
-  waiverUrl                       String?
-  waiverRequired                  Boolean                        @default(false)
-  waiverDisplayType               String?                        @default("inline")
-  targetAudienceId                String?                        @unique
-  amountOfGuestsId                String?                        @unique
-  vibe                            String?
-  occasion                        String?
-  dress                           String?
-  allowed                         String?
-  notAllowed                      String?
-  eventFormat                     EventFormat? // Derived from location and videoLink: In-Person, Virtual, or Hybrid
-  nonProfit                       Boolean?
-  nonProfitId                     String?
-  privacy                         Privacy                        @default(Public)
-  capacity                        Int?
-  location                        String?
-  street                          String?
-  city                            String?
-  state                           String?
-  zipCode                         String?
-  country                         String?
-  status                          BashStatus                     @default(Draft)
-  tags                            String[]
-  coverPhoto                      String?
-  clubId                          String?
-  dateTimePublished               DateTime?
-  includedItems                   String[]
-  videoLink                       String?
-  subtitle                        String?
-  isFeatured                      Boolean?
-  isTrending                      Boolean?
-  venueId                         String?
-  averageRating                   Float?                         @default(0)
-  totalRatings                    Int?                           @default(0) // Total count of all ratings (Review + BashFeedRating)
-  totalReviews                    Int?                           @default(0) // Count of Review records (anonymous quick ratings)
-  totalFeedRatings                Int?                           @default(0) // Count of BashFeedRating records (from posts)
-  allowDonations                  Boolean?                       @default(true)
-  suggestedDonationAmount         Int?
-  donationDetails                 String?
-  absorbDonationFees              Boolean                        @default(false)
-  absorbTicketFees                Boolean                        @default(false)
-  showAttendees                   Boolean                        @default(true)
-  servicePreferences              Json? // New tiered status: { "Entertainment": "need", "Sponsors": "booked_closed", ... }
-  bookedServices                  Json? // Booked service details: { "Entertainment": { serviceId: "...", providerId: "...", bookedAt: "..." }, ... }
-  serviceVisibility               Json? // DEPRECATED: Use servicePreferences instead. Kept for backward compatibility during migration.
-  originalCreatorId               String?
-  transferredAt                   DateTime?
-  transferredFromId               String?
-  transferCount                   Int                            @default(0)
-  startTimeLocked                 Boolean                        @default(false)
-  p2pPaymentMethod                String?
-  venmoUsername                   String?
-  venmoQRCodeUrl                  String?
-  zelleEmail                      String?
-  zellePhone                      String?
-  zelleQRCodeUrl                  String?
-  externalTicketUrl               String? // URL to external ticket purchase page (for imported events)
-  externalPriceMin                Int? // Minimum ticket price in cents (for imported events)
-  externalPriceMax                Int? // Maximum ticket price in cents (for imported events)
-  externalPriceSummary            String? // Human-readable price summary e.g., "$50 - $150" or "$75"
-  customTermsAndConditions        String?
-  itinerary                       Json? // Array of { id: string, title: string, startTime: string, endTime: string, description?: string }
-  
+  id                       String          @id @default(cuid())
+  source                   BashEventSource @default(Bash)
+  title                    String
+  slug                     String?         @unique
+  creatorId                String
+  createdAt                DateTime?       @default(now())
+  isApproved               Boolean?        @default(false)
+  description              String?
+  eventType                String          @default("Other")
+  timezone                 String?
+  startDateTime            DateTime?
+  endDateTime              DateTime?
+  waiverUrl                String?
+  waiverRequired           Boolean         @default(false)
+  waiverDisplayType        String?         @default("inline")
+  targetAudienceId         String?         @unique
+  amountOfGuestsId         String?         @unique
+  vibe                     String?
+  occasion                 String?
+  dress                    String?
+  allowed                  String?
+  notAllowed               String?
+  eventFormat              EventFormat? // Derived from location and videoLink: In-Person, Virtual, or Hybrid
+  nonProfit                Boolean?
+  nonProfitId              String?
+  privacy                  Privacy         @default(Public)
+  capacity                 Int?
+  location                 String?
+  street                   String?
+  city                     String?
+  state                    String?
+  zipCode                  String?
+  country                  String?
+  status                   BashStatus      @default(Draft)
+  tags                     String[]
+  coverPhoto               String?
+  clubId                   String?
+  dateTimePublished        DateTime?
+  includedItems            String[]
+  videoLink                String?
+  subtitle                 String?
+  isFeatured               Boolean?
+  isTrending               Boolean?
+  venueId                  String?
+  averageRating            Float?          @default(0)
+  totalRatings             Int?            @default(0) // Total count of all ratings (Review + BashFeedRating)
+  totalReviews             Int?            @default(0) // Count of Review records (anonymous quick ratings)
+  totalFeedRatings         Int?            @default(0) // Count of BashFeedRating records (from posts)
+  allowDonations           Boolean?        @default(true)
+  suggestedDonationAmount  Int?
+  donationDetails          String?
+  absorbDonationFees       Boolean         @default(false)
+  absorbTicketFees         Boolean         @default(false)
+  showAttendees            Boolean         @default(true)
+  servicePreferences       Json? // New tiered status: { "Entertainment": "need", "Sponsors": "booked_closed", ... }
+  bookedServices           Json? // Booked service details: { "Entertainment": { serviceId: "...", providerId: "...", bookedAt: "..." }, ... }
+  serviceVisibility        Json? // DEPRECATED: Use servicePreferences instead. Kept for backward compatibility during migration.
+  originalCreatorId        String?
+  transferredAt            DateTime?
+  transferredFromId        String?
+  transferCount            Int             @default(0)
+  startTimeLocked          Boolean         @default(false)
+  p2pPaymentMethod         String?
+  venmoUsername            String?
+  venmoQRCodeUrl           String?
+  zelleEmail               String?
+  zellePhone               String?
+  zelleQRCodeUrl           String?
+  externalTicketUrl        String? // URL to external ticket purchase page (for imported events)
+  externalPriceMin         Int? // Minimum ticket price in cents (for imported events)
+  externalPriceMax         Int? // Maximum ticket price in cents (for imported events)
+  externalPriceSummary     String? // Human-readable price summary e.g., "$50 - $150" or "$75"
+  customTermsAndConditions String?
+  itinerary                Json? // Array of { id: string, title: string, startTime: string, endTime: string, description?: string }
+
   // Idea-specific fields (only used when status = 'Idea')
-  ideaExpiresAt                   DateTime?
-  ideaInterestThreshold           Int?                           @default(35)
-  hideInterestCount               Boolean                        @default(false)
-  isAutoApprovable                Boolean                        @default(false)
-  autoApprovedAt                  DateTime?
-  lastEngagementAt                DateTime?                      // Track last interest/share for decay
-  
+  ideaExpiresAt         DateTime?
+  ideaInterestThreshold Int?      @default(35)
+  hideInterestCount     Boolean   @default(false)
+  isAutoApprovable      Boolean   @default(false)
+  autoApprovedAt        DateTime?
+  lastEngagementAt      DateTime? // Track last interest/share for decay
+
+  // Organization field
+  organizationId String?
+  organization   Organization? @relation("OrganizationBashEvents", fields: [organizationId], references: [id])
+
+  // Organization access controls (only apply when organizationId is set)
+  requiresOrgMembership    Boolean  @default(false) // Must be member to attend/RSVP
+  allowMemberGuests        Boolean  @default(false) // Members can bring +1s
+  maxGuestsPerMember       Int? // Guest limit per member (null = unlimited)
+  restrictToOrgDepartments String[] @default([]) // Empty = all departments can see/join
+
   associatedBashesReferencingMe   AssociatedBash[]
   comments                        BashComment[]
   amountOfGuests                  AmountOfGuests?                @relation(fields: [amountOfGuestsId], references: [id], onDelete: Cascade)
@@ -682,16 +697,21 @@ model BashEvent {
   bashFeedPosts   BashFeedPost[]
   bashFeedRatings BashFeedRating[]
   eventRankings   EventRankings?
-  
+
   // Idea Relations
-  interests       IdeaInterest[]
-  configurations  IdeaConfiguration[]
+  interests      IdeaInterest[]
+  configurations IdeaConfiguration[]
 
   // Analytics Relations
   analyticsPredictions AnalyticsPrediction[]
 
+  // Organization Relations
+  budgets Budget[]    @relation("EventBudgets")
+  rsvps   EventRSVP[] @relation("EventRSVPs")
+
   @@index([templateId])
   @@index([parentEventId])
+  @@index([organizationId])
 }
 
 // ============================================
@@ -699,22 +719,22 @@ model BashEvent {
 // ============================================
 
 model IdeaInterest {
-  id                String                  @id @default(cuid())
+  id                String   @id @default(cuid())
   bashEventId       String
   email             String
   phone             String?
-  source            String?                 // 'tiktok_bio', 'bashfeed', 'share', 'direct'
-  ipAddress         String?                 // For fraud prevention
+  source            String? // 'tiktok_bio', 'bashfeed', 'share', 'direct'
+  ipAddress         String? // For fraud prevention
   userAgent         String?
-  convertedToUserId String?                 // If they later create account
-  createdAt         DateTime                @default(now())
-  updatedAt         DateTime                @updatedAt
-  
+  convertedToUserId String? // If they later create account
+  createdAt         DateTime @default(now())
+  updatedAt         DateTime @updatedAt
+
   // Relationships
-  bashEvent         BashEvent               @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
-  user              User?                   @relation(fields: [convertedToUserId], references: [id])
-  responses         IdeaInterestResponse[]
-  
+  bashEvent BashEvent              @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+  user      User?                  @relation(fields: [convertedToUserId], references: [id])
+  responses IdeaInterestResponse[]
+
   @@unique([bashEventId, email])
   @@index([bashEventId])
   @@index([email])
@@ -722,38 +742,38 @@ model IdeaInterest {
 }
 
 model IdeaInterestResponse {
-  id              String             @id @default(cuid())
+  id              String   @id @default(cuid())
   interestId      String
-  questionType    String             // 'base_price', 'configuration_price', 'preferred_date', 'must_have'
-  questionText    String?            // For custom host questions
-  responseValue   String             // JSON: {min: 20, max: 50} or "Yes" or date string
-  configurationId String?            // Links to specific configuration if applicable
-  createdAt       DateTime           @default(now())
-  
+  questionType    String // 'base_price', 'configuration_price', 'preferred_date', 'must_have'
+  questionText    String? // For custom host questions
+  responseValue   String // JSON: {min: 20, max: 50} or "Yes" or date string
+  configurationId String? // Links to specific configuration if applicable
+  createdAt       DateTime @default(now())
+
   // Relationships
-  interest        IdeaInterest       @relation(fields: [interestId], references: [id], onDelete: Cascade)
-  configuration   IdeaConfiguration? @relation(fields: [configurationId], references: [id], onDelete: SetNull)
-  
+  interest      IdeaInterest       @relation(fields: [interestId], references: [id], onDelete: Cascade)
+  configuration IdeaConfiguration? @relation(fields: [configurationId], references: [id], onDelete: SetNull)
+
   @@index([interestId])
   @@index([configurationId])
   @@index([questionType])
 }
 
 model IdeaConfiguration {
-  id              String                  @id @default(cuid())
-  bashEventId     String
-  name            String                  // "Premium Open Bar", "Food Truck", "Live DJ"
-  description     String?
-  estimatedCost   Int?                    // In cents - helps host with pricing
-  isActive        Boolean                 @default(true)
-  sortOrder       Int                     @default(0)
-  createdAt       DateTime                @default(now())
-  updatedAt       DateTime                @updatedAt
-  
+  id            String   @id @default(cuid())
+  bashEventId   String
+  name          String // "Premium Open Bar", "Food Truck", "Live DJ"
+  description   String?
+  estimatedCost Int? // In cents - helps host with pricing
+  isActive      Boolean  @default(true)
+  sortOrder     Int      @default(0)
+  createdAt     DateTime @default(now())
+  updatedAt     DateTime @updatedAt
+
   // Relationships
-  bashEvent       BashEvent               @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
-  responses       IdeaInterestResponse[]
-  
+  bashEvent BashEvent              @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+  responses IdeaInterestResponse[]
+
   @@index([bashEventId])
   @@index([isActive])
 }
@@ -925,6 +945,12 @@ model TicketTier {
   specialOffers          SpecialOffer[] // NEW - Special offers for this tier
   appliedDiscounts       AppliedDiscount[] // NEW - Discounts applied to this tier
 
+  // Organization member restrictions (for org events)
+  restrictedToRoles           String[] @default([]) // ["Admin", "Owner"] - empty = all roles
+  restrictedToDepartments     String[] @default([]) // [deptId1, deptId2] - empty = all departments
+  restrictedToMembershipTiers String[] @default([]) // ["Premium"] - empty = all membership tiers
+  isGuestTier                 Boolean  @default(false) // Ticket for member +1s
+
   @@unique([bashEventId, title])
 }
 
@@ -1507,9 +1533,26 @@ model User {
   nominationsGiven    Nomination[]         @relation("NominatingUser")
   votesGiven          NominationVote[]
   categoriesCreated   NominationCategory[]
-  
+
   // Idea Interest Relations
   ideaInterests IdeaInterest[]
+
+  // Organization Relations
+  ownedOrganizations      Organization[]       @relation("OrganizationOwner")
+  organizationMemberships OrganizationMember[] @relation("OrganizationMemberUser")
+  organizationEventRSVPs  EventRSVP[]          @relation("OrganizationEventRSVP")
+  submittedExpenses       Expense[]            @relation("ExpenseSubmitter")
+  approvedExpenses        Expense[]            @relation("ExpenseApprover")
+  approvedBudgets         Budget[]             @relation("BudgetApprover")
+  submittedBudgets        Budget[]             @relation("BudgetSubmitter")
+  ownedBudgets            Budget[]             @relation("UserBudgets")
+  departmentsHeaded       Department[]         @relation("DepartmentHead")
+  favoriteOrganizations   Organization[]       @relation("FavoriteOrganizations")
+
+  // Service Includes & Add-On Requests
+  suggestedIncludes ServiceInclude[]      @relation("SuggestedIncludes")
+  includeVotes      ServiceIncludeVote[]
+  requestedAddons   ServiceAddonRequest[] @relation("RequestedAddons")
 }
 
 model UserPreferences {
@@ -1952,6 +1995,12 @@ model Service {
   monthlyPrice                       Decimal                    @default(0)
   serviceListingStripeSubscriptionId String?
   acceptsBashCash                    Boolean                    @default(true) // NEW: Allow BashCash payments
+  isVerified                         Boolean                    @default(false) // Service owner verified
+  isLicensed                         Boolean                    @default(false) // Has required licenses
+  verifiedAt                         DateTime? // When verification was approved
+  licenseNumber                      String? // License/registration number
+  certifications                     String[]                   @default([]) // Array of certification names
+  bashFeedPosts                      BashFeedPost[]
   associatedServicesReferencingMe    AssociatedService[]
   exhibitorBookingRequests           ExhibitorBookingRequest[]  @relation("ExhibitorBookingService")
   notification                       Notification[]
@@ -1984,9 +2033,13 @@ model Service {
   bookingCommissions                 BookingCommission[]        @relation("CommissionServiceProfile")
   venueMatches                       VenueEntertainmentMatch[]  @relation("VenueMatches")
   entertainerMatches                 VenueEntertainmentMatch[]  @relation("EntertainerMatches")
+  includes                           ServiceInclude[]
+  addonRequests                      ServiceAddonRequest[]
 
   @@index([serviceListingStripeSubscriptionId])
   @@index([isFreeFirstListing])
+  @@index([isVerified])
+  @@index([isLicensed])
 }
 
 model StripeAccount {
@@ -2318,12 +2371,202 @@ model UserPromoCodeRedemption {
 }
 
 model Organization {
-  id                  String             @id @default(cuid())
-  organizationType    OrganizationType[]
-  goodsOrServices     String[]
-  venueTypes          String[]
-  secondaryVenueTypes String[]           @default([])
-  service             Service?
+  id                          String               @id @default(cuid())
+  name                        String
+  slug                        String               @unique
+  organizationType            OrganizationType[]
+  bio                         String?
+  mission                     String?
+  pocName                     String?
+  pocEmail                    String?
+  pocPhone                    String?
+  street                      String?
+  city                        String?
+  state                       String?
+  zipCode                     String?
+  country                     String?              @default("US")
+  coverPhoto                  String?
+  logoUrl                     String?
+  websiteUrl                  String?
+  socialLinks                 Json?
+  goodsOrServices             String[]
+  venueTypes                  String[]
+  secondaryVenueTypes         String[]             @default([])
+  baseMembershipPriceCents    Int?
+  premiumMembershipPriceCents Int?
+  allowGuestsByDefault        Boolean              @default(false)
+  defaultGuestLimit           Int                  @default(0)
+  visibility                  String               @default("Public")
+  requiresApproval            Boolean              @default(true)
+  memberAutoApproval          Boolean              @default(false)
+  ownerId                     String
+  parentOrganizationId        String?
+  departmentName              String?
+  hierarchyLevel              Int                  @default(0)
+  subscriptionTier            String?
+  subscriptionStatus          String?
+  stripeSubscriptionId        String?              @unique
+  stripeCustomerId            String?
+  createdAt                   DateTime             @default(now())
+  updatedAt                   DateTime             @updatedAt
+  service                     Service?
+  owner                       User                 @relation("OrganizationOwner", fields: [ownerId], references: [id], onDelete: Restrict)
+  parentOrganization          Organization?        @relation("OrganizationHierarchy", fields: [parentOrganizationId], references: [id])
+  childOrganizations          Organization[]       @relation("OrganizationHierarchy")
+  members                     OrganizationMember[]
+  budgets                     Budget[]             @relation("OrganizationBudgets")
+  departments                 Department[]
+  bashEvents                  BashEvent[]          @relation("OrganizationBashEvents")
+  favoriteBy                  User[]               @relation("FavoriteOrganizations")
+
+  @@index([ownerId])
+  @@index([slug])
+  @@index([parentOrganizationId])
+}
+
+model OrganizationMember {
+  id               String       @id @default(cuid())
+  organizationId   String
+  userId           String
+  role             String       @default("Member") // Owner, Admin, Coordinator, EventOrganizer, Treasurer, Member
+  membershipTier   String       @default("Base") // Base, Premium
+  status           String       @default("Pending") // Pending, Active, Suspended, Removed
+  joinedAt         DateTime     @default(now())
+  approvedAt       DateTime?
+  approvedBy       String?
+  paidUntil        DateTime?
+  paymentStatus    String?      @default("Current") // Current, Overdue, Cancelled
+  guestLimit       Int?
+  canInvite        Boolean      @default(true)
+  canCreateEvents  Boolean      @default(false)
+  canManageBudgets Boolean      @default(false)
+  organization     Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+  user             User         @relation("OrganizationMemberUser", fields: [userId], references: [id], onDelete: Cascade)
+  eventRSVPs       EventRSVP[]
+
+  @@unique([organizationId, userId])
+  @@index([organizationId])
+  @@index([userId])
+  @@index([status])
+}
+
+model Department {
+  id             String       @id @default(cuid())
+  organizationId String
+  name           String
+  description    String?
+  parentDeptId   String?
+  headUserId     String?
+  budgetCents    Int?
+  createdAt      DateTime     @default(now())
+  updatedAt      DateTime     @updatedAt
+  organization   Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+  parentDept     Department?  @relation("DepartmentHierarchy", fields: [parentDeptId], references: [id])
+  childDepts     Department[] @relation("DepartmentHierarchy")
+  head           User?        @relation("DepartmentHead", fields: [headUserId], references: [id])
+  budgets        Budget[]     @relation("DepartmentBudgets")
+
+  @@index([organizationId])
+  @@index([parentDeptId])
+}
+
+model EventRSVP {
+  id          String             @id @default(cuid())
+  eventId     String
+  memberId    String
+  userId      String
+  status      String             @default("Going") // Going, Maybe, NotGoing
+  guestsCount Int                @default(0)
+  checkedIn   Boolean            @default(false)
+  checkedInAt DateTime?
+  createdAt   DateTime           @default(now())
+  updatedAt   DateTime           @updatedAt
+  event       BashEvent          @relation("EventRSVPs", fields: [eventId], references: [id], onDelete: Cascade)
+  member      OrganizationMember @relation(fields: [memberId], references: [id], onDelete: Cascade)
+  user        User               @relation("OrganizationEventRSVP", fields: [userId], references: [id])
+
+  @@unique([eventId, userId])
+  @@index([eventId])
+  @@index([userId])
+}
+
+model Budget {
+  id   String @id @default(cuid())
+  name String
+
+  // Flexible ownership - at least ONE should be set
+  organizationId String?
+  bashEventId    String?
+  clubId         String?
+  departmentId   String?
+  userId         String? // For personal event budgets
+
+  // Budget details
+  totalAllocatedCents Int
+  totalBudgetCents    Int? // Alias for backward compatibility
+  spentCents          Int  @default(0)
+  remainingCents      Int? // Can be computed: totalAllocatedCents - spentCents
+
+  // Categorization
+  category   String? // "Marketing", "Catering", "Venue", "Annual", "Activities"
+  fiscalYear String? // Keep as String for flexibility ("2026", "2026-Q1", "FY2026")
+
+  // Approval workflow
+  status      String?   @default("Draft") // Draft, Submitted, Approved, Active, Closed, Archived
+  submittedBy String?
+  approverId  String?
+  approvedBy  String? // Alias for approverId
+  approvedAt  DateTime?
+
+  // Date ranges
+  startDate DateTime?
+  endDate   DateTime?
+
+  // Timestamps
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  // 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)
+  submitter    User?         @relation("BudgetSubmitter", fields: [submittedBy], references: [id])
+  approver     User?         @relation("BudgetApprover", fields: [approverId], references: [id])
+  expenses     Expense[]
+
+  @@index([organizationId])
+  @@index([bashEventId])
+  @@index([clubId])
+  @@index([departmentId])
+  @@index([userId])
+  @@index([status])
+  @@index([fiscalYear])
+}
+
+model Expense {
+  id              String    @id @default(cuid())
+  budgetId        String
+  submittedBy     String
+  description     String
+  amountCents     Int
+  category        String?
+  receiptUrl      String?
+  expenseDate     DateTime? // When the expense occurred
+  status          String    @default("Pending") // Pending, Approved, Rejected
+  approvedBy      String?
+  approvedAt      DateTime?
+  rejectionReason String?
+  createdAt       DateTime  @default(now())
+  updatedAt       DateTime  @updatedAt
+  budget          Budget    @relation(fields: [budgetId], references: [id], onDelete: Cascade)
+  submitter       User      @relation("ExpenseSubmitter", fields: [submittedBy], references: [id])
+  approver        User?     @relation("ExpenseApprover", fields: [approvedBy], references: [id])
+
+  @@index([budgetId])
+  @@index([submittedBy])
+  @@index([status])
 }
 
 model ServiceRange {
@@ -2345,11 +2588,87 @@ model ServiceAddon {
   priceCents                Int
   quantity                  Int
   status                    ServiceAddonStatus       @default(Enabled)
+  imageUrl                  String? // Add-on image URL
+  imageAlt                  String? // Alt text for accessibility
   servicePackageId          String?
   serviceRatesAssociationId String?
   servicePackage            ServicePackage?          @relation(fields: [servicePackageId], references: [id], onDelete: Cascade)
   serviceRatesAssociation   ServiceRatesAssociation? @relation(fields: [serviceRatesAssociationId], references: [id], onDelete: Cascade)
   ServiceBookingAddOn       ServiceBookingAddOn[]
+  convertedFromInclude      ServiceInclude[]         @relation("IncludeConvertedToAddon")
+  convertedFromRequest      ServiceAddonRequest[]    @relation("RequestConvertedToAddon")
+
+  @@index([imageUrl])
+}
+
+model ServiceInclude {
+  id                 String                  @id @default(cuid())
+  serviceId          String
+  suggestedByUserId  String? // Who suggested it (null if anonymous)
+  name               String // e.g., "Tables and Chairs"
+  description        String? // Optional details
+  status             ServiceIncludeStatus    @default(Pending)
+  providerResponse   ServiceIncludeResponse? // How provider responded
+  responseNote       String? // Optional note from provider
+  convertedToAddonId String? // If converted to paid add-on
+  voteCount          Int                     @default(0) // Net votes (upvotes - downvotes)
+  upvoteCount        Int                     @default(0)
+  downvoteCount      Int                     @default(0)
+  isActuallyIncluded Boolean                 @default(false) // Provider confirmed it IS included
+  createdAt          DateTime                @default(now())
+  updatedAt          DateTime                @updatedAt
+
+  service          Service             @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  suggestedBy      User?               @relation("SuggestedIncludes", fields: [suggestedByUserId], references: [id], onDelete: SetNull)
+  convertedToAddon ServiceAddon?       @relation("IncludeConvertedToAddon", fields: [convertedToAddonId], references: [id], onDelete: SetNull)
+  votes            ServiceIncludeVote[]
+
+  @@unique([serviceId, name]) // Prevent duplicate suggestions for same service
+  @@index([serviceId])
+  @@index([status])
+  @@index([voteCount])
+  @@index([createdAt])
+}
+
+model ServiceIncludeVote {
+  id               String         @id @default(cuid())
+  serviceIncludeId String
+  userId           String
+  voteType         VoteType // Upvote or Downvote
+  createdAt        DateTime       @default(now())
+  updatedAt        DateTime       @updatedAt
+
+  serviceInclude ServiceInclude @relation(fields: [serviceIncludeId], references: [id], onDelete: Cascade)
+  user           User           @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@unique([serviceIncludeId, userId]) // One vote per user per include
+  @@index([serviceIncludeId])
+  @@index([userId])
+}
+
+model ServiceAddonRequest {
+  id                 String                      @id @default(cuid())
+  serviceId          String
+  userId             String? // null if anonymous
+  name               String // e.g., "Specialty Lighting Package"
+  description        String? // Optional details
+  status             ServiceAddonRequestStatus   @default(Pending)
+  providerNote       String? // Provider's response/notes
+  notifyOnAvailable  Boolean                     @default(false) // Customer wants notification
+  convertedToAddonId String? // Links to actual ServiceAddon if created
+  requestCount       Int                         @default(1) // How many customers requested this
+  createdAt          DateTime                    @default(now())
+  updatedAt          DateTime                    @updatedAt
+
+  service          Service       @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  user             User?         @relation("RequestedAddons", fields: [userId], references: [id], onDelete: SetNull)
+  convertedToAddon ServiceAddon? @relation("RequestConvertedToAddon", fields: [convertedToAddonId], references: [id], onDelete: SetNull)
+
+  @@index([serviceId])
+  @@index([status])
+  @@index([userId])
+  @@index([requestCount])
+  @@index([createdAt])
 }
 
 model ServicePackage {
@@ -3410,7 +3729,7 @@ enum UserIntent {
 }
 
 enum BashStatus {
-  Idea        // Pre-event idea gauging interest
+  Idea // Pre-event idea gauging interest
   Draft
   Pending
   PreSale
@@ -3729,11 +4048,6 @@ enum AudioVisualSupportSubType {
   ProjectorSetup
 }
 
-enum HostingSupportSubType {
-  Emcee
-  Greeter
-}
-
 enum PromotionAndMarketingSubType {
   Influencer
   Promoter
@@ -3744,6 +4058,10 @@ enum StaffingSubType {
   CrewHand
   ParkingManagement
   GuestRegistration
+  Greeter
+  Ushers
+  CoatCheck
+  DoorAttendant
   Security
 }
 
@@ -4770,21 +5088,14 @@ enum OrganizationType {
   GreekLife
   SocialClub
   Nonprofit
-  Corporation
-  EducationalInstitution
+  Other
+  Professional
+  RecordLabel
+  School
+  StudentClub
   Sports
-  Government
-  Cultural
-  Lifestyle
-  Political
-  Tourism
   Youth
-  Senior
-  Tradeshow
-  Conference
-  FoodAndBeverage
-  TechAndStartups
-  Other
+  Cultural
 }
 
 enum YearsOfExperience {
@@ -4805,6 +5116,34 @@ enum ServiceAddonStatus {
   Disabled
 }
 
+enum ServiceIncludeStatus {
+  Pending   // Customer suggested, awaiting provider review
+  Approved  // Provider confirmed it IS included
+  Declined  // Provider says not possible/won't include
+  Duplicate // Same as another suggestion
+}
+
+enum ServiceIncludeResponse {
+  NotPossible        // Can't offer this
+  Added              // Now included in base package
+  AlreadyIncluded    // Was already included
+  AvailableAsAddOn   // Can offer but as paid add-on
+  UnderConsideration // Thinking about it
+}
+
+enum VoteType {
+  Upvote
+  Downvote
+}
+
+enum ServiceAddonRequestStatus {
+  Pending      // New request
+  Acknowledged // Provider saw it
+  Added        // Provider created the add-on
+  Declined     // Provider won't offer this
+  Duplicate    // Same as another request
+}
+
 enum ServiceBookingFeeType {
   CleaningFee
   ProcessingFee