@bash-app/bash-common 30.97.0 → 30.97.1

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 {
@@ -732,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 {
@@ -807,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)
@@ -901,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[]
@@ -1043,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")
@@ -1863,42 +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?
-  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")
+  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])
@@ -2795,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
@@ -4240,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
@@ -4300,6 +4366,11 @@ enum AuditAction {
   DATA_IMPORTED
   SENSITIVE_DATA_ACCESSED
 
+  // Compliance
+  CONSENT_GIVEN
+  CONSENT_WITHDRAWN
+  POLICY_ACCEPTED
+
   // Security
   SUSPICIOUS_ACTIVITY_DETECTED
   RATE_LIMIT_EXCEEDED
@@ -4317,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,
@@ -877,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;

package/src/extendedSchemas.ts

@@ -10,6 +10,7 @@ import {
     BlogPost,
     BlogTag,
     Checkout,
+    Competition,
     Contact,
     Coordinates,
     Demerit,
@@ -23,6 +24,7 @@ import {
     Notification,
     Organization,
     Prisma,
+    Prize,
     Recurrence,
     Reminder,
     Review,
@@ -154,6 +156,14 @@ export const PRIVATE_USER_ACCOUNT_TO_SELECT = {
 
 export interface SponsoredEventExt extends SponsoredEvent {}
 
+export interface PrizeExt extends Prize {
+  winner?: PublicUser | null;
+}
+
+export interface CompetitionExt extends Competition {
+  prizes: PrizeExt[];
+}
+
 export interface BashEventExt extends BashEvent {
   targetAudience?: TargetAudience;
   amountOfGuests?: AmountOfGuests;
@@ -169,6 +179,7 @@ export interface BashEventExt extends BashEvent {
   venueServiceId?: string;
   venueOwner?: PublicUser;
   sponsorships?: SponsoredEventExt[];
+  competitions?: CompetitionExt[];
 }
 
 export const TICKET_TIER_DATA_TO_INCLUDE = {
@@ -206,6 +217,17 @@ export const BASH_EVENT_DATA_TO_INCLUDE = {
   media: true,
   eventTasks: true,
   invitations: true,
+  competitions: {
+    include: {
+      prizes: {
+        include: {
+          winner: {
+            select: FRONT_END_USER_DATA_TO_SELECT,
+          },
+        },
+      },
+    },
+  },
 } satisfies Prisma.BashEventInclude;
 
 export const BASH_EVENT_DATA_TO_CLONE = [