@bash-app/bash-common 30.37.0 → 30.39.0

package/package.json

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

package/prisma/schema.prisma

@@ -265,6 +265,9 @@ model BashEvent {
   eventType                       String                    @default("Other")
   startDateTime                   DateTime?                 @default(now())
   endDateTime                     DateTime?                 @default(now())
+  waiverUrl                       String?
+  waiverRequired                  Boolean                   @default(false)
+  waiverDisplayType               String?                   @default("inline")
   ticketTiers                     TicketTier[]
   targetAudienceId                String?                   @unique
   targetAudience                  TargetAudience?           @relation(fields: [targetAudienceId], references: [id], onDelete: Cascade)
@@ -980,6 +983,7 @@ enum SocialMediaPlatform {
 
 model User {
   id                            String               @id @default(cuid())
+  username                      String?              @unique
   email                         String               @unique
   createdOn                     DateTime             @default(now())
   stripeCustomerId              String?              @unique
@@ -1075,6 +1079,7 @@ model User {
   unblocksReceived UnblockedUserHistory[] @relation("UserUnblocksReceived")
 
   preferences UserPreferences?
+  userStats   UserStats?
 
   // Add fields for user suspension
   suspendedUntil DateTime?
@@ -2211,3 +2216,37 @@ enum ReportStatus {
   Rejected
   Resolved
 }
+
+// Add UserStats model for tracking statistics and rankings
+model UserStats {
+  id     String @id @default(cuid())
+  userId String @unique
+  user   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  // Event Statistics
+  bashesHostedCount   Int   @default(0)
+  bashesAttendedCount Int   @default(0)
+  totalAttendeesCount Int   @default(0)
+  totalEarnings       Float @default(0)
+  servicesBookedCount Int   @default(0)
+  followersCount      Int   @default(0)
+
+  // Rankings
+  hostRank     Int? // Rank based on number of events hosted
+  attendeeRank Int? // Rank based on number of events attended
+  audienceRank Int? // Rank based on total attendees
+  earningsRank Int? // Rank based on total earnings
+  serviceRank  Int? // Rank based on services booked
+  followerRank Int? // Rank based on number of followers
+
+  // Tracking for when stats were last calculated
+  lastUpdated       DateTime @default(now())
+  lastRankingUpdate DateTime @default(now())
+
+  @@index([bashesHostedCount])
+  @@index([bashesAttendedCount])
+  @@index([totalAttendeesCount])
+  @@index([totalEarnings])
+  @@index([servicesBookedCount])
+  @@index([followersCount])
+}

package/src/extendedSchemas.ts

@@ -1,64 +1,66 @@
 import {
-  AmountOfGuests,
-  AssociatedBash,
-  AssociatedService,
-  BashComment,
-  BashEvent,
-  BashEventPromoCode,
-  BashNotification,
-  Checkout,
-  Contact,
-  Coordinates,
-  EntertainmentService,
-  EventService,
-  EventTask,
-  Exhibitor,
-  Invitation,
-  Link,
-  Media,
-  Organization,
-  Prisma,
-  Recurrence,
-  Reminder,
-  Review,
-  Service,
-  ServiceAddon,
-  ServiceBooking,
-  ServiceBookingAddOn,
-  ServiceBookingCheckout,
-  ServiceBookingDay,
-  ServiceBookingFee,
-  ServiceBookingPackage,
-  ServiceBookingPriceBreakdown,
-  ServiceDailyRates,
-  ServiceLink,
-  ServicePackage,
-  ServiceRange,
-  ServiceRate,
-  ServiceRatesAssociation,
-  ServiceSpecialRates,
-  ServiceSubscriptionCounts,
-  SocialMediaPlatform,
-  SocialMediaProfile,
-  Sponsor,
-  SponsoredEvent,
-  StripeAccount,
-  TargetAudience,
-  Ticket,
-  TicketMetadata,
-  TicketTier,
-  TicketTransfer,
-  User,
-  UserPreferences,
-  UserSubscription,
-  Vendor,
-  Venue,
-  VolunteerService,
+    AmountOfGuests,
+    AssociatedBash,
+    AssociatedService,
+    BashComment,
+    BashEvent,
+    BashEventPromoCode,
+    BashNotification,
+    Checkout,
+    Contact,
+    Coordinates,
+    Demerit,
+    EntertainmentService,
+    EventService,
+    EventTask,
+    Exhibitor,
+    Invitation,
+    Link,
+    Media,
+    Organization,
+    Prisma,
+    Recurrence,
+    Reminder,
+    Review,
+    Service,
+    ServiceAddon,
+    ServiceBooking,
+    ServiceBookingAddOn,
+    ServiceBookingCheckout,
+    ServiceBookingDay,
+    ServiceBookingFee,
+    ServiceBookingPackage,
+    ServiceBookingPriceBreakdown,
+    ServiceDailyRates,
+    ServiceLink,
+    ServicePackage,
+    ServiceRange,
+    ServiceRate,
+    ServiceRatesAssociation,
+    ServiceSpecialRates,
+    ServiceSubscriptionCounts,
+    SocialMediaPlatform,
+    SocialMediaProfile,
+    Sponsor,
+    SponsoredEvent,
+    StripeAccount,
+    TargetAudience,
+    Ticket,
+    TicketMetadata,
+    TicketTier,
+    TicketTransfer,
+    User,
+    UserPreferences,
+    UserStats,
+    UserSubscription,
+    Vendor,
+    Venue,
+    VolunteerService,
 } from "@prisma/client";
 import { SERVICE_LINK_DATA_TO_INCLUDE } from "./definitions";
 import {
-  RemoveCommonProperties,
-  UnionFromArray
+    RemoveCommonProperties,
+    UnionFromArray
 } from "./utils/typeUtils";
 
 //------------------------------------------------------user subscriptions------------------------------------------------------
@@ -783,6 +785,8 @@ export const CONTACT_DATA_TO_INCLUDE = {
 export interface UserExt extends User {
   services?: Service[] | null;
   preferences?: UserPreferences | null;
+  stats?: UserStats | null;
+  demerits?: Demerit[] | null;
   
   // Do not include in fetch as there could be thousands of these
   userSubscription?: UserSubscriptionExt | null;