@bash-app/bash-common 30.6.0 → 30.8.0

package/package.json

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

package/prisma/schema.prisma

@@ -113,6 +113,7 @@ enum TaskStatus {
   Rejected
   Completed
   Assigned
+  Pending
   Open
 }
 
@@ -214,7 +215,7 @@ model BashNotification {
   reminders        Reminder[]
   redirectUrl      String?
 
-  @@unique([creatorId, email, bashEventId])
+  @@unique([creatorId, email, bashEventId, taskId])
   @@unique([creatorId, email, invitationId])
   @@unique([creatorId, email, serviceBookingId])
   @@index([creatorId])
@@ -244,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)
@@ -1203,7 +1210,7 @@ model Service {
   serviceLinks          ServiceLink[]
 
   volunteerServiceId     String?               @unique
-  volunteerService       VolunteerService?     @relation(fields: [volunteerServiceId], references: [id], onDelete: Cascade)
+  volunteerService       VolunteerService?     @relation("ServiceToVolunteer")
   eventServiceId         String?               @unique
   eventService           EventService?         @relation(fields: [eventServiceId], references: [id], onDelete: Cascade)
   entertainmentServiceId String?               @unique
@@ -1251,26 +1258,38 @@ model StripeAccount {
 }
 
 model VolunteerService {
-  id                String                  @id @default(cuid())
-  // service            Service
-  userId            String?
-  user              User?                   @relation(fields: [userId], references: [id])
-  serviceRangeId    String?
-  serviceRange      ServiceRange?           @relation(fields: [serviceRangeId], references: [id])
-  links             Link[]                  @relation("VolunteerServiceLinks")
-  // availableDateTimes ServiceAvailability[]   @relation("AvailableDateTimes")
-  fullName          String?
-  address           String?
-  email             String?
-  phone             String?
-  agreedToAgreement Boolean?                @default(false)
-  description       String?
-  status            VolunteerServiceStatus?
-  media             Media[]
+  id                    String                 @id @default(cuid())
+  userId                String // Make required, not nullable
+  user                  User                   @relation(fields: [userId], references: [id])
+  serviceRangeId        String?
+  serviceRange          ServiceRange?          @relation(fields: [serviceRangeId], references: [id])
+  links                 Link[]                 @relation("VolunteerServiceLinks")
+  fullName              String?
+  address               String?
+  email                 String?
+  phone                 String?
+  agreedToAgreement     Boolean                @default(false) // Remove nullable
+  description           String                 @default("") // Make required with default
+  status                VolunteerServiceStatus @default(Draft) // Make required with default
+  media                 Media[]
+  skills                String?
+  experienceLevel       String?
+  preferredEventTypes   String[]               @default([])
+  availability          String[]               @default([])
+  physicalCapabilities  String?
+  equipment             String?
+  transportation        String?
+  emergencyContactName  String?
+  emergencyContactPhone String?
 
   serviceRatesAssociation ServiceRatesAssociation?
 
-  service Service?
+  // Make this a required one-to-one relationship
+  service   Service @relation("ServiceToVolunteer", fields: [serviceId], references: [id])
+  serviceId String  @unique
+
+  // Add indexes for better performance
+  @@index([userId])
 }
 
 model EventService {
@@ -1550,6 +1569,11 @@ enum ServiceRateType {
   // WEEKLY
 }
 
+enum ServiceAddonStatus {
+  Enabled
+  Disabled
+}
+
 //can optionally be associated with a package
 model ServiceAddon {
   id          String @id @default(cuid())
@@ -1558,6 +1582,8 @@ model ServiceAddon {
   priceCents  Int
   quantity    Int
 
+  status ServiceAddonStatus @default(Enabled)
+
   servicePackage   ServicePackage? @relation(fields: [servicePackageId], references: [id], onDelete: Cascade)
   servicePackageId String?
 

package/src/index.ts

@@ -15,6 +15,7 @@ export * from "./utils/arrayUtils";
 export * from "./utils/promoCodesUtils";
 export * from "./utils/userPromoCodeUtils";
 export * from "./utils/userSubscriptionUtils";
+export * from "./utils/service/regexUtils";
 export * from "./utils/service/serviceUtils";
 export * from "./utils/service/venueUtils";
 export * from "./utils/service/attendeeOptionUtils";

package/src/utils/service/regexUtils.ts

@@ -0,0 +1,11 @@
+export function isPositiveInt(str: string): boolean {
+  return /^\d*$/.test(str);
+}
+
+export function isPositiveFloat(str: string): boolean {
+  return /^\d*\.?\d*$/.test(str);
+}
+
+export function isPrice(str: string): boolean {
+  return /^\d*\.?\d{0,2}$/.test(str);
+}

package/src/utils/service/serviceUtils.ts

@@ -64,7 +64,7 @@ export const SERVICE_CANCELLATION_POLICY_DATA: ServiceCancellationPolicyMap = {
     ],
   },
   [ServiceCancellationPolicyOption.Standard90Day]: {
-    name: "Very Flexible",
+    name: "Standard 90 Day",
     refundPolicy: [
       {
         days: 90,