@bash-app/bash-common 26.0.0 → 26.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/prisma/schema.prisma +85 -67
  3. package/src/extendedSchemas.ts +0 -28
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bash-app/bash-common",
3
- "version": "26.0.0",
3
+ "version": "26.1.1",
4
4
  "description": "Common data and scripts to use on the frontend and backend",
5
5
  "type": "module",
6
6
  "main": "src/index.ts",
package/prisma/schema.prisma CHANGED
@@ -344,8 +344,8 @@ enum BookingStatus {
344
344
 
345
345
  model Booking {
346
346
  id String @id @default(cuid())
347
- serviceId String
348
- service Service @relation(fields: [serviceId], references: [id])
347
+ serviceId String
348
+ service Service @relation(fields: [serviceId], references: [id])
349
349
  validDate DateTime?
350
350
  forUserId String?
351
351
  forUser User? @relation(fields: [forUserId], references: [id])
@@ -571,7 +571,7 @@ model TargetAudience {
571
571
  showOnDetailPage Boolean @default(true)
572
572
 
573
573
  bashEvent BashEvent?
574
- service Service?
574
+ service Service?
575
575
  venue Venue?
576
576
  vendor Vendor?
577
577
  eventService EventService?
@@ -697,7 +697,7 @@ model Media {
697
697
  mimetype String?
698
698
  bashEventsReferencingMe BashEvent[]
699
699
  sponsoredEventsReferencingMe SponsoredEvent[]
700
- serviceReferencingMe Service[]
700
+ serviceReferencingMe Service[]
701
701
  EventService EventService? @relation(fields: [eventServiceId], references: [id])
702
702
  eventServiceId String?
703
703
  entertainmentService EntertainmentService? @relation(fields: [entertainmentServiceId], references: [id])
@@ -708,8 +708,8 @@ model Media {
708
708
  exhibitorId String?
709
709
  sponsor Sponsor? @relation(fields: [sponsorId], references: [id])
710
710
  sponsorId String?
711
- venue Venue? @relation(fields: [venueId], references: [id])
712
- venueId String?
711
+ venue Venue? @relation(fields: [venueId], references: [id])
712
+ venueId String?
713
713
  organization Organization? @relation(fields: [organizationId], references: [id])
714
714
  organizationId String?
715
715
  volunteerServiceId String?
@@ -791,12 +791,12 @@ enum SponsorType {
791
791
  }
792
792
 
793
793
  model User {
794
- id String @id @default(cuid())
795
- email String @unique
796
- createdOn DateTime @default(now())
797
- stripeCustomerId String? @unique
798
- stripeAccountId String? @unique
799
- isSuperUser Boolean @default(false)
794
+ id String @id @default(cuid())
795
+ email String @unique
796
+ createdOn DateTime @default(now())
797
+ stripeCustomerId String? @unique
798
+ stripeAccountId String? @unique
799
+ isSuperUser Boolean @default(false)
800
800
  googleCalendarAccess String?
801
801
  givenName String?
802
802
  familyName String?
@@ -807,11 +807,11 @@ model User {
807
807
  dob DateTime?
808
808
  gender Gender?
809
809
  sex Sex?
810
- roles UserRole[] @default([User])
811
- createdServices Service[] @relation("CreatedService")
812
- createdEvents BashEvent[] @relation("CreatedEvent")
813
- ticketsISent Ticket[] @relation("TicketsISent")
814
- ticketsIOwn Ticket[] @relation("TicketsIOwn")
810
+ roles UserRole[] @default([User])
811
+ createdServices Service[] @relation("CreatedService")
812
+ createdEvents BashEvent[] @relation("CreatedEvent")
813
+ ticketsISent Ticket[] @relation("TicketsISent")
814
+ ticketsIOwn Ticket[] @relation("TicketsIOwn")
815
815
  reviews Review[]
816
816
  sponsorships SponsoredEvent[]
817
817
  investments Investment[]
@@ -834,18 +834,18 @@ model User {
834
834
  city String?
835
835
  state String?
836
836
  zipCode String?
837
- country String? @default("US")
837
+ country String? @default("US")
838
838
  phone String?
839
- documentIDId String? @unique
839
+ documentIDId String? @unique
840
840
  documentID DocumentID?
841
841
  comment BashComment[]
842
842
  associatedBashes AssociatedBash[]
843
- invitationsCreatedByMe Invitation[] @relation("InvitationsCreatedByMe")
844
- invitationsSentToMe Invitation[] @relation("InvitationsSentToMe")
845
- notificationsCreatedByMe BashNotification[] @relation("NotificationsCreatedByMe")
846
- remindersCreatedByMe Reminder[] @relation("RemindersCreatedByMe")
847
- remindersAssignedToMe Reminder[] @relation("RemindersAssignedToMe")
848
- eventTasksAssignedToMe EventTask[] @relation("TasksAssignedToMe")
843
+ invitationsCreatedByMe Invitation[] @relation("InvitationsCreatedByMe")
844
+ invitationsSentToMe Invitation[] @relation("InvitationsSentToMe")
845
+ notificationsCreatedByMe BashNotification[] @relation("NotificationsCreatedByMe")
846
+ remindersCreatedByMe Reminder[] @relation("RemindersCreatedByMe")
847
+ remindersAssignedToMe Reminder[] @relation("RemindersAssignedToMe")
848
+ eventTasksAssignedToMe EventTask[] @relation("TasksAssignedToMe")
849
849
  checkouts Checkout[]
850
850
  ticketTiersWaitListsIveJoined TicketTier[]
851
851
  contacts Contact[]
@@ -855,6 +855,13 @@ model User {
855
855
  userSubscription UserSubscription?
856
856
  serviceSubcriptions ServiceSubscription[]
857
857
  volunteerService VolunteerService[]
858
+ eventService EventService[]
859
+ entertainmentService EntertainmentService[]
860
+ vendor Vendor[]
861
+ exhibitor Exhibitor[]
862
+ sponsor Sponsor[]
863
+ venue Venue[]
864
+ organization Organization[]
858
865
  }
859
866
 
860
867
  model Contact {
@@ -891,10 +898,10 @@ model Service {
891
898
  // ownerId String
892
899
  // owner User @relation(fields: [ownerId], references: [id], onDelete: Cascade)
893
900
  // stripeServiceCustomerId String? @unique
894
- stripeBusinessId String @unique
901
+ stripeBusinessId String @unique
895
902
  // stripeBusinessType String @default("Individual")
896
- creatorId String
897
- creator User @relation("CreatedService", fields: [creatorId], references: [id], onDelete: Cascade)
903
+ creatorId String
904
+ creator User @relation("CreatedService", fields: [creatorId], references: [id], onDelete: Cascade)
898
905
  dateCreated DateTime @default(now())
899
906
  email String
900
907
  street String
@@ -941,34 +948,36 @@ model Service {
941
948
  }
942
949
 
943
950
  model ServiceStripeConnection {
944
- id String @id @default(cuid())
951
+ id String @id @default(cuid())
945
952
  stripeAccountId String?
946
953
  }
947
954
 
948
955
  model VolunteerService {
949
- id String @id @default(cuid())
950
- serviceId String?
951
- service Service? @relation(fields: [serviceId], references: [id])
956
+ id String @id @default(cuid())
957
+ serviceId String?
958
+ service Service? @relation(fields: [serviceId], references: [id])
952
959
  userId String?
953
- user User? @relation(fields: [userId], references: [id])
960
+ user User? @relation(fields: [userId], references: [id])
954
961
  serviceRangeId String?
955
- serviceRange ServiceRange? @relation(fields: [serviceRangeId], references: [id])
956
- media Media[] @relation("VolunteerServiceMedia")
957
- links Link[] @relation("VolunteerServiceLinks")
958
- availableDateTimes Availability[] @relation("AvailableDateTimes")
962
+ serviceRange ServiceRange? @relation(fields: [serviceRangeId], references: [id])
963
+ media Media[] @relation("VolunteerServiceMedia")
964
+ links Link[] @relation("VolunteerServiceLinks")
965
+ availableDateTimes Availability[] @relation("AvailableDateTimes")
959
966
  fullName String?
960
967
  address String?
961
968
  email String?
962
969
  phone String?
963
- agreedToAgreement Boolean @default(false)
970
+ agreedToAgreement Boolean @default(false)
964
971
  description String?
965
972
  status VolunteerServiceStatus?
966
973
  }
967
974
 
968
975
  model EventService {
969
976
  id String @id @default(cuid())
970
- service Service @relation(fields: [serviceId], references: [id], onDelete: Cascade)
971
- serviceId String
977
+ ownerId String
978
+ owner User @relation(fields: [ownerId], references: [id], onDelete: Cascade)
979
+ service Service @relation(fields: [serviceId], references: [id], onDelete: Cascade)
980
+ serviceId String
972
981
  eventServiceName String
973
982
  eventServiceTypes EventServiceType[]
974
983
  eventServiceSubType String?
@@ -1008,8 +1017,10 @@ model EventService {
1008
1017
 
1009
1018
  model EntertainmentService {
1010
1019
  id String @id @default(cuid())
1011
- service Service @relation(fields: [serviceId], references: [id])
1012
- serviceId String
1020
+ ownerId String
1021
+ owner User @relation(fields: [ownerId], references: [id], onDelete: Cascade)
1022
+ service Service @relation(fields: [serviceId], references: [id])
1023
+ serviceId String
1013
1024
  entertainmentServiceName String
1014
1025
  entertainmentServiceTypes EntertainmentServiceType[]
1015
1026
  entertainmentServiceSubType String?
@@ -1049,8 +1060,10 @@ model EntertainmentService {
1049
1060
 
1050
1061
  model Vendor {
1051
1062
  id String @id @default(cuid())
1052
- service Service @relation(fields: [serviceId], references: [id])
1053
- serviceId String
1063
+ ownerId String
1064
+ owner User @relation(fields: [ownerId], references: [id], onDelete: Cascade)
1065
+ service Service @relation(fields: [serviceId], references: [id])
1066
+ serviceId String
1054
1067
  vendorName String
1055
1068
  email String
1056
1069
  street String
@@ -1088,8 +1101,10 @@ model Vendor {
1088
1101
 
1089
1102
  model Exhibitor {
1090
1103
  id String @id @default(cuid())
1091
- service Service @relation(fields: [serviceId], references: [id])
1092
- serviceId String
1104
+ ownerId String
1105
+ owner User @relation(fields: [ownerId], references: [id], onDelete: Cascade)
1106
+ service Service @relation(fields: [serviceId], references: [id])
1107
+ serviceId String
1093
1108
  exhibitorName String
1094
1109
  email String
1095
1110
  street String
@@ -1126,8 +1141,10 @@ model Exhibitor {
1126
1141
 
1127
1142
  model Sponsor {
1128
1143
  id String @id @default(cuid())
1129
- service Service @relation(fields: [serviceId], references: [id])
1130
- serviceId String
1144
+ ownerId String
1145
+ owner User @relation(fields: [ownerId], references: [id], onDelete: Cascade)
1146
+ service Service @relation(fields: [serviceId], references: [id])
1147
+ serviceId String
1131
1148
  sponsorName String
1132
1149
  email String
1133
1150
  street String
@@ -1164,26 +1181,26 @@ model Sponsor {
1164
1181
 
1165
1182
  model Venue {
1166
1183
  id String @id @default(cuid())
1167
- service Service @relation(fields: [serviceId], references: [id], onDelete: Cascade)
1168
- serviceId String
1169
- serviceConnectionId String?
1170
- serviceConnection String?
1171
- venueName String
1172
- email String
1173
- street String
1174
- city String
1175
- state String
1176
- zipCode String
1177
- country String
1178
- phone String
1184
+ ownerId String
1185
+ owner User @relation(fields: [ownerId], references: [id], onDelete: Cascade)
1186
+ service Service @relation(fields: [serviceId], references: [id], onDelete: Cascade)
1187
+ serviceId String
1188
+ serviceConnectionId String?
1189
+ serviceConnection String?
1190
+ venueName String?
1191
+ email String?
1192
+ street String?
1193
+ city String?
1194
+ state String?
1195
+ zipCode String?
1196
+ country String?
1197
+ phone String?
1179
1198
  coverPhoto String?
1180
1199
  media Media[]
1181
1200
  visibility VisibilityPreference @default(Public)
1182
1201
  status ServiceStatus @default(Draft)
1183
1202
  yearsInBusiness YearsOfExperience @default(LessThanOneYear)
1184
1203
  description String?
1185
- serviceRangeId String @unique
1186
- serviceRange ServiceRange @relation(fields: [serviceRangeId], references: [id], onDelete: Cascade)
1187
1204
  amenities String[]
1188
1205
  menuItems String?
1189
1206
  additionalInfo String?
@@ -1212,8 +1229,10 @@ model Venue {
1212
1229
 
1213
1230
  model Organization {
1214
1231
  id String @id @default(cuid())
1215
- service Service? @relation(fields: [serviceId], references: [id])
1216
- serviceId String?
1232
+ ownerId String
1233
+ owner User @relation(fields: [ownerId], references: [id], onDelete: Cascade)
1234
+ service Service? @relation(fields: [serviceId], references: [id])
1235
+ serviceId String?
1217
1236
  organizationName String
1218
1237
  organizationType OrganizationType[]
1219
1238
  email String
@@ -1321,7 +1340,6 @@ model ServiceRange {
1321
1340
  min Int @default(0)
1322
1341
  max Int @default(50)
1323
1342
  volunteerServices VolunteerService[]
1324
- venue Venue?
1325
1343
  }
1326
1344
 
1327
1345
  model Availability {
@@ -1416,8 +1434,8 @@ model VerificationToken {
1416
1434
 
1417
1435
  model ServiceLink {
1418
1436
  id String @id @default(cuid())
1419
- serviceId String
1420
- service Service @relation(fields: [serviceId], references: [id], onDelete: Cascade)
1437
+ serviceId String
1438
+ service Service @relation(fields: [serviceId], references: [id], onDelete: Cascade)
1421
1439
  linkId String
1422
1440
  link Link @relation(fields: [linkId], references: [id], onDelete: Cascade)
1423
1441
  eventService EventService? @relation(fields: [eventServiceId], references: [id])
package/src/extendedSchemas.ts CHANGED
@@ -197,17 +197,6 @@ export interface VenueExt extends Venue {
197
197
  amountOfGuests?: AmountOfGuests | null; // Reflecting the correct relation with AmountOfGuests
198
198
  }
199
199
 
200
- export const VENUE_DATA_TO_INCLUDE = {
201
- availableDateTimes: true,
202
- targetAudience: true,
203
- links: {
204
- include: SERVICE_LINK_DATA_TO_INCLUDE
205
- },
206
- media: true,
207
- serviceRange: true,
208
- amountOfGuests: true,
209
- } satisfies Prisma.VenueInclude;
210
-
211
200
  export const VOLUNTEER_DATA_TO_INCLUDE = {
212
201
  links: {
213
202
  include: {
@@ -264,23 +253,6 @@ export interface ServiceExt extends Service {
264
253
  bookings?: Booking[];
265
254
  }
266
255
 
267
- export const BUSINESS_DATA_TO_INCLUDE = {
268
- owner: {
269
- select: FRONT_END_USER_DATA_TO_SELECT,
270
- },
271
- media: true,
272
- targetAudience: true,
273
- serviceLinks: {
274
- include: SERVICE_LINK_DATA_TO_INCLUDE,
275
- },
276
- venues: {
277
- include: VENUE_DATA_TO_INCLUDE,
278
- },
279
- vendors: {
280
- include: VENDOR_DATA_TO_INCLUDE,
281
- },
282
- }
283
-
284
256
 
285
257
  export interface ServiceLinkExt extends ServiceLink {
286
258
  link: Link;