@bash-app/bash-common 13.4.0 → 13.6.0

package/package.json

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

package/prisma/schema.prisma

@@ -134,10 +134,10 @@ model Reminder {
 }
 
 model BashEventPromoCode {
-  id                       String    @id @default(cuid())
-  bashEventId              String
-  bashEvent                BashEvent @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+  id                       String     @id @default(cuid())
   code                     String
+  ticketTierId             String
+  ticketTier               TicketTier @relation(fields: [ticketTierId], references: [id])
   stripeCouponId           String?
   discountAmountInCents    Int?
   discountAmountPercentage Int?
@@ -145,7 +145,7 @@ model BashEventPromoCode {
   redeemBy                 DateTime?
   usedBy                   User[]
 
-  @@unique([bashEventId, code])
+  @@unique([ticketTierId, code])
 }
 
 model BashNotification {
@@ -196,14 +196,14 @@ model Invitation {
 }
 
 model BashEvent {
-  id                             String               @id @default(cuid())
+  id                             String             @id @default(cuid())
   title                          String
   creatorId                      String
-  creator                        User                 @relation("CreatedEvent", fields: [creatorId], references: [id], onDelete: Cascade)
+  creator                        User               @relation("CreatedEvent", fields: [creatorId], references: [id], onDelete: Cascade)
   description                    String?
-  eventType                      String               @default("Other")
-  startDateTime                  DateTime?            @default(now())
-  endDateTime                    DateTime?            @default(now())
+  eventType                      String             @default("Other")
+  startDateTime                  DateTime?          @default(now())
+  endDateTime                    DateTime?          @default(now())
   ticketTiers                    TicketTier[]
   targetAudience                 TargetAudience?
   amountOfGuests                 AmountOfGuests?
@@ -215,18 +215,18 @@ model BashEvent {
   notAllowed                     String?
   nonProfit                      Boolean?
   nonProfitId                    String?
-  privacy                        Privacy              @default(Public)
+  privacy                        Privacy            @default(Public)
   tickets                        Ticket[]
   reviews                        Review[]
   sponsorships                   SponsoredEvent[]
   investments                    Investment[]
   capacity                       Int?
   location                       String?
-  status                         BashStatus           @default(Draft)
+  status                         BashStatus         @default(Draft)
   tags                           String[]
   coverPhoto                     String?
   media                          Media[]
-  club                           Club?                @relation(fields: [clubId], references: [id], onDelete: SetNull)
+  club                           Club?              @relation(fields: [clubId], references: [id], onDelete: SetNull)
   clubId                         String?
   links                          EventLink[]
   competitions                   Competition[]
@@ -240,7 +240,6 @@ model BashEvent {
   eventTasks                     EventTask[]
   videoLink                      String?
   subtitle                       String?
-  promoCodes                     BashEventPromoCode[]
 }
 
 model Checkout {
@@ -257,18 +256,19 @@ model Checkout {
 }
 
 model TicketTier {
-  id                     String    @id @default(cuid())
+  id                     String               @id @default(cuid())
   bashEventId            String
-  bashEvent              BashEvent @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+  bashEvent              BashEvent            @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
   tickets                Ticket[]
   waitList               User[]
-  price                  Int       @default(0)
-  title                  String    @default("Free")
+  price                  Int                  @default(0)
+  title                  String               @default("Free")
   sortOrder              Int?
   description            String?
-  maximumNumberOfTickets Int       @default(100)
+  maximumNumberOfTickets Int                  @default(100)
   isDonationTier         Boolean?
   hidden                 Boolean?
+  promoCodes             BashEventPromoCode[]
 
   @@unique([bashEventId, title])
 }

package/src/definitions.ts

@@ -96,6 +96,9 @@ export type FilterFields = {
   crowd: string[];
   vibe: string[];
   included: string[];
+  hostRating: string[];      
+  specialOffers: string[];   
+  eventFormat: string[];     
 };
 
 export interface DeletedAndHiddenTiers {

package/src/extendedSchemas.ts

@@ -44,11 +44,17 @@ export interface BashEventExt extends BashEvent {
   ticketTiers: TicketTierExt[];
   media: Media[];
   eventTasks: EventTask[];
-  promoCodes?: BashEventPromoCode[];
   tickets?: Ticket[]; // Only include tickets that the user has purchased and not all tickets (could be thousands + privacy)
   // Do not include in fetch. Could be hundreds of these
   invitations: InvitationExt[];
   youtubeUrl?: string;
+  price?: string;
+  ageRequirement?: string;
+  crowd?: string;
+  included?: string;
+  hostRating?: string;
+  specialOffers?: string;
+  eventFormat?: string;
 }
 
 export const BASH_EVENT_DATA_TO_SELECT = {
@@ -64,7 +70,6 @@ export const BASH_EVENT_DATA_TO_INCLUDE = {
   ticketTiers: true,
   eventTasks: true,
   media: true,
-  promoCodes: true,
 }
 
 export const BASH_EVENT_DATA_TO_CLONE = [
@@ -74,7 +79,6 @@ export const BASH_EVENT_DATA_TO_CLONE = [
   'media',
   'recurrence',
   'invitations',
-  'promoCodes',
 ] as const;
 
 export interface BashNotificationExt extends BashNotification {
@@ -205,6 +209,7 @@ export const ASSOCIATED_BASH_DATA_TO_INCLUDE = {
 export interface TicketTierExt extends TicketTier {
   bashEvent: BashEvent;
   tickets: TicketExt[];
+  promoCodes?: BashEventPromoCode[];
 }
 
 export interface TicketExt extends Ticket {