@bash-app/bash-common 30.95.0 → 30.97.0

package/prisma/schema.prisma

@@ -77,18 +77,51 @@ model CompetitionSponsor {
 }
 
 model EventTask {
-  id                         String         @id @default(cuid())
+  id                         String           @id @default(cuid())
   creatorId                  String
   bashEventId                String
   title                      String
   description                String?
   assignedToId               String?
   status                     TaskStatus?
-  createdAt                  DateTime?      @default(now())
-  assignedTo                 User?          @relation("TasksAssignedToMe", fields: [assignedToId], references: [id], onDelete: Cascade)
-  bashEvent                  BashEvent      @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
-  creator                    User           @relation(fields: [creatorId], references: [id], onDelete: Cascade)
+  createdAt                  DateTime?        @default(now())
+  assignedTo                 User?            @relation("TasksAssignedToMe", fields: [assignedToId], references: [id], onDelete: Cascade)
+  bashEvent                  BashEvent        @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+  creator                    User             @relation(fields: [creatorId], references: [id], onDelete: Cascade)
   notificationsReferencingMe Notification[]
+  comments                   TaskComment[]
+  invitations                TaskInvitation[]
+}
+
+model TaskComment {
+  id        String    @id @default(cuid())
+  taskId    String
+  authorId  String
+  content   String    @db.Text
+  createdAt DateTime  @default(now())
+  task      EventTask @relation(fields: [taskId], references: [id], onDelete: Cascade)
+  author    User      @relation("TaskCommentsAuthored", fields: [authorId], references: [id], onDelete: Cascade)
+}
+
+model TaskInvitation {
+  id              String    @id @default(cuid())
+  taskId          String
+  invitedEmail    String
+  token           String    @unique @default(cuid()) // CUID for security
+  invitedName     String? // Optional name hint from host
+  personalMessage String? // Optional message from host
+  createdAt       DateTime  @default(now())
+  expiresAt       DateTime // Event date + 1 day
+  acceptedAt      DateTime?
+  acceptedById    String? // User who accepted (might be newly created)
+  createdById     String // Host who sent invitation
+  task            EventTask @relation(fields: [taskId], references: [id], onDelete: Cascade)
+  acceptedBy      User?     @relation("TaskInvitationsAccepted", fields: [acceptedById], references: [id], onDelete: SetNull)
+  createdBy       User      @relation("TaskInvitationsSent", fields: [createdById], references: [id], onDelete: Cascade)
+
+  @@index([token])
+  @@index([invitedEmail])
+  @@index([taskId])
 }
 
 model Reminder {
@@ -902,6 +935,9 @@ model User {
   documentID                     DocumentID?
   eventTasksAssignedToMe         EventTask[]                @relation("TasksAssignedToMe")
   eventTasks                     EventTask[]
+  taskCommentsAuthored           TaskComment[]              @relation("TaskCommentsAuthored")
+  taskInvitationsSent            TaskInvitation[]           @relation("TaskInvitationsSent")
+  taskInvitationsAccepted        TaskInvitation[]           @relation("TaskInvitationsAccepted")
   exhibitorBookingRequestsAsHost ExhibitorBookingRequest[]  @relation("ExhibitorBookingHost")
   investments                    Investment[]
   invitationsCreatedByMe         Invitation[]               @relation("InvitationsCreatedByMe")
@@ -1303,6 +1339,7 @@ model Service {
   isFreeFirstListing                 Boolean                    @default(false)
   monthlyPrice                       Decimal                    @default(0)
   serviceListingStripeSubscriptionId String?
+  acceptsBashCash                    Boolean                    @default(true) // NEW: Allow BashCash payments
   associatedServicesReferencingMe    AssociatedService[]
   exhibitorBookingRequests           ExhibitorBookingRequest[]  @relation("ExhibitorBookingService")
   notification                       Notification[]
@@ -1848,6 +1885,8 @@ model ServiceBooking {
   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])

package/src/definitions.ts

@@ -85,60 +85,6 @@ 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;
 
-// 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
 // ============================================
@@ -346,6 +292,7 @@ export const MONTHS_PREVIOUS_THAT_STRIPE_ACCOUNTS_WILL_BE_SEARCHED_BY_EMAIL =
   1 as const;
 
 export const HTTP_CODE_OK = 200 as const;
+export const HTTP_CODE_CREATED = 201 as const;
 export const HTTP_CODE_TEMPORARY_REDIRECT = 307 as const;
 export const HTTP_CODE_INTERNAL_SERVER_ERR = 500 as const;
 export const HTTP_CODE_BAD_REQUEST = 400 as const;
@@ -646,6 +593,8 @@ export interface ApiResult<T, P extends ErrorDataType = ErrorDataType> {
   errorType?: ApiErrorType;
   errorData?: P;
   rawResponse?: any;
+  requiresPayment?: boolean; // For service listing payment flow
+  serviceId?: string; // For service listing payment flow
 }
 
 export function removeDataFromResult<

package/src/extendedSchemas.ts

@@ -28,6 +28,7 @@ import {
     Review,
     Service,
     ServiceAddon,
+    TaskComment,
     ServiceBooking,
     ServiceBookingAddOn,
     ServiceBookingCheckout,
@@ -741,9 +742,20 @@ export const BASH_NOTIFICATION_DATA_TO_INCLUDE = {
   },
 } satisfies Prisma.NotificationInclude;
 
+export interface TaskCommentExt extends TaskComment {
+  author: PublicUser;
+}
+
+export const TASK_COMMENT_DATA_TO_INCLUDE = {
+  author: {
+    select: FRONT_END_USER_DATA_TO_SELECT,
+  },
+} satisfies Prisma.TaskCommentInclude;
+
 export interface EventTaskExt extends EventTask {
   creator: PublicUser;
   assignedTo?: PublicUser | null;
+  comments?: TaskCommentExt[];
 }
 
 export const EVENT_TASK_DATA_TO_INCLUDE = {
@@ -753,6 +765,12 @@ export const EVENT_TASK_DATA_TO_INCLUDE = {
   assignedTo: {
     select: FRONT_END_USER_DATA_TO_SELECT,
   },
+  comments: {
+    include: TASK_COMMENT_DATA_TO_INCLUDE,
+    orderBy: {
+      createdAt: 'desc' as const,
+    },
+  },
 } satisfies Prisma.EventTaskInclude;
 
 export interface InvitationExt extends Invitation {

package/src/index.ts

@@ -5,6 +5,7 @@ export * from "./utils/addressUtils";
 export * from "./utils/apiUtils";
 export * from "./utils/arrayUtils";
 export * from "./utils/awsS3Utils";
+export * from "./utils/bashCashPaymentUtils";
 export * from "./utils/contentFilterUtils";
 export * from "./utils/dateTimeUtils";
 export * from "./utils/objUtils";