@bash-app/bash-common 28.4.1 → 29.1.0

package/package.json

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

package/prisma/schema.prisma

@@ -698,7 +698,7 @@ model Media {
   bashEventsReferencingMe      BashEvent[]
   sponsoredEventsReferencingMe SponsoredEvent[]
   serviceReferencingMe         Service[]
-  VolunteerService             VolunteerService? @relation(fields: [volunteerServiceId], references: [id])
+  volunteerService             VolunteerService? @relation(fields: [volunteerServiceId], references: [id])
   volunteerServiceId           String?
 }
 
@@ -895,6 +895,7 @@ model Service {
   serviceName String?
 
   //this is not the business info but that which is associated with the service
+  place       String?
   email       String?
   street      String?
   city        String?
@@ -928,7 +929,7 @@ model Service {
   bashesInterestedIn BashEventType[]
   bookings           Booking[]
   media              Media[]
-  ServiceLink        ServiceLink[]
+  serviceLinks       ServiceLink[]
 
   eventService         EventService?
   entertainmentService EntertainmentService?
@@ -963,13 +964,15 @@ model VolunteerService {
   agreedToAgreement  Boolean?                @default(false)
   description        String?
   status             VolunteerServiceStatus?
-  Media              Media[]
+  media              Media[]
 }
 
 model EventService {
   id                  String             @id @default(cuid())
   serviceId           String             @unique
   service             Service            @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  serviceRangeId      String?
+  serviceRange        ServiceRange?      @relation(fields: [serviceRangeId], references: [id])
   eventServiceTypes   EventServiceType[]
   eventServiceSubType String?
   yearsOfExperience   YearsOfExperience
@@ -984,6 +987,8 @@ model EntertainmentService {
   id                          String                     @id @default(cuid())
   serviceId                   String                     @unique
   service                     Service                    @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  serviceRangeId              String?
+  serviceRange                ServiceRange?              @relation(fields: [serviceRangeId], references: [id])
   entertainmentServiceTypes   EntertainmentServiceType[]
   entertainmentServiceSubType String?
   genre                       MusicGenreType?
@@ -998,6 +1003,8 @@ model Vendor {
   id                String            @id @default(cuid())
   serviceId         String            @unique
   service           Service           @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  serviceRangeId    String?
+  serviceRange      ServiceRange?     @relation(fields: [serviceRangeId], references: [id])
   yearsOfExperience YearsOfExperience
   crowdSizeId       String?           @unique
   crowdSize         AmountOfGuests?   @relation(fields: [crowdSizeId], references: [id], onDelete: Cascade)
@@ -1010,6 +1017,8 @@ model Exhibitor {
   id                String            @id @default(cuid())
   serviceId         String            @unique
   service           Service           @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  serviceRangeId    String?
+  serviceRange      ServiceRange?     @relation(fields: [serviceRangeId], references: [id])
   yearsOfExperience YearsOfExperience
   crowdSizeId       String?           @unique
   crowdSize         AmountOfGuests?   @relation(fields: [crowdSizeId], references: [id], onDelete: Cascade)
@@ -1021,6 +1030,8 @@ model Sponsor {
   id                String            @id @default(cuid())
   serviceId         String            @unique
   service           Service           @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  serviceRangeId    String?
+  serviceRange      ServiceRange?     @relation(fields: [serviceRangeId], references: [id])
   yearsOfExperience YearsOfExperience
   crowdSizeId       String?           @unique
   crowdSize         AmountOfGuests?   @relation(fields: [crowdSizeId], references: [id])
@@ -1123,10 +1134,15 @@ enum YearsOfExperience {
 }
 
 model ServiceRange {
-  id                String             @id @default(cuid())
-  min               Int                @default(0)
-  max               Int                @default(50)
-  volunteerServices VolunteerService[]
+  id                    String                 @id @default(cuid())
+  min                   Int                    @default(0)
+  max                   Int                    @default(50)
+  volunteerServices     VolunteerService[]
+  entertainmentServices EntertainmentService[]
+  EventService          EventService[]
+  Vendor                Vendor[]
+  Exhibitor             Exhibitor[]
+  Sponsor               Sponsor[]
 }
 
 model Availability {

package/src/definitions.ts

@@ -4,6 +4,7 @@ import {
   BashEventVibeTags,
   Contact,
   DayOfWeek,
+  Prisma,
   Ticket,
   TicketTier,
   User,
@@ -82,7 +83,37 @@ export const DEBOUNCE_WAIT = 1000 as const;
 export const ASSET_KEY_DELIM = '__' as const;
 export const ASSET_MAX_MD5_BYTE_LENGTH = 1024 * 100; // 100kb
 
-
+export const SERVICE_LINK_DATA_TO_INCLUDE = {
+  link: true,
+} satisfies Prisma.ServiceLinkInclude;
+
+export const SERVICE_DATA_TO_INCLUDE = {
+  stripeAccount: true,
+  availableDateTimes: true,
+  targetAudience: true,
+  media: true,
+  serviceLinks: {
+    include: SERVICE_LINK_DATA_TO_INCLUDE
+  },
+} satisfies Prisma.ServiceInclude;
+
+export const VENUE_DATA_TO_INCLUDE = {
+
+} satisfies Prisma.VenueInclude;
+
+export const VENDOR_DATA_TO_INCLUDE = {
+  crowdSize: true,
+} satisfies Prisma.VendorInclude;
+
+export const VOLUNTEER_DATA_TO_INCLUDE = {
+  links: {
+    include: {
+      serviceLinks: true,
+    },
+  },
+  media: true,
+  serviceRange: true,
+} satisfies Prisma.VolunteerServiceInclude;
 
 export type DateTimeArgType = Date | string | undefined | null;
 export type RequiredStripeInfoMissingErrorDataType = { [k in keyof User]?: { type: string, label: string } };

package/src/extendedSchemas.ts

@@ -155,7 +155,6 @@ export interface ServiceExt extends Service {
 
   stripeAccount?: StripeAccount;
 
-  visiblility?: VisibilityPreference;
   availableDateTimes?: Availability[];
 
   bookings?: Booking[];
@@ -175,21 +174,25 @@ export interface ServiceExt extends Service {
 export interface EventServiceExt extends EventService {
   service: ServiceExt;
   crowdSize?: AmountOfGuests;
+  serviceRange?: ServiceRange;
 }
 
 export interface EntertainmentServiceExt extends EntertainmentService {
   service: ServiceExt;
   crowdSize?: AmountOfGuests;
+  serviceRange?: ServiceRange;
 }
 
 export interface ExhibitorExt extends Exhibitor {
   service: ServiceExt;
   crowdSize?: AmountOfGuests;
+  serviceRange?: ServiceRange;
 }
 
 export interface SponsorExt extends Sponsor {
   service: ServiceExt;
   crowdSize?: AmountOfGuests;
+  serviceRange?: ServiceRange;
 }
 
 export interface VendorExt extends Vendor {
@@ -199,7 +202,7 @@ export interface VendorExt extends Vendor {
 
 export interface VenueExt extends Venue {
   service: ServiceExt;
-  crowdSize?: AmountOfGuests;
+  // crowdSize?: AmountOfGuests;
 }
 
 export interface OrganizationExt extends Organization {