@bash-app/bash-common 20.5.2 → 21.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "20.5.2",
+  "version": "21.0.0",
   "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
@@ -353,7 +344,7 @@ enum BookingStatus {
 model Booking {
   id                         String         @id @default(cuid())
   serviceId                  String
-  service                    Service        @relation(fields: [serviceId], references: [id])
+  service                    Business       @relation(fields: [serviceId], references: [id])
   validDate                  DateTime?
   forUserId                  String?
   forUser                    User?          @relation(fields: [forUserId], references: [id])
@@ -582,7 +573,7 @@ model TargetAudience {
   showOnDetailPage Boolean    @default(true)
 
   bashEvent            BashEvent?
-  service              Service?
+  service              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?
@@ -808,7 +798,7 @@ model User {
   gender                        Gender?
   sex                           Sex?
   roles                         UserRole[]               @default([User])
-  services                      Service[]
+  services                      Business[]
   createdEvents                 BashEvent[]              @relation("CreatedEvent")
   ticketsISent                  Ticket[]                 @relation("TicketsISent")
   ticketsIOwn                   Ticket[]                 @relation("TicketsIOwn")
@@ -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)
@@ -938,7 +928,7 @@ model Service {
 
 model EventService {
   id                   String               @id @default(cuid())
-  service              Service?             @relation(fields: [serviceId], references: [id])
+  service              Business?            @relation(fields: [serviceId], references: [id])
   serviceId            String?
   eventServiceName     String
   eventServiceTypes    EventServiceType[]
@@ -979,7 +969,7 @@ model EventService {
 
 model EntertainmentService {
   id                          String                     @id @default(cuid())
-  service                     Service?                   @relation(fields: [serviceId], references: [id])
+  service                     Business?                  @relation(fields: [serviceId], references: [id])
   serviceId                   String?
   entertainmentServiceName    String
   entertainmentServiceTypes   EntertainmentServiceType[]
@@ -1020,7 +1010,7 @@ model EntertainmentService {
 
 model Vendor {
   id                   String               @id @default(cuid())
-  service              Service?             @relation(fields: [serviceId], references: [id])
+  service              Business?            @relation(fields: [serviceId], references: [id])
   serviceId            String?
   vendorName           String
   email                String
@@ -1059,7 +1049,7 @@ model Vendor {
 
 model Exhibitor {
   id                   String               @id @default(cuid())
-  service              Service?             @relation(fields: [serviceId], references: [id])
+  service              Business?            @relation(fields: [serviceId], references: [id])
   serviceId            String?
   exhibitorName        String
   email                String
@@ -1097,7 +1087,7 @@ model Exhibitor {
 
 model Sponsor {
   id                   String               @id @default(cuid())
-  service              Service?             @relation(fields: [serviceId], references: [id])
+  service              Business?            @relation(fields: [serviceId], references: [id])
   serviceId            String?
   sponsorName          String
   email                String
@@ -1136,7 +1126,7 @@ model Sponsor {
 
 model Venue {
   id                   String               @id @default(cuid())
-  service              Service              @relation(fields: [serviceId], references: [id])
+  service              Business             @relation(fields: [serviceId], references: [id])
   serviceId            String
   venueName            String
   email                String
@@ -1179,7 +1169,7 @@ model Venue {
 
 model Organization {
   id                   String               @id @default(cuid())
-  service              Service?             @relation(fields: [serviceId], references: [id])
+  service              Business?            @relation(fields: [serviceId], references: [id])
   serviceId            String?
   organizationName     String
   organizationType     OrganizationType[]
@@ -1284,10 +1274,10 @@ 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)
+  serviceServiceRange Business? @relation("ServiceRange")
 }
 
 model Availability {
@@ -1392,7 +1382,7 @@ model VerificationToken {
 model ServiceLink {
   id                     String                @id @default(cuid())
   serviceId              String
-  service                Service               @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  service                Business              @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])

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,
@@ -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[];
@@ -177,7 +177,7 @@ export interface VendorExt extends Vendor {
 }
 
 export interface VenueExt extends Venue {
-  service: Service;
+  business: Business;
   availableDateTimes: Availability[];
   targetAudience?: TargetAudience | null;
   links: ServiceLinkExt[];
@@ -186,7 +186,7 @@ export interface VenueExt extends Venue {
 }
 
 export interface OrganizationExt extends Organization {
-  service: Service;
+  business: Business;
   availableDateTimes: Availability[];
   targetAudience: TargetAudience;
   links: ServiceLinkExt[];
@@ -212,7 +212,7 @@ export const VENDOR_DATA_TO_INCLUDE = {
   media: true,
 }
 
-export interface ServiceExt extends Service {
+export interface ServiceExt extends Business {
   owner: PublicUser;
   media: Media[];
   serviceRange: ServiceRange;
@@ -337,7 +337,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;