@bash-app/bash-common 20.2.0 → 20.4.0

package/package.json

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

package/prisma/schema.prisma

@@ -256,7 +256,7 @@ model Checkout {
   checkoutDateTime        DateTime? @default(now())
   tickets                 Ticket[]
   stripeCheckoutSessionId String?   @unique
-  bookings             Booking[]
+  bookings                Booking[]
 
   @@index(bashEventId)
 }
@@ -334,13 +334,11 @@ enum BookingStatus {
 
 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])
+  forUser                    User?          @relation(fields: [forUserId], references: [id])
   fullName                   String?
   email                      String?
   paidOn                     DateTime?
@@ -353,7 +351,6 @@ model Booking {
   checkout                   Checkout?      @relation(fields: [checkoutId], references: [id])
 
   @@index([serviceId])
-  @@index([ownerId])
   @@index([forUserId])
   @@index([checkoutId])
 }
@@ -835,9 +832,8 @@ model User {
   ticketTiersWaitListsIveJoined TicketTier[]
   contacts                      Contact[]
   bashEventPromoCodesIUsed      BashEventPromoCode[]
-  bookingsSent                  Booking[]              @relation("BookingsISent")
-  bookingsReceived              Booking[]              @relation("BookingsIHave")
   ServiceCheckout               ServiceCheckout[]
+  bookingForMe                  Booking[]
 }
 
 model Contact {
@@ -870,57 +866,56 @@ model AssociatedBash {
 }
 
 model Service {
-  id                   String                 @id @default(cuid())
-  ownerId              String
-  owner                User                   @relation(fields: [ownerId], references: [id], onDelete: Cascade)
-  dateCreated          DateTime               @default(now())
-  email                String
-  location             String?
-  streetAddress        String
-  city                 String
-  state                String
-  postalCode           String
-  country              String
-  phone                String
-  name                 String                 @default("New Service")
-  coverPhoto           String?
-  agreedToAgreement    Boolean?
-  media                Media[]
-  serviceTypes         ServiceType[]
-  customServiceTag     String[]
-  yearsOfExperince     YearsOfExperience      @default(LessThanOneYear)
-  serviceLinks         ServiceLink[]
-  description          String?
-  canContact           Boolean?
+  id                    String                 @id @default(cuid())
+  ownerId               String
+  owner                 User                   @relation(fields: [ownerId], references: [id], onDelete: Cascade)
+  dateCreated           DateTime               @default(now())
+  email                 String
+  location              String?
+  streetAddress         String
+  city                  String
+  state                 String
+  postalCode            String
+  country               String
+  phone                 String
+  name                  String                 @default("New Service")
+  coverPhoto            String?
+  agreedToAgreement     Boolean?
+  media                 Media[]
+  serviceTypes          ServiceType[]
+  customServiceTag      String[]
+  yearsOfExperince      YearsOfExperience      @default(LessThanOneYear)
+  serviceLinks          ServiceLink[]
+  description           String?
+  canContact            Boolean?
   // musicGenre            MusicGenreType?
-  visibility           VisibilityPreference   @default(Public)
+  visibility            VisibilityPreference   @default(Public)
   // bashesInterestedIn    BashEventType[]
-  status               ServiceStatus          @default(Draft)
-  venues               Venue[]
-  serviceRangeId       String                 @unique
-  serviceRange         ServiceRange           @relation("ServiceRange", fields: [serviceRangeId], references: [id], onDelete: Cascade)
-  targetAudience       TargetAudience?        @relation(fields: [targetAudienceId], references: [id])
-  targetAudienceId     String?                @unique
-  eventService         EventService[]
-  entertainmentService EntertainmentService[]
-  vendor               Vendor[]
-  exhibitor            Exhibitor[]
-  sponsor              Sponsor[]
-  organization         Organization[]
-  trademark            String?
-  manager              String?
-  dba                  String?
-  contactPerson        String?
-  contactPhone         String?
-  contactEmail         String?
-  businessPhone        String?
-  bookings             Booking[]
+  status                ServiceStatus          @default(Draft)
+  venues                Venue[]
+  serviceRangeId        String                 @unique
+  serviceRange          ServiceRange           @relation("ServiceRange", fields: [serviceRangeId], references: [id], onDelete: Cascade)
+  targetAudience        TargetAudience?        @relation(fields: [targetAudienceId], references: [id])
+  targetAudienceId      String?                @unique
+  eventServices         EventService[]
+  entertainmentServices EntertainmentService[]
+  vendors               Vendor[]
+  exhibitor             Exhibitor[]
+  sponsors              Sponsor[]
+  organizations         Organization[]
+  trademark             String?
+  manager               String?
+  dba                   String?
+  contactPerson         String?
+  contactPhone          String?
+  contactEmail          String?
+  businessPhone         String?
+  bookings              Booking[]
 
   @@index([email])
   @@index([phone])
 }
 
-
 model EventService {
   id                   String               @id @default(cuid())
   service              Service?             @relation(fields: [serviceId], references: [id])

package/src/extendedSchemas.ts

@@ -203,6 +203,14 @@ export const VENUE_DATA_TO_INCLUDE = {
   capacity: true,
   media: true,
 }
+export const VENDOR_DATA_TO_INCLUDE = {
+  service: true,
+  availableDateTimes: true,
+  targetAudience: true,
+  links: true,
+  crowdSize: true,
+  media: true,
+}
 
 export interface ServiceExt extends Service {
   owner: PublicUser;
@@ -213,12 +221,12 @@ export interface ServiceExt extends Service {
   venues?: Venue[];
   eventServices?: EventService[];
   entertainmentServices?: EntertainmentService[];
-  vendor?: Vendor[];
-  exhibitor?: Exhibitor[];
-  sponsor?: Sponsor[];
-  organization?: Organization[];
+  vendors?: Vendor[];
+  exhibitors?: Exhibitor[];
+  sponsors?: Sponsor[];
+  organizations?: Organization[];
   bookings?: Booking[];
-  serviceType?: ServiceType[];
+  serviceTypes: ServiceType[];
 }
 
 export interface ServiceLinkExt extends ServiceLink {
@@ -241,6 +249,9 @@ export const SERVICE_DATA_TO_INCLUDE = {
   },
   venues: {
     include: VENUE_DATA_TO_INCLUDE
+  },
+  vendors: {
+    include: VENDOR_DATA_TO_INCLUDE
   }
 }