@bash-app/bash-common 30.75.2 → 30.76.0

package/prisma/schema.prisma

@@ -328,6 +328,7 @@ model BashEvent {
   vendorBookingRequests           VendorBookingRequest[]     @relation("VendorBookingEvent")
   media                           Media[]                    @relation("BashEventToMedia")
   associatedServicesReferencingMe Service[]                  @relation("BashEventToService")
+  userConnections                 UserConnection[]
 }
 
 model Coordinates {
@@ -390,19 +391,24 @@ model UserReferralCode {
 }
 
 model UserReferralToken {
-  id        String   @id @default(cuid())
-  userId    String
-  token     String   @unique
-  planName  String
-  expiresAt DateTime
-  isUsed    Boolean  @default(false)
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-  user      User     @relation("UserReferralTokens", fields: [userId], references: [id], onDelete: Cascade)
+  id               String   @id @default(cuid())
+  userId           String
+  token            String   @unique
+  planName         String
+  redeemedByUserId String?
+  type             String?  @default("PAID_MEMBERSHIP") // "FREE_SIGNUP", "PAID_MEMBERSHIP", or planName
+  metadata         Json? // JSONB in Postgres: signup method, IP, etc.
+  expiresAt        DateTime
+  isUsed           Boolean  @default(false)
+  createdAt        DateTime @default(now())
+  updatedAt        DateTime @updatedAt
+  user             User     @relation("UserReferralTokens", fields: [userId], references: [id], onDelete: Cascade)
 
   @@index([token])
   @@index([userId])
   @@index([expiresAt])
+  @@index([type])
+  @@index([redeemedByUserId])
 }
 
 model TicketTier {
@@ -814,6 +820,7 @@ model User {
   remindersCreatedByMe           Reminder[]                 @relation("RemindersCreatedByMe")
   remindersAssignedToMe          Reminder[]                 @relation("RemindersAssignedToMe")
   reviews                        Review[]
+  firstFreeListingId             String?
   createdServices                Service[]                  @relation("CreatedService")
   ownedServices                  Service[]                  @relation("OwnedService")
   serviceBlocksReceived          ServiceBlock[]             @relation("ServiceBlocksReceived")
@@ -839,6 +846,8 @@ model User {
   favorites                      UserFavorite[]
   following                      UserFollowing[]            @relation("Follower")
   followers                      UserFollowing[]            @relation("Following")
+  connectionRequestsSent         UserConnection[]           @relation("ConnectionRequestsSent")
+  connectionRequestsReceived     UserConnection[]           @relation("ConnectionRequestsReceived")
   links                          UserLink[]
   preferences                    UserPreferences?
   userPromoCodeRedemption        UserPromoCodeRedemption[]
@@ -970,6 +979,25 @@ model UserFollowing {
   @@unique([userId, followingId])
 }
 
+model UserConnection {
+  id                String           @id @default(cuid())
+  requesterId       String // User who sent the request
+  addresseeId       String // User who received the request
+  status            ConnectionStatus @default(Pending)
+  sharedBashEventId String? // The bash that enabled this connection
+  requestedAt       DateTime         @default(now())
+  respondedAt       DateTime?
+  message           String? // Optional message with request
+  requester         User             @relation("ConnectionRequestsSent", fields: [requesterId], references: [id], onDelete: Cascade)
+  addressee         User             @relation("ConnectionRequestsReceived", fields: [addresseeId], references: [id], onDelete: Cascade)
+  sharedBash        BashEvent?       @relation(fields: [sharedBashEventId], references: [id], onDelete: SetNull)
+
+  @@unique([requesterId, addresseeId])
+  @@index([requesterId])
+  @@index([addresseeId])
+  @@index([status])
+}
+
 model BiometricCredential {
   id                  String    @id @default(cuid())
   userId              String
@@ -1121,82 +1149,88 @@ model UserSubscription {
 }
 
 model Service {
-  id                               String                     @id @default(cuid())
-  serviceType                      ServiceTypes?
-  serviceStatus                    ServiceStatus              @default(Draft)
-  serviceCondition                 ServiceCondition           @default(Pending)
-  subscriptionStatus               ServiceSubscriptionStatus  @default(None)
-  isApproved                       Boolean                    @default(false)
-  ownerId                          String?
-  creatorId                        String?
-  createdAt                        DateTime                   @default(now())
-  updatedAt                        DateTime?                  @updatedAt
-  serviceName                      String?
-  tagline                          String?
-  place                            String?
-  googlePlaceId                    String?
-  street                           String?
-  city                             String?
-  state                            String?
-  zipCode                          String?
-  country                          String?
-  description                      String?
-  pocName                          String?
-  pocPhoneNumber                   String?
-  pocBusinessEmail                 String?
-  additionalInfo                   String?
-  coverPhoto                       String?
-  mission                          String?
-  communityInvolvement             String?
-  emergencyContact                 String?
-  contactDetails                   String?
-  cancellationPolicy               ServiceCancellationPolicy? @default(None)
-  availableHours                   String?
-  allowsInstantBooking             Boolean                    @default(false)
-  instantBookingLeadTimeHours      Int                        @default(0)
-  displayGoogleReviewsOnDetailPage Boolean                    @default(true)
-  displayBashReviewsOnDetailPage   Boolean                    @default(true)
-  serviceRating                    Float?                     @default(0)
-  totalRatings                     Int?                       @default(0)
-  stripeAccountId                  String?
-  targetAudienceId                 String?                    @unique
-  visibility                       VisibilityPreference       @default(Public)
-  bashesNotInterestedIn            BashEventType[]
-  customExcludedEventTypes         String[]                   @default([])
-  volunteerServiceId               String?                    @unique
-  eventServiceId                   String?                    @unique
-  entertainmentServiceId           String?                    @unique
-  vendorId                         String?                    @unique
-  exhibitorId                      String?                    @unique
-  sponsorId                        String?                    @unique
-  venueId                          String?                    @unique
-  organizationId                   String?                    @unique
-  associatedServicesReferencingMe  AssociatedService[]
-  exhibitorBookingRequests         ExhibitorBookingRequest[]  @relation("ExhibitorBookingService")
-  notification                     Notification[]
-  creator                          User?                      @relation("CreatedService", fields: [creatorId], references: [id])
-  entertainmentService             EntertainmentService?      @relation(fields: [entertainmentServiceId], references: [id], onDelete: Cascade)
-  eventService                     EventService?              @relation(fields: [eventServiceId], references: [id], onDelete: Cascade)
-  exhibitor                        Exhibitor?                 @relation(fields: [exhibitorId], references: [id], onDelete: Cascade)
-  organization                     Organization?              @relation(fields: [organizationId], references: [id], onDelete: Cascade)
-  owner                            User?                      @relation("OwnedService", fields: [ownerId], references: [id])
-  sponsor                          Sponsor?                   @relation(fields: [sponsorId], references: [id], onDelete: Cascade)
-  stripeAccount                    StripeAccount?             @relation(fields: [stripeAccountId], references: [id], onDelete: Restrict)
-  targetAudience                   TargetAudience?            @relation(fields: [targetAudienceId], references: [id], onDelete: Cascade)
-  vendor                           Vendor?                    @relation(fields: [vendorId], references: [id], onDelete: Cascade)
-  venue                            Venue?                     @relation(fields: [venueId], references: [id], onDelete: Cascade)
-  serviceBlocks                    ServiceBlock[]             @relation("ServiceBlocks")
-  bookings                         ServiceBooking[]
-  serviceLinks                     ServiceLink[]
-  serviceRatesAssociation          ServiceRatesAssociation?
-  sponsorBookingRequests           SponsorBookingRequest[]    @relation("SponsorBookingService")
-  favoritedBy                      UserFavorite[]
-  userPromoCodeRedemption          UserPromoCodeRedemption[]
-  vendorBookingRequests            VendorBookingRequest[]     @relation("VendorBookingService")
-  volunteerService                 VolunteerService?          @relation("ServiceToVolunteer")
-  associatedBashesReferencingMe    AssociatedBash[]           @relation("AssociatedBashToService")
-  bashEvent                        BashEvent[]                @relation("BashEventToService")
-  media                            Media[]                    @relation("MediaToService")
+  id                                 String                     @id @default(cuid())
+  serviceType                        ServiceTypes?
+  serviceStatus                      ServiceStatus              @default(Draft)
+  serviceCondition                   ServiceCondition           @default(Pending)
+  subscriptionStatus                 ServiceSubscriptionStatus  @default(None)
+  isApproved                         Boolean                    @default(false)
+  ownerId                            String?
+  creatorId                          String?
+  createdAt                          DateTime                   @default(now())
+  updatedAt                          DateTime?                  @updatedAt
+  serviceName                        String?
+  tagline                            String?
+  place                              String?
+  googlePlaceId                      String?
+  street                             String?
+  city                               String?
+  state                              String?
+  zipCode                            String?
+  country                            String?
+  description                        String?
+  pocName                            String?
+  pocPhoneNumber                     String?
+  pocBusinessEmail                   String?
+  additionalInfo                     String?
+  coverPhoto                         String?
+  mission                            String?
+  communityInvolvement               String?
+  emergencyContact                   String?
+  contactDetails                     String?
+  cancellationPolicy                 ServiceCancellationPolicy? @default(None)
+  availableHours                     String?
+  allowsInstantBooking               Boolean                    @default(false)
+  instantBookingLeadTimeHours        Int                        @default(0)
+  displayGoogleReviewsOnDetailPage   Boolean                    @default(true)
+  displayBashReviewsOnDetailPage     Boolean                    @default(true)
+  serviceRating                      Float?                     @default(0)
+  totalRatings                       Int?                       @default(0)
+  stripeAccountId                    String?
+  targetAudienceId                   String?                    @unique
+  visibility                         VisibilityPreference       @default(Public)
+  bashesNotInterestedIn              BashEventType[]
+  customExcludedEventTypes           String[]                   @default([])
+  volunteerServiceId                 String?                    @unique
+  eventServiceId                     String?                    @unique
+  entertainmentServiceId             String?                    @unique
+  vendorId                           String?                    @unique
+  exhibitorId                        String?                    @unique
+  sponsorId                          String?                    @unique
+  venueId                            String?                    @unique
+  organizationId                     String?                    @unique
+  isFreeFirstListing                 Boolean                    @default(false)
+  monthlyPrice                       Decimal                    @default(0)
+  serviceListingStripeSubscriptionId String?
+  associatedServicesReferencingMe    AssociatedService[]
+  exhibitorBookingRequests           ExhibitorBookingRequest[]  @relation("ExhibitorBookingService")
+  notification                       Notification[]
+  creator                            User?                      @relation("CreatedService", fields: [creatorId], references: [id])
+  entertainmentService               EntertainmentService?      @relation(fields: [entertainmentServiceId], references: [id], onDelete: Cascade)
+  eventService                       EventService?              @relation(fields: [eventServiceId], references: [id], onDelete: Cascade)
+  exhibitor                          Exhibitor?                 @relation(fields: [exhibitorId], references: [id], onDelete: Cascade)
+  organization                       Organization?              @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+  owner                              User?                      @relation("OwnedService", fields: [ownerId], references: [id])
+  sponsor                            Sponsor?                   @relation(fields: [sponsorId], references: [id], onDelete: Cascade)
+  stripeAccount                      StripeAccount?             @relation(fields: [stripeAccountId], references: [id], onDelete: Restrict)
+  targetAudience                     TargetAudience?            @relation(fields: [targetAudienceId], references: [id], onDelete: Cascade)
+  vendor                             Vendor?                    @relation(fields: [vendorId], references: [id], onDelete: Cascade)
+  venue                              Venue?                     @relation(fields: [venueId], references: [id], onDelete: Cascade)
+  serviceBlocks                      ServiceBlock[]             @relation("ServiceBlocks")
+  bookings                           ServiceBooking[]
+  serviceLinks                       ServiceLink[]
+  serviceRatesAssociation            ServiceRatesAssociation?
+  sponsorBookingRequests             SponsorBookingRequest[]    @relation("SponsorBookingService")
+  favoritedBy                        UserFavorite[]
+  userPromoCodeRedemption            UserPromoCodeRedemption[]
+  vendorBookingRequests              VendorBookingRequest[]     @relation("VendorBookingService")
+  volunteerService                   VolunteerService?          @relation("ServiceToVolunteer")
+  associatedBashesReferencingMe      AssociatedBash[]           @relation("AssociatedBashToService")
+  bashEvent                          BashEvent[]                @relation("BashEventToService")
+  media                              Media[]                    @relation("MediaToService")
+
+  @@index([serviceListingStripeSubscriptionId])
+  @@index([isFreeFirstListing])
 }
 
 model StripeAccount {
@@ -2241,6 +2275,8 @@ enum NotificationType {
   ServiceBookingCancelled
   ServiceBookingConfirmed
   Message
+  ConnectionRequest
+  ConnectionAccepted
 }
 
 enum NotificationPriority {
@@ -2516,6 +2552,13 @@ enum TransferRequestStatus {
   Expired
 }
 
+enum ConnectionStatus {
+  Pending
+  Accepted
+  Rejected
+  Blocked
+}
+
 enum ServiceStatus {
   Draft
   Created

package/src/definitions.ts

@@ -85,7 +85,186 @@ export const URL_PARAMS_TICKETS_DATE_DELIM = ";;" as const;
 export const URL_INCLUDE_QUERY_PARAM_DELIM = "," as const;
 export const URL_INCLUDE_PRISMA_DATA_KEYS_DELIM = "." as const;
 
-export const BASH_FEE_PERCENTAGE = 0.1;
+// Platform fee structure
+export const BASH_FEE_PERCENTAGE = 0.10; // 10% base platform fee for bash tickets/donations
+export const SERVICE_FEE_PERCENTAGE = 0.15; // 15% platform fee for service bookings (Allies, Patrons)
+export const PARTNER_FEE_PERCENTAGE = 0.08; // 8% platform fee for Partner payments (Vendors, Exhibitors, Sponsors)
+
+// Minimum pricing (ensures quality events + sustainable model)
+export const BASH_EVENT_TICKET_MINIMUM = 5.00; // $5 minimum ticket price (quality signal, prevents race to bottom)
+export const BASH_EVENT_FEE_MINIMUM = 0.50; // $0.50 minimum platform fee (prevents gaming, covers Stripe fees)
+
+// Free trial settings
+export const CREATOR_TIER_TRIAL_DAYS = 30; // 30-day free trial for Creator tier (encourages conversions)
+
+// Membership tier fee discounts (for bash tickets/donations)
+// Note: BASH_EVENT_FEE_MINIMUM ($0.50) applies to all tiers, so effective minimums are higher on low-priced tickets
+export const BASH_FEE_BASIC = 0.10; // 10% - Basic (free) members (min $0.50)
+export const BASH_FEE_PRO = 0.08; // 8% - Pro members (20% discount, min $0.50)
+export const BASH_FEE_CREATOR = 0.06; // 6% - Creator members (40% discount, min $0.50)
+export const BASH_FEE_ELITE = 0.04; // 4% - Elite members (60% discount, min $0.50)
+export const BASH_FEE_LEGEND = 0.02; // 2% - Legend members (80% discount, min $0.50 = 10% effective minimum on $5 tickets)
+
+// Service fee discounts (for Allies/Patrons service bookings)
+export const SERVICE_FEE_BASIC = 0.15; // 15% - Basic (free) members
+export const SERVICE_FEE_PRO = 0.12; // 12% - Pro members (20% discount)
+export const SERVICE_FEE_CREATOR = 0.09; // 9% - Creator members (40% discount)
+export const SERVICE_FEE_ELITE = 0.06; // 6% - Elite members (60% discount)
+export const SERVICE_FEE_LEGEND = 0.05; // 5% - Legend members (67% discount, sustainable floor)
+
+// Partner fee discounts (for Vendors/Exhibitors/Sponsors payments)
+export const PARTNER_FEE_BASIC = 0.08; // 8% - Basic (free) members
+export const PARTNER_FEE_PRO = 0.06; // 6% - Pro members (25% discount)
+export const PARTNER_FEE_CREATOR = 0.05; // 5% - Creator members (37.5% discount, sustainable floor)
+export const PARTNER_FEE_ELITE = 0.05; // 5% - Elite members (same as Creator, sustainable floor)
+export const PARTNER_FEE_LEGEND = 0.05; // 5% - Legend members (same as Creator/Elite, sustainable floor)
+
+// Platform fee caps by membership tier (in cents)
+export const BASH_FEE_CAP_BASIC = 25000; // $250 cap for Basic
+export const BASH_FEE_CAP_PRO = 20000; // $200 cap for Pro
+export const BASH_FEE_CAP_CREATOR = 15000; // $150 cap for Creator
+export const BASH_FEE_CAP_ELITE = 10000; // $100 cap for Elite
+export const BASH_FEE_CAP_LEGEND = 5000; // $50 cap for Legend
+
+export const SERVICE_FEE_CAP_BASIC = 37500; // $375 cap for Basic
+export const SERVICE_FEE_CAP_PRO = 30000; // $300 cap for Pro
+export const SERVICE_FEE_CAP_CREATOR = 22500; // $225 cap for Creator
+export const SERVICE_FEE_CAP_ELITE = 15000; // $150 cap for Elite
+export const SERVICE_FEE_CAP_LEGEND = 7500; // $75 cap for Legend
+
+// Partner payment fee caps (Partners pay less since they bring value to hosts)
+export const PARTNER_FEE_CAP_BASIC = 20000; // $200 cap for Basic (8%)
+export const PARTNER_FEE_CAP_PRO = 15000; // $150 cap for Pro (6%)
+export const PARTNER_FEE_CAP_CREATOR = 12500; // $125 cap for Creator (5%)
+export const PARTNER_FEE_CAP_ELITE = 7500; // $75 cap for Elite (3%)
+export const PARTNER_FEE_CAP_LEGEND = 7500; // $75 cap for Legend (3%)
+
+// ============================================
+// SERVICE SUBSCRIPTION TIERS
+// ============================================
+// Service provider subscription tiers with pricing and limits
+// These are separate from user membership tiers (Basic, Creator, Pro, Elite, Legend)
+
+export type UserSubscriptionServiceTierInfo = {
+  name: string;
+  type?: ServiceSubscriptionTier;
+  description: string;
+  price: number;
+  features?: string[];
+  limits?: {
+    maxServices?: number;
+    maxPhotos?: number;
+    priorityPlacement?: boolean;
+    customBranding?: boolean;
+    analytics?: boolean;
+    prioritySupport?: boolean;
+    bookingFeePercentage?: number; // Percentage taken on each booking (0.15 = 15%)
+  };
+};
+
+export type UserSubscriptionServiceTierInfoMap = {
+  [key in ServiceSubscriptionTier]: UserSubscriptionServiceTierInfo;
+};
+
+export const SERVICE_SUBSCRIPTION_TIERS = {
+  Free: {
+    name: "Free",
+    description: "List your first service free - perfect for testing the platform",
+    price: 0,
+    features: [
+      "1 service listing",
+      "Up to 5 photos",
+      "Standard search placement", 
+      "Basic booking management",
+      "15% booking fee",
+      "Community support"
+    ],
+    limits: {
+      maxServices: 1,
+      maxPhotos: 5,
+      priorityPlacement: false,
+      customBranding: false,
+      analytics: false,
+      prioritySupport: false,
+      bookingFeePercentage: 0.15
+    }
+  },
+  Ally: {
+    name: "Ally",
+    description: "Enhanced features for growing entertainment and event service providers",
+    price: 14,
+    features: [
+      "Up to 5 service listings",
+      "Unlimited photos & videos",
+      "Priority search placement (top 50%)",
+      "Featured provider badge",
+      "12% booking fee (save 3%)",
+      "Basic analytics and insights",
+      "Calendar integration",
+      "Email support"
+    ],
+    limits: {
+      maxServices: 5,
+      maxPhotos: -1, // unlimited
+      priorityPlacement: true,
+      customBranding: false,
+      analytics: true,
+      prioritySupport: false,
+      bookingFeePercentage: 0.12
+    }
+  },
+  Partner: {
+    name: "Partner", 
+    description: "Professional tools for established vendors and service providers",
+    price: 49,
+    features: [
+      "Unlimited service listings",
+      "Unlimited photos & videos",
+      "Premium placement (top 25%)",
+      "Custom branding on booking pages",
+      "8% booking fee (save 7%)",
+      "Advanced analytics & reporting",
+      "Automated marketing campaigns",
+      "Priority support (chat & email)",
+      "Lead generation tools"
+    ],
+    limits: {
+      maxServices: -1, // unlimited
+      maxPhotos: -1, // unlimited
+      priorityPlacement: true,
+      customBranding: true,
+      analytics: true,
+      prioritySupport: true,
+      bookingFeePercentage: 0.08
+    }
+  },
+  Patron: {
+    name: "Patron",
+    description: "Premium enterprise solution for venues and large organizations", 
+    price: 99,
+    features: [
+      "Everything in Partner +",
+      "Featured first (top placement)",
+      "5% booking fee (save 10%)",
+      "Dedicated account manager",
+      "White-label booking pages",
+      "Custom integrations & API access",
+      "Custom reporting dashboards",
+      "Lead generation alerts",
+      "24/7 priority support"
+    ],
+    limits: {
+      maxServices: -1, // unlimited
+      maxPhotos: -1, // unlimited
+      priorityPlacement: true,
+      customBranding: true,
+      analytics: true,
+      prioritySupport: true,
+      bookingFeePercentage: 0.05
+    }
+  },
+} as const satisfies UserSubscriptionServiceTierInfoMap;
+
 export const GOOGLE_CALLBACK_URL = "/auth/google/callback" as const;
 export const CHECKOUT_RETURN_SUCCESS_URL =
   `/checkout-success/{CHECKOUT_SESSION_ID}` as const;

package/src/extendedSchemas.ts

@@ -571,8 +571,10 @@ export interface ServiceExt extends Service {
 
   // googleReviews: GoogleReview[];
 
+  // For availability filtering - matches Prisma relation name "bookings"
+  bookings?: ServiceBookingExt[];
+  
   // bookedCheckouts: ServiceBookingCheckoutExt[]; //not necessary to include
-  // bookings?: ServiceBookingExt[];
 }
 
 export type ServiceExtNonSpecific = Exclude<
@@ -650,7 +652,19 @@ export interface VendorExt extends Vendor {
   };
 }
 
-export interface VenueExt extends Venue {}
+// Future type for venue unavailable dates (not yet implemented in database)
+// To implement: Add VenueUnavailableDate model to Prisma schema
+export interface UnavailableDate {
+  id: string;
+  startDate: Date;
+  endDate: Date;
+  reason?: string;
+}
+
+export interface VenueExt extends Venue {
+  // Note: unavailableDates field doesn't exist in database yet
+  // When implemented, add: unavailableDates?: UnavailableDate[];
+}
 
 export interface OrganizationExt extends Organization {
   amountOfGuests?: AmountOfGuests;

package/src/index.ts

@@ -15,7 +15,7 @@ export * from "./utils/recurrenceUtils";
 export * from "./utils/service/attendeeOptionUtils";
 export * from "./utils/service/regexUtils";
 export * from "./utils/service/serviceUtils";
-export * from "./utils/service/venueUtils";
+// Venue utils moved to paymentUtils.ts for better organization
 export * from "./utils/slugUtils";
 export * from "./utils/sortUtils";
 export * from "./utils/stringUtils";

package/src/membershipDefinitions.ts

@@ -41,6 +41,7 @@ export interface UserMembershipStatus {
   currentPeriodStart?: number;
   currentPeriodEnd?: number;
   cancelAtPeriodEnd?: boolean;
+  trialEnd?: string; // ISO string of when trial ends (if in trial period)
 }
 
 // Additional interfaces for membership API

package/src/utils/contentFilterUtils.ts

@@ -317,3 +317,5 @@ export function shouldWarnUser(violations: ContentViolation[], userTier: string)
 
 
 
+
+