@bash-app/bash-common 27.2.9 → 27.2.11

package/package.json

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

package/prisma/schema.prisma

@@ -17,7 +17,7 @@ model Club {
   street  String
   userId  String
   price   Int?
-  events  BashEvent[]
+  events  BashEvent[] 
   members ClubMember[]
   admin   ClubAdmin[]
 }
@@ -900,6 +900,7 @@ model Service {
   // stripeServiceCustomerId              String?               @unique
   stripeBusinessId      String                 @unique
   // stripeBusinessType  String  @default("Individual")
+  serviceType ServiceTypes
   creatorId             String
   creator               User                   @relation("CreatedService", fields: [creatorId], references: [id], onDelete: Cascade)
   dateCreated           DateTime               @default(now())
@@ -976,7 +977,7 @@ model VolunteerService {
   address            String?
   email              String?
   phone              String?
-  agreedToAgreement  Boolean                 @default(false)
+  agreedToAgreement  Boolean?                 @default(false)
   description        String?
   status             VolunteerServiceStatus?
 }

package/src/extendedSchemas.ts

@@ -208,8 +208,7 @@ export const SERVICE_LINK_DATA_TO_INCLUDE = {
 
 export interface VenueExt extends Venue {
   service?: Service;
-  availableDateTimes?: Availability[];
-  agreedToAgreement: boolean;  
+  availableDateTimes?: Availability[]; 
   targetAudience?: TargetAudience | null;
   links?: ServiceLinkExt[];
   coverPhotoUrl?: string;
@@ -252,7 +251,6 @@ export interface VolunteerServiceExt extends VolunteerService {
   address:          string | null;
   email:          string | null;
   phone:          string | null; 
-  agreedToAgreement: boolean;  
   description: string | null;
   status: VolunteerServiceStatus | null;
 }
@@ -260,11 +258,10 @@ export interface VolunteerServiceExt extends VolunteerService {
 
 
 export interface ServiceExt extends Service {
-  owner: PublicUser; 
+  owner?: PublicUser; 
   media?: Media[];
   coverPhotoUrl?: string;
-targetAudience?: TargetAudience | null;
-agreedToAgreement: boolean;  
+targetAudience?: TargetAudience | null; 
   volunteerService?: VolunteerService | null;
   serviceLinks?: ServiceLinkExt[];
   venues?: Venue[];