@bash-app/bash-common 30.42.0 → 30.44.0

package/package.json

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

package/prisma/schema.prisma

@@ -1067,9 +1067,7 @@ model User {
   contactlist                   ContactList[]
 
   bashEventPromoCodesIUsed BashEventPromoCode[]
-  // bookingForMe                  Booking[]
   userSubscription         UserSubscription?
-  // serviceSubscriptions           ServiceSubscription[]
   volunteerService         VolunteerService[]
   stripeAccounts           StripeAccount[]
   userPromoCodeRedemption  UserPromoCodeRedemption[]
@@ -1092,13 +1090,11 @@ model User {
   preferences UserPreferences?
   userStats   UserStats?
 
-  // Add fields for user suspension
   suspendedUntil DateTime?
   suspendedById  String?
   suspendedBy    User?     @relation("SuspendedUsers", fields: [suspendedById], references: [id], onDelete: SetNull)
   suspendedUsers User[]    @relation("SuspendedUsers")
 
-  // Add relations for reports and demerits
   reportsMade      UserReport[] @relation("ReportsMade")
   reportsReceived  UserReport[] @relation("ReportsReceived")
   reportsReviewed  UserReport[] @relation("ReportsReviewed")
@@ -1109,6 +1105,12 @@ model User {
   notification Notification[]  @relation("NotificationsReceivedByMe")
   followers    UserFollowing[] @relation("Following")
   following    UserFollowing[] @relation("Follower")
+
+  // For lightweight sign-up
+  isLightweightAccount    Boolean               @default(false)
+  notifyForTrendingBashes Boolean               @default(false)
+  trendingBashThreshold   Int                   @default(10) // Min attendees to trigger notification
+  organizerUser      UserFollowing[] @relation("FollowingOrganizers")
 }
 
 model UserPreferences {
@@ -1127,6 +1129,8 @@ model UserPreferences {
   invitationNotify        Boolean @default(true)
   eventUpdatesNotify      Boolean @default(true)
   servicePromotionsNotify Boolean @default(true)
+  trendingBashesNotify    Boolean @default(false) // New field
+  organizerUpdatesNotify  Boolean @default(false) // New field
 
   // Privacy Settings
   profileVisibility      String   @default("PUBLIC") // PUBLIC, FRIENDS, PRIVATE
@@ -1180,15 +1184,18 @@ model UserPreferences {
 }
 
 model UserFollowing {
-  id           String    @id @default(cuid())
-  userId       String
-  followingId  String
-  isFollowing  Boolean   @default(true)
-  followedAt   DateTime?
-  unfollowedAt DateTime?
-
-  user      User @relation("Follower", fields: [userId], references: [id], onDelete: Cascade)
-  following User @relation("Following", fields: [followingId], references: [id], onDelete: Cascade)
+  id             String    @id @default(cuid())
+  userId         String
+  followingId    String
+  isFollowing    Boolean   @default(true)
+  followedAt     DateTime?
+  unfollowedAt   DateTime?
+  isOrganizer    Boolean   @default(false)  // Flag if following as organizer
+  lastNotified   DateTime? // For organizer notifications
+
+  user         User @relation("Follower", fields: [userId], references: [id], onDelete: Cascade, map: "UserFollowing_follower_fkey")
+  following    User @relation("Following", fields: [followingId], references: [id], onDelete: Cascade)
+  organizerUser User? @relation("FollowingOrganizers", fields: [userId], references: [id], onDelete: Cascade, map: "UserFollowing_organizer_fkey")
 
   @@unique([userId, followingId])
 }