@bash-app/bash-common 19.0.1 → 19.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "19.0.1",
+  "version": "19.1.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",

package/prisma/schema.prisma

@@ -243,6 +243,7 @@ model BashEvent {
   subtitle                       String?
   isFeatured                     Boolean?
   isTrending                     Boolean?
+  ServiceCheckout                ServiceCheckout[]
 }
 
 model Checkout {
@@ -254,10 +255,22 @@ model Checkout {
   checkoutDateTime        DateTime? @default(now())
   tickets                 Ticket[]
   stripeCheckoutSessionId String?   @unique
+  Booking                 Booking[]
 
   @@index(bashEventId)
 }
 
+model ServiceCheckout {
+  id                      String    @id @default(cuid())
+  ownerId                 String
+  owner                   User      @relation(fields: [ownerId], references: [id], onDelete: Cascade)
+  bashEventId             String
+  bashEvent               BashEvent @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+  checkoutDateTime        DateTime? @default(now())
+  tickets                 Ticket[]
+  stripeCheckoutSessionId String?   @unique
+}
+
 model TicketTier {
   id                     String               @id @default(cuid())
   bashEventId            String
@@ -277,16 +290,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?
@@ -297,9 +310,11 @@ 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])
+  checkout                   Checkout?        @relation(fields: [checkoutId], references: [id])
+  ServiceCheckout            ServiceCheckout? @relation(fields: [serviceCheckoutId], references: [id])
+  serviceCheckoutId          String?
 
   @@index([bashEventId])
 }
@@ -310,6 +325,38 @@ enum TicketStatus {
   Missed
 }
 
+enum BookingStatus {
+  Cancelled
+  Completed
+  Missed
+}
+
+model Booking {
+  id                         String         @id @default(cuid())
+  ownerId                    String
+  owner                      User           @relation("BookingsIHave", fields: [ownerId], references: [id])
+  serviceId                  String
+  service                    Service        @relation(fields: [serviceId], references: [id])
+  validDate                  DateTime?
+  forUserId                  String?
+  forUser                    User?          @relation("BookingsISent", 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([ownerId])
+  @@index([forUserId])
+  @@index([checkoutId])
+}
+
 model unusedModelButNeededForSomeTypesToBeDefinedForTypescript {
   id                    String             @id @default(cuid())
   doNotUseVibeEnum      BashEventVibeTags  @default(Wild)
@@ -792,6 +839,9 @@ model User {
   ticketTiersWaitListsIveJoined TicketTier[]
   contacts                      Contact[]
   bashEventPromoCodesIUsed      BashEventPromoCode[]
+  bookingsSent                  Booking[]              @relation("BookingsISent")
+  bookingsReceived              Booking[]              @relation("BookingsIHave")
+  ServiceCheckout               ServiceCheckout[]
 }
 
 model Contact {
@@ -828,14 +878,16 @@ model Service {
   ownerId              String
   owner                User                   @relation(fields: [ownerId], references: [id], onDelete: Cascade)
   serviceId            String
+  dateCreated DateTime
   email                String
+  location             String?
   streetAddress        String
   city                 String
   state                String
   postalCode           String
   country              String
   phone                String
-  name                String
+  name                 String
   coverPhoto           String?
   agreedToAgreement    Boolean?
   media                Media[]
@@ -867,6 +919,7 @@ model Service {
   contactPhone         String?
   contactEmail         String?
   businessPhone        String?
+  bookings              Booking[]
 
   @@index([email])
   @@index([phone])

package/src/definitions.ts

@@ -4,6 +4,7 @@ import {
   BashEventVibeTags,
   Contact,
   DayOfWeek,
+  ServiceType,
   Ticket,
   TicketTier,
   User,
@@ -410,6 +411,20 @@ export const BashEventTypeToString: BashEventTypeToStringType = {
   [BashEventType.Other]: "Other",
 }
 
+export type ServiceTypeToStringType = {
+  [key in ServiceType]: string;
+};
+export const ServiceTypeToString: ServiceTypeToStringType = {
+  [ServiceType.Volunteer]: "/servicesDefault.webp",
+  [ServiceType.EventService]: "/servicesDefault.webp",
+  [ServiceType.EntertainmentService]: "/servicesDefault.webp",
+  [ServiceType.Vendor]: "/servicesDefault.webp",
+  [ServiceType.Exhibitor]: "/servicesDefault.webp",
+  [ServiceType.Sponsor]: "/servicesDefault.webp",
+  [ServiceType.Venue]: "/servicesDefault.webp",
+  [ServiceType.Organization]: "/servicesDefault.webp"
+  }
+
 export type RecordKey = string | number | symbol;
 export type PartialExcept<T, K extends keyof T> = Partial<T> & {[P in K]: T[P]};
 type GetTypeOfArray<T> = T extends (infer U)[] ? U : never;

package/src/extendedSchemas.ts

@@ -214,7 +214,13 @@ export interface ServiceExt extends Service {
   serviceRange: ServiceRange;
   targetAudience: TargetAudience;
   serviceLinks?: ServiceLinkExt[];
-  venues: VenueExt[];
+  venues?: Venue[];
+  eventServices?: EventService[];
+  entertainmentServices?: EntertainmentService[];
+  vendor?: Vendor[];
+  exhibitor?: Exhibitor[];
+  sponsor?: Sponsor[];
+  organization?: Organization[];
 }
 
 export interface ServiceLinkExt extends ServiceLink {