@bash-app/bash-common 30.48.0 → 30.49.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "30.48.0",
+  "version": "30.49.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",
@@ -24,6 +24,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@types/qrcode": "^1.5.5",
     "lodash-es": "^4.17.21",
+    "mixpanel-browser": "^2.65.0",
     "npm": "^10.5.0",
     "qrcode": "^1.5.3"
   },
@@ -38,6 +39,7 @@
   "devDependencies": {
     "@types/jest": "^29.5.5",
     "@types/luxon": "^3.4.2",
+    "@types/mixpanel-browser": "^2.60.0",
     "@types/node": "^20.11.1",
     "@types/react": "^18.3.2",
     "@types/shelljs": "^0.8.15",

package/prisma/schema.prisma

@@ -262,6 +262,11 @@ model Invitation {
 enum BashEventSource {
   Bash
   Eventbrite
+  Insomniac
+  UtahValley
+  LinkedIn
+  Meetup
+  Facebook
 }
 
 model BashEvent {
@@ -751,7 +756,14 @@ enum Education {
 enum UserIntent {
   EventSeeker
   EventOrganizer
+  Volunteer
+  EntertainmentService
+  EventService
+  Vendor
+  Sponsor
+  Exhibitor
   VenueOwner
+  OrganizationOwner
   Lonely
 }
 
@@ -1115,6 +1127,8 @@ model User {
   trendingBashThreshold   Int             @default(10) // Min attendees to trigger notification
   organizerUser           UserFollowing[] @relation("FollowingOrganizers")
   favorites               UserFavorite[]
+
+  vendorBid VendorBid[]
 }
 
 model UserPreferences {
@@ -1123,68 +1137,90 @@ model UserPreferences {
   user   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
 
   // Notification Preferences
-  emailNotifications      Boolean @default(true)
-  pushNotifications       Boolean @default(true)
-  smsNotifications        Boolean @default(false)
-  newMessageNotify        Boolean @default(true)
-  eventReminderNotify     Boolean @default(true)
-  friendRequestNotify     Boolean @default(true)
-  commentNotify           Boolean @default(true)
-  invitationNotify        Boolean @default(true)
-  eventUpdatesNotify      Boolean @default(true)
-  servicePromotionsNotify Boolean @default(true)
-  trendingBashesNotify    Boolean @default(false) // New field
-  organizerUpdatesNotify  Boolean @default(false) // New field
+  emailNotifications           Boolean @default(true)
+  pushNotifications           Boolean @default(true)
+  marketingEmails             Boolean @default(true)    // Added from our UI
+  eventUpdates                Boolean @default(true)    // Added from our UI
+  serviceBookingNotifications Boolean @default(true)    // Added from our UI
+  reviewReminders             Boolean @default(true)    // Added from our UI
+  newFollowerNotifications    Boolean @default(true)    // Added from our UI
+  trendingBashesNotify        Boolean @default(true)    // Updated default to true
+  organizerUpdatesNotify      Boolean @default(true)    // Updated default to true
+  recurringReminders          Boolean @default(true)    // NEW - multiple reminders as event approaches
+  eventSuggestions            Boolean @default(true)    // NEW - event planning tips and suggestions
+  serviceSuggestions          Boolean @default(true)    // NEW - vendor/service recommendations
+  eventReminderNotify         Boolean @default(true)
+  newMessageNotify            Boolean @default(true)
+  invitationNotify            Boolean @default(true)
+  commentNotify               Boolean @default(true)
+  servicePromotionsNotify     Boolean @default(true)
 
   // Privacy Settings
-  profileVisibility      String   @default("PUBLIC") // PUBLIC, FRIENDS, PRIVATE
-  showOnlineStatus       Boolean  @default(true)
-  allowTagging           Boolean  @default(true)
-  allowDirectMessages    Boolean  @default(true)
-  showActivityStatus     Boolean  @default(true)
-  hiddenBashIds          String[] @default([])
-  hideActivitySection    Boolean  @default(false)
-  allowLocationSharing   Boolean  @default(false)
-  blockSearchEngineIndex Boolean  @default(false)
+  profileVisibility       String   @default("public")    // Updated to lowercase, matches our UI
+  eventHistoryVisibility  Boolean  @default(true)        // Added from our UI
+  servicesVisibility      Boolean  @default(true)        // Added from our UI
+  searchVisibility        Boolean  @default(true)        // Added from our UI
+  hideFollowLists         Boolean  @default(false)       // NEW - hide follower/following lists
+  attendancePrivacy       String   @default("public")    // Updated to lowercase, matches our UI
+  hideEventPrices         Boolean  @default(false)       // NEW - hide prices until day of event
+  showOnlineStatus        Boolean  @default(true)
+  allowDirectMessages     Boolean  @default(true)
+  blockSearchEngineIndex  Boolean  @default(false)
+
+  // Contact Management (NEW SECTION)
+  autoAddEventAttendees   Boolean @default(true)        // NEW - auto-add event attendees to contacts
+  trackFirstEventAttended Boolean @default(true)        // NEW - remember which bash connected you
+  autoAddServiceClients   Boolean @default(true)        // NEW - auto-add service clients to contacts
 
   // UI/UX Preferences
-  theme               String  @default("SYSTEM") // LIGHT, DARK, SYSTEM
-  language            String  @default("en-US")
+  theme               String  @default("system")        // Updated to lowercase, matches our UI
+  language            String  @default("en")            // Simplified from en-US
   timeZone            String  @default("America/New_York")
-  defaultLandingPage  String  @default("dashboard")
-  contentDensity      String  @default("COMFORTABLE") // COMPACT, COMFORTABLE, SPACIOUS
-  fontScale           String  @default("MEDIUM") // SMALL, MEDIUM, LARGE
-  animationsEnabled   Boolean @default(true)
-  useHighContrastMode Boolean @default(false)
-
-  // Content Preferences
-  contentFilters        String[] @default([])
-  topicInterests        String[] @default([])
-  hideSeenContent       Boolean  @default(false)
-  autoplayVideos        Boolean  @default(true)
-  contentSortPreference String   @default("RECENT") // RECENT, POPULAR, RELEVANT
-  contentLanguages      String[] @default(["en"])
-  showSensitiveContent  Boolean  @default(false)
-
-  // Calendar & Event Preferences
-  defaultCalendarView  String @default("MONTH") // DAY, WEEK, MONTH, AGENDA
-  calendarStartDay     Int    @default(0) // 0=Sunday, 1=Monday
-  defaultEventReminder Int    @default(60) // Minutes before event
-  attendancePrivacy    String @default("PUBLIC") // PUBLIC, FRIENDS, PRIVATE
-
-  // Communications Preferences
-  communicationFrequency String @default("NORMAL") // LOW, NORMAL, HIGH
-  preferredContactMethod String @default("EMAIL") // EMAIL, PUSH, SMS
-
-  // Data & Payment Preferences  
-  dataUsageConsent  Boolean @default(true)
-  analyticsConsent  Boolean @default(true)
+
+  // Event Preferences
+  eventReminderTiming String @default("1day")          // NEW - 1hour, 1day, 1week (replaces defaultEventReminder)
+  locationRadius      Int    @default(50)               // NEW - miles for event suggestions
+  calendarStartDay    Int    @default(0)               // 0=Sunday, 1=Monday
+  defaultCalendarView String @default("MONTH")         // DAY, WEEK, MONTH, AGENDA
+
+  // Security & Consent Preferences
+  biometricAuthEnabled Boolean @default(false)         // NEW - Face ID/Touch ID/Fingerprint
+  dataUsageConsent     Boolean @default(true)
+  analyticsConsent     Boolean @default(true)
+
+  // Payment Preferences  
   preferredCurrency String  @default("USD")
   savePaymentInfo   Boolean @default(false)
   showEventPrices   Boolean @default(true)
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
+
+  // Less Relevant Fields (moved to bottom)
+  smsNotifications        Boolean @default(false)      // We're not using SMS
+  friendRequestNotify     Boolean @default(true)       // We use followers, not friends
+  allowTagging           Boolean @default(true)
+  showActivityStatus     Boolean @default(true)
+  hiddenBashIds          String[] @default([])
+  hideActivitySection    Boolean @default(false)
+  allowLocationSharing   Boolean @default(false)
+  defaultLandingPage     String  @default("dashboard")
+  contentDensity         String  @default("COMFORTABLE") // COMPACT, COMFORTABLE, SPACIOUS
+  fontScale              String  @default("MEDIUM")     // SMALL, MEDIUM, LARGE
+  animationsEnabled      Boolean @default(true)
+  useHighContrastMode    Boolean @default(false)
+  contentFilters         String[] @default([])
+  topicInterests         String[] @default([])
+  hideSeenContent        Boolean  @default(false)
+  autoplayVideos         Boolean  @default(true)
+  contentSortPreference  String   @default("RECENT")    // RECENT, POPULAR, RELEVANT
+  contentLanguages       String[] @default(["en"])
+  showSensitiveContent   Boolean  @default(false)
+  defaultEventReminder   Int      @default(60)          // Minutes before event (replaced by eventReminderTiming)
+  communicationFrequency String   @default("NORMAL")    // LOW, NORMAL, HIGH
+  preferredContactMethod String   @default("EMAIL")     // EMAIL, PUSH, SMS
+
+  @@map("user_preferences")
 }
 
 model UserFollowing {
@@ -1602,9 +1638,58 @@ model Vendor {
   subType              String?
   otherSubType         String?
   detailsText          String?
-  service              Service?
+
+  // Booth fee range fields
+  minBoothFeeCents       Int? @default(0)
+  maxBoothFeeCents       Int? @default(0)
+  preferredBoothFeeCents Int? @default(0)
+
+  service    Service?
+  vendorBids VendorBid[] // Relation to bids
 }
 
+model VendorBid {
+  id       String @id @default(cuid())
+  vendorId String
+  vendor   Vendor @relation(fields: [vendorId], references: [id], onDelete: Cascade)
+
+  // Host (bidder) information
+  userId String
+  user   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  // Bid details
+  bidAmountCents    Int
+  eventDetails      String    @db.Text
+  eventDate         DateTime?
+  expectedAttendees Int?
+
+  // Bid status
+  status          VendorBidStatus @default(Pending)
+  respondedAt     DateTime?
+  responseMessage String?
+
+  // Payment tracking (if accepted)
+  stripePaymentIntentId String?
+  paidAt                DateTime?
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@index([vendorId])
+  @@index([userId])
+  @@index([status])
+}
+
+enum VendorBidStatus {
+  Pending
+  Accepted
+  Rejected
+  Withdrawn
+  Expired
+  Paid
+}
+
+
 model Exhibitor {
   id                  String            @id @default(cuid())
   serviceRangeId      String?
@@ -1875,6 +1960,42 @@ enum EventManagerFormat {
   MultiVenueManager
 }
 
+enum LightCleaningFormat {
+  PreEventSetup
+  DuringEventMaintenance
+  PostEventCleanup
+  VenueWipeDown
+  TrashRemoval
+  BathroomMaintenance
+  DiningAreaCleanup
+  KitchenBasics
+  FloorSweeping
+  SurfaceCleaning
+  WindowCleaning
+  TableReset
+  ChairArrangement
+  BasicVacuuming
+  SpotCleaning
+}
+
+enum DeepCleaningFormat {
+  PreEventDeepClean
+  PostEventRestoration
+  CarpetCleaning
+  FloorStripping
+  WindowWashing
+  KitchenDeepClean
+  BathroomSanitization
+  UpholsteryClean
+  VenueDisinfection
+  EquipmentCleaning
+  HighDusting
+  PressureWashing
+  GraffitiRemoval
+  FloorWaxing
+  DetailedSanitization
+}
+
 enum VirtualAssistantFormat {
   EventScheduling
   VendorCoordination
@@ -3111,6 +3232,11 @@ model ServiceBooking {
   bashEventId String?
   bashEvent   BashEvent? @relation(fields: [bashEventId], references: [id])
 
+   // Vendor-specific booking fields
+  isVendorBid          Boolean @default(false)
+  vendorBidAmountCents Int? // Custom bid amount for vendor bookings
+  vendorEventDetails   String? // Additional event details for vendor
+
   @@index([status])
   @@index([creatorId])
   @@index([forUserId])

package/src/extendedSchemas.ts

@@ -721,6 +721,7 @@ export const INVITATION_DATA_TO_INCLUDE = {
 export interface InvitationExtraData extends Invitation {
   isFreeGuest: boolean;
   isOrganizer?: boolean;
+  isOwnershipTransfer?: boolean;
 }
 
 export interface AssociatedBashExt extends AssociatedBash {

package/src/utils/service/serviceBookingStatusUtils.ts

@@ -107,20 +107,20 @@ export function serviceBookingCanHaveApprovalDecision(
       errorMessage: "Approval decisions can only be made on booking requests.",
     };
   }
-  // if (serviceBookingIsCanceled(booking)) {
-  //   return {
-  //     valid: false,
-  //     errorMessage:
-  //       "Approval decisions can not be made on canceled booking requests.",
-  //   };
-  // }
-  // if (serviceBookingIsConfirmed(booking)) {
-  //   return {
-  //     valid: false,
-  //     errorMessage:
-  //       "Approval decisions can not be made on confirmed booking requests.",
-  //   };
-  // }
+  if (serviceBookingIsCanceled(booking)) {
+    return {
+      valid: false,
+      errorMessage:
+        "Approval decisions can not be made on canceled booking requests.",
+    };
+  }
+  if (serviceBookingIsConfirmed(booking)) {
+    return {
+      valid: false,
+      errorMessage:
+        "Approval decisions can not be made on confirmed booking requests.",
+    };
+  }
 
   return { valid: true };
 }