@bash-app/bash-common 25.5.0 → 26.1.0

package/package.json

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

package/prisma/schema.prisma

@@ -344,8 +344,8 @@ enum BookingStatus {
 
 model Booking {
   id                         String         @id @default(cuid())
-  businessId                 String
-  business                   Business       @relation(fields: [businessId], references: [id])
+  serviceId                  String
+  service                    Service        @relation(fields: [serviceId], references: [id])
   validDate                  DateTime?
   forUserId                  String?
   forUser                    User?          @relation(fields: [forUserId], references: [id])
@@ -360,7 +360,7 @@ model Booking {
   checkoutId                 String?
   checkout                   Checkout?      @relation(fields: [checkoutId], references: [id])
 
-  @@index([businessId])
+  @@index([serviceId])
   @@index([forUserId])
   @@index([checkoutId])
 }
@@ -571,7 +571,7 @@ model TargetAudience {
   showOnDetailPage Boolean    @default(true)
 
   bashEvent            BashEvent?
-  business             Business?
+  service              Service?
   venue                Venue?
   vendor               Vendor?
   eventService         EventService?
@@ -697,8 +697,7 @@ model Media {
   mimetype                     String?
   bashEventsReferencingMe      BashEvent[]
   sponsoredEventsReferencingMe SponsoredEvent[]
-  businessesReferencingMe      Business[]
-  venueReferencingMe           Venue[]
+  serviceReferencingMe         Service[]
   EventService                 EventService?         @relation(fields: [eventServiceId], references: [id])
   eventServiceId               String?
   entertainmentService         EntertainmentService? @relation(fields: [entertainmentServiceId], references: [id])
@@ -709,6 +708,8 @@ model Media {
   exhibitorId                  String?
   sponsor                      Sponsor?              @relation(fields: [sponsorId], references: [id])
   sponsorId                    String?
+  venue                        Venue?                @relation(fields: [venueId], references: [id])
+  venueId                      String?
   organization                 Organization?         @relation(fields: [organizationId], references: [id])
   organizationId               String?
   volunteerServiceId           String?
@@ -790,12 +791,12 @@ enum SponsorType {
 }
 
 model User {
-  id                            String                @id @default(cuid())
-  email                         String                @unique
-  createdOn                     DateTime              @default(now())
-  stripeCustomerId              String?               @unique
-  stripeAccountId               String?               @unique
-  isSuperUser                       Boolean                @default(false)
+  id                            String                 @id @default(cuid())
+  email                         String                 @unique
+  createdOn                     DateTime               @default(now())
+  stripeCustomerId              String?                @unique
+  stripeAccountId               String?                @unique
+  isSuperUser                   Boolean                @default(false)
   googleCalendarAccess          String?
   givenName                     String?
   familyName                    String?
@@ -806,11 +807,11 @@ model User {
   dob                           DateTime?
   gender                        Gender?
   sex                           Sex?
-  roles                         UserRole[]            @default([User])
-  businesses                    Business[]
-  createdEvents                 BashEvent[]           @relation("CreatedEvent")
-  ticketsISent                  Ticket[]              @relation("TicketsISent")
-  ticketsIOwn                   Ticket[]              @relation("TicketsIOwn")
+  roles                         UserRole[]             @default([User])
+  createdServices               Service[]              @relation("CreatedService")
+  createdEvents                 BashEvent[]            @relation("CreatedEvent")
+  ticketsISent                  Ticket[]               @relation("TicketsISent")
+  ticketsIOwn                   Ticket[]               @relation("TicketsIOwn")
   reviews                       Review[]
   sponsorships                  SponsoredEvent[]
   investments                   Investment[]
@@ -833,18 +834,18 @@ model User {
   city                          String?
   state                         String?
   zipCode                       String?
-  country                       String?               @default("US")
+  country                       String?                @default("US")
   phone                         String?
-  documentIDId                  String?               @unique
+  documentIDId                  String?                @unique
   documentID                    DocumentID?
   comment                       BashComment[]
   associatedBashes              AssociatedBash[]
-  invitationsCreatedByMe        Invitation[]          @relation("InvitationsCreatedByMe")
-  invitationsSentToMe           Invitation[]          @relation("InvitationsSentToMe")
-  notificationsCreatedByMe      BashNotification[]    @relation("NotificationsCreatedByMe")
-  remindersCreatedByMe          Reminder[]            @relation("RemindersCreatedByMe")
-  remindersAssignedToMe         Reminder[]            @relation("RemindersAssignedToMe")
-  eventTasksAssignedToMe        EventTask[]           @relation("TasksAssignedToMe")
+  invitationsCreatedByMe        Invitation[]           @relation("InvitationsCreatedByMe")
+  invitationsSentToMe           Invitation[]           @relation("InvitationsSentToMe")
+  notificationsCreatedByMe      BashNotification[]     @relation("NotificationsCreatedByMe")
+  remindersCreatedByMe          Reminder[]             @relation("RemindersCreatedByMe")
+  remindersAssignedToMe         Reminder[]             @relation("RemindersAssignedToMe")
+  eventTasksAssignedToMe        EventTask[]            @relation("TasksAssignedToMe")
   checkouts                     Checkout[]
   ticketTiersWaitListsIveJoined TicketTier[]
   contacts                      Contact[]
@@ -854,6 +855,13 @@ model User {
   userSubscription              UserSubscription?
   serviceSubcriptions           ServiceSubscription[]
   volunteerService              VolunteerService[]
+  eventService                  EventService[]
+  entertainmentService          EntertainmentService[]
+  vendor                        Vendor[]
+  exhibitor                     Exhibitor[]
+  sponsor                       Sponsor[]
+  venue                         Venue[]
+  organization                  Organization[]
 }
 
 model Contact {
@@ -885,13 +893,15 @@ model AssociatedBash {
   @@unique([ownerEmail, bashEventId])
 }
 
-model Business {
+model Service {
   id                    String                 @id @default(cuid())
-  ownerId               String
-  owner                 User                   @relation(fields: [ownerId], references: [id], onDelete: Cascade)
+  // ownerId               String
+  // owner                 User                   @relation(fields: [ownerId], references: [id], onDelete: Cascade)
   // stripeServiceCustomerId              String?               @unique
-  stripeBusinessId               String               @unique
-  businessType  String  @default("Individual")
+  stripeBusinessId      String                 @unique
+  // stripeBusinessType  String  @default("Individual")
+  creatorId             String
+  creator               User                   @relation("CreatedService", fields: [creatorId], references: [id], onDelete: Cascade)
   dateCreated           DateTime               @default(now())
   email                 String
   street                String
@@ -900,7 +910,7 @@ model Business {
   zipCode               String
   country               String
   phone                 String
-  name                  String                 @default("New Business")
+  name                  String                 @default("New Service")
   coverPhoto            String?
   agreedToAgreement     Boolean?
   media                 Media[]
@@ -937,30 +947,37 @@ model Business {
   @@index([phone])
 }
 
+model ServiceStripeConnection {
+  id              String  @id @default(cuid())
+  stripeAccountId String?
+}
+
 model VolunteerService {
-  id                 String          @id @default(cuid())
-  businessId         String?
-  business           Business?       @relation(fields: [businessId], references: [id])
+  id                 String                  @id @default(cuid())
+  serviceId          String?
+  service            Service?                @relation(fields: [serviceId], references: [id])
   userId             String?
-  user               User?           @relation(fields: [userId], references: [id])
+  user               User?                   @relation(fields: [userId], references: [id])
   serviceRangeId     String?
-  serviceRange       ServiceRange?   @relation(fields: [serviceRangeId], references: [id])
-  media              Media[]         @relation("VolunteerServiceMedia")
-  links              Link[]          @relation("VolunteerServiceLinks")
-  availableDateTimes Availability[]  @relation("AvailableDateTimes")
+  serviceRange       ServiceRange?           @relation(fields: [serviceRangeId], references: [id])
+  media              Media[]                 @relation("VolunteerServiceMedia")
+  links              Link[]                  @relation("VolunteerServiceLinks")
+  availableDateTimes Availability[]          @relation("AvailableDateTimes")
   fullName           String?
   address            String?
   email              String?
   phone              String?
-  agreedToAgreement  Boolean         @default(false)
+  agreedToAgreement  Boolean                 @default(false)
   description        String?
   status             VolunteerServiceStatus?
 }
 
 model EventService {
   id                   String               @id @default(cuid())
-  business             Business             @relation(fields: [businessId], references: [id], onDelete: Cascade)
-  businessId           String
+  ownerId              String
+  owner                User                 @relation(fields: [ownerId], references: [id], onDelete: Cascade)
+  service              Service              @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  serviceId            String
   eventServiceName     String
   eventServiceTypes    EventServiceType[]
   eventServiceSubType  String?
@@ -1000,8 +1017,10 @@ model EventService {
 
 model EntertainmentService {
   id                          String                     @id @default(cuid())
-  business                    Business                   @relation(fields: [businessId], references: [id])
-  businessId                  String
+  ownerId                     String
+  owner                       User                       @relation(fields: [ownerId], references: [id], onDelete: Cascade)
+  service                     Service                    @relation(fields: [serviceId], references: [id])
+  serviceId                   String
   entertainmentServiceName    String
   entertainmentServiceTypes   EntertainmentServiceType[]
   entertainmentServiceSubType String?
@@ -1041,8 +1060,10 @@ model EntertainmentService {
 
 model Vendor {
   id                   String               @id @default(cuid())
-  business             Business             @relation(fields: [businessId], references: [id])
-  businessId           String
+  ownerId              String
+  owner                User                 @relation(fields: [ownerId], references: [id], onDelete: Cascade)
+  service              Service              @relation(fields: [serviceId], references: [id])
+  serviceId            String
   vendorName           String
   email                String
   street               String
@@ -1080,8 +1101,10 @@ model Vendor {
 
 model Exhibitor {
   id                   String               @id @default(cuid())
-  business             Business             @relation(fields: [businessId], references: [id])
-  businessId           String
+  ownerId              String
+  owner                User                 @relation(fields: [ownerId], references: [id], onDelete: Cascade)
+  service              Service              @relation(fields: [serviceId], references: [id])
+  serviceId            String
   exhibitorName        String
   email                String
   street               String
@@ -1118,8 +1141,10 @@ model Exhibitor {
 
 model Sponsor {
   id                   String               @id @default(cuid())
-  business             Business             @relation(fields: [businessId], references: [id])
-  businessId           String
+  ownerId              String
+  owner                User                 @relation(fields: [ownerId], references: [id], onDelete: Cascade)
+  service              Service              @relation(fields: [serviceId], references: [id])
+  serviceId            String
   sponsorName          String
   email                String
   street               String
@@ -1156,8 +1181,12 @@ model Sponsor {
 
 model Venue {
   id                   String               @id @default(cuid())
-  business             Business             @relation(fields: [businessId], references: [id], onDelete: Cascade)
-  businessId           String
+  ownerId              String
+  owner                User                 @relation(fields: [ownerId], references: [id], onDelete: Cascade)
+  service              Service              @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  serviceId            String
+  serviceConnectionId  String?
+  serviceConnection    String?
   venueName            String
   email                String
   street               String
@@ -1202,8 +1231,10 @@ model Venue {
 
 model Organization {
   id                   String               @id @default(cuid())
-  business             Business?            @relation(fields: [businessId], references: [id])
-  businessId           String?
+  ownerId              String
+  owner                User                 @relation(fields: [ownerId], references: [id], onDelete: Cascade)
+  service              Service?             @relation(fields: [serviceId], references: [id])
+  serviceId            String?
   organizationName     String
   organizationType     OrganizationType[]
   email                String
@@ -1406,8 +1437,8 @@ model VerificationToken {
 
 model ServiceLink {
   id                     String                @id @default(cuid())
-  businessId             String
-  business               Business              @relation(fields: [businessId], references: [id], onDelete: Cascade)
+  serviceId              String
+  service                Service               @relation(fields: [serviceId], references: [id], onDelete: Cascade)
   linkId                 String
   link                   Link                  @relation(fields: [linkId], references: [id], onDelete: Cascade)
   eventService           EventService?         @relation(fields: [eventServiceId], references: [id])
@@ -1425,7 +1456,7 @@ model ServiceLink {
   organization           Organization?         @relation(fields: [organizationId], references: [id])
   organizationId         String?
 
-  @@index([businessId])
+  @@index([serviceId])
 }
 
 enum ServiceTypes {

package/src/definitions.ts

@@ -9,7 +9,7 @@ import {
   User,
   YearsOfExperience
 } from "@prisma/client";
-import {BusinessExt, CheckoutExt, PublicUser, VolunteerServiceExt} from "./extendedSchemas";
+import { ServiceExt, CheckoutExt, PublicUser, VolunteerServiceExt} from "./extendedSchemas";
 
 export const PASSWORD_MIN_LENGTH = 10 as const;
 export const PASSWORD_REQUIREMENTS_REGEX = new RegExp(String.raw`^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{${PASSWORD_MIN_LENGTH},}$`);
@@ -101,7 +101,7 @@ export const ServiceTypes = {
   'Sponsors': 'sponsors',
   'Exhibitors': 'exhibitors',
   'EntertainmentServices': 'entertainmentServices',
-} satisfies {[key: string]: keyof BusinessExt}
+} satisfies {[key: string]: keyof ServiceExt}
 
 export type FilterFields = {
   price: string[];

package/src/extendedSchemas.ts

@@ -6,7 +6,7 @@ import {
   Invitation,
   Ticket,
   User,
-  TicketTier, Business, Review, Media, BashComment, Recurrence, Contact,
+  TicketTier, Service, Review, Media, BashComment, Recurrence, Contact,
   BashNotification, BashEventPromoCode,
   Reminder,
   Checkout,
@@ -131,7 +131,7 @@ export const EVENT_TASK_DATA_TO_INCLUDE = {
 
 
 export interface EventServiceExt extends EventService {
-  business: Business;
+  service: Service;
   availableDateTimes: Availability[];
   targetAudience: TargetAudience;
   links: ServiceLinkExt[];
@@ -140,7 +140,7 @@ export interface EventServiceExt extends EventService {
 }
 
 export interface EntertainmentServiceExt extends EntertainmentService {
-  business: Business;
+  service: Service;
   availableDateTimes: Availability[];
   targetAudience: TargetAudience;
   links: ServiceLinkExt[];
@@ -149,7 +149,7 @@ export interface EntertainmentServiceExt extends EntertainmentService {
 }
 
 export interface ExhibitorExt extends Exhibitor {
-  business: Business;
+  service: Service;
   availableDateTimes: Availability[];
   targetAudience: TargetAudience;
   links: ServiceLinkExt[];
@@ -158,7 +158,7 @@ export interface ExhibitorExt extends Exhibitor {
 }
 
 export interface SponsorExt extends Sponsor {
-  business: Business;
+  service: Service;
   availableDateTimes: Availability[];
   targetAudience: TargetAudience;
   links: ServiceLinkExt[];
@@ -167,7 +167,7 @@ export interface SponsorExt extends Sponsor {
 }
 
 export interface VendorExt extends Vendor {
-  business: Business;
+  service: Service;
   availableDateTimes: Availability[];
   targetAudience?: TargetAudience;
   links: ServiceLinkExt[];
@@ -176,7 +176,6 @@ export interface VendorExt extends Vendor {
 }
 
 export const VENDOR_DATA_TO_INCLUDE = {
-  business: true,
   availableDateTimes: true,
   targetAudience: true,
   links: true,
@@ -189,7 +188,7 @@ export const SERVICE_LINK_DATA_TO_INCLUDE = {
 } satisfies Prisma.ServiceLinkInclude;
 
 export interface VenueExt extends Venue {
-  business: Business;
+  service?: Service;
   availableDateTimes: Availability[];
   targetAudience?: TargetAudience | null;
   links: ServiceLinkExt[];
@@ -199,7 +198,6 @@ export interface VenueExt extends Venue {
 }
 
 export const VENUE_DATA_TO_INCLUDE = {
-  business: true,
   availableDateTimes: true,
   targetAudience: true,
   links: {
@@ -224,7 +222,7 @@ export const VOLUNTEER_DATA_TO_INCLUDE = {
 
 
 export interface OrganizationExt extends Organization {
-  business: Business;
+  service?: Service;
   availableDateTimes: Availability[];
   targetAudience: TargetAudience;
   links: ServiceLinkExt[];
@@ -234,7 +232,7 @@ export interface OrganizationExt extends Organization {
 }
 
 export interface VolunteerServiceExt extends VolunteerService {
-  business?: BusinessExt;
+  service?: ServiceExt;
   serviceRange?: ServiceRange | null;
   media?: Media[];
   links?: Link[];
@@ -250,9 +248,9 @@ export interface VolunteerServiceExt extends VolunteerService {
 
 
 
-export interface BusinessExt extends Business {
-  owner: PublicUser;
-  media: Media[];
+export interface ServiceExt extends Service {
+  owner?: PublicUser; 
+  media?: Media[];
   targetAudience?: TargetAudience | null;
   volunteerService?: VolunteerService | null;
   serviceLinks?: ServiceLinkExt[];
@@ -281,7 +279,7 @@ export const BUSINESS_DATA_TO_INCLUDE = {
   vendors: {
     include: VENDOR_DATA_TO_INCLUDE,
   },
-} satisfies Prisma.BusinessInclude;
+} 
 
 
 export interface ServiceLinkExt extends ServiceLink {
@@ -369,7 +367,7 @@ export interface UserExtraData extends User {
 }
 
 export interface UserExt extends User {
-  businesses?: Business[] | null;
+  servicees?: Service[] | null;
 
   // Do not include in fetch as there could be thousands of these
   associatedBashes?: AssociatedBash[] | null;