@bash-app/bash-common 30.24.0 → 30.26.0

package/package.json

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

package/prisma/schema.prisma

@@ -7,8 +7,8 @@ generator client {
 
 datasource db {
   provider  = "postgresql"
-  url       = env("POSTGRES_PRISMA_URL") 
-  directUrl = env("POSTGRES_URL_NON_POOLING") 
+  url       = env("POSTGRES_PRISMA_URL")
+  directUrl = env("POSTGRES_URL_NON_POOLING")
 }
 
 model Club {
@@ -358,32 +358,48 @@ model TicketTier {
 }
 
 model Ticket {
-  id                         String        @id @default(cuid())
+  id                         String           @id @default(cuid())
   ownerId                    String
-  owner                      User          @relation("TicketsIOwn", fields: [ownerId], references: [id])
+  owner                      User             @relation("TicketsIOwn", fields: [ownerId], references: [id])
   bashEventId                String
-  bashEvent                  BashEvent     @relation(fields: [bashEventId], references: [id])
+  bashEvent                  BashEvent        @relation(fields: [bashEventId], references: [id])
   ticketTierId               String?
-  ticketTier                 TicketTier?   @relation(fields: [ticketTierId], references: [id])
+  ticketTier                 TicketTier?      @relation(fields: [ticketTierId], references: [id])
   validDate                  DateTime?
   forUserId                  String?
-  forUser                    User?         @relation("TicketsISent", fields: [forUserId], references: [id])
+  forUser                    User?            @relation("TicketsISent", fields: [forUserId], references: [id])
   fullName                   String?
   email                      String?
   paidOn                     DateTime?
   allowPromiseToPay          Boolean?
-  status                     TicketStatus?
+  status                     TicketStatus     @default(Pending)
   isFreeGuest                Boolean?
   geoFenceCheckInUnnecessary Boolean?
   checkedInAt                DateTime?
   checkedOutAt               DateTime?
   invitationId               String?
-  invitation                 Invitation?   @relation("TicketsForInvitation", fields: [invitationId], references: [id])
+  invitation                 Invitation?      @relation("TicketsForInvitation", fields: [invitationId], references: [id])
   checkoutId                 String?
-  checkout                   Checkout?     @relation(fields: [checkoutId], references: [id])
-  checkedInMethod String? @default("manual")
+  checkout                   Checkout?        @relation(fields: [checkoutId], references: [id])
+  checkedInMethod            String?          @default("manual")
+  waitlistPosition           Int? // Position in the waitlist
+  waitlistJoinedAt           DateTime? // When they joined the waitlist
+  waitlistNotifiedAt         DateTime? // When they were notified of available spot
+  waitlistExpiresAt          DateTime? // When their waitlist spot expires
+  checkInLocation            String? // Where they checked in
+  checkOutLocation           String? // Where they checked out
+  checkOutMethod             String?          @default("manual")
+  lastLocationUpdate         DateTime? // For tracking if they're still in the venue
+  validationAttempts         Int              @default(0)
+  lastValidationAttempt      DateTime?
+  lastValidatedBy            String? // User ID who last validated
+  transfers                  TicketTransfer[]
+  metadata                   TicketMetadata[]
+  waitlistUser               User?            @relation("TicketsOnWaitlist", fields: [waitlistUserId], references: [id])
+  waitlistUserId             String?
 
   @@index([bashEventId])
+  @@index([waitlistUserId])
 }
 
 enum TicketStatus {
@@ -392,6 +408,33 @@ enum TicketStatus {
   Missed
   CheckedIn
   LeftRadius
+  Pending
+}
+
+model TicketTransfer {
+  id         String   @id @default(cuid())
+  ticket     Ticket   @relation(fields: [ticketId], references: [id])
+  ticketId   String
+  fromUser   User     @relation("TransfersFrom", fields: [fromUserId], references: [id])
+  fromUserId String
+  toUser     User     @relation("TransfersTo", fields: [toUserId], references: [id])
+  toUserId   String
+  timestamp  DateTime
+  reason     String?
+
+  @@index([ticketId])
+}
+
+model TicketMetadata {
+  id        String   @id @default(cuid())
+  ticket    Ticket   @relation(fields: [ticketId], references: [id])
+  ticketId  String
+  key       String
+  value     String
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@index([ticketId])
 }
 
 // enum BookingStatus {
@@ -957,8 +1000,13 @@ model User {
   ownedServices                 Service[]            @relation("OwnedService")
   createdServices               Service[]            @relation("CreatedService")
   createdEvents                 BashEvent[]          @relation("CreatedEvent")
+  checkouts                     Checkout[]
   ticketsISent                  Ticket[]             @relation("TicketsISent")
   ticketsIOwn                   Ticket[]             @relation("TicketsIOwn")
+  transfersFrom                 TicketTransfer[]     @relation("TransfersFrom")
+  transfersTo                   TicketTransfer[]     @relation("TransfersTo")
+  ticketsOnWaitlist             Ticket[]             @relation("TicketsOnWaitlist")
+  ticketTiersWaitListsIveJoined TicketTier[]
   reviews                       Review[]
   sponsorships                  SponsoredEvent[]
   investments                   Investment[]
@@ -995,8 +1043,6 @@ model User {
   remindersCreatedByMe          Reminder[]           @relation("RemindersCreatedByMe")
   remindersAssignedToMe         Reminder[]           @relation("RemindersAssignedToMe")
   eventTasksAssignedToMe        EventTask[]          @relation("TasksAssignedToMe")
-  checkouts                     Checkout[]
-  ticketTiersWaitListsIveJoined TicketTier[]
   contacts                      Contact[]
   contactLists                  ContactList[]        @relation("UserContactLists")
   contactlist                   ContactList[]
@@ -1242,16 +1288,16 @@ model Service {
   additionalInfo String?
   coverPhoto     String?
 
-  mission              String?
-  communityInvolvement String?
-  emergencyContact     String?
-  contactDetails       String?
-  cancellationPolicy   ServiceCancellationPolicy? @default(None)
+  mission                     String?
+  communityInvolvement        String?
+  emergencyContact            String?
+  contactDetails              String?
+  cancellationPolicy          ServiceCancellationPolicy? @default(None)
   // refundPolicy         String?
   // insurancePolicy      String?
-  availableHours     String?
-  allowsInstantBooking  Boolean @default(false)
-  instantBookingLeadTimeHours Int @default(0)
+  availableHours              String?
+  allowsInstantBooking        Boolean                    @default(false)
+  instantBookingLeadTimeHours Int                        @default(0)
 
   displayGoogleReviewsOnDetailPage Boolean @default(true)
   displayBashReviewsOnDetailPage   Boolean @default(true)

package/src/extendedSchemas.ts

@@ -50,6 +50,8 @@ import {
   ServiceBooking,
   ServiceBookingPriceBreakdown,
   ServiceBookingFee,
+  TicketTransfer,
+  TicketMetadata,
 } from "@prisma/client";
 import { SERVICE_LINK_DATA_TO_INCLUDE } from "./definitions";
 import { serviceKeysArray } from "./utils/service/serviceUtils";
@@ -686,6 +688,8 @@ export interface TicketExt extends Ticket {
   owner: PublicUser;
   forUser: PublicUser;
   checkout?: Checkout;
+  transfers?: TicketTransfer[];
+  metadata?: TicketMetadata[];
 }
 
 export interface CheckoutExt extends Checkout {