@bash-app/bash-common 30.68.0 → 30.69.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "30.68.0",
+  "version": "30.69.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "dist/index.js",

package/prisma/schema.prisma

@@ -1263,9 +1263,12 @@ model User {
 
   // Vendor booking relations
   vendorBookingRequestsAsHost VendorBookingRequest[] @relation("VendorBookingHost")
-  
+
   // Vendor booking messages
   vendorBookingMessages VendorBookingMessage[] @relation("VendorMessageSender")
+  
+  // Unified service booking messages
+  serviceBookingMessages ServiceBookingMessage[] @relation("ServiceMessageSender")
 }
 
 model UserPreferences {
@@ -3468,6 +3471,9 @@ model ServiceBooking {
 
   addOns   ServiceBookingAddOn[] // for services that aren't billed by time, but have add-ons
   packages ServiceBookingPackage[] // for services that aren't billed by time, but have packages
+  
+  // Messages relation
+  messages ServiceBookingMessage[]
 
   totalATBCents    Int
   subtotalATBCents Int @default(0) //subtotal before taxes, fees, and discounts
@@ -3544,9 +3550,12 @@ model VendorBookingRequest {
   // Response from vendor
   vendorResponse String? // Vendor's message when accepting/rejecting
   respondedAt    DateTime?
-  
+
   // Messages relation
   messages VendorBookingMessage[]
+  
+  // Unified messages relation
+  serviceMessages ServiceBookingMessage[] @relation("ServiceBookingMessages")
 
   @@index([hostUserId])
   @@index([vendorServiceId])
@@ -3563,21 +3572,54 @@ model VendorBookingMessage {
   // Relations
   vendorBookingRequestId String
   vendorBookingRequest   VendorBookingRequest @relation(fields: [vendorBookingRequestId], references: [id], onDelete: Cascade)
-  
+
   senderId String
   sender   User   @relation("VendorMessageSender", fields: [senderId], references: [id], onDelete: Cascade)
-  
+
   // Message content
   message     String @db.Text
   messageType String @default("text") // "text", "system", "payment_update", etc.
+
+  // Read status
+  isRead Boolean   @default(false)
+  readAt DateTime?
+
+  // Metadata
+  metadata Json? // For storing additional message data like payment info, etc.
+
+  @@index([vendorBookingRequestId])
+  @@index([senderId])
+  @@index([createdAt])
+}
+
+// Unified messaging system for all service bookings
+model ServiceBookingMessage {
+  id        String   @id @default(cuid())
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  // Relations - can be linked to either ServiceBooking or VendorBookingRequest
+  serviceBookingId       String?
+  serviceBooking         ServiceBooking?       @relation(fields: [serviceBookingId], references: [id], onDelete: Cascade)
+  
+  vendorBookingRequestId String?
+  vendorBookingRequest   VendorBookingRequest? @relation("ServiceBookingMessages", fields: [vendorBookingRequestId], references: [id], onDelete: Cascade)
+  
+  senderId String
+  sender   User   @relation("ServiceMessageSender", fields: [senderId], references: [id], onDelete: Cascade)
+  
+  // Message content
+  message     String @db.Text
+  messageType String @default("text") // "text", "system", "booking_update", "payment_update", etc.
   
   // Read status
   isRead   Boolean   @default(false)
   readAt   DateTime?
   
-  // Metadata
-  metadata Json? // For storing additional message data like payment info, etc.
+  // Metadata for different message types
+  metadata Json? // For storing additional message data like booking changes, payment info, etc.
 
+  @@index([serviceBookingId])
   @@index([vendorBookingRequestId])
   @@index([senderId])
   @@index([createdAt])