@bash-app/bash-common 30.4.0 → 30.6.0

package/package.json

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

package/prisma/schema.prisma

@@ -99,7 +99,7 @@ model EventTask {
   creator                        User               @relation(fields: [creatorId], references: [id], onDelete: Cascade)
   bashEventId                    String
   bashEvent                      BashEvent          @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
-  title                          String             
+  title                          String
   description                    String?
   assignedToId                   String?
   assignedTo                     User?              @relation("TasksAssignedToMe", fields: [assignedToId], references: [id], onDelete: Cascade)
@@ -138,10 +138,60 @@ model BashEventPromoCode {
   maxRedemptions           Int?
   redeemBy                 DateTime?
   usedBy                   User[]
+  promoter                 Promoter?  @relation(fields: [promoterId], references: [id])
+  promoterId               String? // Remove the @unique constraint here
+  meta                     String?
 
   @@unique([ticketTierId, code])
 }
 
+model Promoter {
+  id                String               @id @default(cuid())
+  promoterId        String // The user who is promoting
+  promotedForBash   String // The bash being promoted
+  level             Int                  @default(1)
+  isActive          Boolean              @default(true)
+  commissionRate    Float                @default(5.0)
+  creditsGenerated  Int                  @default(0)
+  earningsGenerated Float                @default(0.00)
+  createdAt         DateTime             @default(now())
+  updatedAt         DateTime             @updatedAt
+  promoCodes        BashEventPromoCode[] // This allows one promoter to have multiple promo codes
+  promoterUser      User                 @relation(fields: [userId], references: [id])
+  userId            String
+
+  @@unique([promoterId, promotedForBash])
+}
+
+model PromoterStats {
+  id                    String   @id @default(cuid())
+  userId                String   @unique
+  user                  User     @relation(fields: [userId], references: [id])
+  directSignups         Int      @default(0)
+  indirectSignups       Int      @default(0)
+  totalSignups          Int      @default(0)
+  directClicks          Int      @default(0)
+  indirectClicks        Int      @default(0)
+  totalClicks           Int      @default(0)
+  directCreditsEarned   Int      @default(0)
+  indirectCreditsEarned Int      @default(0)
+  totalCreditsEarned    Int      @default(0)
+  createdAt             DateTime @default(now())
+  updatedAt             DateTime @updatedAt
+}
+
+model PromoterClick {
+  id               String   @id @default(cuid())
+  promoterId       String // References Promoter.id
+  promoterCode     String?
+  userAgent        String?
+  ipHash           String? // Store a hash of IP for privacy
+  converted        Boolean  @default(false)
+  attributionChain String // JSON string of the full attribution path
+  createdAt        DateTime @default(now())
+  clickedAt        DateTime @default(now())
+}
+
 model BashNotification {
   id               String          @id @default(cuid())
   creatorId        String
@@ -948,6 +998,8 @@ model User {
   serviceBookingForCreator ServiceBooking[]         @relation("BookingCreator")
   serviceBookingForUser    ServiceBooking[]         @relation("BookingForUser")
   serviceBookingCheckout   ServiceBookingCheckout[]
+  promoter                 Promoter[]
+  promoterStats            PromoterStats?
 }
 
 model Contact {
@@ -1750,6 +1802,8 @@ model ServiceBookingCheckout {
   stripeCheckoutSessionId String?   @unique
   stripePaymentIntentId   String?   @unique
 
+  stripeRefundId String? @unique
+
   paidOn     DateTime?
   refundedOn DateTime?
 

package/src/utils/service/serviceBookingStatusUtils.ts

@@ -107,11 +107,18 @@ export function serviceBookingCanHaveApprovalDecision(
       errorMessage: "Approval decisions can only be made on booking requests.",
     };
   }
-  if (!serviceBookingIsPending(booking)) {
+  if (serviceBookingIsCanceled(booking)) {
+    return {
+      valid: false,
+      errorMessage:
+        "Approval decisions can not be made on canceled booking requests.",
+    };
+  }
+  if (serviceBookingIsConfirmed(booking)) {
     return {
       valid: false,
       errorMessage:
-        "Approval decisions can only be made for pending booking requests.",
+        "Approval decisions can not be made on confirmed booking requests.",
     };
   }