@bash-app/bash-common 24.0.0 → 24.2.0

package/package.json

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

package/prisma/schema.prisma

@@ -846,6 +846,7 @@ model User {
   bookingForMe                  Booking[]
   userSubscription              UserSubscription?
   serviceSubcriptions           ServiceSubscription[]
+  volunteerService              VolunteerService[]
 }
 
 model Contact {
@@ -905,7 +906,8 @@ model Business {
   venues                Venue[]
   targetAudienceId      String?                @unique
   targetAudience        TargetAudience?        @relation(fields: [targetAudienceId], references: [id])
-  volunteerService      VolunteerService?
+  // volunteerService      VolunteerService?
+  volunteerServices     VolunteerService[]
   eventServices         EventService[]
   entertainmentServices EntertainmentService[]
   vendors               Vendor[]
@@ -927,9 +929,10 @@ model Business {
 
 model VolunteerService {
   id                 String         @id @default(cuid())
-  businessId         String?         @unique
-  business           Business?       @relation(fields: [businessId], references: [id])
-    userId     String   // User ID for individual volunteers
+  businessId         String?
+  business           Business?      @relation(fields: [businessId], references: [id])
+  userId             String?
+  user               User?          @relation(fields: [userId], references: [id])
   serviceRangeId     String?
   serviceRange       ServiceRange?  @relation(fields: [serviceRangeId], references: [id])
   media              Media[]        @relation("VolunteerServiceMedia")
@@ -939,6 +942,7 @@ model VolunteerService {
   address            String?
   email              String?
   phone              String?
+  agreedToAgreement  Boolean
 }
 
 model EventService {

package/src/extendedSchemas.ts

@@ -242,6 +242,7 @@ export interface VolunteerServiceExt extends VolunteerService {
   address:          string | null;
   email:          string | null;
   phone:          string | null; 
+  agreedToAgreement: boolean;  
 }