@bash-app/bash-common 29.66.0 → 29.68.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "29.66.0",
+  "version": "29.68.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",
@@ -29,12 +29,14 @@
   "peerDependencies": {
     "@prisma/client": "^6.1.0",
     "dayjs": "^1.11.13",
+    "luxon": "^3.5.0",
     "prisma": "^6.1.0",
     "react-tailwindcss-datepicker": "^1.6.6",
     "tsx": "^4.10.3"
   },
   "devDependencies": {
     "@types/jest": "^29.5.5",
+    "@types/luxon": "^3.4.2",
     "@types/node": "^20.11.1",
     "@types/react": "^18.3.2",
     "@types/shelljs": "^0.8.15",

package/prisma/schema.prisma

@@ -191,7 +191,8 @@ model BashEvent {
   title                           String
   creatorId                       String
   creator                         User                      @relation("CreatedEvent", fields: [creatorId], references: [id], onDelete: Cascade)
-  isApproved                      Boolean?
+  createdAt                       DateTime                  @default(now())
+  isApproved                      Boolean?                  @default(false)
   description                     String?
   eventType                       String                    @default("Other")
   startDateTime                   DateTime?                 @default(now())
@@ -244,7 +245,6 @@ model BashEvent {
   venue                           Venue?                    @relation(fields: [venueId], references: [id])
   userPromoCodeRedemption         UserPromoCodeRedemption[]
   averageRating                   Float?                    @default(0)
-  createdAt                       DateTime                  @default(now()) // Timestamp for when the review was created
 }
 
 model Coordinates {
@@ -264,7 +264,7 @@ model Checkout {
   checkoutDateTime        DateTime? @default(now())
   tickets                 Ticket[]
   stripeCheckoutSessionId String?   @unique
-  bookings                Booking[]
+  // bookings                Booking[]
 
   @@index(bashEventId)
 }
@@ -289,16 +289,16 @@ model TicketTier {
 }
 
 model Ticket {
-  id                         String           @id @default(cuid())
+  id                         String        @id @default(cuid())
   ownerId                    String
-  owner                      User             @relation("TicketsIOwn", fields: [ownerId], references: [id])
+  owner                      User          @relation("TicketsIOwn", fields: [ownerId], references: [id])
   bashEventId                String
-  bashEvent                  BashEvent        @relation(fields: [bashEventId], references: [id])
+  bashEvent                  BashEvent     @relation(fields: [bashEventId], references: [id])
   ticketTierId               String?
-  ticketTier                 TicketTier?      @relation(fields: [ticketTierId], references: [id])
+  ticketTier                 TicketTier?   @relation(fields: [ticketTierId], references: [id])
   validDate                  DateTime?
   forUserId                  String?
-  forUser                    User?            @relation("TicketsISent", fields: [forUserId], references: [id])
+  forUser                    User?         @relation("TicketsISent", fields: [forUserId], references: [id])
   fullName                   String?
   email                      String?
   paidOn                     DateTime?
@@ -309,11 +309,9 @@ model Ticket {
   checkedInAt                DateTime?
   checkedOutAt               DateTime?
   invitationId               String?
-  invitation                 Invitation?      @relation("TicketsForInvitation", fields: [invitationId], references: [id])
+  invitation                 Invitation?   @relation("TicketsForInvitation", fields: [invitationId], references: [id])
   checkoutId                 String?
-  checkout                   Checkout?        @relation(fields: [checkoutId], references: [id])
-  ServiceCheckout            ServiceCheckout? @relation(fields: [serviceCheckoutId], references: [id])
-  serviceCheckoutId          String?
+  checkout                   Checkout?     @relation(fields: [checkoutId], references: [id])
 
   @@index([bashEventId])
 }
@@ -324,43 +322,34 @@ enum TicketStatus {
   Missed
 }
 
-model ServiceCheckout {
-  id                      String    @id @default(cuid())
-  ownerId                 String
-  owner                   User      @relation(fields: [ownerId], references: [id], onDelete: Cascade)
-  checkoutDateTime        DateTime? @default(now())
-  tickets                 Ticket[]
-  stripeCheckoutSessionId String?   @unique
-}
-
-enum BookingStatus {
-  Cancelled
-  Completed
-  Missed
-}
-
-model Booking {
-  id                         String         @id @default(cuid())
-  serviceId                  String
-  service                    Service        @relation(fields: [serviceId], references: [id])
-  validDate                  DateTime?
-  forUserId                  String?
-  forUser                    User?          @relation(fields: [forUserId], references: [id])
-  fullName                   String?
-  email                      String?
-  paidOn                     DateTime?
-  requireDeposit             Boolean?
-  status                     BookingStatus?
-  geoFenceCheckInUnnecessary Boolean?
-  checkedInAt                DateTime?
-  checkedOutAt               DateTime?
-  checkoutId                 String?
-  checkout                   Checkout?      @relation(fields: [checkoutId], references: [id])
+// enum BookingStatus {
+//   Cancelled
+//   Completed
+//   Missed
+// }
 
-  @@index([serviceId])
-  @@index([forUserId])
-  @@index([checkoutId])
-}
+// model Booking {
+//   id                         String         @id @default(cuid())
+//   serviceId                  String
+//   service                    Service        @relation(fields: [serviceId], references: [id])
+//   validDate                  DateTime?
+//   forUserId                  String?
+//   forUser                    User?          @relation(fields: [forUserId], references: [id])
+//   fullName                   String?
+//   email                      String?
+//   paidOn                     DateTime?
+//   requireDeposit             Boolean?
+//   status                     BookingStatus?
+//   geoFenceCheckInUnnecessary Boolean?
+//   checkedInAt                DateTime?
+//   checkedOutAt               DateTime?
+//   checkoutId                 String?
+//   checkout                   Checkout?      @relation(fields: [checkoutId], references: [id])
+
+//   @@index([serviceId])
+//   @@index([forUserId])
+//   @@index([checkoutId])
+// }
 
 model unusedModelButNeededForSomeTypesToBeDefinedForTypescript {
   id                    String             @id @default(cuid())
@@ -421,8 +410,8 @@ enum BashEventType {
   AfterParty
   AnimeAndCosplayFestival
   AnniversaryCelebration
-  ArtExhibitOpening
   ArtAndCraftNight
+  ArtExhibitOpening
   BBQCookout
   BabyShower
   BachelorOrBacheloretteParty
@@ -437,8 +426,8 @@ enum BashEventType {
   CarnivalAndFair
   CasinoNight
   CasualMixer
-  CharityBall
   CharityFundraiser
+  CharityGala
   ChristmasParty
   ChurchEvent
   CircusOrCarnivalParty
@@ -446,6 +435,7 @@ enum BashEventType {
   CollegeParty_FraternityOrSorority
   ComedyShowOrStandUpComedyNight
   ComicConvention
+  CommunityMovieNight
   Competition
   Concert
   CookingCompetition
@@ -456,17 +446,18 @@ enum BashEventType {
   DesertRave
   DiscoNight
   EasterGathering
-  EngagementParty
   ESportsGamingTournament
+  EngagementParty
   ExclusiveLuxuryRetreat
   FantasyThemedParty
   FashionShow
-  Fireside
-  FitnessFestival
-  FlashMob
   Festival
   FestivalFilm
   FestivalFood
+  Fireside
+  FitnessFestival
+  FlashMob
+  Fundraiser
   FundraisingEvent
   GalaDinner
   GameNight
@@ -474,7 +465,7 @@ enum BashEventType {
   GardenParty
   GoingAwayPartyOrFarewell
   GraduationParty
-  HalloweenCostumeParty
+  HalloweenParty
   HanukkahParty
   HistoricalEraParty
   HolidayParty
@@ -482,11 +473,14 @@ enum BashEventType {
   HousewarmingParty
   KaraokeNight
   KiteFlyingFestival
+  LaunchParty
   LiveBandPerformanceInALocalVenue
   Luau
+  LuxuryRetreat
   MansionParty
   MardiGras
   MasqueradeBall
+  Mastermind
   MotorcycleRally
   MovieNight
   MoviePremiere
@@ -504,30 +498,40 @@ enum BashEventType {
   PreParty
   ProductLaunch
   ProfessionalNetworkingEvent
+  PubCrawl
+  Rave
   Rave_General
   RetirementCelebration
+  Reunion
   Reunion_FamilyOrSchoolOrFriends
   SafariAdventureParty
+  SchoolEvent
   SchoolEvent_MiddleSchoolOrHighSchoolOrCollege
   ScienceFictionThemedParty
   SocialClubEvent
   SportsTournament
   SportsWatchParty
   SuperheroThemedParty
-  SurfCompetition
   ThanksgivingDinner
   ThemedCostumeParty
   ThemedDinnerParty
   ThemedPubCrawl
   Tournament
+  TradeShow
   TravelAndTradeShow
   TriviaNight
+  UniversityEvent
   ValentinesDayParty
   WeddingReception
   WelcomeHomeParty
   WellnessFestival
   WineTastingEvent
+  CharityBall
+  HalloweenCostumeParty
+  SurfCompetition
   Other
+
+  // ArtAndCraftNight, BBQCookout, BabyShower, Birthday, Bonfire, BookClubMeeting, BridalShower, BrunchGathering, EasterGathering, Fireside, GameNight, GardenParty, GoingAwayPartyOrFarewell, GraduationParty, HanukkahParty, HousewarmingParty, MovieNight, OutdoorActivity, OutdoorMovieNight_WithAProjector, PotluckVegan, PreParty, RetirementCelebration, SafariAdventureParty, ScienceFictionThemedParty, SocialClubEvent, SportsWatchParty, SuperheroThemedParty, ThanksgivingDinner, ThemedDinnerParty, TriviaNight, WelcomeHomeParty
 }
 
 model CustomBashEventType {
@@ -612,11 +616,17 @@ enum Education {
   NoPreference
 }
 
+enum UserIntent {
+  EventSeeker
+  EventOrganizer
+  VenueOwner
+}
+
 enum BashStatus {
   Draft
+  Pending
   PreSale
   Published
-  Pending
   Finished
 }
 
@@ -856,6 +866,7 @@ model User {
   stripeAccountId               String?                   @unique
   isSuperUser                   Boolean                   @default(false)
   // isSuspended                   Boolean                   @default(false)
+  intent                        UserIntent?
   googleCalendarAccess          String?
   givenName                     String?
   familyName                    String?
@@ -912,8 +923,7 @@ model User {
   ticketTiersWaitListsIveJoined TicketTier[]
   contacts                      Contact[]
   bashEventPromoCodesIUsed      BashEventPromoCode[]
-  serviceCheckouts              ServiceCheckout[]
-  bookingForMe                  Booking[]
+  // bookingForMe                  Booking[]
   userSubscription              UserSubscription?
   // serviceSubcriptions           ServiceSubscription[]
   volunteerService              VolunteerService[]
@@ -926,6 +936,9 @@ model User {
 
   // primaryStripeAccountDBId String?        @unique
   // primaryStripeAccountDB   StripeAccount? @relation("PrimaryStripeAccount", fields: [primaryStripeAccountDBId], references: [id], onDelete: Restrict, onUpdate: Restrict)
+  serviceBookingForCreator ServiceBooking[]         @relation("BookingCreator")
+  serviceBookingForUser    ServiceBooking[]         @relation("BookingForUser")
+  serviceBookingCheckout   ServiceBookingCheckout[]
 }
 
 model Contact {
@@ -1124,7 +1137,7 @@ model Service {
   visibility VisibilityPreference @default(Public)
 
   bashesNotInterestedIn BashEventType[]
-  bookings              Booking[]
+  // bookings              Booking[]
   media                 Media[]
   serviceLinks          ServiceLink[]
 
@@ -1144,6 +1157,7 @@ model Service {
 
   bashEvent               BashEvent[] // because a service needs to be associated with a bash to post to the bashfeed
   userPromoCodeRedemption UserPromoCodeRedemption[]
+  bookings                ServiceBooking[]
 }
 
 model StripeAccount {
@@ -1295,6 +1309,7 @@ model Venue {
   bashEvents BashEvent[]
 }
 
+//currently used for 1 free service listing per user
 model UserPromoCodeRedemption {
   id        String   @id @default(cuid())
   serviceId String?
@@ -1478,7 +1493,7 @@ model ServiceAddon {
   id          String @id @default(cuid())
   name        String
   description String
-  price       Int?
+  price       Int
   quantity    Int
 
   servicePackage   ServicePackage? @relation(fields: [servicePackageId], references: [id], onDelete: Cascade)
@@ -1486,6 +1501,7 @@ model ServiceAddon {
 
   serviceRatesAssociation   ServiceRatesAssociation? @relation(fields: [serviceRatesAssociationId], references: [id], onDelete: Cascade)
   serviceRatesAssociationId String?
+  ServiceBookingAddOn       ServiceBookingAddOn[]
 }
 
 model ServicePackage {
@@ -1498,6 +1514,7 @@ model ServicePackage {
 
   serviceRatesAssociation   ServiceRatesAssociation? @relation(fields: [serviceRatesAssociationId], references: [id], onDelete: Cascade)
   serviceRatesAssociationId String?
+  ServiceBookingPackage     ServiceBookingPackage[]
 }
 
 model ServiceRate {
@@ -1517,8 +1534,8 @@ model ServiceRate {
 // if isAvailable is false it is closed
 model ServiceSpecialRates {
   id        String   @id @default(cuid())
-  startDate DateTime @db.Date
-  endDate   DateTime @db.Date
+  startDate DateTime //needs to be DateTime and not just Date because of timezone conversions
+  endDate   DateTime
 
   serviceRateId String?
   serviceRate   ServiceRate? @relation(fields: [serviceRateId], references: [id], onDelete: Cascade)
@@ -1535,10 +1552,9 @@ model ServiceSpecialRates {
 // can have special rates on different days of the year (single or range)
 // free trial period with promo code (1 or 2 months of listing for free)
 model ServiceDailyRates {
-  id        String    @id @default(cuid())
-  dayOfWeek DayOfWeek
-  startTime DateTime  @db.Time
-  endTime   DateTime  @db.Time
+  id        String   @id @default(cuid())
+  startDate DateTime
+  endDate   DateTime
 
   serviceRateId String?
   serviceRate   ServiceRate? @relation(fields: [serviceRateId], references: [id], onDelete: Cascade)
@@ -1573,6 +1589,140 @@ model ServiceRatesAssociation {
   @@unique([serviceGeneralRatesId])
 }
 
+// model ServiceTicket {
+//   id                         String        @id @default(cuid())
+//   ownerId                    String
+//   owner                      User          @relation("TicketsIOwn", fields: [ownerId], references: [id])
+//   bashEventId                String
+//   bashEvent                  BashEvent     @relation(fields: [bashEventId], references: [id])
+//   ticketTierId               String?
+//   ticketTier                 TicketTier?   @relation(fields: [ticketTierId], references: [id])
+//   validDate                  DateTime?
+//   forUserId                  String?
+//   forUser                    User?         @relation("TicketsISent", fields: [forUserId], references: [id])
+//   fullName                   String?
+//   email                      String?
+//   paidOn                     DateTime?
+//   allowPromiseToPay          Boolean?
+//   status                     TicketStatus?
+//   isFreeGuest                Boolean?
+//   geoFenceCheckInUnnecessary Boolean?
+//   checkedInAt                DateTime?
+//   checkedOutAt               DateTime?
+//   invitationId               String?
+//   invitation                 Invitation?   @relation("TicketsForInvitation", fields: [invitationId], references: [id])
+//   checkoutId                 String?
+//   checkout                   Checkout?     @relation(fields: [checkoutId], references: [id])
+
+//   @@index([bashEventId])
+// }
+
+// enum ServiceTicketStatus {
+//   Cancelled
+//   Attended
+//   Missed
+// }
+
+model ServiceBookingAddOn {
+  id String @id @default(cuid())
+
+  serviceBookingDay   ServiceBookingDay @relation(fields: [serviceBookingDayId], references: [id])
+  serviceBookingDayId String
+
+  addOnId        String
+  addOn          ServiceAddon @relation(fields: [addOnId], references: [id])
+  chosenQuantity Int
+}
+
+model ServiceBookingPackage {
+  id String @id @default(cuid())
+
+  serviceBookingDay   ServiceBookingDay @relation(fields: [serviceBookingDayId], references: [id])
+  serviceBookingDayId String
+
+  packageId      String
+  package        ServicePackage @relation(fields: [packageId], references: [id])
+  chosenQuantity Int
+}
+
+model ServiceBookingDay {
+  id String @id @default(cuid())
+
+  serviceBookingRequest   ServiceBooking? @relation(fields: [serviceBookingRequestId], references: [id])
+  serviceBookingRequestId String?
+
+  startDate DateTime
+  endDate   DateTime
+
+  addOns   ServiceBookingAddOn[]
+  packages ServiceBookingPackage[]
+}
+
+model ServiceBooking {
+  id String @id @default(cuid())
+
+  creatorId String
+  creator   User   @relation("BookingCreator", fields: [creatorId], references: [id], onDelete: Cascade)
+
+  forUserId String
+  forUser   User   @relation("BookingForUser", fields: [forUserId], references: [id], onDelete: Cascade)
+
+  bookedDays ServiceBookingDay[]
+
+  serviceId String
+  service   Service @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+
+  status      ServiceBookingStatus @default(Pending)
+  bookingType ServiceBookingType   @default(Request)
+
+  requestedOn DateTime?
+  confirmedOn DateTime?
+  paidOn      DateTime?
+  refundedOn  DateTime?
+
+  isFreeGuest       Boolean @default(false)
+  allowPromiseToPay Boolean @default(false)
+
+  totalAmount   Int //stored in cents
+  depositAmount Int
+  checkout      ServiceBookingCheckout?
+
+  @@index([status])
+  @@index([creatorId])
+  @@index([forUserId])
+}
+
+model ServiceBookingCheckout {
+  id String @id @default(cuid())
+
+  bookingDataId String         @unique
+  bookingData   ServiceBooking @relation(fields: [bookingDataId], references: [id], onDelete: Cascade)
+
+  creatorId String
+  creator   User   @relation(fields: [creatorId], references: [id], onDelete: Cascade)
+
+  checkoutDateTime        DateTime? @default(now())
+  stripeCheckoutSessionId String?   @unique
+
+  totalAmount   Int //stored in cents
+  depositAmount Int
+
+  @@index(creatorId)
+}
+
+enum ServiceBookingStatus {
+  Pending //pending request
+  Approved //approved request
+  Rejected //rejected request
+  Confirmed //when payment is complete
+  Canceled //canceled request or booking
+}
+
+enum ServiceBookingType {
+  Request
+  Instant
+}
+
 enum VisibilityPreference {
   Public
   Private