@bash-app/bash-common 30.130.0 → 30.132.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "30.130.0",
+  "version": "30.132.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "dist/index.js",

package/prisma/schema.prisma

@@ -712,6 +712,10 @@ model BashEvent {
   // Analytics Relations
   analyticsPredictions AnalyticsPrediction[]
 
+  // Event series (recurring template instances)
+  eventSeriesId String?
+  eventSeries   EventSeries? @relation("SeriesEvents", fields: [eventSeriesId], references: [id], onDelete: SetNull)
+
   // Organization Relations
   budgets Budget[]    @relation("EventBudgets")
   rsvps   EventRSVP[] @relation("EventRSVPs")
@@ -719,6 +723,7 @@ model BashEvent {
   @@index([templateId])
   @@index([parentEventId])
   @@index([organizationId])
+  @@index([eventSeriesId])
 }
 
 // ============================================
@@ -861,6 +866,26 @@ model BashCreditTransaction {
   @@index([type])
 }
 
+model PendingBashPointsGift {
+  id             String             @id @default(cuid())
+  senderId       String
+  sender         User               @relation("SentPendingGifts", fields: [senderId], references: [id], onDelete: Cascade)
+  recipientEmail String
+  amount         Int
+  message        String?
+  status         PendingGiftStatus  @default(Pending)
+  claimedAt      DateTime?
+  claimedByUserId String?
+  claimedBy      User?              @relation("ClaimedPendingGifts", fields: [claimedByUserId], references: [id], onDelete: SetNull)
+  returnedAt     DateTime?
+  expiresAt      DateTime
+  createdAt      DateTime           @default(now())
+
+  @@index([recipientEmail, status])
+  @@index([senderId])
+  @@index([expiresAt, status])
+}
+
 model UserReferralCode {
   id                    String                 @id @default(cuid())
   userId                String                 @unique
@@ -1067,6 +1092,31 @@ model Recurrence {
   bashEvent          BashEvent          @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
 }
 
+// Recurring event series: template that spawns many BashEvent instances (e.g. "Every Tuesday 7pm for 14 weeks")
+model EventSeries {
+  id             String               @id @default(cuid())
+  organizationId String?
+  creatorId      String
+  name           String
+  description    String?              @db.Text
+  frequency      RecurringFrequency
+  interval       Int                  @default(1)
+  repeatOnDays   DayOfWeek[]
+  seriesStart    DateTime
+  seriesEnd      DateTime
+  exceptions     Json?                // Array of ISO date strings to skip
+  templateConfig Json?                // Event defaults: title pattern, ticketTiers, etc.
+  createdAt      DateTime             @default(now())
+  updatedAt      DateTime             @updatedAt
+
+  organization Organization? @relation("OrganizationEventSeries", fields: [organizationId], references: [id], onDelete: SetNull)
+  creator      User          @relation("EventSeriesCreator", fields: [creatorId], references: [id], onDelete: Restrict)
+  events       BashEvent[]   @relation("SeriesEvents")
+
+  @@index([organizationId])
+  @@index([creatorId])
+}
+
 model CustomBashEventType {
   id          String @id @default(cuid())
   key         String @unique
@@ -1431,6 +1481,8 @@ model User {
   bashEventMessagesRead          BashEventMessageRead[]     @relation("BashMessageReader")
   transferRequestsFrom           BashEventTransferRequest[] @relation("TransferRequestsFrom")
   transferRequestsTo             BashEventTransferRequest[] @relation("TransferRequestsTo")
+  sentPendingGifts               PendingBashPointsGift[]    @relation("SentPendingGifts")
+  claimedPendingGifts            PendingBashPointsGift[]    @relation("ClaimedPendingGifts")
   biometricCredentials           BiometricCredential[]
   blocksReceived                 BlockedUser[]              @relation("UserBlocksReceived")
   blocksCreated                  BlockedUser[]              @relation("UserBlocksMade")
@@ -1571,6 +1623,7 @@ model User {
   ownedBudgets            Budget[]             @relation("UserBudgets")
   departmentsHeaded       Department[]         @relation("DepartmentHead")
   favoriteOrganizations   Organization[]       @relation("FavoriteOrganizations")
+  eventSeriesCreated      EventSeries[]        @relation("EventSeriesCreator")
 
   // Service Includes & Add-On Requests
   suggestedIncludes ServiceInclude[]      @relation("SuggestedIncludes")
@@ -2440,6 +2493,8 @@ model Organization {
   subscriptionStatus          String?
   stripeSubscriptionId        String?              @unique
   stripeCustomerId            String?
+  stripeConnectedAccountId   String?              // Org-level Stripe account for wallet display
+  inheritBrandingFromParent   Boolean              @default(true)
   createdAt                   DateTime             @default(now())
   updatedAt                   DateTime             @updatedAt
   service                     Service?
@@ -2450,6 +2505,7 @@ model Organization {
   budgets                     Budget[]             @relation("OrganizationBudgets")
   departments                 Department[]
   bashEvents                  BashEvent[]          @relation("OrganizationBashEvents")
+  eventSeries                 EventSeries[]        @relation("OrganizationEventSeries")
   favoriteBy                  User[]               @relation("FavoriteOrganizations")
 
   @@index([ownerId])
@@ -2473,6 +2529,10 @@ model OrganizationMember {
   canInvite        Boolean      @default(true)
   canCreateEvents  Boolean      @default(false)
   canManageBudgets Boolean      @default(false)
+  engagementScore      Float?    // Computed: weighted formula (events, recency, points, referrals)
+  lastActiveAt         DateTime? // Last event attended
+  totalEventsAttended  Int       @default(0)
+  firstEventAttendedAt DateTime?
   organization     Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade)
   user             User         @relation("OrganizationMemberUser", fields: [userId], references: [id], onDelete: Cascade)
   eventRSVPs       EventRSVP[]
@@ -5402,6 +5462,13 @@ enum CreditSourceType {
   AdminAdjustment // Manual credit by admin
   PromotionalBonus // Marketing campaigns
   PromoterCommission // Commission earned from promo code usage
+  GiftedPoints // BashPoints gifted to another user
+}
+
+enum PendingGiftStatus {
+  Pending
+  Claimed
+  Returned
 }
 
 enum ReferralTier {