@bash-app/bash-common 30.96.0 → 30.97.1

package/prisma/manual-migration-add-missing-columns.sql

@@ -0,0 +1,182 @@
+-- ============================================================================
+-- BASH DATABASE MIGRATION - Missing Columns
+-- Date: November 14, 2025
+-- Description: Add missing columns from Prisma schema to production database
+-- ============================================================================
+
+-- Issue: Prisma schema has been updated but migrations weren't run
+-- This SQL adds all missing columns that are causing runtime errors
+
+-- ============================================================================
+-- 1. Service Table - Add acceptsBashCash column
+-- ============================================================================
+-- This column controls whether a service accepts BashCash payments
+-- Default: true (most services should accept BashCash)
+
+ALTER TABLE "Service" 
+ADD COLUMN IF NOT EXISTS "acceptsBashCash" BOOLEAN NOT NULL DEFAULT true;
+
+COMMENT ON COLUMN "Service"."acceptsBashCash" IS 'Whether this service accepts BashCash as payment';
+
+-- ============================================================================
+-- 2. User Table - Add isLightweightAccount column
+-- ============================================================================
+-- This column marks accounts created automatically via task invitation acceptance
+-- These accounts need password changes and may have limited permissions initially
+
+ALTER TABLE "User" 
+ADD COLUMN IF NOT EXISTS "isLightweightAccount" BOOLEAN NOT NULL DEFAULT false;
+
+COMMENT ON COLUMN "User"."isLightweightAccount" IS 'True if account was auto-created via task invitation (needs password change)';
+
+-- ============================================================================
+-- 3. TaskComment Table - Create if not exists
+-- ============================================================================
+-- This table stores comments on event tasks
+-- Used for host-volunteer communication about task details
+
+CREATE TABLE IF NOT EXISTS "TaskComment" (
+  "id" TEXT NOT NULL PRIMARY KEY,
+  "taskId" TEXT NOT NULL,
+  "authorId" TEXT NOT NULL,
+  "content" TEXT NOT NULL,
+  "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  CONSTRAINT "TaskComment_taskId_fkey" FOREIGN KEY ("taskId") REFERENCES "EventTask"("id") ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT "TaskComment_authorId_fkey" FOREIGN KEY ("authorId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- Create indexes for TaskComment
+CREATE INDEX IF NOT EXISTS "TaskComment_taskId_idx" ON "TaskComment"("taskId");
+CREATE INDEX IF NOT EXISTS "TaskComment_authorId_idx" ON "TaskComment"("authorId");
+CREATE INDEX IF NOT EXISTS "TaskComment_createdAt_idx" ON "TaskComment"("createdAt");
+
+COMMENT ON TABLE "TaskComment" IS 'Comments on event tasks for host-volunteer communication';
+
+-- ============================================================================
+-- 4. TaskInvitation Table - Create if not exists
+-- ============================================================================
+-- This table stores email invitations for non-users to accept event tasks
+-- When accepted, creates lightweight user accounts automatically
+
+CREATE TABLE IF NOT EXISTS "TaskInvitation" (
+  "id" TEXT NOT NULL PRIMARY KEY,
+  "taskId" TEXT NOT NULL,
+  "invitedEmail" TEXT NOT NULL,
+  "token" TEXT NOT NULL UNIQUE,
+  "invitedName" TEXT,
+  "personalMessage" TEXT,
+  "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "expiresAt" TIMESTAMP(3) NOT NULL,
+  "acceptedAt" TIMESTAMP(3),
+  "acceptedById" TEXT,
+  "createdById" TEXT NOT NULL,
+  CONSTRAINT "TaskInvitation_taskId_fkey" FOREIGN KEY ("taskId") REFERENCES "EventTask"("id") ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT "TaskInvitation_acceptedById_fkey" FOREIGN KEY ("acceptedById") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT "TaskInvitation_createdById_fkey" FOREIGN KEY ("createdById") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- Create indexes for TaskInvitation
+CREATE INDEX IF NOT EXISTS "TaskInvitation_token_idx" ON "TaskInvitation"("token");
+CREATE INDEX IF NOT EXISTS "TaskInvitation_invitedEmail_idx" ON "TaskInvitation"("invitedEmail");
+CREATE INDEX IF NOT EXISTS "TaskInvitation_taskId_idx" ON "TaskInvitation"("taskId");
+CREATE INDEX IF NOT EXISTS "TaskInvitation_createdById_idx" ON "TaskInvitation"("createdById");
+CREATE INDEX IF NOT EXISTS "TaskInvitation_acceptedById_idx" ON "TaskInvitation"("acceptedById");
+
+COMMENT ON TABLE "TaskInvitation" IS 'Email invitations for non-users to accept event tasks';
+COMMENT ON COLUMN "TaskInvitation"."token" IS 'Unique CUID token for invitation link';
+COMMENT ON COLUMN "TaskInvitation"."invitedName" IS 'Optional name hint from host';
+COMMENT ON COLUMN "TaskInvitation"."personalMessage" IS 'Optional personal message from host';
+COMMENT ON COLUMN "TaskInvitation"."expiresAt" IS 'Event date + 1 day';
+
+-- ============================================================================
+-- 5. Update User Table - Add missing task-related relations
+-- ============================================================================
+-- These columns should already exist if EventTask table exists, but verify:
+
+-- Check if comments column is needed (it's a relation, not a physical column)
+-- Check if invitations columns are needed (they're relations, not physical columns)
+
+-- ============================================================================
+-- 6. Verification Queries
+-- ============================================================================
+-- Run these to verify the migration was successful:
+
+-- Check Service table
+-- SELECT column_name, data_type, column_default 
+-- FROM information_schema.columns 
+-- WHERE table_name = 'Service' AND column_name = 'acceptsBashCash';
+
+-- Check User table
+-- SELECT column_name, data_type, column_default 
+-- FROM information_schema.columns 
+-- WHERE table_name = 'User' AND column_name = 'isLightweightAccount';
+
+-- Check TaskComment table exists
+-- SELECT table_name FROM information_schema.tables WHERE table_name = 'TaskComment';
+
+-- Check TaskInvitation table exists
+-- SELECT table_name FROM information_schema.tables WHERE table_name = 'TaskInvitation';
+
+-- ============================================================================
+-- 7. Rollback (if needed)
+-- ============================================================================
+-- DO NOT RUN UNLESS ROLLING BACK!
+
+-- -- Remove acceptsBashCash
+-- ALTER TABLE "Service" DROP COLUMN IF EXISTS "acceptsBashCash";
+
+-- -- Remove isLightweightAccount
+-- ALTER TABLE "User" DROP COLUMN IF EXISTS "isLightweightAccount";
+
+-- -- Drop TaskComment table
+-- DROP TABLE IF EXISTS "TaskComment" CASCADE;
+
+-- -- Drop TaskInvitation table
+-- DROP TABLE IF EXISTS "TaskInvitation" CASCADE;
+
+-- ============================================================================
+-- 8. Post-Migration Tasks
+-- ============================================================================
+-- After running this migration:
+-- 1. Restart API server
+-- 2. Clear any Redis/cache
+-- 3. Run `npx prisma generate` in bash-common
+-- 4. Test the /api/public-services/Sponsors endpoint
+-- 5. Test task invitation flow
+-- 6. Test task comment system
+
+-- ============================================================================
+-- EXECUTION INSTRUCTIONS
+-- ============================================================================
+-- 
+-- To apply this migration to your PostgreSQL database:
+--
+-- Option 1: Using psql command line
+-- $ psql -U your_username -d your_database -f add_missing_columns.sql
+--
+-- Option 2: Using Prisma
+-- $ cd bash-common
+-- $ npx prisma db push
+--
+-- Option 3: Copy-paste into Vercel Postgres Dashboard
+-- 1. Go to Vercel Dashboard > Storage > Your Postgres DB > Query
+-- 2. Copy-paste the SQL statements (exclude comments if needed)
+-- 3. Execute
+--
+-- Option 4: Using TablePlus or another GUI
+-- 1. Connect to your database
+-- 2. Open SQL query window
+-- 3. Copy-paste and execute
+--
+-- ============================================================================
+-- IMPORTANT NOTES
+-- ============================================================================
+-- 
+-- 1. This migration is IDEMPOTENT - safe to run multiple times
+-- 2. Uses "IF NOT EXISTS" to prevent errors on re-run
+-- 3. All new columns have DEFAULT values to avoid breaking existing data
+-- 4. Foreign keys use CASCADE for proper cleanup
+-- 5. Indexes are created for query performance
+--
+-- ============================================================================
+

package/prisma/quick-migration.sql

@@ -0,0 +1,47 @@
+-- Quick Migration SQL - Copy and paste into Vercel Postgres Query
+-- Adds missing columns that are causing errors
+
+-- 1. Add acceptsBashCash to Service table
+ALTER TABLE "Service" ADD COLUMN IF NOT EXISTS "acceptsBashCash" BOOLEAN NOT NULL DEFAULT true;
+
+-- 2. Add isLightweightAccount to User table  
+ALTER TABLE "User" ADD COLUMN IF NOT EXISTS "isLightweightAccount" BOOLEAN NOT NULL DEFAULT false;
+
+-- 3. Create TaskComment table
+CREATE TABLE IF NOT EXISTS "TaskComment" (
+  "id" TEXT NOT NULL PRIMARY KEY,
+  "taskId" TEXT NOT NULL,
+  "authorId" TEXT NOT NULL,
+  "content" TEXT NOT NULL,
+  "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  CONSTRAINT "TaskComment_taskId_fkey" FOREIGN KEY ("taskId") REFERENCES "EventTask"("id") ON DELETE CASCADE,
+  CONSTRAINT "TaskComment_authorId_fkey" FOREIGN KEY ("authorId") REFERENCES "User"("id") ON DELETE CASCADE
+);
+
+CREATE INDEX IF NOT EXISTS "TaskComment_taskId_idx" ON "TaskComment"("taskId");
+CREATE INDEX IF NOT EXISTS "TaskComment_authorId_idx" ON "TaskComment"("authorId");
+
+-- 4. Create TaskInvitation table
+CREATE TABLE IF NOT EXISTS "TaskInvitation" (
+  "id" TEXT NOT NULL PRIMARY KEY,
+  "taskId" TEXT NOT NULL,
+  "invitedEmail" TEXT NOT NULL,
+  "token" TEXT NOT NULL UNIQUE,
+  "invitedName" TEXT,
+  "personalMessage" TEXT,
+  "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "expiresAt" TIMESTAMP(3) NOT NULL,
+  "acceptedAt" TIMESTAMP(3),
+  "acceptedById" TEXT,
+  "createdById" TEXT NOT NULL,
+  CONSTRAINT "TaskInvitation_taskId_fkey" FOREIGN KEY ("taskId") REFERENCES "EventTask"("id") ON DELETE CASCADE,
+  CONSTRAINT "TaskInvitation_acceptedById_fkey" FOREIGN KEY ("acceptedById") REFERENCES "User"("id") ON DELETE SET NULL,
+  CONSTRAINT "TaskInvitation_createdById_fkey" FOREIGN KEY ("createdById") REFERENCES "User"("id") ON DELETE CASCADE
+);
+
+CREATE INDEX IF NOT EXISTS "TaskInvitation_token_idx" ON "TaskInvitation"("token");
+CREATE INDEX IF NOT EXISTS "TaskInvitation_invitedEmail_idx" ON "TaskInvitation"("invitedEmail");
+CREATE INDEX IF NOT EXISTS "TaskInvitation_taskId_idx" ON "TaskInvitation"("taskId");
+
+-- Done! Restart your API server after running this.
+

package/prisma/schema.prisma

@@ -3,9 +3,8 @@ generator client {
 }
 
 datasource db {
-  provider  = "postgresql"
-  url       = env("POSTGRES_PRISMA_URL")
-  directUrl = env("POSTGRES_URL_NON_POOLING")
+  provider = "postgresql"
+  url      = env("POSTGRES_PRISMA_URL")
 }
 
 model Club {
@@ -54,16 +53,25 @@ model BashComment {
 }
 
 model Competition {
-  id             String               @id @default(cuid())
-  name           String
-  description    String
-  userId         String
-  bashEventId    String
-  numberOfPrizes Int
-  bashEvent      BashEvent            @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
-  owner          User                 @relation(fields: [userId], references: [id], onDelete: Cascade)
-  sponsor        CompetitionSponsor[]
-  prizes         Prize[]
+  id              String               @id @default(cuid())
+  name            String
+  description     String               @db.Text
+  userId          String
+  bashEventId     String
+  numberOfPrizes  Int
+  competitionType CompetitionType? // Main category
+  subtype         String? // Subcategory
+  rules           String?              @db.Text // Detailed rules/disclaimers
+  judgingType     JudgingType? // How winner is determined
+  createdAt       DateTime             @default(now())
+  updatedAt       DateTime             @updatedAt
+  bashEvent       BashEvent            @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+  owner           User                 @relation(fields: [userId], references: [id], onDelete: Cascade)
+  sponsor         CompetitionSponsor[]
+  prizes          Prize[]
+
+  @@index([bashEventId])
+  @@index([competitionType])
 }
 
 model CompetitionSponsor {
@@ -77,18 +85,51 @@ model CompetitionSponsor {
 }
 
 model EventTask {
-  id                         String         @id @default(cuid())
+  id                         String           @id @default(cuid())
   creatorId                  String
   bashEventId                String
   title                      String
   description                String?
   assignedToId               String?
   status                     TaskStatus?
-  createdAt                  DateTime?      @default(now())
-  assignedTo                 User?          @relation("TasksAssignedToMe", fields: [assignedToId], references: [id], onDelete: Cascade)
-  bashEvent                  BashEvent      @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
-  creator                    User           @relation(fields: [creatorId], references: [id], onDelete: Cascade)
+  createdAt                  DateTime?        @default(now())
+  assignedTo                 User?            @relation("TasksAssignedToMe", fields: [assignedToId], references: [id], onDelete: Cascade)
+  bashEvent                  BashEvent        @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+  creator                    User             @relation(fields: [creatorId], references: [id], onDelete: Cascade)
   notificationsReferencingMe Notification[]
+  comments                   TaskComment[]
+  invitations                TaskInvitation[]
+}
+
+model TaskComment {
+  id        String    @id @default(cuid())
+  taskId    String
+  authorId  String
+  content   String    @db.Text
+  createdAt DateTime  @default(now())
+  task      EventTask @relation(fields: [taskId], references: [id], onDelete: Cascade)
+  author    User      @relation("TaskCommentsAuthored", fields: [authorId], references: [id], onDelete: Cascade)
+}
+
+model TaskInvitation {
+  id              String    @id @default(cuid())
+  taskId          String
+  invitedEmail    String
+  token           String    @unique @default(cuid()) // CUID for security
+  invitedName     String? // Optional name hint from host
+  personalMessage String? // Optional message from host
+  createdAt       DateTime  @default(now())
+  expiresAt       DateTime // Event date + 1 day
+  acceptedAt      DateTime?
+  acceptedById    String? // User who accepted (might be newly created)
+  createdById     String // Host who sent invitation
+  task            EventTask @relation(fields: [taskId], references: [id], onDelete: Cascade)
+  acceptedBy      User?     @relation("TaskInvitationsAccepted", fields: [acceptedById], references: [id], onDelete: SetNull)
+  createdBy       User      @relation("TaskInvitationsSent", fields: [createdById], references: [id], onDelete: Cascade)
+
+  @@index([token])
+  @@index([invitedEmail])
+  @@index([taskId])
 }
 
 model Reminder {
@@ -699,14 +740,20 @@ model Prize {
   id            String       @id @default(cuid())
   prizeWorth    Float?
   prizeType     PrizeType
-  name          String
+  name          String // Prize name (e.g., "$100 Cash", "Backpack")
+  placeName     String? // Display name (e.g., "1st Place", "Winner")
   prizeLevel    Int
   description   String
   competitionId String?
   paidOn        String?
   winnerUserId  String?
-  competition   Competition? @relation(fields: [competitionId], references: [id])
+  wonAt         DateTime? // When the prize was awarded
+  claimedAt     DateTime? // When the prize was claimed
+  competition   Competition? @relation(fields: [competitionId], references: [id], onDelete: Cascade)
   winner        User?        @relation(fields: [winnerUserId], references: [id], onDelete: Cascade)
+
+  @@index([competitionId])
+  @@index([winnerUserId]) // For fetching user's wins
 }
 
 model Review {
@@ -774,16 +821,22 @@ model SocialMediaProfile {
 }
 
 model User {
-  id                             String         @id @default(cuid())
-  username                       String?        @unique
-  email                          String         @unique
-  createdOn                      DateTime       @default(now())
-  stripeCustomerId               String?        @unique
-  stripeAccountId                String?        @unique
-  isSuperUser                    Boolean        @default(false)
-  isSuspended                    Boolean        @default(false)
-  intent                         UserIntent?
-  googleCalendarAccess           String?
+  id                   String      @id @default(cuid())
+  username             String?     @unique
+  email                String      @unique
+  createdOn            DateTime    @default(now())
+  stripeCustomerId     String?     @unique
+  stripeAccountId      String?     @unique
+  isSuperUser          Boolean     @default(false)
+  isSuspended          Boolean     @default(false)
+  intent               UserIntent?
+  googleCalendarAccess String?
+
+  // Google OAuth tokens for API access (Contacts, Calendar, etc.)
+  googleAccessToken  String?
+  googleRefreshToken String?
+  googleTokenExpiry  DateTime?
+
   givenName                      String?
   familyName                     String?
   nameChangeCount                Int            @default(0)
@@ -868,8 +921,9 @@ model User {
 
   // Security Fields
   accountLockedUntil DateTime? // Account lockout timestamp for failed login protection
-  auditLogs          AuditLog[]    @relation("UserAuditLogs")
-  auditLogsPerformed AuditLog[]    @relation("PerformedByUser")
+  revokedTokens      RevokedToken[] @relation("RevokedTokens") // Revoked JWT tokens
+  auditLogs          AuditLog[]     @relation("UserAuditLogs")
+  auditLogsPerformed AuditLog[]     @relation("PerformedByUser")
   consents           UserConsent[]
 
   associatedBashes               AssociatedBash[]
@@ -902,6 +956,9 @@ model User {
   documentID                     DocumentID?
   eventTasksAssignedToMe         EventTask[]                @relation("TasksAssignedToMe")
   eventTasks                     EventTask[]
+  taskCommentsAuthored           TaskComment[]              @relation("TaskCommentsAuthored")
+  taskInvitationsSent            TaskInvitation[]           @relation("TaskInvitationsSent")
+  taskInvitationsAccepted        TaskInvitation[]           @relation("TaskInvitationsAccepted")
   exhibitorBookingRequestsAsHost ExhibitorBookingRequest[]  @relation("ExhibitorBookingHost")
   investments                    Investment[]
   invitationsCreatedByMe         Invitation[]               @relation("InvitationsCreatedByMe")
@@ -1007,6 +1064,7 @@ model UserPreferences {
   showEmailPublicly           Boolean  @default(true)
   showPhonePublicly           Boolean  @default(false)
   showAddressPublicly         Boolean  @default(false)
+  showCompetitionWins         Boolean  @default(true) // Display competition wins on public profile
   theme                       String   @default("system")
   language                    String   @default("en")
   timeZone                    String   @default("America/New_York")
@@ -1303,6 +1361,7 @@ model Service {
   isFreeFirstListing                 Boolean                    @default(false)
   monthlyPrice                       Decimal                    @default(0)
   serviceListingStripeSubscriptionId String?
+  acceptsBashCash                    Boolean                    @default(true) // NEW: Allow BashCash payments
   associatedServicesReferencingMe    AssociatedService[]
   exhibitorBookingRequests           ExhibitorBookingRequest[]  @relation("ExhibitorBookingService")
   notification                       Notification[]
@@ -1826,40 +1885,42 @@ model ServiceBookingCheckout {
 }
 
 model ServiceBooking {
-  id                   String                   @id @default(cuid())
-  creatorId            String
-  forUserId            String
-  daysTotalATBCents    Int
-  serviceId            String
-  rateOption           ServiceBookingRateOption @default(TimeBased)
-  flatRateCents        Int?
-  status               ServiceBookingStatus     @default(Pending)
-  bookingType          ServiceBookingType       @default(Request)
-  timezone             String
-  requestedOn          DateTime?
-  requestDecisionOn    DateTime?
-  bookedOn             DateTime?
-  canceledOn           DateTime?
-  isFreeGuest          Boolean                  @default(false)
-  allowPromiseToPay    Boolean                  @default(false)
-  totalATBCents        Int
-  subtotalATBCents     Int                      @default(0)
-  bashEventId          String?
-  isVendorBid          Boolean                  @default(false)
-  vendorBidAmountCents Int?
-  vendorEventDetails   String?
-  notification         Notification[]
-  bashEvent            BashEvent?               @relation(fields: [bashEventId], references: [id])
-  creator              User                     @relation("BookingCreator", fields: [creatorId], references: [id])
-  forUser              User                     @relation("BookingForUser", fields: [forUserId], references: [id])
-  service              Service                  @relation(fields: [serviceId], references: [id])
-  addOns               ServiceBookingAddOn[]
-  checkout             ServiceBookingCheckout?
-  bookedDays           ServiceBookingDay[]
-  additionalFees       ServiceBookingFee[]
-  messages             ServiceBookingMessage[]
-  packages             ServiceBookingPackage[]
-  commissions          BookingCommission[]      @relation("BookingCommissions")
+  id                    String                   @id @default(cuid())
+  creatorId             String
+  forUserId             String
+  daysTotalATBCents     Int
+  serviceId             String
+  rateOption            ServiceBookingRateOption @default(TimeBased)
+  flatRateCents         Int?
+  status                ServiceBookingStatus     @default(Pending)
+  bookingType           ServiceBookingType       @default(Request)
+  timezone              String
+  requestedOn           DateTime?
+  requestDecisionOn     DateTime?
+  bookedOn              DateTime?
+  canceledOn            DateTime?
+  isFreeGuest           Boolean                  @default(false)
+  allowPromiseToPay     Boolean                  @default(false)
+  totalATBCents         Int
+  subtotalATBCents      Int                      @default(0)
+  bashEventId           String?
+  isVendorBid           Boolean                  @default(false)
+  vendorBidAmountCents  Int?
+  vendorEventDetails    String?
+  bashCashApplied       Int? // BashCash credits applied to this booking
+  bashCashTransactionId String? // Link to BashCreditTransaction
+  notification          Notification[]
+  bashEvent             BashEvent?               @relation(fields: [bashEventId], references: [id])
+  creator               User                     @relation("BookingCreator", fields: [creatorId], references: [id])
+  forUser               User                     @relation("BookingForUser", fields: [forUserId], references: [id])
+  service               Service                  @relation(fields: [serviceId], references: [id])
+  addOns                ServiceBookingAddOn[]
+  checkout              ServiceBookingCheckout?
+  bookedDays            ServiceBookingDay[]
+  additionalFees        ServiceBookingFee[]
+  messages              ServiceBookingMessage[]
+  packages              ServiceBookingPackage[]
+  commissions           BookingCommission[]      @relation("BookingCommissions")
 
   @@index([status])
   @@index([creatorId])
@@ -2756,6 +2817,31 @@ enum PrizeType {
   Combo
 }
 
+enum CompetitionType {
+  RAFFLE // Raffles & Drawings
+  SKILL // Skill-Based Contests
+  PHYSICAL // Physical & Outdoor
+  INTERACTIVE // Interactive Audience
+  SOCIAL_MEDIA // Social Media-Driven
+  KIDS_FAMILY // Kids & Family
+  FOOD_DRINK // Food & Drink
+  VENDOR_BOOTH // Vendor Booth
+  BUSINESS_PROFESSIONAL // Business / Professional
+  RANDOMIZED // Randomized Participation
+  SEASONAL_HOLIDAY // Seasonal or Holiday
+  AUDIENCE_VOTING // Audience Voting-Based
+}
+
+enum JudgingType {
+  RANDOM_DRAW // Raffle-style random selection
+  JUDGES // Panel of judges decides
+  AUDIENCE_VOTE // Attendees vote
+  METRICS // Based on measurable metrics
+  HOST_CHOOSES // Host/organizer picks winner
+  FIRST_COME // First X people win
+  HIGHEST_BID // Auction-style
+}
+
 enum Sex {
   Male
   Female
@@ -4201,6 +4287,25 @@ model AuditLog {
   @@index([ipAddress])
 }
 
+/// Token Revocation System
+/// Tracks revoked JWT tokens to prevent their reuse
+/// Required for secure logout, password changes, and account termination
+model RevokedToken {
+  id        String   @id @default(cuid())
+  userId    String // Owner of the revoked token
+  jti       String   @unique // JWT ID from token payload
+  revokedAt DateTime @default(now())
+  expiresAt DateTime // When the original token would have expired (for cleanup)
+  reason    String? // Why it was revoked: "logout", "password_change", "suspicious_activity", etc.
+
+  // Relation to user
+  user User @relation("RevokedTokens", fields: [userId], references: [id], onDelete: Cascade)
+
+  @@index([jti]) // Fast lookup for token validation
+  @@index([userId, revokedAt]) // User-specific revocation history
+  @@index([expiresAt]) // For cleanup of old expired tokens
+}
+
 enum AuditAction {
   // Authentication
   LOGIN_SUCCESS
@@ -4261,6 +4366,11 @@ enum AuditAction {
   DATA_IMPORTED
   SENSITIVE_DATA_ACCESSED
 
+  // Compliance
+  CONSENT_GIVEN
+  CONSENT_WITHDRAWN
+  POLICY_ACCEPTED
+
   // Security
   SUSPICIOUS_ACTIVITY_DETECTED
   RATE_LIMIT_EXCEEDED
@@ -4278,6 +4388,7 @@ enum AuditCategory {
   Tickets
   AdminAction
   DataAccess
+  Compliance
   Security
 }
 

package/src/definitions.ts

@@ -2,8 +2,10 @@ import {
     BashEventDressTags,
     BashEventType,
     BashEventVibeTags,
+    CompetitionType,
     Contact,
     EntertainmentServiceType,
+    JudgingType,
     MembershipTier,
     MusicGenreType,
     Prisma,
@@ -292,6 +294,7 @@ export const MONTHS_PREVIOUS_THAT_STRIPE_ACCOUNTS_WILL_BE_SEARCHED_BY_EMAIL =
   1 as const;
 
 export const HTTP_CODE_OK = 200 as const;
+export const HTTP_CODE_CREATED = 201 as const;
 export const HTTP_CODE_TEMPORARY_REDIRECT = 307 as const;
 export const HTTP_CODE_INTERNAL_SERVER_ERR = 500 as const;
 export const HTTP_CODE_BAD_REQUEST = 400 as const;
@@ -592,6 +595,8 @@ export interface ApiResult<T, P extends ErrorDataType = ErrorDataType> {
   errorType?: ApiErrorType;
   errorData?: P;
   rawResponse?: any;
+  requiresPayment?: boolean; // For service listing payment flow
+  serviceId?: string; // For service listing payment flow
 }
 
 export function removeDataFromResult<
@@ -874,7 +879,7 @@ export const YearsOfExperienceToString: { [key in YearsOfExperience]: string } =
   };
 
 // Export Prisma enums for use in frontend
-export { YearsOfExperience, EntertainmentServiceType, MusicGenreType, ServiceTypes };
+export { YearsOfExperience, EntertainmentServiceType, MusicGenreType, ServiceTypes, CompetitionType, JudgingType };
 
 export type BashEventTypeToStringType = {
   [key in BashEventType]: string;