@bash-app/bash-common 30.7.0 → 30.9.0

package/package.json

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

package/prisma/schema.prisma

@@ -245,8 +245,14 @@ model Invitation {
   @@index([email])
 }
 
+enum BashEventSource {
+  Bash
+  Eventbrite
+}
+
 model BashEvent {
   id                              String                    @id @default(cuid())
+  source                          BashEventSource           @default(Bash)
   title                           String
   creatorId                       String
   creator                         User                      @relation("CreatedEvent", fields: [creatorId], references: [id], onDelete: Cascade)

package/src/definitions.ts

@@ -195,22 +195,6 @@ export const SERVICE_LINK_DATA_TO_INCLUDE = {
 //   "organization"
 // >;
 
-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

@@ -531,6 +531,25 @@ export interface ServiceLinkExt extends ServiceLink {
   link: Link;
 }
 
+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,
+  service: {
+    include: SERVICE_DATA_TO_INCLUDE,
+  },
+} satisfies Prisma.VolunteerServiceInclude;
+
+export const VENUE_DATA_TO_INCLUDE = {} satisfies Prisma.VenueInclude;
+
 //-----------------------------------------
 
 export interface BashNotificationExt extends BashNotification {