@bash-app/bash-common 20.5.2 → 21.0.1

package/package.json

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

package/prisma/schema.prisma

@@ -11,15 +11,6 @@ datasource db {
   directUrl = env("POSTGRES_URL_NON_POOLING") // uses a direct connection
 }
 
-model Business {
-  id      String  @id @default(cuid())
-  name    String
-  ein     String?
-  dba     String?
-  address String?
-  media   Media[]
-}
-
 model Club {
   id      String       @id @default(cuid())
   name    String
@@ -336,7 +327,7 @@ enum UserSubscriptionType {
   VIP
 }
 
-model SubServiceSubscription {
+model ServiceSubscription {
   id                   String  @id @default(cuid())
   ownerId              String
   owner                User    @relation(fields: [ownerId], references: [id], onDelete: Cascade)
@@ -352,8 +343,8 @@ enum BookingStatus {
 
 model Booking {
   id                         String         @id @default(cuid())
-  serviceId                  String
-  service                    Service        @relation(fields: [serviceId], references: [id])
+  businessId                 String
+  business                   Business       @relation(fields: [businessId], references: [id])
   validDate                  DateTime?
   forUserId                  String?
   forUser                    User?          @relation(fields: [forUserId], references: [id])
@@ -368,7 +359,7 @@ model Booking {
   checkoutId                 String?
   checkout                   Checkout?      @relation(fields: [checkoutId], references: [id])
 
-  @@index([serviceId])
+  @@index([businessId])
   @@index([forUserId])
   @@index([checkoutId])
 }
@@ -582,7 +573,7 @@ model TargetAudience {
   showOnDetailPage Boolean    @default(true)
 
   bashEvent            BashEvent?
-  service              Service?
+  business             Business?
   venue                Venue?
   vendor               Vendor?
   eventService         EventService?
@@ -699,9 +690,8 @@ model Media {
   type                         MediaType
   mimetype                     String?
   bashEventsReferencingMe      BashEvent[]
-  businessesReferencingMe      Business[]
   sponsoredEventsReferencingMe SponsoredEvent[]
-  servicesReferencingMe        Service[]
+  businessesReferencingMe      Business[]
   venueReferencingMe           Venue[]
   EventService                 EventService?         @relation(fields: [eventServiceId], references: [id])
   eventServiceId               String?
@@ -792,11 +782,11 @@ enum SponsorType {
 }
 
 model User {
-  id                            String                   @id @default(cuid())
-  email                         String                   @unique
-  createdOn                     DateTime                 @default(now())
-  stripeCustomerId              String?                  @unique
-  stripeAccountId               String?                  @unique
+  id                            String                @id @default(cuid())
+  email                         String                @unique
+  createdOn                     DateTime              @default(now())
+  stripeCustomerId              String?               @unique
+  stripeAccountId               String?               @unique
   googleCalendarAccess          String?
   givenName                     String?
   familyName                    String?
@@ -807,11 +797,11 @@ model User {
   dob                           DateTime?
   gender                        Gender?
   sex                           Sex?
-  roles                         UserRole[]               @default([User])
-  services                      Service[]
-  createdEvents                 BashEvent[]              @relation("CreatedEvent")
-  ticketsISent                  Ticket[]                 @relation("TicketsISent")
-  ticketsIOwn                   Ticket[]                 @relation("TicketsIOwn")
+  roles                         UserRole[]            @default([User])
+  businesses                    Business[]
+  createdEvents                 BashEvent[]           @relation("CreatedEvent")
+  ticketsISent                  Ticket[]              @relation("TicketsISent")
+  ticketsIOwn                   Ticket[]              @relation("TicketsIOwn")
   reviews                       Review[]
   sponsorships                  SponsoredEvent[]
   investments                   Investment[]
@@ -834,26 +824,26 @@ model User {
   city                          String?
   state                         String?
   postalCode                    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[]
   bashEventPromoCodesIUsed      BashEventPromoCode[]
-  ServiceCheckout               ServiceCheckout[]
+  serviceCheckouts              ServiceCheckout[]
   bookingForMe                  Booking[]
   bashSubscription              UserSubscription?
-  subServiceSubcriptions        SubServiceSubscription[]
+  serviceSubcriptions           ServiceSubscription[]
 }
 
 model Contact {
@@ -885,7 +875,7 @@ model AssociatedBash {
   @@unique([ownerEmail, bashEventId])
 }
 
-model Service {
+model Business {
   id                    String                 @id @default(cuid())
   ownerId               String
   owner                 User                   @relation(fields: [ownerId], references: [id], onDelete: Cascade)
@@ -898,11 +888,10 @@ model Service {
   postalCode            String
   country               String
   phone                 String
-  name                  String                 @default("New Service")
+  name                  String                 @default("New Business")
   coverPhoto            String?
   agreedToAgreement     Boolean?
   media                 Media[]
-  serviceTypes          ServiceType[]
   customServiceTag      String[]
   yearsOfExperince      YearsOfExperience      @default(LessThanOneYear)
   serviceLinks          ServiceLink[]
@@ -913,10 +902,9 @@ model Service {
   // 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
+  targetAudience        TargetAudience?        @relation(fields: [targetAudienceId], references: [id])
+  volunteerService      VolunteerService?
   eventServices         EventService[]
   entertainmentServices EntertainmentService[]
   vendors               Vendor[]
@@ -936,10 +924,16 @@ model Service {
   @@index([phone])
 }
 
+model VolunteerService {
+  id         String   @id @default(cuid())
+  businessId String   @unique
+  business   Business @relation(fields: [businessId], references: [id])
+}
+
 model EventService {
   id                   String               @id @default(cuid())
-  service              Service?             @relation(fields: [serviceId], references: [id])
-  serviceId            String?
+  business             Business?            @relation(fields: [businessId], references: [id])
+  businessId           String?
   eventServiceName     String
   eventServiceTypes    EventServiceType[]
   eventServiceSubType  String?
@@ -979,8 +973,8 @@ model EventService {
 
 model EntertainmentService {
   id                          String                     @id @default(cuid())
-  service                     Service?                   @relation(fields: [serviceId], references: [id])
-  serviceId                   String?
+  business                    Business?                  @relation(fields: [businessId], references: [id])
+  businessId                  String?
   entertainmentServiceName    String
   entertainmentServiceTypes   EntertainmentServiceType[]
   entertainmentServiceSubType String?
@@ -1020,8 +1014,8 @@ model EntertainmentService {
 
 model Vendor {
   id                   String               @id @default(cuid())
-  service              Service?             @relation(fields: [serviceId], references: [id])
-  serviceId            String?
+  business             Business?            @relation(fields: [businessId], references: [id])
+  businessId           String?
   vendorName           String
   email                String
   streetAddress        String
@@ -1059,8 +1053,8 @@ model Vendor {
 
 model Exhibitor {
   id                   String               @id @default(cuid())
-  service              Service?             @relation(fields: [serviceId], references: [id])
-  serviceId            String?
+  business             Business?            @relation(fields: [businessId], references: [id])
+  businessId           String?
   exhibitorName        String
   email                String
   streetAddress        String
@@ -1097,8 +1091,8 @@ model Exhibitor {
 
 model Sponsor {
   id                   String               @id @default(cuid())
-  service              Service?             @relation(fields: [serviceId], references: [id])
-  serviceId            String?
+  business             Business?            @relation(fields: [businessId], references: [id])
+  businessId           String?
   sponsorName          String
   email                String
   streetAddress        String
@@ -1136,8 +1130,8 @@ model Sponsor {
 
 model Venue {
   id                   String               @id @default(cuid())
-  service              Service              @relation(fields: [serviceId], references: [id])
-  serviceId            String
+  business             Business             @relation(fields: [businessId], references: [id])
+  businessId           String
   venueName            String
   email                String
   streetAddress        String
@@ -1152,6 +1146,8 @@ model Venue {
   status               ServiceStatus        @default(Draft)
   yearsInBusiness      YearsOfExperience
   description          String?
+  serviceRangeId       String               @unique
+  serviceRange         ServiceRange         @relation(fields: [serviceRangeId], references: [id], onDelete: Cascade)
   capacityId           String?              @unique
   capacity             AmountOfGuests?      @relation(fields: [capacityId], references: [id], onDelete: Cascade)
   amenities            String[]
@@ -1179,8 +1175,8 @@ model Venue {
 
 model Organization {
   id                   String               @id @default(cuid())
-  service              Service?             @relation(fields: [serviceId], references: [id])
-  serviceId            String?
+  business             Business?            @relation(fields: [businessId], references: [id])
+  businessId           String?
   organizationName     String
   organizationType     OrganizationType[]
   email                String
@@ -1284,10 +1280,11 @@ enum YearsOfExperience {
 }
 
 model ServiceRange {
-  id                  String   @id @default(cuid())
-  min                 Int      @default(0)
-  max                 Int      @default(50)
-  serviceServiceRange Service? @relation("ServiceRange")
+  id  String @id @default(cuid())
+  min Int    @default(0)
+  max Int    @default(50)
+
+  venue Venue?
 }
 
 model Availability {
@@ -1326,17 +1323,6 @@ enum MusicGenreType {
   Acoustic
 }
 
-enum ServiceType {
-  Volunteer
-  EventService
-  EntertainmentService
-  Vendor
-  Exhibitor
-  Sponsor
-  Venue
-  Organization
-}
-
 enum UserRole {
   User
   Vendor
@@ -1391,8 +1377,8 @@ model VerificationToken {
 
 model ServiceLink {
   id                     String                @id @default(cuid())
-  serviceId              String
-  service                Service               @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  businessId             String
+  business               Business              @relation(fields: [businessId], references: [id], onDelete: Cascade)
   linkId                 String
   link                   Link                  @relation(fields: [linkId], references: [id], onDelete: Cascade)
   eventService           EventService?         @relation(fields: [eventServiceId], references: [id])
@@ -1410,5 +1396,5 @@ model ServiceLink {
   organization           Organization?         @relation(fields: [organizationId], references: [id])
   organizationId         String?
 
-  @@index([serviceId])
+  @@index([businessId])
 }

package/src/definitions.ts

@@ -4,13 +4,12 @@ import {
   BashEventVibeTags,
   Contact,
   DayOfWeek,
-  ServiceType,
   Ticket,
   TicketTier,
   User,
   YearsOfExperience
 } from "@prisma/client";
-import { CheckoutExt, PublicUser } from "./extendedSchemas";
+import {BusinessExt, CheckoutExt, PublicUser} 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},}$`);
@@ -89,6 +88,17 @@ export type DateTimeArgType = Date | string | undefined | null;
 export type RequiredStripeInfoMissingErrorDataType = { [k in keyof User]?: { type: string, label: string } };
 export type ContactOrUser = Contact | PublicUser;
 
+export const ServiceTypes: (keyof BusinessExt)[] = [
+  'volunteerService',
+  'eventServices',
+  'organizations',
+  'venues',
+  'vendors',
+  'sponsors',
+  'exhibitors',
+  'entertainmentServices',
+] as const;
+
 export type FilterFields = {
   price: string[];
   ageRequirement: string[];
@@ -411,20 +421,6 @@ 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

@@ -6,7 +6,7 @@ import {
   Invitation,
   Ticket,
   User,
-  TicketTier, Service, Review, Media, BashComment, Recurrence, Contact,
+  TicketTier, Business, Review, Media, BashComment, Recurrence, Contact,
   BashNotification, BashEventPromoCode,
   Reminder, ServiceRange,
   Checkout,
@@ -21,7 +21,7 @@ import {
   Sponsor,
   Organization,
   Booking,
-  ServiceType,
+  VolunteerService,
 } from "@prisma/client";
 
 export const FRONT_END_USER_DATA_TO_SELECT = {
@@ -132,7 +132,7 @@ export const EVENT_TASK_DATA_TO_INCLUDE = {
 
 
 export interface EventServiceExt extends EventService {
-  service: Service;
+  business: Business;
   availableDateTimes: Availability[];
   targetAudience: TargetAudience;
   links: ServiceLinkExt[];
@@ -141,7 +141,7 @@ export interface EventServiceExt extends EventService {
 }
 
 export interface EntertainmentServiceExt extends EntertainmentService {
-  service: Service;
+  business: Business;
   availableDateTimes: Availability[];
   targetAudience: TargetAudience;
   links: ServiceLinkExt[];
@@ -150,7 +150,7 @@ export interface EntertainmentServiceExt extends EntertainmentService {
 }
 
 export interface ExhibitorExt extends Exhibitor {
-  service: Service;
+  business: Business;
   availableDateTimes: Availability[];
   targetAudience: TargetAudience;
   links: ServiceLinkExt[];
@@ -159,7 +159,7 @@ export interface ExhibitorExt extends Exhibitor {
 }
 
 export interface SponsorExt extends Sponsor {
-  service: Service;
+  business: Business;
   availableDateTimes: Availability[];
   targetAudience: TargetAudience;
   links: ServiceLinkExt[];
@@ -168,7 +168,7 @@ export interface SponsorExt extends Sponsor {
 }
 
 export interface VendorExt extends Vendor {
-  service: Service;
+  business: Business;
   availableDateTimes: Availability[];
   targetAudience?: TargetAudience;
   links: ServiceLinkExt[];
@@ -176,8 +176,17 @@ export interface VendorExt extends Vendor {
   media?: Media[];
 }
 
+export const VENDOR_DATA_TO_INCLUDE = {
+  business: true,
+  availableDateTimes: true,
+  targetAudience: true,
+  links: true,
+  crowdSize: true,
+  media: true,
+}
+
 export interface VenueExt extends Venue {
-  service: Service;
+  business: Business;
   availableDateTimes: Availability[];
   targetAudience?: TargetAudience | null;
   links: ServiceLinkExt[];
@@ -185,8 +194,17 @@ export interface VenueExt extends Venue {
   media?: Media[];
 }
 
+export const VENUE_DATA_TO_INCLUDE = {
+  business: true,
+  availableDateTimes: true,
+  targetAudience: true,
+  links: true,
+  capacity: true,
+  media: true,
+}
+
 export interface OrganizationExt extends Organization {
-  service: Service;
+  business: Business;
   availableDateTimes: Availability[];
   targetAudience: TargetAudience;
   links: ServiceLinkExt[];
@@ -195,28 +213,12 @@ export interface OrganizationExt extends Organization {
   status: ServiceStatus;
 }
 
-export const VENUE_DATA_TO_INCLUDE = {
-  service: true,
-  availableDateTimes: true,
-  targetAudience: true,
-  links: true,
-  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 {
+export interface BusinessExt extends Business {
   owner: PublicUser;
   media: Media[];
-  serviceRange: ServiceRange;
   targetAudience: TargetAudience;
+  volunteerService?: VolunteerService;
   serviceLinks?: ServiceLinkExt[];
   venues?: Venue[];
   eventServices?: EventService[];
@@ -226,7 +228,6 @@ export interface ServiceExt extends Service {
   sponsors?: Sponsor[];
   organizations?: Organization[];
   bookings?: Booking[];
-  serviceTypes: ServiceType[];
 }
 
 export interface ServiceLinkExt extends ServiceLink {
@@ -237,12 +238,12 @@ export const SERVICE_LINK_DATA_TO_INCLUDE = {
   link: true,
 }
 
-export const SERVICE_DATA_TO_INCLUDE = {
+export const BUSINESS_DATA_TO_INCLUDE = {
   owner: {
     select: FRONT_END_USER_DATA_TO_SELECT
   },
   media: true,
-  serviceRange: true,
+  volunteerService: true,
   targetAudience: true,
   serviceLinks: {
     include: SERVICE_LINK_DATA_TO_INCLUDE
@@ -337,7 +338,7 @@ export interface UserExtraData extends User {
 }
 
 export interface UserExt extends User {
-  services?: Service[] | null;
+  services?: Business[] | null;
 
   // Do not include in fetch as there could be thousands of these
   associatedBashes?: AssociatedBash[] | null;