@bash-app/bash-common 29.67.0 → 29.69.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "29.67.0",
+  "version": "29.69.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

@@ -140,25 +140,30 @@ model BashEventPromoCode {
 }
 
 model BashNotification {
-  id              String      @id @default(cuid())
-  creatorId       String
-  creator         User        @relation("NotificationsCreatedByMe", fields: [creatorId], references: [id], onDelete: Cascade)
-  email           String
-  createdDateTime DateTime    @default(now())
-  message         String
-  image           String?
-  readDateTime    DateTime?
-  taskId          String?
-  eventTask       EventTask?  @relation(fields: [taskId], references: [id], onDelete: Cascade)
-  invitationId    String?
-  invitation      Invitation? @relation(fields: [invitationId], references: [id], onDelete: Cascade)
-  bashEventId     String?
-  bashEvent       BashEvent?  @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
-  reminders       Reminder[]
-  redirectUrl     String?
+  id               String          @id @default(cuid())
+  creatorId        String
+  creator          User            @relation("NotificationsCreatedByMe", fields: [creatorId], references: [id], onDelete: Cascade)
+  email            String
+  createdDateTime  DateTime        @default(now())
+  message          String
+  image            String?
+  readDateTime     DateTime?
+  taskId           String?
+  eventTask        EventTask?      @relation(fields: [taskId], references: [id], onDelete: Cascade)
+  invitationId     String?
+  invitation       Invitation?     @relation(fields: [invitationId], references: [id], onDelete: Cascade)
+  bashEventId      String?
+  bashEvent        BashEvent?      @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+  serviceId        String?
+  service          Service?        @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  serviceBookingId String?
+  serviceBooking   ServiceBooking? @relation(fields: [serviceBookingId], references: [id], onDelete: Cascade)
+  reminders        Reminder[]
+  redirectUrl      String?
 
   @@unique([creatorId, email, bashEventId])
   @@unique([creatorId, email, invitationId])
+  @@unique([creatorId, email, serviceBookingId])
   @@index([creatorId])
 }
 
@@ -264,7 +269,7 @@ model Checkout {
   checkoutDateTime        DateTime? @default(now())
   tickets                 Ticket[]
   stripeCheckoutSessionId String?   @unique
-  bookings                Booking[]
+  // bookings                Booking[]
 
   @@index(bashEventId)
 }
@@ -289,16 +294,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 +314,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 +327,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 +415,8 @@ enum BashEventType {
   AfterParty
   AnimeAndCosplayFestival
   AnniversaryCelebration
-  ArtExhibitOpening
   ArtAndCraftNight
+  ArtExhibitOpening
   BBQCookout
   BabyShower
   BachelorOrBacheloretteParty
@@ -437,8 +431,8 @@ enum BashEventType {
   CarnivalAndFair
   CasinoNight
   CasualMixer
-  CharityBall
   CharityFundraiser
+  CharityGala
   ChristmasParty
   ChurchEvent
   CircusOrCarnivalParty
@@ -446,6 +440,7 @@ enum BashEventType {
   CollegeParty_FraternityOrSorority
   ComedyShowOrStandUpComedyNight
   ComicConvention
+  CommunityMovieNight
   Competition
   Concert
   CookingCompetition
@@ -456,17 +451,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 +470,7 @@ enum BashEventType {
   GardenParty
   GoingAwayPartyOrFarewell
   GraduationParty
-  HalloweenCostumeParty
+  HalloweenParty
   HanukkahParty
   HistoricalEraParty
   HolidayParty
@@ -482,11 +478,14 @@ enum BashEventType {
   HousewarmingParty
   KaraokeNight
   KiteFlyingFestival
+  LaunchParty
   LiveBandPerformanceInALocalVenue
   Luau
+  LuxuryRetreat
   MansionParty
   MardiGras
   MasqueradeBall
+  Mastermind
   MotorcycleRally
   MovieNight
   MoviePremiere
@@ -504,30 +503,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 {
@@ -624,6 +633,7 @@ enum BashStatus {
   PreSale
   Published
   Finished
+  // should we add Approved, Rejected, Confirmed, and Canceled like services has?
 }
 
 enum ServiceStatus {
@@ -862,7 +872,7 @@ model User {
   stripeAccountId               String?                   @unique
   isSuperUser                   Boolean                   @default(false)
   // isSuspended                   Boolean                   @default(false)
-  intent  UserIntent?
+  intent                        UserIntent?
   googleCalendarAccess          String?
   givenName                     String?
   familyName                    String?
@@ -919,8 +929,7 @@ model User {
   ticketTiersWaitListsIveJoined TicketTier[]
   contacts                      Contact[]
   bashEventPromoCodesIUsed      BashEventPromoCode[]
-  serviceCheckouts              ServiceCheckout[]
-  bookingForMe                  Booking[]
+  // bookingForMe                  Booking[]
   userSubscription              UserSubscription?
   // serviceSubcriptions           ServiceSubscription[]
   volunteerService              VolunteerService[]
@@ -933,6 +942,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 {
@@ -1131,7 +1143,7 @@ model Service {
   visibility VisibilityPreference @default(Public)
 
   bashesNotInterestedIn BashEventType[]
-  bookings              Booking[]
+  // bookings              Booking[]
   media                 Media[]
   serviceLinks          ServiceLink[]
 
@@ -1151,6 +1163,8 @@ model Service {
 
   bashEvent               BashEvent[] // because a service needs to be associated with a bash to post to the bashfeed
   userPromoCodeRedemption UserPromoCodeRedemption[]
+  bookings                ServiceBooking[]
+  bashNotification        BashNotification[]
 }
 
 model StripeAccount {
@@ -1302,6 +1316,7 @@ model Venue {
   bashEvents BashEvent[]
 }
 
+//currently used for 1 free service listing per user
 model UserPromoCodeRedemption {
   id        String   @id @default(cuid())
   serviceId String?
@@ -1485,7 +1500,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)
@@ -1493,6 +1508,7 @@ model ServiceAddon {
 
   serviceRatesAssociation   ServiceRatesAssociation? @relation(fields: [serviceRatesAssociationId], references: [id], onDelete: Cascade)
   serviceRatesAssociationId String?
+  ServiceBookingAddOn       ServiceBookingAddOn[]
 }
 
 model ServicePackage {
@@ -1505,6 +1521,7 @@ model ServicePackage {
 
   serviceRatesAssociation   ServiceRatesAssociation? @relation(fields: [serviceRatesAssociationId], references: [id], onDelete: Cascade)
   serviceRatesAssociationId String?
+  ServiceBookingPackage     ServiceBookingPackage[]
 }
 
 model ServiceRate {
@@ -1542,11 +1559,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())
-  startDayOfWeek DayOfWeek
-  startTime      DateTime  @db.Time
-  endDayOfWeek   DayOfWeek
-  endTime        DateTime  @db.Time
+  id        String   @id @default(cuid())
+  startDate DateTime
+  endDate   DateTime
 
   serviceRateId String?
   serviceRate   ServiceRate? @relation(fields: [serviceRateId], references: [id], onDelete: Cascade)
@@ -1581,6 +1596,153 @@ 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
+
+  // costATBCents 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
+
+  // costATBCents 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[]
+
+  // costATBCents Int
+}
+
+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)
+
+  timezone String //stored here instead of service incase different service types operate in multiple timezones (requesters timezone would matter)
+
+  requestedOn       DateTime?
+  requestDecisionOn DateTime?
+  bookedOn          DateTime?
+  canceledOn        DateTime?
+
+  isFreeGuest       Boolean @default(false)
+  allowPromiseToPay Boolean @default(false)
+
+  checkout         ServiceBookingCheckout?
+  bashNotification BashNotification[]
+
+  // costATBCents Int
+
+  @@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
+  stripePaymentIntentId   String?   @unique
+
+  paidOn     DateTime?
+  refundedOn DateTime?
+
+  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